diff options
Diffstat (limited to 'src/emu/cpu/z180')
| -rw-r--r-- | src/emu/cpu/z180/z180.c | 12 | ||||
| -rw-r--r-- | src/emu/cpu/z180/z180daa.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/z180/z180dasm.c | 14 | ||||
| -rw-r--r-- | src/emu/cpu/z180/z180tbl.h | 22 |
4 files changed, 25 insertions, 25 deletions
diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index b72dceaafbc..d9ea75f3ff9 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -2589,12 +2589,12 @@ void z180_get_info(UINT32 state, cpuinfo *info) #endif /* MAME_DEBUG */ case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &z180_icount; break; case CPUINFO_PTR_TRANSLATE: info->translate = z180_translate; break; - case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_op: info->p = cc[Z180_TABLE_op]; break; - case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_cb: info->p = cc[Z180_TABLE_cb]; break; - case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ed: info->p = cc[Z180_TABLE_ed]; break; - case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xy: info->p = cc[Z180_TABLE_xy]; break; - case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xycb: info->p = cc[Z180_TABLE_xycb]; break; - case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ex: info->p = cc[Z180_TABLE_ex]; break; + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_op: info->p = (void *)cc[Z180_TABLE_op]; break; + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_cb: info->p = (void *)cc[Z180_TABLE_cb]; break; + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ed: info->p = (void *)cc[Z180_TABLE_ed]; break; + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xy: info->p = (void *)cc[Z180_TABLE_xy]; break; + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_xycb: info->p = (void *)cc[Z180_TABLE_xycb]; break; + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ex: info->p = (void *)cc[Z180_TABLE_ex]; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z180"); break; diff --git a/src/emu/cpu/z180/z180daa.h b/src/emu/cpu/z180/z180daa.h index 44dbbd3bc0b..b4ad6e1521c 100644 --- a/src/emu/cpu/z180/z180daa.h +++ b/src/emu/cpu/z180/z180daa.h @@ -1,4 +1,4 @@ -static UINT16 DAATable[0x800] = { +static const UINT16 DAATable[0x800] = { (0x00<<8) +ZF +VF , (0x01<<8) , (0x02<<8) , diff --git a/src/emu/cpu/z180/z180dasm.c b/src/emu/cpu/z180/z180dasm.c index 8f3dff1874c..493e8a3ba74 100644 --- a/src/emu/cpu/z180/z180dasm.c +++ b/src/emu/cpu/z180/z180dasm.c @@ -61,7 +61,7 @@ enum e_mnemonics { zSLP ,zSRA ,zSRL ,zSUB ,zTST ,zTSTIO ,zXOR }; -static const char *s_mnemonic[] = { +static const char *const s_mnemonic[] = { "adc" ,"add" ,"and" ,"bit" ,"call" ,"ccf" ,"cp" ,"cpd" , "cpdr" ,"cpi" ,"cpir" ,"cpl" ,"daa" ,"db" ,"dec" ,"di" , "djnz" ,"ei" ,"ex" ,"exx" ,"halt" ,"im" ,"in" ,"in0" , @@ -79,7 +79,7 @@ typedef struct { const char *arguments; } z80dasm; -static z80dasm mnemonic_xx_cb[256]= { +static const z80dasm mnemonic_xx_cb[256]= { {zRLC,"b=Y"}, {zRLC,"c=Y"}, {zRLC,"d=Y"}, {zRLC,"e=Y"}, {zRLC,"h=Y"}, {zRLC,"l=Y"}, {zRLC,"Y"}, {zRLC,"a=Y"}, {zRRC,"b=Y"}, {zRRC,"c=Y"}, {zRRC,"d=Y"}, {zRRC,"e=Y"}, @@ -146,7 +146,7 @@ static z80dasm mnemonic_xx_cb[256]= { {zSET,"h=7,Y"}, {zSET,"l=7,Y"}, {zSET,"7,Y"}, {zSET,"a=7,Y"} }; -static z80dasm mnemonic_cb[256] = { +static const z80dasm mnemonic_cb[256] = { {zRLC,"b"}, {zRLC,"c"}, {zRLC,"d"}, {zRLC,"e"}, {zRLC,"h"}, {zRLC,"l"}, {zRLC,"(hl)"}, {zRLC,"a"}, {zRRC,"b"}, {zRRC,"c"}, {zRRC,"d"}, {zRRC,"e"}, @@ -213,7 +213,7 @@ static z80dasm mnemonic_cb[256] = { {zSET,"7,h"}, {zSET,"7,l"}, {zSET,"7,(hl)"},{zSET,"7,a"} }; -static z80dasm mnemonic_ed[256]= { +static const z80dasm mnemonic_ed[256]= { {zIN0,"b,(B)"}, {zOUT0,"(B),b"},{zDB,"?"}, {zDB,"?"}, {zTST,"b"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zIN0,"c,(B)"}, {zOUT0,"(B),c"},{zDB,"?"}, {zDB,"?"}, @@ -280,7 +280,7 @@ static z80dasm mnemonic_ed[256]= { {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"} }; -static z80dasm mnemonic_xx[256]= { +static const z80dasm mnemonic_xx[256]= { {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zADD,"I,bc"}, {zDB,"?"}, {zDB,"?"}, @@ -347,7 +347,7 @@ static z80dasm mnemonic_xx[256]= { {zDB,"?"}, {zDB,"?"}, {zDB,"?"}, {zDB,"?"} }; -static z80dasm mnemonic_main[256]= { +static const z80dasm mnemonic_main[256]= { {zNOP,0}, {zLD,"bc,N"}, {zLD,"(bc),a"}, {zINC,"bc"}, {zINC,"b"}, {zDEC,"b"}, {zLD,"b,B"}, {zRLCA,0}, {zEX,"af,af'"}, {zADD,"hl,bc"}, {zLD,"a,(bc)"}, {zDEC,"bc"}, @@ -430,7 +430,7 @@ static int offs(INT8 offset) ****************************************************************************/ offs_t z180_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram) { - z80dasm *d; + const z80dasm *d; const char *src, *ixy; char *dst; unsigned PC = pc; diff --git a/src/emu/cpu/z180/z180tbl.h b/src/emu/cpu/z180/z180tbl.h index bfd2271aa5f..3598f12a529 100644 --- a/src/emu/cpu/z180/z180tbl.h +++ b/src/emu/cpu/z180/z180tbl.h @@ -1,16 +1,16 @@ #if Z180_EXACT /* tmp1 value for ini/inir/outi/otir for [C.1-0][io.1-0] */ -static UINT8 irep_tmp1[4][4] = { +static const UINT8 irep_tmp1[4][4] = { {0,0,1,0},{0,1,0,1},{1,0,1,1},{0,1,1,0} }; /* tmp1 value for ind/indr/outd/otdr for [C.1-0][io.1-0] */ -static UINT8 drep_tmp1[4][4] = { +static const UINT8 drep_tmp1[4][4] = { {0,1,0,0},{1,0,0,1},{0,0,1,0},{0,1,0,1} }; /* tmp2 value for all in/out repeated opcodes for B.7-0 */ -static UINT8 breg_tmp2[256] = { +static const UINT8 breg_tmp2[256] = { 0,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1, 0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0, 1,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0, @@ -30,7 +30,7 @@ static UINT8 breg_tmp2[256] = { }; #endif -static UINT8 cc_op[0x100] = { +static const UINT8 cc_op[0x100] = { /*-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -a -b -c -d -e -f */ 3, 9, 7, 4, 4, 4, 6, 3, 4, 7, 6, 4, 4, 4, 6, 3, 7, 9, 7, 4, 4, 4, 6, 3, 8, 7, 6, 4, 4, 4, 6, 3, @@ -50,7 +50,7 @@ static UINT8 cc_op[0x100] = { 5, 9, 6, 3, 6,11, 6,11, 5, 4, 6, 3, 6, 0, 6,11 }; -static UINT8 cc_cb[0x100] = { +static const UINT8 cc_cb[0x100] = { /*-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -a -b -c -d -e -f */ 7, 7, 7, 7, 7, 7,13, 7, 7, 7, 7, 7, 7, 7,13, 7, 7, 7, 7, 7, 7, 7,13, 7, 7, 7, 7, 7, 7, 7,13, 7, @@ -70,7 +70,7 @@ static UINT8 cc_cb[0x100] = { 7, 7, 7, 7, 7, 7,13, 7, 7, 7, 7, 7, 7, 7,13, 7 }; -static UINT8 cc_ed[0x100] = { +static const UINT8 cc_ed[0x100] = { /*-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -a -b -c -d -e -f */ 12,13, 6, 6, 9, 6, 6, 6,12,13, 6, 6, 9, 6, 6, 6, 12,13, 6, 6, 9, 6, 6, 6,12,13, 6, 6, 9, 6, 6, 6, @@ -90,7 +90,7 @@ static UINT8 cc_ed[0x100] = { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 }; -static UINT8 cc_xy[0x100] = { +static const UINT8 cc_xy[0x100] = { /*-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -a -b -c -d -e -f */ 4, 4, 4, 4, 4, 4, 4, 4, 4,10, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,10, 4, 4, 4, 4, 4, 4, @@ -110,7 +110,7 @@ static UINT8 cc_xy[0x100] = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4 }; -static UINT8 cc_xycb[0x100] = { +static const UINT8 cc_xycb[0x100] = { /*-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -a -b -c -d -e -f */ 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, @@ -131,7 +131,7 @@ static UINT8 cc_xycb[0x100] = { }; /* extra cycles if jr/jp/call taken and 'interrupt latency' on rst 0-7 */ -static UINT8 cc_ex[0x100] = { +static const UINT8 cc_ex[0x100] = { /*-0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -a -b -c -d -e -f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* DJNZ */ @@ -151,7 +151,7 @@ static UINT8 cc_ex[0x100] = { 5, 0, 3, 0,10, 0, 0, 2, 5, 0, 3, 0,10, 0, 0, 2 }; -static UINT8 *cc[6] = { cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex }; +static const UINT8 *cc[6] = { cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex }; #define Z180_TABLE_dd Z180_TABLE_xy #define Z180_TABLE_fd Z180_TABLE_xy @@ -222,7 +222,7 @@ static void take_interrupt(int irqline); INLINE void prefix##_f4(void); INLINE void prefix##_f5(void); INLINE void prefix##_f6(void); INLINE void prefix##_f7(void); \ INLINE void prefix##_f8(void); INLINE void prefix##_f9(void); INLINE void prefix##_fa(void); INLINE void prefix##_fb(void); \ INLINE void prefix##_fc(void); INLINE void prefix##_fd(void); INLINE void prefix##_fe(void); INLINE void prefix##_ff(void); \ -static void (*tablename[0x100])(void) = { \ +static void (*const tablename[0x100])(void) = { \ prefix##_00,prefix##_01,prefix##_02,prefix##_03,prefix##_04,prefix##_05,prefix##_06,prefix##_07, \ prefix##_08,prefix##_09,prefix##_0a,prefix##_0b,prefix##_0c,prefix##_0d,prefix##_0e,prefix##_0f, \ prefix##_10,prefix##_11,prefix##_12,prefix##_13,prefix##_14,prefix##_15,prefix##_16,prefix##_17, \ |
