From 4b7dd3cd0de9a22407105730d933383bc78f96a6 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 23 Apr 2009 05:44:35 +0000 Subject: Cleanups and version bump for 0.131. --- src/emu/cpu/tlcs900/900tbl.c | 48 +++++++------- src/emu/cpu/tlcs900/dasm900.c | 34 +++++----- src/emu/video/tms9927.c | 40 ++++++------ src/mame/drivers/atarigt.c | 10 +-- src/mame/drivers/roul.c | 4 +- src/mame/drivers/statriv2.c | 148 +++++++++++++++++++++--------------------- src/mame/drivers/triforce.c | 20 +++--- src/mame/machine/konamigx.c | 8 +-- src/version.c | 2 +- 9 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/emu/cpu/tlcs900/900tbl.c b/src/emu/cpu/tlcs900/900tbl.c index c745f684ce1..743a7c0551f 100644 --- a/src/emu/cpu/tlcs900/900tbl.c +++ b/src/emu/cpu/tlcs900/900tbl.c @@ -226,7 +226,7 @@ INLINE UINT32 *get_reg32_current( tlcs900_state *cpustate, UINT8 reg ) return &cpustate->xiz.d; /* XSP */ - case 7: + case 7: /* TODO: Add selector for user/system stack pointer */ return &cpustate->xssp.d; } @@ -1165,18 +1165,18 @@ INLINE UINT32 div16( tlcs900_state *cpustate, UINT32 a, UINT16 b ) return ( a << 16 ) | ( ( a >> 16 ) ^ 0xffff ); } -// if ( a >= ( 0x02000000 * b ) ) { -// UINT32 diff = a - ( 0x02000000 * b ); -// UINT32 range = 0x1000000 - b; +// if ( a >= ( 0x02000000 * b ) ) { +// UINT32 diff = a - ( 0x02000000 * b ); +// UINT32 range = 0x1000000 - b; // -// result = ldiv( diff, range ); -// result.quot = 0x1ffffff - result.quot; -// result.rem = result.rem + b; -// } -// else -// { +// result = ldiv( diff, range ); +// result.quot = 0x1ffffff - result.quot; +// result.rem = result.rem + b; +// } +// else +// { result = ldiv( a, b ); -// } +// } if ( result.quot > 0xffff ) cpustate->sr.b.l |= FLAG_VF; @@ -3851,7 +3851,7 @@ static void _ZCF(tlcs900_state *cpustate) } -typedef struct +typedef struct { void (*opfunc)(tlcs900_state *cpustate); int operand1; @@ -4161,7 +4161,7 @@ static const tlcs900inst mnemonic_80[256] = { _ANDBMI, _M, _I8, 7 }, { _XORBMI, _M, _I8, 7 }, { _ORBMI, _M, _I8, 7 }, { _CPBMI, _M, _I8, 6 }, /* 40 - 5F */ - { _MULBRM, _MC16, _M, 18}, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, + { _MULBRM, _MC16, _M, 18}, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18}, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, @@ -4245,7 +4245,7 @@ static const tlcs900inst mnemonic_88[256] = { _ANDBMI, _M, _I8, 7 }, { _XORBMI, _M, _I8, 7 }, { _ORBMI, _M, _I8, 7 }, { _CPBMI, _M, _I8, 6 }, /* 40 - 5F */ - { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, + { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, @@ -4329,7 +4329,7 @@ static const tlcs900inst mnemonic_90[256] = { _ANDWMI, _M, _I16, 8 }, { _XORWMI, _M, _I16, 8 }, { _ORWMI, _M, _I16, 8 }, { _CPWMI, _M, _I16, 6 }, /* 40 - 5F */ - { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, + { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, @@ -4413,7 +4413,7 @@ static const tlcs900inst mnemonic_98[256] = { _ANDWMI, _M, _I16, 8 }, { _XORWMI, _M, _I16, 8 }, { _ORWMI, _M, _I16, 8 }, { _CPWMI, _M, _I16, 6 }, /* 40 - 5F */ - { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, + { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, @@ -4623,7 +4623,7 @@ static const tlcs900inst mnemonic_b0[256] = /* C0 - DF */ { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, - { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, + { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, @@ -4707,7 +4707,7 @@ static const tlcs900inst mnemonic_b8[256] = /* C0 - DF */ { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, - { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, + { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _BITBIM, _I3, _M, 8 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, @@ -4749,7 +4749,7 @@ static const tlcs900inst mnemonic_c0[256] = { _ANDBMI, _M, _I8, 7 }, { _XORBMI, _M, _I8, 7 }, { _ORBMI, _M, _I8, 7 }, { _CPBMI, _M, _I8, 6 }, /* 40 - 5F */ - { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, + { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, { _MULSBRM, _MC16, _M, 18 }, @@ -4858,7 +4858,7 @@ static const tlcs900inst mnemonic_c8[256] = { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _LDBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, - { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, + { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _ADCBRR, _C8, _R, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, { _LDBRR, _R, _C8, 4 }, @@ -4917,7 +4917,7 @@ static const tlcs900inst mnemonic_d0[256] = { _ANDWMI, _M, _I16, 8 }, { _XORWMI, _M, _I16, 8 }, { _ORWMI, _M, _I16, 8 }, { _CPWMI, _M, _I16, 6 }, /* 40 - 5F */ - { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, + { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, { _MULSWRM, _C32, _M, 26 }, @@ -5026,7 +5026,7 @@ static const tlcs900inst mnemonic_d8[256] = { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _LDWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, - { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, + { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _ADCWRR, _C16, _R, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, { _LDWRR, _R, _C16, 4 }, @@ -5194,7 +5194,7 @@ static const tlcs900inst mnemonic_e8[256] = { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _LDLRR, _C32, _R, 4 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, - { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, + { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _ADCLRR, _C32, _R, 7 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, { _LDLRR, _R, _C32, 4 }, @@ -5295,7 +5295,7 @@ static const tlcs900inst mnemonic_f0[256] = /* C0 - DF */ { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, { _CHGBIM, _I3, _M, 8 }, - { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, + { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _BITBIM, _I3, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, { _JPM, _CC, _M, 4 }, diff --git a/src/emu/cpu/tlcs900/dasm900.c b/src/emu/cpu/tlcs900/dasm900.c index e9202274070..97bc94585a4 100644 --- a/src/emu/cpu/tlcs900/dasm900.c +++ b/src/emu/cpu/tlcs900/dasm900.c @@ -88,7 +88,7 @@ enum e_operand }; -typedef struct +typedef struct { int mnemonic; int operand1; @@ -119,7 +119,7 @@ static const tlcs900inst mnemonic_80[256] = { _AND, _M, _I8 }, { _XOR, _M, _I8 }, { _OR, _M, _I8 }, { _CP, _M, _I8 }, /* 40 - 5F */ - { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, + { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, @@ -203,7 +203,7 @@ static const tlcs900inst mnemonic_88[256] = { _AND, _M, _I8 }, { _XOR, _M, _I8 }, { _OR, _M, _I8 }, { _CP, _M, _I8 }, /* 40 - 5F */ - { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, + { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, @@ -287,7 +287,7 @@ static const tlcs900inst mnemonic_90[256] = { _AND, _M, _I16 }, { _XOR, _M, _I16 }, { _OR, _M, _I16 }, { _CP, _M, _I16 }, /* 40 - 5F */ - { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, + { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, @@ -371,7 +371,7 @@ static const tlcs900inst mnemonic_98[256] = { _AND, _M, _I16 }, { _XOR, _M, _I16 }, { _OR, _M, _I16 }, { _CP, _M, _I16 }, /* 40 - 5F */ - { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, + { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, @@ -581,7 +581,7 @@ static const tlcs900inst mnemonic_b0[256] = /* C0 - DF */ { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, - { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, + { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, @@ -665,7 +665,7 @@ static const tlcs900inst mnemonic_b8[256] = /* C0 - DF */ { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, - { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, + { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, @@ -707,7 +707,7 @@ static const tlcs900inst mnemonic_c0[256] = { _AND, _M, _I8 }, { _XOR, _M, _I8 }, { _OR, _M, _I8 }, { _CP, _M, _I8 }, /* 40 - 5F */ - { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, + { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MUL, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, { _MULS, _MC16, _M }, @@ -817,7 +817,7 @@ static const tlcs900inst mnemonic_c8[256] = { _LD, _C8, _R }, { _LD, _C8, _R }, { _LD, _C8, _R }, { _LD, _C8, _R }, { _LD, _C8, _R }, { _LD, _C8, _R }, { _LD, _C8, _R }, { _LD, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, - { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, + { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _ADC, _C8, _R }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, { _LD, _R, _C8 }, @@ -876,7 +876,7 @@ static const tlcs900inst mnemonic_d0[256] = { _AND, _M, _I16 }, { _XOR, _M, _I16 }, { _OR, _M, _I16 }, { _CP, _M, _I16 }, /* 40 - 5F */ - { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, + { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MUL, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, { _MULS, _C32, _M }, @@ -985,7 +985,7 @@ static const tlcs900inst mnemonic_d8[256] = { _LD, _C16, _R }, { _LD, _C16, _R }, { _LD, _C16, _R }, { _LD, _C16, _R }, { _LD, _C16, _R }, { _LD, _C16, _R }, { _LD, _C16, _R }, { _LD, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, - { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, + { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _ADC, _C16, _R }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, { _LD, _R, _C16 }, @@ -1153,7 +1153,7 @@ static const tlcs900inst mnemonic_e8[256] = { _LD, _C32, _R }, { _LD, _C32, _R }, { _LD, _C32, _R }, { _LD, _C32, _R }, { _LD, _C32, _R }, { _LD, _C32, _R }, { _LD, _C32, _R }, { _LD, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, - { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, + { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _ADC, _C32, _R }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, { _LD, _R, _C32 }, @@ -1254,7 +1254,7 @@ static const tlcs900inst mnemonic_f0[256] = /* C0 - DF */ { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, { _CHG, _I3, _M }, - { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, + { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _BIT, _I3, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, { _JP, _CC, _M }, @@ -1948,7 +1948,7 @@ CPU_DISASSEMBLE( tlcs900 ) case _CR32: imm = oprom[ pos++ ]; switch( imm ) - { + { case 0x00: dst += sprintf( dst, " DMAS0" ); break; @@ -1965,7 +1965,7 @@ CPU_DISASSEMBLE( tlcs900 ) dst += sprintf( dst, " DMAD0" ); break; case 0x14: - dst += sprintf( dst, " DMAD1" ); + dst += sprintf( dst, " DMAD1" ); break; case 0x18: dst += sprintf( dst, " DMAD2" ); @@ -1976,7 +1976,7 @@ CPU_DISASSEMBLE( tlcs900 ) default: dst += sprintf( dst, " unknown" ); break; - } + } break; case _D8: @@ -2148,7 +2148,7 @@ CPU_DISASSEMBLE( tlcs900 ) dst += sprintf( dst, ",DMAD0" ); break; case 0x14: - dst += sprintf( dst, ",DMAD1" ); + dst += sprintf( dst, ",DMAD1" ); break; case 0x18: dst += sprintf( dst, ",DMAD2" ); diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c index 461ebf0b739..ff1608561c2 100644 --- a/src/emu/video/tms9927.c +++ b/src/emu/video/tms9927.c @@ -86,7 +86,7 @@ static void generic_access(const device_config *device, offs_t offset) if (tms->selfload != NULL) { int cur; - + for (cur = 0; cur < 7; cur++) tms9927_w(device, cur, tms->selfload[cur]); for (cur = 0; cur < 1; cur++) @@ -94,12 +94,12 @@ static void generic_access(const device_config *device, offs_t offset) } else popmessage("tms9927: self-load initiated with no PROM!"); - + /* processor self-load waits with reset enabled; - non-processor just goes ahead */ + non-processor just goes ahead */ tms->reset = (offset == 0x07); break; - + case 0x0a: /* Reset */ if (!tms->reset) { @@ -107,13 +107,13 @@ static void generic_access(const device_config *device, offs_t offset) tms->reset = TRUE; } break; - + case 0x0b: /* Up scroll */ mame_printf_debug("Up scroll\n"); video_screen_update_now(tms->screen); tms->start_datarow = (tms->start_datarow + 1) % DATA_ROWS_PER_FRAME(tms); break; - + case 0x0e: /* Start timing chain */ if (tms->reset) { @@ -129,7 +129,7 @@ mame_printf_debug("Up scroll\n"); WRITE8_DEVICE_HANDLER( tms9927_w ) { tms9927_state *tms = get_safe_token(device); - + switch (offset) { case 0x00: /* HORIZONTAL CHARACTER COUNT */ @@ -142,7 +142,7 @@ WRITE8_DEVICE_HANDLER( tms9927_w ) tms->reg[offset] = data; recompute_parameters(tms, FALSE); break; - + case 0x0c: /* LOAD CURSOR CHARACTER ADDRESS */ case 0x0d: /* LOAD CURSOR ROW ADDRESS */ mame_printf_debug("Cursor address changed\n"); @@ -160,13 +160,13 @@ mame_printf_debug("Cursor address changed\n"); READ8_DEVICE_HANDLER( tms9927_r ) { tms9927_state *tms = get_safe_token(device); - + switch (offset) { case 0x08: /* READ CURSOR CHARACTER ADDRESS */ case 0x09: /* READ CURSOR ROW ADDRESS */ return tms->reg[offset - 0x08 + 7]; - + default: generic_access(device, offset); break; @@ -194,7 +194,7 @@ int tms9927_cursor_bounds(const device_config *device, rectangle *bounds) tms9927_state *tms = get_safe_token(device); int cursorx = CURSOR_CHAR_ADDRESS(tms); int cursory = CURSOR_ROW_ADDRESS(tms); - + bounds->min_x = cursorx * tms->hpixels_per_column; bounds->max_x = bounds->min_x + tms->hpixels_per_column - 1; bounds->min_y = cursory * SCANS_PER_DATA_ROW(tms); @@ -209,24 +209,24 @@ static void recompute_parameters(tms9927_state *tms, int postload) UINT16 offset_hpix, offset_vpix; attoseconds_t refresh; rectangle visarea; - + if (tms->intf == NULL || tms->reset) return; /* compute the screen sizes */ tms->total_hpix = HCOUNT(tms) * tms->hpixels_per_column; tms->total_vpix = SCAN_LINES_PER_FRAME(tms); - + /* determine the visible area, avoid division by 0 */ tms->visible_hpix = CHARS_PER_DATA_ROW(tms) * tms->hpixels_per_column; tms->visible_vpix = (LAST_DISP_DATA_ROW(tms) + 1) * SCANS_PER_DATA_ROW(tms); - + /* determine the horizontal/vertical offsets */ offset_hpix = HSYNC_DELAY(tms) * tms->hpixels_per_column; offset_vpix = VERTICAL_DATA_START(tms); mame_printf_debug("TMS9937: Total = %dx%d, Visible = %dx%d, Offset=%dx%d, Skew=%d\n", tms->total_hpix, tms->total_vpix, tms->visible_hpix, tms->visible_vpix, offset_hpix, offset_vpix, SKEW_BITS(tms)); - + /* see if it all makes sense */ tms->valid_config = TRUE; if (tms->visible_hpix > tms->total_hpix || tms->visible_vpix > tms->total_vpix) @@ -234,11 +234,11 @@ static void recompute_parameters(tms9927_state *tms, int postload) tms->valid_config = FALSE; logerror("tms9927: invalid visible size (%dx%d) versus total size (%dx%d)\n", tms->visible_hpix, tms->visible_vpix, tms->total_hpix, tms->total_vpix); } - + /* update */ if (!tms->valid_config) return; - + /* create a visible area */ /* fix me: how do the offsets fit in here? */ visarea.min_x = 0; @@ -247,7 +247,7 @@ static void recompute_parameters(tms9927_state *tms, int postload) visarea.max_y = tms->visible_vpix - 1; refresh = HZ_TO_ATTOSECONDS(tms->clock) * tms->total_hpix * tms->total_vpix; - + video_screen_configure(tms->screen, tms->total_hpix, tms->total_vpix, &visarea, refresh); } @@ -260,7 +260,7 @@ static DEVICE_START( tms9927 ) /* validate arguments */ assert(device != NULL); assert(device->tag != NULL); - + tms->intf = (const tms9927_interface *)device->static_config; if (tms->intf != NULL) @@ -275,7 +275,7 @@ static DEVICE_START( tms9927 ) /* get the screen device */ tms->screen = devtag_get_device(device->machine, tms->intf->screen_tag); assert(tms->screen != NULL); - + /* get the self-load PROM */ if (tms->intf->selfload_region != NULL) { diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 211f72ab9a3..896dffc4b66 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -279,11 +279,11 @@ static void tmek_update_mode(offs_t offset) static void tmek_protection_w(const address_space *space, offs_t offset, UINT16 data) { /* - T-Mek init: - ($387C0) = $0001 - Read ($38010), add to memory - Write $3C0 bytes to low half of words from $38000-$3877E - Read ($38488) + T-Mek init: + ($387C0) = $0001 + Read ($38010), add to memory + Write $3C0 bytes to low half of words from $38000-$3877E + Read ($38488) */ if (LOG_PROTECTION) logerror("%06X:Protection W@%06X = %04X\n", cpu_get_previouspc(space->cpu), offset, data); diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c index 83036f9ef74..54a0e2dce50 100644 --- a/src/mame/drivers/roul.c +++ b/src/mame/drivers/roul.c @@ -90,8 +90,8 @@ code check bit 6 and bit 7 bit 7 -> blitter ready bit 6 -> ??? (after unknown blitter command : [80][80][08][02]) */ -// return 0x80; // blitter ready -// logerror("Read unknown port $f5 at %04x\n",cpu_get_pc(space->cpu)); +// return 0x80; // blitter ready +// logerror("Read unknown port $f5 at %04x\n",cpu_get_pc(space->cpu)); return mame_rand(space->machine) & 0x00c0; } diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 19adcf11a1d..321aae6056b 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -59,7 +59,7 @@ PROM use is unknown Issues: * statusbj - very glitchy, bad video, seems to spin * hangman - keys are weird, spinner is busted - * + * quaquiz2 - no inputs, needs NVRAM */ @@ -178,7 +178,7 @@ static VIDEO_UPDATE( statriv2 ) static INTERRUPT_GEN( statriv2_interrupt ) { UINT8 new_coin = input_port_read(device->machine, "COIN"); - + /* check the coin inputs once per frame */ latched_coin |= new_coin & (new_coin ^ last_coin); last_coin = new_coin; @@ -200,7 +200,7 @@ static READ8_HANDLER( question_data_r ) const UINT8 *qrom = memory_region(space->machine, "questions"); UINT32 qromsize = memory_region_length(space->machine, "questions"); UINT32 address; - + if (question_offset_high == 0xff) question_offset[question_offset_low]++; @@ -315,7 +315,7 @@ static INPUT_PORTS_START( statusbj ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_5C ) ) -// PORT_DIPSETTING( 0x30, DEF_STR( 1C_5C ) ) +// PORT_DIPSETTING( 0x30, DEF_STR( 1C_5C ) ) PORT_DIPNAME( 0x40, 0x40, "DIP switch?" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) @@ -323,7 +323,7 @@ static INPUT_PORTS_START( statusbj ) PORT_START("IN2") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("COIN") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) INPUT_PORTS_END @@ -359,7 +359,7 @@ static INPUT_PORTS_START( funcsino ) PORT_START("IN2") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("COIN") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) INPUT_PORTS_END @@ -398,7 +398,7 @@ static INPUT_PORTS_START( hangman ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("COIN") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) INPUT_PORTS_END @@ -435,7 +435,7 @@ static INPUT_PORTS_START( statriv2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("COIN") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) INPUT_PORTS_END @@ -465,10 +465,10 @@ static INPUT_PORTS_START( quaquiz2 ) PORT_INCLUDE(supertr2) PORT_MODIFY("IN0") -// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(1) PORT_NAME("Button A") -// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_IMPULSE(1) PORT_NAME("Button B") -// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_IMPULSE(1) PORT_NAME("Button C") -// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_IMPULSE(1) PORT_NAME("Button D") +// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(1) PORT_NAME("Button A") +// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_IMPULSE(1) PORT_NAME("Button B") +// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_IMPULSE(1) PORT_NAME("Button C") +// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_IMPULSE(1) PORT_NAME("Button D") PORT_DIPNAME( 0x80, 0x00, "Port $20 bit 7" ) // coin3? if off it doesn't boot PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -490,7 +490,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( sextriv ) PORT_INCLUDE(statriv2) - + PORT_MODIFY("IN1") PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) @@ -982,71 +982,71 @@ static DRIVER_INIT( addr_lmh ) static DRIVER_INIT( addr_lmhe ) { /***************************************************\ - * * - * Super Trivia has some really weird protection on * - * its question data. For some odd reason, the data * - * itself is stored normally. Just load the ROMs up * - * in a hex editor and OR everything with 0x40 to * - * get normal text. However, the game itself expects * - * different data than what the question ROMs * - * contain. Here is some pseudocode for what the * - * game does for each character: * - * * - * GetCharacter: * - * In A,($28) // Read character in * - * Invert A // Invert the bits * - * AND A,$1F // Put low 5 bits of * - * B = Low 8 bits of addy // addy into high 8 * - * C = 0 // bits of BC pair * - * Call ArcaneFormula(BC) // Get XOR value * - * XOR A,C // Apply it * - * Return * - * * - * ArcaneFormula(BC): * - * ShiftR BC,1 * - * DblShiftR BC,1 * - * DblShiftR BC,1 * - * DblShiftR BC,1 * - * ShiftR BC,1 * - * Return * - * * - * Essentially what ArcaneFormula does is to "fill * - * out" an entire 8 bit number from only five bits. * - * The way it does this is by putting bit 0 of the 5 * - * bits into bit 0 of the 8 bits, putting bit 1 into * - * bits 1 and 2, bit 2 into bits 3 and 4, bit 3 into * - * bits 5 and 6, and finally, bit 4 into bit * - * position 7 of the 8-bit number. For example, for * - * a value of FA, these would be the steps to get * - * the XOR value: * - * * - * Address XOR val * - * 1: Take original number 11111010 00000000 * - * 2: AND with 0x1F 00011010 00000000 * - * 3: Put bit 0 in bit 0 0001101- 00000000 * - * 4: Double bit 1 in bits 1,2 000110-0 00000110 * - * 5: Double bit 2 in bits 3,4 00011-10 00000110 * - * 6: Double bit 3 in bits 5,6 0001-010 01100110 * - * 7: Put bit 4 in bit 7 000-1010 11100110 * - * * - * Since XOR operations are symmetrical, to make the * - * game end up receiving the correct value one only * - * needs to invert the value and XOR it with the * - * value derived from its address. The game will * - * then de-invert the value when it tries to invert * - * it, re-OR the value when it tries to XOR it, and * - * we wind up with nice, working questions. If * - * anyone can figure out a way to simplify the * - * formula I'm using, PLEASE DO SO! * - * * - * - MooglyGuy * - * * - \***************************************************/ + * * + * Super Trivia has some really weird protection on * + * its question data. For some odd reason, the data * + * itself is stored normally. Just load the ROMs up * + * in a hex editor and OR everything with 0x40 to * + * get normal text. However, the game itself expects * + * different data than what the question ROMs * + * contain. Here is some pseudocode for what the * + * game does for each character: * + * * + * GetCharacter: * + * In A,($28) // Read character in * + * Invert A // Invert the bits * + * AND A,$1F // Put low 5 bits of * + * B = Low 8 bits of addy // addy into high 8 * + * C = 0 // bits of BC pair * + * Call ArcaneFormula(BC) // Get XOR value * + * XOR A,C // Apply it * + * Return * + * * + * ArcaneFormula(BC): * + * ShiftR BC,1 * + * DblShiftR BC,1 * + * DblShiftR BC,1 * + * DblShiftR BC,1 * + * ShiftR BC,1 * + * Return * + * * + * Essentially what ArcaneFormula does is to "fill * + * out" an entire 8 bit number from only five bits. * + * The way it does this is by putting bit 0 of the 5 * + * bits into bit 0 of the 8 bits, putting bit 1 into * + * bits 1 and 2, bit 2 into bits 3 and 4, bit 3 into * + * bits 5 and 6, and finally, bit 4 into bit * + * position 7 of the 8-bit number. For example, for * + * a value of FA, these would be the steps to get * + * the XOR value: * + * * + * Address XOR val * + * 1: Take original number 11111010 00000000 * + * 2: AND with 0x1F 00011010 00000000 * + * 3: Put bit 0 in bit 0 0001101- 00000000 * + * 4: Double bit 1 in bits 1,2 000110-0 00000110 * + * 5: Double bit 2 in bits 3,4 00011-10 00000110 * + * 6: Double bit 3 in bits 5,6 0001-010 01100110 * + * 7: Put bit 4 in bit 7 000-1010 11100110 * + * * + * Since XOR operations are symmetrical, to make the * + * game end up receiving the correct value one only * + * needs to invert the value and XOR it with the * + * value derived from its address. The game will * + * then de-invert the value when it tries to invert * + * it, re-OR the value when it tries to XOR it, and * + * we wind up with nice, working questions. If * + * anyone can figure out a way to simplify the * + * formula I'm using, PLEASE DO SO! * + * * + * - MooglyGuy * + * * + \***************************************************/ UINT8 *qrom = memory_region(machine, "questions"); UINT32 length = memory_region_length(machine, "questions"); UINT32 address; - + for (address = 0; address < length; address++) qrom[address] ^= BITSWAP8(address, 4,3,3,2,2,1,1,0); diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c index 60ba2f0e44a..cbc7c8f0f92 100644 --- a/src/mame/drivers/triforce.c +++ b/src/mame/drivers/triforce.c @@ -74,7 +74,7 @@ ROM_END ROM_START( vs2002j ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? DISK_REGION( "gdrom" ) @@ -103,7 +103,7 @@ PIC ROM_START( vs2002ex ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -117,7 +117,7 @@ ROM_END ROM_START( avalons ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -131,7 +131,7 @@ ROM_END ROM_START( gekpurya ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -145,7 +145,7 @@ ROM_END ROM_START( tfupdate ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -183,7 +183,7 @@ PIC ROM_START( vs4 ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -215,7 +215,7 @@ PIC ROM_START( vs4j ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -248,7 +248,7 @@ track03.bin 45150 549299 1185760800 ROM_START( avalon13 ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -282,7 +282,7 @@ track03.bin 45150 549299 1185760800 ROM_START( avalon20 ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? @@ -296,7 +296,7 @@ ROM_END ROM_START( vs42006 ) TRIFORCE_BIOS - + ROM_REGION( 0x20000000, "user1", ROMREGION_ERASE) // allocate max size in init instead? diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c index 7259254344f..86bb223b678 100644 --- a/src/mame/machine/konamigx.c +++ b/src/mame/machine/konamigx.c @@ -2117,14 +2117,14 @@ WRITE32_HANDLER(fantjour_dma_w) COMBINE_DATA(fantjour_dma + offset); if(!offset && ACCESSING_BITS_24_31) { UINT32 sa = fantjour_dma[1]; - // UINT16 ss = (fantjour_dma[2] & 0xffff0000) >> 16; - // UINT32 sb = ((fantjour_dma[2] & 0xffff) << 16) | ((fantjour_dma[3] & 0xffff0000) >> 16); + // UINT16 ss = (fantjour_dma[2] & 0xffff0000) >> 16; + // UINT32 sb = ((fantjour_dma[2] & 0xffff) << 16) | ((fantjour_dma[3] & 0xffff0000) >> 16); UINT32 da = ((fantjour_dma[3] & 0xffff) << 16) | ((fantjour_dma[4] & 0xffff0000) >> 16); - // UINT16 ds = fantjour_dma[4] & 0xffff; + // UINT16 ds = fantjour_dma[4] & 0xffff; UINT32 db = fantjour_dma[5]; - // UINT8 sz1 = fantjour_dma[0] >> 8; + // UINT8 sz1 = fantjour_dma[0] >> 8; UINT8 sz2 = fantjour_dma[0] >> 16; UINT8 mode = fantjour_dma[0] >> 24; diff --git a/src/version.c b/src/version.c index ab13aec681d..fb0a143f68b 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.130u4 ("__DATE__")"; +const char build_version[] = "0.131 ("__DATE__")"; -- cgit v1.2.3