diff options
| author | 2007-12-17 16:39:40 +0000 | |
|---|---|---|
| committer | 2007-12-17 16:39:40 +0000 | |
| commit | df34329a478833efbd542a424ce1813a11214d4a (patch) | |
| tree | 97960620a0153b267478c8f9ae93e55582ecaefa /src/emu/cpu/mips | |
| parent | c82a966b3b72d79ac3ce394980d6b5806e752160 (diff) | |
Changes for MAME 0.121u3.mame0121u3
Diffstat (limited to 'src/emu/cpu/mips')
| -rw-r--r-- | src/emu/cpu/mips/dismips.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/mips/mdrc64.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/mips/mips3.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/mips/mips3dsm.c | 10 | ||||
| -rw-r--r-- | src/emu/cpu/mips/mipsdasm.c | 22 | ||||
| -rw-r--r-- | src/emu/cpu/mips/psx.c | 34 | ||||
| -rw-r--r-- | src/emu/cpu/mips/r3kdasm.c | 6 |
7 files changed, 40 insertions, 40 deletions
diff --git a/src/emu/cpu/mips/dismips.c b/src/emu/cpu/mips/dismips.c index 10ce5b89963..1a7a22df27d 100644 --- a/src/emu/cpu/mips/dismips.c +++ b/src/emu/cpu/mips/dismips.c @@ -42,9 +42,9 @@ static struct static UINT8 *filebuf; static UINT32 offset; -static UINT8 order[] = { 0, 1, 2, 3 }; +static const UINT8 order[] = { 0, 1, 2, 3 }; -static char *Options[]= +static const char *const Options[]= { "begin", "end", "offset", "order", "format", "cpu", 0 }; diff --git a/src/emu/cpu/mips/mdrc64.c b/src/emu/cpu/mips/mdrc64.c index c2dca50e074..8d2d42ea1ee 100644 --- a/src/emu/cpu/mips/mdrc64.c +++ b/src/emu/cpu/mips/mdrc64.c @@ -351,7 +351,7 @@ static int compile_store_double_partial(drc_core *drc, compiler_state *compiler, static const UINT8 nvreg[] = { REG_NV0, REG_NV1, REG_NV2, REG_NV3, REG_NV4, REG_NV5, REG_NV6 }; -static const char *x86regname[] = {"rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"}; +static const char *const x86regname[] = {"rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"}; diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c index efec9518412..8fe4f17ea39 100644 --- a/src/emu/cpu/mips/mips3.c +++ b/src/emu/cpu/mips/mips3.c @@ -136,7 +136,7 @@ static void ldr_le(UINT32 op); static void sdl_le(UINT32 op); static void sdr_le(UINT32 op); -static UINT8 fcc_shift[8] = { 23, 25, 26, 27, 28, 29, 30, 31 }; +static const UINT8 fcc_shift[8] = { 23, 25, 26, 27, 28, 29, 30, 31 }; diff --git a/src/emu/cpu/mips/mips3dsm.c b/src/emu/cpu/mips/mips3dsm.c index b7896a9f9cd..a3f4cc6aeb2 100644 --- a/src/emu/cpu/mips/mips3dsm.c +++ b/src/emu/cpu/mips/mips3dsm.c @@ -9,7 +9,7 @@ #include "cpuintrf.h" -static const char *reg[32] = +static const char *const reg[32] = { "0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", @@ -18,7 +18,7 @@ static const char *reg[32] = }; -static const char *cpreg[4][32] = +static const char *const cpreg[4][32] = { { "Index","Random","EntryLo0","EntryLo1","Context","PageMask","Wired","Error", @@ -47,7 +47,7 @@ static const char *cpreg[4][32] = }; -static const char *ccreg[4][32] = +static const char *const ccreg[4][32] = { { "ccr0", "ccr1", "ccr2", "ccr3", "ccr4", "ccr5", "ccr6", "ccr7", @@ -148,7 +148,7 @@ static UINT32 dasm_cop0(UINT32 pc, UINT32 op, char *buffer) static UINT32 dasm_cop1(UINT32 pc, UINT32 op, char *buffer) { - static const char *format_table[] = + static const char *const format_table[] = { "?","?","?","?","?","?","?","?","?","?","?","?","?","?","?","?", "s","d","?","?","w","l","?","?","?","?","?","?","?","?","?","?" @@ -231,7 +231,7 @@ static UINT32 dasm_cop1(UINT32 pc, UINT32 op, char *buffer) static UINT32 dasm_cop1x(UINT32 pc, UINT32 op, char *buffer) { - static const char *format3_table[] = + static const char *const format3_table[] = { "s","d","?","?","w","l","?","?" }; diff --git a/src/emu/cpu/mips/mipsdasm.c b/src/emu/cpu/mips/mipsdasm.c index 10297b8e439..406d4e58a3d 100644 --- a/src/emu/cpu/mips/mipsdasm.c +++ b/src/emu/cpu/mips/mipsdasm.c @@ -21,7 +21,7 @@ static char *make_signed_hex_str_16( UINT32 value ) return s_hex; } -static const char *s_cpugenreg[] = +static const char *const s_cpugenreg[] = { "zero", "at", "v0", "v1", "a0", "a1", "a2", "a3", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", @@ -29,7 +29,7 @@ static const char *s_cpugenreg[] = "t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra" }; -static const char *s_cp0genreg[] = +static const char *const s_cp0genreg[] = { "Index", "Random", "EntryLo", "cp0r3", "Context", "cp0r5", "cp0r6", "cp0r7", "BadVAddr", "cp0r9", "EntryHi", "cp0r11", "SR", "Cause", "EPC", "PRId", @@ -37,7 +37,7 @@ static const char *s_cp0genreg[] = "cp0r24", "cp0r25", "cp0r26", "cp0r27", "cp0r28", "cp0r29", "cp0r30", "cp0r31" }; -static const char *s_cp1genreg[] = +static const char *const s_cp1genreg[] = { "cp1r0", "cp1r1", "cp1r2", "cp1r3", "cp1r4", "cp1r5", "cp1r6", "cp1r7", "cp1r8", "cp1r9", "cp1r10", "cp1r11", "cp1r12", "cp1r13", "cp1r14", "cp1r15", @@ -45,7 +45,7 @@ static const char *s_cp1genreg[] = "cp1r23", "cp1r24", "cp1r25", "cp1r26", "cp1r27", "cp1r28", "cp1r29", "cp1r30" }; -static const char *s_cp1ctlreg[] = +static const char *const s_cp1ctlreg[] = { "cp1cr0", "cp1cr1", "cp1cr2", "cp1cr3", "cp1cr4", "cp1cr5", "cp1cr6", "cp1cr7", "cp1cr8", "cp1cr9", "cp1cr10", "cp1cr11", "cp1cr12", "cp1cr13", "cp1cr14", "cp1cr15", @@ -53,7 +53,7 @@ static const char *s_cp1ctlreg[] = "cp1cr24", "cp1cr25", "cp1cr26", "cp1cr27", "cp1cr28", "cp1cr29", "cp1cr30", "cp1cr31" }; -static const char *s_cp2genreg[] = +static const char *const s_cp2genreg[] = { "vxy0", "vz0", "vxy1", "vz1", "vxy2", "vz2", "rgb", "otz", "ir0", "ir1", "ir2", "ir3", "sxy0", "sxy1", "sxy2", "sxyp", @@ -61,7 +61,7 @@ static const char *s_cp2genreg[] = "mac0", "mac1", "mac2", "mac3", "irgb", "orgb", "lzcs", "lzcr" }; -static const char *s_cp2ctlreg[] = +static const char *const s_cp2ctlreg[] = { "r11r12", "r13r21", "r22r23", "r31r32", "r33", "trx", "try", "trz", "l11l12", "l13l21", "l22l23", "l31l32", "l33", "rbk", "gbk", "bbk", @@ -69,27 +69,27 @@ static const char *s_cp2ctlreg[] = "ofx", "ofy", "h", "dqa", "dqb", "zsf3", "zsf4", "flag" }; -static const char *s_gtesf[] = +static const char *const s_gtesf[] = { "0", "12" }; -static const char *s_gtemx[] = +static const char *const s_gtemx[] = { "rm", "lm", "cm", "0" }; -static const char *s_gtev[] = +static const char *const s_gtev[] = { "v0", "v1", "v2", "ir" }; -static const char *s_gtecv[] = +static const char *const s_gtecv[] = { "tr", "bk", "fc", "0" }; -static const char *s_gtelm[] = +static const char *const s_gtelm[] = { "0", "1" }; diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c index 4b304da268f..fd0c9582c4b 100644 --- a/src/emu/cpu/mips/psx.c +++ b/src/emu/cpu/mips/psx.c @@ -62,7 +62,7 @@ #define CAUSE_CE2 ( 2L << 28 ) #define CAUSE_BD ( 1L << 31 ) -static const char *delayn[] = +static const char *const delayn[] = { "pc", "at", "v0", "v1", "a0", "a1", "a2", "a3", "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", @@ -92,7 +92,7 @@ static mips_cpu_context mipscpu; static int mips_ICount = 0; -static UINT32 mips_mtc0_writemask[]= +static const UINT32 mips_mtc0_writemask[]= { 0xffffffff, /* INDEX */ 0x00000000, /* RANDOM */ @@ -2513,23 +2513,23 @@ static void docop2( int gteop ) UINT16 n_v1; UINT16 n_v2; UINT16 n_v3; - const UINT16 **p_n_mx; - const UINT32 **p_n_cv; + const UINT16 *const *p_n_mx; + const UINT32 *const *p_n_cv; static const UINT16 n_zm = 0; static const UINT32 n_zc = 0; - static const UINT16 *p_n_vx[] = { &VX0, &VX1, &VX2 }; - static const UINT16 *p_n_vy[] = { &VY0, &VY1, &VY2 }; - static const UINT16 *p_n_vz[] = { &VZ0, &VZ1, &VZ2 }; - static const UINT16 *p_n_rm[] = { &R11, &R12, &R13, &R21, &R22, &R23, &R31, &R32, &R33 }; - static const UINT16 *p_n_lm[] = { &L11, &L12, &L13, &L21, &L22, &L23, &L31, &L32, &L33 }; - static const UINT16 *p_n_cm[] = { &LR1, &LR2, &LR3, &LG1, &LG2, &LG3, &LB1, &LB2, &LB3 }; - static const UINT16 *p_n_zm[] = { &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm }; - static const UINT16 **p_p_n_mx[] = { p_n_rm, p_n_lm, p_n_cm, p_n_zm }; - static const UINT32 *p_n_tr[] = { &TRX, &TRY, &TRZ }; - static const UINT32 *p_n_bk[] = { &RBK, &GBK, &BBK }; - static const UINT32 *p_n_fc[] = { &RFC, &GFC, &BFC }; - static const UINT32 *p_n_zc[] = { &n_zc, &n_zc, &n_zc }; - static const UINT32 **p_p_n_cv[] = { p_n_tr, p_n_bk, p_n_fc, p_n_zc }; + static const UINT16 *const p_n_vx[] = { &VX0, &VX1, &VX2 }; + static const UINT16 *const p_n_vy[] = { &VY0, &VY1, &VY2 }; + static const UINT16 *const p_n_vz[] = { &VZ0, &VZ1, &VZ2 }; + static const UINT16 *const p_n_rm[] = { &R11, &R12, &R13, &R21, &R22, &R23, &R31, &R32, &R33 }; + static const UINT16 *const p_n_lm[] = { &L11, &L12, &L13, &L21, &L22, &L23, &L31, &L32, &L33 }; + static const UINT16 *const p_n_cm[] = { &LR1, &LR2, &LR3, &LG1, &LG2, &LG3, &LB1, &LB2, &LB3 }; + static const UINT16 *const p_n_zm[] = { &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm }; + static const UINT16 *const *p_p_n_mx[] = { p_n_rm, p_n_lm, p_n_cm, p_n_zm }; + static const UINT32 *const p_n_tr[] = { &TRX, &TRY, &TRZ }; + static const UINT32 *const p_n_bk[] = { &RBK, &GBK, &BBK }; + static const UINT32 *const p_n_fc[] = { &RFC, &GFC, &BFC }; + static const UINT32 *const p_n_zc[] = { &n_zc, &n_zc, &n_zc }; + static const UINT32 *const *p_p_n_cv[] = { p_n_tr, p_n_bk, p_n_fc, p_n_zc }; switch( GTE_FUNCT( gteop ) ) { diff --git a/src/emu/cpu/mips/r3kdasm.c b/src/emu/cpu/mips/r3kdasm.c index f695fcf7dc4..62c8f250ca4 100644 --- a/src/emu/cpu/mips/r3kdasm.c +++ b/src/emu/cpu/mips/r3kdasm.c @@ -9,7 +9,7 @@ #include "cpuintrf.h" -static const char *reg[32] = +static const char *const reg[32] = { "0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", @@ -18,7 +18,7 @@ static const char *reg[32] = }; -static const char *cpreg[4][32] = +static const char *const cpreg[4][32] = { { "Index","Random","EntryLo","cpr3", "Context", "cpr5", "cpr6", "cpr7", @@ -47,7 +47,7 @@ static const char *cpreg[4][32] = }; -static const char *ccreg[4][32] = +static const char *const ccreg[4][32] = { { "ccr0", "ccr1", "ccr2", "ccr3", "ccr4", "ccr5", "ccr6", "ccr7", |
