mirror of
https://github.com/holub/mame
synced 2025-05-28 08:33:05 +03:00
From: Oliver Stoeneberg [mailto:oliverst@online.de]
Subject: a few cleanups This patch contains: - removal of unprintable chars (newlines) in SH-2 disassembler (I submitted this in the past nd it wasn't included) - a few unnecessary checks after malloc_ort_die() calls - changes two romload.c warnings to use GAMENOUN instead - adds "deprecat.h" in a few src/mame/drivers files (would be necessary, if the debugger.h one would be removed) - cleans up the mame.mak by adding all missing defines and grouping them based on cpu.mak - renamed video_exit() to winvideo_exit() for consistency in function names
This commit is contained in:
Aaron Giles
parent
a69088c498
commit
e0409bc7b1
@ -95,7 +95,7 @@ static UINT32 op0000(char *buffer, UINT32 pc, UINT16 opcode)
|
||||
sprintf(buffer, "MOV.L %s,@(R0,%s)", regname[Rm], regname[Rn]);
|
||||
break;
|
||||
case 7:
|
||||
sprintf(buffer, "MUL.L %s,%s\n", regname[Rm], regname[Rn]);
|
||||
sprintf(buffer, "MUL.L %s,%s", regname[Rm], regname[Rn]);
|
||||
break;
|
||||
case 8:
|
||||
sprintf(buffer, "?????? $%04X", opcode);
|
||||
@ -375,7 +375,7 @@ static UINT32 op0100(char *buffer, UINT32 pc, UINT16 opcode)
|
||||
|
||||
static UINT32 op0101(char *buffer, UINT32 pc, UINT16 opcode)
|
||||
{
|
||||
sprintf(buffer, "MOV.L @($%02X,%s),%s\n", (opcode & 15) * 4, regname[Rm], regname[Rn]);
|
||||
sprintf(buffer, "MOV.L @($%02X,%s),%s", (opcode & 15) * 4, regname[Rm], regname[Rn]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -474,7 +474,7 @@ static UINT32 op1000(char *buffer, UINT32 pc, UINT16 opcode)
|
||||
sprintf(buffer, "BFS $%08X", pc + SIGNX8(opcode & 0xff) * 2 + 2);
|
||||
break;
|
||||
default :
|
||||
sprintf(buffer, "invalid $%04X\n", opcode);
|
||||
sprintf(buffer, "invalid $%04X", opcode);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -891,8 +891,7 @@ void debug_cpu_trace(int cpunum, FILE *file, int trace_over, const char *action)
|
||||
if (action != NULL)
|
||||
{
|
||||
info->trace.action = malloc_or_die(strlen(action) + 1);
|
||||
if (info->trace.action != NULL)
|
||||
strcpy(info->trace.action, action);
|
||||
strcpy(info->trace.action, action);
|
||||
}
|
||||
|
||||
/* update flags */
|
||||
|
||||
@ -38,8 +38,6 @@ machine_config *machine_config_alloc(const machine_config_token *tokens)
|
||||
|
||||
/* allocate a new configuration object */
|
||||
config = malloc_or_die(sizeof(*config));
|
||||
if (config == NULL)
|
||||
return NULL;
|
||||
memset(config, 0, sizeof(*config));
|
||||
|
||||
/* parse tokens into the config */
|
||||
|
||||
@ -431,14 +431,14 @@ static void display_rom_load_results(rom_load_data *romdata)
|
||||
}
|
||||
|
||||
/* create the error message and exit fatally */
|
||||
strcat(romdata->errorbuf, "ERROR: required files are missing, the game cannot be run.");
|
||||
strcat(romdata->errorbuf, "ERROR: required files are missing, the "GAMENOUN" cannot be run.");
|
||||
fatalerror_exitcode(MAMERR_MISSING_FILES, "%s", romdata->errorbuf);
|
||||
}
|
||||
|
||||
/* if we had warnings, output them, but continue */
|
||||
if (romdata->warnings)
|
||||
{
|
||||
strcat(romdata->errorbuf, "WARNING: the game might not run correctly.");
|
||||
strcat(romdata->errorbuf, "WARNING: the "GAMENOUN" might not run correctly.");
|
||||
mame_printf_warning("%s\n", romdata->errorbuf);
|
||||
}
|
||||
}
|
||||
|
||||
@ -211,6 +211,7 @@ Notes:
|
||||
****************************************************************************/
|
||||
|
||||
#include "driver.h"
|
||||
#include "deprecat.h"
|
||||
#include "cpu/m6809/m6809.h"
|
||||
#include "cpu/m68000/m68000.h"
|
||||
#include "machine/6522via.h"
|
||||
|
||||
@ -29,6 +29,7 @@ ft5_v6_c4.u58 /
|
||||
#define NVRAM_HACK 1
|
||||
|
||||
#include "driver.h"
|
||||
#include "deprecat.h"
|
||||
#include "cpu/m68000/m68000.h"
|
||||
#include "sound/okim6295.h"
|
||||
|
||||
|
||||
@ -625,6 +625,7 @@ Notes:
|
||||
*/
|
||||
|
||||
#include "driver.h"
|
||||
#include "deprecat.h"
|
||||
#include "machine/eeprom.h"
|
||||
#include "system16.h"
|
||||
#include "video/segaic24.h"
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
*/
|
||||
|
||||
#include "driver.h"
|
||||
//#include "deprecat.h"
|
||||
#include "deprecat.h"
|
||||
#include "machine/eeprom.h"
|
||||
#include "video/segaic24.h"
|
||||
#include "cpu/i960/i960.h"
|
||||
|
||||
@ -55,9 +55,14 @@ CPUS += I8088
|
||||
CPUS += I80186
|
||||
CPUS += I80188
|
||||
CPUS += I80286
|
||||
CPUS += I386
|
||||
CPUS += I486
|
||||
CPUS += PENTIUM
|
||||
CPUS += MEDIAGX
|
||||
CPUS += V20
|
||||
CPUS += V25
|
||||
CPUS += V30
|
||||
CPUS += V30MZ
|
||||
CPUS += V33
|
||||
CPUS += V35
|
||||
CPUS += V60
|
||||
@ -90,6 +95,7 @@ CPUS += M6809
|
||||
CPUS += M6809E
|
||||
CPUS += KONAMI
|
||||
CPUS += M68000
|
||||
#CPUS += M68008
|
||||
CPUS += M68010
|
||||
CPUS += M68EC020
|
||||
CPUS += M68020
|
||||
@ -106,6 +112,8 @@ CPUS += TMS9980
|
||||
CPUS += TMS9995
|
||||
#CPUS += TMS99105A
|
||||
#CPUS += TMS99110A
|
||||
#CPUS += TMS99000
|
||||
#CPUS += TMS99010
|
||||
CPUS += Z8000
|
||||
CPUS += TMS32010
|
||||
CPUS += TMS32025
|
||||
@ -121,9 +129,11 @@ CPUS += ADSP2105
|
||||
CPUS += ADSP2115
|
||||
CPUS += ADSP2181
|
||||
CPUS += PSXCPU
|
||||
CPUS += CXD8661R
|
||||
CPUS += ASAP
|
||||
CPUS += UPD7810
|
||||
CPUS += UPD7807
|
||||
#CPUS += UPD7801
|
||||
CPUS += ARM
|
||||
CPUS += ARM7
|
||||
CPUS += JAGUAR
|
||||
@ -159,10 +169,6 @@ CPUS += GMS30C2116
|
||||
CPUS += GMS30C2132
|
||||
CPUS += GMS30C2216
|
||||
CPUS += GMS30C2232
|
||||
CPUS += I386
|
||||
CPUS += I486
|
||||
CPUS += PENTIUM
|
||||
CPUS += MEDIAGX
|
||||
CPUS += I960
|
||||
CPUS += H83002
|
||||
CPUS += V810
|
||||
@ -175,6 +181,7 @@ CPUS += PPC602
|
||||
CPUS += PPC603
|
||||
CPUS += PPC603E
|
||||
CPUS += PPC603R
|
||||
#CPUS += PPC604
|
||||
CPUS += MPC8240
|
||||
CPUS += SE3208
|
||||
CPUS += MC68HC11
|
||||
@ -184,9 +191,10 @@ CPUS += RSP
|
||||
CPUS += ALPHA8201
|
||||
CPUS += ALPHA8301
|
||||
CPUS += CDP1802
|
||||
CPUS += COP410
|
||||
#CPUS += COP411
|
||||
CPUS += COP420
|
||||
CPUS += COP421
|
||||
CPUS += COP410
|
||||
CPUS += TLCS90
|
||||
CPUS += MB8841
|
||||
CPUS += MB8842
|
||||
@ -201,14 +209,12 @@ CPUS += LH5801
|
||||
CPUS += PDP1
|
||||
CPUS += SATURN
|
||||
CPUS += SC61860
|
||||
CPUS += TX0_64KW
|
||||
CPUS += TX0_8KW
|
||||
CPUS += TX0
|
||||
CPUS += LR35902
|
||||
CPUS += TMS7000
|
||||
CPUS += TMS7000_EXL
|
||||
CPUS += SM8500
|
||||
CPUS += V30MZ
|
||||
CPUS += CXD8661R
|
||||
#CPUS += MINX
|
||||
|
||||
|
||||
|
||||
|
||||
@ -67,7 +67,7 @@ static bitmap_t *effect_bitmap;
|
||||
// PROTOTYPES
|
||||
//============================================================
|
||||
|
||||
static void video_exit(running_machine *machine);
|
||||
static void winvideo_exit(running_machine *machine);
|
||||
static void init_monitors(void);
|
||||
static BOOL CALLBACK monitor_enum_callback(HMONITOR handle, HDC dc, LPRECT rect, LPARAM data);
|
||||
static win_monitor_info *pick_monitor(int index);
|
||||
@ -90,7 +90,7 @@ void winvideo_init(running_machine *machine)
|
||||
int index;
|
||||
|
||||
// ensure we get called on the way out
|
||||
add_exit_callback(machine, video_exit);
|
||||
add_exit_callback(machine, winvideo_exit);
|
||||
|
||||
// extract data from the options
|
||||
extract_video_config(machine);
|
||||
@ -114,10 +114,10 @@ void winvideo_init(running_machine *machine)
|
||||
|
||||
|
||||
//============================================================
|
||||
// video_exit
|
||||
// winvideo_exit
|
||||
//============================================================
|
||||
|
||||
static void video_exit(running_machine *machine)
|
||||
static void winvideo_exit(running_machine *machine)
|
||||
{
|
||||
// free the overlay effect
|
||||
if (effect_bitmap != NULL)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user