From b3d7e09292e4e9995349a4605177ce66a5afa696 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Mon, 24 Jan 2011 05:09:05 +0000 Subject: Cleanups and version bump. --- .gitattributes | 6 +- src/emu/clifront.c | 6 +- src/emu/cpu/drcbec.c | 338 +++++++++++++++++++++--------------------- src/emu/cpu/drcbec.h | 2 +- src/emu/cpu/drcbeut.c | 20 +-- src/emu/cpu/drcbeut.h | 4 +- src/emu/cpu/drcbex64.c | 156 +++++++++---------- src/emu/cpu/drcbex64.h | 12 +- src/emu/cpu/drcbex86.c | 152 +++++++++---------- src/emu/cpu/drcbex86.h | 14 +- src/emu/cpu/drccache.c | 6 +- src/emu/cpu/drccache.h | 6 +- src/emu/cpu/drcfe.c | 6 +- src/emu/cpu/drcfe.h | 4 +- src/emu/cpu/drcuml.c | 48 +++--- src/emu/cpu/drcuml.h | 14 +- src/emu/cpu/i386/i386.h | 38 ++--- src/emu/cpu/i86/i86.h | 130 ++++++++-------- src/emu/cpu/i86/instr86.c | 26 ++-- src/emu/cpu/m6800/m6800.c | 62 ++++---- src/emu/cpu/mips/mips3fe.c | 16 +- src/emu/cpu/nec/nec.h | 74 ++++----- src/emu/cpu/nec/v25instr.c | 2 +- src/emu/cpu/powerpc/ppcfe.c | 2 +- src/emu/cpu/pps4/pps4.c | 52 +++---- src/emu/cpu/pps4/pps4dasm.c | 14 +- src/emu/cpu/rsp/rspdrc.c | 54 +++---- src/emu/cpu/rsp/rspfe.c | 10 +- src/emu/cpu/sh2/sh2comn.h | 2 +- src/emu/cpu/sh2/sh2drc.c | 54 +++---- src/emu/cpu/sh4/sh4.h | 2 +- src/emu/cpu/sh4/sh4comn.h | 10 +- src/emu/cpu/uml.c | 68 ++++----- src/emu/cpu/uml.h | 182 +++++++++++------------ src/emu/cpu/upd7725/upd7725.c | 32 ++-- src/emu/cpu/upd7725/upd7725.h | 8 +- src/emu/cpu/x86emit.h | 14 +- src/emu/devimage.c | 2 +- src/emu/drivers/xtal.h | 2 +- src/emu/emuopts.c | 2 +- src/emu/imagedev/cartslot.c | 4 +- src/emu/imagedev/chd_cd.c | 4 +- src/emu/imagedev/snapquik.h | 2 +- src/emu/info.c | 2 +- src/emu/mame.c | 4 +- src/emu/romload.c | 16 +- src/emu/softlist.c | 12 +- src/emu/sound/bsmt2000.c | 20 +-- src/emu/sound/bsmt2000.h | 6 +- src/emu/sound/disc_cls.h | 14 +- src/emu/sound/disc_dev.h | 4 +- src/emu/sound/disc_flt.h | 60 ++++---- src/emu/sound/disc_inp.c | 2 +- src/emu/sound/disc_mth.c | 6 +- src/emu/sound/disc_mth.h | 10 +- src/emu/sound/disc_wav.h | 14 +- src/emu/sound/discrete.c | 6 +- src/emu/sound/discrete.h | 10 +- src/emu/sound/okim6295.c | 2 +- src/emu/sound/segapcm.c | 38 ++--- src/lib/util/options.c | 20 +-- src/mame/audio/beezer.c | 102 ++++++------- src/mame/audio/seibu.c | 2 +- src/mame/drivers/1943.c | 2 +- src/mame/drivers/allied.c | 14 +- src/mame/drivers/alvg.c | 118 +++++++-------- src/mame/drivers/atari_s1.c | 30 ++-- src/mame/drivers/atari_s2.c | 12 +- src/mame/drivers/atari_s3.c | 12 +- src/mame/drivers/atarisy2.c | 32 ++-- src/mame/drivers/atvtrack.c | 4 +- src/mame/drivers/bingo.c | 28 ++-- src/mame/drivers/bishjan.c | 18 +-- src/mame/drivers/by17.c | 30 ++-- src/mame/drivers/by35.c | 288 +++++++++++++++++------------------ src/mame/drivers/by6803.c | 158 ++++++++++---------- src/mame/drivers/by68701.c | 14 +- src/mame/drivers/byvid.c | 20 +-- src/mame/drivers/capcom.c | 8 +- src/mame/drivers/cb2001.c | 4 +- src/mame/drivers/cshooter.c | 8 +- src/mame/drivers/de_1.c | 8 +- src/mame/drivers/de_2.c | 8 +- src/mame/drivers/de_3.c | 8 +- src/mame/drivers/de_3b.c | 8 +- src/mame/drivers/flicker.c | 8 +- src/mame/drivers/g627.c | 16 +- src/mame/drivers/gaplus.c | 2 +- src/mame/drivers/goldnpkr.c | 52 +++---- src/mame/drivers/gp_1.c | 8 +- src/mame/drivers/gp_2.c | 8 +- src/mame/drivers/gts1.c | 14 +- src/mame/drivers/gts3.c | 12 +- src/mame/drivers/gts80.c | 18 +-- src/mame/drivers/gts80a.c | 22 +-- src/mame/drivers/gts80b.c | 28 ++-- src/mame/drivers/hankin.c | 6 +- src/mame/drivers/hikaru.c | 16 +- src/mame/drivers/icecold.c | 6 +- src/mame/drivers/igs017.c | 20 +-- src/mame/drivers/inder.c | 4 +- src/mame/drivers/jp.c | 6 +- src/mame/drivers/jvh.c | 6 +- src/mame/drivers/kissproto.c | 10 +- src/mame/drivers/ltd.c | 6 +- src/mame/drivers/m92.c | 2 +- src/mame/drivers/megadriv.c | 2 +- src/mame/drivers/megadrvb.c | 2 +- src/mame/drivers/mephisto.c | 12 +- src/mame/drivers/micropin.c | 6 +- src/mame/drivers/model3.c | 16 +- src/mame/drivers/moo.c | 4 +- src/mame/drivers/mpu4.c | 6 +- src/mame/drivers/mrgame.c | 10 +- src/mame/drivers/mystston.c | 4 +- src/mame/drivers/mystwarr.c | 24 +-- src/mame/drivers/naomi.c | 14 +- src/mame/drivers/nsm.c | 6 +- src/mame/drivers/nss.c | 2 +- src/mame/drivers/peyper.c | 10 +- src/mame/drivers/play_1.c | 8 +- src/mame/drivers/play_2.c | 24 +-- src/mame/drivers/play_3.c | 8 +- src/mame/drivers/play_5.c | 8 +- src/mame/drivers/prehisle.c | 16 +- src/mame/drivers/pushman.c | 24 +-- src/mame/drivers/raiden2.c | 24 +-- src/mame/drivers/rowamet.c | 6 +- src/mame/drivers/s11.c | 8 +- src/mame/drivers/s11a.c | 10 +- src/mame/drivers/s11b.c | 8 +- src/mame/drivers/s11c.c | 8 +- src/mame/drivers/s3.c | 14 +- src/mame/drivers/s4.c | 8 +- src/mame/drivers/s6.c | 8 +- src/mame/drivers/s6a.c | 8 +- src/mame/drivers/s7.c | 8 +- src/mame/drivers/s8.c | 8 +- src/mame/drivers/s9.c | 8 +- src/mame/drivers/sleic.c | 10 +- src/mame/drivers/spaceg.c | 2 +- src/mame/drivers/spinb.c | 6 +- src/mame/drivers/ssv.c | 12 +- src/mame/drivers/st_mp100.c | 10 +- src/mame/drivers/st_mp200.c | 12 +- src/mame/drivers/starfire.c | 6 +- src/mame/drivers/taito.c | 6 +- src/mame/drivers/taito_f2.c | 2 +- src/mame/drivers/techno.c | 8 +- src/mame/drivers/toaplan2.c | 20 +-- src/mame/drivers/vamphalf.c | 12 +- src/mame/drivers/vd.c | 6 +- src/mame/drivers/white_mod.c | 24 +-- src/mame/drivers/whitestar.c | 32 ++-- src/mame/drivers/wico.c | 6 +- src/mame/drivers/wpc_95.c | 22 +-- src/mame/drivers/wpc_an.c | 22 +-- src/mame/drivers/wpc_dcs.c | 10 +- src/mame/drivers/wpc_dot.c | 6 +- src/mame/drivers/wpc_flip1.c | 6 +- src/mame/drivers/wpc_flip2.c | 6 +- src/mame/drivers/wpc_s.c | 8 +- src/mame/drivers/zac_1.c | 8 +- src/mame/drivers/zac_2.c | 8 +- src/mame/drivers/zac_proto.c | 8 +- src/mame/includes/starfire.h | 2 +- src/mame/machine/beezer.c | 88 +++++------ src/mame/machine/gaelco3d.c | 42 +++--- src/mame/machine/gaelco3d.h | 2 +- src/mame/machine/namco62.c | 2 +- src/mame/machine/seicop.c | 88 +++++------ src/mame/machine/snes.c | 14 +- src/mame/mamedriv.c | 36 ++--- src/mame/video/dc.c | 6 +- src/mame/video/gp9001.c | 18 +-- src/mame/video/legionna.c | 10 +- src/mame/video/madalien.c | 8 +- src/mame/video/seta.c | 24 +-- src/mame/video/shangkid.c | 10 +- src/mame/video/ssv.c | 22 +-- src/mame/video/starfire.c | 8 +- src/osd/sdl/drawsdl.c | 2 +- src/osd/sdl/sdlos_os2.c | 2 +- src/version.c | 2 +- 184 files changed, 2055 insertions(+), 2055 deletions(-) diff --git a/.gitattributes b/.gitattributes index e08315d4ef3..310e985f060 100644 --- a/.gitattributes +++ b/.gitattributes @@ -155,7 +155,7 @@ src/emu/cpu/hd6309/hd6309.c svneol=native#text/plain src/emu/cpu/hd6309/hd6309.h svneol=native#text/plain src/emu/cpu/i386/cycles.h svneol=native#text/plain src/emu/cpu/i386/i386.c svneol=native#text/plain -src/emu/cpu/i386/i386.h svneol=native#text/plain +src/emu/cpu/i386/i386.h -text svneol=native#text/plain src/emu/cpu/i386/i386dasm.c svneol=native#text/plain src/emu/cpu/i386/i386op16.c svneol=native#text/plain src/emu/cpu/i386/i386op32.c svneol=native#text/plain @@ -180,7 +180,7 @@ src/emu/cpu/i86/host.h svneol=native#text/plain src/emu/cpu/i86/i286.c svneol=native#text/plain src/emu/cpu/i86/i286.h svneol=native#text/plain src/emu/cpu/i86/i86.c svneol=native#text/plain -src/emu/cpu/i86/i86.h svneol=native#text/plain +src/emu/cpu/i86/i86.h -text svneol=native#text/plain src/emu/cpu/i86/i86.txt svneol=native#text/plain src/emu/cpu/i86/i86priv.h svneol=native#text/plain src/emu/cpu/i86/i86time.c svneol=native#text/plain @@ -325,7 +325,7 @@ src/emu/cpu/mn10200/mn10200.c svneol=native#text/plain src/emu/cpu/mn10200/mn10200.h svneol=native#text/plain src/emu/cpu/mn10200/mn102dis.c svneol=native#text/plain src/emu/cpu/nec/nec.c svneol=native#text/plain -src/emu/cpu/nec/nec.h svneol=native#text/plain +src/emu/cpu/nec/nec.h -text svneol=native#text/plain src/emu/cpu/nec/necdasm.c svneol=native#text/plain src/emu/cpu/nec/necea.h svneol=native#text/plain src/emu/cpu/nec/necinstr.c svneol=native#text/plain diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 58bc7eb3d4e..62cbc6aab9b 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -162,7 +162,7 @@ int cli_execute(int argc, char **argv, osd_interface &osd, const options_entry * core_filename_extract_base(&gamename, gamename_option, TRUE); driver = driver_get_name(gamename); - /* execute any commands specified */ + /* execute any commands specified */ result = execute_commands(options, exename, driver); if (result != -1) goto error; @@ -181,7 +181,7 @@ int cli_execute(int argc, char **argv, osd_interface &osd, const options_entry * result = MAMERR_INVALID_CONFIG; goto error; } - + /* run the game */ result = mame_execute(osd, options); @@ -882,7 +882,7 @@ static int info_listsoftware(core_options *options, const char *gamename) "\n" ); } - + for ( int drvindex = 0; drivers[drvindex] != NULL; drvindex++ ) { if ( mame_strwildcmp( gamename, drivers[drvindex]->name ) == 0 ) diff --git a/src/emu/cpu/drcbec.c b/src/emu/cpu/drcbec.c index f40ec76f9db..65c8c2fc396 100644 --- a/src/emu/cpu/drcbec.c +++ b/src/emu/cpu/drcbec.c @@ -455,7 +455,7 @@ void drcbe_c::generate(drcuml_block &block, const instruction *instlist, UINT32 // count how many bytes of immediates we need int immedbytes = 0; for (int pnum = 0; pnum < inst.numparams(); pnum++) - if (inst.param(pnum).is_mapvar() || + if (inst.param(pnum).is_mapvar() || (inst.param(pnum).is_immediate() && inst.param(pnum).immediate() != 0) || (inst.param(pnum).is_size_space() && inst.param(pnum).space() != 0)) immedbytes += psize[pnum]; @@ -491,7 +491,7 @@ void drcbe_c::generate(drcuml_block &block, const instruction *instlist, UINT32 //------------------------------------------------- -// hash_exists - return true if the given mode/pc +// hash_exists - return true if the given mode/pc // exists in the hash table //------------------------------------------------- @@ -502,7 +502,7 @@ bool drcbe_c::hash_exists(UINT32 mode, UINT32 pc) //------------------------------------------------- -// get_info - return information about the +// get_info - return information about the // back-end implementation //------------------------------------------------- @@ -514,7 +514,7 @@ void drcbe_c::get_info(drcbe_info &info) //------------------------------------------------- -// execute - execute a block of code registered +// execute - execute a block of code registered // at the given mode/pc //------------------------------------------------- @@ -540,21 +540,21 @@ int drcbe_c::execute(code_handle &entry) { // ----------------------- Control Flow Operations ----------------------- - case MAKE_OPCODE_SHORT(OP_HANDLE, 4, 0): // HANDLE handle - case MAKE_OPCODE_SHORT(OP_HASH, 4, 0): // HASH mode,pc - case MAKE_OPCODE_SHORT(OP_LABEL, 4, 0): // LABEL imm - case MAKE_OPCODE_SHORT(OP_COMMENT, 4, 0): // COMMENT string - case MAKE_OPCODE_SHORT(OP_MAPVAR, 4, 0): // MAPVAR mapvar,value + case MAKE_OPCODE_SHORT(OP_HANDLE, 4, 0): // HANDLE handle + case MAKE_OPCODE_SHORT(OP_HASH, 4, 0): // HASH mode,pc + case MAKE_OPCODE_SHORT(OP_LABEL, 4, 0): // LABEL imm + case MAKE_OPCODE_SHORT(OP_COMMENT, 4, 0): // COMMENT string + case MAKE_OPCODE_SHORT(OP_MAPVAR, 4, 0): // MAPVAR mapvar,value // these opcodes should be processed at compile-time only fatalerror("Unexpected opcode"); break; - case MAKE_OPCODE_SHORT(OP_DEBUG, 4, 0): // DEBUG pc + case MAKE_OPCODE_SHORT(OP_DEBUG, 4, 0): // DEBUG pc debugger_instruction_hook(&m_device, PARAM0); break; - case MAKE_OPCODE_SHORT(OP_HASHJMP, 4, 0): // HASHJMP mode,pc,handle + case MAKE_OPCODE_SHORT(OP_HASHJMP, 4, 0): // HASHJMP mode,pc,handle sp = 0; newinst = (const drcbec_instruction *)m_hash.get_codeptr(PARAM0, PARAM1); if (newinst == NULL) @@ -568,7 +568,7 @@ int drcbe_c::execute(code_handle &entry) inst = newinst; continue; - case MAKE_OPCODE_SHORT(OP_EXIT, 4, 1): // EXIT src1[,c] + case MAKE_OPCODE_SHORT(OP_EXIT, 4, 1): // EXIT src1[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -576,7 +576,7 @@ int drcbe_c::execute(code_handle &entry) case MAKE_OPCODE_SHORT(OP_EXIT, 4, 0): return PARAM0; - case MAKE_OPCODE_SHORT(OP_JMP, 4, 1): // JMP imm[,c] + case MAKE_OPCODE_SHORT(OP_JMP, 4, 1): // JMP imm[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -587,7 +587,7 @@ int drcbe_c::execute(code_handle &entry) inst = newinst; continue; - case MAKE_OPCODE_SHORT(OP_CALLH, 4, 1): // CALLH handle[,c] + case MAKE_OPCODE_SHORT(OP_CALLH, 4, 1): // CALLH handle[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -600,7 +600,7 @@ int drcbe_c::execute(code_handle &entry) inst = newinst; continue; - case MAKE_OPCODE_SHORT(OP_RET, 4, 1): // RET [c] + case MAKE_OPCODE_SHORT(OP_RET, 4, 1): // RET [c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -612,7 +612,7 @@ int drcbe_c::execute(code_handle &entry) inst = newinst; continue; - case MAKE_OPCODE_SHORT(OP_EXH, 4, 1): // EXH handle,param[,c] + case MAKE_OPCODE_SHORT(OP_EXH, 4, 1): // EXH handle,param[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -626,7 +626,7 @@ int drcbe_c::execute(code_handle &entry) inst = newinst; continue; - case MAKE_OPCODE_SHORT(OP_CALLC, 4, 1): // CALLC func,ptr[,c] + case MAKE_OPCODE_SHORT(OP_CALLC, 4, 1): // CALLC func,ptr[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -635,7 +635,7 @@ int drcbe_c::execute(code_handle &entry) (*inst[0].cfunc)(inst[1].v); break; - case MAKE_OPCODE_SHORT(OP_RECOVER, 4, 0): // RECOVER dst,mapvar + case MAKE_OPCODE_SHORT(OP_RECOVER, 4, 0): // RECOVER dst,mapvar assert(sp > 0); PARAM0 = m_map.get_value((drccodeptr)callstack[0], PARAM1); break; @@ -643,29 +643,29 @@ int drcbe_c::execute(code_handle &entry) // ----------------------- Internal Register Operations ----------------------- - case MAKE_OPCODE_SHORT(OP_SETFMOD, 4, 0): // SETFMOD src + case MAKE_OPCODE_SHORT(OP_SETFMOD, 4, 0): // SETFMOD src m_state.fmod = PARAM0; break; - case MAKE_OPCODE_SHORT(OP_GETFMOD, 4, 0): // GETFMOD dst + case MAKE_OPCODE_SHORT(OP_GETFMOD, 4, 0): // GETFMOD dst PARAM0 = m_state.fmod; break; - case MAKE_OPCODE_SHORT(OP_GETEXP, 4, 0): // GETEXP dst + case MAKE_OPCODE_SHORT(OP_GETEXP, 4, 0): // GETEXP dst PARAM0 = m_state.exp; break; - case MAKE_OPCODE_SHORT(OP_GETFLGS, 4, 0): // GETFLGS dst[,f] + case MAKE_OPCODE_SHORT(OP_GETFLGS, 4, 0): // GETFLGS dst[,f] PARAM0 = flags & PARAM1; break; - case MAKE_OPCODE_SHORT(OP_SAVE, 4, 0): // SAVE dst + case MAKE_OPCODE_SHORT(OP_SAVE, 4, 0): // SAVE dst *inst[0].state = m_state; inst[0].state->flags = flags; break; - case MAKE_OPCODE_SHORT(OP_RESTORE, 4, 0): // RESTORE dst - case MAKE_OPCODE_SHORT(OP_RESTORE, 4, 1): // RESTORE dst + case MAKE_OPCODE_SHORT(OP_RESTORE, 4, 0): // RESTORE dst + case MAKE_OPCODE_SHORT(OP_RESTORE, 4, 1): // RESTORE dst m_state = *inst[0].state; flags = inst[0].state->flags; break; @@ -673,7 +673,7 @@ int drcbe_c::execute(code_handle &entry) // ----------------------- 32-Bit Integer Operations ----------------------- - case MAKE_OPCODE_SHORT(OP_LOAD1, 4, 0): // LOAD dst,base,index,BYTE + case MAKE_OPCODE_SHORT(OP_LOAD1, 4, 0): // LOAD dst,base,index,BYTE PARAM0 = inst[1].puint8[PARAM2]; break; @@ -693,7 +693,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = *(UINT16 *)&inst[1].puint8[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOAD2, 4, 0): // LOAD dst,base,index,WORD + case MAKE_OPCODE_SHORT(OP_LOAD2, 4, 0): // LOAD dst,base,index,WORD PARAM0 = inst[1].puint16[PARAM2]; break; @@ -713,7 +713,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = *(UINT32 *)&inst[1].puint16[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOAD4, 4, 0): // LOAD dst,base,index,DWORD + case MAKE_OPCODE_SHORT(OP_LOAD4, 4, 0): // LOAD dst,base,index,DWORD PARAM0 = inst[1].puint32[PARAM2]; break; @@ -721,7 +721,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = *(UINT32 *)&inst[1].puint64[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOADS1, 4, 0): // LOADS dst,base,index,BYTE + case MAKE_OPCODE_SHORT(OP_LOADS1, 4, 0): // LOADS dst,base,index,BYTE PARAM0 = inst[1].pint8[PARAM2]; break; @@ -740,8 +740,8 @@ int drcbe_c::execute(code_handle &entry) case MAKE_OPCODE_SHORT(OP_LOADS2x1, 4, 0): // LOADS dst,base,index,WORD_x1 PARAM0 = *(INT16 *)&inst[1].pint8[PARAM2]; break; - - case MAKE_OPCODE_SHORT(OP_LOADS2, 4, 0): // LOADS dst,base,index,WORD + + case MAKE_OPCODE_SHORT(OP_LOADS2, 4, 0): // LOADS dst,base,index,WORD PARAM0 = inst[1].pint16[PARAM2]; break; @@ -761,7 +761,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = *(INT32 *)&inst[1].pint16[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOADS4, 4, 0): // LOADS dst,base,index,DWORD + case MAKE_OPCODE_SHORT(OP_LOADS4, 4, 0): // LOADS dst,base,index,DWORD PARAM0 = inst[1].pint32[PARAM2]; break; @@ -769,7 +769,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = *(INT32 *)&inst[1].pint64[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_STORE1, 4, 0): // STORE dst,base,index,BYTE + case MAKE_OPCODE_SHORT(OP_STORE1, 4, 0): // STORE dst,base,index,BYTE inst[0].puint8[PARAM1] = PARAM2; break; @@ -789,7 +789,7 @@ int drcbe_c::execute(code_handle &entry) *(UINT16 *)&inst[0].puint8[PARAM1] = PARAM2; break; - case MAKE_OPCODE_SHORT(OP_STORE2, 4, 0): // STORE dst,base,index,WORD + case MAKE_OPCODE_SHORT(OP_STORE2, 4, 0): // STORE dst,base,index,WORD inst[0].puint16[PARAM1] = PARAM2; break; @@ -809,7 +809,7 @@ int drcbe_c::execute(code_handle &entry) *(UINT32 *)&inst[0].puint16[PARAM1] = PARAM2; break; - case MAKE_OPCODE_SHORT(OP_STORE4, 4, 0): // STORE dst,base,index,DWORD + case MAKE_OPCODE_SHORT(OP_STORE4, 4, 0): // STORE dst,base,index,DWORD inst[0].puint32[PARAM1] = PARAM2; break; @@ -817,15 +817,15 @@ int drcbe_c::execute(code_handle &entry) *(UINT32 *)&inst[0].puint64[PARAM1] = PARAM2; break; - case MAKE_OPCODE_SHORT(OP_READ1, 4, 0): // READ dst,src1,space_BYTE + case MAKE_OPCODE_SHORT(OP_READ1, 4, 0): // READ dst,src1,space_BYTE PARAM0 = m_space[PARAM2]->read_byte(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_READ2, 4, 0): // READ dst,src1,space_WORD + case MAKE_OPCODE_SHORT(OP_READ2, 4, 0): // READ dst,src1,space_WORD PARAM0 = m_space[PARAM2]->read_word(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_READ4, 4, 0): // READ dst,src1,space_DWORD + case MAKE_OPCODE_SHORT(OP_READ4, 4, 0): // READ dst,src1,space_DWORD PARAM0 = m_space[PARAM2]->read_dword(PARAM1); break; @@ -837,15 +837,15 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = m_space[PARAM3]->read_dword(PARAM1, PARAM2); break; - case MAKE_OPCODE_SHORT(OP_WRITE1, 4, 0): // WRITE dst,src1,space_BYTE + case MAKE_OPCODE_SHORT(OP_WRITE1, 4, 0): // WRITE dst,src1,space_BYTE m_space[PARAM2]->write_byte(PARAM0, PARAM1); break; - case MAKE_OPCODE_SHORT(OP_WRITE2, 4, 0): // WRITE dst,src1,space_WORD + case MAKE_OPCODE_SHORT(OP_WRITE2, 4, 0): // WRITE dst,src1,space_WORD m_space[PARAM2]->write_word(PARAM0, PARAM1); break; - case MAKE_OPCODE_SHORT(OP_WRITE4, 4, 0): // WRITE dst,src1,space_DWORD + case MAKE_OPCODE_SHORT(OP_WRITE4, 4, 0): // WRITE dst,src1,space_DWORD m_space[PARAM2]->write_dword(PARAM0, PARAM1); break; @@ -857,11 +857,11 @@ int drcbe_c::execute(code_handle &entry) m_space[PARAM3]->write_dword(PARAM0, PARAM1, PARAM2); break; - case MAKE_OPCODE_SHORT(OP_CARRY, 4, 1): // CARRY src,bitnum + case MAKE_OPCODE_SHORT(OP_CARRY, 4, 1): // CARRY src,bitnum flags = (flags & ~FLAG_C) | ((PARAM0 >> (PARAM1 & 31)) & FLAG_C); break; - case MAKE_OPCODE_SHORT(OP_MOV, 4, 1): // MOV dst,src[,c] + case MAKE_OPCODE_SHORT(OP_MOV, 4, 1): // MOV dst,src[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -870,11 +870,11 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = PARAM1; break; - case MAKE_OPCODE_SHORT(OP_SET, 4, 1): // SET dst,c + case MAKE_OPCODE_SHORT(OP_SET, 4, 1): // SET dst,c PARAM0 = OPCODE_FAIL_CONDITION(opcode, flags) ? 0 : 1; break; - case MAKE_OPCODE_SHORT(OP_SEXT1, 4, 0): // SEXT1 dst,src + case MAKE_OPCODE_SHORT(OP_SEXT1, 4, 0): // SEXT1 dst,src PARAM0 = (INT8)PARAM1; break; @@ -884,7 +884,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_SEXT2, 4, 0): // SEXT2 dst,src + case MAKE_OPCODE_SHORT(OP_SEXT2, 4, 0): // SEXT2 dst,src PARAM0 = (INT16)PARAM1; break; @@ -918,7 +918,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_ADD, 4, 0): // ADD dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_ADD, 4, 0): // ADD dst,src1,src2[,f] PARAM0 = PARAM1 + PARAM2; break; @@ -928,7 +928,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_ADDC, 4, 0): // ADDC dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_ADDC, 4, 0): // ADDC dst,src1,src2[,f] PARAM0 = PARAM1 + PARAM2 + (flags & FLAG_C); break; @@ -941,7 +941,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_SUB, 4, 0): // SUB dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_SUB, 4, 0): // SUB dst,src1,src2[,f] PARAM0 = PARAM1 - PARAM2; break; @@ -951,7 +951,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_SUBB, 4, 0): // SUBB dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_SUBB, 4, 0): // SUBB dst,src1,src2[,f] PARAM0 = PARAM1 - PARAM2 - (flags & FLAG_C); break; @@ -964,7 +964,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_CMP, 4, 1): // CMP src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_CMP, 4, 1): // CMP src1,src2[,f] temp32 = PARAM0 - PARAM1; flags = FLAGS32_NZCV_SUB(temp32, PARAM0, PARAM1); break; @@ -1041,7 +1041,7 @@ int drcbe_c::execute(code_handle &entry) flags = FLAG_V; break; - case MAKE_OPCODE_SHORT(OP_AND, 4, 0): // AND dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_AND, 4, 0): // AND dst,src1,src2[,f] PARAM0 = PARAM1 & PARAM2; break; @@ -1051,12 +1051,12 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_TEST, 4, 1): // TEST src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_TEST, 4, 1): // TEST src1,src2[,f] temp32 = PARAM0 & PARAM1; flags = FLAGS32_NZ(temp32); break; - case MAKE_OPCODE_SHORT(OP_OR, 4, 0): // OR dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_OR, 4, 0): // OR dst,src1,src2[,f] PARAM0 = PARAM1 | PARAM2; break; @@ -1066,7 +1066,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_XOR, 4, 0): // XOR dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_XOR, 4, 0): // XOR dst,src1,src2[,f] PARAM0 = PARAM1 ^ PARAM2; break; @@ -1076,7 +1076,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_LZCNT, 4, 0): // LZCNT dst,src + case MAKE_OPCODE_SHORT(OP_LZCNT, 4, 0): // LZCNT dst,src PARAM0 = count_leading_zeros(PARAM1); break; @@ -1086,7 +1086,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_BSWAP, 4, 0): // BSWAP dst,src + case MAKE_OPCODE_SHORT(OP_BSWAP, 4, 0): // BSWAP dst,src temp32 = PARAM1; PARAM0 = FLIPENDIAN_INT32(temp32); break; @@ -1097,7 +1097,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = FLIPENDIAN_INT32(temp32); break; - case MAKE_OPCODE_SHORT(OP_SHL, 4, 0): // SHL dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_SHL, 4, 0): // SHL dst,src,count[,f] PARAM0 = PARAM1 << (PARAM2 & 31); break; @@ -1109,7 +1109,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_SHR, 4, 0): // SHR dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_SHR, 4, 0): // SHR dst,src,count[,f] PARAM0 = PARAM1 >> (PARAM2 & 31); break; @@ -1121,7 +1121,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_SAR, 4, 0): // SAR dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_SAR, 4, 0): // SAR dst,src,count[,f] PARAM0 = (INT32)PARAM1 >> (PARAM2 & 31); break; @@ -1133,7 +1133,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_ROL, 4, 0): // ROL dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_ROL, 4, 0): // ROL dst,src,count[,f] shift = PARAM2 & 31; PARAM0 = (PARAM1 << shift) | (PARAM1 >> ((32 - shift) & 31)); break; @@ -1146,7 +1146,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_ROLC, 4, 0): // ROLC dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_ROLC, 4, 0): // ROLC dst,src,count[,f] shift = PARAM2 & 31; if (shift > 1) PARAM0 = (PARAM1 << shift) | ((flags & FLAG_C) << (shift - 1)) | (PARAM1 >> (33 - shift)); @@ -1167,7 +1167,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_ROR, 4, 0): // ROR dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_ROR, 4, 0): // ROR dst,src,count[,f] shift = PARAM2 & 31; PARAM0 = (PARAM1 >> shift) | (PARAM1 << ((32 - shift) & 31)); break; @@ -1180,7 +1180,7 @@ int drcbe_c::execute(code_handle &entry) PARAM0 = temp32; break; - case MAKE_OPCODE_SHORT(OP_RORC, 4, 0): // RORC dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_RORC, 4, 0): // RORC dst,src,count[,f] shift = PARAM2 & 31; if (shift > 1) PARAM0 = (PARAM1 >> shift) | (((flags & FLAG_C) << 31) >> (shift - 1)) | (PARAM1 << (33 - shift)); @@ -1204,7 +1204,7 @@ int drcbe_c::execute(code_handle &entry) // ----------------------- 64-Bit Integer Operations ----------------------- - case MAKE_OPCODE_SHORT(OP_LOAD1, 8, 0): // DLOAD dst,base,index,BYTE + case MAKE_OPCODE_SHORT(OP_LOAD1, 8, 0): // DLOAD dst,base,index,BYTE DPARAM0 = inst[1].puint8[PARAM2]; break; @@ -1224,7 +1224,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = *(UINT16 *)&inst[1].puint8[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOAD2, 8, 0): // DLOAD dst,base,index,WORD + case MAKE_OPCODE_SHORT(OP_LOAD2, 8, 0): // DLOAD dst,base,index,WORD DPARAM0 = inst[1].puint16[PARAM2]; break; @@ -1244,7 +1244,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = *(UINT32 *)&inst[1].puint16[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOAD4, 8, 0): // DLOAD dst,base,index,DWORD + case MAKE_OPCODE_SHORT(OP_LOAD4, 8, 0): // DLOAD dst,base,index,DWORD DPARAM0 = inst[1].puint32[PARAM2]; break; @@ -1268,7 +1268,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = inst[1].puint64[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOADS1, 8, 0): // DLOADS dst,base,index,BYTE + case MAKE_OPCODE_SHORT(OP_LOADS1, 8, 0): // DLOADS dst,base,index,BYTE DPARAM0 = inst[1].pint8[PARAM2]; break; @@ -1288,7 +1288,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = *(INT16 *)&inst[1].pint8[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOADS2, 8, 0): // DLOADS dst,base,index,WORD + case MAKE_OPCODE_SHORT(OP_LOADS2, 8, 0): // DLOADS dst,base,index,WORD DPARAM0 = inst[1].pint16[PARAM2]; break; @@ -1308,7 +1308,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = *(INT32 *)&inst[1].pint16[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOADS4, 8, 0): // DLOADS dst,base,index,DWORD + case MAKE_OPCODE_SHORT(OP_LOADS4, 8, 0): // DLOADS dst,base,index,DWORD DPARAM0 = inst[1].pint32[PARAM2]; break; @@ -1328,11 +1328,11 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = *(INT64 *)&inst[1].pint32[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_LOADS8, 8, 0): // DLOADS dst,base,index,QWORD + case MAKE_OPCODE_SHORT(OP_LOADS8, 8, 0): // DLOADS dst,base,index,QWORD DPARAM0 = inst[1].pint64[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_STORE1, 8, 0): // DSTORE dst,base,index,BYTE + case MAKE_OPCODE_SHORT(OP_STORE1, 8, 0): // DSTORE dst,base,index,BYTE inst[0].puint8[PARAM1] = DPARAM2; break; @@ -1352,7 +1352,7 @@ int drcbe_c::execute(code_handle &entry) *(UINT16 *)&inst[0].puint8[PARAM1] = DPARAM2; break; - case MAKE_OPCODE_SHORT(OP_STORE2, 8, 0): // DSTORE dst,base,index,WORD + case MAKE_OPCODE_SHORT(OP_STORE2, 8, 0): // DSTORE dst,base,index,WORD inst[0].puint16[PARAM1] = DPARAM2; break; @@ -1372,7 +1372,7 @@ int drcbe_c::execute(code_handle &entry) *(UINT32 *)&inst[0].puint16[PARAM1] = DPARAM2; break; - case MAKE_OPCODE_SHORT(OP_STORE4, 8, 0): // DSTORE dst,base,index,DWORD + case MAKE_OPCODE_SHORT(OP_STORE4, 8, 0): // DSTORE dst,base,index,DWORD inst[0].puint32[PARAM1] = DPARAM2; break; @@ -1392,23 +1392,23 @@ int drcbe_c::execute(code_handle &entry) *(UINT64 *)&inst[0].puint32[PARAM1] = DPARAM2; break; - case MAKE_OPCODE_SHORT(OP_STORE8, 8, 0): // DSTORE dst,base,index,QWORD + case MAKE_OPCODE_SHORT(OP_STORE8, 8, 0): // DSTORE dst,base,index,QWORD inst[0].puint64[PARAM1] = DPARAM2; break; - case MAKE_OPCODE_SHORT(OP_READ1, 8, 0): // DREAD dst,src1,space_BYTE + case MAKE_OPCODE_SHORT(OP_READ1, 8, 0): // DREAD dst,src1,space_BYTE DPARAM0 = m_space[PARAM2]->read_byte(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_READ2, 8, 0): // DREAD dst,src1,space_WORD + case MAKE_OPCODE_SHORT(OP_READ2, 8, 0): // DREAD dst,src1,space_WORD DPARAM0 = m_space[PARAM2]->read_word(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_READ4, 8, 0): // DREAD dst,src1,space_DWORD + case MAKE_OPCODE_SHORT(OP_READ4, 8, 0): // DREAD dst,src1,space_DWORD DPARAM0 = m_space[PARAM2]->read_dword(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_READ8, 8, 0): // DREAD dst,src1,space_QOWRD + case MAKE_OPCODE_SHORT(OP_READ8, 8, 0): // DREAD dst,src1,space_QOWRD DPARAM0 = m_space[PARAM2]->read_qword(PARAM1); break; @@ -1424,19 +1424,19 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = m_space[PARAM3]->read_qword(PARAM1, PARAM2); break; - case MAKE_OPCODE_SHORT(OP_WRITE1, 8, 0): // DWRITE dst,src1,space_BYTE + case MAKE_OPCODE_SHORT(OP_WRITE1, 8, 0): // DWRITE dst,src1,space_BYTE m_space[PARAM2]->write_byte(PARAM0, PARAM1); break; - case MAKE_OPCODE_SHORT(OP_WRITE2, 8, 0): // DWRITE dst,src1,space_WORD + case MAKE_OPCODE_SHORT(OP_WRITE2, 8, 0): // DWRITE dst,src1,space_WORD m_space[PARAM2]->write_word(PARAM0, PARAM1); break; - case MAKE_OPCODE_SHORT(OP_WRITE4, 8, 0): // DWRITE dst,src1,space_DWORD + case MAKE_OPCODE_SHORT(OP_WRITE4, 8, 0): // DWRITE dst,src1,space_DWORD m_space[PARAM2]->write_dword(PARAM0, PARAM1); break; - case MAKE_OPCODE_SHORT(OP_WRITE8, 8, 0): // DWRITE dst,src1,space_QWORD + case MAKE_OPCODE_SHORT(OP_WRITE8, 8, 0): // DWRITE dst,src1,space_QWORD m_space[PARAM2]->write_qword(PARAM0, DPARAM1); break; @@ -1452,11 +1452,11 @@ int drcbe_c::execute(code_handle &entry) m_space[PARAM3]->write_qword(PARAM0, DPARAM1, DPARAM2); break; - case MAKE_OPCODE_SHORT(OP_CARRY, 8, 0): // DCARRY src,bitnum + case MAKE_OPCODE_SHORT(OP_CARRY, 8, 0): // DCARRY src,bitnum flags = (flags & ~FLAG_C) | ((DPARAM0 >> (DPARAM1 & 63)) & FLAG_C); break; - case MAKE_OPCODE_SHORT(OP_MOV, 8, 1): // DMOV dst,src[,c] + case MAKE_OPCODE_SHORT(OP_MOV, 8, 1): // DMOV dst,src[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -1465,11 +1465,11 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = DPARAM1; break; - case MAKE_OPCODE_SHORT(OP_SET, 8, 1): // DSET dst,c + case MAKE_OPCODE_SHORT(OP_SET, 8, 1): // DSET dst,c DPARAM0 = OPCODE_FAIL_CONDITION(opcode, flags) ? 0 : 1; break; - case MAKE_OPCODE_SHORT(OP_SEXT1, 8, 0): // DSEXT dst,src,BYTE + case MAKE_OPCODE_SHORT(OP_SEXT1, 8, 0): // DSEXT dst,src,BYTE DPARAM0 = (INT8)PARAM1; break; @@ -1479,7 +1479,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_SEXT2, 8, 0): // DSEXT dst,src,WORD + case MAKE_OPCODE_SHORT(OP_SEXT2, 8, 0): // DSEXT dst,src,WORD DPARAM0 = (INT16)PARAM1; break; @@ -1489,7 +1489,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_SEXT4, 8, 0): // DSEXT dst,src,DWORD + case MAKE_OPCODE_SHORT(OP_SEXT4, 8, 0): // DSEXT dst,src,DWORD DPARAM0 = (INT32)PARAM1; break; @@ -1523,7 +1523,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_ADD, 8, 0): // DADD dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_ADD, 8, 0): // DADD dst,src1,src2[,f] DPARAM0 = DPARAM1 + DPARAM2; break; @@ -1533,7 +1533,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_ADDC, 8, 0): // DADDC dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_ADDC, 8, 0): // DADDC dst,src1,src2[,f] DPARAM0 = DPARAM1 + DPARAM2 + (flags & FLAG_C); break; @@ -1546,7 +1546,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_SUB, 8, 0): // DSUB dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_SUB, 8, 0): // DSUB dst,src1,src2[,f] DPARAM0 = DPARAM1 - DPARAM2; break; @@ -1556,7 +1556,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_SUBB, 8, 0): // DSUBB dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_SUBB, 8, 0): // DSUBB dst,src1,src2[,f] DPARAM0 = DPARAM1 - DPARAM2 - (flags & FLAG_C); break; @@ -1569,7 +1569,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_CMP, 8, 1): // DCMP src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_CMP, 8, 1): // DCMP src1,src2[,f] temp64 = DPARAM0 - DPARAM1; flags = FLAGS64_NZCV_SUB(temp64, DPARAM0, DPARAM1); break; @@ -1632,7 +1632,7 @@ int drcbe_c::execute(code_handle &entry) flags = FLAG_V; break; - case MAKE_OPCODE_SHORT(OP_AND, 8, 0): // DAND dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_AND, 8, 0): // DAND dst,src1,src2[,f] DPARAM0 = DPARAM1 & DPARAM2; break; @@ -1642,12 +1642,12 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_TEST, 8, 1): // DTEST src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_TEST, 8, 1): // DTEST src1,src2[,f] temp64 = DPARAM1 & DPARAM2; flags = FLAGS64_NZ(temp64); break; - case MAKE_OPCODE_SHORT(OP_OR, 8, 0): // DOR dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_OR, 8, 0): // DOR dst,src1,src2[,f] DPARAM0 = DPARAM1 | DPARAM2; break; @@ -1657,7 +1657,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_XOR, 8, 0): // DXOR dst,src1,src2[,f] + case MAKE_OPCODE_SHORT(OP_XOR, 8, 0): // DXOR dst,src1,src2[,f] DPARAM0 = DPARAM1 ^ DPARAM2; break; @@ -1667,7 +1667,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_LZCNT, 8, 0): // DLZCNT dst,src + case MAKE_OPCODE_SHORT(OP_LZCNT, 8, 0): // DLZCNT dst,src if ((UINT32)(DPARAM1 >> 32) != 0) DPARAM0 = count_leading_zeros(DPARAM1 >> 32); else @@ -1683,7 +1683,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_BSWAP, 8, 0): // DBSWAP dst,src + case MAKE_OPCODE_SHORT(OP_BSWAP, 8, 0): // DBSWAP dst,src temp64 = DPARAM1; DPARAM0 = FLIPENDIAN_INT64(temp64); break; @@ -1694,7 +1694,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = FLIPENDIAN_INT64(temp64); break; - case MAKE_OPCODE_SHORT(OP_SHL, 8, 0): // DSHL dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_SHL, 8, 0): // DSHL dst,src,count[,f] DPARAM0 = DPARAM1 << (DPARAM2 & 63); break; @@ -1706,7 +1706,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_SHR, 8, 0): // DSHR dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_SHR, 8, 0): // DSHR dst,src,count[,f] DPARAM0 = DPARAM1 >> (DPARAM2 & 63); break; @@ -1718,7 +1718,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_SAR, 8, 0): // DSAR dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_SAR, 8, 0): // DSAR dst,src,count[,f] DPARAM0 = (INT64)DPARAM1 >> (DPARAM2 & 63); break; @@ -1730,7 +1730,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_ROL, 8, 0): // DROL dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_ROL, 8, 0): // DROL dst,src,count[,f] shift = DPARAM2 & 31; DPARAM0 = (DPARAM1 << shift) | (DPARAM1 >> ((64 - shift) & 63)); break; @@ -1743,7 +1743,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_ROLC, 8, 0): // DROLC dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_ROLC, 8, 0): // DROLC dst,src,count[,f] shift = DPARAM2 & 63; if (shift > 1) DPARAM0 = (DPARAM1 << shift) | ((flags & FLAG_C) << (shift - 1)) | (DPARAM1 >> (65 - shift)); @@ -1764,7 +1764,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_ROR, 8, 0): // DROR dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_ROR, 8, 0): // DROR dst,src,count[,f] shift = DPARAM2 & 63; DPARAM0 = (DPARAM1 >> shift) | (DPARAM1 << ((64 - shift) & 63)); break; @@ -1777,7 +1777,7 @@ int drcbe_c::execute(code_handle &entry) DPARAM0 = temp64; break; - case MAKE_OPCODE_SHORT(OP_RORC, 8, 0): // DRORC dst,src,count[,f] + case MAKE_OPCODE_SHORT(OP_RORC, 8, 0): // DRORC dst,src,count[,f] shift = DPARAM2 & 63; if (shift > 1) DPARAM0 = (DPARAM1 >> shift) | ((((UINT64)flags & FLAG_C) << 63) >> (shift - 1)) | (DPARAM1 << (65 - shift)); @@ -1801,23 +1801,23 @@ int drcbe_c::execute(code_handle &entry) // ----------------------- 32-Bit Floating Point Operations ----------------------- - case MAKE_OPCODE_SHORT(OP_FLOAD, 4, 0): // FSLOAD dst,base,index + case MAKE_OPCODE_SHORT(OP_FLOAD, 4, 0): // FSLOAD dst,base,index FSPARAM0 = inst[1].pfloat[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_FSTORE, 4, 0): // FSSTORE dst,base,index + case MAKE_OPCODE_SHORT(OP_FSTORE, 4, 0): // FSSTORE dst,base,index inst[0].pfloat[PARAM1] = FSPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FREAD, 4, 0): // FSREAD dst,src1,space + case MAKE_OPCODE_SHORT(OP_FREAD, 4, 0): // FSREAD dst,src1,space PARAM0 = m_space[PARAM2]->read_dword(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_FWRITE, 4, 0): // FSWRITE dst,src1,space + case MAKE_OPCODE_SHORT(OP_FWRITE, 4, 0): // FSWRITE dst,src1,space m_space[PARAM2]->write_dword(PARAM0, PARAM1); break; - case MAKE_OPCODE_SHORT(OP_FMOV, 4, 1): // FSMOV dst,src[,c] + case MAKE_OPCODE_SHORT(OP_FMOV, 4, 1): // FSMOV dst,src[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -1826,133 +1826,133 @@ int drcbe_c::execute(code_handle &entry) FSPARAM0 = FSPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FTOI4T, 4, 0): // FSTOI4T dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4T, 4, 0): // FSTOI4T dst,src1 if (FSPARAM1 >= 0) *inst[0].pint32 = floor(FSPARAM1); else *inst[0].pint32 = ceil(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI4R, 4, 0): // FSTOI4R dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4R, 4, 0): // FSTOI4R dst,src1 if (FSPARAM1 >= 0) *inst[0].pint32 = floor(FSPARAM1 + 0.5f); else *inst[0].pint32 = ceil(FSPARAM1 - 0.5f); break; - case MAKE_OPCODE_SHORT(OP_FTOI4F, 4, 0): // FSTOI4F dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4F, 4, 0): // FSTOI4F dst,src1 *inst[0].pint32 = floor(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI4C, 4, 0): // FSTOI4C dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4C, 4, 0): // FSTOI4C dst,src1 *inst[0].pint32 = ceil(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI4, 4, 0): // FSTOI4 dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4, 4, 0): // FSTOI4 dst,src1 *inst[0].pint32 = FSPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FTOI8T, 4, 0): // FSTOI8T dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8T, 4, 0): // FSTOI8T dst,src1 if (FSPARAM1 >= 0) *inst[0].pint64 = floor(FSPARAM1); else *inst[0].pint64 = ceil(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI8R, 4, 0): // FSTOI8R dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8R, 4, 0): // FSTOI8R dst,src1 if (FSPARAM1 >= 0) *inst[0].pint64 = floor(FSPARAM1 + 0.5f); else *inst[0].pint64 = ceil(FSPARAM1 - 0.5f); break; - case MAKE_OPCODE_SHORT(OP_FTOI8F, 4, 0): // FSTOI8F dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8F, 4, 0): // FSTOI8F dst,src1 *inst[0].pint64 = floor(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI8C, 4, 0): // FSTOI8C dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8C, 4, 0): // FSTOI8C dst,src1 *inst[0].pint64 = ceil(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI8, 4, 0): // FSTOI8 dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8, 4, 0): // FSTOI8 dst,src1 *inst[0].pint64 = FSPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FFRI4, 4, 0): // FSFRI4 dst,src1 + case MAKE_OPCODE_SHORT(OP_FFRI4, 4, 0): // FSFRI4 dst,src1 FSPARAM0 = *inst[1].pint32; break; - case MAKE_OPCODE_SHORT(OP_FFRI8, 4, 0): // FSFRI8 dst,src1 + case MAKE_OPCODE_SHORT(OP_FFRI8, 4, 0): // FSFRI8 dst,src1 FSPARAM0 = *inst[1].pint64; break; - case MAKE_OPCODE_SHORT(OP_FFRFD, 4, 0): // FSFRFD dst,src1 + case MAKE_OPCODE_SHORT(OP_FFRFD, 4, 0): // FSFRFD dst,src1 FSPARAM0 = FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FADD, 4, 0): // FSADD dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FADD, 4, 0): // FSADD dst,src1,src2 FSPARAM0 = FSPARAM1 + FSPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FSUB, 4, 0): // FSSUB dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FSUB, 4, 0): // FSSUB dst,src1,src2 FSPARAM0 = FSPARAM1 - FSPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FCMP, 4, 1): // FSCMP src1,src2 + case MAKE_OPCODE_SHORT(OP_FCMP, 4, 1): // FSCMP src1,src2 if (isnan(FSPARAM0) || isnan(FSPARAM1)) flags = FLAG_U; else flags = (FSPARAM0 < FSPARAM1) | ((FSPARAM0 == FSPARAM1) << 2); break; - case MAKE_OPCODE_SHORT(OP_FMUL, 4, 0): // FSMUL dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FMUL, 4, 0): // FSMUL dst,src1,src2 FSPARAM0 = FSPARAM1 * FSPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FDIV, 4, 0): // FSDIV dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FDIV, 4, 0): // FSDIV dst,src1,src2 FSPARAM0 = FSPARAM1 / FSPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FNEG, 4, 0): // FSNEG dst,src1 + case MAKE_OPCODE_SHORT(OP_FNEG, 4, 0): // FSNEG dst,src1 FSPARAM0 = -FSPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FABS, 4, 0): // FSABS dst,src1 + case MAKE_OPCODE_SHORT(OP_FABS, 4, 0): // FSABS dst,src1 FSPARAM0 = fabs(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FSQRT, 4, 0): // FSSQRT dst,src1 + case MAKE_OPCODE_SHORT(OP_FSQRT, 4, 0): // FSSQRT dst,src1 FSPARAM0 = sqrt(FSPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FRECIP, 4, 0): // FSRECIP dst,src1 + case MAKE_OPCODE_SHORT(OP_FRECIP, 4, 0): // FSRECIP dst,src1 FSPARAM0 = 1.0f / FSPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FRSQRT, 4, 0): // FSRSQRT dst,src1 + case MAKE_OPCODE_SHORT(OP_FRSQRT, 4, 0): // FSRSQRT dst,src1 FSPARAM0 = 1.0f / sqrt(FSPARAM1); break; // ----------------------- 64-Bit Floating Point Operations ----------------------- - case MAKE_OPCODE_SHORT(OP_FLOAD, 8, 0): // FDLOAD dst,base,index + case MAKE_OPCODE_SHORT(OP_FLOAD, 8, 0): // FDLOAD dst,base,index FDPARAM0 = inst[1].pdouble[PARAM2]; break; - case MAKE_OPCODE_SHORT(OP_FSTORE, 8, 0): // FDSTORE dst,base,index + case MAKE_OPCODE_SHORT(OP_FSTORE, 8, 0): // FDSTORE dst,base,index inst[0].pdouble[PARAM1] = FDPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FREAD, 8, 0): // FDREAD dst,src1,space + case MAKE_OPCODE_SHORT(OP_FREAD, 8, 0): // FDREAD dst,src1,space DPARAM0 = m_space[PARAM2]->read_qword(PARAM1); break; - case MAKE_OPCODE_SHORT(OP_FWRITE, 8, 0): // FDWRITE dst,src1,space + case MAKE_OPCODE_SHORT(OP_FWRITE, 8, 0): // FDWRITE dst,src1,space m_space[PARAM2]->write_qword(PARAM0, DPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FMOV, 8, 1): // FDMOV dst,src[,c] + case MAKE_OPCODE_SHORT(OP_FMOV, 8, 1): // FDMOV dst,src[,c] if (OPCODE_FAIL_CONDITION(opcode, flags)) break; // fall through... @@ -1961,114 +1961,114 @@ int drcbe_c::execute(code_handle &entry) FDPARAM0 = FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FTOI4T, 8, 0): // FDTOI4T dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4T, 8, 0): // FDTOI4T dst,src1 if (FDPARAM1 >= 0) *inst[0].pint32 = floor(FDPARAM1); else *inst[0].pint32 = ceil(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI4R, 8, 0): // FDTOI4R dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4R, 8, 0): // FDTOI4R dst,src1 if (FDPARAM1 >= 0) *inst[0].pint32 = floor(FDPARAM1 + 0.5); else *inst[0].pint32 = ceil(FDPARAM1 - 0.5); break; - case MAKE_OPCODE_SHORT(OP_FTOI4F, 8, 0): // FDTOI4F dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4F, 8, 0): // FDTOI4F dst,src1 *inst[0].pint32 = floor(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI4C, 8, 0): // FDTOI4C dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4C, 8, 0): // FDTOI4C dst,src1 *inst[0].pint32 = ceil(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI4, 8, 0): // FDTOI4 dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI4, 8, 0): // FDTOI4 dst,src1 *inst[0].pint32 = FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FTOI8T, 8, 0): // FDTOI8T dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8T, 8, 0): // FDTOI8T dst,src1 if (FDPARAM1 >= 0) *inst[0].pint64 = floor(FDPARAM1); else *inst[0].pint64 = ceil(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI8R, 8, 0): // FDTOI8R dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8R, 8, 0): // FDTOI8R dst,src1 if (FDPARAM1 >= 0) *inst[0].pint64 = floor(FDPARAM1 + 0.5); else *inst[0].pint64 = ceil(FDPARAM1 - 0.5); break; - case MAKE_OPCODE_SHORT(OP_FTOI8F, 8, 0): // FDTOI8F dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8F, 8, 0): // FDTOI8F dst,src1 *inst[0].pint64 = floor(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI8C, 8, 0): // FDTOI8C dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8C, 8, 0): // FDTOI8C dst,src1 *inst[0].pint64 = ceil(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FTOI8, 8, 0): // FDTOI8 dst,src1 + case MAKE_OPCODE_SHORT(OP_FTOI8, 8, 0): // FDTOI8 dst,src1 *inst[0].pint64 = FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FFRI4, 8, 0): // FDFRI4 dst,src1 + case MAKE_OPCODE_SHORT(OP_FFRI4, 8, 0): // FDFRI4 dst,src1 FDPARAM0 = *inst[1].pint32; break; - case MAKE_OPCODE_SHORT(OP_FFRI8, 8, 0): // FDFRI8 dst,src1 + case MAKE_OPCODE_SHORT(OP_FFRI8, 8, 0): // FDFRI8 dst,src1 FDPARAM0 = *inst[1].pint64; break; - case MAKE_OPCODE_SHORT(OP_FFRFS, 8, 0): // FDFRFS dst,src1 + case MAKE_OPCODE_SHORT(OP_FFRFS, 8, 0): // FDFRFS dst,src1 FDPARAM0 = FSPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FRNDS, 8, 0): // FDRNDS dst,src1 + case MAKE_OPCODE_SHORT(OP_FRNDS, 8, 0): // FDRNDS dst,src1 FDPARAM0 = (float)FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FADD, 8, 0): // FDADD dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FADD, 8, 0): // FDADD dst,src1,src2 FDPARAM0 = FDPARAM1 + FDPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FSUB, 8, 0): // FDSUB dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FSUB, 8, 0): // FDSUB dst,src1,src2 FDPARAM0 = FDPARAM1 - FDPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FCMP, 8, 1): // FDCMP src1,src2 + case MAKE_OPCODE_SHORT(OP_FCMP, 8, 1): // FDCMP src1,src2 if (isnan(FDPARAM0) || isnan(FDPARAM1)) flags = FLAG_U; else flags = (FDPARAM0 < FDPARAM1) | ((FDPARAM0 == FDPARAM1) << 2); break; - case MAKE_OPCODE_SHORT(OP_FMUL, 8, 0): // FDMUL dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FMUL, 8, 0): // FDMUL dst,src1,src2 FDPARAM0 = FDPARAM1 * FDPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FDIV, 8, 0): // FDDIV dst,src1,src2 + case MAKE_OPCODE_SHORT(OP_FDIV, 8, 0): // FDDIV dst,src1,src2 FDPARAM0 = FDPARAM1 / FDPARAM2; break; - case MAKE_OPCODE_SHORT(OP_FNEG, 8, 0): // FDNEG dst,src1 + case MAKE_OPCODE_SHORT(OP_FNEG, 8, 0): // FDNEG dst,src1 FDPARAM0 = -FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FABS, 8, 0): // FDABS dst,src1 + case MAKE_OPCODE_SHORT(OP_FABS, 8, 0): // FDABS dst,src1 FDPARAM0 = fabs(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FSQRT, 8, 0): // FDSQRT dst,src1 + case MAKE_OPCODE_SHORT(OP_FSQRT, 8, 0): // FDSQRT dst,src1 FDPARAM0 = sqrt(FDPARAM1); break; - case MAKE_OPCODE_SHORT(OP_FRECIP, 8, 0): // FDRECIP dst,src1 + case MAKE_OPCODE_SHORT(OP_FRECIP, 8, 0): // FDRECIP dst,src1 FDPARAM0 = 1.0 / FDPARAM1; break; - case MAKE_OPCODE_SHORT(OP_FRSQRT, 8, 0): // FDRSQRT dst,src1 + case MAKE_OPCODE_SHORT(OP_FRSQRT, 8, 0): // FDRSQRT dst,src1 FDPARAM0 = 1.0 / sqrt(FDPARAM1); break; @@ -2111,7 +2111,7 @@ void drcbe_c::output_parameter(drcbec_instruction **dstptr, void **immedptr, int immed = (UINT8 *)immed + size; } break; - + // int registers point to the appropriate part of the integer register state case parameter::PTYPE_INT_REGISTER: if (size == 4) @@ -2137,7 +2137,7 @@ void drcbe_c::output_parameter(drcbec_instruction **dstptr, void **immedptr, int case parameter::PTYPE_MEMORY: (dst++)->v = param.memory(); break; - + // ignore these parameters: they are directly encoded in the opcode case parameter::PTYPE_SIZE: case parameter::PTYPE_SIZE_SCALE: @@ -2153,16 +2153,16 @@ void drcbe_c::output_parameter(drcbec_instruction **dstptr, void **immedptr, int case parameter::PTYPE_CODE_HANDLE: (dst++)->handle = ¶m.handle(); break; - + // code label just contains the label value case parameter::PTYPE_CODE_LABEL: return output_parameter(dstptr, immedptr, size, UINT32(param.label())); - + // c_function just points to the C function case parameter::PTYPE_C_FUNCTION: (dst++)->cfunc = param.cfunc(); break; - + default: fatalerror("Unexpected param->type"); break; diff --git a/src/emu/cpu/drcbec.h b/src/emu/cpu/drcbec.h index 93bdb68937f..f74face8497 100644 --- a/src/emu/cpu/drcbec.h +++ b/src/emu/cpu/drcbec.h @@ -59,7 +59,7 @@ public: // construction/destruction drcbe_c(drcuml_state &drcuml, device_t &device, drc_cache &cache, UINT32 flags, int modes, int addrbits, int ignorebits); virtual ~drcbe_c(); - + // required overrides virtual void reset(); virtual int execute(uml::code_handle &entry); diff --git a/src/emu/cpu/drcbeut.c b/src/emu/cpu/drcbeut.c index a2552b25dbe..b33d2207a1c 100644 --- a/src/emu/cpu/drcbeut.c +++ b/src/emu/cpu/drcbeut.c @@ -154,7 +154,7 @@ void drc_hash_table::block_end(drcuml_block &block) //------------------------------------------------- -// set_default_codeptr - change the default +// set_default_codeptr - change the default // codeptr //------------------------------------------------- @@ -182,7 +182,7 @@ void drc_hash_table::set_default_codeptr(drccodeptr nocodeptr) //------------------------------------------------- -// set_codeptr - set the codeptr for the given +// set_codeptr - set the codeptr for the given // mode/pc //------------------------------------------------- @@ -346,7 +346,7 @@ void drc_map_variables::block_end(drcuml_block &block) //------------------------------------------------- -// set_value - set a map value for the given +// set_value - set a map value for the given // code pointer //------------------------------------------------- @@ -374,7 +374,7 @@ void drc_map_variables::set_value(drccodeptr codebase, UINT32 mapvar, UINT32 new //------------------------------------------------- -// get_value - return a map value for the given +// get_value - return a map value for the given // code pointer //------------------------------------------------- @@ -442,7 +442,7 @@ UINT32 drc_map_variables::static_get_value(drc_map_variables &map, drccodeptr co //------------------------------------------------- -// get_last_value - return the most recently set +// get_last_value - return the most recently set // map value //------------------------------------------------- @@ -503,8 +503,8 @@ void drc_label_list::block_end(drcuml_block &block) //------------------------------------------------- -// get_codeptr - find or allocate a new label; -// returns NULL and requests an OOB callback if +// get_codeptr - find or allocate a new label; +// returns NULL and requests an OOB callback if // undefined //------------------------------------------------- @@ -534,7 +534,7 @@ void drc_label_list::set_codeptr(uml::code_label label, drccodeptr codeptr) //------------------------------------------------- -// reset - reset a label list (add all entries to +// reset - reset a label list (add all entries to // the free list) //------------------------------------------------- @@ -555,7 +555,7 @@ void drc_label_list::reset(bool fatal_on_leftovers) //------------------------------------------------- -// find_or_allocate - look up a label and +// find_or_allocate - look up a label and // allocate a new one if not found //------------------------------------------------- @@ -580,7 +580,7 @@ drc_label_list::label_entry *drc_label_list::find_or_allocate(uml::code_label la //------------------------------------------------- -// oob_callback - out-of-band codegen callback +// oob_callback - out-of-band codegen callback // for labels //------------------------------------------------- diff --git a/src/emu/cpu/drcbeut.h b/src/emu/cpu/drcbeut.h index 4c707bb3c2e..250d3328000 100644 --- a/src/emu/cpu/drcbeut.h +++ b/src/emu/cpu/drcbeut.h @@ -57,7 +57,7 @@ class drc_hash_table public: // construction/destruction drc_hash_table(drc_cache &cache, UINT32 modes, UINT8 addrbits, UINT8 ignorebits); - + // getters drccodeptr ***base() const { return m_base; } UINT8 l1bits() const { return m_l1bits; } @@ -67,7 +67,7 @@ public: offs_t l1mask() const { return m_l1mask; } offs_t l2mask() const { return m_l2mask; } bool is_mode_populated(UINT32 mode) const { return m_base[mode] != m_emptyl1; } - + // set up and configuration bool reset(); void set_default_codeptr(drccodeptr code); diff --git a/src/emu/cpu/drcbex64.c b/src/emu/cpu/drcbex64.c index 4a3e5503194..aba05b1d608 100644 --- a/src/emu/cpu/drcbex64.c +++ b/src/emu/cpu/drcbex64.c @@ -332,89 +332,89 @@ static const UINT8 fprnd_map[4] = const drcbe_x64::opcode_table_entry drcbe_x64::s_opcode_table_source[] = { // Compile-time opcodes - { uml::OP_HANDLE, &drcbe_x64::op_handle }, // HANDLE handle - { uml::OP_HASH, &drcbe_x64::op_hash }, // HASH mode,pc - { uml::OP_LABEL, &drcbe_x64::op_label }, // LABEL imm - { uml::OP_COMMENT, &drcbe_x64::op_comment }, // COMMENT string - { uml::OP_MAPVAR, &drcbe_x64::op_mapvar }, // MAPVAR mapvar,value + { uml::OP_HANDLE, &drcbe_x64::op_handle }, // HANDLE handle + { uml::OP_HASH, &drcbe_x64::op_hash }, // HASH mode,pc + { uml::OP_LABEL, &drcbe_x64::op_label }, // LABEL imm + { uml::OP_COMMENT, &drcbe_x64::op_comment }, // COMMENT string + { uml::OP_MAPVAR, &drcbe_x64::op_mapvar }, // MAPVAR mapvar,value // Control Flow Operations - { uml::OP_NOP, &drcbe_x64::op_nop }, // NOP - { uml::OP_DEBUG, &drcbe_x64::op_debug }, // DEBUG pc - { uml::OP_EXIT, &drcbe_x64::op_exit }, // EXIT src1[,c] - { uml::OP_HASHJMP, &drcbe_x64::op_hashjmp }, // HASHJMP mode,pc,handle - { uml::OP_JMP, &drcbe_x64::op_jmp }, // JMP imm[,c] - { uml::OP_EXH, &drcbe_x64::op_exh }, // EXH handle,param[,c] - { uml::OP_CALLH, &drcbe_x64::op_callh }, // CALLH handle[,c] - { uml::OP_RET, &drcbe_x64::op_ret }, // RET [c] - { uml::OP_CALLC, &drcbe_x64::op_callc }, // CALLC func,ptr[,c] - { uml::OP_RECOVER, &drcbe_x64::op_recover }, // RECOVER dst,mapvar + { uml::OP_NOP, &drcbe_x64::op_nop }, // NOP + { uml::OP_DEBUG, &drcbe_x64::op_debug }, // DEBUG pc + { uml::OP_EXIT, &drcbe_x64::op_exit }, // EXIT src1[,c] + { uml::OP_HASHJMP, &drcbe_x64::op_hashjmp }, // HASHJMP mode,pc,handle + { uml::OP_JMP, &drcbe_x64::op_jmp }, // JMP imm[,c] + { uml::OP_EXH, &drcbe_x64::op_exh }, // EXH handle,param[,c] + { uml::OP_CALLH, &drcbe_x64::op_callh }, // CALLH handle[,c] + { uml::OP_RET, &drcbe_x64::op_ret }, // RET [c] + { uml::OP_CALLC, &drcbe_x64::op_callc }, // CALLC func,ptr[,c] + { uml::OP_RECOVER, &drcbe_x64::op_recover }, // RECOVER dst,mapvar // Internal Register Operations - { uml::OP_SETFMOD, &drcbe_x64::op_setfmod }, // SETFMOD src - { uml::OP_GETFMOD, &drcbe_x64::op_getfmod }, // GETFMOD dst - { uml::OP_GETEXP, &drcbe_x64::op_getexp }, // GETEXP dst - { uml::OP_GETFLGS, &drcbe_x64::op_getflgs }, // GETFLGS dst[,f] - { uml::OP_SAVE, &drcbe_x64::op_save }, // SAVE dst - { uml::OP_RESTORE, &drcbe_x64::op_restore }, // RESTORE dst + { uml::OP_SETFMOD, &drcbe_x64::op_setfmod }, // SETFMOD src + { uml::OP_GETFMOD, &drcbe_x64::op_getfmod }, // GETFMOD dst + { uml::OP_GETEXP, &drcbe_x64::op_getexp }, // GETEXP dst + { uml::OP_GETFLGS, &drcbe_x64::op_getflgs }, // GETFLGS dst[,f] + { uml::OP_SAVE, &drcbe_x64::op_save }, // SAVE dst + { uml::OP_RESTORE, &drcbe_x64::op_restore }, // RESTORE dst // Integer Operations - { uml::OP_LOAD, &drcbe_x64::op_load }, // LOAD dst,base,index,size - { uml::OP_LOADS, &drcbe_x64::op_loads }, // LOADS dst,base,index,size - { uml::OP_STORE, &drcbe_x64::op_store }, // STORE base,index,src,size - { uml::OP_READ, &drcbe_x64::op_read }, // READ dst,src1,spacesize + { uml::OP_LOAD, &drcbe_x64::op_load }, // LOAD dst,base,index,size + { uml::OP_LOADS, &drcbe_x64::op_loads }, // LOADS dst,base,index,size + { uml::OP_STORE, &drcbe_x64::op_store }, // STORE base,index,src,size + { uml::OP_READ, &drcbe_x64::op_read }, // READ dst,src1,spacesize { uml::OP_READM, &drcbe_x64::op_readm }, // READM dst,src1,mask,spacesize - { uml::OP_WRITE, &drcbe_x64::op_write }, // WRITE dst,src1,spacesize - { uml::OP_WRITEM, &drcbe_x64::op_writem }, // WRITEM dst,src1,spacesize - { uml::OP_CARRY, &drcbe_x64::op_carry }, // CARRY src,bitnum - { uml::OP_SET, &drcbe_x64::op_set }, // SET dst,c - { uml::OP_MOV, &drcbe_x64::op_mov }, // MOV dst,src[,c] - { uml::OP_SEXT, &drcbe_x64::op_sext }, // SEXT dst,src - { uml::OP_ROLAND, &drcbe_x64::op_roland }, // ROLAND dst,src1,src2,src3 - { uml::OP_ROLINS, &drcbe_x64::op_rolins }, // ROLINS dst,src1,src2,src3 - { uml::OP_ADD, &drcbe_x64::op_add }, // ADD dst,src1,src2[,f] - { uml::OP_ADDC, &drcbe_x64::op_addc }, // ADDC dst,src1,src2[,f] - { uml::OP_SUB, &drcbe_x64::op_sub }, // SUB dst,src1,src2[,f] - { uml::OP_SUBB, &drcbe_x64::op_subc }, // SUBB dst,src1,src2[,f] - { uml::OP_CMP, &drcbe_x64::op_cmp }, // CMP src1,src2[,f] + { uml::OP_WRITE, &drcbe_x64::op_write }, // WRITE dst,src1,spacesize + { uml::OP_WRITEM, &drcbe_x64::op_writem }, // WRITEM dst,src1,spacesize + { uml::OP_CARRY, &drcbe_x64::op_carry }, // CARRY src,bitnum + { uml::OP_SET, &drcbe_x64::op_set }, // SET dst,c + { uml::OP_MOV, &drcbe_x64::op_mov }, // MOV dst,src[,c] + { uml::OP_SEXT, &drcbe_x64::op_sext }, // SEXT dst,src + { uml::OP_ROLAND, &drcbe_x64::op_roland }, // ROLAND dst,src1,src2,src3 + { uml::OP_ROLINS, &drcbe_x64::op_rolins }, // ROLINS dst,src1,src2,src3 + { uml::OP_ADD, &drcbe_x64::op_add }, // ADD dst,src1,src2[,f] + { uml::OP_ADDC, &drcbe_x64::op_addc }, // ADDC dst,src1,src2[,f] + { uml::OP_SUB, &drcbe_x64::op_sub }, // SUB dst,src1,src2[,f] + { uml::OP_SUBB, &drcbe_x64::op_subc }, // SUBB dst,src1,src2[,f] + { uml::OP_CMP, &drcbe_x64::op_cmp }, // CMP src1,src2[,f] { uml::OP_MULU, &drcbe_x64::op_mulu }, // MULU dst,edst,src1,src2[,f] { uml::OP_MULS, &drcbe_x64::op_muls }, // MULS dst,edst,src1,src2[,f] { uml::OP_DIVU, &drcbe_x64::op_divu }, // DIVU dst,edst,src1,src2[,f] { uml::OP_DIVS, &drcbe_x64::op_divs }, // DIVS dst,edst,src1,src2[,f] - { uml::OP_AND, &drcbe_x64::op_and }, // AND dst,src1,src2[,f] - { uml::OP_TEST, &drcbe_x64::op_test }, // TEST src1,src2[,f] - { uml::OP_OR, &drcbe_x64::op_or }, // OR dst,src1,src2[,f] - { uml::OP_XOR, &drcbe_x64::op_xor }, // XOR dst,src1,src2[,f] - { uml::OP_LZCNT, &drcbe_x64::op_lzcnt }, // LZCNT dst,src[,f] - { uml::OP_BSWAP, &drcbe_x64::op_bswap }, // BSWAP dst,src - { uml::OP_SHL, &drcbe_x64::op_shl }, // SHL dst,src,count[,f] - { uml::OP_SHR, &drcbe_x64::op_shr }, // SHR dst,src,count[,f] - { uml::OP_SAR, &drcbe_x64::op_sar }, // SAR dst,src,count[,f] - { uml::OP_ROL, &drcbe_x64::op_rol }, // ROL dst,src,count[,f] - { uml::OP_ROLC, &drcbe_x64::op_rolc }, // ROLC dst,src,count[,f] - { uml::OP_ROR, &drcbe_x64::op_ror }, // ROR dst,src,count[,f] - { uml::OP_RORC, &drcbe_x64::op_rorc }, // RORC dst,src,count[,f] + { uml::OP_AND, &drcbe_x64::op_and }, // AND dst,src1,src2[,f] + { uml::OP_TEST, &drcbe_x64::op_test }, // TEST src1,src2[,f] + { uml::OP_OR, &drcbe_x64::op_or }, // OR dst,src1,src2[,f] + { uml::OP_XOR, &drcbe_x64::op_xor }, // XOR dst,src1,src2[,f] + { uml::OP_LZCNT, &drcbe_x64::op_lzcnt }, // LZCNT dst,src[,f] + { uml::OP_BSWAP, &drcbe_x64::op_bswap }, // BSWAP dst,src + { uml::OP_SHL, &drcbe_x64::op_shl }, // SHL dst,src,count[,f] + { uml::OP_SHR, &drcbe_x64::op_shr }, // SHR dst,src,count[,f] + { uml::OP_SAR, &drcbe_x64::op_sar }, // SAR dst,src,count[,f] + { uml::OP_ROL, &drcbe_x64::op_rol }, // ROL dst,src,count[,f] + { uml::OP_ROLC, &drcbe_x64::op_rolc }, // ROLC dst,src,count[,f] + { uml::OP_ROR, &drcbe_x64::op_ror }, // ROR dst,src,count[,f] + { uml::OP_RORC, &drcbe_x64::op_rorc }, // RORC dst,src,count[,f] // Floating Point Operations - { uml::OP_FLOAD, &drcbe_x64::op_fload }, // FLOAD dst,base,index - { uml::OP_FSTORE, &drcbe_x64::op_fstore }, // FSTORE base,index,src - { uml::OP_FREAD, &drcbe_x64::op_fread }, // FREAD dst,space,src1 - { uml::OP_FWRITE, &drcbe_x64::op_fwrite }, // FWRITE space,dst,src1 - { uml::OP_FMOV, &drcbe_x64::op_fmov }, // FMOV dst,src1[,c] - { uml::OP_FTOINT, &drcbe_x64::op_ftoint }, // FTOINT dst,src1,size,round - { uml::OP_FFRINT, &drcbe_x64::op_ffrint }, // FFRINT dst,src1,size - { uml::OP_FFRFLT, &drcbe_x64::op_ffrflt }, // FFRFLT dst,src1,size - { uml::OP_FRNDS, &drcbe_x64::op_frnds }, // FRNDS dst,src1 - { uml::OP_FADD, &drcbe_x64::op_fadd }, // FADD dst,src1,src2 - { uml::OP_FSUB, &drcbe_x64::op_fsub }, // FSUB dst,src1,src2 - { uml::OP_FCMP, &drcbe_x64::op_fcmp }, // FCMP src1,src2 - { uml::OP_FMUL, &drcbe_x64::op_fmul }, // FMUL dst,src1,src2 - { uml::OP_FDIV, &drcbe_x64::op_fdiv }, // FDIV dst,src1,src2 - { uml::OP_FNEG, &drcbe_x64::op_fneg }, // FNEG dst,src1 - { uml::OP_FABS, &drcbe_x64::op_fabs }, // FABS dst,src1 - { uml::OP_FSQRT, &drcbe_x64::op_fsqrt }, // FSQRT dst,src1 - { uml::OP_FRECIP, &drcbe_x64::op_frecip }, // FRECIP dst,src1 - { uml::OP_FRSQRT, &drcbe_x64::op_frsqrt } // FRSQRT dst,src1 + { uml::OP_FLOAD, &drcbe_x64::op_fload }, // FLOAD dst,base,index + { uml::OP_FSTORE, &drcbe_x64::op_fstore }, // FSTORE base,index,src + { uml::OP_FREAD, &drcbe_x64::op_fread }, // FREAD dst,space,src1 + { uml::OP_FWRITE, &drcbe_x64::op_fwrite }, // FWRITE space,dst,src1 + { uml::OP_FMOV, &drcbe_x64::op_fmov }, // FMOV dst,src1[,c] + { uml::OP_FTOINT, &drcbe_x64::op_ftoint }, // FTOINT dst,src1,size,round + { uml::OP_FFRINT, &drcbe_x64::op_ffrint }, // FFRINT dst,src1,size + { uml::OP_FFRFLT, &drcbe_x64::op_ffrflt }, // FFRFLT dst,src1,size + { uml::OP_FRNDS, &drcbe_x64::op_frnds }, // FRNDS dst,src1 + { uml::OP_FADD, &drcbe_x64::op_fadd }, // FADD dst,src1,src2 + { uml::OP_FSUB, &drcbe_x64::op_fsub }, // FSUB dst,src1,src2 + { uml::OP_FCMP, &drcbe_x64::op_fcmp }, // FCMP src1,src2 + { uml::OP_FMUL, &drcbe_x64::op_fmul }, // FMUL dst,src1,src2 + { uml::OP_FDIV, &drcbe_x64::op_fdiv }, // FDIV dst,src1,src2 + { uml::OP_FNEG, &drcbe_x64::op_fneg }, // FNEG dst,src1 + { uml::OP_FABS, &drcbe_x64::op_fabs }, // FABS dst,src1 + { uml::OP_FSQRT, &drcbe_x64::op_fsqrt }, // FSQRT dst,src1 + { uml::OP_FRECIP, &drcbe_x64::op_frecip }, // FRECIP dst,src1 + { uml::OP_FRSQRT, &drcbe_x64::op_frsqrt } // FRSQRT dst,src1 }; @@ -477,8 +477,8 @@ drcbe_x64::be_parameter::be_parameter(drcbe_x64 &drcbe, const parameter ¶m, //------------------------------------------------- -// select_register - select a register to use, -// avoiding conflicts with the optional +// select_register - select a register to use, +// avoiding conflicts with the optional // checkparam //------------------------------------------------- @@ -505,8 +505,8 @@ inline int drcbe_x64::be_parameter::select_register(int defreg, const be_paramet //------------------------------------------------- -// select_register - select a register to use, -// avoiding conflicts with the optional +// select_register - select a register to use, +// avoiding conflicts with the optional // checkparam //------------------------------------------------- @@ -777,7 +777,7 @@ void drcbe_x64::reset() //------------------------------------------------- -// execute - execute a block of code referenced +// execute - execute a block of code referenced // by the given handle //------------------------------------------------- @@ -853,7 +853,7 @@ void drcbe_x64::generate(drcuml_block &block, const instruction *instlist, UINT3 //------------------------------------------------- -// hash_exists - return true if the given mode/pc +// hash_exists - return true if the given mode/pc // exists in the hash table //------------------------------------------------- @@ -864,7 +864,7 @@ bool drcbe_x64::hash_exists(UINT32 mode, UINT32 pc) //------------------------------------------------- -// get_info - return information about the +// get_info - return information about the // back-end implementation //------------------------------------------------- @@ -4018,7 +4018,7 @@ void drcbe_x64::op_set(x86code *&dst, const instruction &inst) void drcbe_x64::op_mov(x86code *&dst, const instruction &inst) { x86code *savedst = dst; - + // validate instruction assert(inst.size() == 4 || inst.size() == 8); assert_any_condition(inst); diff --git a/src/emu/cpu/drcbex64.h b/src/emu/cpu/drcbex64.h index 788ccfa5a66..277046d1df2 100644 --- a/src/emu/cpu/drcbex64.h +++ b/src/emu/cpu/drcbex64.h @@ -63,7 +63,7 @@ public: // construction/destruction drcbe_x64(drcuml_state &drcuml, device_t &device, drc_cache &cache, UINT32 flags, int modes, int addrbits, int ignorebits); virtual ~drcbe_x64(); - + // required overrides virtual void reset(); virtual int execute(uml::code_handle &entry); @@ -96,7 +96,7 @@ private: be_parameter(const be_parameter ¶m) : m_type(param.m_type), m_value(param.m_value) { } be_parameter(UINT64 val) : m_type(PTYPE_IMMEDIATE), m_value(val) { } be_parameter(drcbe_x64 &drcbe, const uml::parameter ¶m, UINT32 allowed); - + // creators for types that don't safely default static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); } static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); } @@ -107,7 +107,7 @@ private: // operators bool operator==(const be_parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); } bool operator!=(const be_parameter &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); } - + // getters be_parameter_type type() const { return m_type; } UINT64 immediate() const { assert(m_type == PTYPE_IMMEDIATE); return m_value; } @@ -115,14 +115,14 @@ private: int freg() const { assert(m_type == PTYPE_FLOAT_REGISTER); assert(m_value >= 0 && m_value < x64emit::REG_MAX); return m_value; } int vreg() const { assert(m_type == PTYPE_VECTOR_REGISTER); assert(m_value >= 0 && m_value < x64emit::REG_MAX); return m_value; } void *memory() const { assert(m_type == PTYPE_MEMORY); return reinterpret_cast(m_value); } - + // type queries bool is_immediate() const { return (m_type == PTYPE_IMMEDIATE); } bool is_int_register() const { return (m_type == PTYPE_INT_REGISTER); } bool is_float_register() const { return (m_type == PTYPE_FLOAT_REGISTER); } bool is_vector_register() const { return (m_type == PTYPE_VECTOR_REGISTER); } bool is_memory() const { return (m_type == PTYPE_MEMORY); } - + // other queries bool is_immediate_value(UINT64 value) const { return (m_type == PTYPE_IMMEDIATE && m_value == value); } @@ -130,7 +130,7 @@ private: int select_register(int defreg) const; int select_register(int defreg, const be_parameter &checkparam) const; int select_register(int defreg, const be_parameter &checkparam, const be_parameter &checkparam2) const; - + private: // private constructor be_parameter(be_parameter_type type, be_parameter_value value) : m_type(type), m_value(value) { } diff --git a/src/emu/cpu/drcbex86.c b/src/emu/cpu/drcbex86.c index 361f4662a24..3419a988125 100644 --- a/src/emu/cpu/drcbex86.c +++ b/src/emu/cpu/drcbex86.c @@ -1,6 +1,6 @@ /*************************************************************************** - drcbex86.c + drcbex86.c 32-bit x86 back-end for the universal machine language. @@ -216,89 +216,89 @@ static const UINT16 fp_control[4] = const drcbe_x86::opcode_table_entry drcbe_x86::s_opcode_table_source[] = { // Compile-time opcodes - { uml::OP_HANDLE, &drcbe_x86::op_handle }, // HANDLE handle - { uml::OP_HASH, &drcbe_x86::op_hash }, // HASH mode,pc - { uml::OP_LABEL, &drcbe_x86::op_label }, // LABEL imm - { uml::OP_COMMENT, &drcbe_x86::op_comment }, // COMMENT string - { uml::OP_MAPVAR, &drcbe_x86::op_mapvar }, // MAPVAR mapvar,value + { uml::OP_HANDLE, &drcbe_x86::op_handle }, // HANDLE handle + { uml::OP_HASH, &drcbe_x86::op_hash }, // HASH mode,pc + { uml::OP_LABEL, &drcbe_x86::op_label }, // LABEL imm + { uml::OP_COMMENT, &drcbe_x86::op_comment }, // COMMENT string + { uml::OP_MAPVAR, &drcbe_x86::op_mapvar }, // MAPVAR mapvar,value // Control Flow Operations - { uml::OP_NOP, &drcbe_x86::op_nop }, // NOP - { uml::OP_DEBUG, &drcbe_x86::op_debug }, // DEBUG pc - { uml::OP_EXIT, &drcbe_x86::op_exit }, // EXIT src1[,c] - { uml::OP_HASHJMP, &drcbe_x86::op_hashjmp }, // HASHJMP mode,pc,handle - { uml::OP_JMP, &drcbe_x86::op_jmp }, // JMP imm[,c] - { uml::OP_EXH, &drcbe_x86::op_exh }, // EXH handle,param[,c] - { uml::OP_CALLH, &drcbe_x86::op_callh }, // CALLH handle[,c] - { uml::OP_RET, &drcbe_x86::op_ret }, // RET [c] - { uml::OP_CALLC, &drcbe_x86::op_callc }, // CALLC func,ptr[,c] - { uml::OP_RECOVER, &drcbe_x86::op_recover }, // RECOVER dst,mapvar + { uml::OP_NOP, &drcbe_x86::op_nop }, // NOP + { uml::OP_DEBUG, &drcbe_x86::op_debug }, // DEBUG pc + { uml::OP_EXIT, &drcbe_x86::op_exit }, // EXIT src1[,c] + { uml::OP_HASHJMP, &drcbe_x86::op_hashjmp }, // HASHJMP mode,pc,handle + { uml::OP_JMP, &drcbe_x86::op_jmp }, // JMP imm[,c] + { uml::OP_EXH, &drcbe_x86::op_exh }, // EXH handle,param[,c] + { uml::OP_CALLH, &drcbe_x86::op_callh }, // CALLH handle[,c] + { uml::OP_RET, &drcbe_x86::op_ret }, // RET [c] + { uml::OP_CALLC, &drcbe_x86::op_callc }, // CALLC func,ptr[,c] + { uml::OP_RECOVER, &drcbe_x86::op_recover }, // RECOVER dst,mapvar // Internal Register Operations - { uml::OP_SETFMOD, &drcbe_x86::op_setfmod }, // SETFMOD src - { uml::OP_GETFMOD, &drcbe_x86::op_getfmod }, // GETFMOD dst - { uml::OP_GETEXP, &drcbe_x86::op_getexp }, // GETEXP dst - { uml::OP_GETFLGS, &drcbe_x86::op_getflgs }, // GETFLGS dst[,f] - { uml::OP_SAVE, &drcbe_x86::op_save }, // SAVE dst - { uml::OP_RESTORE, &drcbe_x86::op_restore }, // RESTORE dst + { uml::OP_SETFMOD, &drcbe_x86::op_setfmod }, // SETFMOD src + { uml::OP_GETFMOD, &drcbe_x86::op_getfmod }, // GETFMOD dst + { uml::OP_GETEXP, &drcbe_x86::op_getexp }, // GETEXP dst + { uml::OP_GETFLGS, &drcbe_x86::op_getflgs }, // GETFLGS dst[,f] + { uml::OP_SAVE, &drcbe_x86::op_save }, // SAVE dst + { uml::OP_RESTORE, &drcbe_x86::op_restore }, // RESTORE dst // Integer Operations - { uml::OP_LOAD, &drcbe_x86::op_load }, // LOAD dst,base,index,size - { uml::OP_LOADS, &drcbe_x86::op_loads }, // LOADS dst,base,index,size - { uml::OP_STORE, &drcbe_x86::op_store }, // STORE base,index,src,size - { uml::OP_READ, &drcbe_x86::op_read }, // READ dst,src1,spacesize + { uml::OP_LOAD, &drcbe_x86::op_load }, // LOAD dst,base,index,size + { uml::OP_LOADS, &drcbe_x86::op_loads }, // LOADS dst,base,index,size + { uml::OP_STORE, &drcbe_x86::op_store }, // STORE base,index,src,size + { uml::OP_READ, &drcbe_x86::op_read }, // READ dst,src1,spacesize { uml::OP_READM, &drcbe_x86::op_readm }, // READM dst,src1,mask,spacesize - { uml::OP_WRITE, &drcbe_x86::op_write }, // WRITE dst,src1,spacesize - { uml::OP_WRITEM, &drcbe_x86::op_writem }, // WRITEM dst,src1,spacesize - { uml::OP_CARRY, &drcbe_x86::op_carry }, // CARRY src,bitnum - { uml::OP_SET, &drcbe_x86::op_set }, // SET dst,c - { uml::OP_MOV, &drcbe_x86::op_mov }, // MOV dst,src[,c] - { uml::OP_SEXT, &drcbe_x86::op_sext }, // SEXT dst,src - { uml::OP_ROLAND, &drcbe_x86::op_roland }, // ROLAND dst,src1,src2,src3 - { uml::OP_ROLINS, &drcbe_x86::op_rolins }, // ROLINS dst,src1,src2,src3 - { uml::OP_ADD, &drcbe_x86::op_add }, // ADD dst,src1,src2[,f] - { uml::OP_ADDC, &drcbe_x86::op_addc }, // ADDC dst,src1,src2[,f] - { uml::OP_SUB, &drcbe_x86::op_sub }, // SUB dst,src1,src2[,f] - { uml::OP_SUBB, &drcbe_x86::op_subc }, // SUBB dst,src1,src2[,f] - { uml::OP_CMP, &drcbe_x86::op_cmp }, // CMP src1,src2[,f] + { uml::OP_WRITE, &drcbe_x86::op_write }, // WRITE dst,src1,spacesize + { uml::OP_WRITEM, &drcbe_x86::op_writem }, // WRITEM dst,src1,spacesize + { uml::OP_CARRY, &drcbe_x86::op_carry }, // CARRY src,bitnum + { uml::OP_SET, &drcbe_x86::op_set }, // SET dst,c + { uml::OP_MOV, &drcbe_x86::op_mov }, // MOV dst,src[,c] + { uml::OP_SEXT, &drcbe_x86::op_sext }, // SEXT dst,src + { uml::OP_ROLAND, &drcbe_x86::op_roland }, // ROLAND dst,src1,src2,src3 + { uml::OP_ROLINS, &drcbe_x86::op_rolins }, // ROLINS dst,src1,src2,src3 + { uml::OP_ADD, &drcbe_x86::op_add }, // ADD dst,src1,src2[,f] + { uml::OP_ADDC, &drcbe_x86::op_addc }, // ADDC dst,src1,src2[,f] + { uml::OP_SUB, &drcbe_x86::op_sub }, // SUB dst,src1,src2[,f] + { uml::OP_SUBB, &drcbe_x86::op_subc }, // SUBB dst,src1,src2[,f] + { uml::OP_CMP, &drcbe_x86::op_cmp }, // CMP src1,src2[,f] { uml::OP_MULU, &drcbe_x86::op_mulu }, // MULU dst,edst,src1,src2[,f] { uml::OP_MULS, &drcbe_x86::op_muls }, // MULS dst,edst,src1,src2[,f] { uml::OP_DIVU, &drcbe_x86::op_divu }, // DIVU dst,edst,src1,src2[,f] { uml::OP_DIVS, &drcbe_x86::op_divs }, // DIVS dst,edst,src1,src2[,f] - { uml::OP_AND, &drcbe_x86::op_and }, // AND dst,src1,src2[,f] - { uml::OP_TEST, &drcbe_x86::op_test }, // TEST src1,src2[,f] - { uml::OP_OR, &drcbe_x86::op_or }, // OR dst,src1,src2[,f] - { uml::OP_XOR, &drcbe_x86::op_xor }, // XOR dst,src1,src2[,f] - { uml::OP_LZCNT, &drcbe_x86::op_lzcnt }, // LZCNT dst,src[,f] - { uml::OP_BSWAP, &drcbe_x86::op_bswap }, // BSWAP dst,src - { uml::OP_SHL, &drcbe_x86::op_shl }, // SHL dst,src,count[,f] - { uml::OP_SHR, &drcbe_x86::op_shr }, // SHR dst,src,count[,f] - { uml::OP_SAR, &drcbe_x86::op_sar }, // SAR dst,src,count[,f] - { uml::OP_ROL, &drcbe_x86::op_rol }, // ROL dst,src,count[,f] - { uml::OP_ROLC, &drcbe_x86::op_rolc }, // ROLC dst,src,count[,f] - { uml::OP_ROR, &drcbe_x86::op_ror }, // ROR dst,src,count[,f] - { uml::OP_RORC, &drcbe_x86::op_rorc }, // RORC dst,src,count[,f] + { uml::OP_AND, &drcbe_x86::op_and }, // AND dst,src1,src2[,f] + { uml::OP_TEST, &drcbe_x86::op_test }, // TEST src1,src2[,f] + { uml::OP_OR, &drcbe_x86::op_or }, // OR dst,src1,src2[,f] + { uml::OP_XOR, &drcbe_x86::op_xor }, // XOR dst,src1,src2[,f] + { uml::OP_LZCNT, &drcbe_x86::op_lzcnt }, // LZCNT dst,src[,f] + { uml::OP_BSWAP, &drcbe_x86::op_bswap }, // BSWAP dst,src + { uml::OP_SHL, &drcbe_x86::op_shl }, // SHL dst,src,count[,f] + { uml::OP_SHR, &drcbe_x86::op_shr }, // SHR dst,src,count[,f] + { uml::OP_SAR, &drcbe_x86::op_sar }, // SAR dst,src,count[,f] + { uml::OP_ROL, &drcbe_x86::op_rol }, // ROL dst,src,count[,f] + { uml::OP_ROLC, &drcbe_x86::op_rolc }, // ROLC dst,src,count[,f] + { uml::OP_ROR, &drcbe_x86::op_ror }, // ROR dst,src,count[,f] + { uml::OP_RORC, &drcbe_x86::op_rorc }, // RORC dst,src,count[,f] // Floating Point Operations - { uml::OP_FLOAD, &drcbe_x86::op_fload }, // FLOAD dst,base,index - { uml::OP_FSTORE, &drcbe_x86::op_fstore }, // FSTORE base,index,src - { uml::OP_FREAD, &drcbe_x86::op_fread }, // FREAD dst,space,src1 - { uml::OP_FWRITE, &drcbe_x86::op_fwrite }, // FWRITE space,dst,src1 - { uml::OP_FMOV, &drcbe_x86::op_fmov }, // FMOV dst,src1[,c] - { uml::OP_FTOINT, &drcbe_x86::op_ftoint }, // FTOINT dst,src1,size,round - { uml::OP_FFRINT, &drcbe_x86::op_ffrint }, // FFRINT dst,src1,size - { uml::OP_FFRFLT, &drcbe_x86::op_ffrflt }, // FFRFLT dst,src1,size - { uml::OP_FRNDS, &drcbe_x86::op_frnds }, // FRNDS dst,src1 - { uml::OP_FADD, &drcbe_x86::op_fadd }, // FADD dst,src1,src2 - { uml::OP_FSUB, &drcbe_x86::op_fsub }, // FSUB dst,src1,src2 - { uml::OP_FCMP, &drcbe_x86::op_fcmp }, // FCMP src1,src2 - { uml::OP_FMUL, &drcbe_x86::op_fmul }, // FMUL dst,src1,src2 - { uml::OP_FDIV, &drcbe_x86::op_fdiv }, // FDIV dst,src1,src2 - { uml::OP_FNEG, &drcbe_x86::op_fneg }, // FNEG dst,src1 - { uml::OP_FABS, &drcbe_x86::op_fabs }, // FABS dst,src1 - { uml::OP_FSQRT, &drcbe_x86::op_fsqrt }, // FSQRT dst,src1 - { uml::OP_FRECIP, &drcbe_x86::op_frecip }, // FRECIP dst,src1 - { uml::OP_FRSQRT, &drcbe_x86::op_frsqrt } // FRSQRT dst,src1 + { uml::OP_FLOAD, &drcbe_x86::op_fload }, // FLOAD dst,base,index + { uml::OP_FSTORE, &drcbe_x86::op_fstore }, // FSTORE base,index,src + { uml::OP_FREAD, &drcbe_x86::op_fread }, // FREAD dst,space,src1 + { uml::OP_FWRITE, &drcbe_x86::op_fwrite }, // FWRITE space,dst,src1 + { uml::OP_FMOV, &drcbe_x86::op_fmov }, // FMOV dst,src1[,c] + { uml::OP_FTOINT, &drcbe_x86::op_ftoint }, // FTOINT dst,src1,size,round + { uml::OP_FFRINT, &drcbe_x86::op_ffrint }, // FFRINT dst,src1,size + { uml::OP_FFRFLT, &drcbe_x86::op_ffrflt }, // FFRFLT dst,src1,size + { uml::OP_FRNDS, &drcbe_x86::op_frnds }, // FRNDS dst,src1 + { uml::OP_FADD, &drcbe_x86::op_fadd }, // FADD dst,src1,src2 + { uml::OP_FSUB, &drcbe_x86::op_fsub }, // FSUB dst,src1,src2 + { uml::OP_FCMP, &drcbe_x86::op_fcmp }, // FCMP src1,src2 + { uml::OP_FMUL, &drcbe_x86::op_fmul }, // FMUL dst,src1,src2 + { uml::OP_FDIV, &drcbe_x86::op_fdiv }, // FDIV dst,src1,src2 + { uml::OP_FNEG, &drcbe_x86::op_fneg }, // FNEG dst,src1 + { uml::OP_FABS, &drcbe_x86::op_fabs }, // FABS dst,src1 + { uml::OP_FSQRT, &drcbe_x86::op_fsqrt }, // FSQRT dst,src1 + { uml::OP_FRECIP, &drcbe_x86::op_frecip }, // FRECIP dst,src1 + { uml::OP_FRSQRT, &drcbe_x86::op_frsqrt } // FRSQRT dst,src1 }; @@ -357,8 +357,8 @@ drcbe_x86::be_parameter::be_parameter(drcbe_x86 &drcbe, const parameter ¶m, //------------------------------------------------- -// select_register - select a register to use, -// avoiding conflicts with the optional +// select_register - select a register to use, +// avoiding conflicts with the optional // checkparam //------------------------------------------------- @@ -385,8 +385,8 @@ inline int drcbe_x86::be_parameter::select_register(int defreg, const be_paramet //------------------------------------------------- -// select_register - select a register to use, -// avoiding conflicts with the optional +// select_register - select a register to use, +// avoiding conflicts with the optional // checkparam //------------------------------------------------- @@ -4210,7 +4210,7 @@ void drcbe_x86::op_set(x86code *&dst, const instruction &inst) void drcbe_x86::op_mov(x86code *&dst, const instruction &inst) { x86code *savedst = dst; - + // validate instruction assert(inst.size() == 4 || inst.size() == 8); assert_any_condition(inst); diff --git a/src/emu/cpu/drcbex86.h b/src/emu/cpu/drcbex86.h index 96617cfe164..bbe47b4b775 100644 --- a/src/emu/cpu/drcbex86.h +++ b/src/emu/cpu/drcbex86.h @@ -63,7 +63,7 @@ public: // construction/destruction drcbe_x86(drcuml_state &drcuml, device_t &device, drc_cache &cache, UINT32 flags, int modes, int addrbits, int ignorebits); virtual ~drcbe_x86(); - + // required overrides virtual void reset(); virtual int execute(uml::code_handle &entry); @@ -96,7 +96,7 @@ private: be_parameter(const be_parameter ¶m) : m_type(param.m_type), m_value(param.m_value) { } be_parameter(UINT64 val) : m_type(PTYPE_IMMEDIATE), m_value(val) { } be_parameter(drcbe_x86 &drcbe, const uml::parameter ¶m, UINT32 allowed); - + // creators for types that don't safely default static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); } static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); } @@ -107,7 +107,7 @@ private: // operators bool operator==(const be_parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); } bool operator!=(const be_parameter &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); } - + // getters be_parameter_type type() const { return m_type; } UINT64 immediate() const { assert(m_type == PTYPE_IMMEDIATE); return m_value; } @@ -115,14 +115,14 @@ private: int freg() const { assert(m_type == PTYPE_FLOAT_REGISTER); assert(m_value >= 0 && m_value < x86emit::REG_MAX); return m_value; } int vreg() const { assert(m_type == PTYPE_VECTOR_REGISTER); assert(m_value >= 0 && m_value < x86emit::REG_MAX); return m_value; } void *memory(UINT32 offset = 0) const { assert(m_type == PTYPE_MEMORY); return reinterpret_cast(m_value + offset); } - + // type queries bool is_immediate() const { return (m_type == PTYPE_IMMEDIATE); } bool is_int_register() const { return (m_type == PTYPE_INT_REGISTER); } bool is_float_register() const { return (m_type == PTYPE_FLOAT_REGISTER); } bool is_vector_register() const { return (m_type == PTYPE_VECTOR_REGISTER); } bool is_memory() const { return (m_type == PTYPE_MEMORY); } - + // other queries bool is_immediate_value(UINT64 value) const { return (m_type == PTYPE_IMMEDIATE && m_value == value); } @@ -130,7 +130,7 @@ private: int select_register(int defreg) const; int select_register(int defreg, const be_parameter &checkparam) const; int select_register(int defreg, const be_parameter &checkparam, const be_parameter &checkparam2) const; - + private: // private constructor be_parameter(be_parameter_type type, be_parameter_value value) : m_type(type), m_value(value) { } @@ -317,7 +317,7 @@ private: // floating-point code emission helpers void emit_fld_p(x86code *&dst, int size, const be_parameter ¶m); void emit_fstp_p(x86code *&dst, int size, const be_parameter ¶m); - + // callback helpers static int dmulu(UINT64 &dstlo, UINT64 &dsthi, UINT64 src1, UINT64 src2, int flags); static int dmuls(UINT64 &dstlo, UINT64 &dsthi, INT64 src1, INT64 src2, int flags); diff --git a/src/emu/cpu/drccache.c b/src/emu/cpu/drccache.c index 533d403adbc..b5564458ae5 100644 --- a/src/emu/cpu/drccache.c +++ b/src/emu/cpu/drccache.c @@ -101,7 +101,7 @@ void drc_cache::flush() //------------------------------------------------- -// alloc - allocate permanent memory from the +// alloc - allocate permanent memory from the // cache //------------------------------------------------- @@ -186,7 +186,7 @@ void *drc_cache::alloc_temporary(size_t bytes) //------------------------------------------------- -// free - release permanent memory allocated from +// free - release permanent memory allocated from // the cache //------------------------------------------------- @@ -259,7 +259,7 @@ drccodeptr drc_cache::end_codegen() //------------------------------------------------- -// request_oob_codegen - request callback for +// request_oob_codegen - request callback for // out-of-band codegen //------------------------------------------------- diff --git a/src/emu/cpu/drccache.h b/src/emu/cpu/drccache.h index efafef09ed6..b633eec3e4d 100644 --- a/src/emu/cpu/drccache.h +++ b/src/emu/cpu/drccache.h @@ -81,12 +81,12 @@ public: // construction/destruction drc_cache(size_t bytes); ~drc_cache(); - + // getters drccodeptr near() const { return m_near; } drccodeptr base() const { return m_base; } drccodeptr top() const { return m_top; } - + // pointer checking bool contains_pointer(const void *ptr) const { return ((const drccodeptr)ptr >= m_near && (const drccodeptr)ptr < m_near + m_size); } bool contains_near_pointer(const void *ptr) const { return ((const drccodeptr)ptr >= m_near && (const drccodeptr)ptr < m_neartop); } @@ -129,7 +129,7 @@ private: struct oob_handler { oob_handler *next() const { return m_next; } - + oob_handler * m_next; // next handler oob_func m_callback; // callback function void * m_param1; // 1st pointer parameter diff --git a/src/emu/cpu/drcfe.c b/src/emu/cpu/drcfe.c index f39bfaf0bb1..ae6cbdb5ecc 100644 --- a/src/emu/cpu/drcfe.c +++ b/src/emu/cpu/drcfe.c @@ -106,8 +106,8 @@ drc_frontend::~drc_frontend() //------------------------------------------------- -// describe_code - describe a sequence of code -// that falls within the configured window +// describe_code - describe a sequence of code +// that falls within the configured window // relative to the specified startpc //------------------------------------------------- @@ -395,7 +395,7 @@ void drc_frontend::release_descriptions() // release all delay slots first for (opcode_desc *curdesc = m_desc_live_list.first(); curdesc != NULL; curdesc = curdesc->next()) m_desc_allocator.reclaim_all(curdesc->delay); - + // reclaim all the descriptors m_desc_allocator.reclaim_all(m_desc_live_list); } diff --git a/src/emu/cpu/drcfe.h b/src/emu/cpu/drcfe.h index 7849aed73c9..68b94ffd481 100644 --- a/src/emu/cpu/drcfe.h +++ b/src/emu/cpu/drcfe.h @@ -158,11 +158,11 @@ public: // construction/destruction drc_frontend(device_t &cpu, UINT32 window_start, UINT32 window_end, UINT32 max_sequence); virtual ~drc_frontend(); - + // describe a block const opcode_desc *describe_code(offs_t startpc); -protected: +protected: // required overrides virtual bool describe(opcode_desc &desc, const opcode_desc *prev) = 0; diff --git a/src/emu/cpu/drcuml.c b/src/emu/cpu/drcuml.c index 245a3bfb11d..b682b0255e3 100644 --- a/src/emu/cpu/drcuml.c +++ b/src/emu/cpu/drcuml.c @@ -127,7 +127,7 @@ drcbe_interface::drcbe_interface(drcuml_state &drcuml, drc_cache &cache, device_ m_space[spacenum]->accessors(m_accessors[spacenum]); } } - + //------------------------------------------------- // ~drcbe_interface - destructor @@ -150,9 +150,9 @@ drcbe_interface::~drcbe_interface() drcuml_state::drcuml_state(device_t &device, drc_cache &cache, UINT32 flags, int modes, int addrbits, int ignorebits) : m_device(device), m_cache(cache), - m_beintf((flags & DRCUML_OPTION_USE_C) ? - *static_cast(auto_alloc(device.machine, drcbe_c(*this, device, cache, flags, modes, addrbits, ignorebits))) : - *static_cast(auto_alloc(device.machine, drcbe_native(*this, device, cache, flags, modes, addrbits, ignorebits)))), + m_beintf((flags & DRCUML_OPTION_USE_C) ? + *static_cast(auto_alloc(device.machine, drcbe_c(*this, device, cache, flags, modes, addrbits, ignorebits))) : + *static_cast(auto_alloc(device.machine, drcbe_native(*this, device, cache, flags, modes, addrbits, ignorebits)))), m_umllog(NULL), m_blocklist(device.machine->m_respool), m_symlist(device.machine->m_respool) @@ -179,7 +179,7 @@ drcuml_state::~drcuml_state() //------------------------------------------------- -// reset - reset the state completely, flushing +// reset - reset the state completely, flushing // the cache and all information //------------------------------------------------- @@ -199,15 +199,15 @@ void drcuml_state::reset() m_beintf.reset(); // do a one-time validation if requested -/* if (VALIDATE_BACKEND) - { - static bool validated = false; - if (!validated) - { - validated = true; - validate_backend(this); - } - }*/ +/* if (VALIDATE_BACKEND) + { + static bool validated = false; + if (!validated) + { + validated = true; + validate_backend(this); + } + }*/ } catch (drcuml_block::abort_compilation &) { @@ -232,7 +232,7 @@ drcuml_block *drcuml_state::begin_block(UINT32 maxinst) if (bestblock == NULL) bestblock = &m_blocklist.append(*auto_alloc(m_device.machine, drcuml_block(*this, maxinst * 3/2))); - // start the block + // start the block bestblock->begin(); return bestblock; } @@ -250,7 +250,7 @@ code_handle *drcuml_state::handle_alloc(const char *name) //------------------------------------------------- -// symbol_add - add a symbol to the internal +// symbol_add - add a symbol to the internal // symbol table //------------------------------------------------- @@ -261,7 +261,7 @@ void drcuml_state::symbol_add(void *base, UINT32 length, const char *name) //------------------------------------------------- -// symbol_find - look up a symbol from the +// symbol_find - look up a symbol from the // internal symbol table or return NULL if not // found //------------------------------------------------- @@ -290,7 +290,7 @@ const char *drcuml_state::symbol_find(void *base, UINT32 *offset) //------------------------------------------------- -// log_printf - directly printf to the UML log +// log_printf - directly printf to the UML log // if generated //------------------------------------------------- @@ -353,7 +353,7 @@ void drcuml_block::begin() //------------------------------------------------- -// end - complete a code block and commit it to +// end - complete a code block and commit it to // the cache via the back-end //------------------------------------------------- @@ -402,13 +402,13 @@ uml::instruction &drcuml_block::append() instruction &curinst = m_inst[m_nextinst++]; if (m_nextinst > m_maxinst) fatalerror("Overran maxinst in drcuml_block_append"); - + return curinst; } //------------------------------------------------- -// comment - attach a comment to the current +// comment - attach a comment to the current // output location in the specified block //------------------------------------------------- @@ -433,7 +433,7 @@ void drcuml_block::append_comment(const char *format, ...) //------------------------------------------------- -// optimize - apply various optimizations to a +// optimize - apply various optimizations to a // block of code //------------------------------------------------- @@ -480,7 +480,7 @@ void drcuml_block::optimize() //------------------------------------------------- -// disassemble - disassemble a block of +// disassemble - disassemble a block of // instructions to the log //------------------------------------------------- @@ -488,7 +488,7 @@ void drcuml_block::disassemble() { astring comment; astring dasm; - + // iterate over instructions and output int firstcomment = -1; for (int instnum = 0; instnum < m_nextinst; instnum++) diff --git a/src/emu/cpu/drcuml.h b/src/emu/cpu/drcuml.h index 1abbdf10676..b4c152fb6db 100644 --- a/src/emu/cpu/drcuml.h +++ b/src/emu/cpu/drcuml.h @@ -132,7 +132,7 @@ public: bool inuse() const { return m_inuse; } UINT32 maxinst() const { return m_maxinst; } - // code generation + // code generation void begin(); void end(); void abort(); @@ -171,7 +171,7 @@ public: // construction/destruction drcbe_interface(drcuml_state &drcuml, drc_cache &cache, device_t &device); virtual ~drcbe_interface(); - + // required overrides virtual void reset() = 0; virtual int execute(uml::code_handle &entry) = 0; @@ -197,7 +197,7 @@ public: // construction/destruction drcuml_state(device_t &device, drc_cache &cache, UINT32 flags, int modes, int addrbits, int ignorebits); ~drcuml_state(); - + // getters device_t &device() const { return m_device; } drc_cache &cache() const { return m_cache; } @@ -206,7 +206,7 @@ public: void reset(); int execute(uml::code_handle &entry) { return m_beintf.execute(entry); } - // code generation + // code generation drcuml_block *begin_block(UINT32 maxinst); // back-end interface @@ -216,7 +216,7 @@ public: // handle management uml::code_handle *handle_alloc(const char *name); - + // symbol management void symbol_add(void *base, UINT32 length, const char *name); const char *symbol_find(void *base, UINT32 *offset = NULL); @@ -232,7 +232,7 @@ private: { friend class drcuml_state; template friend class simple_list; - + // construction/destruction symbol(void *base, UINT32 length, const char *name) : m_next(NULL), @@ -257,7 +257,7 @@ private: drc_cache & m_cache; // pointer to the codegen cache drcbe_interface & m_beintf; // backend interface pointer FILE * m_umllog; // handle to the UML logfile - simple_list m_blocklist; // list of active blocks + simple_list m_blocklist; // list of active blocks simple_list m_handlelist; // list of active handles simple_list m_symlist; // list of symbols }; diff --git a/src/emu/cpu/i386/i386.h b/src/emu/cpu/i386/i386.h index f8937c9823f..31a21250e9b 100644 --- a/src/emu/cpu/i386/i386.h +++ b/src/emu/cpu/i386/i386.h @@ -1,19 +1,19 @@ -#pragma once - -#ifndef __I386INTF_H__ -#define __I386INTF_H__ - -#define INPUT_LINE_A20 1 - - -// mingw has this defined for 32-bit compiles -#undef i386 - -DECLARE_LEGACY_CPU_DEVICE(I386, i386); -DECLARE_LEGACY_CPU_DEVICE(I486, i486); -DECLARE_LEGACY_CPU_DEVICE(PENTIUM, pentium); -DECLARE_LEGACY_CPU_DEVICE(MEDIAGX, mediagx); - - - -#endif /* __I386INTF_H__ */ +#pragma once + +#ifndef __I386INTF_H__ +#define __I386INTF_H__ + +#define INPUT_LINE_A20 1 + + +// mingw has this defined for 32-bit compiles +#undef i386 + +DECLARE_LEGACY_CPU_DEVICE(I386, i386); +DECLARE_LEGACY_CPU_DEVICE(I486, i486); +DECLARE_LEGACY_CPU_DEVICE(PENTIUM, pentium); +DECLARE_LEGACY_CPU_DEVICE(MEDIAGX, mediagx); + + + +#endif /* __I386INTF_H__ */ diff --git a/src/emu/cpu/i86/i86.h b/src/emu/cpu/i86/i86.h index dc5cbf5941b..e8d1fd03738 100644 --- a/src/emu/cpu/i86/i86.h +++ b/src/emu/cpu/i86/i86.h @@ -1,65 +1,65 @@ -/* ASG 971222 -- rewrote this interface */ -#pragma once - -#ifndef __I86INTF_H__ -#define __I86INTF_H__ - - -#define INPUT_LINE_INT0 INPUT_LINE_IRQ0 -#define INPUT_LINE_INT1 INPUT_LINE_IRQ1 -#define INPUT_LINE_INT2 INPUT_LINE_IRQ2 -#define INPUT_LINE_INT3 INPUT_LINE_IRQ3 -#define INPUT_LINE_TEST 20 /* PJB 03/05 */ -#define INPUT_LINE_DRQ0 21 -#define INPUT_LINE_DRQ1 22 -#define INPUT_LINE_TMRIN0 23 -#define INPUT_LINE_TMRIN1 24 - - -typedef struct _i80186_interface i80186_interface; -struct _i80186_interface -{ - devcb_write_line out_tmrout0_func; - devcb_write_line out_tmrout1_func; -}; -#define I80186_INTERFACE(name) const i80186_interface (name) = - - -enum -{ - I8086_IP, - I8086_AX, - I8086_CX, - I8086_DX, - I8086_BX, - I8086_SP, - I8086_BP, - I8086_SI, - I8086_DI, - I8086_AL, - I8086_CL, - I8086_DL, - I8086_BL, - I8086_AH, - I8086_CH, - I8086_DH, - I8086_BH, - I8086_FLAGS, - I8086_ES, - I8086_CS, - I8086_SS, - I8086_DS, - I8086_VECTOR, - - I8086_GENPC = STATE_GENPC, - I8086_GENSP = STATE_GENSP, - I8086_GENPCBASE = STATE_GENPCBASE -}; - -/* Public functions */ -DECLARE_LEGACY_CPU_DEVICE(I8086, i8086); -DECLARE_LEGACY_CPU_DEVICE(I8088, i8088); -DECLARE_LEGACY_CPU_DEVICE(I80186, i80186); -DECLARE_LEGACY_CPU_DEVICE(I80188, i80188); - -#endif /* __I86INTF_H__ */ +/* ASG 971222 -- rewrote this interface */ +#pragma once + +#ifndef __I86INTF_H__ +#define __I86INTF_H__ + + +#define INPUT_LINE_INT0 INPUT_LINE_IRQ0 +#define INPUT_LINE_INT1 INPUT_LINE_IRQ1 +#define INPUT_LINE_INT2 INPUT_LINE_IRQ2 +#define INPUT_LINE_INT3 INPUT_LINE_IRQ3 +#define INPUT_LINE_TEST 20 /* PJB 03/05 */ +#define INPUT_LINE_DRQ0 21 +#define INPUT_LINE_DRQ1 22 +#define INPUT_LINE_TMRIN0 23 +#define INPUT_LINE_TMRIN1 24 + + +typedef struct _i80186_interface i80186_interface; +struct _i80186_interface +{ + devcb_write_line out_tmrout0_func; + devcb_write_line out_tmrout1_func; +}; +#define I80186_INTERFACE(name) const i80186_interface (name) = + + +enum +{ + I8086_IP, + I8086_AX, + I8086_CX, + I8086_DX, + I8086_BX, + I8086_SP, + I8086_BP, + I8086_SI, + I8086_DI, + I8086_AL, + I8086_CL, + I8086_DL, + I8086_BL, + I8086_AH, + I8086_CH, + I8086_DH, + I8086_BH, + I8086_FLAGS, + I8086_ES, + I8086_CS, + I8086_SS, + I8086_DS, + I8086_VECTOR, + + I8086_GENPC = STATE_GENPC, + I8086_GENSP = STATE_GENSP, + I8086_GENPCBASE = STATE_GENPCBASE +}; + +/* Public functions */ +DECLARE_LEGACY_CPU_DEVICE(I8086, i8086); +DECLARE_LEGACY_CPU_DEVICE(I8088, i8088); +DECLARE_LEGACY_CPU_DEVICE(I80186, i80186); +DECLARE_LEGACY_CPU_DEVICE(I80188, i80188); + +#endif /* __I86INTF_H__ */ diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c index ee0c5c0a50c..bbf6d2e44eb 100644 --- a/src/emu/cpu/i86/instr86.c +++ b/src/emu/cpu/i86/instr86.c @@ -10,19 +10,19 @@ * timing value should move to separate array */ -/* - PHS - 2010-12-29 - - Moved several instruction stubs so that they are compiled separately for - the 8086 and 80186. The instructions affected are : - - _pop_ss, _es, _cs, _ss, _ds, _mov_sregw and _sti - - This is because they call the next instruction directly as it cannot be - interrupted. If they are not compiled separately when executing on an - 80186, the wrong set of instructions are used (the 8086 set). This has - the serious effect of ignoring the next instruction, as invalid, *IF* - it is an 80186 specific instruction. +/* + PHS - 2010-12-29 + + Moved several instruction stubs so that they are compiled separately for + the 8086 and 80186. The instructions affected are : + + _pop_ss, _es, _cs, _ss, _ds, _mov_sregw and _sti + + This is because they call the next instruction directly as it cannot be + interrupted. If they are not compiled separately when executing on an + 80186, the wrong set of instructions are used (the 8086 set). This has + the serious effect of ignoring the next instruction, as invalid, *IF* + it is an 80186 specific instruction. */ diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index 2e1f1a20805..a579fb1a9f9 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -53,29 +53,29 @@ TODO: /* - Chip RAM NVRAM ROM SCI r15-f ports + Chip RAM NVRAM ROM SCI r15-f ports ----------------------------------------------------------------- - MC6800 - - - no no 4 - MC6802 128 32 - no no 4 - MC6802NS 128 - - no no 4 - MC6808 - - - no no 4 - - MC6801 128 64 2K yes no 4 - MC68701 128 64 - yes no 4 - MC6803 128 64 - yes no 4 - - MC6801U4 192 32 4K yes yes 4 - MC6803U4 192 32 - yes yes 4 - - HD6801 128 64 2K yes no 4 - HD6301V 128 - 4K yes no 4 - HD63701V 192 - 4K yes no 4 - HD6303R 128 - - yes no 4 - - HD6301X 192 - 4K yes yes 6 - HD6301Y 256 - 16K yes yes 6 - HD6303X 192 - - yes yes 6 - HD6303Y 256 - - yes yes 6 + MC6800 - - - no no 4 + MC6802 128 32 - no no 4 + MC6802NS 128 - - no no 4 + MC6808 - - - no no 4 + + MC6801 128 64 2K yes no 4 + MC68701 128 64 - yes no 4 + MC6803 128 64 - yes no 4 + + MC6801U4 192 32 4K yes yes 4 + MC6803U4 192 32 - yes yes 4 + + HD6801 128 64 2K yes no 4 + HD6301V 128 - 4K yes no 4 + HD63701V 192 - 4K yes no 4 + HD6303R 128 - - yes no 4 + + HD6301X 192 - 4K yes yes 6 + HD6301Y 256 - 16K yes yes 6 + HD6303X 192 - - yes yes 6 + HD6303Y 256 - - yes yes 6 NSC8105 MS2010-A @@ -827,7 +827,7 @@ static void serial_transmit(m6800_state *cpustate) cpustate->tx = 0; cpustate->txbits++; - + //logerror("M6800 '%s' Transmit START Data %02x\n", cpustate->device->tag(), cpustate->tsr); } break; @@ -866,7 +866,7 @@ static void serial_transmit(m6800_state *cpustate) static void serial_receive(m6800_state *cpustate) { //logerror("M6800 '%s' Rx Tick TRCSR %02x bits %u check %02x\n", cpustate->device->tag(), cpustate->trcsr, cpustate->rxbits, cpustate->trcsr & M6800_TRCSR_RE); - + if (cpustate->trcsr & M6800_TRCSR_RE) { if (cpustate->trcsr & M6800_TRCSR_WU) @@ -903,7 +903,7 @@ static void serial_receive(m6800_state *cpustate) { // start bit found cpustate->rxbits++; - + //logerror("M6800 '%s' Received START bit\n", cpustate->device->tag()); } break; @@ -928,7 +928,7 @@ static void serial_receive(m6800_state *cpustate) { // transfer data into receive register cpustate->rdr = cpustate->rsr; - + //logerror("M6800 '%s' Receive Data Register: %02x\n", cpustate->device->tag(), cpustate->rdr); // set RDRF flag @@ -1387,7 +1387,7 @@ static READ8_HANDLER( m6801_io_r ) data = (cpustate->io->read_byte(M6803_PORT1) & (cpustate->port1_ddr ^ 0xff)) | (cpustate->port1_data & cpustate->port1_ddr); break; - + case IO_P2DATA: if(cpustate->port2_ddr == 0xff) data = cpustate->port2_data; @@ -1395,7 +1395,7 @@ static READ8_HANDLER( m6801_io_r ) data = (cpustate->io->read_byte(M6803_PORT2) & (cpustate->port2_ddr ^ 0xff)) | (cpustate->port2_data & cpustate->port2_ddr); break; - + case IO_P3DDR: logerror("M6801 '%s' Port 3 DDR is a write-only register\n", space->cpu->tag()); break; @@ -1505,12 +1505,12 @@ static READ8_HANDLER( m6801_io_r ) { cpustate->trcsr_read_tdre = 1; } - + if (cpustate->trcsr & M6800_TRCSR_ORFE) { cpustate->trcsr_read_orfe = 1; } - + if (cpustate->trcsr & M6800_TRCSR_RDRF) { cpustate->trcsr_read_rdrf = 1; @@ -1750,7 +1750,7 @@ static WRITE8_HANDLER( m6801_io_w ) cpustate->txbits = 0; cpustate->tx = 1; } - + if ((data & M6800_TRCSR_RE) && !(cpustate->trcsr & M6800_TRCSR_RE)) { cpustate->rxbits = 0; diff --git a/src/emu/cpu/mips/mips3fe.c b/src/emu/cpu/mips/mips3fe.c index dbc5b8f40bd..f22c75aedc6 100644 --- a/src/emu/cpu/mips/mips3fe.c +++ b/src/emu/cpu/mips/mips3fe.c @@ -58,7 +58,7 @@ mips3_frontend::mips3_frontend(mips3_state &state, UINT32 window_start, UINT32 w //------------------------------------------------- -// describe - build a description of a single +// describe - build a description of a single // instruction //------------------------------------------------- @@ -255,7 +255,7 @@ bool mips3_frontend::describe(opcode_desc &desc, const opcode_desc *prev) //------------------------------------------------- -// describe_special - build a description of a +// describe_special - build a description of a // single instruction in the 'special' group //------------------------------------------------- @@ -406,7 +406,7 @@ bool mips3_frontend::describe_special(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_regimm - build a description of a +// describe_regimm - build a description of a // single instruction in the 'regimm' group //------------------------------------------------- @@ -463,7 +463,7 @@ bool mips3_frontend::describe_regimm(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_idt - build a description of a single +// describe_idt - build a description of a single // instruction in the IDT-specific group //------------------------------------------------- @@ -494,7 +494,7 @@ bool mips3_frontend::describe_idt(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_cop0 - build a description of a +// describe_cop0 - build a description of a // single instruction in the COP0 group //------------------------------------------------- @@ -569,7 +569,7 @@ bool mips3_frontend::describe_cop0(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_cop1 - build a description of a +// describe_cop1 - build a description of a // single instruction in the COP1 group //------------------------------------------------- @@ -687,7 +687,7 @@ bool mips3_frontend::describe_cop1(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_cop1x - build a description of a +// describe_cop1x - build a description of a // single instruction in the COP1X group //------------------------------------------------- @@ -730,7 +730,7 @@ bool mips3_frontend::describe_cop1x(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_cop2 - build a description of a +// describe_cop2 - build a description of a // single instruction in the COP2 group //------------------------------------------------- diff --git a/src/emu/cpu/nec/nec.h b/src/emu/cpu/nec/nec.h index 89ec4c0c232..d0a6e4816c5 100644 --- a/src/emu/cpu/nec/nec.h +++ b/src/emu/cpu/nec/nec.h @@ -1,37 +1,37 @@ -/* ASG 971222 -- rewrote this interface */ -#ifndef __NEC_H_ -#define __NEC_H_ - - -typedef struct _nec_config nec_config; -struct _nec_config -{ - const UINT8* v25v35_decryptiontable; // internal decryption table -}; - -#define NEC_INPUT_LINE_INTP0 10 -#define NEC_INPUT_LINE_INTP1 11 -#define NEC_INPUT_LINE_INTP2 12 -#define NEC_INPUT_LINE_POLL 20 - -#define V25_PORT_P0 0x10000 -#define V25_PORT_P1 0x10002 -#define V25_PORT_P2 0x10004 -#define V25_PORT_PT 0x10006 - -enum -{ - NEC_PC=0, - NEC_IP, NEC_AW, NEC_CW, NEC_DW, NEC_BW, NEC_SP, NEC_BP, NEC_IX, NEC_IY, - NEC_FLAGS, NEC_ES, NEC_CS, NEC_SS, NEC_DS, - NEC_PENDING -}; - -/* Public functions */ -DECLARE_LEGACY_CPU_DEVICE(V20, v20); -DECLARE_LEGACY_CPU_DEVICE(V25, v25); -DECLARE_LEGACY_CPU_DEVICE(V30, v30); -DECLARE_LEGACY_CPU_DEVICE(V33, v33); -DECLARE_LEGACY_CPU_DEVICE(V35, v35); - -#endif +/* ASG 971222 -- rewrote this interface */ +#ifndef __NEC_H_ +#define __NEC_H_ + + +typedef struct _nec_config nec_config; +struct _nec_config +{ + const UINT8* v25v35_decryptiontable; // internal decryption table +}; + +#define NEC_INPUT_LINE_INTP0 10 +#define NEC_INPUT_LINE_INTP1 11 +#define NEC_INPUT_LINE_INTP2 12 +#define NEC_INPUT_LINE_POLL 20 + +#define V25_PORT_P0 0x10000 +#define V25_PORT_P1 0x10002 +#define V25_PORT_P2 0x10004 +#define V25_PORT_PT 0x10006 + +enum +{ + NEC_PC=0, + NEC_IP, NEC_AW, NEC_CW, NEC_DW, NEC_BW, NEC_SP, NEC_BP, NEC_IX, NEC_IY, + NEC_FLAGS, NEC_ES, NEC_CS, NEC_SS, NEC_DS, + NEC_PENDING +}; + +/* Public functions */ +DECLARE_LEGACY_CPU_DEVICE(V20, v20); +DECLARE_LEGACY_CPU_DEVICE(V25, v25); +DECLARE_LEGACY_CPU_DEVICE(V30, v30); +DECLARE_LEGACY_CPU_DEVICE(V33, v33); +DECLARE_LEGACY_CPU_DEVICE(V35, v35); + +#endif diff --git a/src/emu/cpu/nec/v25instr.c b/src/emu/cpu/nec/v25instr.c index 0ead0a9a89b..a18c4a24daa 100644 --- a/src/emu/cpu/nec/v25instr.c +++ b/src/emu/cpu/nec/v25instr.c @@ -38,7 +38,7 @@ nec_state->ISPR &= ~tmp; \ break; \ } \ - } + } OP( 0x0f, i_pre_v25 ) { UINT32 ModRM, tmp, tmp2; switch (FETCH()) { diff --git a/src/emu/cpu/powerpc/ppcfe.c b/src/emu/cpu/powerpc/ppcfe.c index b27cc783331..4acd13b9b19 100644 --- a/src/emu/cpu/powerpc/ppcfe.c +++ b/src/emu/cpu/powerpc/ppcfe.c @@ -93,7 +93,7 @@ ppc_frontend::ppc_frontend(powerpc_state &state, UINT32 window_start, UINT32 win //------------------------------------------------- -// describe - build a description of a single +// describe - build a description of a single // instruction //------------------------------------------------- diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c index 47addb75517..6791eb0c7f7 100644 --- a/src/emu/cpu/pps4/pps4.c +++ b/src/emu/cpu/pps4/pps4.c @@ -23,23 +23,23 @@ typedef struct _pps4_state pps4_state; struct _pps4_state { UINT8 A; // Accumulator - UINT8 X; - - PAIR P; + UINT8 X; + + PAIR P; PAIR SA; PAIR SB; - PAIR B; // BU + BM + BL + PAIR B; // BU + BM + BL - UINT8 C; // Carry flag + UINT8 C; // Carry flag UINT8 FF1; // Flip-flop 1 UINT8 FF2; // Flip-flop 2 - + legacy_cpu_device *device; const address_space *program; direct_read_data *direct; const address_space *data; const address_space *io; - + int icount; }; @@ -79,18 +79,18 @@ static void execute_one(pps4_state *cpustate, int opcode) switch (opcode) { // Arithmetic instructions - case 0x0b: // AD + case 0x0b: // AD break; - case 0x0a: // ADC + case 0x0a: // ADC break; - case 0x09: // ADSK + case 0x09: // ADSK break; case 0x08: // ADCSK break; case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: case 0x66: case 0x67: case 0x68: case 0x69: case 0x6a: case 0x6b: case 0x6c: - case 0x6d: case 0x6e: + case 0x6d: case 0x6e: // ADI break; case 0x65: //DC @@ -99,9 +99,9 @@ static void execute_one(pps4_state *cpustate, int opcode) // Logical instructions case 0x0d: // AND break; - case 0x0f: // OR + case 0x0f: // OR break; - case 0x0c: // EOR + case 0x0c: // EOR break; case 0x0e: // COMP cpustate->A ^= 0x0f; @@ -124,7 +124,7 @@ static void execute_one(pps4_state *cpustate, int opcode) break; case 0x25: // RF2 cpustate->FF2 = 0; - break; + break; case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: case 0x35: case 0x36: case 0x37: // LD @@ -206,14 +206,14 @@ static void execute_one(pps4_state *cpustate, int opcode) UINT8 tmp = ARG(cpustate); cpustate->icount -= 1; cpustate->B.w.l = tmp; - } + } break; case 0x17: // INCB if ((cpustate->B.w.l & 0x0f) == 0x0f) { cpustate->B.w.l &= 0xff0; DO_SKIP(cpustate); } else { - cpustate->B.w.l += 1; + cpustate->B.w.l += 1; } break; case 0x1f: // DECB @@ -221,7 +221,7 @@ static void execute_one(pps4_state *cpustate, int opcode) cpustate->B.w.l |= 0x00f; DO_SKIP(cpustate); } else { - cpustate->B.w.l -= 1; + cpustate->B.w.l -= 1; } break; // Control transfer instructions @@ -243,7 +243,7 @@ static void execute_one(pps4_state *cpustate, int opcode) case 0xbc: case 0xbd: case 0xbe: case 0xbf: // T cpustate->P.w.l = (cpustate->P.w.l & 0xfc0) | (opcode & 0x3f); - break; + break; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: case 0xd8: case 0xd9: case 0xda: case 0xdb: @@ -295,7 +295,7 @@ static void execute_one(pps4_state *cpustate, int opcode) break; // Input/Output instructions case 0x1c: // IOL - { + { //UINT8 tmp = ARG(cpustate); cpustate->icount -= 1; } @@ -342,7 +342,7 @@ static CPU_INIT( pps4 ) cpustate->direct = &cpustate->program->direct(); cpustate->data = device->space(AS_DATA); cpustate->io = device->space(AS_IO); - + state_save_register_device_item(device, 0, cpustate->A); state_save_register_device_item(device, 0, cpustate->X); state_save_register_device_item(device, 0, cpustate->P); @@ -364,7 +364,7 @@ static CPU_RESET( pps4 ) cpustate->A = cpustate->X = 0; cpustate->C = cpustate->FF1 = cpustate->FF2 = 0; - + cpustate->P.d = 0; cpustate->SA.d = 0; cpustate->SB.d = 0; @@ -411,17 +411,17 @@ CPU_GET_INFO( pps4 ) case CPUINFO_INT_MIN_CYCLES: info->i = 1; break; case CPUINFO_INT_MAX_CYCLES: info->i = 2; break; - case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break; + case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break; case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break; case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break; // 4 bit for RAM - case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 12; break; - case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 12; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break; // 4 bit - case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break; /* --- the following bits of info are returned as pointers to functions --- */ case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(pps4); break; diff --git a/src/emu/cpu/pps4/pps4dasm.c b/src/emu/cpu/pps4/pps4dasm.c index ec7cac77284..51bdd5211c2 100644 --- a/src/emu/cpu/pps4/pps4dasm.c +++ b/src/emu/cpu/pps4/pps4dasm.c @@ -17,18 +17,18 @@ CPU_DISASSEMBLE( pps4 ) { UINT32 flags = 0; unsigned PC = pc; - UINT8 op; + UINT8 op; switch (op = OP(pc++)) { // Arithmetic instructions - case 0x0b: sprintf (buffer,"ad"); break; - case 0x0a: sprintf (buffer,"adc"); break; + case 0x0b: sprintf (buffer,"ad"); break; + case 0x0a: sprintf (buffer,"adc"); break; case 0x09: sprintf (buffer,"adsk"); break; case 0x08: sprintf (buffer,"adcsk"); break; case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: case 0x66: case 0x67: case 0x68: case 0x69: case 0x6a: case 0x6b: case 0x6c: - case 0x6d: case 0x6e: + case 0x6d: case 0x6e: sprintf (buffer,"adi %01x",(op & 0x0f)); break; case 0x65: sprintf (buffer,"dc"); break; // Logical instructions @@ -42,7 +42,7 @@ CPU_DISASSEMBLE( pps4 ) case 0x22: sprintf (buffer,"sf1"); break; case 0x26: sprintf (buffer,"rf1"); break; case 0x21: sprintf (buffer,"sf2"); break; - case 0x25: sprintf (buffer,"rf2"); break; + case 0x25: sprintf (buffer,"rf2"); break; case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: case 0x35: case 0x36: case 0x37: sprintf (buffer,"ld %01x",(op & 0x07)); break; @@ -90,7 +90,7 @@ CPU_DISASSEMBLE( pps4 ) case 0xb4: case 0xb5: case 0xb6: case 0xb7: case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: - sprintf (buffer,"t %02x",(op & 0x3f)); break; + sprintf (buffer,"t %02x",(op & 0x3f)); break; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: case 0xd8: case 0xd9: case 0xda: case 0xdb: @@ -130,6 +130,6 @@ CPU_DISASSEMBLE( pps4 ) // Special instructions case 0x13: sprintf (buffer,"sag"); break; } - + return (pc - PC) | flags | DASMFLAG_SUPPORTED; } diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c index 52926d64a2c..bbde2e951bb 100644 --- a/src/emu/cpu/rsp/rspdrc.c +++ b/src/emu/cpu/rsp/rspdrc.c @@ -663,29 +663,29 @@ static CPU_INIT( rsp ) rsp->impstate->regmap[regnum] = (regnum == 0) ? parameter(0) : parameter::make_memory(&rsp->r[regnum]); /* - drcbe_info beinfo; - rsp->impstate->drcuml->get_backend_info(beinfo); - if (beinfo.direct_iregs > 2) - { - rsp->impstate->regmap[30] = I2; - } - if (beinfo.direct_iregs > 3) - { - rsp->impstate->regmap[31] = I3; - } - if (beinfo.direct_iregs > 4) - { - rsp->impstate->regmap[2] = I4; - } - if (beinfo.direct_iregs > 5) - { - rsp->impstate->regmap[3] = I5; - } - if (beinfo.direct_iregs > 6) - { - rsp->impstate->regmap[4] = I6; - } - */ + drcbe_info beinfo; + rsp->impstate->drcuml->get_backend_info(beinfo); + if (beinfo.direct_iregs > 2) + { + rsp->impstate->regmap[30] = I2; + } + if (beinfo.direct_iregs > 3) + { + rsp->impstate->regmap[31] = I3; + } + if (beinfo.direct_iregs > 4) + { + rsp->impstate->regmap[2] = I4; + } + if (beinfo.direct_iregs > 5) + { + rsp->impstate->regmap[3] = I5; + } + if (beinfo.direct_iregs > 6) + { + rsp->impstate->regmap[4] = I6; + } + */ /* mark the cache dirty so it is updated on next execute */ rsp->impstate->cache_dirty = TRUE; @@ -2533,7 +2533,7 @@ INLINE void cfunc_rsp_vne(void *param) int sel; rsp->flag[1] = 0; - for (i=0; i < 8; i++)//ïåðåïèñàíî ìíîé + for (i=0; i < 8; i++)//?????????? ???? { sel = VEC_EL_2(EL, i); @@ -2888,7 +2888,7 @@ INLINE void cfunc_rsp_vmrg(void *param) } else { - vres[i] = VREG_S(VS2REG, sel);//ìî¸ èñïðàâëåíèå + vres[i] = VREG_S(VS2REG, sel);//??? ??????????? } ACCUM_L(i) = vres[i]; @@ -3050,7 +3050,7 @@ INLINE void cfunc_rsp_vrcp(void *param) { for (i = 0; i < 32; i++) { - if (datainput & (1 << ((~i) & 0x1f)))//ò.æ.÷òî 31 - i + if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i { shifter = i; break; @@ -3135,7 +3135,7 @@ INLINE void cfunc_rsp_vrcpl(void *param) { for (i = 0; i < 32; i++) { - if (datainput & (1 << ((~i) & 0x1f)))//ò.æ.÷òî 31 - i + if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i { shifter = i; break; diff --git a/src/emu/cpu/rsp/rspfe.c b/src/emu/cpu/rsp/rspfe.c index 225d1d551ff..dca31e40f2d 100644 --- a/src/emu/cpu/rsp/rspfe.c +++ b/src/emu/cpu/rsp/rspfe.c @@ -30,7 +30,7 @@ rsp_frontend::rsp_frontend(rsp_state &state, UINT32 window_start, UINT32 window_ //------------------------------------------------- -// describe - build a description of a single +// describe - build a description of a single // instruction //------------------------------------------------- @@ -155,7 +155,7 @@ bool rsp_frontend::describe(opcode_desc &desc, const opcode_desc *prev) //------------------------------------------------- -// describe_special - build a description of a +// describe_special - build a description of a // single instruction in the 'special' group //------------------------------------------------- @@ -217,7 +217,7 @@ bool rsp_frontend::describe_special(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_regimm - build a description of a +// describe_regimm - build a description of a // single instruction in the 'regimm' group //------------------------------------------------- @@ -260,7 +260,7 @@ bool rsp_frontend::describe_regimm(UINT32 op, opcode_desc &desc) //------------------------------------------------- -// describe_cop0 - build a description of a +// describe_cop0 - build a description of a // single instruction in the COP0 group //------------------------------------------------- @@ -281,7 +281,7 @@ bool rsp_frontend::describe_cop0(UINT32 op, opcode_desc &desc) } //------------------------------------------------- -// describe_cop2 - build a description of a +// describe_cop2 - build a description of a // single instruction in the COP2 group //------------------------------------------------- diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h index 3ea30d359f2..ddab61f65fe 100644 --- a/src/emu/cpu/sh2/sh2comn.h +++ b/src/emu/cpu/sh2/sh2comn.h @@ -191,7 +191,7 @@ class sh2_frontend : public drc_frontend public: sh2_frontend(sh2_state &state, UINT32 window_start, UINT32 window_end, UINT32 max_sequence); -protected: +protected: virtual bool describe(opcode_desc &desc, const opcode_desc *prev); private: diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c index 10dc9313154..97c0906a820 100644 --- a/src/emu/cpu/sh2/sh2drc.c +++ b/src/emu/cpu/sh2/sh2drc.c @@ -1089,14 +1089,14 @@ static void static_generate_entry_point(sh2_state *sh2) UML_LABEL(block, skip+1); // skip+1: UML_CMP(block, mem(&sh2->evec), 0xffffffff); // cmp evec, 0xffffffff - UML_JMPc(block, COND_Z, skip); // jz skip + UML_JMPc(block, COND_Z, skip); // jz skip - UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 + UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 UML_MOV(block, I1, mem(&sh2->irqsr)); // mov r1, irqsr UML_CALLH(block, *sh2->write32); // call write32 - UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 + UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 UML_MOV(block, I1, mem(&sh2->pc)); // mov r1, pc UML_CALLH(block, *sh2->write32); // call write32 @@ -1186,7 +1186,7 @@ static void static_generate_memory_accessor(sh2_state *sh2, int size, int iswrit UML_JMPc(block, COND_NZ, label); // if high bit is set, don't mask UML_CMP(block, I0, 0x40000000); // cmp #0x40000000, r0 - UML_JMPc(block, COND_AE, label); // bae label + UML_JMPc(block, COND_AE, label); // bae label UML_AND(block, I0, I0, AM); // and r0, r0, #AM (0xc7ffffff) @@ -1462,14 +1462,14 @@ static void generate_update_cycles(sh2_state *sh2, drcuml_block *block, compiler UML_LABEL(block, skip+1); // skip+1: UML_CMP(block, mem(&sh2->evec), 0xffffffff); // cmp evec, 0xffffffff - UML_JMPc(block, COND_Z, skip); // jz skip + UML_JMPc(block, COND_Z, skip); // jz skip - UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 + UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 UML_MOV(block, I1, mem(&sh2->irqsr)); // mov r1, irqsr UML_CALLH(block, *sh2->write32); // call write32 - UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 + UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 UML_MOV(block, I1, param); // mov r1, nextpc UML_CALLH(block, *sh2->write32); // call write32 @@ -1848,7 +1848,7 @@ static int generate_group_0(sh2_state *sh2, drcuml_block *block, compiler_state case 0x24: // MOVBS0(Rm, Rn); case 0x34: // MOVBS0(Rm, Rn); UML_ADD(block, I0, R32(0), R32(Rn)); // add r0, R0, Rn - UML_AND(block, I1, R32(Rm), 0x000000ff); // and r1, Rm, 0xff + UML_AND(block, I1, R32(Rm), 0x000000ff); // and r1, Rm, 0xff UML_CALLH(block, *sh2->write8); // call write8 if (!in_delay_slot) @@ -1860,7 +1860,7 @@ static int generate_group_0(sh2_state *sh2, drcuml_block *block, compiler_state case 0x25: // MOVWS0(Rm, Rn); case 0x35: // MOVWS0(Rm, Rn); UML_ADD(block, I0, R32(0), R32(Rn)); // add r0, R0, Rn - UML_AND(block, I1, R32(Rm), 0x0000ffff); // and r1, Rm, 0xffff + UML_AND(block, I1, R32(Rm), 0x0000ffff); // and r1, Rm, 0xffff UML_CALLH(block, *sh2->write16); // call write16 if (!in_delay_slot) @@ -1980,14 +1980,14 @@ static int generate_group_0(sh2_state *sh2, drcuml_block *block, compiler_state UML_MOV(block, I0, mem(&sh2->evec)); // mov r0, evec UML_CMP(block, I0, 0xffffffff); // cmp r0, 0xffffffff - UML_JMPc(block, COND_Z, compiler->labelnum); // jz skip + UML_JMPc(block, COND_Z, compiler->labelnum); // jz skip - UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 + UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 UML_MOV(block, I1, mem(&sh2->irqsr)); // mov r1, irqsr UML_CALLH(block, *sh2->write32); // call write32 - UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 + UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 UML_MOV(block, I1, desc->pc+2); // mov r1, nextpc UML_CALLH(block, *sh2->write32); // call write32 @@ -2100,7 +2100,7 @@ static int generate_group_2(sh2_state *sh2, drcuml_block *block, compiler_state case 4: // MOVBM(Rm, Rn); UML_MOV(block, I1, R32(Rm)); // mov r1, Rm - UML_SUB(block, R32(Rn), R32(Rn), 1); // sub Rn, Rn, 1 + UML_SUB(block, R32(Rn), R32(Rn), 1); // sub Rn, Rn, 1 UML_MOV(block, I0, R32(Rn)); // mov r0, Rn UML_CALLH(block, *sh2->write8); // call write8 @@ -2145,20 +2145,20 @@ static int generate_group_2(sh2_state *sh2, drcuml_block *block, compiler_state UML_TEST(block, R32(Rn), 0x80000000); // test Rn, #0x80000000 UML_JMPc(block, COND_Z, compiler->labelnum); // jz labelnum - UML_OR(block, I0, I0, Q); // or r0, r0, Q + UML_OR(block, I0, I0, Q); // or r0, r0, Q UML_LABEL(block, compiler->labelnum++); // labelnum: UML_TEST(block, R32(Rm), 0x80000000); // test Rm, #0x80000000 UML_JMPc(block, COND_Z, compiler->labelnum); // jz labelnum - UML_OR(block, I0, I0, M); // or r0, r0, M + UML_OR(block, I0, I0, M); // or r0, r0, M UML_LABEL(block, compiler->labelnum++); // labelnum: UML_XOR(block, I1, R32(Rn), R32(Rm)); // xor r1, Rn, Rm UML_TEST(block, I1, 0x80000000); // test r1, #0x80000000 UML_JMPc(block, COND_Z, compiler->labelnum); // jz labelnum - UML_OR(block, I0, I0, T); // or r0, r0, T + UML_OR(block, I0, I0, T); // or r0, r0, T UML_LABEL(block, compiler->labelnum++); // labelnum: UML_MOV(block, mem(&sh2->sr), I0); // mov sr, r0 return TRUE; @@ -2166,7 +2166,7 @@ static int generate_group_2(sh2_state *sh2, drcuml_block *block, compiler_state case 8: // TST(Rm, Rn); UML_AND(block, I0, mem(&sh2->sr), ~T); // and r0, sr, ~T (clear the T bit) UML_TEST(block, R32(Rm), R32(Rn)); // test Rm, Rn - UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum + UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum UML_OR(block, I0, I0, T); // or r0, r0, T UML_LABEL(block, compiler->labelnum++); // desc->pc: @@ -2481,7 +2481,7 @@ static int generate_group_4(sh2_state *sh2, drcuml_block *block, compiler_state { UML_AND(block, I0, mem(&sh2->sr), ~T); // and r0, sr, ~T (clear the T bit) UML_SUB(block, R32(Rn), R32(Rn), 1); // sub Rn, Rn, 1 - UML_JMPc(block, COND_NZ, compiler->labelnum); // jz compiler->labelnum + UML_JMPc(block, COND_NZ, compiler->labelnum); // jz compiler->labelnum UML_OR(block, I0, I0, T); // or r0, r0, T UML_LABEL(block, compiler->labelnum++); // desc->pc: @@ -2495,7 +2495,7 @@ static int generate_group_4(sh2_state *sh2, drcuml_block *block, compiler_state UML_AND(block, I0, mem(&sh2->sr), ~T); // and r0, sr, ~T (clear the T bit) UML_CMP(block, R32(Rn), 0); // cmp Rn, 0 - UML_JMPc(block, COND_S, compiler->labelnum); // js compiler->labelnum (if negative) + UML_JMPc(block, COND_S, compiler->labelnum); // js compiler->labelnum (if negative) UML_OR(block, I0, I0, T); // or r0, r0, T UML_LABEL(block, compiler->labelnum++); // desc->pc: @@ -2508,8 +2508,8 @@ static int generate_group_4(sh2_state *sh2, drcuml_block *block, compiler_state UML_CMP(block, R32(Rn), 0); // cmp Rn, 0 - UML_JMPc(block, COND_S, compiler->labelnum); // js compiler->labelnum (if negative) - UML_JMPc(block, COND_Z, compiler->labelnum); // jz compiler->labelnum (if zero) + UML_JMPc(block, COND_S, compiler->labelnum); // js compiler->labelnum (if negative) + UML_JMPc(block, COND_Z, compiler->labelnum); // jz compiler->labelnum (if zero) UML_OR(block, I0, I0, T); // or r0, r0, T @@ -2904,7 +2904,7 @@ static int generate_group_8(sh2_state *sh2, drcuml_block *block, compiler_state UML_SEXT(block, I1, opcode&0xff, SIZE_BYTE); // sext r1, opcode&0xff, BYTE UML_CMP(block, I1, R32(0)); // cmp r1, R0 - UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum (if negative) + UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum (if negative) UML_OR(block, I0, I0, T); // or r0, r0, T @@ -2914,7 +2914,7 @@ static int generate_group_8(sh2_state *sh2, drcuml_block *block, compiler_state case 9<< 8: // BT(opcode & 0xff); UML_TEST(block, mem(&sh2->sr), T); // test sh2->sr, T - UML_JMPc(block, COND_Z, compiler->labelnum); // jz compiler->labelnum + UML_JMPc(block, COND_Z, compiler->labelnum); // jz compiler->labelnum disp = ((INT32)opcode << 24) >> 24; sh2->ea = (desc->pc + 2) + disp * 2 + 2; // sh2->ea = destination @@ -2927,7 +2927,7 @@ static int generate_group_8(sh2_state *sh2, drcuml_block *block, compiler_state case 11<< 8: // BF(opcode & 0xff); UML_TEST(block, mem(&sh2->sr), T); // test sh2->sr, T - UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum + UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum disp = ((INT32)opcode << 24) >> 24; sh2->ea = (desc->pc + 2) + disp * 2 + 2; // sh2->ea = destination @@ -2942,7 +2942,7 @@ static int generate_group_8(sh2_state *sh2, drcuml_block *block, compiler_state if (sh2->cpu_type > CPU_TYPE_SH1) { UML_TEST(block, mem(&sh2->sr), T); // test sh2->sr, T - UML_JMPc(block, COND_Z, compiler->labelnum); // jz compiler->labelnum + UML_JMPc(block, COND_Z, compiler->labelnum); // jz compiler->labelnum disp = ((INT32)opcode << 24) >> 24; sh2->ea = (desc->pc + 2) + disp * 2 + 2; // sh2->ea = destination @@ -2963,7 +2963,7 @@ static int generate_group_8(sh2_state *sh2, drcuml_block *block, compiler_state if (sh2->cpu_type > CPU_TYPE_SH1) { UML_TEST(block, mem(&sh2->sr), T); // test sh2->sr, T - UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum + UML_JMPc(block, COND_NZ, compiler->labelnum); // jnz compiler->labelnum disp = ((INT32)opcode << 24) >> 24; sh2->ea = (desc->pc + 2) + disp * 2 + 2; // sh2->ea = destination @@ -3031,7 +3031,7 @@ static int generate_group_12(sh2_state *sh2, drcuml_block *block, compiler_state UML_SUB(block, R32(15), R32(15), 4); // sub R15, R15, #4 UML_MOV(block, I0, R32(15)); // mov r0, R15 - UML_MOV(block, I1, desc->pc+2); // mov r1, pc+2 + UML_MOV(block, I1, desc->pc+2); // mov r1, pc+2 UML_CALLH(block, *sh2->write32); // write32 UML_MOV(block, I0, mem(&sh2->ea)); // mov r0, ea diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h index 010bb1cfe1a..54879eee05a 100644 --- a/src/emu/cpu/sh4/sh4.h +++ b/src/emu/cpu/sh4/sh4.h @@ -105,7 +105,7 @@ void sh4_dma_ddt(device_t *device, struct sh4_ddt_dma *s); COMPILER-SPECIFIC OPTIONS ***************************************************************************/ -#define SH4DRC_STRICT_VERIFY 0x0001 /* verify all instructions */ +#define SH4DRC_STRICT_VERIFY 0x0001 /* verify all instructions */ #define SH4DRC_FLUSH_PC 0x0002 /* flush the PC value before each memory access */ #define SH4DRC_STRICT_PCREL 0x0004 /* do actual loads on MOVLI/MOVWI instead of collapsing to immediates */ diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/emu/cpu/sh4/sh4comn.h index a65316939c3..42a88141158 100644 --- a/src/emu/cpu/sh4/sh4comn.h +++ b/src/emu/cpu/sh4/sh4comn.h @@ -119,13 +119,13 @@ typedef struct int maxpcfsel; // highest valid pcflush entry UINT32 pcflushes[16]; // pcflush entries - drc_cache * cache; /* pointer to the DRC code cache */ + drc_cache * cache; /* pointer to the DRC code cache */ drcuml_state * drcuml; /* DRC UML generator state */ sh4_frontend * drcfe; /* pointer to the DRC front-end class */ UINT32 drcoptions; /* configurable DRC options */ /* internal stuff */ - UINT8 cache_dirty; /* true if we need to flush the cache */ + UINT8 cache_dirty; /* true if we need to flush the cache */ /* parameters for subroutines */ UINT64 numcycles; /* return value from gettotalcycles */ @@ -159,7 +159,7 @@ class sh4_frontend : public drc_frontend public: sh4_frontend(sh4_state &state, UINT32 window_start, UINT32 window_end, UINT32 max_sequence); -protected: +protected: virtual bool describe(opcode_desc &desc, const opcode_desc *prev); private: @@ -233,8 +233,8 @@ enum /* register flags 1 */ #define REGFLAG_PR (1 << 0) -#define REGFLAG_MACL (1 << 1) -#define REGFLAG_MACH (1 << 2) +#define REGFLAG_MACL (1 << 1) +#define REGFLAG_MACH (1 << 2) #define REGFLAG_GBR (1 << 3) #define REGFLAG_VBR (1 << 4) #define REGFLAG_SR (1 << 5) diff --git a/src/emu/cpu/uml.c b/src/emu/cpu/uml.c index 0dc9ff63829..7d2ef743a13 100644 --- a/src/emu/cpu/uml.c +++ b/src/emu/cpu/uml.c @@ -432,8 +432,8 @@ void uml::instruction::configure(opcode_t op, UINT8 size, parameter p0, paramete //------------------------------------------------- -// simplify - simplify instructions that have -// immediate values we can evaluate at compile +// simplify - simplify instructions that have +// immediate values we can evaluate at compile // time //------------------------------------------------- @@ -767,22 +767,22 @@ void uml::instruction::simplify() } /* - if (LOG_SIMPLIFICATIONS && memcmp(&orig, inst, sizeof(orig)) != 0) - { - astring disasm1, disasm2; - orig.disasm(disasm1, block->drcuml); - inst->disasm(disasm2, block->drcuml); - mame_printf_debug("Simplified: %-50.50s -> %s\n", disasm1.cstr(), disasm2.cstr()); - } - */ - + if (LOG_SIMPLIFICATIONS && memcmp(&orig, inst, sizeof(orig)) != 0) + { + astring disasm1, disasm2; + orig.disasm(disasm1, block->drcuml); + inst->disasm(disasm2, block->drcuml); + mame_printf_debug("Simplified: %-50.50s -> %s\n", disasm1.cstr(), disasm2.cstr()); + } + */ + // loop until we stop changing opcodes } while (m_opcode != origop); } //------------------------------------------------- -// validate - verify that the instruction created +// validate - verify that the instruction created // meets all requirements //------------------------------------------------- @@ -816,8 +816,8 @@ void uml::instruction::validate() //------------------------------------------------- -// input_flags - return the effective input flags -// based on any conditions encoded in an +// input_flags - return the effective input flags +// based on any conditions encoded in an // instruction //------------------------------------------------- @@ -826,21 +826,21 @@ UINT8 uml::instruction::input_flags() const static const UINT8 flags_for_condition[] = { FLAG_Z, // COND_Z - FLAG_Z, // COND_NZ - FLAG_S, // COND_S - FLAG_S, // COND_NS - FLAG_C, // COND_C - FLAG_C, // COND_NC - FLAG_V, // COND_V - FLAG_V, // COND_NV - FLAG_U, // COND_U - FLAG_U, // COND_NU - FLAG_C | FLAG_Z, // COND_A - FLAG_C | FLAG_Z, // COND_BE - FLAG_S | FLAG_V | FLAG_Z, // COND_G - FLAG_S | FLAG_V | FLAG_Z, // COND_LE - FLAG_S | FLAG_V, // COND_L - FLAG_S | FLAG_V // COND_GE + FLAG_Z, // COND_NZ + FLAG_S, // COND_S + FLAG_S, // COND_NS + FLAG_C, // COND_C + FLAG_C, // COND_NC + FLAG_V, // COND_V + FLAG_V, // COND_NV + FLAG_U, // COND_U + FLAG_U, // COND_NU + FLAG_C | FLAG_Z, // COND_A + FLAG_C | FLAG_Z, // COND_BE + FLAG_S | FLAG_V | FLAG_Z, // COND_G + FLAG_S | FLAG_V | FLAG_Z, // COND_LE + FLAG_S | FLAG_V, // COND_L + FLAG_S | FLAG_V // COND_GE }; UINT8 flags = s_opcode_info_table[m_opcode].inflags; @@ -853,8 +853,8 @@ UINT8 uml::instruction::input_flags() const //------------------------------------------------- -// output_flags - return the effective output -// flags based on any conditions encoded in an +// output_flags - return the effective output +// flags based on any conditions encoded in an // instruction //------------------------------------------------- @@ -868,8 +868,8 @@ UINT8 uml::instruction::output_flags() const //------------------------------------------------- -// modified_flags - return the effective output -// flags based on any conditions encoded in an +// modified_flags - return the effective output +// flags based on any conditions encoded in an // instruction //------------------------------------------------- @@ -880,7 +880,7 @@ UINT8 uml::instruction::modified_flags() const //------------------------------------------------- -// disasm - disassemble an instruction to the +// disasm - disassemble an instruction to the // given buffer //------------------------------------------------- diff --git a/src/emu/cpu/uml.h b/src/emu/cpu/uml.h index 25e7e6de1d2..9175b5fb9b6 100644 --- a/src/emu/cpu/uml.h +++ b/src/emu/cpu/uml.h @@ -86,7 +86,7 @@ namespace uml const UINT8 FLAG_S = 0x08; // sign flag (defined for integer only) const UINT8 FLAG_U = 0x10; // unordered flag (defined for FP only) - // testable conditions; note that these are defined such that (condition ^ 1) is + // testable conditions; note that these are defined such that (condition ^ 1) is // always the opposite enum condition_t { @@ -139,7 +139,7 @@ namespace uml SIZE_SHORT = SIZE_DWORD, // 4-byte (float) SIZE_DOUBLE = SIZE_QWORD // 8-byte (float) }; - + // memory scale factors enum memory_scale { @@ -164,89 +164,89 @@ namespace uml OP_INVALID, // compile-time opcodes - OP_HANDLE, // HANDLE handle - OP_HASH, // HASH mode,pc - OP_LABEL, // LABEL imm - OP_COMMENT, // COMMENT string - OP_MAPVAR, // MAPVAR mapvar,value + OP_HANDLE, // HANDLE handle + OP_HASH, // HASH mode,pc + OP_LABEL, // LABEL imm + OP_COMMENT, // COMMENT string + OP_MAPVAR, // MAPVAR mapvar,value // control flow operations - OP_NOP, // NOP - OP_DEBUG, // DEBUG pc - OP_EXIT, // EXIT src1[,c] - OP_HASHJMP, // HASHJMP mode,pc,handle - OP_JMP, // JMP imm[,c] - OP_EXH, // EXH handle,param[,c] - OP_CALLH, // CALLH handle[,c] - OP_RET, // RET [c] - OP_CALLC, // CALLC func,ptr[,c] - OP_RECOVER, // RECOVER dst,mapvar + OP_NOP, // NOP + OP_DEBUG, // DEBUG pc + OP_EXIT, // EXIT src1[,c] + OP_HASHJMP, // HASHJMP mode,pc,handle + OP_JMP, // JMP imm[,c] + OP_EXH, // EXH handle,param[,c] + OP_CALLH, // CALLH handle[,c] + OP_RET, // RET [c] + OP_CALLC, // CALLC func,ptr[,c] + OP_RECOVER, // RECOVER dst,mapvar // internal register operations - OP_SETFMOD, // SETFMOD src - OP_GETFMOD, // GETFMOD dst - OP_GETEXP, // GETEXP dst - OP_GETFLGS, // GETFLGS dst[,f] - OP_SAVE, // SAVE mem - OP_RESTORE, // RESTORE mem + OP_SETFMOD, // SETFMOD src + OP_GETFMOD, // GETFMOD dst + OP_GETEXP, // GETEXP dst + OP_GETFLGS, // GETFLGS dst[,f] + OP_SAVE, // SAVE mem + OP_RESTORE, // RESTORE mem // integer operations - OP_LOAD, // LOAD dst,base,index,size - OP_LOADS, // LOADS dst,base,index,size - OP_STORE, // STORE base,index,src,size - OP_READ, // READ dst,src1,space/size + OP_LOAD, // LOAD dst,base,index,size + OP_LOADS, // LOADS dst,base,index,size + OP_STORE, // STORE base,index,src,size + OP_READ, // READ dst,src1,space/size OP_READM, // READM dst,src1,mask,space/size - OP_WRITE, // WRITE dst,src1,space/size + OP_WRITE, // WRITE dst,src1,space/size OP_WRITEM, // WRITEM dst,mask,src1,space/size - OP_CARRY, // CARRY src,bitnum - OP_SET, // SET dst,c - OP_MOV, // MOV dst,src[,c] - OP_SEXT, // SEXT dst,src,size - OP_ROLAND, // ROLAND dst,src,shift,mask - OP_ROLINS, // ROLINS dst,src,shift,mask - OP_ADD, // ADD dst,src1,src2[,f] - OP_ADDC, // ADDC dst,src1,src2[,f] - OP_SUB, // SUB dst,src1,src2[,f] - OP_SUBB, // SUBB dst,src1,src2[,f] - OP_CMP, // CMP src1,src2[,f] + OP_CARRY, // CARRY src,bitnum + OP_SET, // SET dst,c + OP_MOV, // MOV dst,src[,c] + OP_SEXT, // SEXT dst,src,size + OP_ROLAND, // ROLAND dst,src,shift,mask + OP_ROLINS, // ROLINS dst,src,shift,mask + OP_ADD, // ADD dst,src1,src2[,f] + OP_ADDC, // ADDC dst,src1,src2[,f] + OP_SUB, // SUB dst,src1,src2[,f] + OP_SUBB, // SUBB dst,src1,src2[,f] + OP_CMP, // CMP src1,src2[,f] OP_MULU, // MULU dst,edst,src1,src2[,f] OP_MULS, // MULS dst,edst,src1,src2[,f] OP_DIVU, // DIVU dst,edst,src1,src2[,f] OP_DIVS, // DIVS dst,edst,src1,src2[,f] - OP_AND, // AND dst,src1,src2[,f] - OP_TEST, // TEST src1,src2[,f] - OP_OR, // OR dst,src1,src2[,f] - OP_XOR, // XOR dst,src1,src2[,f] - OP_LZCNT, // LZCNT dst,src - OP_BSWAP, // BSWAP dst,src - OP_SHL, // SHL dst,src,count[,f] - OP_SHR, // SHR dst,src,count[,f] - OP_SAR, // SAR dst,src,count[,f] - OP_ROL, // ROL dst,src,count[,f] - OP_ROLC, // ROLC dst,src,count[,f] - OP_ROR, // ROL dst,src,count[,f] - OP_RORC, // ROLC dst,src,count[,f] + OP_AND, // AND dst,src1,src2[,f] + OP_TEST, // TEST src1,src2[,f] + OP_OR, // OR dst,src1,src2[,f] + OP_XOR, // XOR dst,src1,src2[,f] + OP_LZCNT, // LZCNT dst,src + OP_BSWAP, // BSWAP dst,src + OP_SHL, // SHL dst,src,count[,f] + OP_SHR, // SHR dst,src,count[,f] + OP_SAR, // SAR dst,src,count[,f] + OP_ROL, // ROL dst,src,count[,f] + OP_ROLC, // ROLC dst,src,count[,f] + OP_ROR, // ROL dst,src,count[,f] + OP_RORC, // ROLC dst,src,count[,f] // floating point operations - OP_FLOAD, // FLOAD dst,base,index - OP_FSTORE, // FSTORE base,index,src - OP_FREAD, // FREAD dst,space,src1 - OP_FWRITE, // FWRITE space,dst,src1 - OP_FMOV, // FMOV dst,src1[,c] - OP_FTOINT, // FTOINT dst,src1,size,round - OP_FFRINT, // FFRINT dst,src1,size - OP_FFRFLT, // FFRFLT dst,src1,size - OP_FRNDS, // FRNDS dst,src1 - OP_FADD, // FADD dst,src1,src2 - OP_FSUB, // FSUB dst,src1,src2 - OP_FCMP, // FCMP src1,src2 - OP_FMUL, // FMUL dst,src1,src2 - OP_FDIV, // FDIV dst,src1,src2 - OP_FNEG, // FNEG dst,src1 - OP_FABS, // FABS dst,src1 - OP_FSQRT, // FSQRT dst,src1 + OP_FLOAD, // FLOAD dst,base,index + OP_FSTORE, // FSTORE base,index,src + OP_FREAD, // FREAD dst,space,src1 + OP_FWRITE, // FWRITE space,dst,src1 + OP_FMOV, // FMOV dst,src1[,c] + OP_FTOINT, // FTOINT dst,src1,size,round + OP_FFRINT, // FFRINT dst,src1,size + OP_FFRFLT, // FFRFLT dst,src1,size + OP_FRNDS, // FRNDS dst,src1 + OP_FADD, // FADD dst,src1,src2 + OP_FSUB, // FSUB dst,src1,src2 + OP_FCMP, // FCMP src1,src2 + OP_FMUL, // FMUL dst,src1,src2 + OP_FDIV, // FDIV dst,src1,src2 + OP_FNEG, // FNEG dst,src1 + OP_FABS, // FABS dst,src1 + OP_FSQRT, // FSQRT dst,src1 OP_FRECIP, // FRECIP dst,src1 - OP_FRSQRT, // FRSQRT dst,src1 + OP_FRSQRT, // FRSQRT dst,src1 OP_MAX }; @@ -259,12 +259,12 @@ namespace uml { friend class ::drcuml_state; template friend class ::simple_list; - + // construction/destruction code_handle(drcuml_state &drcuml, const char *name); public: - // getters + // getters code_handle *next() const { return m_next; } drccodeptr codeptr() const { return *m_code; } drccodeptr *codeptr_addr() { return m_code; } @@ -280,22 +280,22 @@ namespace uml code_handle * m_next; // link to next handle in the list drcuml_state & m_drcuml; // pointer to owning object }; - + // class describing a local code label class code_label { public: // construction code_label(UINT32 label = 0) : m_label(label) { } - + // operators operator UINT32 &() { return m_label; } bool operator==(const code_label &rhs) const { return (m_label == rhs.m_label); } bool operator!=(const code_label &rhs) const { return (m_label != rhs.m_label); } - + // getters UINT32 label() const { return m_label; } - + private: UINT32 m_label; }; @@ -336,7 +336,7 @@ namespace uml parameter(operand_size size, memory_space space) : m_type(PTYPE_SIZE_SPACE), m_value((space << 4) | size) { assert(size >= SIZE_BYTE && size <= SIZE_DQWORD); assert(space >= SPACE_PROGRAM && space <= SPACE_IO); } parameter(code_handle &handle) : m_type(PTYPE_CODE_HANDLE), m_value(reinterpret_cast(&handle)) { } parameter(code_label &label) : m_type(PTYPE_CODE_LABEL), m_value(label) { } - + // creators for types that don't safely default static inline parameter make_ireg(int regnum) { assert(regnum >= REG_I0 && regnum < REG_I_END); return parameter(PTYPE_INT_REGISTER, regnum); } static inline parameter make_freg(int regnum) { assert(regnum >= REG_F0 && regnum < REG_F_END); return parameter(PTYPE_FLOAT_REGISTER, regnum); } @@ -352,7 +352,7 @@ namespace uml // operators bool operator==(const parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); } bool operator!=(const parameter &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); } - + // getters parameter_type type() const { return m_type; } UINT64 immediate() const { assert(m_type == PTYPE_IMMEDIATE); return m_value; } @@ -362,14 +362,14 @@ namespace uml int mapvar() const { assert(m_type == PTYPE_MAPVAR); assert(m_value >= MAPVAR_M0 && m_value < MAPVAR_END); return m_value; } void *memory() const { assert(m_type == PTYPE_MEMORY); return reinterpret_cast(m_value); } operand_size size() const { assert(m_type == PTYPE_SIZE || m_type == PTYPE_SIZE_SCALE || m_type == PTYPE_SIZE_SPACE); return operand_size(m_value & 15); } - memory_scale scale() const { assert(m_type == PTYPE_SIZE_SCALE); return memory_scale(m_value >> 4); } + memory_scale scale() const { assert(m_type == PTYPE_SIZE_SCALE); return memory_scale(m_value >> 4); } memory_space space() const { assert(m_type == PTYPE_SIZE_SPACE); return memory_space(m_value >> 4); } code_handle &handle() const { assert(m_type == PTYPE_CODE_HANDLE); return *reinterpret_cast(m_value); } code_label label() const { assert(m_type == PTYPE_CODE_LABEL); return code_label(m_value); } c_function cfunc() const { assert(m_type == PTYPE_C_FUNCTION); return reinterpret_cast(m_value); } float_rounding_mode rounding() const { assert(m_type == PTYPE_ROUNDING); return float_rounding_mode(m_value); } const char *string() const { assert(m_type == PTYPE_STRING); return reinterpret_cast(m_value); } - + // type queries bool is_immediate() const { return (m_type == PTYPE_IMMEDIATE); } bool is_int_register() const { return (m_type == PTYPE_INT_REGISTER); } @@ -385,10 +385,10 @@ namespace uml bool is_c_function() const { return (m_type == PTYPE_C_FUNCTION); } bool is_rounding() const { return (m_type == PTYPE_ROUNDING); } bool is_string() const { return (m_type == PTYPE_STRING); } - + // other queries bool is_immediate_value(UINT64 value) const { return (m_type == PTYPE_IMMEDIATE && m_value == value); } - + private: // private constructor parameter(parameter_type type, parameter_value value) : m_type(type), m_value(value) { } @@ -415,7 +415,7 @@ namespace uml UINT8 inflags; // input flags UINT8 outflags; // output flags UINT8 modflags; // modified flags - parameter_info param[4]; // information about parameters + parameter_info param[4]; // information about parameters }; // a single UML instructon is encoded like this @@ -450,7 +450,7 @@ namespace uml void label(code_label lab) { configure(OP_LABEL, 4, lab); } void comment(const char *string) { configure(OP_COMMENT, 4, parameter::make_string(string)); } void mapvar(parameter mapvar, UINT32 value) { assert(mapvar.is_mapvar()); configure(OP_MAPVAR, 4, mapvar, value); } - + // control flow operations void nop() { configure(OP_NOP, 4); } void debug(UINT32 pc) { configure(OP_DEBUG, 4, pc); } @@ -573,7 +573,7 @@ namespace uml void fssqrt(parameter dst, parameter src1) { configure(OP_FSQRT, 4, dst, src1); } void fsrecip(parameter dst, parameter src1) { configure(OP_FRECIP, 4, dst, src1); } void fsrsqrt(parameter dst, parameter src1) { configure(OP_FRSQRT, 4, dst, src1); } - + // 64-bit floating point operations void fdload(parameter dst, const void *base, parameter index) { configure(OP_FLOAD, 8, dst, parameter::make_memory(base), index); } void fdstore(void *base, parameter index, parameter src1) { configure(OP_FSTORE, 8, parameter::make_memory(base), index, src1); } @@ -595,10 +595,10 @@ namespace uml void fdsqrt(parameter dst, parameter src1) { configure(OP_FSQRT, 8, dst, src1); } void fdrecip(parameter dst, parameter src1) { configure(OP_FRECIP, 8, dst, src1); } void fdrsqrt(parameter dst, parameter src1) { configure(OP_FRSQRT, 8, dst, src1); } - + // constants static const int MAX_PARAMS = 4; - + private: // internal configuration void configure(opcode_t op, UINT8 size, condition_t cond = COND_ALWAYS); @@ -611,7 +611,7 @@ namespace uml void validate(); void convert_to_mov_immediate(UINT64 immediate) { m_opcode = OP_MOV; m_numparams = 2; m_param[1] = immediate; } void convert_to_mov_param(int pnum) { m_opcode = OP_MOV; m_numparams = 2; m_param[1] = m_param[pnum]; } - + // internal state opcode_t m_opcode; // opcode condition_t m_condition; // condition @@ -651,7 +651,7 @@ namespace uml const parameter I7(parameter::make_ireg(REG_I0 + 7)); const parameter I8(parameter::make_ireg(REG_I0 + 8)); const parameter I9(parameter::make_ireg(REG_I0 + 9)); - + const parameter F0(parameter::make_freg(REG_F0 + 0)); const parameter F1(parameter::make_freg(REG_F0 + 1)); const parameter F2(parameter::make_freg(REG_F0 + 2)); @@ -662,7 +662,7 @@ namespace uml const parameter F7(parameter::make_freg(REG_F0 + 7)); const parameter F8(parameter::make_freg(REG_F0 + 8)); const parameter F9(parameter::make_freg(REG_F0 + 9)); - + const parameter V0(parameter::make_vreg(REG_V0 + 0)); const parameter V1(parameter::make_vreg(REG_V0 + 1)); const parameter V2(parameter::make_vreg(REG_V0 + 2)); @@ -673,7 +673,7 @@ namespace uml const parameter V7(parameter::make_vreg(REG_V0 + 7)); const parameter V8(parameter::make_vreg(REG_V0 + 8)); const parameter V9(parameter::make_vreg(REG_V0 + 9)); - + const parameter M0(parameter::make_mapvar(MAPVAR_M0 + 0)); const parameter M1(parameter::make_mapvar(MAPVAR_M0 + 1)); const parameter M2(parameter::make_mapvar(MAPVAR_M0 + 2)); diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c index 9f3d245c791..ec691b41eda 100755 --- a/src/emu/cpu/upd7725/upd7725.c +++ b/src/emu/cpu/upd7725/upd7725.c @@ -3,10 +3,10 @@ upd7725.c Core implementation for the portable NEC uPD7725/uPD96050 emulator - + Original by byuu in the public domain. MAME conversion by R. Belmont - + ****************************************************************************/ #include "emu.h" @@ -246,7 +246,7 @@ void necdsp_device::device_start() void necdsp_device::device_reset() { - for (unsigned i = 0; i < 2048; i++) + for (unsigned i = 0; i < 2048; i++) { dataRAM[i] = 0x0000; } @@ -335,7 +335,7 @@ offs_t necdsp_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *o return CPU_DISASSEMBLE_NAME(upd7725)(NULL, buffer, pc, oprom, opram, 0); } -void necdsp_device::execute_run() +void necdsp_device::execute_run() { UINT32 opcode; @@ -356,7 +356,7 @@ void necdsp_device::execute_run() case 2: exec_jp(opcode); break; case 3: exec_ld(opcode); break; } - + INT32 result = (INT32)regs.k * regs.l; //sign + 30-bit result regs.m = result >> 15; //store sign + top 15-bits regs.n = result << 1; //store low 15-bits + zero @@ -584,12 +584,12 @@ void necdsp_device::exec_ld(UINT32 opcode) { } UINT8 necdsp_device::snesdsp_read(bool mode) { - + if (!mode) { return regs.sr >> 8; } - + if (regs.sr.drc == 0) { //16-bit @@ -597,14 +597,14 @@ UINT8 necdsp_device::snesdsp_read(bool mode) { { regs.sr.drs = 1; return regs.dr >> 0; - } - else + } + else { regs.sr.rqm = 0; regs.sr.drs = 0; return regs.dr >> 8; } - } + } else { //8-bit @@ -615,23 +615,23 @@ UINT8 necdsp_device::snesdsp_read(bool mode) { void necdsp_device::snesdsp_write(bool mode, UINT8 data) { if (!mode) return; - - if (regs.sr.drc == 0) + + if (regs.sr.drc == 0) { //16-bit if (regs.sr.drs == 0) { regs.sr.drs = 1; regs.dr = (regs.dr & 0xff00) | (data << 0); - } - else + } + else { regs.sr.rqm = 0; regs.sr.drs = 0; regs.dr = (data << 8) | (regs.dr & 0x00ff); } - } - else + } + else { //8-bit regs.sr.rqm = 0; diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/emu/cpu/upd7725/upd7725.h index 82f65034a4c..4e64e74e57e 100755 --- a/src/emu/cpu/upd7725/upd7725.h +++ b/src/emu/cpu/upd7725/upd7725.h @@ -113,7 +113,7 @@ private: struct Flag { bool s1, s0, c, z, ov1, ov0; - + inline operator unsigned() const { return (s1 << 5) + (s0 << 4) + (c << 3) + (z << 2) + (ov1 << 1) + (ov0 << 0); @@ -129,14 +129,14 @@ private: struct Status { bool rqm, usf1, usf0, drs, dma, drc, soc, sic, ei, p1, p0; - + inline operator unsigned() const { return (rqm << 15) + (usf1 << 14) + (usf0 << 13) + (drs << 12) + (dma << 11) + (drc << 10) + (soc << 9) + (sic << 8) + (ei << 7) + (p1 << 1) + (p0 << 0); } - + inline unsigned operator=(unsigned d) { rqm = d & 0x8000; usf1 = d & 0x4000; usf0 = d & 0x2000; drs = d & 0x1000; @@ -146,7 +146,7 @@ private: } }; - struct Regs + struct Regs { UINT16 pc; //program counter UINT16 stack[16]; //LIFO diff --git a/src/emu/cpu/x86emit.h b/src/emu/cpu/x86emit.h index 49dfe8256d4..7d4129d0def 100644 --- a/src/emu/cpu/x86emit.h +++ b/src/emu/cpu/x86emit.h @@ -301,7 +301,7 @@ const UINT32 OP_ADD_Ev_Gv = 0x01; const UINT32 OP_ADD_Gb_Eb = (0x02 | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_ADD_Gv_Ev = 0x03; const UINT32 OP_ADD_AL_Ib = 0x04; -const UINT32 OP_ADD_rAX_Iz = 0x05; +const UINT32 OP_ADD_rAX_Iz = 0x05; const UINT32 OP_PUSH_ES = 0x06; const UINT32 OP_POP_ES = 0x07; const UINT32 OP_OR_Eb_Gb = (0x08 | OPFLAG_8BITRM | OPFLAG_8BITREG); @@ -318,7 +318,7 @@ const UINT32 OP_ADC_Ev_Gv = 0x11; const UINT32 OP_ADC_Gb_Eb = (0x12 | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_ADC_Gv_Ev = 0x13; const UINT32 OP_ADC_AL_Ib = 0x14; -const UINT32 OP_ADC_rAX_Iz = 0x15; +const UINT32 OP_ADC_rAX_Iz = 0x15; const UINT32 OP_PUSH_SS = 0x16; const UINT32 OP_POP_SS = 0x17; const UINT32 OP_SBB_Eb_Gb = (0x18 | OPFLAG_8BITRM | OPFLAG_8BITREG); @@ -326,7 +326,7 @@ const UINT32 OP_SBB_Ev_Gv = 0x19; const UINT32 OP_SBB_Gb_Eb = (0x1a | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_SBB_Gv_Ev = 0x1b; const UINT32 OP_SBB_AL_Ib = 0x1c; -const UINT32 OP_SBB_eAX_Iv = 0x1d; +const UINT32 OP_SBB_eAX_Iv = 0x1d; const UINT32 OP_PUSH_DS = 0x1e; const UINT32 OP_POP_DS = 0x1f; @@ -335,7 +335,7 @@ const UINT32 OP_AND_Ev_Gv = 0x21; const UINT32 OP_AND_Gb_Eb = (0x22 | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_AND_Gv_Ev = 0x23; const UINT32 OP_AND_AL_Ib = 0x24; -const UINT32 OP_AND_rAX_Iz = 0x25; +const UINT32 OP_AND_rAX_Iz = 0x25; const UINT32 PREFIX_ES = 0x26; const UINT32 OP_DAA = 0x27; const UINT32 OP_SUB_Eb_Gb = (0x28 | OPFLAG_8BITRM | OPFLAG_8BITREG); @@ -343,7 +343,7 @@ const UINT32 OP_SUB_Ev_Gv = 0x29; const UINT32 OP_SUB_Gb_Eb = (0x2a | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_SUB_Gv_Ev = 0x2b; const UINT32 OP_SUB_AL_Ib = 0x2c; -const UINT32 OP_SUB_eAX_Iv = 0x2d; +const UINT32 OP_SUB_eAX_Iv = 0x2d; const UINT32 PREFIX_CS = 0x2e; const UINT32 OP_DAS = 0x2f; @@ -352,7 +352,7 @@ const UINT32 OP_XOR_Ev_Gv = 0x31; const UINT32 OP_XOR_Gb_Eb = (0x32 | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_XOR_Gv_Ev = 0x33; const UINT32 OP_XOR_AL_Ib = 0x34; -const UINT32 OP_XOR_rAX_Iz = 0x35; +const UINT32 OP_XOR_rAX_Iz = 0x35; const UINT32 PREFIX_SS = 0x36; const UINT32 OP_AAA = 0x37; const UINT32 OP_CMP_Eb_Gb = (0x38 | OPFLAG_8BITRM | OPFLAG_8BITREG); @@ -360,7 +360,7 @@ const UINT32 OP_CMP_Ev_Gv = 0x39; const UINT32 OP_CMP_Gb_Eb = (0x3a | OPFLAG_8BITRM | OPFLAG_8BITREG); const UINT32 OP_CMP_Gv_Ev = 0x3b; const UINT32 OP_CMP_AL_Ib = 0x3c; -const UINT32 OP_CMP_eAX_Iv = 0x3d; +const UINT32 OP_CMP_eAX_Iv = 0x3d; const UINT32 PREFIX_DS = 0x3e; const UINT32 OP_AAS = 0x3f; diff --git a/src/emu/devimage.c b/src/emu/devimage.c index ee7986d688f..4986e56468f 100644 --- a/src/emu/devimage.c +++ b/src/emu/devimage.c @@ -353,7 +353,7 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent if (software_get_support(swlist, swname) == SOFTWARE_SUPPORTED_NO) mame_printf_error("WARNING: support for software %s (in list %s) is only preliminary\n", swname, swlist); - + // check if locationtag actually contains two locations separated by '%' // (i.e. check if we are dealing with a clone in softwarelist) astring tag2, tag3, tag4(locationtag), tag5; diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index d22481ca0c8..25d36294eef 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -67,7 +67,7 @@ enum XTAL_5_7143MHz = 5714300, /* Cidelsa Destroyer */ XTAL_5_9904MHz = 5990400, /* Luxor ABC 800 keyboard */ XTAL_6MHz = 6000000, /* American Poker II */ - XTAL_6_5MHz = 6500000, /* Jupiter Ace */ + XTAL_6_5MHz = 6500000, /* Jupiter Ace */ XTAL_6_144MHz = 6144000, /* Used on Alpha Denshi early 80's games sound board */ XTAL_7MHz = 7000000, /* Jaleco Mega System PCBs */ XTAL_7_15909MHz = 7159090, /* Blood Bros */ diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index d78d0863efb..30c5df10bfa 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -159,7 +159,7 @@ const options_entry mame_core_options[] = { "cheat;c", "0", OPTION_BOOLEAN, "enable cheat subsystem" }, { "skip_gameinfo", "0", OPTION_BOOLEAN, "skip displaying the information screen at startup" }, { "uifont", "default", 0, "specify a font to use" }, - { "ramsize;ram", NULL, OPTION_DRIVER_ONLY,"size of RAM (if supported by driver)" }, + { "ramsize;ram", NULL, OPTION_DRIVER_ONLY,"size of RAM (if supported by driver)" }, /* image device options */ { OPTION_ADDED_DEVICE_OPTIONS, "0", OPTION_BOOLEAN | OPTION_INTERNAL, "image device-specific options have been added" }, diff --git a/src/emu/imagedev/cartslot.c b/src/emu/imagedev/cartslot.c index daa7e44e961..9ac546c77cb 100644 --- a/src/emu/imagedev/cartslot.c +++ b/src/emu/imagedev/cartslot.c @@ -371,10 +371,10 @@ static const cartslot_pcb_type *identify_pcb(device_image_interface &image) { if (me != MCERR_NOT_MULTICART) fatalerror("multicart error: %s", multicart_error_text(me)); - + /* Force fetching of image metadata */ image.crc(); - + if (image.pcb() != NULL) { /* read from hash file */ diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c index 2c3962b8804..008fa87fb2b 100644 --- a/src/emu/imagedev/chd_cd.c +++ b/src/emu/imagedev/chd_cd.c @@ -79,7 +79,7 @@ static DEVICE_IMAGE_LOAD(cdrom) dev_cdrom_t *cdrom = get_safe_token(&image.device()); chd_error err = (chd_error)0; chd_file *chd = NULL; - astring tempstring; + astring tempstring; if (image.software_entry() == NULL) { @@ -148,7 +148,7 @@ static DEVICE_START(cdrom) static DEVICE_IMAGE_SOFTLIST_LOAD(cdrom) { load_software_part_region( &image.device(), swlist, swname, start_entry ); - return TRUE; + return TRUE; } /*------------------------------------------------- diff --git a/src/emu/imagedev/snapquik.h b/src/emu/imagedev/snapquik.h index db9bab25259..37ccfa12a2c 100644 --- a/src/emu/imagedev/snapquik.h +++ b/src/emu/imagedev/snapquik.h @@ -104,7 +104,7 @@ struct _z80bin_config MCFG_DEVICE_CONFIG_DATA64(snapquick_config, delay_seconds, (seconds_t) (_delay)) \ MCFG_DEVICE_CONFIG_DATA64(snapquick_config, delay_attoseconds, (attoseconds_t) (((_delay) - (int)(_delay)) * ATTOSECONDS_PER_SECOND)) \ MCFG_DEVICE_CONFIG_DATAPTR(z80bin_config, execute, Z80BIN_EXECUTE_NAME(_execute)) - + /*************************************************************************** FUNCTION PROTOTYPES ***************************************************************************/ diff --git a/src/emu/info.c b/src/emu/info.c index d58fe495858..e5558944259 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -1108,7 +1108,7 @@ static void print_game_info(FILE *out, const game_driver *game) print_game_adjusters(out, game, portlist); print_game_driver(out, game, config); print_game_images( out, game, config ); - print_game_software_list( out, game, config ); + print_game_software_list( out, game, config ); print_game_ramoptions( out, game, config ); /* close the topmost tag */ fprintf(out, "\t\n"); diff --git a/src/emu/mame.c b/src/emu/mame.c index 58e1b6c6575..4f7006fe37c 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -554,9 +554,9 @@ void mame_parse_ini_files(core_options *options, const game_driver *driver) parse_ini_file(options, gparent->name, OPTION_PRIORITY_GPARENT_INI); if (parent != NULL) parse_ini_file(options, parent->name, OPTION_PRIORITY_PARENT_INI); - + options_revert_driver_only(options, OPTION_PRIORITY_CMDLINE); - + parse_ini_file(options, driver->name, OPTION_PRIORITY_DRIVER_INI); } } diff --git a/src/emu/romload.c b/src/emu/romload.c index 7010aa25bbe..81539f92a0b 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -684,7 +684,7 @@ static int open_rom_file(rom_load_data *romdata, const char *regiontag, const ro if (separator2 != -1) { has_parent = TRUE; - + // we are loading a clone through softlists, split the setname from the parentname tag5.cpysubstr(tag4, separator2 + 1, tag4.len() - separator2 + 1); tag4.del(separator2, tag4.len() - separator2); @@ -1073,17 +1073,17 @@ chd_error open_disk_image_options(core_options *options, const game_driver *game astring tag1(locationtag), tag2, tag3, tag4, tag5; bool is_list = FALSE; bool has_parent = FALSE; - + int separator1 = tag1.chr(0, '%'); if (separator1 != -1) { is_list = TRUE; - + // we are loading through softlists, split the listname from the regiontag tag4.cpysubstr(tag1, separator1 + 1, tag1.len() - separator1 + 1); tag1.del(separator1, tag1.len() - separator1); tag1.cat(PATH_SEPARATOR); - + // check if we are loading a clone (if this is the case also tag1 have a separator '%') int separator2 = tag4.chr(0, '%'); if (separator2 != -1) @@ -1094,7 +1094,7 @@ chd_error open_disk_image_options(core_options *options, const game_driver *game tag5.cpysubstr(tag4, separator2 + 1, tag4.len() - separator2 + 1); tag4.del(separator2, tag4.len() - separator2); } - + // prepare locations where we have to load from: list/parentname (if any) & list/clonename astring swlist(tag1.cstr()); tag2.cpy(swlist.cat(tag4)); @@ -1104,10 +1104,10 @@ chd_error open_disk_image_options(core_options *options, const game_driver *game tag3.cpy(swlist.cat(tag5)); } } - + if (tag5.chr(0, '%') != -1) fatalerror("We do not support clones of clones!\n"); - + // try to load from the available location(s): // - if we are not using lists, we have locationtag only; // - if we are using lists, we have: list/clonename, list/parentname, clonename, parentname @@ -1421,7 +1421,7 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom romdata->errorstring.catprintf("WARNING: support for software %s (in list %s) is only preliminary\n", swname, swlist); romdata->warnings++; } - + /* loop until we hit the end */ for (region = start_region; region != NULL; region = rom_next_region(region)) { diff --git a/src/emu/softlist.c b/src/emu/softlist.c index 8707edca41c..f354f97527b 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -832,7 +832,7 @@ const char *software_get_clone(char *swlist, const char *swname) { software_info *tmp = software_list_find(software_list_ptr, swname, NULL); retval = core_strdup(tmp->parentname); - software_list_close(software_list_ptr); + software_list_close(software_list_ptr); } return retval; @@ -853,7 +853,7 @@ UINT32 software_get_support(char *swlist, const char *swname) { software_info *tmp = software_list_find(software_list_ptr, swname, NULL); retval = tmp->supported; - software_list_close(software_list_ptr); + software_list_close(software_list_ptr); } return retval; @@ -1525,18 +1525,18 @@ bool load_software_part(device_image_interface *image, const char *path, softwar const char *software_part_get_feature(software_part *part, const char *feature_name) { feature_list *feature; - + if (part == NULL) return NULL; - + for (feature = part->featurelist; feature; feature = feature->next) { if (!strcmp(feature->name, feature_name)) return feature->value; } - + return NULL; - + } diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c index 0bcf51d402f..cf0c776ae50 100644 --- a/src/emu/sound/bsmt2000.c +++ b/src/emu/sound/bsmt2000.c @@ -139,7 +139,7 @@ device_t *bsmt2000_device_config::alloc_device(running_machine &machine) const //------------------------------------------------- -// static_set_ready_callback - configuration +// static_set_ready_callback - configuration // helper to set the ready callback //------------------------------------------------- @@ -228,7 +228,7 @@ void bsmt2000_device::device_start() // internally at 24MHz the max output sample rate is 32kHz // divided by 128 gives us 6x the max output rate which is plenty for oversampling m_stream = stream_create(*this, 0, 2, clock() / 128); - + // register for save states state_save_register_device_item(this, 0, m_register_select); state_save_register_device_item(this, 0, m_write_data); @@ -264,12 +264,12 @@ void bsmt2000_device::device_timer(emu_timer &timer, device_timer_id id, int par stream_update(m_stream); m_cpu->reset(); break; - + // deferred register write case TIMER_ID_REG_WRITE: m_register_select = param & 0xffff; break; - + // deferred data write case TIMER_ID_DATA_WRITE: m_write_data = param & 0xffff; @@ -307,7 +307,7 @@ UINT16 bsmt2000_device::read_status() //------------------------------------------------- -// write_reg - handle writes to the BSMT2000 +// write_reg - handle writes to the BSMT2000 // register select interface //------------------------------------------------- @@ -318,14 +318,14 @@ void bsmt2000_device::write_reg(UINT16 data) //------------------------------------------------- -// write_data - handle writes to the BSMT2000 +// write_data - handle writes to the BSMT2000 // data port //------------------------------------------------- void bsmt2000_device::write_data(UINT16 data) { device_timer_call_after_resynch(*this, TIMER_ID_DATA_WRITE, data); - + // boost the interleave on a write so that the caller detects the status more accurately m_machine.scheduler().boost_interleave(ATTOTIME_IN_USEC(1), ATTOTIME_IN_USEC(10)); } @@ -343,7 +343,7 @@ READ16_MEMBER( bsmt2000_device::tms_register_r ) //------------------------------------------------- -// tms_data_r - return the value written to the +// tms_data_r - return the value written to the // data port //------------------------------------------------- @@ -392,7 +392,7 @@ WRITE16_MEMBER( bsmt2000_device::tms_rom_bank_w ) //------------------------------------------------- -// tms_left_w - handle writes to the left channel +// tms_left_w - handle writes to the left channel // DAC //------------------------------------------------- @@ -404,7 +404,7 @@ WRITE16_MEMBER( bsmt2000_device::tms_left_w ) //------------------------------------------------- -// tms_right_w - handle writes to the right +// tms_right_w - handle writes to the right // channel DAC //------------------------------------------------- diff --git a/src/emu/sound/bsmt2000.h b/src/emu/sound/bsmt2000.h index 435f570ec42..4d5ffc76362 100644 --- a/src/emu/sound/bsmt2000.h +++ b/src/emu/sound/bsmt2000.h @@ -74,7 +74,7 @@ class bsmt2000_device_config : public device_config, public device_config_memory_interface { friend class bsmt2000_device; - + typedef void (*ready_callback)(bsmt2000_device &device); // construction/destruction @@ -98,7 +98,7 @@ protected: // internal state const address_space_config m_space_config; - + // inline data ready_callback m_ready_callback; }; @@ -126,7 +126,7 @@ protected: virtual void device_start(); virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - + // sound interface overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); diff --git a/src/emu/sound/disc_cls.h b/src/emu/sound/disc_cls.h index dfb36fea2a0..e6be420716f 100644 --- a/src/emu/sound/disc_cls.h +++ b/src/emu/sound/disc_cls.h @@ -15,7 +15,7 @@ * * Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins * Discrete parallel tasks 2009 - Couriersud - * Discrete classes 2010 - Couriersud + * Discrete classes 2010 - Couriersud * ***********************************************************************/ @@ -25,7 +25,7 @@ #define DISCRETE_CLASS_CONSTRUCTOR(_name, _base) \ public: \ - DISCRETE_CLASS_NAME(_name)() \ + DISCRETE_CLASS_NAME(_name)() \ : DISCRETE_CLASS_NAME(_base)() { } #define DISCRETE_CLASS_DESTRUCTOR(_name) \ @@ -45,7 +45,7 @@ private: \ _priv \ } -#define DISCRETE_CLASS_STEP(_name, _maxout, _priv) \ +#define DISCRETE_CLASS_STEP(_name, _maxout, _priv) \ class DISCRETE_CLASS_NAME(_name): public discrete_base_node, public discrete_step_interface \ { \ DISCRETE_CLASS_CONSTRUCTOR(_name, base) \ @@ -58,7 +58,7 @@ private: \ _priv \ } -#define DISCRETE_CLASS_RESET(_name, _maxout) \ +#define DISCRETE_CLASS_RESET(_name, _maxout) \ class DISCRETE_CLASS_NAME(_name): public discrete_base_node \ { \ DISCRETE_CLASS_CONSTRUCTOR(_name, base) \ @@ -68,7 +68,7 @@ public: \ int max_output(void) { return _maxout; } \ } -#define DISCRETE_CLASS(_name, _maxout, _priv) \ +#define DISCRETE_CLASS(_name, _maxout, _priv) \ class DISCRETE_CLASS_NAME(_name): public discrete_base_node, public discrete_step_interface \ { \ DISCRETE_CLASS_DESTRUCTOR(_name) \ @@ -105,7 +105,7 @@ public: * *************************************/ -class DISCRETE_CLASS_NAME(dso_output): public discrete_base_node, +class DISCRETE_CLASS_NAME(dso_output): public discrete_base_node, public discrete_sound_output_interface, public discrete_step_interface { @@ -238,7 +238,7 @@ private: UINT8 m_data; /* data written */ UINT8 m_is_buffered; /* the buffer stream */ - sound_stream *m_buffer_stream; + sound_stream *m_buffer_stream; }; class DISCRETE_CLASS_NAME(dss_input_buffer): public DISCRETE_CLASS_NAME(dss_input_stream) diff --git a/src/emu/sound/disc_dev.h b/src/emu/sound/disc_dev.h index e45cdde1e36..1915a47233b 100644 --- a/src/emu/sound/disc_dev.h +++ b/src/emu/sound/disc_dev.h @@ -15,7 +15,7 @@ * * Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins * Discrete parallel tasks 2009 - Couriersud - * Discrete classes 2010 - Couriersud + * Discrete classes 2010 - Couriersud * ***********************************************************************/ @@ -98,7 +98,7 @@ DISCRETE_CLASS_STEP_RESET(dsd_555_vco1, 1, ); DISCRETE_CLASS_STEP_RESET(dsd_566, 1, - unsigned int m_state[2]; /* keeps track of excess flip_flop changes during the current step */ + unsigned int m_state[2]; /* keeps track of excess flip_flop changes during the current step */ int m_flip_flop; /* 566 flip/flop output state */ double m_cap_voltage; /* voltage on cap */ double m_v_sqr_low; /* voltage for a squarewave at low */ diff --git a/src/emu/sound/disc_flt.h b/src/emu/sound/disc_flt.h index 8a8e586c058..3a62857a8b7 100644 --- a/src/emu/sound/disc_flt.h +++ b/src/emu/sound/disc_flt.h @@ -15,7 +15,7 @@ * * Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins * Discrete parallel tasks 2009 - Couriersud - * Discrete classes 2010 - Couriersud + * Discrete classes 2010 - Couriersud * ***********************************************************************/ @@ -72,35 +72,35 @@ DISCRETE_CLASS_STEP_RESET(dst_op_amp_filt, 1, ); DISCRETE_CLASS_STEP_RESET(dst_rc_circuit_1, 1, - double m_v_cap; - double m_v_charge_1_2; + double m_v_cap; + double m_v_charge_1_2; double m_v_drop; - double m_exp_1; - double m_exp_1_2; - double m_exp_2; + double m_exp_1; + double m_exp_1_2; + double m_exp_2; ); DISCRETE_CLASS_STEP_RESET(dst_rcdisc, 1, int m_state; - double m_t; /* time */ - double m_exponent0; + double m_t; /* time */ + double m_exponent0; ); DISCRETE_CLASS_STEP_RESET(dst_rcdisc2, 1, int m_state; double m_v_out; - double m_t; /* time */ - double m_exponent0; - double m_exponent1; + double m_t; /* time */ + double m_exponent0; + double m_exponent1; ); DISCRETE_CLASS_STEP_RESET(dst_rcdisc3, 1, int m_state; double m_v_out; - double m_t; /* time */ - double m_exponent0; - double m_exponent1; - double m_v_diode; /* rcdisc3 */ + double m_t; /* time */ + double m_exponent0; + double m_exponent1; + double m_v_diode; /* rcdisc3 */ ); DISCRETE_CLASS_STEP_RESET(dst_rcdisc4, 1, @@ -113,9 +113,9 @@ DISCRETE_CLASS_STEP_RESET(dst_rcdisc4, 1, DISCRETE_CLASS_STEP_RESET(dst_rcdisc5, 1, int m_state; - double m_t; /* time */ - double m_exponent0; - double m_v_cap; /* rcdisc5 */ + double m_t; /* time */ + double m_exponent0; + double m_v_cap; /* rcdisc5 */ ); DISCRETE_CLASS_STEP_RESET(dst_rcintegrate, 1, @@ -130,7 +130,7 @@ DISCRETE_CLASS_STEP_RESET(dst_rcintegrate, 1, double m_exp_exponent1; double m_c_exp0; double m_c_exp1; - double m_EM_IC_0_7; + double m_EM_IC_0_7; ); DISCRETE_CLASS_STEP_RESET(dst_rcdisc_mod, 1, @@ -153,25 +153,25 @@ DISCRETE_CLASS_STEP_RESET(dst_rcfilter, 1, DISCRETE_CLASS_STEP_RESET(dst_rcfilter_sw, 1, double m_vCap[4]; double m_exp[4]; - double m_exp0; /* fast case bit 0 */ - double m_exp1; /* fast case bit 1 */ - double m_factor; /* fast case */ - double m_f1[16]; - double m_f2[16]; + double m_exp0; /* fast case bit 0 */ + double m_exp1; /* fast case bit 1 */ + double m_factor; /* fast case */ + double m_f1[16]; + double m_f2[16]; ); DISCRETE_CLASS_STEP_RESET(dst_rcdiscN, 1, - double m_x1; /* x[k-1], previous input value */ - double m_y1; /* y[k-1], previous output value */ - double m_a1; /* digital filter coefficients, denominator */ - double m_b[2]; /* digital filter coefficients, numerator */ + double m_x1; /* x[k-1], previous input value */ + double m_y1; /* y[k-1], previous output value */ + double m_a1; /* digital filter coefficients, denominator */ + double m_b[2]; /* digital filter coefficients, numerator */ ); DISCRETE_CLASS_STEP_RESET(dst_rcdisc2N, 1, struct discrete_filter_coeff m_fc0; struct discrete_filter_coeff m_fc1; - double m_x1; - double m_y1; + double m_x1; + double m_y1; ); diff --git a/src/emu/sound/disc_inp.c b/src/emu/sound/disc_inp.c index 57aad660197..054d2d485eb 100644 --- a/src/emu/sound/disc_inp.c +++ b/src/emu/sound/disc_inp.c @@ -23,7 +23,7 @@ READ8_DEVICE_HANDLER(discrete_sound_r) { discrete_device *disc_device = downcast(device); - return disc_device->read( *disc_device->machine->firstcpu->space(), offset, 0xff); + return disc_device->read( *disc_device->machine->firstcpu->space(), offset, 0xff); } diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c index b04af0f0c0b..65cb10b2fff 100644 --- a/src/emu/sound/disc_mth.c +++ b/src/emu/sound/disc_mth.c @@ -1585,7 +1585,7 @@ DISCRETE_STEP(dst_transform) { switch (*fPTR++) { - case TOK_MULT: top = stack.pop() * top; break; + case TOK_MULT: top = stack.pop() * top; break; case TOK_DIV: top = stack.pop() / top; break; case TOK_ADD: top = stack.pop() + top; break; case TOK_MINUS: top = stack.pop() - top; break; @@ -1630,7 +1630,7 @@ DISCRETE_RESET(dst_transform) case '4': *p = TOK_4; break; case 'P': *p = TOK_DUP; break; case 'a': *p = TOK_ABS; break; /* absolute value */ - case 'i': *p = TOK_NEG; break; /* * -1 */ + case 'i': *p = TOK_NEG; break; /* * -1 */ case '!': *p = TOK_NOT; break; /* Logical NOT of Last Value */ case '=': *p = TOK_EQUAL; break; /* Logical = */ case '>': *p = TOK_GREATER; break; /* Logical > */ @@ -1863,7 +1863,7 @@ DISCRETE_STEP(dst_tvca_op_amp) double i_pos = 0; /* current into + input */ double i_out = 0; /* current at output */ - double v_out; + double v_out; trig0 = (int)DST_TVCA_OP_AMP__TRG0; trig1 = (int)DST_TVCA_OP_AMP__TRG1; diff --git a/src/emu/sound/disc_mth.h b/src/emu/sound/disc_mth.h index ad797345567..5debe62bfb6 100644 --- a/src/emu/sound/disc_mth.h +++ b/src/emu/sound/disc_mth.h @@ -15,7 +15,7 @@ * * Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins * Discrete parallel tasks 2009 - Couriersud - * Discrete classes 2010 - Couriersud + * Discrete classes 2010 - Couriersud * ***********************************************************************/ @@ -56,7 +56,7 @@ DISCRETE_CLASS_STEP_RESET(dst_logic_dff, 1, ); DISCRETE_CLASS_STEP_RESET(dst_logic_jkff, 1, - double m_v_out; + double m_v_out; int m_last_clk; ); @@ -91,7 +91,7 @@ DISCRETE_CLASS_STEP_RESET(dst_ramp, 1, ); DISCRETE_CLASS_STEP_RESET(dst_samphold, 1, - double m_last_input; + double m_last_input; int m_clocktype; ); @@ -118,13 +118,13 @@ public: TOK_4, TOK_DUP, TOK_ABS, /* absolute value */ - TOK_NEG, /* * -1 */ + TOK_NEG, /* * -1 */ TOK_NOT, /* Logical NOT of Last Value */ TOK_EQUAL, /* Logical = */ TOK_GREATER, /* Logical > */ TOK_LESS, /* Logical < */ TOK_AND, /* Bitwise AND */ - TOK_OR, /* Bitwise OR */ + TOK_OR, /* Bitwise OR */ TOK_XOR /* Bitwise XOR */ }; void step(void); diff --git a/src/emu/sound/disc_wav.h b/src/emu/sound/disc_wav.h index 0bbde51d10b..2c711205a13 100644 --- a/src/emu/sound/disc_wav.h +++ b/src/emu/sound/disc_wav.h @@ -15,7 +15,7 @@ * * Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins * Discrete parallel tasks 2009 - Couriersud - * Discrete classes 2010 - Couriersud + * Discrete classes 2010 - Couriersud * ***********************************************************************/ @@ -48,7 +48,7 @@ DISCRETE_CLASS_STEP_RESET(dss_lfsr_noise, 2, ); DISCRETE_CLASS_STEP_RESET(dss_noise, 2, - double m_phase; + double m_phase; ); DISCRETE_CLASS_STEP_RESET(dss_note, 1, @@ -128,12 +128,12 @@ protected: inline double tftab(double x); inline double tf(double x); private: - DISCRETE_CLASS_INPUT(I_ENABLE, 0); + DISCRETE_CLASS_INPUT(I_ENABLE, 0); DISCRETE_CLASS_INPUT(I_MOD, 1); - DISCRETE_CLASS_INPUT(I_RC, 2); - DISCRETE_CLASS_INPUT(I_RP, 3); - DISCRETE_CLASS_INPUT(I_C, 4); - DISCRETE_CLASS_INPUT(I_R2, 5); + DISCRETE_CLASS_INPUT(I_RC, 2); + DISCRETE_CLASS_INPUT(I_RP, 3); + DISCRETE_CLASS_INPUT(I_C, 4); + DISCRETE_CLASS_INPUT(I_R2, 5); double mc_v_cap; double mc_v_g2_old; diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index c1477911f09..4a6585b06a1 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -112,7 +112,7 @@ public: inline void unlock(void) { m_threadid = -1; } //const linked_list_entry *list; - node_step_list_t step_list; + node_step_list_t step_list; /* list of source nodes */ dynamic_array_t source_list; /* discrete_source_node */ @@ -135,7 +135,7 @@ protected: void check(discrete_task *dest_task); void prepare_for_queue(int samples); - dynamic_array_t m_buffers; + dynamic_array_t m_buffers; discrete_device & m_device; private: @@ -303,7 +303,7 @@ void discrete_task::check(discrete_task *dest_task) output_buffer *pbuf = NULL; for (i = 0; i < m_buffers.count(); i++) -// if (m_buffers[i].node->block_node() == inputnode_num) +// if (m_buffers[i].node->block_node() == inputnode_num) if (m_buffers[i].node_num == inputnode_num) { found = i; diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index 885f11c5d1f..d8682640e57 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -3503,7 +3503,7 @@ #define DISCRETE_STOP(_class) void DISCRETE_CLASS_FUNC(_class, stop)(void) #define DISCRETE_DECLARE_INFO(_name) const _name *info = (const _name *)this->custom_data(); -//#define DISCRETE_INPUT(_num) (*(this->m_input[_num])) +//#define DISCRETE_INPUT(_num) (*(this->m_input[_num])) #define DISCRETE_INPUT(_num) (input(_num)) /************************************* @@ -3817,7 +3817,7 @@ public: m_arr[i-1] = m_arr[i]; m_count--; } - inline void clear(void) { m_count = 0; } + inline void clear(void) { m_count = 0; } inline int count(void) const { return m_count; } inline T *begin_ptr(void) const { return m_arr; } inline T *end_ptr(void) const { return m_arr + (m_count - 1); } @@ -4383,7 +4383,7 @@ protected: double m_neg_sample_time; /* list of all nodes */ - node_list_t m_node_list; /* node_description * */ + node_list_t m_node_list; /* node_description * */ private: void discrete_build_list(const discrete_block *intf, sound_block_list_t &block_list); @@ -4427,7 +4427,7 @@ public: // ======================> discrete_sound_device -class discrete_sound_device : public discrete_device, +class discrete_sound_device : public discrete_device, public device_sound_interface { friend class discrete_sound_device_config; @@ -4462,7 +4462,7 @@ private: /* the input streams */ istream_node_list_t m_input_stream_list; /* output node tracking */ - node_output_list_t m_output_list; + node_output_list_t m_output_list; }; // device type definition diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index 5377a236408..08a11f9cf31 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -324,7 +324,7 @@ void okim6295_device::write_command(UINT8 command) // the manual explicitly says that it's not possible to start multiple voices at the same time int voicemask = command >> 4; //if (voicemask != 0 && voicemask != 1 && voicemask != 2 && voicemask != 4 && voicemask != 8) - // popmessage("OKI6295 start %x contact MAMEDEV", voicemask); + // popmessage("OKI6295 start %x contact MAMEDEV", voicemask); // update the stream stream_update(m_stream); diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c index fd2398494ac..377f151eae7 100644 --- a/src/emu/sound/segapcm.c +++ b/src/emu/sound/segapcm.c @@ -35,26 +35,26 @@ static STREAM_UPDATE( SEGAPCM_update ) memset(outputs[0], 0, samples*sizeof(*outputs[0])); memset(outputs[1], 0, samples*sizeof(*outputs[1])); - // reg function + // reg function // ------------------------------------------------ - // 0x00 ? - // 0x01 ? - // 0x02 volume left - // 0x03 volume right - // 0x04 loop address (08-15) - // 0x05 loop address (16-23) - // 0x06 end address - // 0x07 address delta - // 0x80 ? - // 0x81 ? - // 0x82 ? - // 0x83 ? - // 0x84 current address (08-15), 00-07 is internal? - // 0x85 current address (16-23) - // 0x86 bit 0: channel disable? - // bit 1: loop disable - // other bits: bank - // 0x87 ? + // 0x00 ? + // 0x01 ? + // 0x02 volume left + // 0x03 volume right + // 0x04 loop address (08-15) + // 0x05 loop address (16-23) + // 0x06 end address + // 0x07 address delta + // 0x80 ? + // 0x81 ? + // 0x82 ? + // 0x83 ? + // 0x84 current address (08-15), 00-07 is internal? + // 0x85 current address (16-23) + // 0x86 bit 0: channel disable? + // bit 1: loop disable + // other bits: bank + // 0x87 ? /* loop over channels */ for (ch = 0; ch < 16; ch++) diff --git a/src/lib/util/options.c b/src/lib/util/options.c index b618b36e04c..9c735d5f3bf 100644 --- a/src/lib/util/options.c +++ b/src/lib/util/options.c @@ -251,9 +251,9 @@ void options_revert(core_options *opts, int priority) } /*------------------------------------------------- - options_revert_driver_only - revert options + options_revert_driver_only - revert options that are marked as driver only and are under - priority level + priority level -------------------------------------------------*/ void options_revert_driver_only(core_options *opts, int priority) @@ -475,13 +475,13 @@ int options_parse_command_line(core_options *opts, int argc, char **argv, int pr /* find our entry */ data = find_entry_data(opts, optionname, TRUE); - if (data == NULL) continue; + if (data == NULL) continue; if ((data->flags & OPTION_COMMAND) != 0) { // in case of any command force show error to TRUE show_error = TRUE; break; } - } + } /* loop over commands, looking for options */ for (arg = 1; arg < argc; arg++) { @@ -776,9 +776,9 @@ const char *options_get_string(core_options *opts, const char *name) /*------------------------------------------------- - options_get_string_priority - return data + options_get_string_priority - return data formatted as a string if priority is equal - or better + or better -------------------------------------------------*/ const char *options_get_string_priority(core_options *opts, const char *name, int priority) @@ -791,9 +791,9 @@ const char *options_get_string_priority(core_options *opts, const char *name, in message(opts, OPTMSG_ERROR, "Unexpected option %s queried\n", name); /* copy if non-NULL */ - else { + else { if (data->priority!=OPTION_PRIORITY_DEFAULT) { - if (priority > data->priority) return value; + if (priority > data->priority) return value; } value = astring_c(data->data); } @@ -1148,9 +1148,9 @@ static void update_data(core_options *opts, options_data *data, const char *newd } break; } - + /* ignore if we don't have priority */ - if (priority < data->priority) { + if (priority < data->priority) { return; } /* allocate a copy of the data */ diff --git a/src/mame/audio/beezer.c b/src/mame/audio/beezer.c index bc74fa31b14..a9d893b6a83 100644 --- a/src/mame/audio/beezer.c +++ b/src/mame/audio/beezer.c @@ -6,54 +6,54 @@ Preliminary, partially functional driver by Jonathan Gevaryahu AKA Lord Nightmare - TODO: - * The entire NOISE generator is just copied from exidy.c and is completely - wrong. It should be using an MM5837 self-clocked LFSR with taps on bits - 16(0x10) and 13(0xD) - * The entire audio 6522 VIA isn't even HANDLED in this driver yet, hence - the sound channel provided by the VIA is completely missing! (it is - handled in /machine/beezer.c as via 1 at the moment) - * Related to above, the hookup of timer1 out (from pb7 of 6522) isn't done - which means selectively latched noise cannot work properly. - * Several inexplicable things on the schematic are not handled, such as the - 'VCO' input for 6840 channel 2 external clock whose source does not appear - anywhere on the schematic, nor does it handle the 'DMOD DATA' and 'DMOD - CLR' outputs for some sort of digital modulator (perhaps an hc55516?) - from the VIA, which also does not appear anywhere on schematic. - The latter the VIA *DOES* seem to write something to, but it may be just - a silence waveform for 55516, alternating zeroes and ones. - * The volume dac ram values could be handled better, currently the MSB bit - is just thrown out; it should invert the waveform. - * The channel mixing is done additively at the moment rather than - emulating the original multiplexer, which is actually not that hard to do - * The 'FM OR AM' output of the audio via (pb1) appears to control some sort - of suppression or filtering change of the post-DAC amplifier when enabled, - only during the TIMER1 OUT time-slot of the multiplexer, see page 1B 3-3 - of schematics. This will be a MESS to emulate since theres a lot of analog - crap involved. - * The /INT line and related logic of the 6840 is not emulated, and should - be hooked to the audio 6809 - * Convert this to a modern device instead of a deprecated old style device - - - Notes on multiplexer: - The sound output is from a DAC76xx 8-bit dac; driving this dac is a pair - of 74ls670 4x4 register files wired up as four 8-bit words; - The four words are used as the volumes for four 1-bit channels by inversion - of the MSB of the 8 bit value. - The four channels are: - CNT1 CNT0 - 0 0 6522 pin 7 output (squarewave) NOT EMULATED YET; 'FM or AM' - affects this slot only - 0 1 6840 channel 1 clocked by E1(int) OR by 6522 PB7-latched NOISE - 1 0 6840 channel 2 clocked by E1(int) OR by "VCO" ext (Huh?) - 1 1 6840 channel 3 clocked by E1(int) OR by channel 2-latched NOISE - - The four slots determine which address is selected of the 8-bit words and - which source will XOR against the MSB of the 8-bit word before it goes - to the DAC (effectively making the 8-bit word be a 7-bit volume control - plus optional wave invert). The speed which cnt0 and cnt1 count at is - E1/16 or 62500Hz. + TODO: + * The entire NOISE generator is just copied from exidy.c and is completely + wrong. It should be using an MM5837 self-clocked LFSR with taps on bits + 16(0x10) and 13(0xD) + * The entire audio 6522 VIA isn't even HANDLED in this driver yet, hence + the sound channel provided by the VIA is completely missing! (it is + handled in /machine/beezer.c as via 1 at the moment) + * Related to above, the hookup of timer1 out (from pb7 of 6522) isn't done + which means selectively latched noise cannot work properly. + * Several inexplicable things on the schematic are not handled, such as the + 'VCO' input for 6840 channel 2 external clock whose source does not appear + anywhere on the schematic, nor does it handle the 'DMOD DATA' and 'DMOD + CLR' outputs for some sort of digital modulator (perhaps an hc55516?) + from the VIA, which also does not appear anywhere on schematic. + The latter the VIA *DOES* seem to write something to, but it may be just + a silence waveform for 55516, alternating zeroes and ones. + * The volume dac ram values could be handled better, currently the MSB bit + is just thrown out; it should invert the waveform. + * The channel mixing is done additively at the moment rather than + emulating the original multiplexer, which is actually not that hard to do + * The 'FM OR AM' output of the audio via (pb1) appears to control some sort + of suppression or filtering change of the post-DAC amplifier when enabled, + only during the TIMER1 OUT time-slot of the multiplexer, see page 1B 3-3 + of schematics. This will be a MESS to emulate since theres a lot of analog + crap involved. + * The /INT line and related logic of the 6840 is not emulated, and should + be hooked to the audio 6809 + * Convert this to a modern device instead of a deprecated old style device + + + Notes on multiplexer: + The sound output is from a DAC76xx 8-bit dac; driving this dac is a pair + of 74ls670 4x4 register files wired up as four 8-bit words; + The four words are used as the volumes for four 1-bit channels by inversion + of the MSB of the 8 bit value. + The four channels are: + CNT1 CNT0 + 0 0 6522 pin 7 output (squarewave) NOT EMULATED YET; 'FM or AM' + affects this slot only + 0 1 6840 channel 1 clocked by E1(int) OR by 6522 PB7-latched NOISE + 1 0 6840 channel 2 clocked by E1(int) OR by "VCO" ext (Huh?) + 1 1 6840 channel 3 clocked by E1(int) OR by channel 2-latched NOISE + + The four slots determine which address is selected of the 8-bit words and + which source will XOR against the MSB of the 8-bit word before it goes + to the DAC (effectively making the 8-bit word be a 7-bit volume control + plus optional wave invert). The speed which cnt0 and cnt1 count at is + E1/16 or 62500Hz. *************************************************************************/ @@ -148,8 +148,8 @@ INLINE beezer_sound_state *get_safe_token(device_t *device) /*static WRITE_LINE_DEVICE_HANDLER( update_irq_state ) { - beezer_sound_state *sndstate = get_safe_token(device); - cputag_set_input_line(device->machine, "audiocpu", M6809_IRQ_LINE, (sndstate->ptm_irq_state) ? ASSERT_LINE : CLEAR_LINE); + beezer_sound_state *sndstate = get_safe_token(device); + cputag_set_input_line(device->machine, "audiocpu", M6809_IRQ_LINE, (sndstate->ptm_irq_state) ? ASSERT_LINE : CLEAR_LINE); }*/ @@ -352,7 +352,7 @@ static STREAM_UPDATE( beezer_stream_update ) sample += (state->sh6840_volume[2]&0x7F); else sample -= (state->sh6840_volume[2]&0x7F); - + /* generate channel 1-clocked noise if configured to do so */ if (noisy != 0) noise_clocks_this_sample = sh6840_update_noise(state, t->clocks - chan1_clocks); diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index 35fe3179508..b57811749e0 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -503,7 +503,7 @@ ADDRESS_MAP_START( seibu2_airraid_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) -// AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write) +// AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 5ce9a798d6d..971eb6bc546 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -567,7 +567,7 @@ ROM_START( 1943b ) ROM_LOAD( "bm13.14c", 0x38000, 0x8000, CRC(1143829a) SHA1(2b3a65e354a205c05a87f783e9938b64bc62396f) ) ROM_REGION( 0x10000, "gfx5", 0 ) /* tilemaps */ - ROM_LOAD( "bm14.5f", 0x0000, 0x8000, CRC(4d3c6401) SHA1(ce4f6dbf8fa030ad45cbb5afd58df27fed2d4618) ) /* front background */ + ROM_LOAD( "bm14.5f", 0x0000, 0x8000, CRC(4d3c6401) SHA1(ce4f6dbf8fa030ad45cbb5afd58df27fed2d4618) ) /* front background */ ROM_LOAD( "bm23.8k", 0x8000, 0x8000, CRC(a52aecbd) SHA1(45b0283d84d394c16c35802463ca95d70d1062d4) ) /* back background */ ROM_REGION( 0x0c00, "proms", 0 ) diff --git a/src/mame/drivers/allied.c b/src/mame/drivers/allied.c index 335bee2468b..6f44e160947 100644 --- a/src/mame/drivers/allied.c +++ b/src/mame/drivers/allied.c @@ -12,10 +12,10 @@ public: static ADDRESS_MAP_START( allied_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x1400, 0x1fff) AM_ROM + AM_RANGE(0x0000, 0x0fff) AM_RAM + AM_RANGE(0x1400, 0x1fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( allied ) INPUT_PORTS_END @@ -31,15 +31,15 @@ static MACHINE_CONFIG_START( allied, allied_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6504, 3572549/4) MCFG_CPU_PROGRAM_MAP(allied_map) - + MCFG_MACHINE_RESET( allied ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END ROM_START( allied ) - ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "alliedu5.bin", 0x1400, 0x0400, CRC(e4fb64fb) SHA1(a3d9de7cbfb42180a860e0bbbeaeba96d8bd1e20)) ROM_LOAD( "alliedu6.bin", 0x1800, 0x0400, CRC(dca980dd) SHA1(3817d75413854d889fc1ce4fd6a51d820d1e0534)) ROM_LOAD( "alliedu3.bin", 0x1c00, 0x0400, CRC(13f42789) SHA1(baa0f73fda08a3c5d6f1423fb329e4febb07ef97)) @@ -57,7 +57,7 @@ ROM_END #define rom_circa33 rom_allied #define rom_starshot rom_allied -GAME(1977, allied, 0, allied, allied, allied, ROT0, "Allied Leisure", "Allied System", GAME_IS_BIOS_ROOT) +GAME(1977, allied, 0, allied, allied, allied, ROT0, "Allied Leisure", "Allied System", GAME_IS_BIOS_ROOT) GAME(1977, suprpick, allied, allied, allied, allied, ROT0, "Allied Leisure", "Super Picker", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1977, royclark, allied, allied, allied, allied, ROT0, "Fascination Int.", "Roy Clark - The Entertainer", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1977, thndbolt, allied, allied, allied, allied, ROT0, "Allied Leisure", "Thunderbolt", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/alvg.c b/src/mame/drivers/alvg.c index 6bd151a09cd..c9254ea85b8 100644 --- a/src/mame/drivers/alvg.c +++ b/src/mame/drivers/alvg.c @@ -13,10 +13,10 @@ public: static ADDRESS_MAP_START( alvg_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x3fff) AM_RAM - AM_RANGE(0x4000, 0xffff) AM_ROM + AM_RANGE(0x0000, 0x3fff) AM_RAM + AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( alvg ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( alvg, alvg_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, 2000000) MCFG_CPU_PROGRAM_MAP(alvg_map) - + MCFG_MACHINE_RESET( alvg ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -57,67 +57,67 @@ ROM_END /*------------------------------------------------------------------- / Al's Garage Band Goes On A World Tour /-------------------------------------------------------------------*/ -ROM_START(wrldtour) - ROM_REGION(0x10000, "maincpu", 0) +ROM_START(wrldtour) + ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("cpu27c.512", 0x0000, 0x10000, CRC(c9572fb5) SHA1(47a3e8943ef4207011a33f4a03a6e722c937cc48)) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("soundc.512", 0x0000, 0x10000, CRC(b44bee01) SHA1(795d8500e5bd73ce23756bf1f5c96db1a3621a70)) - ROM_REGION(0x400000, "sound1", 0) - ROM_LOAD("samp_0.c21", 0x000000, 0x40000, CRC(37beb831) SHA1(2b90d2be0a1bd7c59469846631d2b44bdf9f5f9d)) - ROM_RELOAD(0x000000 + 0x40000, 0x40000) - ROM_RELOAD(0x000000 + 0x80000, 0x40000) - ROM_RELOAD(0x000000 + 0xc0000, 0x40000) - ROM_LOAD("samp_1.c21", 0x100000, 0x40000, CRC(621533c6) SHA1(ca0ed9e89c340cb3b08f9a9002af9997372c1cbf)) - ROM_RELOAD(0x100000 + 0x40000, 0x40000) - ROM_RELOAD(0x100000 + 0x80000, 0x40000) - ROM_RELOAD(0x100000 + 0xc0000, 0x40000) - ROM_LOAD("samp_2.c21", 0x200000, 0x40000, CRC(454a5cca) SHA1(66b1a5832134365fd762fcba4cf4d666f60ebd65)) - ROM_RELOAD(0x200000 + 0x40000, 0x40000) - ROM_RELOAD(0x200000 + 0x80000, 0x40000) - ROM_RELOAD(0x200000 + 0xc0000, 0x40000) - ROM_LOAD("samp_3.c21", 0x300000, 0x40000, CRC(1f4928f4) SHA1(9949ab96644984fab8037224f52ec28d7d7cc967)) - ROM_RELOAD(0x300000 + 0x40000, 0x40000) - ROM_RELOAD(0x300000 + 0x80000, 0x40000) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("soundc.512", 0x0000, 0x10000, CRC(b44bee01) SHA1(795d8500e5bd73ce23756bf1f5c96db1a3621a70)) + ROM_REGION(0x400000, "sound1", 0) + ROM_LOAD("samp_0.c21", 0x000000, 0x40000, CRC(37beb831) SHA1(2b90d2be0a1bd7c59469846631d2b44bdf9f5f9d)) + ROM_RELOAD(0x000000 + 0x40000, 0x40000) + ROM_RELOAD(0x000000 + 0x80000, 0x40000) + ROM_RELOAD(0x000000 + 0xc0000, 0x40000) + ROM_LOAD("samp_1.c21", 0x100000, 0x40000, CRC(621533c6) SHA1(ca0ed9e89c340cb3b08f9a9002af9997372c1cbf)) + ROM_RELOAD(0x100000 + 0x40000, 0x40000) + ROM_RELOAD(0x100000 + 0x80000, 0x40000) + ROM_RELOAD(0x100000 + 0xc0000, 0x40000) + ROM_LOAD("samp_2.c21", 0x200000, 0x40000, CRC(454a5cca) SHA1(66b1a5832134365fd762fcba4cf4d666f60ebd65)) + ROM_RELOAD(0x200000 + 0x40000, 0x40000) + ROM_RELOAD(0x200000 + 0x80000, 0x40000) + ROM_RELOAD(0x200000 + 0xc0000, 0x40000) + ROM_LOAD("samp_3.c21", 0x300000, 0x40000, CRC(1f4928f4) SHA1(9949ab96644984fab8037224f52ec28d7d7cc967)) + ROM_RELOAD(0x300000 + 0x40000, 0x40000) + ROM_RELOAD(0x300000 + 0x80000, 0x40000) ROM_RELOAD(0x300000 + 0xc0000, 0x40000) - ROM_REGION(0x110000, "gfx3", 0) - ROM_LOAD("romdef1.c20", 0x00000, 0x40000, CRC(045b21c1) SHA1(134b7eb0f71506d12d9ded24999d530126c558fc)) - ROM_RELOAD( 0x80000, 0x40000) - ROM_LOAD("romdef2.c20", 0x40000, 0x40000, CRC(23c32ee5) SHA1(429b3b069251bb8b681bbc6382ceb6b85125eb79)) - ROM_RELOAD( 0xc0000, 0x40000) - ROM_LOAD("dot27c.512", 0x100000, 0x10000, CRC(c8bd48e7) SHA1(e2dc513dd42c05c2018e6d8c0b6f0b2c56e6e059)) - ROM_REGION(0x20000, "cpu3", 0) + ROM_REGION(0x110000, "gfx3", 0) + ROM_LOAD("romdef1.c20", 0x00000, 0x40000, CRC(045b21c1) SHA1(134b7eb0f71506d12d9ded24999d530126c558fc)) + ROM_RELOAD( 0x80000, 0x40000) + ROM_LOAD("romdef2.c20", 0x40000, 0x40000, CRC(23c32ee5) SHA1(429b3b069251bb8b681bbc6382ceb6b85125eb79)) + ROM_RELOAD( 0xc0000, 0x40000) + ROM_LOAD("dot27c.512", 0x100000, 0x10000, CRC(c8bd48e7) SHA1(e2dc513dd42c05c2018e6d8c0b6f0b2c56e6e059)) + ROM_REGION(0x20000, "cpu3", 0) ROM_COPY("gfx3",0x108000,0x0000,0x8000) ROM_END -ROM_START(wrldtour2) - ROM_REGION(0x10000, "maincpu", 0) +ROM_START(wrldtour2) + ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("cpu02b.512", 0x0000, 0x10000, CRC(1658bf40) SHA1(7af9eedab4e7d0cedaf8bfdbc1f27b989a7171cd)) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("soundc.512", 0x0000, 0x10000, CRC(b44bee01) SHA1(795d8500e5bd73ce23756bf1f5c96db1a3621a70)) - ROM_REGION(0x400000, "sound1", 0) - ROM_LOAD("samp_0.c21", 0x000000, 0x40000, CRC(37beb831) SHA1(2b90d2be0a1bd7c59469846631d2b44bdf9f5f9d)) - ROM_RELOAD(0x000000 + 0x40000, 0x40000) - ROM_RELOAD(0x000000 + 0x80000, 0x40000) - ROM_RELOAD(0x000000 + 0xc0000, 0x40000) - ROM_LOAD("samp_1.c21", 0x100000, 0x40000, CRC(621533c6) SHA1(ca0ed9e89c340cb3b08f9a9002af9997372c1cbf)) - ROM_RELOAD(0x100000 + 0x40000, 0x40000) - ROM_RELOAD(0x100000 + 0x80000, 0x40000) - ROM_RELOAD(0x100000 + 0xc0000, 0x40000) - ROM_LOAD("samp_2.c21", 0x200000, 0x40000, CRC(454a5cca) SHA1(66b1a5832134365fd762fcba4cf4d666f60ebd65)) - ROM_RELOAD(0x200000 + 0x40000, 0x40000) - ROM_RELOAD(0x200000 + 0x80000, 0x40000) - ROM_RELOAD(0x200000 + 0xc0000, 0x40000) - ROM_LOAD("samp_3.c21", 0x300000, 0x40000, CRC(1f4928f4) SHA1(9949ab96644984fab8037224f52ec28d7d7cc967)) - ROM_RELOAD(0x300000 + 0x40000, 0x40000) - ROM_RELOAD(0x300000 + 0x80000, 0x40000) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("soundc.512", 0x0000, 0x10000, CRC(b44bee01) SHA1(795d8500e5bd73ce23756bf1f5c96db1a3621a70)) + ROM_REGION(0x400000, "sound1", 0) + ROM_LOAD("samp_0.c21", 0x000000, 0x40000, CRC(37beb831) SHA1(2b90d2be0a1bd7c59469846631d2b44bdf9f5f9d)) + ROM_RELOAD(0x000000 + 0x40000, 0x40000) + ROM_RELOAD(0x000000 + 0x80000, 0x40000) + ROM_RELOAD(0x000000 + 0xc0000, 0x40000) + ROM_LOAD("samp_1.c21", 0x100000, 0x40000, CRC(621533c6) SHA1(ca0ed9e89c340cb3b08f9a9002af9997372c1cbf)) + ROM_RELOAD(0x100000 + 0x40000, 0x40000) + ROM_RELOAD(0x100000 + 0x80000, 0x40000) + ROM_RELOAD(0x100000 + 0xc0000, 0x40000) + ROM_LOAD("samp_2.c21", 0x200000, 0x40000, CRC(454a5cca) SHA1(66b1a5832134365fd762fcba4cf4d666f60ebd65)) + ROM_RELOAD(0x200000 + 0x40000, 0x40000) + ROM_RELOAD(0x200000 + 0x80000, 0x40000) + ROM_RELOAD(0x200000 + 0xc0000, 0x40000) + ROM_LOAD("samp_3.c21", 0x300000, 0x40000, CRC(1f4928f4) SHA1(9949ab96644984fab8037224f52ec28d7d7cc967)) + ROM_RELOAD(0x300000 + 0x40000, 0x40000) + ROM_RELOAD(0x300000 + 0x80000, 0x40000) ROM_RELOAD(0x300000 + 0xc0000, 0x40000) - ROM_REGION(0x110000, "gfx3", 0) - ROM_LOAD("romdef1.c20", 0x00000, 0x40000, CRC(045b21c1) SHA1(134b7eb0f71506d12d9ded24999d530126c558fc)) - ROM_RELOAD( 0x80000, 0x40000) - ROM_LOAD("romdef2.c20", 0x40000, 0x40000, CRC(23c32ee5) SHA1(429b3b069251bb8b681bbc6382ceb6b85125eb79)) - ROM_RELOAD( 0xc0000, 0x40000) - ROM_LOAD("dot02b.512", 0x100000, 0x10000, CRC(50e3d59d) SHA1(db6df3482fc485af6bde341750bf8072a296b8da)) - ROM_REGION(0x20000, "cpu3", 0) + ROM_REGION(0x110000, "gfx3", 0) + ROM_LOAD("romdef1.c20", 0x00000, 0x40000, CRC(045b21c1) SHA1(134b7eb0f71506d12d9ded24999d530126c558fc)) + ROM_RELOAD( 0x80000, 0x40000) + ROM_LOAD("romdef2.c20", 0x40000, 0x40000, CRC(23c32ee5) SHA1(429b3b069251bb8b681bbc6382ceb6b85125eb79)) + ROM_RELOAD( 0xc0000, 0x40000) + ROM_LOAD("dot02b.512", 0x100000, 0x10000, CRC(50e3d59d) SHA1(db6df3482fc485af6bde341750bf8072a296b8da)) + ROM_REGION(0x20000, "cpu3", 0) ROM_COPY("gfx3",0x108000,0x0000,0x8000) ROM_END diff --git a/src/mame/drivers/atari_s1.c b/src/mame/drivers/atari_s1.c index 554c0fbd877..f991f2b36d2 100644 --- a/src/mame/drivers/atari_s1.c +++ b/src/mame/drivers/atari_s1.c @@ -1,5 +1,5 @@ /* - Atari Generation/System 1 + Atari Generation/System 1 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -16,10 +16,10 @@ static ADDRESS_MAP_START( atari_s1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x7000, 0x77ff) AM_ROM + AM_RANGE(0x7000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( atari_s1 ) INPUT_PORTS_END @@ -35,9 +35,9 @@ static MACHINE_CONFIG_START( atari_s1, atari_s1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(atari_s1_map) - + MCFG_MACHINE_RESET( atari_s1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -55,10 +55,10 @@ ROM_END / The Atarians (working bootleg) /-------------------------------------------------------------------*/ //ROM_START(atarianb) -// ROM_REGION(0x10000, "maincpu", 0) -// ROM_LOAD("atarianb.e00", 0x7000, 0x0800, CRC(74fc86e4) SHA1(135d75e5c03feae0929fa84caa3c802353cdd94e)) -// ROM_LOAD("atarian.e0", 0x7800, 0x0800, CRC(45cb0427) SHA1(e286930ca36bdd0f79acefd142d2a5431fa8005b)) -// ROM_RELOAD(0xf800, 0x0800) +// ROM_REGION(0x10000, "maincpu", 0) +// ROM_LOAD("atarianb.e00", 0x7000, 0x0800, CRC(74fc86e4) SHA1(135d75e5c03feae0929fa84caa3c802353cdd94e)) +// ROM_LOAD("atarian.e0", 0x7800, 0x0800, CRC(45cb0427) SHA1(e286930ca36bdd0f79acefd142d2a5431fa8005b)) +// ROM_RELOAD(0xf800, 0x0800) //ROM_END /*------------------------------------------------------------------- @@ -97,9 +97,9 @@ ROM_START(spcrider) ROM_LOAD("spacel.bin", 0x7800, 0x0800, CRC(66ffb04e) SHA1(42d8b7fb7206b30478f631d0e947c0908dcf5419)) ROM_END -GAME( 1976, atarians, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","The Atarians", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -//GAME( 2002, atarianb, atarians, atari_s1, atari_s1, atari_s1, ROT0, "Atari / Gaston","The Atarians (working bootleg)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, time2000, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Time 2000", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, aavenger, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Airborne Avenger", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, midearth, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Middle Earth", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, spcrider, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Space Riders", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1976, atarians, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","The Atarians", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +//GAME( 2002, atarianb, atarians, atari_s1, atari_s1, atari_s1, ROT0, "Atari / Gaston","The Atarians (working bootleg)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, time2000, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Time 2000", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, aavenger, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Airborne Avenger", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, midearth, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Middle Earth", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, spcrider, 0, atari_s1, atari_s1, atari_s1, ROT0, "Atari","Space Riders", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c index 201fa0906cb..dd31eb4b9d7 100644 --- a/src/mame/drivers/atari_s2.c +++ b/src/mame/drivers/atari_s2.c @@ -1,5 +1,5 @@ /* - Atari Generation/System 2 + Atari Generation/System 2 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,11 +17,11 @@ public: static ADDRESS_MAP_START( atari_s2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x3fff) - AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM + AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0700) AM_RAM // NVRAM - AM_RANGE(0x2800, 0x3fff) AM_ROM + AM_RANGE(0x2800, 0x3fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( atari_s2 ) INPUT_PORTS_END @@ -37,9 +37,9 @@ static MACHINE_CONFIG_START( atari_s2, atari_s2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(atari_s2_map) - + MCFG_MACHINE_RESET( atari_s2 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atari_s3.c b/src/mame/drivers/atari_s3.c index b87e4806537..0b972f74a0c 100644 --- a/src/mame/drivers/atari_s3.c +++ b/src/mame/drivers/atari_s3.c @@ -1,5 +1,5 @@ /* - Atari Generation/System 3 + Atari Generation/System 3 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,11 +17,11 @@ public: static ADDRESS_MAP_START( atari_s3_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x3fff) - AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM + AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0700) AM_RAM // NVRAM - AM_RANGE(0x2800, 0x3fff) AM_ROM + AM_RANGE(0x2800, 0x3fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( atari_s3 ) INPUT_PORTS_END @@ -37,9 +37,9 @@ static MACHINE_CONFIG_START( atari_s3, atari_s3_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(atari_s3_map) - + MCFG_MACHINE_RESET( atari_s3 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index ee2242b0411..b43d5d06304 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -489,8 +489,8 @@ static READ8_HANDLER( leta_r ) UINT32 temp; UINT32 rotate_count = input_port_read(space->machine, "FAKE_SPINNER") & 0xffff; /* rotate_count behaves the same as the real LEAT1 Rotate encoder - * we use it to generate the LETA0 Center encoder count - */ + * we use it to generate the LETA0 Center encoder count + */ if (rotate_count != last_rotate_count) { @@ -558,14 +558,14 @@ static READ8_HANDLER( leta_r ) else /* offset == 1 */ return rotate_count & 0xff; - } + } default: logerror("Unknown controller passed to leta_r"); return 0xff; } } - return input_port_read(space->machine, letanames[offset]); + return input_port_read(space->machine, letanames[offset]); } @@ -968,17 +968,17 @@ static INPUT_PORTS_START( 720 ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* 720 uses a special controller to control the player rotation. - * It uses 1 disc with 72 teeth for the rotation and another disc - * with 2 teeth for the alignment of the joystick to the top position. - * The following graph shows how the Center and Rotate disc align. - * The numbers show how the optical count varies from center. - * - * _____2 1________1 2_____ - * |__| |__| Center disc - 2 teeth. Shown lined up with Rotate disc - * __ __ __ __ - * __| |__| |__| |__| |__ Rotate disc - 72 teeth (144 positions) - * 4 3 2 1 1 2 3 4 - */ + * It uses 1 disc with 72 teeth for the rotation and another disc + * with 2 teeth for the alignment of the joystick to the top position. + * The following graph shows how the Center and Rotate disc align. + * The numbers show how the optical count varies from center. + * + * _____2 1________1 2_____ + * |__| |__| Center disc - 2 teeth. Shown lined up with Rotate disc + * __ __ __ __ + * __| |__| |__| |__| |__ Rotate disc - 72 teeth (144 positions) + * 4 3 2 1 1 2 3 4 + */ /* Center disc */ /* X1, X2 LETA inputs */ @@ -999,7 +999,7 @@ static INPUT_PORTS_START( 720 ) PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_CONDITION("SELECT",0x03,PORTCOND_EQUALS,0x01) /* Let's assume we are using a 1200 count spinner. We scale to get a 144 count. - * 144/1200 = 0.12 = 12% */ + * 144/1200 = 0.12 = 12% */ PORT_START("FAKE_SPINNER") /* not direct mapped */ PORT_BIT( 0xffff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(12) PORT_KEYDELTA(10) PORT_CONDITION("SELECT",0x03,PORTCOND_EQUALS,0x02) diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c index fc482dd6026..4db75bdd56e 100644 --- a/src/mame/drivers/atvtrack.c +++ b/src/mame/drivers/atvtrack.c @@ -1,4 +1,4 @@ -/* +/* ATV Track (c)2002 Gaelco @@ -30,7 +30,7 @@ static INPUT_PORTS_START( atvtrack ) INPUT_PORTS_END // ? -#define ATV_CPU_CLOCK 200000000 +#define ATV_CPU_CLOCK 200000000 // ? static const struct sh4_config sh4cpu_config = { 1, 0, 1, 0, 0, 0, 1, 1, 0, ATV_CPU_CLOCK }; diff --git a/src/mame/drivers/bingo.c b/src/mame/drivers/bingo.c index 2d9e16ebf32..3e2616cd44b 100644 --- a/src/mame/drivers/bingo.c +++ b/src/mame/drivers/bingo.c @@ -13,10 +13,10 @@ public: static ADDRESS_MAP_START( bingo_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x1eff) AM_ROM - AM_RANGE(0x1f00, 0x1fff) AM_RAM + AM_RANGE(0x0000, 0x1eff) AM_ROM + AM_RANGE(0x1f00, 0x1fff) AM_RAM ADDRESS_MAP_END - + static INPUT_PORTS_START( bingo ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( bingo, bingo_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 1000000) MCFG_CPU_PROGRAM_MAP(bingo_map) - + MCFG_MACHINE_RESET( bingo ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -64,21 +64,21 @@ ROM_START(goldgam2) ROM_END /* ROM_START(penalty) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD("13006-1.epr", 0x8000, 0x8000, CRC(93cfbec9) SHA1(c245604ac42c88c647950db4497a6f9dd3504955)) - ROM_LOAD("13006-2.epr", 0x0000, 0x4000, CRC(41470cc1) SHA1(7050df563fddbe8216317d96664d12567b618645)) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD("13006-1.epr", 0x8000, 0x8000, CRC(93cfbec9) SHA1(c245604ac42c88c647950db4497a6f9dd3504955)) + ROM_LOAD("13006-2.epr", 0x0000, 0x4000, CRC(41470cc1) SHA1(7050df563fddbe8216317d96664d12567b618645)) ROM_END ROM_START(brooklyn) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD("n10207-1.epr", 0x8000, 0x8000, CRC(7851f870) SHA1(8da400108a352954ced8fc942663c0635bec4d1c)) - ROM_LOAD("n10207-2.epr", 0x0000, 0x4000, CRC(861dae09) SHA1(d808fbbf6b50e1482a512b9bd1b18a023694adb2)) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD("n10207-1.epr", 0x8000, 0x8000, CRC(7851f870) SHA1(8da400108a352954ced8fc942663c0635bec4d1c)) + ROM_LOAD("n10207-2.epr", 0x0000, 0x4000, CRC(861dae09) SHA1(d808fbbf6b50e1482a512b9bd1b18a023694adb2)) ROM_END ROM_START(newdixie) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD("10307-1.epr", 0x8000, 0x8000, CRC(7b6b2e9c) SHA1(149c9e1d2a3e7db735835c6fa795e41b2eb45175)) - ROM_LOAD("10307-2.epr", 0x0000, 0x4000, CRC(d99a7866) SHA1(659a0107bc970d2578dcfd7cdd43661da778fd5c)) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD("10307-1.epr", 0x8000, 0x8000, CRC(7b6b2e9c) SHA1(149c9e1d2a3e7db735835c6fa795e41b2eb45175)) + ROM_LOAD("10307-2.epr", 0x0000, 0x4000, CRC(d99a7866) SHA1(659a0107bc970d2578dcfd7cdd43661da778fd5c)) ROM_END */ diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 86cfd3fae0f..f59c18fcdd3 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -148,17 +148,17 @@ static READ8_HANDLER( bishjan_videoram_1_lo_r ) { return layers[1].videorams[VR xplan: -80 = 00 40 = FD L0 = - L1 = 8x8 ; ram test (disable = 01 -> L0 disabled) -80 = 70 40 = FF L0 = 64x32 L1 = 8x8 ; shoot'em up demo / gambling demo -80 = 40 40 = BF L0 = 8x32 L1 = 8x8 ; title screen [L0 line scroll] / 3 planes with scrolling clouds (before title screen) -80 = 00 40 = EF L0 = 8x8 L1 = 8x8 ; parachutist and cars demo [L1 line scroll] -80 = 00 40 = FF L0 = 8x8 L1 = 8x8 ; test mode and stat screens +80 = 00 40 = FD L0 = - L1 = 8x8 ; ram test (disable = 01 -> L0 disabled) +80 = 70 40 = FF L0 = 64x32 L1 = 8x8 ; shoot'em up demo / gambling demo +80 = 40 40 = BF L0 = 8x32 L1 = 8x8 ; title screen [L0 line scroll] / 3 planes with scrolling clouds (before title screen) +80 = 00 40 = EF L0 = 8x8 L1 = 8x8 ; parachutist and cars demo [L1 line scroll] +80 = 00 40 = FF L0 = 8x8 L1 = 8x8 ; test mode and stat screens bishjan: -80 = 00 40 = FD L0 = - L1 = 8x8 ; ram test (disable = 01 -> L0 disabled) -80 = 00 40 = 0F L0 = 8x8 L1 = 8x8 ; soft dsw screen -80 = 00 40 = 0x L0 = 8x8 L1 = 8x8 ; stat screens (40 = 07/0d, seems a don't care) +80 = 00 40 = FD L0 = - L1 = 8x8 ; ram test (disable = 01 -> L0 disabled) +80 = 00 40 = 0F L0 = 8x8 L1 = 8x8 ; soft dsw screen +80 = 00 40 = 0x L0 = 8x8 L1 = 8x8 ; stat screens (40 = 07/0d, seems a don't care) ***************************************************************************/ @@ -1143,7 +1143,7 @@ static MACHINE_CONFIG_START( mtrain, driver_device ) MCFG_CPU_PROGRAM_MAP( mtrain_map ) MCFG_CPU_IO_MAP( mtrain_io ) -// MCFG_NVRAM_ADD_0FILL("nvram") +// MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/by17.c b/src/mame/drivers/by17.c index c4156e33f54..36baa4120be 100644 --- a/src/mame/drivers/by17.c +++ b/src/mame/drivers/by17.c @@ -1,5 +1,5 @@ /* - Bally MPU AS-2518-17 + Bally MPU AS-2518-17 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,11 +17,11 @@ public: static ADDRESS_MAP_START( by17_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x7fff) - AM_RANGE(0x0000, 0x007f) AM_RAM + AM_RANGE(0x0000, 0x007f) AM_RAM AM_RANGE(0x0200, 0x02ff) AM_RAM // CMOS NVRAM - AM_RANGE(0x1000, 0x7fff) AM_ROM + AM_RANGE(0x1000, 0x7fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( by17 ) INPUT_PORTS_END @@ -37,9 +37,9 @@ static MACHINE_CONFIG_START( by17, by17_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(by17_map) - + MCFG_MACHINE_RESET( by17 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -143,12 +143,12 @@ ROM_START(stk_sprs) ROM_RELOAD( 0xf800, 0x0800) ROM_END -GAME( 1978, blackjck, 0, by17, by17, by17, ROT0, "Bally","Black Jack (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1976, bowarrow, 0, by17, by17, by17, ROT0, "Bally","Bow & Arrow (Prototype)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, eightbll, 0, by17, by17, by17, ROT0, "Bally","Eight Ball", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, evelknie, 0, by17, by17, by17, ROT0, "Bally","Evel Knievel", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, freedom, 0, by17, by17, by17, ROT0, "Bally","Freedom", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, matahari, 0, by17, by17, by17, ROT0, "Bally","Mata Hari", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, nightrdr, 0, by17, by17, by17, ROT0, "Bally","Night Rider", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, pwerplay, 0, by17, by17, by17, ROT0, "Bally","Power Play (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, stk_sprs, 0, by17, by17, by17, ROT0, "Bally","Strikes and Spares", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, blackjck, 0, by17, by17, by17, ROT0, "Bally","Black Jack (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1976, bowarrow, 0, by17, by17, by17, ROT0, "Bally","Bow & Arrow (Prototype)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, eightbll, 0, by17, by17, by17, ROT0, "Bally","Eight Ball", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, evelknie, 0, by17, by17, by17, ROT0, "Bally","Evel Knievel", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, freedom, 0, by17, by17, by17, ROT0, "Bally","Freedom", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, matahari, 0, by17, by17, by17, ROT0, "Bally","Mata Hari", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, nightrdr, 0, by17, by17, by17, ROT0, "Bally","Night Rider", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, pwerplay, 0, by17, by17, by17, ROT0, "Bally","Power Play (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, stk_sprs, 0, by17, by17, by17, ROT0, "Bally","Strikes and Spares", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/by35.c b/src/mame/drivers/by35.c index 4cbf72a1f93..1ffc9402a87 100644 --- a/src/mame/drivers/by35.c +++ b/src/mame/drivers/by35.c @@ -1,5 +1,5 @@ /* - Bally MPU AS-2518-35 + Bally MPU AS-2518-35 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,11 +17,11 @@ public: static ADDRESS_MAP_START( by35_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x7fff) - AM_RANGE(0x0000, 0x007f) AM_RAM + AM_RANGE(0x0000, 0x007f) AM_RAM AM_RANGE(0x0200, 0x02ff) AM_RAM // CMOS NVRAM - AM_RANGE(0x1000, 0x7fff) AM_ROM + AM_RANGE(0x1000, 0x7fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( by35 ) INPUT_PORTS_END @@ -37,9 +37,9 @@ static MACHINE_CONFIG_START( by35, by35_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(by35_map) - + MCFG_MACHINE_RESET( by35 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -272,27 +272,27 @@ ROM_END /*-------------------------------- / Flash Gordon /-------------------------------*/ -ROM_START(flashgdn) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "834-23_2.732", 0x1000, 0x0800, CRC(0c7a0d91) SHA1(1f79be15817975acbc35cb08591e2289e2eca938)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "720-52_6.732", 0x1800, 0x0800, CRC(2a43d9fb) SHA1(9ff903c32b80780383578a9abaa3ef9d3bcecbc7)) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(flashgdn) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "834-23_2.732", 0x1000, 0x0800, CRC(0c7a0d91) SHA1(1f79be15817975acbc35cb08591e2289e2eca938)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "720-52_6.732", 0x1800, 0x0800, CRC(2a43d9fb) SHA1(9ff903c32b80780383578a9abaa3ef9d3bcecbc7)) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("834-20_2.532", 0xc000, 0x1000, CRC(2f8ced3e) SHA1(ecdeb07c31c22ec313b55774f4358a9923c5e9e7)) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("834-20_2.532", 0xc000, 0x1000, CRC(2f8ced3e) SHA1(ecdeb07c31c22ec313b55774f4358a9923c5e9e7)) ROM_LOAD("834-18_5.532", 0xf000, 0x1000, CRC(8799e80e) SHA1(f255b4e7964967c82cfc2de20ebe4b8d501e3cb0)) ROM_END -ROM_START(flashgdnf) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "834-23_2.732", 0x1000, 0x0800, CRC(0c7a0d91) SHA1(1f79be15817975acbc35cb08591e2289e2eca938)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "720-52_6.732", 0x1800, 0x0800, CRC(2a43d9fb) SHA1(9ff903c32b80780383578a9abaa3ef9d3bcecbc7)) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(flashgdnf) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "834-23_2.732", 0x1000, 0x0800, CRC(0c7a0d91) SHA1(1f79be15817975acbc35cb08591e2289e2eca938)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "720-52_6.732", 0x1800, 0x0800, CRC(2a43d9fb) SHA1(9ff903c32b80780383578a9abaa3ef9d3bcecbc7)) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("834-35_2.532", 0xc000, 0x1000, CRC(dff3f711) SHA1(254a5670775ecb6c347f33af8ba7c350e4cfa550)) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("834-35_2.532", 0xc000, 0x1000, CRC(dff3f711) SHA1(254a5670775ecb6c347f33af8ba7c350e4cfa550)) ROM_LOAD("834-36_5.532", 0xf000, 0x1000, CRC(18691897) SHA1(3b445e0756c07d80f14c01af5a7f87744474ae15)) ROM_END @@ -358,54 +358,54 @@ ROM_END /*---------------------------------------------------------- / Gold Ball /----------------------------------------------------------*/ -ROM_START(goldball) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "gold2732.u2", 0x1000, 0x0800, CRC(3169493c) SHA1(1335fcdfb2d6970d78c636748ff419baf85ef78b)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "goldball.u6", 0x1800, 0x0800, CRC(9b6e79d0) SHA1(4fcda91bbe930e6131d94964a08459e395f841af)) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(goldball) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "gold2732.u2", 0x1000, 0x0800, CRC(3169493c) SHA1(1335fcdfb2d6970d78c636748ff419baf85ef78b)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "goldball.u6", 0x1800, 0x0800, CRC(9b6e79d0) SHA1(4fcda91bbe930e6131d94964a08459e395f841af)) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("gb_u4.532", 0xf000, 0x1000, CRC(2dcb0315) SHA1(8cb9c9f627f0c8420d3b3d9f0d10d77a82c8be56)) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("gb_u4.532", 0xf000, 0x1000, CRC(2dcb0315) SHA1(8cb9c9f627f0c8420d3b3d9f0d10d77a82c8be56)) ROM_RELOAD(0x1000, 0x1000) ROM_END -ROM_START(goldballn) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "u2.532", 0x1000, 0x0800, CRC(aa6eb9d6) SHA1(a73cc832450e718d9b8484e409a1f8093d91d786)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "goldball.u6", 0x1800, 0x0800, CRC(9b6e79d0) SHA1(4fcda91bbe930e6131d94964a08459e395f841af) ) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(goldballn) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "u2.532", 0x1000, 0x0800, CRC(aa6eb9d6) SHA1(a73cc832450e718d9b8484e409a1f8093d91d786)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "goldball.u6", 0x1800, 0x0800, CRC(9b6e79d0) SHA1(4fcda91bbe930e6131d94964a08459e395f841af) ) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("gb_u4.532", 0xf000, 0x1000, CRC(2dcb0315) SHA1(8cb9c9f627f0c8420d3b3d9f0d10d77a82c8be56)) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("gb_u4.532", 0xf000, 0x1000, CRC(2dcb0315) SHA1(8cb9c9f627f0c8420d3b3d9f0d10d77a82c8be56)) ROM_RELOAD(0x1000, 0x1000) ROM_END /*----------------------------------------------------------- / Grand Slam /-----------------------------------------------------------*/ -ROM_START(granslam) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "grndslam.u2", 0x1000, 0x0800, CRC(66aea9dc) SHA1(76c017dc83a63b7f1e6035e228370219eb9c0678)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "grndslam.u6", 0x1800, 0x0800, CRC(9e6ccea1) SHA1(5e158e021e0f3eed063577ae22cf5f1bc9655065) ) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(granslam) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "grndslam.u2", 0x1000, 0x0800, CRC(66aea9dc) SHA1(76c017dc83a63b7f1e6035e228370219eb9c0678)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "grndslam.u6", 0x1800, 0x0800, CRC(9e6ccea1) SHA1(5e158e021e0f3eed063577ae22cf5f1bc9655065) ) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("grndslam.u4", 0xf000, 0x1000, CRC(ac34bc38) SHA1(376ceb53cb51d250b5bc222001291b0c85e42e8a)) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("grndslam.u4", 0xf000, 0x1000, CRC(ac34bc38) SHA1(376ceb53cb51d250b5bc222001291b0c85e42e8a)) ROM_RELOAD(0x1000, 0x1000) ROM_END -ROM_START(granslam4) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "gr_slam.u2b", 0x1000, 0x0800, CRC(552d9423) SHA1(16b86d5b7539fd803f458f1633ecc249ef15243d)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "grndslam.u6", 0x1800, 0x0800, CRC(9e6ccea1) SHA1(5e158e021e0f3eed063577ae22cf5f1bc9655065) ) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(granslam4) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "gr_slam.u2b", 0x1000, 0x0800, CRC(552d9423) SHA1(16b86d5b7539fd803f458f1633ecc249ef15243d)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "grndslam.u6", 0x1800, 0x0800, CRC(9e6ccea1) SHA1(5e158e021e0f3eed063577ae22cf5f1bc9655065) ) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("grndslam.u4", 0xf000, 0x1000, CRC(ac34bc38) SHA1(376ceb53cb51d250b5bc222001291b0c85e42e8a)) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("grndslam.u4", 0xf000, 0x1000, CRC(ac34bc38) SHA1(376ceb53cb51d250b5bc222001291b0c85e42e8a)) ROM_RELOAD(0x1000, 0x1000) ROM_END @@ -762,31 +762,31 @@ ROM_END /*-------------------------------------------------- / Speakeasy /--------------------------------------------------*/ -ROM_START(speakesy) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "877-03_2.732", 0x1000, 0x0800, CRC(34b28bbc) SHA1(c649a04664e694cfbd6b4d496bf76f5e802d492a)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "720-53_6.732", 0x1800, 0x0800, CRC(c2e92f80) SHA1(61de956a4b6e9fb9ef2b25c01bff1fb5972284ad) ) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(speakesy) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "877-03_2.732", 0x1000, 0x0800, CRC(34b28bbc) SHA1(c649a04664e694cfbd6b4d496bf76f5e802d492a)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "720-53_6.732", 0x1800, 0x0800, CRC(c2e92f80) SHA1(61de956a4b6e9fb9ef2b25c01bff1fb5972284ad) ) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("877-01_4.716", 0xf000, 0x0800, CRC(6534e826) SHA1(580653636f8d33e758e6631c9ce495f42fe3747a)) - ROM_RELOAD(0xf800, 0x0800) - ROM_RELOAD(0x1000, 0x0800) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("877-01_4.716", 0xf000, 0x0800, CRC(6534e826) SHA1(580653636f8d33e758e6631c9ce495f42fe3747a)) + ROM_RELOAD(0xf800, 0x0800) + ROM_RELOAD(0x1000, 0x0800) ROM_RELOAD(0x1800, 0x0800) ROM_END -ROM_START(speakesy4p) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "877-04_2.732", 0x1000, 0x0800, CRC(8926f2bb) SHA1(617c032ce949007d6bcb52268f17bec5a02f8651)) - ROM_CONTINUE( 0x5000, 0x0800) - ROM_LOAD( "720-53_6.732", 0x1800, 0x0800, CRC(c2e92f80) SHA1(61de956a4b6e9fb9ef2b25c01bff1fb5972284ad) ) - ROM_CONTINUE( 0x5800, 0x0800) +ROM_START(speakesy4p) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "877-04_2.732", 0x1000, 0x0800, CRC(8926f2bb) SHA1(617c032ce949007d6bcb52268f17bec5a02f8651)) + ROM_CONTINUE( 0x5000, 0x0800) + ROM_LOAD( "720-53_6.732", 0x1800, 0x0800, CRC(c2e92f80) SHA1(61de956a4b6e9fb9ef2b25c01bff1fb5972284ad) ) + ROM_CONTINUE( 0x5800, 0x0800) ROM_RELOAD( 0xf000, 0x1000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("877-01_4.716", 0xf000, 0x0800, CRC(6534e826) SHA1(580653636f8d33e758e6631c9ce495f42fe3747a)) - ROM_RELOAD(0xf800, 0x0800) - ROM_RELOAD(0x1000, 0x0800) + ROM_REGION(0x10000, "cpu2", 0) + ROM_LOAD("877-01_4.716", 0xf000, 0x0800, CRC(6534e826) SHA1(580653636f8d33e758e6631c9ce495f42fe3747a)) + ROM_RELOAD(0xf800, 0x0800) + ROM_RELOAD(0x1000, 0x0800) ROM_RELOAD(0x1800, 0x0800) ROM_END @@ -970,39 +970,39 @@ ROM_END /*-------------------------------- / Xenon /-------------------------------*/ -ROM_START(xenon) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "811-40_1.716", 0x1000, 0x0800, CRC(0fba871b) SHA1(52bc0ef65507f0f7422c319d0dc2059e12deab6d)) - ROM_LOAD( "811-41_2.716", 0x5000, 0x0800, CRC(1ea0d891) SHA1(98cd8cfed5c0f437d2b9423b31205f1e8b7436f9)) - ROM_LOAD( "720-40_6.732", 0x1800, 0x0800, CRC(d7aaaa03) SHA1(4e0b901645e509bcb59bf81a6ffc1612b4fb16ee)) - ROM_CONTINUE( 0x5800, 0x0800 ) +ROM_START(xenon) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "811-40_1.716", 0x1000, 0x0800, CRC(0fba871b) SHA1(52bc0ef65507f0f7422c319d0dc2059e12deab6d)) + ROM_LOAD( "811-41_2.716", 0x5000, 0x0800, CRC(1ea0d891) SHA1(98cd8cfed5c0f437d2b9423b31205f1e8b7436f9)) + ROM_LOAD( "720-40_6.732", 0x1800, 0x0800, CRC(d7aaaa03) SHA1(4e0b901645e509bcb59bf81a6ffc1612b4fb16ee)) + ROM_CONTINUE( 0x5800, 0x0800 ) ROM_RELOAD( 0xf000, 0x1000 ) - ROM_REGION(0x10000, "cpu2", 0) + ROM_REGION(0x10000, "cpu2", 0) ROM_LOAD("811-35_4.532", 0xf000, 0x1000, CRC(e9caccbb) SHA1(e2e09ac738c48342212bf38687299876b40cecbb)) - ROM_LOAD("811-22_1.532", 0x8000, 0x1000, CRC(c49a968e) SHA1(86680e8cbb82e69c232313e5fdd7a0058b7eef13)) - ROM_LOAD("811-23_2.532", 0x9000, 0x1000, CRC(41043996) SHA1(78fa3782ee9f32d14cf41a96a60f708087e97bb9)) - ROM_LOAD("811-24_3.532", 0xa000, 0x1000, CRC(53d65542) SHA1(edb63b6d36524ae17ec40cfc02d5cf9985f0477f)) - ROM_LOAD("811-25_4.532", 0xb000, 0x1000, CRC(2c678631) SHA1(a1f9a732fdb498a71caf61ec8cf3d105cf7e114e)) - ROM_LOAD("811-26_5.532", 0xc000, 0x1000, CRC(b8e7febc) SHA1(e557b1bbbc68a6884edebe779df4529116031e00)) - ROM_LOAD("811-27_6.532", 0xd000, 0x1000, CRC(1e2a2afa) SHA1(3f4d4a562e46c162b80660eec8d9af6efe165dd6)) + ROM_LOAD("811-22_1.532", 0x8000, 0x1000, CRC(c49a968e) SHA1(86680e8cbb82e69c232313e5fdd7a0058b7eef13)) + ROM_LOAD("811-23_2.532", 0x9000, 0x1000, CRC(41043996) SHA1(78fa3782ee9f32d14cf41a96a60f708087e97bb9)) + ROM_LOAD("811-24_3.532", 0xa000, 0x1000, CRC(53d65542) SHA1(edb63b6d36524ae17ec40cfc02d5cf9985f0477f)) + ROM_LOAD("811-25_4.532", 0xb000, 0x1000, CRC(2c678631) SHA1(a1f9a732fdb498a71caf61ec8cf3d105cf7e114e)) + ROM_LOAD("811-26_5.532", 0xc000, 0x1000, CRC(b8e7febc) SHA1(e557b1bbbc68a6884edebe779df4529116031e00)) + ROM_LOAD("811-27_6.532", 0xd000, 0x1000, CRC(1e2a2afa) SHA1(3f4d4a562e46c162b80660eec8d9af6efe165dd6)) ROM_LOAD("811-28_7.532", 0xe000, 0x1000, CRC(cebb4cd8) SHA1(2678ffb5e8e2fcff07f029f14a9e0bf1fb95f7bc)) ROM_END -ROM_START(xenonf) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "811-40_1.716", 0x1000, 0x0800, CRC(0fba871b) SHA1(52bc0ef65507f0f7422c319d0dc2059e12deab6d)) - ROM_LOAD( "811-41_2.716", 0x5000, 0x0800, CRC(1ea0d891) SHA1(98cd8cfed5c0f437d2b9423b31205f1e8b7436f9)) - ROM_LOAD( "720-40_6.732", 0x1800, 0x0800, CRC(d7aaaa03) SHA1(4e0b901645e509bcb59bf81a6ffc1612b4fb16ee)) - ROM_CONTINUE( 0x5800, 0x0800 ) +ROM_START(xenonf) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "811-40_1.716", 0x1000, 0x0800, CRC(0fba871b) SHA1(52bc0ef65507f0f7422c319d0dc2059e12deab6d)) + ROM_LOAD( "811-41_2.716", 0x5000, 0x0800, CRC(1ea0d891) SHA1(98cd8cfed5c0f437d2b9423b31205f1e8b7436f9)) + ROM_LOAD( "720-40_6.732", 0x1800, 0x0800, CRC(d7aaaa03) SHA1(4e0b901645e509bcb59bf81a6ffc1612b4fb16ee)) + ROM_CONTINUE( 0x5800, 0x0800 ) ROM_RELOAD( 0xf000, 0x1000 ) - ROM_REGION(0x10000, "cpu2", 0) + ROM_REGION(0x10000, "cpu2", 0) ROM_LOAD("811-36_4.532", 0xf000, 0x1000, CRC(73156c6e) SHA1(b0b3ecb44428c01849189adf6c86be3e95a99012)) - ROM_LOAD("811-22_1.532", 0x8000, 0x1000, CRC(c49a968e) SHA1(86680e8cbb82e69c232313e5fdd7a0058b7eef13)) - ROM_LOAD("811-23_2.532", 0x9000, 0x1000, CRC(41043996) SHA1(78fa3782ee9f32d14cf41a96a60f708087e97bb9)) - ROM_LOAD("811-24_3.532", 0xa000, 0x1000, CRC(53d65542) SHA1(edb63b6d36524ae17ec40cfc02d5cf9985f0477f)) - ROM_LOAD("811-29_4.532", 0xb000, 0x1000, CRC(e586ec31) SHA1(080d43e9a5895e95533ae73cffa4948f747ce510)) - ROM_LOAD("811-30_5.532", 0xc000, 0x1000, CRC(e48d98e3) SHA1(bb32ab96501dcd21525540a61bd5e478a35b1fef)) - ROM_LOAD("811-31_6.532", 0xd000, 0x1000, CRC(0a2336e5) SHA1(28eeb00b03b8d9eb0e6966be00dfbf3a1e13e04c)) + ROM_LOAD("811-22_1.532", 0x8000, 0x1000, CRC(c49a968e) SHA1(86680e8cbb82e69c232313e5fdd7a0058b7eef13)) + ROM_LOAD("811-23_2.532", 0x9000, 0x1000, CRC(41043996) SHA1(78fa3782ee9f32d14cf41a96a60f708087e97bb9)) + ROM_LOAD("811-24_3.532", 0xa000, 0x1000, CRC(53d65542) SHA1(edb63b6d36524ae17ec40cfc02d5cf9985f0477f)) + ROM_LOAD("811-29_4.532", 0xb000, 0x1000, CRC(e586ec31) SHA1(080d43e9a5895e95533ae73cffa4948f747ce510)) + ROM_LOAD("811-30_5.532", 0xc000, 0x1000, CRC(e48d98e3) SHA1(bb32ab96501dcd21525540a61bd5e478a35b1fef)) + ROM_LOAD("811-31_6.532", 0xd000, 0x1000, CRC(0a2336e5) SHA1(28eeb00b03b8d9eb0e6966be00dfbf3a1e13e04c)) ROM_LOAD("811-32_7.532", 0xe000, 0x1000, CRC(987e6118) SHA1(4cded4ff715494f762d043dbcb0298111f327311)) ROM_END @@ -1262,62 +1262,62 @@ ROM_START(suprbowl) ROM_END -GAME( 1986, bullseye, 0, by35, by35, by35, ROT0, "Grand Products Inc.","301/Bullseye", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1984, blakpyra, 0, by35, by35, by35, ROT0, "Bally","Black Pyramid", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1983, bmx, 0, by35, by35, by35, ROT0, "Bally","BMX", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, centaur, 0, by35, by35, by35, ROT0, "Bally","Centaur", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1986, bullseye, 0, by35, by35, by35, ROT0, "Grand Products Inc.","301/Bullseye", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1984, blakpyra, 0, by35, by35, by35, ROT0, "Bally","Black Pyramid", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1983, bmx, 0, by35, by35, by35, ROT0, "Bally","BMX", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, centaur, 0, by35, by35, by35, ROT0, "Bally","Centaur", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1985, cosflash, flashgdn, by35, by35, by35, ROT0, "Bell Games","Cosmic Flash", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1985, cybrnaut, 0, by35, by35, by35, ROT0, "Bally","Cybernaut", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, dollyptn, 0, by35, by35, by35, ROT0, "Bally","Dolly Parton", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, eballdlx, 0, by35, by35, by35, ROT0, "Bally","Eight Ball Deluxe", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, elektra, 0, by35, by35, by35, ROT0, "Bally","Elektra", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, embryon, 0, by35, by35, by35, ROT0, "Bally","Embryon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, fathom, 0, by35, by35, by35, ROT0, "Bally","Fathom", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1984, fbclass, 0, by35, by35, by35, ROT0, "Bally","Fireball Classic", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, fball_ii, 0, by35, by35, by35, ROT0, "Bally","Fireball II", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, flashgdn, 0, by35, by35, by35, ROT0, "Bally","Flash Gordon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1985, cybrnaut, 0, by35, by35, by35, ROT0, "Bally","Cybernaut", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, dollyptn, 0, by35, by35, by35, ROT0, "Bally","Dolly Parton", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, eballdlx, 0, by35, by35, by35, ROT0, "Bally","Eight Ball Deluxe", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, elektra, 0, by35, by35, by35, ROT0, "Bally","Elektra", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, embryon, 0, by35, by35, by35, ROT0, "Bally","Embryon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, fathom, 0, by35, by35, by35, ROT0, "Bally","Fathom", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1984, fbclass, 0, by35, by35, by35, ROT0, "Bally","Fireball Classic", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, fball_ii, 0, by35, by35, by35, ROT0, "Bally","Fireball II", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, flashgdn, 0, by35, by35, by35, ROT0, "Bally","Flash Gordon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1981, flashgdnf, flashgdn, by35, by35, by35, ROT0, "Bally","Flash Gordon (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1981, flashgdnv, flashgdn, by35, by35, by35, ROT0, "Bally","Flash Gordon (Vocalizer sound)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, frontier, 0, by35, by35, by35, ROT0, "Bally","Frontier", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, futurspa, 0, by35, by35, by35, ROT0, "Bally","Future Spa", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1983, goldball, 0, by35, by35, by35, ROT0, "Bally","Gold Ball", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, frontier, 0, by35, by35, by35, ROT0, "Bally","Frontier", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, futurspa, 0, by35, by35, by35, ROT0, "Bally","Future Spa", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1983, goldball, 0, by35, by35, by35, ROT0, "Bally","Gold Ball", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1983, goldballn, goldball, by35, by35, by35, ROT0, "Bally / Oliver","Gold Ball (alternate set)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1983, granslam, 0, by35, by35, by35, ROT0, "Bally","Grand Slam", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1983, granslam, 0, by35, by35, by35, ROT0, "Bally","Grand Slam", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1983, granslam4, granslam, by35, by35, by35, ROT0, "Bally","Grand Slam (4 Players)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, hglbtrtr, 0, by35, by35, by35, ROT0, "Bally","Harlem Globetrotters On Tour", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, hotdoggn, 0, by35, by35, by35, ROT0, "Bally","Hotdoggin'", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1984, kosteel, 0, by35, by35, by35, ROT0, "Bally","Kings of Steel", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, kiss, 0, by35, by35, by35, ROT0, "Bally","Kiss", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, lostwrlp, 0, by35, by35, by35, ROT0, "Bally","Lost World", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1981, medusa, 0, by35, by35, by35, ROT0, "Bally","Medusa", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1982, m_mpac, 0, by35, by35, by35, ROT0, "Bally","Mr. and Mrs. PacMan", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, mystic, 0, by35, by35, by35, ROT0, "Bally","Mystic", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1984, myststar, 0, by35, by35, by35, ROT0, "Bally","Mystic Star", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, hglbtrtr, 0, by35, by35, by35, ROT0, "Bally","Harlem Globetrotters On Tour", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, hotdoggn, 0, by35, by35, by35, ROT0, "Bally","Hotdoggin'", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1984, kosteel, 0, by35, by35, by35, ROT0, "Bally","Kings of Steel", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, kiss, 0, by35, by35, by35, ROT0, "Bally","Kiss", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, lostwrlp, 0, by35, by35, by35, ROT0, "Bally","Lost World", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1981, medusa, 0, by35, by35, by35, ROT0, "Bally","Medusa", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1982, m_mpac, 0, by35, by35, by35, ROT0, "Bally","Mr. and Mrs. PacMan", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, mystic, 0, by35, by35, by35, ROT0, "Bally","Mystic", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1984, myststar, 0, by35, by35, by35, ROT0, "Bally","Mystic Star", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1985, newwave, blakpyra, by35, by35, by35, ROT0, "Bell Games","New Wave", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, ngndshkr, 0, by35, by35, by35, ROT0, "Bally","Nitro Ground Shaker", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, paragon, 0, by35, by35, by35, ROT0, "Bally","Paragon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, playboy , 0, by35, by35, by35, ROT0, "Bally","Playboy", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1982, rapidfip, 0, by35, by35, by35, ROT0, "Bally","Rapid Fire", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, rollston, 0, by35, by35, by35, ROT0, "Bally","Rolling Stones", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, ngndshkr, 0, by35, by35, by35, ROT0, "Bally","Nitro Ground Shaker", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, paragon, 0, by35, by35, by35, ROT0, "Bally","Paragon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, playboy , 0, by35, by35, by35, ROT0, "Bally","Playboy", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1982, rapidfip, 0, by35, by35, by35, ROT0, "Bally","Rapid Fire", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, rollston, 0, by35, by35, by35, ROT0, "Bally","Rolling Stones", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1985, saturn2, spyhuntr, by35, by35, by35, ROT0, "Bell Games","Saturn 2", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, slbmania, 0, by35, by35, by35, ROT0, "Bally","Silverball Mania", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, skatebll, 0, by35, by35, by35, ROT0, "Bally","Skateball", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, slbmania, 0, by35, by35, by35, ROT0, "Bally","Silverball Mania", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, skatebll, 0, by35, by35, by35, ROT0, "Bally","Skateball", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1986, spacehaw, cybrnaut, by35, by35, by35, ROT0, "Nuova Bell Games","Space Hawks", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, spaceinv, 0, by35, by35, by35, ROT0, "Bally","Space Invaders", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1982, speakesy, 0, by35, by35, by35, ROT0, "Bally","Speakeasy", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, spaceinv, 0, by35, by35, by35, ROT0, "Bally","Space Invaders", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1982, speakesy, 0, by35, by35, by35, ROT0, "Bally","Speakeasy", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1982, speakesy4p, speakesy, by35, by35, by35, ROT0, "Bally","Speakeasy 4 Player", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1982, spectrm, 0, by35, by35, by35, ROT0, "Bally","Spectrum", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1982, spectrm4, spectrm, by35, by35, by35, ROT0, "Bally","Spectrum (ver 4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1984, spyhuntr, 0, by35, by35, by35, ROT0, "Bally","Spy Hunter (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, startrep, 0, by35, by35, by35, ROT0, "Bally","Star Trek (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1979, sst, 0, by35, by35, by35, ROT0, "Bally","Supersonic", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, smman, 0, by35, by35, by35, ROT0, "Bally","Six Million Dollar Man", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1984, spyhuntr, 0, by35, by35, by35, ROT0, "Bally","Spy Hunter (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, startrep, 0, by35, by35, by35, ROT0, "Bally","Star Trek (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, sst, 0, by35, by35, by35, ROT0, "Bally","Supersonic", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, smman, 0, by35, by35, by35, ROT0, "Bally","Six Million Dollar Man", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1984, tigerrag, kosteel, by35, by35, by35, ROT0, "Bell Games","Tiger Rag", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1982, vector, 0, by35, by35, by35, ROT0, "Bally","Vector", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, viking, 0, by35, by35, by35, ROT0, "Bally","Viking", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, voltan, 0, by35, by35, by35, ROT0, "Bally","Voltan Escapes Cosmic Doom", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1983, xsandos, 0, by35, by35, by35, ROT0, "Bally","X's & O's", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1980, xenon, 0, by35, by35, by35, ROT0, "Bally","Xenon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1982, vector, 0, by35, by35, by35, ROT0, "Bally","Vector", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, viking, 0, by35, by35, by35, ROT0, "Bally","Viking", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, voltan, 0, by35, by35, by35, ROT0, "Bally","Voltan Escapes Cosmic Doom", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1983, xsandos, 0, by35, by35, by35, ROT0, "Bally","X's & O's", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1980, xenon, 0, by35, by35, by35, ROT0, "Bally","Xenon", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1980, xenonf, xenon, by35, by35, by35, ROT0, "Bally","Xenon (French)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1985, worlddef, 0, by35, by35, by35, ROT0, "Bell Games","World Defender", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1986, darkshad, 0, by35, by35, by35, ROT0, "Nuova Bell Games","Dark Shadow", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/by6803.c b/src/mame/drivers/by6803.c index 65212a6608a..ab702a1ba0d 100644 --- a/src/mame/drivers/by6803.c +++ b/src/mame/drivers/by6803.c @@ -1,5 +1,5 @@ /* - Bally MPU A084-91786-AH06 (6803) + Bally MPU A084-91786-AH06 (6803) */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,9 +17,9 @@ public: static ADDRESS_MAP_START( by6803_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x00ff) AM_RAM + AM_RANGE(0x0000, 0x00ff) AM_RAM AM_RANGE(0x1000, 0x17ff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROM + AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static INPUT_PORTS_START( by6803 ) @@ -37,15 +37,15 @@ static MACHINE_CONFIG_START( by6803, by6803_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, 1000000) MCFG_CPU_PROGRAM_MAP(by6803_map) - + MCFG_MACHINE_RESET( by6803 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END /*----------------------------------------------------------- -/ Atlantis +/ Atlantis /-----------------------------------------------------------*/ ROM_START(atlantip) ROM_REGION(0x10000, "maincpu", 0) @@ -92,25 +92,25 @@ ROM_END /*------------------------------------ / Blackwater 100 /------------------------------------*/ -ROM_START(black100) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "u2.cpu", 0x8000, 0x4000, CRC(411fa773) SHA1(9756c7eee0f78792823a0b0379d2baac28cb03e8)) +ROM_START(black100) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "u2.cpu", 0x8000, 0x4000, CRC(411fa773) SHA1(9756c7eee0f78792823a0b0379d2baac28cb03e8)) ROM_LOAD( "u3.cpu", 0xc000, 0x4000, CRC(d6f6f890) SHA1(8fe4dae471f4c89f2fd72c6e647ead5206881c63)) - ROM_REGION(0x01000000, "cpu2", 0) - ROM_LOAD16_BYTE("u12.bin", 0x00001, 0x10000, CRC(a0ecb282) SHA1(4655e0b85f7e8af8dda853279696718d3adbf7e3)) - ROM_LOAD16_BYTE("u11.bin", 0x00000, 0x10000, CRC(3f117ba3) SHA1(b4cded8fdd90ca030c6ff12c817701402c94baba)) - ROM_LOAD16_BYTE("u14.bin", 0x20001, 0x10000, CRC(b45bf5c4) SHA1(396ddf346e8ebd8cb91777521d93564d029f40b1)) + ROM_REGION(0x01000000, "cpu2", 0) + ROM_LOAD16_BYTE("u12.bin", 0x00001, 0x10000, CRC(a0ecb282) SHA1(4655e0b85f7e8af8dda853279696718d3adbf7e3)) + ROM_LOAD16_BYTE("u11.bin", 0x00000, 0x10000, CRC(3f117ba3) SHA1(b4cded8fdd90ca030c6ff12c817701402c94baba)) + ROM_LOAD16_BYTE("u14.bin", 0x20001, 0x10000, CRC(b45bf5c4) SHA1(396ddf346e8ebd8cb91777521d93564d029f40b1)) ROM_LOAD16_BYTE("u13.bin", 0x20000, 0x10000, CRC(f5890443) SHA1(77cd18cf5541ae9f7e2dd1c060a9bf29b242d05d)) ROM_END -ROM_START(black100s) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "sb2.cpu", 0x8000, 0x4000, CRC(b6fdbb0f) SHA1(5b36a725db3a1e023bbb54b8f85300fe99174b6e)) +ROM_START(black100s) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "sb2.cpu", 0x8000, 0x4000, CRC(b6fdbb0f) SHA1(5b36a725db3a1e023bbb54b8f85300fe99174b6e)) ROM_LOAD( "sb3.cpu", 0xc000, 0x4000, CRC(ae9930b8) SHA1(1b6c63ce98939ecded300639d872df62548157a4)) - ROM_REGION(0x01000000, "cpu2", 0) - ROM_LOAD16_BYTE("u12.bin", 0x00001, 0x10000, CRC(a0ecb282) SHA1(4655e0b85f7e8af8dda853279696718d3adbf7e3)) - ROM_LOAD16_BYTE("u11.bin", 0x00000, 0x10000, CRC(3f117ba3) SHA1(b4cded8fdd90ca030c6ff12c817701402c94baba)) - ROM_LOAD16_BYTE("u14.bin", 0x20001, 0x10000, CRC(b45bf5c4) SHA1(396ddf346e8ebd8cb91777521d93564d029f40b1)) + ROM_REGION(0x01000000, "cpu2", 0) + ROM_LOAD16_BYTE("u12.bin", 0x00001, 0x10000, CRC(a0ecb282) SHA1(4655e0b85f7e8af8dda853279696718d3adbf7e3)) + ROM_LOAD16_BYTE("u11.bin", 0x00000, 0x10000, CRC(3f117ba3) SHA1(b4cded8fdd90ca030c6ff12c817701402c94baba)) + ROM_LOAD16_BYTE("u14.bin", 0x20001, 0x10000, CRC(b45bf5c4) SHA1(396ddf346e8ebd8cb91777521d93564d029f40b1)) ROM_LOAD16_BYTE("u13.bin", 0x20000, 0x10000, CRC(f5890443) SHA1(77cd18cf5541ae9f7e2dd1c060a9bf29b242d05d)) ROM_END @@ -164,43 +164,43 @@ ROM_END /*------------------------------------------------ / Escape from the Lost World /-----------------------------------------------*/ -ROM_START(esclwrld) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "u2.128", 0x8000, 0x4000, CRC(b11a97ea) SHA1(29339785a67ed7dc9eb39ddc7bb7e6baaf731210)) +ROM_START(esclwrld) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "u2.128", 0x8000, 0x4000, CRC(b11a97ea) SHA1(29339785a67ed7dc9eb39ddc7bb7e6baaf731210)) ROM_LOAD( "u3.128", 0xc000, 0x4000, CRC(5385a562) SHA1(a6c39532d01db556e4bdf90020a9d9905238e8ef)) - ROM_REGION(0x01000000, "cpu2", 0) - ROM_LOAD16_BYTE("u12.512", 0x00001, 0x10000, CRC(0c003473) SHA1(8ada2aa546a6499c5e2b5eb45a1975b8285d25f9)) - ROM_LOAD16_BYTE("u11.512", 0x00000, 0x10000, CRC(360f6658) SHA1(c0346952dcd33bbcf4c43c51cde5433a099a7a5d)) - ROM_LOAD16_BYTE("u14.512", 0x20001, 0x10000, CRC(0b92afff) SHA1(78f51989e74ced9e0a81c4e18d5abad71de01faf)) + ROM_REGION(0x01000000, "cpu2", 0) + ROM_LOAD16_BYTE("u12.512", 0x00001, 0x10000, CRC(0c003473) SHA1(8ada2aa546a6499c5e2b5eb45a1975b8285d25f9)) + ROM_LOAD16_BYTE("u11.512", 0x00000, 0x10000, CRC(360f6658) SHA1(c0346952dcd33bbcf4c43c51cde5433a099a7a5d)) + ROM_LOAD16_BYTE("u14.512", 0x20001, 0x10000, CRC(0b92afff) SHA1(78f51989e74ced9e0a81c4e18d5abad71de01faf)) ROM_LOAD16_BYTE("u13.512", 0x20000, 0x10000, CRC(b056842e) SHA1(7c67e5d69235a784b9c38cb31302d206278a3814)) ROM_END -ROM_START(esclwrldg) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "u2_ger.128", 0x8000, 0x4000, CRC(0a6ab137) SHA1(0627b7c67d13f305f2287f3cfa023c8dd7721250)) +ROM_START(esclwrldg) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "u2_ger.128", 0x8000, 0x4000, CRC(0a6ab137) SHA1(0627b7c67d13f305f2287f3cfa023c8dd7721250)) ROM_LOAD( "u3_ger.128", 0xc000, 0x4000, CRC(26d8bfbb) SHA1(3b81fb0e736d14004bbbbb2edd682fdfc1b2c832)) - ROM_REGION(0x01000000, "cpu2", 0) - ROM_LOAD16_BYTE("u12.512", 0x00001, 0x10000, CRC(0c003473) SHA1(8ada2aa546a6499c5e2b5eb45a1975b8285d25f9)) - ROM_LOAD16_BYTE("u11.512", 0x00000, 0x10000, CRC(360f6658) SHA1(c0346952dcd33bbcf4c43c51cde5433a099a7a5d)) - ROM_LOAD16_BYTE("u14.512", 0x20001, 0x10000, CRC(0b92afff) SHA1(78f51989e74ced9e0a81c4e18d5abad71de01faf)) + ROM_REGION(0x01000000, "cpu2", 0) + ROM_LOAD16_BYTE("u12.512", 0x00001, 0x10000, CRC(0c003473) SHA1(8ada2aa546a6499c5e2b5eb45a1975b8285d25f9)) + ROM_LOAD16_BYTE("u11.512", 0x00000, 0x10000, CRC(360f6658) SHA1(c0346952dcd33bbcf4c43c51cde5433a099a7a5d)) + ROM_LOAD16_BYTE("u14.512", 0x20001, 0x10000, CRC(0b92afff) SHA1(78f51989e74ced9e0a81c4e18d5abad71de01faf)) ROM_LOAD16_BYTE("u13.512", 0x20000, 0x10000, CRC(b056842e) SHA1(7c67e5d69235a784b9c38cb31302d206278a3814)) ROM_END /*------------------------------------ / Hardbody /------------------------------------*/ -ROM_START(hardbody) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "cpu_u2.128", 0x8000, 0x4000, CRC(c9248b47) SHA1(54239bd7d15574ebbb70ed306a804b7b32ed516a)) +ROM_START(hardbody) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "cpu_u2.128", 0x8000, 0x4000, CRC(c9248b47) SHA1(54239bd7d15574ebbb70ed306a804b7b32ed516a)) ROM_LOAD( "cpu_u3.128", 0xc000, 0x4000, CRC(31c255d0) SHA1(b6ffa2616ae9a4a121585cc402080ec6f26f8472)) - ROM_REGION(0x10000, "cpu2", 0) + ROM_REGION(0x10000, "cpu2", 0) ROM_LOAD("sound_u7.512", 0x0000, 0x10000, CRC(c96f91af) SHA1(9602a8991ca0cf9a7c68710f55c245d9c675b06f)) ROM_END -ROM_START(hardbodyg) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "hrdbdy-g.u2", 0x8000, 0x4000, CRC(fce357cc) SHA1(f7d13c12aabcb3c5bb5826b1911817bd359f1941)) +ROM_START(hardbodyg) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "hrdbdy-g.u2", 0x8000, 0x4000, CRC(fce357cc) SHA1(f7d13c12aabcb3c5bb5826b1911817bd359f1941)) ROM_LOAD( "hrdbdy-g.u3", 0xc000, 0x4000, CRC(ccac74b5) SHA1(d55cfc8ee866a9af4567d56890f5a9ecb9c3c02f)) - ROM_REGION(0x10000, "cpu2", 0) + ROM_REGION(0x10000, "cpu2", 0) ROM_LOAD("sound_u7.512", 0x0000, 0x10000, CRC(c96f91af) SHA1(9602a8991ca0cf9a7c68710f55c245d9c675b06f)) ROM_END @@ -282,51 +282,51 @@ ROM_END /*------------------------------------------------------------- / Truck Stop /-------------------------------------------------------------*/ -ROM_START(trucksp3) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "u2_p3.128", 0x8000, 0x4000, CRC(79b2a5b1) SHA1(d3de91bfadc9684302b2367cfcb30ed0d6faa020)) +ROM_START(trucksp3) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "u2_p3.128", 0x8000, 0x4000, CRC(79b2a5b1) SHA1(d3de91bfadc9684302b2367cfcb30ed0d6faa020)) ROM_LOAD( "u3_p3.128", 0xc000, 0x4000, CRC(2993373c) SHA1(26490f1dd8a5329a88a2ceb1e6044711a29f1445)) - ROM_REGION(0x10000, "cpu2", ROMREGION_ERASE00) - ROM_REGION(0x30000, "sound1", 0) - ROM_LOAD("u4sndp1.256", 0x00000, 0x8000, CRC(120a386f) SHA1(51b3b45eb7ea63758b21aad404ba12a9607fec44)) - ROM_RELOAD(0x00000 +0x8000, 0x8000) - ROM_LOAD("u19sndp1.256", 0x10000, 0x8000, CRC(5cd43dda) SHA1(23dd8a52ea1340fc239a246af0d94da905464efb)) - ROM_RELOAD(0x10000 +0x8000, 0x8000) - ROM_LOAD("u20sndp1.256", 0x20000, 0x8000, CRC(93ac5c33) SHA1(f6dc84eca4678188a58ba3c8ef18975164dd29b0)) - ROM_RELOAD(0x20000 +0x8000, 0x8000) + ROM_REGION(0x10000, "cpu2", ROMREGION_ERASE00) + ROM_REGION(0x30000, "sound1", 0) + ROM_LOAD("u4sndp1.256", 0x00000, 0x8000, CRC(120a386f) SHA1(51b3b45eb7ea63758b21aad404ba12a9607fec44)) + ROM_RELOAD(0x00000 +0x8000, 0x8000) + ROM_LOAD("u19sndp1.256", 0x10000, 0x8000, CRC(5cd43dda) SHA1(23dd8a52ea1340fc239a246af0d94da905464efb)) + ROM_RELOAD(0x10000 +0x8000, 0x8000) + ROM_LOAD("u20sndp1.256", 0x20000, 0x8000, CRC(93ac5c33) SHA1(f6dc84eca4678188a58ba3c8ef18975164dd29b0)) + ROM_RELOAD(0x20000 +0x8000, 0x8000) ROM_END -ROM_START(trucksp2) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD( "u2_p2.128", 0x8000, 0x4000, CRC(3c397dec) SHA1(2fc86ad39c935ce8615eafd67e571ac94c938cd7)) +ROM_START(trucksp2) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD( "u2_p2.128", 0x8000, 0x4000, CRC(3c397dec) SHA1(2fc86ad39c935ce8615eafd67e571ac94c938cd7)) ROM_LOAD( "u3_p2.128", 0xc000, 0x4000, CRC(d7ac519a) SHA1(612bf9fee0d54e8b1215508bd6c1ea61dcb99951)) - ROM_REGION(0x10000, "cpu2", ROMREGION_ERASE00) - ROM_REGION(0x30000, "sound1", 0) - ROM_LOAD("u4sndp1.256", 0x00000, 0x8000, CRC(120a386f) SHA1(51b3b45eb7ea63758b21aad404ba12a9607fec44)) - ROM_RELOAD(0x00000 +0x8000, 0x8000) - ROM_LOAD("u19sndp1.256", 0x10000, 0x8000, CRC(5cd43dda) SHA1(23dd8a52ea1340fc239a246af0d94da905464efb)) - ROM_RELOAD(0x10000 +0x8000, 0x8000) - ROM_LOAD("u20sndp1.256", 0x20000, 0x8000, CRC(93ac5c33) SHA1(f6dc84eca4678188a58ba3c8ef18975164dd29b0)) + ROM_REGION(0x10000, "cpu2", ROMREGION_ERASE00) + ROM_REGION(0x30000, "sound1", 0) + ROM_LOAD("u4sndp1.256", 0x00000, 0x8000, CRC(120a386f) SHA1(51b3b45eb7ea63758b21aad404ba12a9607fec44)) + ROM_RELOAD(0x00000 +0x8000, 0x8000) + ROM_LOAD("u19sndp1.256", 0x10000, 0x8000, CRC(5cd43dda) SHA1(23dd8a52ea1340fc239a246af0d94da905464efb)) + ROM_RELOAD(0x10000 +0x8000, 0x8000) + ROM_LOAD("u20sndp1.256", 0x20000, 0x8000, CRC(93ac5c33) SHA1(f6dc84eca4678188a58ba3c8ef18975164dd29b0)) ROM_RELOAD(0x20000 +0x8000, 0x8000) ROM_END -GAME( 1989, atlantip, 0, by6803, by6803, by6803, ROT0, "Bally","Atlantis", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1985, beatclck, 0, by6803, by6803, by6803, ROT0, "Bally","Beat the Clock", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1986, blackblt, 0, by6803, by6803, by6803, ROT0, "Bally","Black Belt", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1988, black100, 0, by6803, by6803, by6803, ROT0, "Bally","Blackwater 100", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1989, atlantip, 0, by6803, by6803, by6803, ROT0, "Bally","Atlantis", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1985, beatclck, 0, by6803, by6803, by6803, ROT0, "Bally","Beat the Clock", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1986, blackblt, 0, by6803, by6803, by6803, ROT0, "Bally","Black Belt", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1988, black100, 0, by6803, by6803, by6803, ROT0, "Bally","Blackwater 100", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1988, black100s, black100, by6803, by6803, by6803, ROT0, "Bally","Blackwater 100 (Single Ball Play)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, cityslck, 0, by6803, by6803, by6803, ROT0, "Bally","City Slicker", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, dungdrag, 0, by6803, by6803, by6803, ROT0, "Bally","Dungeons & Dragons", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1985, eballchp, 0, by6803, by6803, by6803, ROT0, "Bally","Eight Ball Champ", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, esclwrld, 0, by6803, by6803, by6803, ROT0, "Bally","Escape from the Lost World", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, cityslck, 0, by6803, by6803, by6803, ROT0, "Bally","City Slicker", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, dungdrag, 0, by6803, by6803, by6803, ROT0, "Bally","Dungeons & Dragons", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1985, eballchp, 0, by6803, by6803, by6803, ROT0, "Bally","Eight Ball Champ", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, esclwrld, 0, by6803, by6803, by6803, ROT0, "Bally","Escape from the Lost World", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1987, esclwrldg, esclwrld, by6803, by6803, by6803, ROT0, "Bally","Escape from the Lost World (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, hardbody, 0, by6803, by6803, by6803, ROT0, "Bally","Hardbody", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, hardbody, 0, by6803, by6803, by6803, ROT0, "Bally","Hardbody", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1987, hardbodyg, hardbody, by6803, by6803, by6803, ROT0, "Bally","Hardbody (German)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, hvymetap, 0, by6803, by6803, by6803, ROT0, "Bally","Heavy Metal Meltdown", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1986, ladyluck, 0, by6803, by6803, by6803, ROT0, "Bally","Lady Luck", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1986, motrdome, 0, by6803, by6803, by6803, ROT0, "Bally","MotorDome", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, prtyanim, 0, by6803, by6803, by6803, ROT0, "Bally","Party Animal", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1986, specforc, 0, by6803, by6803, by6803, ROT0, "Bally","Special Force", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1986, strngsci, 0, by6803, by6803, by6803, ROT0, "Bally","Strange Science", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1988, trucksp3, 0, by6803, by6803, by6803, ROT0, "Bally","Truck Stop (P-3)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, hvymetap, 0, by6803, by6803, by6803, ROT0, "Bally","Heavy Metal Meltdown", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1986, ladyluck, 0, by6803, by6803, by6803, ROT0, "Bally","Lady Luck", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1986, motrdome, 0, by6803, by6803, by6803, ROT0, "Bally","MotorDome", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, prtyanim, 0, by6803, by6803, by6803, ROT0, "Bally","Party Animal", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1986, specforc, 0, by6803, by6803, by6803, ROT0, "Bally","Special Force", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1986, strngsci, 0, by6803, by6803, by6803, ROT0, "Bally","Strange Science", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1988, trucksp3, 0, by6803, by6803, by6803, ROT0, "Bally","Truck Stop (P-3)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1988, trucksp2, trucksp3, by6803, by6803, by6803, ROT0, "Bally","Truck Stop (P-2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/by68701.c b/src/mame/drivers/by68701.c index f50fd7c64b2..dac5cb7e92e 100644 --- a/src/mame/drivers/by68701.c +++ b/src/mame/drivers/by68701.c @@ -13,12 +13,12 @@ public: static ADDRESS_MAP_START( by68701_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x00ff) AM_RAM - AM_RANGE(0x0400, 0x04ff) AM_RAM - AM_RANGE(0x0500, 0x07ff) AM_RAM - AM_RANGE(0x7000, 0xffff) AM_ROM + AM_RANGE(0x0000, 0x00ff) AM_RAM + AM_RANGE(0x0400, 0x04ff) AM_RAM + AM_RANGE(0x0500, 0x07ff) AM_RAM + AM_RANGE(0x7000, 0xffff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( by68701 ) INPUT_PORTS_END @@ -34,9 +34,9 @@ static MACHINE_CONFIG_START( by68701, by68701_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, 3579545/4) MCFG_CPU_PROGRAM_MAP(by68701_map) - + MCFG_MACHINE_RESET( by68701 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/byvid.c b/src/mame/drivers/byvid.c index 6f786147c45..e9472f57d37 100644 --- a/src/mame/drivers/byvid.c +++ b/src/mame/drivers/byvid.c @@ -1,6 +1,6 @@ /* - Bally MPU AS-2518-133 -*/ + Bally MPU AS-2518-133 +*/ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -18,14 +18,14 @@ public: static ADDRESS_MAP_START( by133_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x7fff) - AM_RANGE(0x1000, 0x7fff) AM_ROM + AM_RANGE(0x1000, 0x7fff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( by133_video_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( by133 ) INPUT_PORTS_END @@ -41,14 +41,14 @@ static MACHINE_CONFIG_START( by133, by133_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 3580000/4) MCFG_CPU_PROGRAM_MAP(by133_map) - + MCFG_CPU_ADD("videocpu", M6809, 3580000/4) - MCFG_CPU_PROGRAM_MAP(by133_video_map) - + MCFG_CPU_PROGRAM_MAP(by133_video_map) + MCFG_MACHINE_RESET( by133 ) - + /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_pinball) + MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END /*----------------------------------------------------- @@ -90,6 +90,6 @@ ROM_START(granny) ROM_REGION(0x10000, "soundcpu", 0) ROM_LOAD( "cs_u3.764", 0xe000, 0x2000, CRC(0a39a51d) SHA1(98342ba38e48578ce9870f2ee85b553d46c0e35f)) ROM_END - + GAME( 1982, babypac, 0, by133, by133, by133, ROT0, "Bally","Baby Pacman (Video/Pinball Combo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1984, granny, 0, by133, by133, by133, ROT0, "Bally","Granny and the Gators (Video/Pinball Combo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/capcom.c b/src/mame/drivers/capcom.c index 9eba3c10ede..c35ec905cdd 100644 --- a/src/mame/drivers/capcom.c +++ b/src/mame/drivers/capcom.c @@ -1,5 +1,5 @@ /* - Capcom A0015405 + Capcom A0015405 */ #include "emu.h" @@ -18,7 +18,7 @@ public: static ADDRESS_MAP_START( capcom_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( capcom ) INPUT_PORTS_END @@ -34,9 +34,9 @@ static MACHINE_CONFIG_START( capcom, capcom_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16670000) // M68306 MCFG_CPU_PROGRAM_MAP(capcom_map) - + MCFG_MACHINE_RESET( capcom ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index f3d643c3343..8020ecc888b 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -395,7 +395,7 @@ static VIDEO_UPDATE(cb2001) tile = (cb2001_vram_fg[count] & 0x0fff); colour = (cb2001_vram_fg[count] & 0xf000)>>12; tile += cb2001_videobank*0x2000; - + if (other2 & 0x4) { tile += 0x1000; @@ -436,7 +436,7 @@ WRITE16_HANDLER( cb2001_vidctrl2_w ) else // something else other2 = data & 0x00ff; -// printf("cb2001_vidctrl2_w %04x %04x\n", data, mem_mask); // bank could be here instead +// printf("cb2001_vidctrl2_w %04x %04x\n", data, mem_mask); // bank could be here instead } diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index cffe2b4a014..82d23554b20 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -204,8 +204,8 @@ static INTERRUPT_GEN( cshooter_interrupt ) else cpu_set_input_line_and_vector(device, 0, HOLD_LINE, 0x10); -// if(mainram!=NULL) -// ar_coin_hack(device->machine); +// if(mainram!=NULL) +// ar_coin_hack(device->machine); } @@ -295,8 +295,8 @@ static WRITE8_HANDLER( seibu_sound_comms_w ) static ADDRESS_MAP_START( airraid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP // rld result write-back -// AM_RANGE(0xb000, 0xb0ff) AM_RAM -// AM_RANGE(0xb100, 0xb1ff) AM_RAM//ROMBANK("bank1") +// AM_RANGE(0xb000, 0xb0ff) AM_RAM +// AM_RANGE(0xb100, 0xb1ff) AM_RAM//ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") diff --git a/src/mame/drivers/de_1.c b/src/mame/drivers/de_1.c index 6aa4b520a68..f03bb7e769d 100644 --- a/src/mame/drivers/de_1.c +++ b/src/mame/drivers/de_1.c @@ -1,5 +1,5 @@ /* - DataEast/Sega Version 1 + DataEast/Sega Version 1 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( de_1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( de_1 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( de_1, de_1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(de_1_map) - + MCFG_MACHINE_RESET( de_1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c index 7c882a739c4..54627038e7c 100644 --- a/src/mame/drivers/de_2.c +++ b/src/mame/drivers/de_2.c @@ -1,5 +1,5 @@ /* - DataEast/Sega Version 2 + DataEast/Sega Version 2 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( de_2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( de_2 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( de_2, de_2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(de_2_map) - + MCFG_MACHINE_RESET( de_2 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c index 1fe6039ff67..ae8a961cace 100644 --- a/src/mame/drivers/de_3.c +++ b/src/mame/drivers/de_3.c @@ -1,5 +1,5 @@ /* - DataEast/Sega Version 3 + DataEast/Sega Version 3 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -16,7 +16,7 @@ public: static ADDRESS_MAP_START( de_3_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( de_3 ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( de_3, de_3_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(de_3_map) - + MCFG_MACHINE_RESET( de_3 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c index dc426b72559..d9dd040a6cc 100644 --- a/src/mame/drivers/de_3b.c +++ b/src/mame/drivers/de_3b.c @@ -1,5 +1,5 @@ /* - DataEast/Sega Version 3b + DataEast/Sega Version 3b */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -16,7 +16,7 @@ public: static ADDRESS_MAP_START( de_3b_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( de_3b ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( de_3b, de_3b_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(de_3b_map) - + MCFG_MACHINE_RESET( de_3b ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/flicker.c b/src/mame/drivers/flicker.c index 0fc2509fa9a..341fc2f729c 100644 --- a/src/mame/drivers/flicker.c +++ b/src/mame/drivers/flicker.c @@ -19,12 +19,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(flicker_map, ADDRESS_SPACE_DATA, 8) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x00FF) AM_RAM -ADDRESS_MAP_END +ADDRESS_MAP_END static ADDRESS_MAP_START( flicker_io , ADDRESS_SPACE_IO, 8) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( flicker ) INPUT_PORTS_END @@ -42,9 +42,9 @@ static MACHINE_CONFIG_START( flicker, flicker_state ) MCFG_CPU_PROGRAM_MAP(flicker_rom) MCFG_CPU_DATA_MAP(flicker_map) MCFG_CPU_IO_MAP(flicker_io) - + MCFG_MACHINE_RESET( flicker ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/g627.c b/src/mame/drivers/g627.c index 639a0b3bc38..a6fede206a3 100644 --- a/src/mame/drivers/g627.c +++ b/src/mame/drivers/g627.c @@ -1,9 +1,9 @@ /* - Midway A084-91313-G627 - A080-91313-G627 - A082-91320-C000 - - Only one of it's kind + Midway A084-91313-G627 + A080-91313-G627 + A082-91320-C000 + + Only one of it's kind */ #include "emu.h" #include "cpu/z80/z80.h" @@ -21,7 +21,7 @@ public: static ADDRESS_MAP_START( g627_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( g627 ) INPUT_PORTS_END @@ -37,9 +37,9 @@ static MACHINE_CONFIG_START( g627, g627_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 14138000/8) MCFG_CPU_PROGRAM_MAP(g627_map) - + MCFG_MACHINE_RESET( g627 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 7156a4f4d3f..0b1d733fdc6 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( gaplus, driver_device ) MCFG_NAMCO58XX_ADD("58xx", intf1) MCFG_NAMCO_62XX_ADD("62xx", 24576000/6/2, namco_62xx_intf) /* totally made up - TODO: fix */ - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60.606060) diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index f70091f76c7..1a08caa3bef 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -249,7 +249,7 @@ * Wild Witch / Jolli Witch - + These sets have a switch to change the game. Wild Witch comes with a complete Witch Game as switchable alternative, and Jolli Witch has Witch Card in the same package. Both are based in the 6T/12T program made by Video Klein, However, Jolli @@ -897,7 +897,7 @@ static PALETTE_INIT( wcrdxtnd ) bit2 = (color_prom[i] >> 2) & 0x01; b = bk * (bit2 * 0xff); //if ((b == 0) & (bk = 1)) --> needs better implementation - // b = 0x3f; + // b = 0x3f; palette_set_color(machine, i, MAKE_RGB(r, g, b)); } @@ -1132,13 +1132,13 @@ ADDRESS_MAP_END /* Video Klein extended hardware - + Extended graphics plus DS1210 + RAM */ static ADDRESS_MAP_START( wcrdxtnd_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_SHARE("nvram") /* battery backed RAM */ + AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_SHARE("nvram") /* battery backed RAM */ AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) @@ -3315,9 +3315,9 @@ ROM_END Nothing about them, except that they are running on ICP-1 type boards. - + It's a supossed Jack Potten's Poker upgrade. - + *************************************************************/ ROM_START( ngold ) @@ -3333,7 +3333,7 @@ ROM_START( ngold ) ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ ROM_LOAD( "2.5a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ - + ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "n82s129n.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END @@ -3351,7 +3351,7 @@ ROM_START( ngolda ) ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ ROM_LOAD( "2.5a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ - + ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "n82s129n.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END @@ -3369,7 +3369,7 @@ ROM_START( ngoldb ) ROM_LOAD( "7.bin", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ ROM_LOAD( "8.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ ROM_LOAD( "9.bin", 0x1000, 0x0800, BAD_DUMP CRC(d5471775) SHA1(ce3953ef1a21db055f92a6eeb7a64ea32bb539da) ) /* cards deck gfx, bitplane3. need to be redumped */ - + ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "n82s129n.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */ ROM_END @@ -4311,7 +4311,7 @@ ROM_END There are french strings related to the game, so maybe is a leftover, or maybe there is a unknown way to switch the language. - + *****************************************************/ @@ -4322,7 +4322,7 @@ ROM_START( silverga ) ROM_REGION( 0x3000, "gfx1", 0 ) ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */ - ROM_LOAD( "13", 0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) ) /* text layer */ + ROM_LOAD( "13", 0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) ) /* text layer */ ROM_REGION( 0x1800, "gfx2", 0 ) ROM_LOAD( "11", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */ @@ -4340,7 +4340,7 @@ ROM_END There are french strings related to the game into the program ROM. - + The dump lacks of 1 program ROM located at 17a. (empty socket in the PCB picture) @@ -4359,7 +4359,7 @@ ROM_START( pokerdub ) ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */ ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */ ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */ - + ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "s287.8c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END @@ -4372,9 +4372,9 @@ ROM_END This one is totally encrypted. The PCB has a daughterboard coated with some plastic or epoxy resin. - - Char ROM is identical to the Witch Card one. - + + Char ROM is identical to the Witch Card one. + *****************************************************/ ROM_START( pokerduc ) @@ -4408,10 +4408,10 @@ ROM_START( witchjol ) ROM_LOAD( "27c256.bin", 0x8000, 0x8000, CRC(14f05e3b) SHA1(83578f6a82b0974dd0325903926b2fd0d8e5c236) ) ROM_REGION( 0x6000, "temp", 0 ) - ROM_LOAD( "iii.5a", 0x0000, 0x2000, CRC(5ea338da) SHA1(5e55e17689541ffb9c23e45f689dda98a79bf789) ) + ROM_LOAD( "iii.5a", 0x0000, 0x2000, CRC(5ea338da) SHA1(5e55e17689541ffb9c23e45f689dda98a79bf789) ) ROM_LOAD( "ii.4a", 0x2000, 0x2000, CRC(044dfac0) SHA1(721f8f57e05ddcbdb838d12fd3e81a45346ee6db) ) - ROM_LOAD( "i.2a", 0x4000, 0x2000, CRC(d467f6e2) SHA1(6aaf4cdfb76f5efeeee45635fea120711483648e) ) - + ROM_LOAD( "i.2a", 0x4000, 0x2000, CRC(d467f6e2) SHA1(6aaf4cdfb76f5efeeee45635fea120711483648e) ) + ROM_REGION( 0x1800, "gfx1", 0 ) ROM_FILL( 0x0000, 0x1000, 0 ) /* filling bitplanes */ ROM_COPY( "temp", 0x0000, 0x1000, 0x0800 ) /* 0000-07ff of 03.a3 - char rom, bitplane 3*/ @@ -4427,7 +4427,7 @@ ROM_START( witchjol ) ROM_COPY( "temp", 0x01800, 0x1000, 0x0800 ) /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */ ROM_REGION( 0x0100, "proms", 0 ) -// ROM_LOAD( "24s10.bin", 0x0000, 0x0100, BAD_DUMP CRC(d5018fc0) SHA1(05c67d84da0a4053bcd3b9d144643d83892470ef) ) +// ROM_LOAD( "24s10.bin", 0x0000, 0x0100, BAD_DUMP CRC(d5018fc0) SHA1(05c67d84da0a4053bcd3b9d144643d83892470ef) ) ROM_LOAD( "24s10.clr", 0x0000, 0x0100, BAD_DUMP CRC(560aafa5) SHA1(a85a72f7616146eae0d00b2fedf7b053a4794d10) ) ROM_END @@ -4440,8 +4440,8 @@ ROM_END The program ask you to install a new block or retain the former buggy one. - - + + ******************************************/ ROM_START( wldwitch ) @@ -4468,7 +4468,7 @@ ROM_START( wldwitch ) ROM_COPY( "temp", 0x01800, 0x1000, 0x0800 ) /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */ ROM_REGION( 0x0100, "proms", 0 ) -// ROM_LOAD( "24s10.bin", 0x0000, 0x0100, BAD_DUMP CRC(d5018fc0) SHA1(05c67d84da0a4053bcd3b9d144643d83892470ef) ) +// ROM_LOAD( "24s10.bin", 0x0000, 0x0100, BAD_DUMP CRC(d5018fc0) SHA1(05c67d84da0a4053bcd3b9d144643d83892470ef) ) ROM_LOAD( "24s10.clr", 0x0000, 0x0100, BAD_DUMP CRC(560aafa5) SHA1(a85a72f7616146eae0d00b2fedf7b053a4794d10) ) ROM_REGION( 0x0400, "proms2", 0 ) @@ -4521,7 +4521,7 @@ static DRIVER_INIT( royale ) { /* $60bb, NOPing the ORA #$F0 (after read the PIA1 port B */ -// UINT8 *ROM = machine->region("maincpu")->base(); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x60bb] = 0xea; // ROM[0x60bc] = 0xea; @@ -4603,10 +4603,10 @@ static DRIVER_INIT( vkdlsc ) /*********************************************** ICP1 Daughterboard encryption - + The PCB has a daughterboard coated with some plastic or epoxy resin. - + pattern: 0000: FF FF FF FF FF FF FF FF | FB FB FB FB FB FB FB FB diff --git a/src/mame/drivers/gp_1.c b/src/mame/drivers/gp_1.c index 0662d21690d..3ba8bc3afb7 100644 --- a/src/mame/drivers/gp_1.c +++ b/src/mame/drivers/gp_1.c @@ -1,5 +1,5 @@ /* - Game Plan MPU-1 + Game Plan MPU-1 */ #include "emu.h" @@ -18,7 +18,7 @@ public: static ADDRESS_MAP_START( gp_1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( gp_1 ) INPUT_PORTS_END @@ -34,9 +34,9 @@ static MACHINE_CONFIG_START( gp_1, gp_1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2457600) MCFG_CPU_PROGRAM_MAP(gp_1_map) - + MCFG_MACHINE_RESET( gp_1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gp_2.c b/src/mame/drivers/gp_2.c index e14bb24ac79..2c8032b43f9 100644 --- a/src/mame/drivers/gp_2.c +++ b/src/mame/drivers/gp_2.c @@ -1,5 +1,5 @@ /* - Game Plan MPU-2 + Game Plan MPU-2 */ #include "emu.h" #include "cpu/z80/z80.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( gp_2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( gp_2 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( gp_2, gp_2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2457600) MCFG_CPU_PROGRAM_MAP(gp_2_map) - + MCFG_MACHINE_RESET( gp_2 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gts1.c b/src/mame/drivers/gts1.c index a2595fa6252..86c47dd2167 100644 --- a/src/mame/drivers/gts1.c +++ b/src/mame/drivers/gts1.c @@ -1,6 +1,6 @@ /* - Gottlieb System 1 -*/ + Gottlieb System 1 +*/ #include "emu.h" #include "cpu/pps4/pps4.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( gts1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( gts1 ) INPUT_PORTS_END @@ -33,13 +33,13 @@ static MACHINE_CONFIG_START( gts1, gts1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPS4, 198864) MCFG_CPU_PROGRAM_MAP(gts1_map) - + MCFG_MACHINE_RESET( gts1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END - + ROM_START( gts1 ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -294,7 +294,7 @@ GAME(1977, gts1, 0, gts1, gts1, gts1, ROT0, "Gottlieb", "System 1", GA //Exact same roms as gts1 with added hardware we'll likely need roms for to emulate properly GAME(1979, gts1s, gts1, gts1, gts1, gts1, ROT0, "Gottlieb", "System 1 with sound board", GAME_IS_BIOS_ROOT) - + GAME(1980, astannie, gts1s, gts1, gts1, gts1, ROT0, "Gottlieb", "Asteroid Annie and the Aliens", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1980, buckrgrs, gts1s, gts1, gts1, gts1, ROT0, "Gottlieb", "Buck Rogers", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1978, charlies, gts1, gts1, gts1, gts1, ROT0, "Gottlieb", "Charlie's Angels", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/gts3.c b/src/mame/drivers/gts3.c index b9490b9e2a1..7b382d85953 100644 --- a/src/mame/drivers/gts3.c +++ b/src/mame/drivers/gts3.c @@ -1,5 +1,5 @@ /* - Gottlieb System 3 + Gottlieb System 3 */ #include "emu.h" #include "cpu/m6502/m65ce02.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( gts3_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( gts3 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( gts3, gts3_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, 2000000) MCFG_CPU_PROGRAM_MAP(gts3_map) - + MCFG_MACHINE_RESET( gts3 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -136,7 +136,7 @@ ROM_START(ccruise) ROM_REGION(0x10000, "cpu3", 0) ROM_LOAD("drom1.bin", 0x8000, 0x8000, CRC(4480257e) SHA1(50b93d4496816ef7cdf007ac75c72c6aaa956aba)) ROM_REGION(0x100000, "sound1", 0) - ROM_LOAD("arom1.bin", 0x00000, 0x40000, CRC(f8cec60c) SHA1(e52f3a5890a3bb5eb6c932c3d0ed471ed76909c9)) + ROM_LOAD("arom1.bin", 0x00000, 0x40000, CRC(f8cec60c) SHA1(e52f3a5890a3bb5eb6c932c3d0ed471ed76909c9)) ROM_RELOAD(0x40000, 0x40000) ROM_REGION(0x10000, "cpu2", ROMREGION_ERASEFF) ROM_LOAD("yrom1.bin", 0x8000, 0x8000, CRC(6e424e53) SHA1(90a9bf5ce84680972f9d12eb386215494c584b9b)) @@ -631,7 +631,7 @@ ROM_START(smb3) ROM_REGION(0x10000, "cpu2", ROMREGION_ERASEFF) ROM_REGION(0x80000, "user1", 0) ROM_LOAD("dsprom2.bin", 0x00000, 0x40000, CRC(181e8234) SHA1(9b22681f61cae401269a88c3cfd783d683390877)) - ROM_RELOAD( 0x40000, 0x40000) + ROM_RELOAD( 0x40000, 0x40000) ROM_REGION(0x10000, "cpu4", 0) ROM_LOAD("drom1.bin", 0x8000, 0x8000, CRC(6f1d0a3e) SHA1(c7f665d79b9073f28f90debde16cafa9ab57a47c)) ROM_REGION(0x100000, "sound1", 0) diff --git a/src/mame/drivers/gts80.c b/src/mame/drivers/gts80.c index c613994b0e9..b6e91a1bbd4 100644 --- a/src/mame/drivers/gts80.c +++ b/src/mame/drivers/gts80.c @@ -1,7 +1,7 @@ /* - - Gottlieb System 80 - + + Gottlieb System 80 + */ #include "emu.h" @@ -23,7 +23,7 @@ static ADDRESS_MAP_START( gts80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3fff) AM_MIRROR(0xc000) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( gts80 ) INPUT_PORTS_END @@ -42,9 +42,9 @@ static MACHINE_CONFIG_START( gts80_s, gts80_state ) MCFG_CPU_PROGRAM_MAP(gts80_map) MCFG_MACHINE_RESET( gts80 ) - + /* related to src/mame/audio/gottlieb.c */ -// MCFG_IMPORT_FROM(gts80s_s) +// MCFG_IMPORT_FROM(gts80s_s) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -58,9 +58,9 @@ static MACHINE_CONFIG_START( gts80_ss, driver_device ) MCFG_CPU_PROGRAM_MAP(gts80_map) MCFG_MACHINE_RESET( gts80 ) - + /* related to src/mame/audio/gottlieb.c */ -// MCFG_IMPORT_FROM(gts80s_ss) +// MCFG_IMPORT_FROM(gts80s_ss) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -303,7 +303,7 @@ ROM_START(hh_1) ROM_END /*------------------------------------------------------------------- -/ James Bond +/ James Bond /-------------------------------------------------------------------*/ ROM_START(jamesb) ROM_REGION(0x10000, "maincpu", 0) diff --git a/src/mame/drivers/gts80a.c b/src/mame/drivers/gts80a.c index fb4e01f5fb8..6b769d1887c 100644 --- a/src/mame/drivers/gts80a.c +++ b/src/mame/drivers/gts80a.c @@ -1,7 +1,7 @@ /* - - Gottlieb System 80A - + + Gottlieb System 80A + */ #include "emu.h" @@ -51,9 +51,9 @@ static MACHINE_CONFIG_START( gts80a_s, gts80a_state ) MCFG_CPU_PROGRAM_MAP(gts80a_map) MCFG_MACHINE_RESET( gts80a ) - + /* related to src/mame/audio/gottlieb.c */ -// MCFG_IMPORT_FROM(gts80s_s) +// MCFG_IMPORT_FROM(gts80s_s) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -65,9 +65,9 @@ static MACHINE_CONFIG_START( gts80a_ss, gts80a_state ) MCFG_CPU_PROGRAM_MAP(gts80a_map) MCFG_MACHINE_RESET( gts80a ) - + /* related to src/mame/audio/gottlieb.c */ -// MCFG_IMPORT_FROM(gts80s_ss) +// MCFG_IMPORT_FROM(gts80s_ss) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -89,9 +89,9 @@ static MACHINE_CONFIG_START( caveman, gts80a_state ) MCFG_CPU_PROGRAM_MAP(caveman_map) MCFG_MACHINE_RESET( gts80a ) - + /* related to src/mame/audio/gottlieb.c */ -// MCFG_IMPORT_FROM(gts80s_ss) +// MCFG_IMPORT_FROM(gts80s_ss) MCFG_CPU_ADD("video_cpu", I8086, 5000000) MCFG_CPU_PROGRAM_MAP(video_map) @@ -227,7 +227,7 @@ ROM_START(cavemana) ROM_END /*------------------------------------------------------------------- -/ Devil's Dare +/ Devil's Dare /-------------------------------------------------------------------*/ ROM_START(dvlsdre) ROM_REGION(0x10000, "maincpu", 0) @@ -661,6 +661,6 @@ ROM_END /* disp3 */GAME(1984, thegames, 0, gts80a_s, gts80a, gts80a, ROT0, "Gottlieb", "The Games", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) /* disp3 */GAME(1984, touchdn, 0, gts80a_s, gts80a, gts80a, ROT0, "Gottlieb", "Touchdown", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -/* custom (+video) */ +/* custom (+video) */ GAME(1981, caveman, 0, caveman, caveman, gts80a, ROT0, "Gottlieb", "Caveman (Pinball/Video Combo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1981, cavemana, caveman, caveman, caveman, gts80a, ROT0, "Gottlieb", "Caveman (Pinball/Video Combo, Set 2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/gts80b.c b/src/mame/drivers/gts80b.c index 3e5b5032c3c..be414762093 100644 --- a/src/mame/drivers/gts80b.c +++ b/src/mame/drivers/gts80b.c @@ -1,7 +1,7 @@ /* - - Gottlieb System 80B - + + Gottlieb System 80B + */ #include "emu.h" @@ -23,7 +23,7 @@ static ADDRESS_MAP_START( gts80b_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3fff) AM_MIRROR(0xc000) AM_ROM /* u3 ROM */ ADDRESS_MAP_END - + static INPUT_PORTS_START( gts80b ) INPUT_PORTS_END @@ -42,9 +42,9 @@ static MACHINE_CONFIG_START( gts80b_s, gts80b_state ) MCFG_CPU_PROGRAM_MAP(gts80b_map) MCFG_MACHINE_RESET( gts80b ) - + /* related to src/mame/audio/gottlieb.c */ -// MCFG_IMPORT_FROM(gts80s_s) +// MCFG_IMPORT_FROM(gts80s_s) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -56,9 +56,9 @@ static MACHINE_CONFIG_START( gts80b_s1, gts80b_state ) MCFG_CPU_PROGRAM_MAP(gts80b_map) MCFG_MACHINE_RESET( gts80b ) - + /* related to src/mame/audio/gottlieb.c? */ -// MCFG_IMPORT_FROM(gts80s_b1) +// MCFG_IMPORT_FROM(gts80s_b1) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -70,9 +70,9 @@ static MACHINE_CONFIG_START( gts80b_s2, gts80b_state ) MCFG_CPU_PROGRAM_MAP(gts80b_map) MCFG_MACHINE_RESET( gts80b ) - + /* related to src/mame/audio/gottlieb.c? */ -// MCFG_IMPORT_FROM(gts80s_b2) +// MCFG_IMPORT_FROM(gts80s_b2) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -84,9 +84,9 @@ static MACHINE_CONFIG_START( gts80b_s3, gts80b_state ) MCFG_CPU_PROGRAM_MAP(gts80b_map) MCFG_MACHINE_RESET( gts80b ) - + /* related to src/mame/audio/gottlieb.c? */ -// MCFG_IMPORT_FROM(gts80s_b3) +// MCFG_IMPORT_FROM(gts80s_b3) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) @@ -98,9 +98,9 @@ static MACHINE_CONFIG_START( bonebstr, gts80b_state ) MCFG_CPU_PROGRAM_MAP(gts80b_map) MCFG_MACHINE_RESET( gts80b ) - + /* related to src/mame/audio/gottlieb.c? */ -// MCFG_IMPORT_FROM(gts80s_b3a) +// MCFG_IMPORT_FROM(gts80s_b3a) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) diff --git a/src/mame/drivers/hankin.c b/src/mame/drivers/hankin.c index be13e5036f7..dbea2083f3f 100644 --- a/src/mame/drivers/hankin.c +++ b/src/mame/drivers/hankin.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( hankin_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( hankin ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( hankin, hankin_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, 900000) MCFG_CPU_PROGRAM_MAP(hankin_map) - + MCFG_MACHINE_RESET( hankin ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index 02081def943..aeeb866caaf 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -554,12 +554,12 @@ ROM_START( braveff ) HIKARU_BIOS ROM_REGION( 0x2000000, "user1", 0) - ROM_LOAD32_WORD( "epr-21994.ic29", 0x000000, 0x200000, CRC(31b0a754) SHA1(b49c998a15fbc790b780ed6665a56681d4edd369) ) - ROM_LOAD32_WORD( "epr-21995.ic30", 0x000002, 0x200000, CRC(bcccb56b) SHA1(6e7a69934e5b47495ae8e90c57759573bc519d24) ) - ROM_LOAD32_WORD( "epr-21996.ic31", 0x400000, 0x200000, CRC(a8f88e17) SHA1(dbbd2a73335c740bcf2ff9680c575841af29b340) ) - ROM_LOAD32_WORD( "epr-21997.ic32", 0x400002, 0x200000, CRC(4b24fa1b) SHA1(53c330f7e7ce8cb67f67db3ee9068a77aeb33747) ) - ROM_LOAD32_WORD( "epr-21998.ic33", 0x800000, 0x200000, CRC(bd1df696) SHA1(fd937894763fab5cb50f33c40f8047e0d3adc93b) ) - ROM_LOAD32_WORD( "epr-21999.ic34", 0x800002, 0x200000, CRC(9425eee0) SHA1(0f6a23163022bbd7ec54dd638094f3e317a87919) ) + ROM_LOAD32_WORD( "epr-21994.ic29", 0x000000, 0x200000, CRC(31b0a754) SHA1(b49c998a15fbc790b780ed6665a56681d4edd369) ) + ROM_LOAD32_WORD( "epr-21995.ic30", 0x000002, 0x200000, CRC(bcccb56b) SHA1(6e7a69934e5b47495ae8e90c57759573bc519d24) ) + ROM_LOAD32_WORD( "epr-21996.ic31", 0x400000, 0x200000, CRC(a8f88e17) SHA1(dbbd2a73335c740bcf2ff9680c575841af29b340) ) + ROM_LOAD32_WORD( "epr-21997.ic32", 0x400002, 0x200000, CRC(4b24fa1b) SHA1(53c330f7e7ce8cb67f67db3ee9068a77aeb33747) ) + ROM_LOAD32_WORD( "epr-21998.ic33", 0x800000, 0x200000, CRC(bd1df696) SHA1(fd937894763fab5cb50f33c40f8047e0d3adc93b) ) + ROM_LOAD32_WORD( "epr-21999.ic34", 0x800002, 0x200000, CRC(9425eee0) SHA1(0f6a23163022bbd7ec54dd638094f3e317a87919) ) /* ic35 unpopulated */ /* ic36 unpopulated */ @@ -572,8 +572,8 @@ ROM_START( sgnascar ) HIKARU_BIOS ROM_REGION( 0x2000000, "user1", 0) - ROM_LOAD32_WORD( "epr-23485a.ic35", 0x000000, 0x400000, CRC(1072f531) SHA1(ca07a8bfb7247e4aec57e18cb091d24dcef666c1) ) - ROM_LOAD32_WORD( "epr-23486a.ic36", 0x000002, 0x400000, CRC(02d4aab6) SHA1(b1b0e07dc71dc124177e27dfd8b459444e8ae4d3) ) + ROM_LOAD32_WORD( "epr-23485a.ic35", 0x000000, 0x400000, CRC(1072f531) SHA1(ca07a8bfb7247e4aec57e18cb091d24dcef666c1) ) + ROM_LOAD32_WORD( "epr-23486a.ic36", 0x000002, 0x400000, CRC(02d4aab6) SHA1(b1b0e07dc71dc124177e27dfd8b459444e8ae4d3) ) /* ROM board using 64M SOP44 MASKROM */ ROM_REGION( 0x10000000, "user2", ROMREGION_ERASE00) diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c index 7bc29d178ee..bf26d210656 100644 --- a/src/mame/drivers/icecold.c +++ b/src/mame/drivers/icecold.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( icecold_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( icecold ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( icecold, icecold_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 1000000) MCFG_CPU_PROGRAM_MAP(icecold_map) - + MCFG_MACHINE_RESET( icecold ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index ba7b211f0fc..3feb379fa5e 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -1407,15 +1407,15 @@ static WRITE16_HANDLER( mgdha_magic_w ) default: /* - 04aba0: warning, writing to igs_magic 08 = d0 - 04abb0: warning, writing to igs_magic 09 = 76 - 04abc0: warning, writing to igs_magic 0a = 97 - 04abd0: warning, writing to igs_magic 0b = bf - 04abe0: warning, writing to igs_magic 0c = ff - 04abf0: warning, writing to igs_magic 04 = 3f - 04ac00: warning, writing to igs_magic 05 = 82 - 04ac10: warning, writing to igs_magic 06 = ff - 04ac20: warning, writing to igs_magic 07 = 3f + 04aba0: warning, writing to igs_magic 08 = d0 + 04abb0: warning, writing to igs_magic 09 = 76 + 04abc0: warning, writing to igs_magic 0a = 97 + 04abd0: warning, writing to igs_magic 0b = bf + 04abe0: warning, writing to igs_magic 0c = ff + 04abf0: warning, writing to igs_magic 04 = 3f + 04ac00: warning, writing to igs_magic 05 = 82 + 04ac10: warning, writing to igs_magic 06 = ff + 04ac20: warning, writing to igs_magic 07 = 3f */ logerror("%06x: warning, writing to igs_magic %02x = %02x\n", cpu_get_pc(space->cpu), igs_magic[0], data); } @@ -1455,7 +1455,7 @@ static ADDRESS_MAP_START( mgdha_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x876002, 0x876003) AM_READ ( mgdha_magic_r ) AM_RANGE(0xa02000, 0xa02fff) AM_READWRITE( spriteram_lsb_r, spriteram_lsb_w ) AM_BASE_GENERIC( spriteram ) AM_RANGE(0xa03000, 0xa037ff) AM_RAM_WRITE( sdmg2_paletteram_xRRRRRGGGGGBBBBB_w ) AM_BASE_GENERIC( paletteram ) -// AM_RANGE(0xa04014, 0xa04015) // written with FF at boot +// AM_RANGE(0xa04014, 0xa04015) // written with FF at boot AM_RANGE(0xa04020, 0xa04027) AM_DEVREAD8( "ppi8255", ppi8255_r, 0x00ff ) AM_RANGE(0xa04024, 0xa04025) AM_WRITE( video_disable_lsb_w ) AM_RANGE(0xa04028, 0xa04029) AM_WRITE( irq2_enable_w ) diff --git a/src/mame/drivers/inder.c b/src/mame/drivers/inder.c index ecb009d30bf..902f1592696 100644 --- a/src/mame/drivers/inder.c +++ b/src/mame/drivers/inder.c @@ -14,7 +14,7 @@ static ADDRESS_MAP_START( inder_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( inder ) INPUT_PORTS_END @@ -32,7 +32,7 @@ static MACHINE_CONFIG_START( inder, inder_state ) MCFG_CPU_PROGRAM_MAP(inder_map) MCFG_MACHINE_RESET( inder ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jp.c b/src/mame/drivers/jp.c index 8d43adbb775..cc92111d5a6 100644 --- a/src/mame/drivers/jp.c +++ b/src/mame/drivers/jp.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( jp_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( jp ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( jp, jp_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) MCFG_CPU_PROGRAM_MAP(jp_map) - + MCFG_MACHINE_RESET( jp ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jvh.c b/src/mame/drivers/jvh.c index 7d8637ffed5..5bf97cda7e8 100644 --- a/src/mame/drivers/jvh.c +++ b/src/mame/drivers/jvh.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( jvh_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( jvh ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( jvh, jvh_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS9980, 1000000) MCFG_CPU_PROGRAM_MAP(jvh_map) - + MCFG_MACHINE_RESET( jvh ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/kissproto.c b/src/mame/drivers/kissproto.c index 1486101d21a..d09a2a470d3 100644 --- a/src/mame/drivers/kissproto.c +++ b/src/mame/drivers/kissproto.c @@ -1,5 +1,5 @@ /* - Bally Kiss 8035 prototype + Bally Kiss 8035 prototype */ #include "emu.h" #include "cpu/mcs48/mcs48.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( kissp_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( kissp ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( kissp, kissp_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8035, 6000000/15) MCFG_CPU_PROGRAM_MAP(kissp_map) - + MCFG_MACHINE_RESET( kissp ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -50,5 +50,5 @@ ROM_START(kissp) ROM_RELOAD( 0x4800, 0x0800) ROM_END -GAME( 1979, kissp, kiss, kissp, kissp, kissp, ROT0, "Bally","Kiss (prototype)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1979, kissp, kiss, kissp, kissp, kissp, ROT0, "Bally","Kiss (prototype)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/ltd.c b/src/mame/drivers/ltd.c index 70a72280892..1a10a9ba553 100644 --- a/src/mame/drivers/ltd.c +++ b/src/mame/drivers/ltd.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( ltd_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( ltd ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( ltd, ltd_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, 1000000) MCFG_CPU_PROGRAM_MAP(ltd_map) - + MCFG_MACHINE_RESET( ltd ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index 5716540221b..9478aa81c6c 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -58,7 +58,7 @@ Glitch list! LeagueMan: Raster effects don't work properly (not even cpu time per line?). - (0.141 update: at least following two seems fixed from a lot of time ... -AS) + (0.141 update: at least following two seems fixed from a lot of time ... -AS) Perfect Soliders: Shortly into the fight, the sound CPU enters a tight loop, continuously writing to the status port and with interrupts disabled. I don't see how diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index aa84b4950ce..687b8408464 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -1,7 +1,7 @@ /* Megadrive / Genesis support (formerly in mess/drivers) - + Current Issues Timing is wrong diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c index 2b42bbc6bd6..0b2f7d11aa3 100644 --- a/src/mame/drivers/megadrvb.c +++ b/src/mame/drivers/megadrvb.c @@ -721,7 +721,7 @@ static DRIVER_INIT( ssf2mdb ) memory_set_bankptr(machine, "bank5", machine->region( "maincpu" )->base() + 0x400000 ); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x770070, 0x770075, 0, 0, ssf2mdb_dsw_r ); - + megadrive_6buttons_pad = 1; DRIVER_INIT_CALL(megadrij); diff --git a/src/mame/drivers/mephisto.c b/src/mame/drivers/mephisto.c index 0a4cdf26e26..db7c35efb80 100644 --- a/src/mame/drivers/mephisto.c +++ b/src/mame/drivers/mephisto.c @@ -13,11 +13,11 @@ public: static ADDRESS_MAP_START( mephisto_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00000, 0x0ffff) AM_ROM - AM_RANGE(0x10000, 0x1ffff) AM_RAM - AM_RANGE(0xf8000, 0xfffff) AM_ROM + AM_RANGE(0x00000, 0x0ffff) AM_ROM + AM_RANGE(0x10000, 0x1ffff) AM_RAM + AM_RANGE(0xf8000, 0xfffff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( mephisto ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( mephisto, mephisto_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 8000000) MCFG_CPU_PROGRAM_MAP(mephisto_map) - + MCFG_MACHINE_RESET( mephisto ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/micropin.c b/src/mame/drivers/micropin.c index 344ab18c532..adf48b58814 100644 --- a/src/mame/drivers/micropin.c +++ b/src/mame/drivers/micropin.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( micropin_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( micropin ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( micropin, micropin_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(micropin_map) - + MCFG_MACHINE_RESET( micropin ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 7b1269a351d..4fb3e215119 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -3960,16 +3960,16 @@ ROM_START( daytona2 ) /* Step 2.1 */ ROM_LOAD64_WORD_SWAP( "epr-20864a.20", 0x000000, 0x200000, CRC(5250f3a8) SHA1(d75b86cb320b854fcf53e1b76331f87806b9ae84) ) // CROM0 - ROM_LOAD64_WORD_SWAP( "mpr-20845.1", 0x800006, 0x800000, CRC(6037712c) SHA1(904beb9da47ceec4e3e68791895404cca55ef21e) ) - ROM_LOAD64_WORD_SWAP( "mpr-20846.2", 0x800004, 0x800000, CRC(f44c5c7a) SHA1(256417b75d351cabb67629b62c8277a4c437b858) ) - ROM_LOAD64_WORD_SWAP( "mpr-20847.3", 0x800002, 0x800000, CRC(eda966ee) SHA1(59720fefdefdd8cc909ea7ac95e0a8c3e191f2f1) ) - ROM_LOAD64_WORD_SWAP( "mpr-20848.4", 0x800000, 0x800000, CRC(5b6c8b7d) SHA1(caf723e669b4b58d8cb5a5e9114ff9a40cfa2eea) ) + ROM_LOAD64_WORD_SWAP( "mpr-20845.1", 0x800006, 0x800000, CRC(6037712c) SHA1(904beb9da47ceec4e3e68791895404cca55ef21e) ) + ROM_LOAD64_WORD_SWAP( "mpr-20846.2", 0x800004, 0x800000, CRC(f44c5c7a) SHA1(256417b75d351cabb67629b62c8277a4c437b858) ) + ROM_LOAD64_WORD_SWAP( "mpr-20847.3", 0x800002, 0x800000, CRC(eda966ee) SHA1(59720fefdefdd8cc909ea7ac95e0a8c3e191f2f1) ) + ROM_LOAD64_WORD_SWAP( "mpr-20848.4", 0x800000, 0x800000, CRC(5b6c8b7d) SHA1(caf723e669b4b58d8cb5a5e9114ff9a40cfa2eea) ) // CROM1 - ROM_LOAD64_WORD_SWAP( "mpr-20849.5", 0x2800006, 0x800000, CRC(50dee4af) SHA1(1e07efbc9a1997aa991be5852ec89f21b0416348) ) - ROM_LOAD64_WORD_SWAP( "mpr-20850.6", 0x2800004, 0x800000, CRC(cb73758a) SHA1(df92a494a407b2d28fec7b38c73021966bcead96) ) - ROM_LOAD64_WORD_SWAP( "mpr-20851.7", 0x2800002, 0x800000, CRC(6e7a64b7) SHA1(ddda7c50a76e815e6e85c9cb3d32a36efe69e68d) ) - ROM_LOAD64_WORD_SWAP( "mpr-20852.8", 0x2800000, 0x800000, CRC(d606ad38) SHA1(07902b25b2950087cef8eaec0e4680934085d19b) ) + ROM_LOAD64_WORD_SWAP( "mpr-20849.5", 0x2800006, 0x800000, CRC(50dee4af) SHA1(1e07efbc9a1997aa991be5852ec89f21b0416348) ) + ROM_LOAD64_WORD_SWAP( "mpr-20850.6", 0x2800004, 0x800000, CRC(cb73758a) SHA1(df92a494a407b2d28fec7b38c73021966bcead96) ) + ROM_LOAD64_WORD_SWAP( "mpr-20851.7", 0x2800002, 0x800000, CRC(6e7a64b7) SHA1(ddda7c50a76e815e6e85c9cb3d32a36efe69e68d) ) + ROM_LOAD64_WORD_SWAP( "mpr-20852.8", 0x2800000, 0x800000, CRC(d606ad38) SHA1(07902b25b2950087cef8eaec0e4680934085d19b) ) // CROM2 ROM_LOAD64_WORD_SWAP( "mpr-20853.9", 0x4800006, 0x400000, CRC(3245ee68) SHA1(f957df447bab0559076bc8a14eeaa080040acb85) ) diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 4cd559e4586..a67888de83f 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -390,13 +390,13 @@ static INPUT_PORTS_START( moo ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE(0x08, IP_ACTIVE_LOW) - PORT_DIPNAME( 0x10, 0x00, "Sound Output") PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x10, 0x00, "Sound Output") PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x10, DEF_STR( Mono ) ) PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) ) PORT_DIPNAME( 0x20, 0x20, "Coin Mechanism") PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x20, "Common") PORT_DIPSETTING( 0x00, "Independent") - PORT_DIPNAME( 0xc0, 0x80, "Number of Players") PORT_DIPLOCATION("SW1:3,4") + PORT_DIPNAME( 0xc0, 0x80, "Number of Players") PORT_DIPLOCATION("SW1:3,4") PORT_DIPSETTING( 0xc0, "2") PORT_DIPSETTING( 0x40, "3") PORT_DIPSETTING( 0x80, "4") diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 4fb1b4fdfdb..a47c03ca39f 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -441,8 +441,8 @@ static WRITE_LINE_DEVICE_HANDLER( cpu0_irq ) /*static WRITE_LINE_DEVICE_HANDLER( cpu0_irq_m6840 ) { -// cpu0_irq(device->machine->device("pia_ic3"), state); - cpu0_irq(device->machine->device("6840ptm"), state); +// cpu0_irq(device->machine->device("pia_ic3"), state); + cpu0_irq(device->machine->device("6840ptm"), state); }*/ @@ -1718,7 +1718,7 @@ static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0850, 0x0850) AM_READWRITE(bankswitch_r,bankswitch_w) /* write bank (rom page select) */ -/* AM_RANGE(0x08e0, 0x08e7) AM_READWRITE(68681_duart_r,68681_duart_w) */ //Runs hoppers +/* AM_RANGE(0x08e0, 0x08e7) AM_READWRITE(68681_duart_r,68681_duart_w) */ //Runs hoppers AM_RANGE(0x0900, 0x0907) AM_DEVREADWRITE("ptm_ic2", ptm6840_read, ptm6840_write)/* PTM6840 IC2 */ diff --git a/src/mame/drivers/mrgame.c b/src/mame/drivers/mrgame.c index 1c2dde4763f..83d8c7313e3 100644 --- a/src/mame/drivers/mrgame.c +++ b/src/mame/drivers/mrgame.c @@ -1,6 +1,6 @@ /* - Mr. Game 1B11188/0 -*/ + Mr. Game 1B11188/0 +*/ #include "emu.h" #include "cpu/m68000/m68000.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( mrgame_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( mrgame ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( mrgame, mrgame_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 6000000) MCFG_CPU_PROGRAM_MAP(mrgame_map) - + MCFG_MACHINE_RESET( mrgame ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index 1aa698a84be..f19fa625f63 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -161,12 +161,12 @@ static INPUT_PORTS_START( mystston ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) /* Listed as "Unused" */ PORT_START("DSW1") - PORT_DIPNAME(0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2") + PORT_DIPNAME(0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) - PORT_DIPNAME(0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4") + PORT_DIPNAME(0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4") PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index da410d31681..5c212b603cc 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -627,10 +627,10 @@ static INPUT_PORTS_START( mystwarr ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* game loops if this is set */ - PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x10, DEF_STR( Mono ) ) PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) ) - PORT_DIPNAME( 0x20, 0x20, "Coin Mechanism" ) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME( 0x20, 0x20, "Coin Mechanism" ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x20, "Common" ) PORT_DIPSETTING( 0x00, "Independent" ) PORT_DIPNAME( 0x40, 0x40, "Number of Players" ) PORT_DIPLOCATION("SW1:3") @@ -668,16 +668,16 @@ static INPUT_PORTS_START( metamrph ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x10, DEF_STR( Mono ) ) PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) ) - PORT_DIPNAME( 0x20, 0x20, "Coin Mechanism" ) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME( 0x20, 0x20, "Coin Mechanism" ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x20, "Common" ) PORT_DIPSETTING( 0x00, "Independent" ) PORT_DIPNAME( 0x40, 0x40, "Number of Players" ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x00, "4" ) PORT_DIPSETTING( 0x40, "2" ) - PORT_DIPNAME( 0x80, 0x80, "Continuous Energy Increment" ) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME( 0x80, 0x80, "Continuous Energy Increment" ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x80, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) @@ -711,13 +711,13 @@ static INPUT_PORTS_START( viostorm ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x10, DEF_STR( Mono ) ) PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "Coin Mechanism" ) PORT_DIPLOCATION("SW1:3") + PORT_DIPNAME( 0x40, 0x40, "Coin Mechanism" ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x40, "Common" ) PORT_DIPSETTING( 0x00, "Independent" ) PORT_DIPNAME( 0x80, 0x80, "Number of Players" ) PORT_DIPLOCATION("SW1:4") @@ -755,10 +755,10 @@ static INPUT_PORTS_START( dadandrn ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x10, DEF_STR( Mono ) ) PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:3" ) @@ -795,10 +795,10 @@ static INPUT_PORTS_START( martchmp ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* game loops if this is set */ - PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x10, 0x00, "Sound Output" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x10, DEF_STR( Mono ) ) PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:3" ) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 034c30d04cb..257b5ad59db 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -349,7 +349,7 @@ Marvel Vs. Capcom 2 (Rev A) 841-0007C 23085A 14 (64Mb) present Quiz Ah Megamisama 840-0030C 23227 16 (64Mb) present 317-0280-JPN Shootout Pool 840-0098C 23844 4 (64mb) present 317-0336-COM Shootout Pool - Shootout Pool Prize 840-0128C 24065 4 (64mb) present 317-0367-COM -Shootout Pool Medal ? 24148 4 (64Mb) ? ? +Shootout Pool Medal ? 24148 4 (64Mb) ? ? Virtua Fighter 4 Evolution 840-0106B 23934 20 (64Mb) present 317-0339-COM Virtua Tennis 2 / Power Smash 2 (Rev A) 840-0084C 22327A 18 (64Mb) present 317-0320-COM @@ -439,10 +439,10 @@ Notes: CN4 - 6 legs connector for ISP programming Games known to use this PCB include.... - Sticker EPROM FLASHROMs XC3S50 PIC16C621A XCF01S + Sticker EPROM FLASHROMs XC3S50 PIC16C621A XCF01S Game on cart IC7# # of SOP56 IC2# IC3# IC4# Notes ---------------------------------------------------------------------------------------------------------------------------- -Dynamite Deka EX / Asian Dynamite 840-0175C ? ? ? ? ? +Dynamite Deka EX / Asian Dynamite 840-0175C ? ? ? ? ? Mamonoro 841-0060C not present 4 (512Mb) present 317-5132-JPN present IC2# is labeled "VER.2" Touch De Zunou (Rev A) 840-0166C not present 2 (512Mb) present 317-0435-JPN present IC4# is marked "18" @@ -489,10 +489,10 @@ Notes: CN1/2/3 - connectors joining to main board Games known to use this PCB include.... - Sticker FL0-FL3 FLASHROMs X76F100 EPM7064 EPM7064 315-5581 Game + Sticker FL0-FL3 FLASHROMs X76F100 EPM7064 EPM7064 315-5581 Game Game on cart FLASHROM # of SOP48 IC @ 1F IC @ 1H IC @ 2K IC @ 1M code Notes ----------------------------------------------------------------------------------------------------------------------------------------------- -Gun Survivor 2: Biohazard Code V. 25709801 1 (64Mb) 14 (128Mb) ? NAODEC2A NAODEC1A 317-5075-COM +Gun Survivor 2: Biohazard Code V. 25709801 1 (64Mb) 14 (128Mb) ? NAODEC2A NAODEC1A 317-5075-COM /Shin Nihon Prowrestling FL0 & FL1 have pin55 raised from PCB. \Toukon Retsuden 4 Arcade Edition 25349801 2 (64Mb) 15 (128Mb) not present NAODEC2A NAODEC1B 317-5040-COM TRF1Ver.A They are connected togheter and go to pin89 on 2K. World Kicks 25209801 2 (32Mb) 10 (128Mb) ? NAODEC2A NAODEC1A 317-5040-COM WK3 Ver.A 317-5040-COM must be checked. @@ -537,7 +537,7 @@ Notes: CN1/2/3 - connectors joining to main board Games known to use this PCB include.... - Sticker FL0-FL3 FLASHROMs X76F100 CY37128 315-5581 Game + Sticker FL0-FL3 FLASHROMs X76F100 CY37128 315-5581 Game Game on cart FLASHROM # of SOP48 IC @ 1F IC @ 3J IC @ 1M code Notes -------------------------------------------------------------------------------------------------------------------- Ninja Assault 25469801 3 (64Mb) 9 (128Mb) present NAODEC3 317-5068-COM NJA3 Ver.A @@ -6754,7 +6754,7 @@ GAME( 2001, naomi2, 0, naomi, naomi, 0, ROT0, "Sega", /* 0061C */ GAME( 2001, vstrik3cb,vstrik3c,naomi, naomi, 0, ROT0, "Sega", "Virtua Striker 3 (Cart, Rev B) (USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0080C */ GAME( 2001, vf4cart, naomi2, naomi, naomi, 0, ROT0, "Sega", "Virtua Fighter 4 (Cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0106C */ GAME( 2001, vf4evoct, naomi2, naomi, naomi, vf4evoct, ROT0, "Sega", "Virtua Fighter 4 Evolution (Cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -/* 01??C */ GAME( 2002, kingrt66, naomi2, naomi, naomi, 0, ROT0, "Sega", "King of Route 66 (Rev A)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +/* 01??C */ GAME( 2002, kingrt66, naomi2, naomi, naomi, 0, ROT0, "Sega", "King of Route 66 (Rev A)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0139C */ GAME( 2002, clubkrte, naomi2, naomi, naomi, 0, ROT0, "Sega", "Club Kart: European Session", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* GDS-xxxx (Sega first party games) */ diff --git a/src/mame/drivers/nsm.c b/src/mame/drivers/nsm.c index 0c25da40d12..8b0bc4c596d 100644 --- a/src/mame/drivers/nsm.c +++ b/src/mame/drivers/nsm.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( nsm_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( nsm ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( nsm, nsm_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS9995, 11052000) MCFG_CPU_PROGRAM_MAP(nsm_map) - + MCFG_MACHINE_RESET( nsm ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 10e9b3c467a..09543e14405 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -648,7 +648,7 @@ static MACHINE_CONFIG_START( snes, snes_state ) MCFG_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ MCFG_CPU_PROGRAM_MAP(spc_mem) -// MCFG_QUANTUM_TIME(HZ(24000)) +// MCFG_QUANTUM_TIME(HZ(24000)) MCFG_QUANTUM_PERFECT_CPU("maincpu") MCFG_MACHINE_START( snes ) diff --git a/src/mame/drivers/peyper.c b/src/mame/drivers/peyper.c index 2e8b59b8ec8..2c0664c3402 100644 --- a/src/mame/drivers/peyper.c +++ b/src/mame/drivers/peyper.c @@ -20,7 +20,7 @@ static ADDRESS_MAP_START( peyper_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END - + static INPUT_PORTS_START( peyper ) INPUT_PORTS_END @@ -37,9 +37,9 @@ static MACHINE_CONFIG_START( peyper, peyper_state ) MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(peyper_map) MCFG_CPU_IO_MAP(peyper_io) - + MCFG_MACHINE_RESET( peyper ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -118,5 +118,5 @@ GAME( 1987, odisea, 0, peyper, peyper, peyper, ROT0, "Peyper (Spain)", "Odisea GAME( 1987, wolfman, 0, peyper, peyper, peyper, ROT0, "Peyper (Spain)", "Wolf Man", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1985, odin_dlx, 0, peyper, peyper, peyper, ROT0, "Sonic", "Odin De Luxe", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1986, solarwap, 0, peyper, peyper, peyper, ROT0, "Sonic", "Solar Wars (Sonic)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, poleposn, 0, peyper, peyper, peyper, ROT0, "Sonic", "Pole Position (Sonic)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1987, sonstwar, 0, peyper, peyper, peyper, ROT0, "Sonic", "Star Wars (Sonic)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, poleposn, 0, peyper, peyper, peyper, ROT0, "Sonic", "Pole Position (Sonic)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1987, sonstwar, 0, peyper, peyper, peyper, ROT0, "Sonic", "Star Wars (Sonic)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/play_1.c b/src/mame/drivers/play_1.c index 0b204edc124..06d00beb7c6 100644 --- a/src/mame/drivers/play_1.c +++ b/src/mame/drivers/play_1.c @@ -1,5 +1,5 @@ /* - Playmatic MPU 1 + Playmatic MPU 1 */ #include "emu.h" #include "cpu/cosmac/cosmac.h" @@ -16,7 +16,7 @@ public: static ADDRESS_MAP_START( play_1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( play_1 ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( play_1, play_1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COSMAC, 400000) MCFG_CPU_PROGRAM_MAP(play_1_map) - + MCFG_MACHINE_RESET( play_1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/play_2.c b/src/mame/drivers/play_2.c index 0a14a5591c2..e84a467d3d3 100644 --- a/src/mame/drivers/play_2.c +++ b/src/mame/drivers/play_2.c @@ -1,5 +1,5 @@ /* - Playmatic MPU 2 + Playmatic MPU 2 */ #include "emu.h" #include "cpu/cosmac/cosmac.h" @@ -16,7 +16,7 @@ public: static ADDRESS_MAP_START( play_2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( play_2 ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( play_2, play_2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COSMAC, 2950000) MCFG_CPU_PROGRAM_MAP(play_2_map) - + MCFG_MACHINE_RESET( play_2 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -155,7 +155,7 @@ ROM_START(attack) ROM_LOAD("attack11.bin", 0x0c00, 0x0400, CRC(972157b4) SHA1(23c90f23a34b34acfe445496a133b6022a749ccc)) ROM_RELOAD(0x4c00, 0x0400) ROM_RELOAD(0x8c00, 0x0400) - ROM_RELOAD(0xcc00, 0x0400) + ROM_RELOAD(0xcc00, 0x0400) ROM_END /*------------------------------------------------------------------- @@ -178,7 +178,7 @@ ROM_START(blkfever) ROM_LOAD("blackf11.bin", 0x0c00, 0x0400, CRC(5a97c1b4) SHA1(b9d7eb0dd55ef6d959c0fab48f710e4b1c8d8003)) ROM_RELOAD(0x4c00, 0x0400) ROM_RELOAD(0x8c00, 0x0400) - ROM_RELOAD(0xcc00, 0x0400) + ROM_RELOAD(0xcc00, 0x0400) ROM_END /*------------------------------------------------------------------- @@ -212,12 +212,12 @@ ROM_START(cerberup) ROM_RELOAD(0xc000, 0x2000) ROM_END -// ??/84 Nautilus -// ??/84 The Raid -// ??/85 Stop Ship -// ??/86 Flash Dragon -// ??/87 Phantom Ship -// ??/87 Skill Flight +// ??/84 Nautilus +// ??/84 The Raid +// ??/85 Stop Ship +// ??/86 Flash Dragon +// ??/87 Phantom Ship +// ??/87 Skill Flight GAME(1979, antar, 0, play_2, play_2, play_2, ROT0, "Playmatic", "Antar", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/play_3.c b/src/mame/drivers/play_3.c index 972ef4a1227..103f4e322db 100644 --- a/src/mame/drivers/play_3.c +++ b/src/mame/drivers/play_3.c @@ -1,5 +1,5 @@ /* - Playmatic MPU 3 + Playmatic MPU 3 */ #include "emu.h" #include "cpu/cosmac/cosmac.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( play_3_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( play_3 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( play_3, play_3_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COSMAC, 2950000) MCFG_CPU_PROGRAM_MAP(play_3_map) - + MCFG_MACHINE_RESET( play_3 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/play_5.c b/src/mame/drivers/play_5.c index ee2c812704a..dde46f46349 100644 --- a/src/mame/drivers/play_5.c +++ b/src/mame/drivers/play_5.c @@ -1,5 +1,5 @@ /* - Playmatic MPU 5 + Playmatic MPU 5 */ #include "emu.h" #include "cpu/cosmac/cosmac.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( play_5_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( play_5 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( play_5, play_5_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COSMAC, 2950000) MCFG_CPU_PROGRAM_MAP(play_5_map) - + MCFG_MACHINE_RESET( play_5 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index 1717a423c1e..5aadd013c98 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -98,31 +98,31 @@ static INPUT_PORTS_START( prehisle ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW0") /* Dip switches */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Level_Select ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:3") + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x04, "Only Twice" ) PORT_DIPSETTING( 0x00, "Always" ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,6") + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,6") PORT_DIPSETTING( 0x00, "A 4C/1C B 1C/4C" ) PORT_DIPSETTING( 0x10, "A 3C/1C B 1C/3C" ) PORT_DIPSETTING( 0x20, "A 2C/1C B 1C/2C" ) PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:7,8") + PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:7,8") PORT_DIPSETTING( 0x80, "2" ) PORT_DIPSETTING( 0xc0, "3" ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) PORT_START("DSW1") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x03, DEF_STR( Standard ) ) PORT_DIPSETTING( 0x01, "Middle" ) @@ -132,12 +132,12 @@ static INPUT_PORTS_START( prehisle ) PORT_DIPSETTING( 0x0c, "Demo Sounds On" ) PORT_DIPSETTING( 0x00, "Freeze" ) PORT_DIPSETTING( 0x04, "Infinite Lives" ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6") + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x30, "100K 200K" ) PORT_DIPSETTING( 0x20, "150K 300K" ) PORT_DIPSETTING( 0x10, "300K 500K" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7") + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index de688705b28..abdba73219b 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -232,22 +232,22 @@ static INPUT_PORTS_START( pushman ) PORT_DIPNAME( 0x0001, 0x0001, "Debug Mode (Cheat)") PORT_DIPLOCATION("SW1:1") /* Listed as "Screen Skip" */ PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, "Pull Option" ) PORT_DIPLOCATION("SW1:2") + PORT_DIPNAME( 0x0002, 0x0002, "Pull Option" ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x0002, "5" ) PORT_DIPSETTING( 0x0000, "9" ) PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Level_Select ) ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x0008, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:5") + PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) PORT_SERVICE_DIPLOC( 0x0020, IP_ACTIVE_LOW, "SW1:6" ) PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0040, "SW1:7" ) PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW1:8" ) - PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3") + PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0100, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0200, DEF_STR( 3C_1C ) ) @@ -256,7 +256,7 @@ static INPUT_PORTS_START( pushman ) PORT_DIPSETTING( 0x0600, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0500, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4") + PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4") PORT_DIPSETTING( 0x0800, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Hard ) ) PORT_DIPUNUSED_DIPLOC( 0x1000, 0x1000, "SW2:5" ) @@ -296,7 +296,7 @@ static INPUT_PORTS_START( bballs ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_START("DSW") - PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3") + PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) @@ -305,21 +305,21 @@ static INPUT_PORTS_START( bballs ) PORT_DIPSETTING( 0x0006, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x0008, DEF_STR( Easy ) ) // less bubbles before cycling PORT_DIPSETTING( 0x0000, DEF_STR( Hard ) ) // more bubbles before cycling - PORT_DIPNAME( 0x0010, 0x0000, "Music (In-game)" ) PORT_DIPLOCATION("SW1:5") + PORT_DIPNAME( 0x0010, 0x0000, "Music (In-game)" ) PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0000, "Music (Attract Mode)" ) PORT_DIPLOCATION("SW1:6") + PORT_DIPNAME( 0x0020, 0x0000, "Music (Attract Mode)" ) PORT_DIPLOCATION("SW1:6") PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:7,8") + PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:7,8") PORT_DIPSETTING( 0x00c0, "1" ) PORT_DIPSETTING( 0x0080, "2" ) PORT_DIPSETTING( 0x0040, "3" ) PORT_DIPSETTING( 0x0000, "4" ) - PORT_DIPNAME( 0x0100, 0x0100, "Zaps" ) PORT_DIPLOCATION("SW2:1") + PORT_DIPNAME( 0x0100, 0x0100, "Zaps" ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0100, "1" ) PORT_DIPSETTING( 0x0000, "2" ) PORT_DIPNAME( 0x0200, 0x0000, "Display Next Ball" ) PORT_DIPLOCATION("SW2:2") @@ -328,7 +328,7 @@ static INPUT_PORTS_START( bballs ) PORT_DIPUNUSED_DIPLOC( 0x0400, 0x0400, "SW2:3" ) PORT_DIPUNUSED_DIPLOC( 0x0800, 0x0800, "SW2:4" ) PORT_DIPUNUSED_DIPLOC( 0x1000, 0x1000, "SW2:5" ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6") // code at 0x0054ac, 0x0054f2, 0x0056fc + PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:6") // code at 0x0054ac, 0x0054f2, 0x0056fc PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Service_Mode ) ) PORT_DIPLOCATION("SW2:7,8") diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 201c54572cd..571548fa0c3 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -226,7 +226,7 @@ WRITE16_MEMBER(raiden2_state::cop_pgm_data_w) logerror("?\n"); break; } - } + } } WRITE16_MEMBER(raiden2_state::cop_pgm_addr_w) @@ -301,10 +301,10 @@ WRITE16_MEMBER(raiden2_state::cop_dma_trigger_w) switch(cop_dma_mode) { case 0x14: { /* TODO: this transfers the whole VRAM, not only spriteram! - For whatever reason, this stopped working as soon as I've implemented DMA slot concept. - Raiden 2 uses this DMA with cop_dma_dst == 0xfffe, effectively changing the order of the uploaded VRAMs. - Also the size is used for doing a sprite limit trickery. - */ + For whatever reason, this stopped working as soon as I've implemented DMA slot concept. + Raiden 2 uses this DMA with cop_dma_dst == 0xfffe, effectively changing the order of the uploaded VRAMs. + Also the size is used for doing a sprite limit trickery. + */ static int rsize = ((0x80 - cop_dma_size[cop_dma_mode]) & 0x7f) +1; sprites_cur_start = 0x1000 - (rsize << 5); @@ -547,17 +547,17 @@ WRITE16_MEMBER(raiden2_state::cop_cmd_w) } case 0x5205: // 5205 0006 fff7 0050 - 0180 02e0 03a0 00a0 03a0 0000 0000 0000 - // fprintf(stderr, "sprcpt 5205 %04x %04x %04x %08x %08x\n", cop_regs[0], cop_regs[1], cop_regs[3], space.read_dword(cop_regs[0]), space.read_dword(cop_regs[3])); + // fprintf(stderr, "sprcpt 5205 %04x %04x %04x %08x %08x\n", cop_regs[0], cop_regs[1], cop_regs[3], space.read_dword(cop_regs[0]), space.read_dword(cop_regs[3])); space.write_dword(cop_regs[1], space.read_dword(cop_regs[0])); break; case 0x5a05: // 5a05 0006 fff7 0058 - 0180 02e0 03a0 00a0 03a0 0000 0000 0000 - // fprintf(stderr, "sprcpt 5a05 %04x %04x %04x %08x %08x\n", cop_regs[0], cop_regs[1], cop_regs[3], space.read_dword(cop_regs[0]), space.read_dword(cop_regs[3])); + // fprintf(stderr, "sprcpt 5a05 %04x %04x %04x %08x %08x\n", cop_regs[0], cop_regs[1], cop_regs[3], space.read_dword(cop_regs[0]), space.read_dword(cop_regs[3])); space.write_dword(cop_regs[1], space.read_dword(cop_regs[0])); break; case 0xf205: // f205 0006 fff7 00f0 - 0182 02e0 03c0 00c0 03c0 0000 0000 0000 - // fprintf(stderr, "sprcpt f205 %04x %04x %04x %08x %08x\n", cop_regs[0]+4, cop_regs[1], cop_regs[3], space.read_dword(cop_regs[0]+4), space.read_dword(cop_regs[3])); + // fprintf(stderr, "sprcpt f205 %04x %04x %04x %08x %08x\n", cop_regs[0]+4, cop_regs[1], cop_regs[3], space.read_dword(cop_regs[0]+4), space.read_dword(cop_regs[3])); space.write_dword(cop_regs[2], space.read_dword(cop_regs[0]+4)); break; @@ -1186,8 +1186,8 @@ WRITE16_MEMBER(raiden2_state::sprite_prot_dst2_w) /* MEMORY MAPS */ static ADDRESS_MAP_START( raiden2_cop_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state ) -// AM_RANGE(0x0041c, 0x0041d) AM_WRITENOP // angle compare (for 0x6200 COP macro) -// AM_RANGE(0x0041e, 0x0041f) AM_WRITENOP // angle mod value (for 0x6200 COP macro) +// AM_RANGE(0x0041c, 0x0041d) AM_WRITENOP // angle compare (for 0x6200 COP macro) +// AM_RANGE(0x0041e, 0x0041f) AM_WRITENOP // angle mod value (for 0x6200 COP macro) AM_RANGE(0x00420, 0x00421) AM_WRITE(cop_itoa_low_w) AM_RANGE(0x00422, 0x00423) AM_WRITE(cop_itoa_high_w) AM_RANGE(0x00424, 0x00425) AM_WRITE(cop_itoa_digit_count_w) @@ -1213,7 +1213,7 @@ static ADDRESS_MAP_START( raiden2_cop_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_st AM_RANGE(0x004c0, 0x004c9) AM_READWRITE(cop_reg_low_r, cop_reg_low_w) AM_RANGE(0x00500, 0x00505) AM_WRITE(cop_cmd_w) AM_RANGE(0x00580, 0x00581) AM_READ(cop_collision_status_r) -// AM_RANGE(0x00588, 0x00589) AM_READ(cop_collision_status2_r) // used by Zero Team (only this, why?) +// AM_RANGE(0x00588, 0x00589) AM_READ(cop_collision_status2_r) // used by Zero Team (only this, why?) AM_RANGE(0x00590, 0x00599) AM_READ(cop_itoa_digits_r) AM_RANGE(0x005b0, 0x005b1) AM_READ(cop_status_r) AM_RANGE(0x005b2, 0x005b3) AM_READ(cop_dist_r) @@ -1278,7 +1278,7 @@ static ADDRESS_MAP_START( raidendx_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state AM_RANGE(0x004d0, 0x004d7) AM_RAM //??? AM_RANGE(0x0062c, 0x0062d) AM_WRITE(tilemap_enable_w) AM_RANGE(0x00610, 0x0061b) AM_WRITE(tile_scroll_w) -// AM_RANGE(0x006ca, 0x006cb) AM_WRITENOP +// AM_RANGE(0x006ca, 0x006cb) AM_WRITENOP AM_IMPORT_FROM( raiden2_mem ) ADDRESS_MAP_END diff --git a/src/mame/drivers/rowamet.c b/src/mame/drivers/rowamet.c index 72c8bfb2766..bba1260edb1 100644 --- a/src/mame/drivers/rowamet.c +++ b/src/mame/drivers/rowamet.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( rowamet_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( rowamet ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( rowamet, rowamet_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1888888) MCFG_CPU_PROGRAM_MAP(rowamet_map) - + MCFG_MACHINE_RESET( rowamet ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c index 71d5faf3f38..d194f52f0e5 100644 --- a/src/mame/drivers/s11.c +++ b/src/mame/drivers/s11.c @@ -1,5 +1,5 @@ /* - Williams System 11 + Williams System 11 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s11_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s11 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s11, williams_s11_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s11_map) - + MCFG_MACHINE_RESET( williams_s11 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s11a.c b/src/mame/drivers/s11a.c index edf7d31e597..2a9142f3745 100644 --- a/src/mame/drivers/s11a.c +++ b/src/mame/drivers/s11a.c @@ -1,5 +1,5 @@ /* - Williams System 11a + Williams System 11a */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s11a_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s11a ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s11a, williams_s11a_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s11a_map) - + MCFG_MACHINE_RESET( williams_s11a ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -106,7 +106,7 @@ ROM_START(fire_l3) ROM_REGION(0x10000, "cpu2", ROMREGION_ERASEFF) ROM_REGION(0x30000, "sound1", 0) ROM_LOAD("fire_u4.l1", 0x00000, 0x8000, CRC(0e058918) SHA1(4d6bf2290141119174787f8dd653c47ea4c73693)) - ROM_RELOAD(0x00000+0x8000, 0x8000) + ROM_RELOAD(0x00000+0x8000, 0x8000) ROM_END /*-------------------- diff --git a/src/mame/drivers/s11b.c b/src/mame/drivers/s11b.c index a904405bd6b..c025d97b061 100644 --- a/src/mame/drivers/s11b.c +++ b/src/mame/drivers/s11b.c @@ -1,5 +1,5 @@ /* - Williams System 11b + Williams System 11b */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s11b_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s11b ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s11b, williams_s11b_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s11b_map) - + MCFG_MACHINE_RESET( williams_s11b ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s11c.c b/src/mame/drivers/s11c.c index c26b86a4699..b931ae8487e 100644 --- a/src/mame/drivers/s11c.c +++ b/src/mame/drivers/s11c.c @@ -1,5 +1,5 @@ /* - Williams System 11c + Williams System 11c */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s11c_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s11c ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s11c, williams_s11c_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s11c_map) - + MCFG_MACHINE_RESET( williams_s11c ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c index 63a09f33804..3c6302ff11c 100644 --- a/src/mame/drivers/s3.c +++ b/src/mame/drivers/s3.c @@ -1,5 +1,5 @@ /* - Williams System 3 + Williams System 3 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -20,7 +20,7 @@ static ADDRESS_MAP_START( williams_s3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s3 ) INPUT_PORTS_END @@ -37,7 +37,7 @@ static MACHINE_CONFIG_START( williams_s3, williams_s3_state ) MCFG_CPU_PROGRAM_MAP(williams_s3_map) MCFG_MACHINE_RESET( williams_s3 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -116,8 +116,8 @@ ROM_START(wldcp_l1) ROM_RELOAD( 0xf800, 0x0800) ROM_END -GAME( 1977, httip_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Hot Tip (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1977, lucky_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Lucky Seven (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, httip_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Hot Tip (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1977, lucky_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Lucky Seven (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME( 1978, wldcp_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "World Cup Soccer (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, cntct_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Contact (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) -GAME( 1978, disco_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Disco Fever (L-1", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, cntct_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Contact (L-1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +GAME( 1978, disco_l1, 0, williams_s3, williams_s3, williams_s3, ROT0, "Williams", "Disco Fever (L-1", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/s4.c b/src/mame/drivers/s4.c index 7e08f32f48a..4856dce4fd2 100644 --- a/src/mame/drivers/s4.c +++ b/src/mame/drivers/s4.c @@ -1,5 +1,5 @@ /* - Williams System 4 + Williams System 4 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -16,7 +16,7 @@ public: static ADDRESS_MAP_START( williams_s4_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s4 ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( williams_s4, williams_s4_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s4_map) - + MCFG_MACHINE_RESET( williams_s4 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s6.c b/src/mame/drivers/s6.c index fc35c610a3b..0682caec453 100644 --- a/src/mame/drivers/s6.c +++ b/src/mame/drivers/s6.c @@ -1,5 +1,5 @@ /* - Williams System 6 + Williams System 6 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s6_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s6 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s6, williams_s6_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s6_map) - + MCFG_MACHINE_RESET( williams_s6 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s6a.c b/src/mame/drivers/s6a.c index 267fe19cfba..77d94a56466 100644 --- a/src/mame/drivers/s6a.c +++ b/src/mame/drivers/s6a.c @@ -1,5 +1,5 @@ /* - Williams System 6a + Williams System 6a */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s6a_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s6a ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s6a, williams_s6a_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s6a_map) - + MCFG_MACHINE_RESET( williams_s6a ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s7.c b/src/mame/drivers/s7.c index 6a845709a35..7c99bc1d7f9 100644 --- a/src/mame/drivers/s7.c +++ b/src/mame/drivers/s7.c @@ -1,5 +1,5 @@ /* - Williams System 7 + Williams System 7 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s7_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s7 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s7, williams_s7_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s7_map) - + MCFG_MACHINE_RESET( williams_s7 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c index 2eb48146ebd..fc5bbbad3e5 100644 --- a/src/mame/drivers/s8.c +++ b/src/mame/drivers/s8.c @@ -1,5 +1,5 @@ /* - Williams System 8 + Williams System 8 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s8_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s8 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s8, williams_s8_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s8_map) - + MCFG_MACHINE_RESET( williams_s8 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c index 1e1158c5525..3b500cee19d 100644 --- a/src/mame/drivers/s9.c +++ b/src/mame/drivers/s9.c @@ -1,5 +1,5 @@ /* - Williams System 9 + Williams System 9 */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( williams_s9_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( williams_s9 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( williams_s9, williams_s9_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(williams_s9_map) - + MCFG_MACHINE_RESET( williams_s9 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sleic.c b/src/mame/drivers/sleic.c index 089814ee9d7..6fea735c831 100644 --- a/src/mame/drivers/sleic.c +++ b/src/mame/drivers/sleic.c @@ -13,10 +13,10 @@ public: static ADDRESS_MAP_START( sleic_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00000, 0x1ffff) AM_RAM - AM_RANGE(0xe0000, 0xfffff) AM_ROM + AM_RANGE(0x00000, 0x1ffff) AM_RAM + AM_RANGE(0xe0000, 0xfffff) AM_ROM ADDRESS_MAP_END - + static INPUT_PORTS_START( sleic ) INPUT_PORTS_END @@ -32,9 +32,9 @@ static MACHINE_CONFIG_START( sleic, sleic_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 8000000) MCFG_CPU_PROGRAM_MAP(sleic_map) - + MCFG_MACHINE_RESET( sleic ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 0b17ccb3a7c..e348f12012b 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( spaceg, spaceg_state ) MCFG_VIDEO_UPDATE( spaceg ) /* sound hardware */ -// MCFG_SPEAKER_STANDARD_MONO("mono") +// MCFG_SPEAKER_STANDARD_MONO("mono") // MCFG_SOUND_ADD("sn1", SN76496, 15468480/4) // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/spinb.c b/src/mame/drivers/spinb.c index af90af7d067..f59ee80c862 100644 --- a/src/mame/drivers/spinb.c +++ b/src/mame/drivers/spinb.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( spinb_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( spinb ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( spinb, spinb_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8051, 16000000) MCFG_CPU_PROGRAM_MAP(spinb_map) - + MCFG_MACHINE_RESET( spinb ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index d7526860397..374f92bc171 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -1934,7 +1934,7 @@ static INPUT_PORTS_START( meosism ) PORT_START("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) -// PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) // Should work but doesn't +// PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) // Should work but doesn't PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) //service coin PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Analyzer") //analyzer PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON5 ) //max bet @@ -2333,11 +2333,11 @@ static INPUT_PORTS_START( twineag2 ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSW2:8" ) // Not shown in service mode I/O or show any function in game. Valid? -// PORT_MODIFY("SYSTEM") // IN4 - $21000c -// PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) -// PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE4 ) -// PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START3 ) -// PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START4 ) +// PORT_MODIFY("SYSTEM") // IN4 - $21000c +// PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) +// PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE4 ) +// PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START3 ) +// PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START4 ) INPUT_PORTS_END diff --git a/src/mame/drivers/st_mp100.c b/src/mame/drivers/st_mp100.c index 28d15a09a72..b6e8f56ebc6 100644 --- a/src/mame/drivers/st_mp100.c +++ b/src/mame/drivers/st_mp100.c @@ -1,6 +1,6 @@ /* - Stern MP-100 MPU - (almost identical to Bally MPU-17) + Stern MP-100 MPU + (almost identical to Bally MPU-17) */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -18,7 +18,7 @@ public: static ADDRESS_MAP_START( st_mp100_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( st_mp100 ) INPUT_PORTS_END @@ -34,9 +34,9 @@ static MACHINE_CONFIG_START( st_mp100, st_mp100_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(st_mp100_map) - + MCFG_MACHINE_RESET( st_mp100 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/st_mp200.c b/src/mame/drivers/st_mp200.c index ad291b11d55..e349383c4e4 100644 --- a/src/mame/drivers/st_mp200.c +++ b/src/mame/drivers/st_mp200.c @@ -1,6 +1,6 @@ /* - Stern MP-200 MPU - (almost identical to Bally MPU-35) + Stern MP-200 MPU + (almost identical to Bally MPU-35) */ #include "emu.h" #include "cpu/m6800/m6800.h" @@ -18,7 +18,7 @@ public: static ADDRESS_MAP_START( st_mp200_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( st_mp200 ) INPUT_PORTS_END @@ -34,9 +34,9 @@ static MACHINE_CONFIG_START( st_mp200, st_mp200_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) MCFG_CPU_PROGRAM_MAP(st_mp200_map) - + MCFG_MACHINE_RESET( st_mp200 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -339,7 +339,7 @@ ROM_START(st_game) ROM_END -//GAME(1982, cue, 0, st_mp200, st_mp200, st_mp200, ROT0, "Stern", "Cue", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) +//GAME(1982, cue, 0, st_mp200, st_mp200, st_mp200, ROT0, "Stern", "Cue", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1980, ali, 0, st_mp200, st_mp200, st_mp200, ROT0, "Stern", "Ali", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1980, biggame, 0, st_mp200, st_mp200, st_mp200, ROT0, "Stern", "Big Game", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1981, catacomp, 0, st_mp200, st_mp200, st_mp200, ROT0, "Stern", "Catacomb (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c index 10df69dd153..78abb66b3d0 100644 --- a/src/mame/drivers/starfire.c +++ b/src/mame/drivers/starfire.c @@ -58,7 +58,7 @@ starfira has one less rom in total than starfire but everything passes as static WRITE8_HANDLER( starfire_scratch_w ) { starfire_state *state = space->machine->driver_data(); - + /* A12 and A3 select video control registers */ if ((offset & 0x1008) == 0x1000) { @@ -82,7 +82,7 @@ static WRITE8_HANDLER( starfire_scratch_w ) static READ8_HANDLER( starfire_scratch_r ) { starfire_state *state = space->machine->driver_data(); - + /* A11 selects input ports */ if (offset & 0x800) return (*state->input_read)(space, offset); @@ -384,7 +384,7 @@ static DRIVER_INIT( starfire ) static DRIVER_INIT( fireone ) { starfire_state *state = machine->driver_data(); - + state->input_read = fireone_input_r; /* register for state saving */ diff --git a/src/mame/drivers/taito.c b/src/mame/drivers/taito.c index 586f076c0af..1399a0cd014 100644 --- a/src/mame/drivers/taito.c +++ b/src/mame/drivers/taito.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( taito_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( taito ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( taito, driver_device ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 19000000/9) MCFG_CPU_PROGRAM_MAP(taito_map) - + MCFG_MACHINE_RESET( taito ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 69caca2b5cd..e177166221f 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -5057,7 +5057,7 @@ ROM_START( footchmpbl ) ROM_LOAD( "bk2.rom7", 0x100000, 0x80000, CRC(79ce5b01) SHA1(454a9b8ca5178418c7e0976efb78cb883c553476) ) ROM_LOAD( "bk1.rom6", 0x180000, 0x80000, CRC(6e4757c7) SHA1(a412bdb09440f80e0e323c297a79b143a9bdb7f2) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* OBJ */ + ROM_REGION( 0x200000, "gfx2", 0 ) /* OBJ */ ROM_LOAD( "ob17.rom1", 0x000000, 0x80000, CRC(a4891065) SHA1(69469e4c68ff72d3e50e3e74f5ca7b55e3a0bd6f) ) ROM_LOAD( "ob16.rom2", 0x080000, 0x80000, CRC(3b65028b) SHA1(b2bb123b067b40ddacd90f82e42dff775e7e66c7) ) ROM_LOAD( "ob15.rom3", 0x100000, 0x80000, CRC(dbd07328) SHA1(9d658f0a0ad119ae76a6c4749651440642ee671c) ) diff --git a/src/mame/drivers/techno.c b/src/mame/drivers/techno.c index aabb840b3c3..70d295bc318 100644 --- a/src/mame/drivers/techno.c +++ b/src/mame/drivers/techno.c @@ -1,5 +1,5 @@ /* - Technoplay "2-2C 8008 LS" (68000 CPU) + Technoplay "2-2C 8008 LS" (68000 CPU) */ #include "emu.h" #include "cpu/m68000/m68000.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( techno_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( techno ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( techno, techno_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(techno_map) - + MCFG_MACHINE_RESET( techno ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 9c9e05c6ac2..614459c7f45 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -1664,8 +1664,8 @@ ADDRESS_MAP_END READ8_DEVICE_HANDLER( fixeight_eeprom_r ) { int bit = eeprom_read_bit(device); - - return bit<<7; + + return bit<<7; } static WRITE8_DEVICE_HANDLER(fixeight_eeprom_w ) @@ -1687,7 +1687,7 @@ static READ8_HANDLER( fixeight_region_r ) // this makes me wonder if there are decryption errors, therefore // this code, and the default eeproms use should be considered subject // to change - + if (!strcmp(space->machine->gamedrv->name,"fixeightkt")) return 0x00; if (!strcmp(space->machine->gamedrv->name,"fixeightk")) return 0x01; if (!strcmp(space->machine->gamedrv->name,"fixeightht")) return 0x02; @@ -1700,8 +1700,8 @@ static READ8_HANDLER( fixeight_region_r ) if (!strcmp(space->machine->gamedrv->name,"fixeight9")) return 0x09; if (!strcmp(space->machine->gamedrv->name,"fixeighta")) return 0x0a; if (!strcmp(space->machine->gamedrv->name,"fixeightu")) return 0x0b; -// if (!strcmp(space->machine->gamedrv->name,"fixeightc")) return 0x0c; // invalid -// if (!strcmp(space->machine->gamedrv->name,"fixeightd")) return 0x0d; // invalid +// if (!strcmp(space->machine->gamedrv->name,"fixeightc")) return 0x0c; // invalid +// if (!strcmp(space->machine->gamedrv->name,"fixeightd")) return 0x0d; // invalid if (!strcmp(space->machine->gamedrv->name,"fixeightj")) return 0x0e; if (!strcmp(space->machine->gamedrv->name,"fixeightjt")) return 0x0f; @@ -1716,7 +1716,7 @@ static ADDRESS_MAP_START( V25_fixeight_mem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( V25_fixeight_port, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(V25_PORT_P0, V25_PORT_P0) AM_DEVREADWRITE("eeprom", fixeight_eeprom_r, fixeight_eeprom_w) + AM_RANGE(V25_PORT_P0, V25_PORT_P0) AM_DEVREADWRITE("eeprom", fixeight_eeprom_r, fixeight_eeprom_w) ADDRESS_MAP_END @@ -1991,7 +1991,7 @@ static INPUT_PORTS_START( dogyuun ) // PORT_DIPSETTING( 0x0090, "Hong Kong (Charterfield license)" ) PORT_DIPSETTING( 0x0060, "Taiwan" ) // PORT_DIPSETTING( 0x00b0, "Taiwan" ) - //PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Sound ready */ + //PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Sound ready */ INPUT_PORTS_END @@ -2015,7 +2015,7 @@ static INPUT_PORTS_START( dogyuunk ) // PORT_DIPSETTING( 0x0090, "Hong Kong (Charterfield license)" ) PORT_DIPSETTING( 0x0060, "Taiwan" ) // PORT_DIPSETTING( 0x00b0, "Taiwan" ) - //PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Sound ready */ + //PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Sound ready */ INPUT_PORTS_END static INPUT_PORTS_START( dogyuunt ) @@ -2263,7 +2263,7 @@ static INPUT_PORTS_START( fixeight ) PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_START3 ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */ - + PORT_START("SYS") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_TILT ) @@ -3615,7 +3615,7 @@ static MACHINE_CONFIG_START( fixeight, toaplan2_state ) MCFG_CPU_ADD("audiocpu", V25, XTAL_16MHz) /* NEC V25 type Toaplan marked CPU ??? */ MCFG_CPU_PROGRAM_MAP(V25_fixeight_mem) -// IO map must be different - has eeprom but no dips or jumpers */ +// IO map must be different - has eeprom but no dips or jumpers */ MCFG_CPU_CONFIG(ts001turbo_config) MCFG_CPU_IO_MAP(V25_fixeight_port) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index b603500adca..e9da285e089 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -27,8 +27,8 @@ - dquizgo2: bugged video test Notes: - [1] Mr. Kicker game code crashes if the eeprom values are empty, because it replaces the SP register with a bogus value at PC = $18D0 before crashing. - It could be an original game bug or a hyperstone core bug + [1] Mr. Kicker game code crashes if the eeprom values are empty, because it replaces the SP register with a bogus value at PC = $18D0 before crashing. + It could be an original game bug or a hyperstone core bug Mr Kicker is also known to exist (not dumped) on the F-E1-16-010 PCB that Semicom also used for Date Quiz Go Go Episode 2 game. @@ -1493,7 +1493,7 @@ ROM_START( mrkicker ) ROM_COPY( "user2", 0x040000, 0x0a0000, 0x020000) ROM_COPY( "user2", 0x000000, 0x0c0000, 0x020000) ROM_COPY( "user2", 0x060000, 0x0e0000, 0x020000) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) /* Default EEPROM (it doesn't boot without and the game code crashes) */ ROM_LOAD( "eeprom-mrkicker.bin", 0x0000, 0x0080, CRC(87afb8f7) SHA1(444203b793c1d7929fc5916f18b510198719cd38) ) ROM_END @@ -1720,9 +1720,9 @@ static READ32_HANDLER( mrkicker_speedup_r ) UINT32 pc = cpu_get_pc(space->cpu); if(pc == 0x469de || pc == 0x46a36) { -// if(irq_active(space)) -// cpu_spinuntil_int(space->cpu); -// else +// if(irq_active(space)) +// cpu_spinuntil_int(space->cpu); +// else cpu_eat_cycles(space->cpu, 50); } diff --git a/src/mame/drivers/vd.c b/src/mame/drivers/vd.c index 9b7668124d5..9a4ccd72c5d 100644 --- a/src/mame/drivers/vd.c +++ b/src/mame/drivers/vd.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( vd_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( vd ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( vd, vd_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(vd_map) - + MCFG_MACHINE_RESET( vd ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/white_mod.c b/src/mame/drivers/white_mod.c index b4558552372..e845b622924 100644 --- a/src/mame/drivers/white_mod.c +++ b/src/mame/drivers/white_mod.c @@ -1,5 +1,5 @@ /* - Stern Whitestar (modified) + Stern Whitestar (modified) */ #include "emu.h" #include "cpu/m6809/m6809.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( whitestar_mod_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( whitestar_mod ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( whitestar_mod, whitestar_mod_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(whitestar_mod_map) - + MCFG_MACHINE_RESET( whitestar_mod ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -46,7 +46,7 @@ MACHINE_CONFIG_END ROM_START(elvisp) ROM_REGION(0x80000, "user1", 0) ROM_LOAD("elvscpua.500", 0x00000, 0x20000, CRC(aae9d65d) SHA1(d6e789f7257448e97697c406561c14a0abc45187)) -/* +/* ROM_LOAD( "elvscpua.302", 0x0000, 0x20000, CRC(52fd7068) SHA1(548568aeb30a17541b07489dfecde9d4d63bf82b)) ROM_LOAD( "elvscpuf.302", 0x0000, 0x20000, CRC(893a5ac6) SHA1(4be45cf036cdd643f10ecbb4d0b1778d25cf778a)) ROM_LOAD( "elvscpug.302", 0x0000, 0x20000, CRC(9d907782) SHA1(3bad8d0429029b0055d09e50af16bca4da724e0f)) @@ -72,7 +72,7 @@ ROM_LOAD( "elvscpui.303", 0x0000, 0x20000, CRC(11f47b7a) SHA1(4fbe64ed49719408b ROM_LOAD( "elvsdspi.302", 0x0000, 0x80000, CRC(217c7d17) SHA1(bfd67e876ea85847212c936f9f8477aba8a7b573)) ROM_LOAD( "elvscpul.303", 0x0000, 0x20000, CRC(691b9882) SHA1(fd8ceef9dbae6c788964d417ad1c61a4bb8e0d9b)) ROM_LOAD( "elvsdspl.302", 0x0000, 0x80000, CRC(f75ea4cb) SHA1(aa351bb0912fd9dc93e9c95f96af2d31aaf03777)) - */ + */ ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -222,7 +222,7 @@ ROM_START(gprixg) //ROM_LOAD( "gpcpug.301", 0x0000, 0x20000, CRC(23ac882e) SHA1(5194c3ea18a08f844f4ee293c9de44b62a956ee6)) //ROM_LOAD( "gpcpug.340", 0x0000, 0x20000, CRC(34afe4e4) SHA1(0655be39f309f32dffca22d7ab780263da5e8cb2)) //ROM_LOAD( "gpcpug.400", 0x0000, 0x20000, CRC(98d69588) SHA1(9d248b00a1aa966e69816cd7aaf869737e7a1ca7)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -345,7 +345,7 @@ ROM_START(nascar) //ROM_LOAD( "nasdspl.303", 0x0000, 0x80000, CRC(868277f0) SHA1(9c058054e6dc3b838bfc3a91d37438afcd59aa4b)) //ROM_LOAD( "nascpua.400", 0x0000, 0x20000, CRC(24a72071) SHA1(5bfe473e85e12b30963b15dfc8732f2ef9c299c3)) //ROM_LOAD( "nascpul.400", 0x0000, 0x20000, CRC(23ca7b4a) SHA1(9ea7afb283157a8e65106dc027cfd45eecc3f86a)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -406,7 +406,7 @@ ROM_START(ripleys) //ROM_LOAD( "ripsndi.u7", 0x0000, 0x10000, CRC(b966a2c1) SHA1(1aa83dc5b87fc16fc4281f577e61eb2661cfad09)) //ROM_LOAD( "ripsndl.u7", 0x0000, 0x10000, CRC(66bfcb7c) SHA1(8bdfaf01f367de8ccf15da59000ecff5268e0a4f)) //ROM_LOAD( "ripdispl.300", 0x0000, 0x80000, CRC(d2f496bb) SHA1(48622e25171030b83d8d1736735e97a13c5f47c6)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -540,7 +540,7 @@ ROM_START(lotr) //ROM_LOAD( "lotrdspa.403", 0x0000, 0x80000, CRC(2630cef1) SHA1(1dfd929e7eb57983f2fd9184d471f2e919359de0)) // ver 4.03 //ROM_LOAD( "lotrdspa.700", 0x0000, 0x80000, CRC(233ef0ad) SHA1(1564ae806639dac49add0c464f4499f46b5589ab)) // ver 7.00 //ROM_LOAD( "lotrdspa.800", 0x0000, 0x80000, CRC(2aa1f00d) SHA1(e9df5b61b467c307aacdb5a6980a78af26492e6a)) // ver 8.00 - //ROM_LOAD( "lotrdspa.900", 0x0000, 0x80000, CRC(2b1debd3) SHA1(eab1ffa7b5111bf224c47688bb6c0f40ee6e12fb)) // ver 9.00 + //ROM_LOAD( "lotrdspa.900", 0x0000, 0x80000, CRC(2b1debd3) SHA1(eab1ffa7b5111bf224c47688bb6c0f40ee6e12fb)) // ver 9.00 ROM_REGION32_LE(0x600000, "cpu2", 0) ROM_LOAD("bios.u8", 0x400000, 0x200000, CRC(c049bf99) SHA1(89e76760e8010fe642ed4312732de81c8a25f548)) ROM_RELOAD(0x0,0x200000) @@ -576,7 +576,7 @@ ROM_START(lotr_sp) ROM_LOAD("bios.u8", 0x400000, 0x200000, CRC(c049bf99) SHA1(89e76760e8010fe642ed4312732de81c8a25f548)) ROM_RELOAD(0x0,0x200000) ROM_REGION(0x10000, "sound1", 0) - ROM_LOAD("lotrlu7.100",0x0000,0x10000,CRC(980d970a) SHA1(cf70deddcc146ef9eaa64baec74ae800bebf8715)) + ROM_LOAD("lotrlu7.100",0x0000,0x10000,CRC(980d970a) SHA1(cf70deddcc146ef9eaa64baec74ae800bebf8715)) ROM_REGION(0x400000, "sound2", 0) ROM_LOAD("lotrlu17.100", 0x000000, 0x100000, CRC(c16d3e20) SHA1(43d9f186db361abb3aa119a7252f1bb13bbbbe39)) ROM_LOAD("lotrlu21.100", 0x100000, 0x100000, CRC(f956a1be) SHA1(2980e85463704a154ed81d3241f866442d1ea2e6)) @@ -717,7 +717,7 @@ ROM_START(sopranos) //ROM_LOAD( "sopdspl.100", 0x0000, 0x80000, CRC(1f52723e) SHA1(c972252a139c871e4bbbf20382ceb738b84f9a18)) //ROM_LOAD( "sopcpua.204", 0x0000, 0x20000, CRC(95251d1e) SHA1(c22754647afd07f42bb6b2d0944f696922e68feb)) //ROM_LOAD( "sopdspa.200", 0x0000, 0x80000, CRC(e5de9a5d) SHA1(6e18d4bdf2d35c9c0743fa6f91f540686d0a706b)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) diff --git a/src/mame/drivers/whitestar.c b/src/mame/drivers/whitestar.c index 16fa6f5477b..938debe5b48 100644 --- a/src/mame/drivers/whitestar.c +++ b/src/mame/drivers/whitestar.c @@ -1,5 +1,5 @@ /* - Sega/Stern Whitestar + Sega/Stern Whitestar */ #include "emu.h" #include "cpu/m6809/m6809.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( whitestar_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( whitestar ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( whitestar, whitestar_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(whitestar_map) - + MCFG_MACHINE_RESET( whitestar ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -945,7 +945,7 @@ ROM_START(playboys) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("pbdispa.500", 0x00000, 0x80000, CRC(40450165) SHA1(80295466838cb08fe1499b19a98bf759fb7a306e)) // ver 5.00 - //ROM_LOAD("pbdispa.300", 0x00000, 0x80000, CRC(2dbb372a) SHA1(b694ae06f380ea9f9730ea6bbfab7f9f7ec7342b)) // ver 3.00 + //ROM_LOAD("pbdispa.300", 0x00000, 0x80000, CRC(2dbb372a) SHA1(b694ae06f380ea9f9730ea6bbfab7f9f7ec7342b)) // ver 3.00 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("pbsndu7.102",0x0000,0x10000,CRC(12a68f34) SHA1(f2cd42918dec353883bc465f6302c2d94dcd6b87)) ROM_REGION(0x400000, "sound1", 0) @@ -1007,7 +1007,7 @@ ROM_START(playboyg) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("pbdispg.500", 0x00000, 0x80000, CRC(681392fe) SHA1(23011d538282da144b8ff9cbb7c5655567017e5e)) // ver 5.00 - //ROM_LOAD("pbdispg.300", 0x00000, 0x80000, CRC(ed7b7c62) SHA1(28b0ab490f8abd5f29e8cb0996da9e7200918157)) // ver 3.00 + //ROM_LOAD("pbdispg.300", 0x00000, 0x80000, CRC(ed7b7c62) SHA1(28b0ab490f8abd5f29e8cb0996da9e7200918157)) // ver 3.00 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("pbsndu7.102",0x0000,0x10000,CRC(12a68f34) SHA1(f2cd42918dec353883bc465f6302c2d94dcd6b87)) ROM_REGION(0x400000, "sound1", 0) @@ -1027,7 +1027,7 @@ ROM_START(playboyi) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("pbdispi.500", 0x00000, 0x80000, CRC(d90d7ec6) SHA1(7442160f403a8ccabfc9dc8dc53f8b44f5df26bc)) // ver 5.00 - //ROM_LOAD("pbdispi.300", 0x00000, 0x80000, CRC(74c8cedf) SHA1(474ad1939ea0a58852003e549ed85478e239a67c)) // ver 3.00 + //ROM_LOAD("pbdispi.300", 0x00000, 0x80000, CRC(74c8cedf) SHA1(474ad1939ea0a58852003e549ed85478e239a67c)) // ver 3.00 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("pbsndu7.102",0x0000,0x10000,CRC(12a68f34) SHA1(f2cd42918dec353883bc465f6302c2d94dcd6b87)) ROM_REGION(0x400000, "sound1", 0) @@ -1063,14 +1063,14 @@ ROM_END ROM_START(rctycn) ROM_REGION(0x80000, "user1", 0) ROM_LOAD("rctcpu.702", 0x00000, 0x20000, CRC(5736a816) SHA1(fcfd06eeca74df0bca2c0bc57aeaa00400e4ab55)) // ver 7.02 - //ROM_LOAD("rctcpu.400", 0x00000, 0x20000, CRC(4691de23) SHA1(f47fc03f9b030cb7a1201d015bbec5a426176338)) // ver 4.00 + //ROM_LOAD("rctcpu.400", 0x00000, 0x20000, CRC(4691de23) SHA1(f47fc03f9b030cb7a1201d015bbec5a426176338)) // ver 4.00 //ROM_LOAD( "rctcpu.701", 0x0000, 0x20000, CRC(e1fe89f6) SHA1(9a76a5c267e055fcf0418394762bcea758da02d6)) //ROM_LOAD( "rctdispa.700", 0x0000, 0x80000, CRC(6a8925d7) SHA1(82a6c069f1e8f8e053fec708f56c8ffe56d70fc8)) //ROM_LOAD( "rctdispf.700", 0x0000, 0x80000, CRC(2de0eec8) SHA1(5b48eabddc1fb735866767ae008baf58205954db)) //ROM_LOAD( "rctdispg.700", 0x0000, 0x80000, CRC(0babf1ed) SHA1(db683aa392968d255d355d4a1b0c9d8d4fb9e799)) //ROM_LOAD( "rctdispi.700", 0x0000, 0x80000, CRC(0d07d8f2) SHA1(3ffd8ad7183ba20844c1e5d1933c8002ca4707aa)) //ROM_LOAD( "rctdisps.700", 0x0000, 0x80000, CRC(6921d8cc) SHA1(1ada415af8e949829ceac75da507982ea2091f4d)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -1119,7 +1119,7 @@ ROM_START(rctycng) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("rctdispg.701", 0x00000, 0x80000, CRC(6c70ab29) SHA1(fa3b713b79c0d724b918fa318795681308a4fce3)) // ver 7.01 - //ROM_LOAD("rctdispg.400", 0x00000, 0x80000, CRC(c88dc915) SHA1(894c3bb7f5d200448740f021b5b9421f6ee74c5f)) // ver 4.00 + //ROM_LOAD("rctdispg.400", 0x00000, 0x80000, CRC(c88dc915) SHA1(894c3bb7f5d200448740f021b5b9421f6ee74c5f)) // ver 4.00 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("rcsndu7.100",0x0000,0x10000,CRC(e6cde9b1) SHA1(cbaadafd18ad9c0338bf2cce94b2c2a89e734778)) ROM_REGION(0x400000, "sound1", 0) @@ -1138,7 +1138,7 @@ ROM_START(rctycnf) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("rctdispf.701", 0x00000, 0x80000, CRC(4a3bb40c) SHA1(053f494765ac7708401a7816af7186e71083fe8d)) // ver 7.01 - //ROM_LOAD("rctdispf.400", 0x00000, 0x80000, CRC(5b41893b) SHA1(66930d0f5d6542b41f22995df55447ba0e435576)) // ver 4.00 + //ROM_LOAD("rctdispf.400", 0x00000, 0x80000, CRC(5b41893b) SHA1(66930d0f5d6542b41f22995df55447ba0e435576)) // ver 4.00 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("rcsndu7.100",0x0000,0x10000,CRC(e6cde9b1) SHA1(cbaadafd18ad9c0338bf2cce94b2c2a89e734778)) ROM_REGION(0x400000, "sound1", 0) @@ -1631,7 +1631,7 @@ ROM_START(term3) //ROM_LOAD( "t3dispf.201", 0x0000, 0x80000, CRC(ced87154) SHA1(893c071bb2427429ca45f4d2088b015c5f638207)) //ROM_LOAD( "t3dispi.201", 0x0000, 0x80000, CRC(c1f3604f) SHA1(8a391e6471ced52662aa69261ac29a279c7b8a7d)) //ROM_LOAD( "t3displ.201", 0x0000, 0x80000, CRC(180b55a2) SHA1(1d8161fc806804e0712ee8a07a2cac0561949f0c)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -1799,14 +1799,14 @@ ROM_END ROM_START(simpprty) ROM_REGION(0x80000, "user1", 0) ROM_LOAD("spp-cpu.500", 0x00000, 0x20000, CRC(215ce09c) SHA1(f3baaaa1b9f12a98109da55746031eb9f5f8790c)) // ver 5.00 - //ROM_LOAD("spp-cpu.204", 0x00000, 0x20000, CRC(5bc155f7) SHA1(78d793cecbc6561a891ff8007f33c63ec5515e9f)) // ver 2.04 + //ROM_LOAD("spp-cpu.204", 0x00000, 0x20000, CRC(5bc155f7) SHA1(78d793cecbc6561a891ff8007f33c63ec5515e9f)) // ver 2.04 //ROM_LOAD( "sppdspf.400", 0x0000, 0x80000, CRC(6cc306e2) SHA1(bfe6ef0cd5d0cb5e3b29d85ade1700005e22d81b)) //ROM_LOAD( "sppdspg.400", 0x0000, 0x80000, CRC(3b408fe2) SHA1(ce8d7f0d58b5f8fb4df0b9811449e4dc0e1e6580)) //ROM_LOAD( "sppdspi.400", 0x0000, 0x80000, CRC(ebe45dee) SHA1(4cdf0f01b1df1fa35df67f19c67b82a39d887be8)) //ROM_LOAD( "sppdspl.400", 0x0000, 0x80000, CRC(a0bf567e) SHA1(ce6eb65da6bff15aeb787fd2cdac7cf6b4300108)) //ROM_LOAD( "spp-cpu.400", 0x0000, 0x20000, CRC(530b9782) SHA1(573b20cac205b7989cdefceb2c31cb7d88c2951a)) //ROM_LOAD( "sppdspa.400", 0x0000, 0x80000, CRC(cd5eaab7) SHA1(a06bef6fc0e7f3c0616439cb0e0431a3d52cdfa1)) - + ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -1876,7 +1876,7 @@ ROM_START(simpprtl) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("sppdispl.500", 0x00000, 0x80000, CRC(0821f182) SHA1(7998ab29dae59d077b1dedd28a30a3477251d107)) // ver 5.00 - //ROM_LOAD("sppdispl.201", 0x00000, 0x80000, CRC(78a67e23) SHA1(c4ef2b0301104280410aefdacc847e74a8c6a49f)) // ver 2.01 + //ROM_LOAD("sppdispl.201", 0x00000, 0x80000, CRC(78a67e23) SHA1(c4ef2b0301104280410aefdacc847e74a8c6a49f)) // ver 2.01 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("spp101.u7",0x0000,0x10000,CRC(32efcdf6) SHA1(1d437e8649408be91e0dd10598cc67336203077f)) ROM_REGION(0x400000, "sound1", 0) @@ -1916,7 +1916,7 @@ ROM_START(simpprti) ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF) ROM_REGION(0x80000, "gfx3", 0) ROM_LOAD("sppdispi.500", 0x00000, 0x80000, CRC(eefe84db) SHA1(97c60f9182bdfe346ca4981b844a71f57414d470)) // ver 5.00 - //ROM_LOAD("sppdispi.201", 0x00000, 0x80000, CRC(b4594819) SHA1(4ab83f3b6466eebdec802e57d6542ad4a3cf3fb0)) // ver 2.01 + //ROM_LOAD("sppdispi.201", 0x00000, 0x80000, CRC(b4594819) SHA1(4ab83f3b6466eebdec802e57d6542ad4a3cf3fb0)) // ver 2.01 ROM_REGION(0x010000, "cpu2", 0) ROM_LOAD("spp101.u7",0x0000,0x10000,CRC(32efcdf6) SHA1(1d437e8649408be91e0dd10598cc67336203077f)) ROM_REGION(0x400000, "sound1", 0) diff --git a/src/mame/drivers/wico.c b/src/mame/drivers/wico.c index c3fde7f539a..8f28ecca31c 100644 --- a/src/mame/drivers/wico.c +++ b/src/mame/drivers/wico.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wico_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wico ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wico, wico_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 10000000 / 8) MCFG_CPU_PROGRAM_MAP(wico_map) - + MCFG_MACHINE_RESET( wico ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wpc_95.c b/src/mame/drivers/wpc_95.c index adbdc4a2b96..41c6696dbf4 100644 --- a/src/mame/drivers/wpc_95.c +++ b/src/mame/drivers/wpc_95.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wpc_95_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_95 ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wpc_95, wpc_95_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_95_map) - + MCFG_MACHINE_RESET( wpc_95 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -136,7 +136,7 @@ ROM_START(cc_13) ROM_END /*----------------- -/ Cirqus Voltaire +/ Cirqus Voltaire /------------------*/ ROM_START(cv_14) ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF) @@ -354,16 +354,16 @@ ROM_START(mm_10u) ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF) ROM_REGION(0x2000, "user1", ROMREGION_ERASEFF) ROM_REGION(0x080000, "user2", 0) - ROM_LOAD("mmu_g11.1_0", 0x00000, 0x080000, CRC(265e6192) SHA1(bd9606df5fb85b2048a07db0927e4a856c344276)) + ROM_LOAD("mmu_g11.1_0", 0x00000, 0x080000, CRC(265e6192) SHA1(bd9606df5fb85b2048a07db0927e4a856c344276)) ROM_REGION(0x20000, "cpu2", ROMREGION_ERASEFF) ROM_REGION(0x1000*2, "user3", ROMREGION_ERASEFF) ROM_REGION(0x800000, "sound1",0) - ROM_LOAD("mm_s2.1_0", 0x000000, 0x080000, CRC(c55c3b71) SHA1(95febbf16645dd897bdd459ccad9501d2457d1f1)) - ROM_RELOAD(0x000000 +0x080000, 0x080000) - ROM_LOAD("mm_sav3.rom", 0x100000, 0x100000, CRC(ed1be570) SHA1(ead4c4f89d63ee0b46d8a8bcd8650d506542d1ee)) - ROM_LOAD("mm_sav4.rom", 0x200000, 0x100000, CRC(9c89eacf) SHA1(594a2aa81e34658862a9b7f0a83cf514182f2a2d)) - ROM_LOAD("mm_sav5.rom", 0x300000, 0x100000, CRC(45089e30) SHA1(e83492109c59e8a2f1ba9e1f793788b97d150a9b)) - ROM_LOAD("mm_sav6.rom", 0x400000, 0x100000, CRC(439d55f2) SHA1(d80e7268223157d864674261d140322634fb3bc2)) + ROM_LOAD("mm_s2.1_0", 0x000000, 0x080000, CRC(c55c3b71) SHA1(95febbf16645dd897bdd459ccad9501d2457d1f1)) + ROM_RELOAD(0x000000 +0x080000, 0x080000) + ROM_LOAD("mm_sav3.rom", 0x100000, 0x100000, CRC(ed1be570) SHA1(ead4c4f89d63ee0b46d8a8bcd8650d506542d1ee)) + ROM_LOAD("mm_sav4.rom", 0x200000, 0x100000, CRC(9c89eacf) SHA1(594a2aa81e34658862a9b7f0a83cf514182f2a2d)) + ROM_LOAD("mm_sav5.rom", 0x300000, 0x100000, CRC(45089e30) SHA1(e83492109c59e8a2f1ba9e1f793788b97d150a9b)) + ROM_LOAD("mm_sav6.rom", 0x400000, 0x100000, CRC(439d55f2) SHA1(d80e7268223157d864674261d140322634fb3bc2)) ROM_END ROM_START(mm_05) ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF) diff --git a/src/mame/drivers/wpc_an.c b/src/mame/drivers/wpc_an.c index 8a7d2a108c4..ee974d980a9 100644 --- a/src/mame/drivers/wpc_an.c +++ b/src/mame/drivers/wpc_an.c @@ -1,5 +1,5 @@ /* - Williams WPC (Alpha Numeric) + Williams WPC (Alpha Numeric) */ #include "emu.h" #include "cpu/m6809/m6809.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( wpc_an_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_an ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( wpc_an, wpc_an_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_an_map) - + MCFG_MACHINE_RESET( wpc_an ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -122,7 +122,7 @@ ROM_START(fh_l3) ROM_LOAD("fh_u18.sl2", 0x000000, 0x20000, CRC(11c8944a) SHA1(425d8da5a036c41e054d201b99856319fd5ef9e2)) ROM_RELOAD( 0x000000 + 0x20000, 0x20000) ROM_RELOAD( 0x000000 + 0x40000, 0x20000) - ROM_RELOAD( 0x000000 + 0x60000, 0x20000) + ROM_RELOAD( 0x000000 + 0x60000, 0x20000) ROM_LOAD("fh_u15.sl2", 0x080000, 0x20000, CRC(0744b9f5) SHA1(b626601d82e6b1cf25f7fdcca31e623fc14a3f92)) ROM_RELOAD( 0x080000 + 0x20000, 0x20000) ROM_RELOAD( 0x080000 + 0x40000, 0x20000) @@ -142,11 +142,11 @@ ROM_START(fh_l4) ROM_LOAD("fh_u18.sl2", 0x000000, 0x20000, CRC(11c8944a) SHA1(425d8da5a036c41e054d201b99856319fd5ef9e2)) ROM_RELOAD( 0x000000 + 0x20000, 0x20000) ROM_RELOAD( 0x000000 + 0x40000, 0x20000) - ROM_RELOAD( 0x000000 + 0x60000, 0x20000) + ROM_RELOAD( 0x000000 + 0x60000, 0x20000) ROM_LOAD("fh_u15.sl2", 0x080000, 0x20000, CRC(0744b9f5) SHA1(b626601d82e6b1cf25f7fdcca31e623fc14a3f92)) ROM_RELOAD( 0x080000 + 0x20000, 0x20000) ROM_RELOAD( 0x080000 + 0x40000, 0x20000) - ROM_RELOAD( 0x080000 + 0x60000, 0x20000) + ROM_RELOAD( 0x080000 + 0x60000, 0x20000) ROM_LOAD("fh_u14.sl2", 0x100000, 0x20000, CRC(3394b69b) SHA1(34690688f00106b725b27a6975cdbf1e077e3bb3)) ROM_RELOAD( 0x100000 + 0x20000, 0x20000) ROM_RELOAD( 0x100000 + 0x40000, 0x20000) @@ -163,11 +163,11 @@ ROM_START(fh_l5) ROM_LOAD("fh_u18.sl2", 0x000000, 0x20000, CRC(11c8944a) SHA1(425d8da5a036c41e054d201b99856319fd5ef9e2)) ROM_RELOAD( 0x000000 + 0x20000, 0x20000) ROM_RELOAD( 0x000000 + 0x40000, 0x20000) - ROM_RELOAD( 0x000000 + 0x60000, 0x20000) + ROM_RELOAD( 0x000000 + 0x60000, 0x20000) ROM_LOAD("fh_u15.sl2", 0x080000, 0x20000, CRC(0744b9f5) SHA1(b626601d82e6b1cf25f7fdcca31e623fc14a3f92)) ROM_RELOAD( 0x080000 + 0x20000, 0x20000) ROM_RELOAD( 0x080000 + 0x40000, 0x20000) - ROM_RELOAD( 0x080000 + 0x60000, 0x20000) + ROM_RELOAD( 0x080000 + 0x60000, 0x20000) ROM_LOAD("fh_u14.sl2", 0x100000, 0x20000, CRC(3394b69b) SHA1(34690688f00106b725b27a6975cdbf1e077e3bb3)) ROM_RELOAD( 0x100000 + 0x20000, 0x20000) ROM_RELOAD( 0x100000 + 0x40000, 0x20000) @@ -184,11 +184,11 @@ ROM_START(fh_905h) ROM_LOAD("fh_u18.sl3", 0x000000, 0x20000, CRC(7f6c7045) SHA1(8c8d601e8e6598507d75b4955ccc51623124e8ab)) ROM_RELOAD( 0x000000 + 0x20000, 0x20000) ROM_RELOAD( 0x000000 + 0x40000, 0x20000) - ROM_RELOAD( 0x000000 + 0x60000, 0x20000) + ROM_RELOAD( 0x000000 + 0x60000, 0x20000) ROM_LOAD("fh_u15.sl2", 0x080000, 0x20000, CRC(0744b9f5) SHA1(b626601d82e6b1cf25f7fdcca31e623fc14a3f92)) ROM_RELOAD( 0x080000 + 0x20000, 0x20000) ROM_RELOAD( 0x080000 + 0x40000, 0x20000) - ROM_RELOAD( 0x080000 + 0x60000, 0x20000) + ROM_RELOAD( 0x080000 + 0x60000, 0x20000) ROM_LOAD("fh_u14.sl2", 0x100000, 0x20000, CRC(3394b69b) SHA1(34690688f00106b725b27a6975cdbf1e077e3bb3)) ROM_RELOAD( 0x100000 + 0x20000, 0x20000) ROM_RELOAD( 0x100000 + 0x40000, 0x20000) diff --git a/src/mame/drivers/wpc_dcs.c b/src/mame/drivers/wpc_dcs.c index f1c60cf880b..a951f9c8b38 100644 --- a/src/mame/drivers/wpc_dcs.c +++ b/src/mame/drivers/wpc_dcs.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wpc_dcs_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_dcs ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wpc_dcs, wpc_dcs_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_dcs_map) - + MCFG_MACHINE_RESET( wpc_dcs ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -339,7 +339,7 @@ ROM_START(ij_l3) ROM_END /*----------------- -/ Judge Dredd +/ Judge Dredd /------------------*/ ROM_START(jd_l7) ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF) @@ -642,7 +642,7 @@ ROM_START(afv_l4) ROM_LOAD("afv_su2.l1", 0x000000, 0x080000, CRC(1aa878fc) SHA1(59a89071001b5da6ab56d691721a015773f5f0b5)) ROM_RELOAD(0x000000+0x080000, 0x080000) ROM_END - + GAME(1994, dm_lx4, 0, wpc_dcs, wpc_dcs, wpc_dcs, ROT0, "Williams", "Demolition Man (LX-4)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1994, dm_pa2, dm_lx4, wpc_dcs, wpc_dcs, wpc_dcs, ROT0, "Williams", "Demolition Man (PA-2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(1994, dm_px5, dm_lx4, wpc_dcs, wpc_dcs, wpc_dcs, ROT0, "Williams", "Demolition Man (PX-5)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/wpc_dot.c b/src/mame/drivers/wpc_dot.c index 2885cfa5b98..9e3309a3533 100644 --- a/src/mame/drivers/wpc_dot.c +++ b/src/mame/drivers/wpc_dot.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wpc_dot_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_dot ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wpc_dot, wpc_dot_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_dot_map) - + MCFG_MACHINE_RESET( wpc_dot ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wpc_flip1.c b/src/mame/drivers/wpc_flip1.c index 5c0a059b82b..b3d83231cae 100644 --- a/src/mame/drivers/wpc_flip1.c +++ b/src/mame/drivers/wpc_flip1.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wpc_flip1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_flip1 ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wpc_flip1, wpc_flip1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_flip1_map) - + MCFG_MACHINE_RESET( wpc_flip1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wpc_flip2.c b/src/mame/drivers/wpc_flip2.c index 81a238a6768..160b30bf99c 100644 --- a/src/mame/drivers/wpc_flip2.c +++ b/src/mame/drivers/wpc_flip2.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wpc_flip2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_flip2 ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wpc_flip2, wpc_flip2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_flip2_map) - + MCFG_MACHINE_RESET( wpc_flip2 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wpc_s.c b/src/mame/drivers/wpc_s.c index 80630683b3a..53c682afb9b 100644 --- a/src/mame/drivers/wpc_s.c +++ b/src/mame/drivers/wpc_s.c @@ -14,7 +14,7 @@ public: static ADDRESS_MAP_START( wpc_s_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( wpc_s ) INPUT_PORTS_END @@ -30,9 +30,9 @@ static MACHINE_CONFIG_START( wpc_s, wpc_s_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_s_map) - + MCFG_MACHINE_RESET( wpc_s ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END @@ -912,7 +912,7 @@ ROM_START(tom_06) ROM_END /*----------------- -/ Who Dunnit +/ Who Dunnit /------------------*/ ROM_START(wd_12) ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF) diff --git a/src/mame/drivers/zac_1.c b/src/mame/drivers/zac_1.c index d8055a8e29c..5f445a10280 100644 --- a/src/mame/drivers/zac_1.c +++ b/src/mame/drivers/zac_1.c @@ -1,5 +1,5 @@ /* - Zaccaria Generation 1 + Zaccaria Generation 1 */ #include "emu.h" #include "cpu/s2650/s2650.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( zac_1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( zac_1 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( zac_1, zac_1_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 6000000/2) MCFG_CPU_PROGRAM_MAP(zac_1_map) - + MCFG_MACHINE_RESET( zac_1 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/zac_2.c b/src/mame/drivers/zac_2.c index a6c37ec525d..7b163f21f26 100644 --- a/src/mame/drivers/zac_2.c +++ b/src/mame/drivers/zac_2.c @@ -1,5 +1,5 @@ /* - Zaccaria Generation 2 + Zaccaria Generation 2 */ #include "emu.h" #include "cpu/s2650/s2650.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( zac_2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( zac_2 ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( zac_2, zac_2_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 6000000/2) MCFG_CPU_PROGRAM_MAP(zac_2_map) - + MCFG_MACHINE_RESET( zac_2 ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/drivers/zac_proto.c b/src/mame/drivers/zac_proto.c index 0615432d74c..0d4195e3458 100644 --- a/src/mame/drivers/zac_proto.c +++ b/src/mame/drivers/zac_proto.c @@ -1,5 +1,5 @@ /* - Zaccaria Prototype + Zaccaria Prototype */ #include "emu.h" #include "cpu/scmp/scmp.h" @@ -17,7 +17,7 @@ public: static ADDRESS_MAP_START( zac_proto_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( zac_proto ) INPUT_PORTS_END @@ -33,9 +33,9 @@ static MACHINE_CONFIG_START( zac_proto, zac_proto_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SCMP, 1000000) MCFG_CPU_PROGRAM_MAP(zac_proto_map) - + MCFG_MACHINE_RESET( zac_proto ) - + /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_pinball) MACHINE_CONFIG_END diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index dba01552443..600c05c6988 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -27,7 +27,7 @@ public: UINT8 *starfire_videoram; UINT8 *starfire_colorram; - + emu_timer* scanline_timer; bitmap_t *starfire_screen; }; diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index 4a84fd0289d..2b0eacda364 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -22,28 +22,28 @@ static WRITE8_DEVICE_HANDLER( b_via_1_pb_w ); /* VIA 0 (aka "PPCNP74", U6 @1C on schematics) - enabled at CE00-CFFF of main m6809 cpu when bankswitch is set to 0 - port A: - bit 7: input, X from banking latch (d3 of banking register) - bit 6: input, Y from banking latch (d4 of banking register) - bit 5: input, Z from banking latch (d5 of banking register) - bit 4: N/C - bit 3: output, /RESET for audio subcpu - bit 2: output, /ENABLE for LS139@2H for reading control and dipswitch inputs to pbus - bit 1: output, MSb of selector for inputs to pbus - bit 0: output, LSb of " - port B: - bits 7-0: input/output: pbus - port C: - CA1: N/C - CA2: input: "TDISP" (one of the higher bits in the video line counter, a mirror of the D5 bit from beezer_line_r), done in /video/beezer.c - CB1: ASH1 to via 1 - CB2: ASH2 to via 1 - /IRQ: to main m6809 cpu - /RES: from main reset generator/watchdog/button - - TODO: find a better way to attach ca2 read to beezer_line_r - */ + enabled at CE00-CFFF of main m6809 cpu when bankswitch is set to 0 + port A: + bit 7: input, X from banking latch (d3 of banking register) + bit 6: input, Y from banking latch (d4 of banking register) + bit 5: input, Z from banking latch (d5 of banking register) + bit 4: N/C + bit 3: output, /RESET for audio subcpu + bit 2: output, /ENABLE for LS139@2H for reading control and dipswitch inputs to pbus + bit 1: output, MSb of selector for inputs to pbus + bit 0: output, LSb of " + port B: + bits 7-0: input/output: pbus + port C: + CA1: N/C + CA2: input: "TDISP" (one of the higher bits in the video line counter, a mirror of the D5 bit from beezer_line_r), done in /video/beezer.c + CB1: ASH1 to via 1 + CB2: ASH2 to via 1 + /IRQ: to main m6809 cpu + /RES: from main reset generator/watchdog/button + + TODO: find a better way to attach ca2 read to beezer_line_r + */ const via6522_interface b_via_0_interface = { /*inputs : A/B */ DEVCB_HANDLER(b_via_0_pa_r), DEVCB_HANDLER(b_via_0_pb_r), @@ -54,28 +54,28 @@ const via6522_interface b_via_0_interface = }; /* VIA 1 (U18 @3C on schematics) - port A: - bits 7-0: input/output: pbus - port B: - bit 7: output: TIMER1 OUT (used to gate NOISE (see below) to clock channel 1 of 6840, plus acts as channel 0 by itself) - bit 6: input: NOISE (from mn5837 14-bit LFSR, which also connects to clock above) - bit 5: output?: N/C - bit 4: output?: FMSEL1 (does not appear elsewhere on schematics! what does this do? needs tracing) - bit 3: output?: FMSEL0 (does not appear elsewhere on schematics! what does this do? needs tracing) - bit 2: output?: AM (does not appear elsewhere on schematics! what does this do? needs tracing) - bit 1: output: FM or AM (appears to control some sort of suppression or filtering change of the post-DAC amplifier when enabled, only during the TIMER1 OUT time-slot of the multiplexer, see page 1B 3-3 of schematics) - bit 0: output?: DMOD DISABLE (does not appear elsewhere on schematics! what does this do? needs tracing) - port C: - CA1: AHS2 from via 0 (are these two switched?) - CA2: AHS1 from via 0 " - CB1: ??put: DMOD CLR (does not appear elsewhere on schematics! what does this do? needs tracing) - CB2: ??put: DMOD DATA (does not appear elsewhere on schematics! what does this do? needs tracing) - /IRQ: to audio/sub m6809 cpu - /RES: from audio reset bit of via 0 - - TODO: the entirety of port B, much needs tracing - TODO: ports CB1 and CB2, need tracing; ports CA1 and CA2 could use verify as well - */ + port A: + bits 7-0: input/output: pbus + port B: + bit 7: output: TIMER1 OUT (used to gate NOISE (see below) to clock channel 1 of 6840, plus acts as channel 0 by itself) + bit 6: input: NOISE (from mn5837 14-bit LFSR, which also connects to clock above) + bit 5: output?: N/C + bit 4: output?: FMSEL1 (does not appear elsewhere on schematics! what does this do? needs tracing) + bit 3: output?: FMSEL0 (does not appear elsewhere on schematics! what does this do? needs tracing) + bit 2: output?: AM (does not appear elsewhere on schematics! what does this do? needs tracing) + bit 1: output: FM or AM (appears to control some sort of suppression or filtering change of the post-DAC amplifier when enabled, only during the TIMER1 OUT time-slot of the multiplexer, see page 1B 3-3 of schematics) + bit 0: output?: DMOD DISABLE (does not appear elsewhere on schematics! what does this do? needs tracing) + port C: + CA1: AHS2 from via 0 (are these two switched?) + CA2: AHS1 from via 0 " + CB1: ??put: DMOD CLR (does not appear elsewhere on schematics! what does this do? needs tracing) + CB2: ??put: DMOD DATA (does not appear elsewhere on schematics! what does this do? needs tracing) + /IRQ: to audio/sub m6809 cpu + /RES: from audio reset bit of via 0 + + TODO: the entirety of port B, much needs tracing + TODO: ports CB1 and CB2, need tracing; ports CA1 and CA2 could use verify as well + */ const via6522_interface b_via_1_interface = { /*inputs : A/B */ DEVCB_HANDLER(b_via_1_pa_r), DEVCB_HANDLER(b_via_1_pb_r), diff --git a/src/mame/machine/gaelco3d.c b/src/mame/machine/gaelco3d.c index 7142991918e..c6da62c5ba7 100644 --- a/src/mame/machine/gaelco3d.c +++ b/src/mame/machine/gaelco3d.c @@ -2,34 +2,34 @@ Gaelco 3D serial hardware - Couriersud, early 2010 + Couriersud, early 2010 - Not all lines are fully understood. There is some handshaking going - on on send which is not fully understood. Those wishing to have a look - at this: + Not all lines are fully understood. There is some handshaking going + on on send which is not fully understood. Those wishing to have a look + at this: - Serial send: 0x1fca (radikalb, 68020) 1866e (surfplnt) - Serial receive: 0x1908 (radikalb, 68020) 185ae + Serial send: 0x1fca (radikalb, 68020) 1866e (surfplnt) + Serial receive: 0x1908 (radikalb, 68020) 185ae - The receive is interrupt driven (interrupt 6) and the send is - initiated out of the normal program loop. There is the chance - of race conditions in mame. + The receive is interrupt driven (interrupt 6) and the send is + initiated out of the normal program loop. There is the chance + of race conditions in mame. - To run two instances of radikalb on *nix, use the following + To run two instances of radikalb on *nix, use the following - a) Uncomment SHARED_MEM_DRIVER below - b) Open two terminals - c) In terminal 1: mkdir /tmp/x1; cd /tmp/x1; /path/to/mame64 -np 2 -mt -rp /mnt/mame/romlib/r -inipath . radikalb -w -nomaximize -inipath . - d) In terminal 2: mkdir /tmp/x2; cd /tmp/x2; /path/to/mame64 -np 2 -mt -rp /mnt/mame/romlib/r -inipath . radikalb -w -nomaximize -inipath . - e) Set one instance to be master and one to be slave in service mode - f) Have fun + a) Uncomment SHARED_MEM_DRIVER below + b) Open two terminals + c) In terminal 1: mkdir /tmp/x1; cd /tmp/x1; /path/to/mame64 -np 2 -mt -rp /mnt/mame/romlib/r -inipath . radikalb -w -nomaximize -inipath . + d) In terminal 2: mkdir /tmp/x2; cd /tmp/x2; /path/to/mame64 -np 2 -mt -rp /mnt/mame/romlib/r -inipath . radikalb -w -nomaximize -inipath . + e) Set one instance to be master and one to be slave in service mode + f) Have fun ***************************************************************************/ #include "emu.h" #include "gaelco3d.h" -//#define SHARED_MEM_DRIVER (1) +//#define SHARED_MEM_DRIVER (1) #include #include @@ -47,7 +47,7 @@ #define VERBOSE (0) #if VERBOSE -#define LOGMSG(x) logerror x +#define LOGMSG(x) logerror x #else #define LOGMSG(x) do {} while (0); #endif @@ -89,7 +89,7 @@ struct _buf_t typedef struct _shmem_t shmem_t; struct _shmem_t { - volatile INT32 lock; + volatile INT32 lock; buf_t buf[2]; }; @@ -504,7 +504,7 @@ static DEVICE_RESET( gaelco_serial ) { gaelco_serial_state *state = get_token(device); - state->status = GAELCOSER_STATUS_READY |GAELCOSER_STATUS_IRQ_ENABLE ; + state->status = GAELCOSER_STATUS_READY |GAELCOSER_STATUS_IRQ_ENABLE ; state->last_in_msg_cnt = -1; state->slack_cnt = LINK_SLACK_B; @@ -534,7 +534,7 @@ DEVICE_GET_INFO( gaelco_serial ) /* --- the following bits of info are returned as 64-bit signed integers --- */ case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(gaelco_serial_state); break; case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = 0; break; - //case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break; + //case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(gaelco_serial);break; diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h index 7bd59a4acf4..459cb704522 100644 --- a/src/mame/machine/gaelco3d.h +++ b/src/mame/machine/gaelco3d.h @@ -19,7 +19,7 @@ #define GAELCOSER_STATUS_RTS 0x02 /* only RTS currently understood ! */ -//#define GAELCOSER_STATUS_DTR 0x04 +//#define GAELCOSER_STATUS_DTR 0x04 #define GAELCOSER_EXT_STATUS_MASK 0x03 diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c index 589b964b912..62e3b64efc9 100644 --- a/src/mame/machine/namco62.c +++ b/src/mame/machine/namco62.c @@ -6,7 +6,7 @@ device. It is used by just one game: Gaplus. TODO: Chip pin description/layout/notes - + ***************************************************************************/ #include "emu.h" diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index 5febf9b0bcc..cc4ed04742f 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -1827,12 +1827,12 @@ static UINT8 cop_calculate_collsion_detection(running_machine *machine) res &= ~2; /* TODO: Legionnaire does collision detection via the other two regs, - for now just implement a version that allows the player to spam flying kicks and hit everything else on the screen ;-) */ + for now just implement a version that allows the player to spam flying kicks and hit everything else on the screen ;-) */ cop_hit_val_x = (res & 1) ? cop_collision_info[0].max_x - cop_collision_info[1].min_x : 0; cop_hit_val_y = (res & 2) ? cop_collision_info[0].max_y - cop_collision_info[1].min_y : 0; //if(res == 0) - // printf("0:%08x %08x 1:%08x %08x\n",cop_collision_info[0].min_x,cop_collision_info[0].min_y,cop_collision_info[1].min_x,cop_collision_info[1].min_y); + // printf("0:%08x %08x 1:%08x %08x\n",cop_collision_info[0].min_x,cop_collision_info[0].min_y,cop_collision_info[1].min_x,cop_collision_info[1].min_y); return res; } @@ -2129,12 +2129,12 @@ static WRITE16_HANDLER( generic_cop_w ) word ^= 2 byte ^= 3 - some macro commands here have a commented algorythm, it's how Seibu Cup Bootleg version handles maths inside the 14/15 roms. - The ROMs map tables in the following arrangement: - 0x00000 - 0x1ffff Sine math results - 0x20000 - 0x3ffff Cosine math results - 0x40000 - 0x7ffff Division math results - 0x80000 - 0xfffff Pythagorean theorem, hypotenuse length math results - Surprisingly atan maths are nowhere to be found from the roms. + The ROMs map tables in the following arrangement: + 0x00000 - 0x1ffff Sine math results + 0x20000 - 0x3ffff Cosine math results + 0x40000 - 0x7ffff Division math results + 0x80000 - 0xfffff Pythagorean theorem, hypotenuse length math results + Surprisingly atan maths are nowhere to be found from the roms. */ /* "automatic" movement */ @@ -2164,16 +2164,16 @@ static WRITE16_HANDLER( generic_cop_w ) /* SINE math - 0x8100 */ /* FIXME: cop scale is unreliable */ /* - 00000-0ffff: - amp = x/256 - ang = x & 255 - s = sin(ang*2*pi/256) - val = trunc(s*amp) - if(s<0) - val-- - if(s == 192) - val = -2*amp - */ + 00000-0ffff: + amp = x/256 + ang = x & 255 + s = sin(ang*2*pi/256) + val = trunc(s*amp) + if(s<0) + val-- + if(s == 192) + val = -2*amp + */ if(COP_CMD(0xb9a,0xb88,0x888,0x000,0x000,0x000,0x000,0x000,7,0xfdfb)) { int raw_angle = (space->read_word(cop_register[0]+(0x34^2)) & 0xff); @@ -2191,16 +2191,16 @@ static WRITE16_HANDLER( generic_cop_w ) /* COSINE math - 0x8900 */ /* FIXME: cop scale is unreliable */ /* - 10000-1ffff: - amp = x/256 - ang = x & 255 - s = cos(ang*2*pi/256) - val = trunc(s*amp) - if(s<0) - val-- - if(s == 128) - val = -2*amp - */ + 10000-1ffff: + amp = x/256 + ang = x & 255 + s = cos(ang*2*pi/256) + val = trunc(s*amp) + if(s<0) + val-- + if(s == 128) + val = -2*amp + */ if(COP_CMD(0xb9a,0xb8a,0x88a,0x000,0x000,0x000,0x000,0x000,7,0xfdfb)) { int raw_angle = (space->read_word(cop_register[0]+(0x34^2)) & 0xff); @@ -2259,11 +2259,11 @@ static WRITE16_HANDLER( generic_cop_w ) //07 | 4 | 007f | 3bb0 | f9c b9c b9c b9c b9c b9c b9c 99c //(grainbow) | 4 | 007f | 3bb0 | f9c b9c b9c b9c b9c b9c b9c 99c /* - 40000-7ffff: - v1 = (x / 32768)*64 - v2 = (x & 255)*32767/255 - val = sqrt(v1*v1+v2*v2) (unsigned) - */ + 40000-7ffff: + v1 = (x / 32768)*64 + v2 = (x & 255)*32767/255 + val = sqrt(v1*v1+v2*v2) (unsigned) + */ if(COP_CMD(0xf9c,0xb9c,0xb9c,0xb9c,0xb9c,0xb9c,0xb9c,0x99c,4,0x007f)) { int dx = space->read_dword(cop_register[1]+4) - space->read_dword(cop_register[0]+4); @@ -2280,15 +2280,15 @@ static WRITE16_HANDLER( generic_cop_w ) /* Division - 0x42c2 */ /* - 20000-2ffff: - v1 = x / 1024 - v2 = x & 1023 - val = !v1 ? 32767 : trunc(v2/v1+0.5) - 30000-3ffff: - v1 = x / 1024 - v2 = (x & 1023)*32 - val = !v1 ? 32767 : trunc(v2/v1+0.5) - */ + 20000-2ffff: + v1 = x / 1024 + v2 = x & 1023 + val = !v1 ? 32767 : trunc(v2/v1+0.5) + 30000-3ffff: + v1 = x / 1024 + v2 = (x & 1023)*32 + val = !v1 ? 32767 : trunc(v2/v1+0.5) + */ if(COP_CMD(0xf9a,0xb9a,0xb9c,0xb9c,0xb9c,0x29c,0x000,0x000,5,0xfcdd)) { int div = space->read_word(cop_register[0]+(0x36^2)); @@ -2309,7 +2309,7 @@ static WRITE16_HANDLER( generic_cop_w ) int hitbox_param1 = space->read_dword(cop_register[2]); int hitbox_param2 = space->read_dword(cop_register[3]); - TODO: we are ignoring the u1 / u2 params for now + TODO: we are ignoring the u1 / u2 params for now */ if(COP_CMD(0xb80,0xb82,0xb84,0xb86,0x000,0x000,0x000,0x000,u1,u2)) @@ -2384,7 +2384,7 @@ static WRITE16_HANDLER( generic_cop_w ) rel_xy = space->read_word(cop_sprite_dma_src + 4 + offs); //if(rel_xy & 0x0706) - // printf("sprite rel_xy = %04x\n",rel_xy); + // printf("sprite rel_xy = %04x\n",rel_xy); if(rel_xy & 1) space->write_word(cop_register[4] + offs + 4,0xc0 + abs_x - (rel_xy & 0xf8)); diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 413dc290f58..bbf6280d5c8 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -63,7 +63,7 @@ UINT8 st010_read_ram(snes_state *state, UINT16 addr) UINT16 temp = state->upd96050->dataram_r(addr/2); UINT8 res; - if (addr & 1) + if (addr & 1) { res = temp>>8; } @@ -1134,7 +1134,7 @@ READ8_HANDLER( snes_r_bank4 ) else value = snes_open_bus_r(space, 0); } - else if (state->has_addon_chip == HAS_ST010 || state->has_addon_chip == HAS_ST011) + else if (state->has_addon_chip == HAS_ST010 || state->has_addon_chip == HAS_ST011) { if (offset >= 0x80000 && address < 0x1000) { @@ -1294,7 +1294,7 @@ READ8_HANDLER( snes_r_bank7 ) value = sdd1_read(space->machine, offset); else if (state->has_addon_chip == HAS_ST010 || state->has_addon_chip == HAS_ST011) { - if (offset >= 0x280000 && offset < 0x300000 && address < 0x1000) + if (offset >= 0x280000 && offset < 0x300000 && address < 0x1000) { value = st010_read_ram(state, address); } @@ -1449,7 +1449,7 @@ WRITE8_HANDLER( snes_w_bank4 ) snes_ram[0xe00000 + offset] = data; else if (state->has_addon_chip == HAS_ST010 || state->has_addon_chip == HAS_ST011) { - if (offset >= 0x80000 && address < 0x1000) + if (offset >= 0x80000 && address < 0x1000) { st010_write_ram(state, address, data); } @@ -1760,7 +1760,7 @@ static void snes_init_ram( running_machine *machine ) snes_ram[VMAIN] = 0x80; // see if there's a uPD7725 DSP in the machine config - state->upd7725 = machine->device("dsp"); + state->upd7725 = machine->device("dsp"); // if we have a DSP, halt it for the moment if (state->upd7725) @@ -1790,7 +1790,7 @@ static void snes_init_ram( running_machine *machine ) { logerror("SNES: Game uses a DSP, but the machine driver is missing the uPD7725!\n"); state->has_addon_chip = HAS_NONE; // prevent crash trying to access NULL device - } + } break; case HAS_RTC: @@ -1816,7 +1816,7 @@ static void snes_init_ram( running_machine *machine ) { logerror("SNES: Game uses a Seta DSP, but the machine driver is missing the uPD96050!\n"); state->has_addon_chip = HAS_NONE; // prevent crash trying to access NULL device - } + } break; default: diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 6d3cd7f3c37..bf9a3beac9e 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -10650,21 +10650,21 @@ Other Sun games DRIVER( dinoeggs ) /* - Atari Generation/System 1 - */ + Atari Generation/System 1 + */ DRIVER( atarians ) DRIVER( time2000 ) DRIVER( aavenger ) DRIVER( midearth ) DRIVER( spcrider ) /* - Atari Generation/System 2 - */ + Atari Generation/System 2 + */ DRIVER( supermap ) DRIVER( hercules ) /* - Atari Generation/System 3 - */ + Atari Generation/System 3 + */ DRIVER( roadrunr ) // bingo.c @@ -10673,8 +10673,8 @@ Other Sun games DRIVER( goldgam2 ) /* - Bally MPU AS-2518-17 - */ + Bally MPU AS-2518-17 + */ DRIVER( blackjck ) DRIVER( bowarrow ) DRIVER( eightbll ) @@ -10686,8 +10686,8 @@ Other Sun games DRIVER( stk_sprs ) /* - Bally MPU AS-2518-35 - */ + Bally MPU AS-2518-35 + */ DRIVER( bullseye ) DRIVER( blakpyra ) DRIVER( bmx ) @@ -10713,7 +10713,7 @@ Other Sun games DRIVER( hglbtrtr ) DRIVER( hotdoggn ) DRIVER( kosteel ) - DRIVER( kiss ) + DRIVER( kiss ) DRIVER( lostwrlp ) DRIVER( medusa ) DRIVER( m_mpac ) @@ -10748,7 +10748,7 @@ Other Sun games DRIVER( worlddef ) DRIVER( darkshad ) DRIVER( skflight ) - DRIVER( cobrap ) + DRIVER( cobrap ) DRIVER( futrquen ) DRIVER( f1gpp ) DRIVER( toppin ) @@ -10760,13 +10760,13 @@ Other Sun games DRIVER( suprbowl ) /* - Bally Kiss 8035 prototype - */ + Bally Kiss 8035 prototype + */ DRIVER( kissp ) /* - Bally MPU A084-91786-AH06 (6803) - */ + Bally MPU A084-91786-AH06 (6803) + */ DRIVER( atlantip ) DRIVER( beatclck ) DRIVER( blackblt ) @@ -10789,8 +10789,8 @@ Other Sun games DRIVER( trucksp2 ) /* - Bally MPU AS-2518-133 - */ + Bally MPU AS-2518-133 + */ DRIVER( babypac ) DRIVER( granny ) diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c index a0eb4fe0318..5bc189e67ba 100644 --- a/src/mame/video/dc.c +++ b/src/mame/video/dc.c @@ -720,10 +720,10 @@ static void tex_get_info(texinfo *t, pvrta_state *sa) t->sizex = 1 << (3+((t->sizes >> 3) & 7)); t->sizey = 1 << (3+(t->sizes & 7)); - + /* Stride select is used only in the non-twiddled case */ t->stride = (t->mode & 1) && sa->strideselect ? t->sizex : (pvrta_regs[TEXT_CONTROL] & 0x1f) << 5; - + t->blend_mode = sa->blend_mode; t->filter_mode = sa->filtermode; @@ -736,7 +736,7 @@ static void tex_get_info(texinfo *t, pvrta_state *sa) t->vqbase = t->address; t->blend = sa->use_alpha ? blend_functions[t->blend_mode] : bl10; - // fprintf(stderr, "tex %d %d %d %d\n", t->pf, t->mode, pvrta_regs[PAL_RAM_CTRL], t->mipmapped); + // fprintf(stderr, "tex %d %d %d %d\n", t->pf, t->mode, pvrta_regs[PAL_RAM_CTRL], t->mipmapped); switch(t->pf) { case 0: // 1555 diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index f29175c5915..76835e94397 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -6,7 +6,7 @@ which use one or more Toaplan L7A0498 GP9001 graphic controllers. The simpler hardware of these games use one GP9001 controller. - + Next we have games that use two GP9001 controllers, the mixing of the VDPs depends on a PAL on the motherboard. (mixing handled in toaplan2.c) @@ -569,20 +569,20 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1 /************************************************************************/ //printf("gp9001_scroll_reg_data_w %04x %04x\n", offset, data); - + // writes with 8x set turn on flip for the specified layer / axis int flip = vdp->gp9001_scroll_reg & 0x80; switch(vdp->gp9001_scroll_reg&0x7f) { case 0x00: gp9001_set_scrollx_and_flip_reg(&vdp->bg, data, mem_mask, flip); break; - case 0x01: gp9001_set_scrolly_and_flip_reg(&vdp->bg, data, mem_mask, flip); break; + case 0x01: gp9001_set_scrolly_and_flip_reg(&vdp->bg, data, mem_mask, flip); break; case 0x02: gp9001_set_scrollx_and_flip_reg(&vdp->fg, data, mem_mask, flip); break; - case 0x03: gp9001_set_scrolly_and_flip_reg(&vdp->fg, data, mem_mask, flip); break; + case 0x03: gp9001_set_scrolly_and_flip_reg(&vdp->fg, data, mem_mask, flip); break; case 0x04: gp9001_set_scrollx_and_flip_reg(&vdp->top,data, mem_mask, flip); break; - case 0x05: gp9001_set_scrolly_and_flip_reg(&vdp->top,data, mem_mask, flip); break; + case 0x05: gp9001_set_scrolly_and_flip_reg(&vdp->top,data, mem_mask, flip); break; case 0x06: gp9001_set_sprite_scrollx_and_flip_reg(&vdp->sp, data,mem_mask,flip); break; case 0x07: gp9001_set_sprite_scrolly_and_flip_reg(&vdp->sp, data,mem_mask,flip); break; @@ -614,11 +614,11 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1 void gp9001vdp_device::init_scroll_regs() { gp9001_set_scrollx_and_flip_reg(&bg, 0, 0xffff, 0); - gp9001_set_scrolly_and_flip_reg(&bg, 0, 0xffff, 0); + gp9001_set_scrolly_and_flip_reg(&bg, 0, 0xffff, 0); gp9001_set_scrollx_and_flip_reg(&fg, 0, 0xffff, 0); - gp9001_set_scrolly_and_flip_reg(&fg, 0, 0xffff, 0); + gp9001_set_scrolly_and_flip_reg(&fg, 0, 0xffff, 0); gp9001_set_scrollx_and_flip_reg(&top,0, 0xffff, 0); - gp9001_set_scrolly_and_flip_reg(&top,0, 0xffff, 0); + gp9001_set_scrolly_and_flip_reg(&top,0, 0xffff, 0); gp9001_set_sprite_scrollx_and_flip_reg(&sp, 0,0xffff,0); gp9001_set_sprite_scrolly_and_flip_reg(&sp, 0,0xffff,0); } @@ -796,7 +796,7 @@ void gp9001vdp_device::draw_sprites( running_machine *machine, bitmap_t *bitmap, int offs, old_x, old_y; UINT16 *source; - + if (sp.use_sprite_buffer) source=(UINT16 *)(sp.vram16_buffer); else source=(UINT16 *)(sp.vram16); diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index b125ed36a91..281b3387685 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -230,7 +230,7 @@ VIDEO_START(godzilla) +0 ..x..... ........ Flip y ??? +0 ...xxx.. ........ Width: do this many tiles horizontally +0 ......xx x....... Height: do this many tiles vertically - +0 ........ .x...... Tile bank,used in Denjin Makai / extra Priority in Grainbow (to external pin?) + +0 ........ .x...... Tile bank,used in Denjin Makai / extra Priority in Grainbow (to external pin?) +0 ........ ..xxxxxx Color bank +1 xx...... ........ Priority? (1=high?) @@ -261,7 +261,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan { cur_pri = (spriteram16[offs+1] & 0xc000) >> 14; - + if(data & 0x0040) { cur_pri |= 0x4; // definitely seems to be needed by grainbow @@ -272,7 +272,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan // -32 behind mid // -256 behind tx // 0 above all - + // is the low bit REALLY priority? switch (cur_pri) @@ -285,7 +285,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan //case 5: pri_mask = 0; break; case 6: pri_mask = 0; break; // insert coin in gundam //case 7: pri_mask = 0; break; - + default: printf("unhandled pri %d\n",cur_pri); pri_mask=0; } @@ -307,7 +307,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan sprite = spriteram16[offs+1]; sprite &= 0x3fff; - + if (legionna_has_extended_banking) { if(data & 0x0040) diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index 32fbf4a96e5..ab91718edd3 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -278,10 +278,10 @@ static VIDEO_UPDATE( madalien ) draw_foreground(screen->machine, bitmap, cliprect, flip); /* highlight section A (outside of tunnels). - * also, bit 1 of the madalien_video_flags register (6A) is - * combined with the headlight signal through NOR gate 1A, - * which is used to light up the tunnel when an alien explodes - */ + * also, bit 1 of the madalien_video_flags register (6A) is + * combined with the headlight signal through NOR gate 1A, + * which is used to light up the tunnel when an alien explodes + */ if (scroll_mode != 1 || *madalien_video_flags & 2) { int x; diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 124830dab72..94de43f5cdc 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -580,7 +580,7 @@ PALETTE_INIT( blandia ) colortable_entry_set_value(machine->colortable, 0x1a00 + ((color << 6) | pen), 0x400 + pen); } } - + // setup the colortable for the effect palette. // what are used for palette from 0x800 to 0xBFF? for(int i = 0; i < 0x2200; i++) @@ -714,9 +714,9 @@ static void set_pens(running_machine *machine) else palette_set_color(machine, i, color); } - + if(state->paletteram2 != NULL) - { + { for (i = 0; i < state->paletteram2_size / 2; i++) { UINT16 data = state->paletteram2[i]; @@ -934,10 +934,10 @@ static void draw_tilemap_palette_effect(running_machine *machine, bitmap_t *bitm int opaque_mask = gfx_tilemap->color_granularity - 1; int pixel_effect_mask = gfx_tilemap->color_base + (gfx_tilemap->total_colors - 1) * gfx_tilemap->color_granularity; int p; - + width_mask = src_bitmap->width - 1; height_mask = src_bitmap->height - 1; - + for (y = cliprect->min_y; y <= cliprect->max_y; y++) { UINT16 *dest = BITMAP_ADDR16(bitmap, y, 0); @@ -953,7 +953,7 @@ static void draw_tilemap_palette_effect(running_machine *machine, bitmap_t *bitm { p = *BITMAP_ADDR16(src_bitmap, (y - scrolly - 256) & height_mask, (x - scrollx - 512) & width_mask); } - + // draw not transparent pixels if(p & opaque_mask) { @@ -1110,12 +1110,12 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) if (order & 2) // layer-sprite priority? { if (layers_ctrl & 8) draw_sprites(screen->machine,bitmap,cliprect); - + if(order & 4) { popmessage("Missing palette effect. Contact MAMETesters."); } - + if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->tilemap_0, 0, 0); if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->tilemap_1, 0, 0); } @@ -1125,10 +1125,10 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) { popmessage("Missing palette effect. Contact MAMETesters."); } - + if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->tilemap_0, 0, 0); if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->tilemap_1, 0, 0); - + if (layers_ctrl & 8) draw_sprites(screen->machine, bitmap,cliprect); } } @@ -1158,7 +1158,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) { popmessage("Missing palette effect. Contact MAMETesters."); } - + if (state->tilemap_2) { if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->tilemap_2, 0, 0); @@ -1192,7 +1192,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, state->tilemap_3, 0, 0); } } - + if (layers_ctrl & 8) draw_sprites(screen->machine, bitmap,cliprect); } } diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index ee41c48d750..2dac6f01351 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -112,14 +112,14 @@ static void draw_sprite(running_machine *machine, const UINT8 *source, bitmap_t } else { - + /* Chinese Hero */ color >>= 1; - + // It's needed in level 7 to hide "bogus" sprites. Is it a sprite disable flag or an end sprite list flag? if(color == 0) return; - + switch( bank>>2 ) { case 0x0: bank_index = 0; break; @@ -132,7 +132,7 @@ static void draw_sprite(running_machine *machine, const UINT8 *source, bitmap_t } if( bank&0x01 ) tile += 0x40; - + transparent_pen = 7; } @@ -160,7 +160,7 @@ static void draw_sprite(running_machine *machine, const UINT8 *source, bitmap_t xflip,yflip, sx,sy, (width<<16)/16, (height<<16)/16,transparent_pen ); - + // wrap around y drawgfxzoom_transpen( bitmap, diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index bb3c3f2720e..01b7da5b992 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -282,7 +282,7 @@ VIDEO_START( gdfs ) 1c006a-6b fedc ba98 7654 3210 y start visible area 1c006c-6d fedc ba98 7654 3210 y end visible area 1c006e-6f ---- ---- ---- ---- ? 106 for all games - 1c0070-71 fedc ba98 7654 3210 signed y global tilemap x offset + 1c0070-71 fedc ba98 7654 3210 signed y global tilemap x offset 1c0072-73 ---- ---- ---- ---- ? 1c0074-75 ---- ---- ---- ---- ? -e-- ---- ---- ---- y flipscreen @@ -782,7 +782,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta tilemaps_offsy = ((s2[3] & 0x1ff) - (s2[3] & 0x200)); /* Every single sprite is offset by x & yoffs, and additionally - by one of the 8 x & y offsets in the 1c0040-1c005f area */ + by one of the 8 x & y offsets in the 1c0040-1c005f area */ xoffs += ssv_scroll[((mode & 0x00e0) >> 4) + 0x40/2]; yoffs += ssv_scroll[((mode & 0x00e0) >> 4) + 0x42/2]; @@ -906,7 +906,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta { sy = -sy; if (ssv_scroll[0x74/2] & 0x8000) - sy += 0x00; // + sy += 0x00; // else sy -= 0x10; // vasara (hack) } @@ -1087,14 +1087,14 @@ static void gdfs_draw_zooming_sprites(running_machine *machine, bitmap_t *bitmap flipy = (attr & 0x4000); /* - if ((ssv_scroll[0x74/2] & 0x1000) && ((ssv_scroll[0x74/2] & 0x2000) == 0)) - { - if (flipx == 0) flipx = 1; else flipx = 0; - } - if ((ssv_scroll[0x74/2] & 0x4000) && ((ssv_scroll[0x74/2] & 0x2000) == 0)) - { - if (flipy == 0) flipy = 1; else flipy = 0; - } + if ((ssv_scroll[0x74/2] & 0x1000) && ((ssv_scroll[0x74/2] & 0x2000) == 0)) + { + if (flipx == 0) flipx = 1; else flipx = 0; + } + if ((ssv_scroll[0x74/2] & 0x4000) && ((ssv_scroll[0x74/2] & 0x2000) == 0)) + { + if (flipy == 0) flipy = 1; else flipy = 0; + } */ color = (attr & 0x0400) ? attr : attr * 4; diff --git a/src/mame/video/starfire.c b/src/mame/video/starfire.c index 93fbaf1e3cb..1df91557eac 100644 --- a/src/mame/video/starfire.c +++ b/src/mame/video/starfire.c @@ -40,7 +40,7 @@ VIDEO_START( starfire ) WRITE8_HANDLER( starfire_colorram_w ) { starfire_state *state = space->machine->driver_data(); - + /* handle writes to the pseudo-color RAM */ if ((offset & 0xe0) == 0) { @@ -50,10 +50,10 @@ WRITE8_HANDLER( starfire_colorram_w ) int cl = (state->starfire_vidctrl1 & 0x80) ? state->starfire_color : (data & 0x1f); int cr = (data >> 5) | ((offset & 0x100) >> 5); cr |= (state->starfire_vidctrl1 & 0x80) ? (state->starfire_color & 0x10) : (data & 0x10); - + state->starfire_colorram[offset & ~0x100] = cl; state->starfire_colorram[offset | 0x100] = cr; - + state->starfire_color = cl; /* don't modify the palette unless the TRANS bit is set */ @@ -188,7 +188,7 @@ READ8_HANDLER( starfire_videoram_r ) int offset1 = offset & 0x1fff; int offset2 = (offset + 0x100) & 0x1fff; starfire_state *state = space->machine->driver_data(); - + /* selector 6A */ if (offset & 0x2000) sh = (state->starfire_vidctrl >> 1) & 0x07; diff --git a/src/osd/sdl/drawsdl.c b/src/osd/sdl/drawsdl.c index b6c94bf7627..cad3e7aa075 100644 --- a/src/osd/sdl/drawsdl.c +++ b/src/osd/sdl/drawsdl.c @@ -74,7 +74,7 @@ struct _sdl_info struct _sdl_scale_mode { - const char *name; + const char *name; int is_scale; /* Scale mode? */ int is_yuv; /* Yuv mode? */ int mult_w; /* Width multiplier */ diff --git a/src/osd/sdl/sdlos_os2.c b/src/osd/sdl/sdlos_os2.c index fa9e1c11c1a..97a0f8419ac 100644 --- a/src/osd/sdl/sdlos_os2.c +++ b/src/osd/sdl/sdlos_os2.c @@ -258,7 +258,7 @@ osd_directory_entry *osd_stat(const char *path) // create an osd_directory_entry; be sure to make sure that the caller can // free all resources by just freeing the resulting osd_directory_entry - result = (osd_directory_entry *) osd_malloc(sizeof(*result) + strlen(path) + result = (osd_directory_entry *) osd_malloc(sizeof(*result) + strlen(path) 1); strcpy(((char *) result) + sizeof(*result), path); result->name = ((char *) result) + sizeof(*result); diff --git a/src/version.c b/src/version.c index 011e9e3407b..278ed263f53 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.141 ("__DATE__")"; +const char build_version[] = "0.141u1 ("__DATE__")"; -- cgit v1.2.3