Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

(nw) fix lots of inadverently mutable static pointers

Browse Source
This commit is contained in:
Vas Crabb 2018-09-20 11:42:37 +10:00
parent 82a3d44cbe
commit 2993e850bb
74 changed files with 238 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/hexbus/hx5102.cpp
View File

@ -151,7 +151,7 @@ hx5102_device::hx5102_device(const machine_config &mconfig, const char *tag, dev
WRITE8_MEMBER( hx5102_device::external_operation ) WRITE8_MEMBER( hx5102_device::external_operation )
{ {
static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" }; static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
if (offset != IDLE_OP) LOGMASKED(LOG_WARN, "External operation %s not implemented on HX5102 board\n", extop[offset]); if (offset != IDLE_OP) LOGMASKED(LOG_WARN, "External operation %s not implemented on HX5102 board\n", extop[offset]);
} }

4
src/devices/cpu/alto2/a2disk.cpp
View File

@ -89,8 +89,8 @@ enum {
#if ALTO2_DEBUG #if ALTO2_DEBUG
/** @brief human readable names for the KADR<- modes */ /** @brief human readable names for the KADR<- modes */
static const char *rwc_name[4] = {"read", "check", "write", "write2"}; static char const *const rwc_name[4] = {"read", "check", "write", "write2"};
static const char* raise_lower[2] = {"/","\\"}; static char const *const raise_lower[2] = {"/","\\"};
#endif #endif
/** /**

4
src/devices/cpu/alto2/a2emu.cpp
View File

@ -489,8 +489,8 @@ void alto2_cpu_device::f2_early_acdest()
#if ALTO2_DEBUG #if ALTO2_DEBUG
void alto2_cpu_device::bitblt_info() void alto2_cpu_device::bitblt_info()
{ {
static const char *type_name[4] = {"bitmap","complement","and gray","gray"}; static char const *const type_name[4] = {"bitmap","complement","and gray","gray"};
static const char *oper_name[4] = {"replace","paint","invert","erase"}; static char const *const oper_name[4] = {"replace","paint","invert","erase"};
int bbt = m_r[rsel_ac2]; int bbt = m_r[rsel_ac2];
int val = debug_read_mem(bbt); int val = debug_read_mem(bbt);

8
src/devices/cpu/arc/arcdasm.cpp
View File

@ -15,7 +15,7 @@
/*****************************************************************************/ /*****************************************************************************/
const char *const arc_disassembler::basic[0x20] = char const *const arc_disassembler::basic[0x20] =
{ {
/* 00 */ "LD r+r", /* 00 */ "LD r+r",
/* 01 */ "LD r+o", /* 01 */ "LD r+o",
@ -51,7 +51,7 @@ const char *const arc_disassembler::basic[0x20] =
/* 1f */ "MIN" /* 1f */ "MIN"
}; };
const char *arc_disassembler::conditions[0x20] = char const *const arc_disassembler::conditions[0x20] =
{ {
/* 00 */ "AL", // (aka RA - Always) /* 00 */ "AL", // (aka RA - Always)
/* 01 */ "EQ", // (aka Z - Zero /* 01 */ "EQ", // (aka Z - Zero
@ -87,7 +87,7 @@ const char *arc_disassembler::conditions[0x20] =
/* 1f */ "0x1f Reserved" /* 1f */ "0x1f Reserved"
}; };
const char *arc_disassembler::delaytype[0x4] = char const *const arc_disassembler::delaytype[0x4] =
{ {
"ND", // NO DELAY - execute next instruction only when NOT jumping "ND", // NO DELAY - execute next instruction only when NOT jumping
"D", // always execute next instruction "D", // always execute next instruction
@ -95,7 +95,7 @@ const char *arc_disassembler::delaytype[0x4] =
"Res!", // reserved / invalid "Res!", // reserved / invalid
}; };
const char *arc_disassembler::regnames[0x40] = char const *const arc_disassembler::regnames[0x40] =
{ {
/* 0x00 */ "r00", /* 0x00 */ "r00",
/* 0x01 */ "r01", /* 0x01 */ "r01",

8
src/devices/cpu/arc/arcdasm.h
View File

@ -21,10 +21,10 @@ public:
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override; virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
private: private:
static const char *const basic[0x20]; static char const *const basic[0x20];
static const char *conditions[0x20]; static char const *const conditions[0x20];
static const char *delaytype[0x4]; static char const *const delaytype[0x4];
static const char *regnames[0x40]; static char const *const regnames[0x40];
}; };

2
src/devices/cpu/arm/arm.cpp
View File

@ -563,7 +563,7 @@ void arm_cpu_device::device_start()
void arm_cpu_device::state_string_export(const device_state_entry &entry, std::string &str) const void arm_cpu_device::state_string_export(const device_state_entry &entry, std::string &str) const
{ {
static const char *s[4] = { "USER", "FIRQ", "IRQ ", "SVC " }; static char const *const s[4] = { "USER", "FIRQ", "IRQ ", "SVC " };
switch (entry.index()) switch (entry.index())
{ {

6
src/devices/cpu/m37710/m37710.cpp
View File

@ -692,7 +692,7 @@ WRITE8_MEMBER(m37710_cpu_device::m37710_internal_w)
} }
} }
const m37710_cpu_device::opcode_func *m37710_cpu_device::m37710i_opcodes[4] = const m37710_cpu_device::opcode_func *const m37710_cpu_device::m37710i_opcodes[4] =
{ {
m37710i_opcodes_M0X0, m37710i_opcodes_M0X0,
m37710i_opcodes_M0X1, m37710i_opcodes_M0X1,
@ -700,7 +700,7 @@ const m37710_cpu_device::opcode_func *m37710_cpu_device::m37710i_opcodes[4] =
m37710i_opcodes_M1X1, m37710i_opcodes_M1X1,
}; };
const m37710_cpu_device::opcode_func *m37710_cpu_device::m37710i_opcodes2[4] = const m37710_cpu_device::opcode_func *const m37710_cpu_device::m37710i_opcodes2[4] =
{ {
m37710i_opcodes42_M0X0, m37710i_opcodes42_M0X0,
m37710i_opcodes42_M0X1, m37710i_opcodes42_M0X1,
@ -708,7 +708,7 @@ const m37710_cpu_device::opcode_func *m37710_cpu_device::m37710i_opcodes2[4] =
m37710i_opcodes42_M1X1, m37710i_opcodes42_M1X1,
}; };
const m37710_cpu_device::opcode_func *m37710_cpu_device::m37710i_opcodes3[4] = const m37710_cpu_device::opcode_func *const m37710_cpu_device::m37710i_opcodes3[4] =
{ {
m37710i_opcodes89_M0X0, m37710i_opcodes89_M0X0,
m37710i_opcodes89_M0X1, m37710i_opcodes89_M0X1,

6
src/devices/cpu/m37710/m37710.h
View File

@ -202,9 +202,9 @@ private:
static const int m37710_irq_vectors[M37710_LINE_MAX]; static const int m37710_irq_vectors[M37710_LINE_MAX];
static const char *const m37710_rnames[128]; static const char *const m37710_rnames[128];
static const char *const m37710_tnames[8]; static const char *const m37710_tnames[8];
static const opcode_func *m37710i_opcodes[4]; static const opcode_func *const m37710i_opcodes[4];
static const opcode_func *m37710i_opcodes2[4]; static const opcode_func *const m37710i_opcodes2[4];
static const opcode_func *m37710i_opcodes3[4]; static const opcode_func *const m37710i_opcodes3[4];
static const get_reg_func m37710i_get_reg[4]; static const get_reg_func m37710i_get_reg[4];
static const set_reg_func m37710i_set_reg[4]; static const set_reg_func m37710i_set_reg[4];
static const set_line_func m37710i_set_line[4]; static const set_line_func m37710i_set_line[4];

4
src/devices/cpu/m68000/m68kdasm.cpp
View File

@ -977,7 +977,7 @@ std::string m68k_disassembler::d68040_cinv()
if(limit.first) if(limit.first)
return limit.second; return limit.second;
static const char *cachetype[4] = { "nop", "data", "inst", "both" }; static char const *const cachetype[4] = { "nop", "data", "inst", "both" };
switch((m_cpu_ir>>3)&3) switch((m_cpu_ir>>3)&3)
{ {
@ -1241,7 +1241,7 @@ std::string m68k_disassembler::d68040_cpush()
if(limit.first) if(limit.first)
return limit.second; return limit.second;
static const char *cachetype[4] = { "nop", "data", "inst", "both" }; static char const *const cachetype[4] = { "nop", "data", "inst", "both" };
switch((m_cpu_ir>>3)&3) switch((m_cpu_ir>>3)&3)
{ {

8
src/devices/cpu/mb86233/mb86233d.cpp
View File

@ -87,7 +87,7 @@
const char *const mb86233_disassembler::regnames[0x40] = { char const *const mb86233_disassembler::regnames[0x40] = {
"b0", "b1", "x0", "x1", "x2", "i0", "i1", "i2", "sp", "pag", "vsm", "dmc", "c0", "c1", "pc", "-", "b0", "b1", "x0", "x1", "x2", "i0", "i1", "i2", "sp", "pag", "vsm", "dmc", "c0", "c1", "pc", "-",
"a", "ah", "al", "b", "bh", "bl", "c", "ch", "cl", "d", "dh", "dl", "p", "ph", "pl", "sft", "a", "ah", "al", "b", "bh", "bl", "c", "ch", "cl", "d", "dh", "dl", "p", "ph", "pl", "sft",
"rf0", "rf1", "rf2", "rf3", "rf4", "rf5", "rf6", "rf7", "rf8", "rf9", "rfa", "rfb", "rfc", "rfd", "rfe", "rff", "rf0", "rf1", "rf2", "rf3", "rf4", "rf5", "rf6", "rf7", "rf8", "rf9", "rfa", "rfb", "rfc", "rfd", "rfe", "rff",
@ -384,7 +384,7 @@ offs_t mb86233_disassembler::disassemble(std::ostream &stream, offs_t pc, const
util::stream_format(stream, "stmh"); util::stream_format(stream, "stmh");
if(opcode & 0x0001) if(opcode & 0x0001)
util::stream_format(stream, " fp"); util::stream_format(stream, " fp");
static const char *const round_mode[4] = { "rn", "rp", "rm", "rz" }; static char const *const round_mode[4] = { "rn", "rp", "rm", "rz" };
util::stream_format(stream, " %s", round_mode[(opcode >> 1) & 3]); util::stream_format(stream, " %s", round_mode[(opcode >> 1) & 3]);
break; break;
} }
@ -397,7 +397,7 @@ offs_t mb86233_disassembler::disassemble(std::ostream &stream, offs_t pc, const
} }
case 0x0e: { // Load 24 bit val case 0x0e: { // Load 24 bit val
static const char *const inst[4] = { "lipl", "lia", "lib", "lid" }; static char const *const inst[4] = { "lipl", "lia", "lib", "lid" };
util::stream_format(stream, "%s #0x%x", inst[(opcode >> 24) & 0x3], opcode&0xffffff); util::stream_format(stream, "%s #0x%x", inst[(opcode >> 24) & 0x3], opcode&0xffffff);
break; break;
} }
@ -411,7 +411,7 @@ offs_t mb86233_disassembler::disassemble(std::ostream &stream, offs_t pc, const
switch(sub2) { switch(sub2) {
case 0: { case 0: {
static const char *rl2[16] = { static char const *const rl2[16] = {
"?0", "?1", "a", "b", "d", "?5", "?6", "?7", "?8", "?9", "?a", "?b", "?c", "?d", "?e", "?f" "?0", "?1", "a", "b", "d", "?5", "?6", "?7", "?8", "?9", "?a", "?b", "?c", "?d", "?e", "?f"
}; };
util::stream_format(stream, "clr0"); util::stream_format(stream, "clr0");

22
src/devices/cpu/mb86235/mb86235d.cpp
View File

@ -3,7 +3,7 @@
#include "emu.h" #include "emu.h"
#include "mb86235d.h" #include "mb86235d.h"
const char *mb86235_disassembler::regname[128] = char const *const mb86235_disassembler::regname[128] =
{ {
"MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7",
"AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7",
@ -15,7 +15,7 @@ const char *mb86235_disassembler::regname[128] =
"???", "???", "???", "???", "???", "???", "???", "???" "???", "???", "???", "???", "???", "???", "???", "???"
}; };
const char *mb86235_disassembler::db_mnemonic[64] = char const *const mb86235_disassembler::db_mnemonic[64] =
{ {
"DBMN", "DBMZ", "DBMV", "DBMU", "DBZD", "DBNR", "DBIL", "DBZC", "DBMN", "DBMZ", "DBMV", "DBMU", "DBZD", "DBNR", "DBIL", "DBZC",
"DBAN", "DBAZ", "DBAV", "DBAU", "DBMD", "DBAD", "???", "???", "DBAN", "DBAZ", "DBAV", "DBAU", "DBMD", "DBAD", "???", "???",
@ -27,7 +27,7 @@ const char *mb86235_disassembler::db_mnemonic[64] =
"???", "???", "???", "???", "???", "???", "???", "???" "???", "???", "???", "???", "???", "???", "???", "???"
}; };
const char *mb86235_disassembler::dbn_mnemonic[64] = char const *const mb86235_disassembler::dbn_mnemonic[64] =
{ {
"DBNMN", "DBNMZ", "DBNMV", "DBNMU", "DBNZD", "DBNNR", "DBNIL", "DBNZC", "DBNMN", "DBNMZ", "DBNMV", "DBNMU", "DBNZD", "DBNNR", "DBNIL", "DBNZC",
"DBNAN", "DBNAZ", "DBNAV", "DBNAU", "DBNMD", "DBNAD", "???", "???", "DBNAN", "DBNAZ", "DBNAV", "DBNAU", "DBNMD", "DBNAD", "???", "???",
@ -39,7 +39,7 @@ const char *mb86235_disassembler::dbn_mnemonic[64] =
"???", "???", "???", "???", "???", "???", "???", "???" "???", "???", "???", "???", "???", "???", "???", "???"
}; };
const char *mb86235_disassembler::dc_mnemonic[64] = char const *const mb86235_disassembler::dc_mnemonic[64] =
{ {
"DCMN", "DCMZ", "DCMV", "DCMU", "DCZD", "DCNR", "DCIL", "DCZC", "DCMN", "DCMZ", "DCMV", "DCMU", "DCZD", "DCNR", "DCIL", "DCZC",
"DCAN", "DCAZ", "DCAV", "DCAU", "DCMD", "DCAD", "???", "???", "DCAN", "DCAZ", "DCAV", "DCAU", "DCMD", "DCAD", "???", "???",
@ -51,7 +51,7 @@ const char *mb86235_disassembler::dc_mnemonic[64] =
"???", "???", "???", "???", "???", "???", "???", "???" "???", "???", "???", "???", "???", "???", "???", "???"
}; };
const char *mb86235_disassembler::dcn_mnemonic[64] = char const *const mb86235_disassembler::dcn_mnemonic[64] =
{ {
"DCNMN", "DCNMZ", "DCNMV", "DCNMU", "DCNZD", "DCNNR", "DCNIL", "DCNZC", "DCNMN", "DCNMZ", "DCNMV", "DCNMU", "DCNZD", "DCNNR", "DCNIL", "DCNZC",
"DCNAN", "DCNAZ", "DCNAV", "DCNAU", "DCNMD", "DCNAD", "???", "???", "DCNAN", "DCNAZ", "DCNAV", "DCNAU", "DCNMD", "DCNAD", "???", "???",
@ -63,25 +63,25 @@ const char *mb86235_disassembler::dcn_mnemonic[64] =
"???", "???", "???", "???", "???", "???", "???", "???" "???", "???", "???", "???", "???", "???", "???", "???"
}; };
const char *mb86235_disassembler::mi1_field[16] = char const *const mb86235_disassembler::mi1_field[16] =
{ "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MB0", "MB1", "MB2", "MB3", "MB4", "MB5", "MB6", "MB7" }; { "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MB0", "MB1", "MB2", "MB3", "MB4", "MB5", "MB6", "MB7" };
const char *mb86235_disassembler::mi2_field[32] = char const *const mb86235_disassembler::mi2_field[32] =
{ "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MB0", "MB1", "MB2", "MB3", "MB4", "MB5", "MB6", "MB7", { "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MB0", "MB1", "MB2", "MB3", "MB4", "MB5", "MB6", "MB7",
"PR", "PR++", "PR--", "PR#0", "???", "???", "???", "???", "-1.0E+0", "0.0E+0", "0.5E+0", "1.0E+0", "1.5E+0", "2.0E+0", "3.0E+0", "5.0E+0" }; "PR", "PR++", "PR--", "PR#0", "???", "???", "???", "???", "-1.0E+0", "0.0E+0", "0.5E+0", "1.0E+0", "1.5E+0", "2.0E+0", "3.0E+0", "5.0E+0" };
const char *mb86235_disassembler::mo_field[32] = char const *const mb86235_disassembler::mo_field[32] =
{ "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MB0", "MB1", "MB2", "MB3", "MB4", "MB5", "MB6", "MB7", { "MA0", "MA1", "MA2", "MA3", "MA4", "MA5", "MA6", "MA7", "MB0", "MB1", "MB2", "MB3", "MB4", "MB5", "MB6", "MB7",
"AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7" }; "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7" };
const char *mb86235_disassembler::ai1_field[16] = char const *const mb86235_disassembler::ai1_field[16] =
{ "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7" }; { "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7" };
const char *mb86235_disassembler::ai2_field[32] = char const *const mb86235_disassembler::ai2_field[32] =
{ "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7", { "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7",
"PR", "PR++", "PR--", "PR#0", "???", "???", "???", "???", "0", "1", "-1", "???", "???", "???", "???", "???" }; "PR", "PR++", "PR--", "PR#0", "???", "???", "???", "???", "0", "1", "-1", "???", "???", "???", "???", "???" };
const char *mb86235_disassembler::ai2f_field[32] = char const *const mb86235_disassembler::ai2f_field[32] =
{ "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7", { "AA0", "AA1", "AA2", "AA3", "AA4", "AA5", "AA6", "AA7", "AB0", "AB1", "AB2", "AB3", "AB4", "AB5", "AB6", "AB7",
"PR", "PR++", "PR--", "PR#0", "???", "???", "???", "???", "-1.0E+0", "0.0E+0", "0.5E+0", "1.0E+0", "1.5E+0", "2.0E+0", "3.0E+0", "5.0E+0" }; "PR", "PR++", "PR--", "PR#0", "???", "???", "???", "???", "-1.0E+0", "0.0E+0", "0.5E+0", "1.0E+0", "1.5E+0", "2.0E+0", "3.0E+0", "5.0E+0" };

22
src/devices/cpu/mb86235/mb86235d.h
View File

@ -15,17 +15,17 @@ public:
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override; virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
private: private:
static const char *regname[128]; static char const *const regname[128];
static const char *db_mnemonic[64]; static char const *const db_mnemonic[64];
static const char *dbn_mnemonic[64]; static char const *const dbn_mnemonic[64];
static const char *dc_mnemonic[64]; static char const *const dc_mnemonic[64];
static const char *dcn_mnemonic[64]; static char const *const dcn_mnemonic[64];
static const char *mi1_field[16]; static char const *const mi1_field[16];
static const char *mi2_field[32]; static char const *const mi2_field[32];
static const char *mo_field[32]; static char const *const mo_field[32];
static const char *ai1_field[16]; static char const *const ai1_field[16];
static const char *ai2_field[32]; static char const *const ai2_field[32];
static const char *ai2f_field[32]; static char const *const ai2f_field[32];
void dasm_ea(std::ostream &stream, int md, int arx, int ary, int disp); void dasm_ea(std::ostream &stream, int md, int arx, int ary, int disp);
void dasm_alu_mul(std::ostream &stream, uint64_t opcode, bool twoop); void dasm_alu_mul(std::ostream &stream, uint64_t opcode, bool twoop);

12
src/devices/cpu/mips/vudasm.cpp
View File

@ -9,22 +9,22 @@
#include "emu.h" #include "emu.h"
#include "vudasm.h" #include "vudasm.h"
/*static*/ const char* sonyvu_disassembler::DEST_STR[] = /*static*/ char const *const sonyvu_disassembler::DEST_STR[] =
{ {
" ", "w ", "z ", "zw ", "y ", "yw ", "yz ", "yzw ", " ", "w ", "z ", "zw ", "y ", "yw ", "yz ", "yzw ",
"x ", "xw ", "xz ", "xzw ", "xy ", "xyw ", "xyz ", "xyzw" "x ", "xw ", "xz ", "xzw ", "xy ", "xyw ", "xyz ", "xyzw"
}; };
/*static*/ const char* sonyvu_disassembler::DEST_COMMA_STR[] = /*static*/ char const *const sonyvu_disassembler::DEST_COMMA_STR[] =
{ {
",", "w,", "z,", "zw,", "y,", "yw,", "yz,", "yzw,", ",", "w,", "z,", "zw,", "y,", "yw,", "yz,", "yzw,",
"x,", "xw,", "xz,", "xzw,", "xy,", "xyw,", "xyz,", "xyzw," "x,", "xw,", "xz,", "xzw,", "xy,", "xyw,", "xyz,", "xyzw,"
}; };
/*static*/ const char* sonyvu_disassembler::BC_STR[] = { "x", "y", "z", "w" }; /*static*/ char const *const sonyvu_disassembler::BC_STR[] = { "x", "y", "z", "w" };
/*static*/ const char* sonyvu_disassembler::BC_COMMA_STR[] = { "x,", "y,", "z,", "w," }; /*static*/ char const *const sonyvu_disassembler::BC_COMMA_STR[] = { "x,", "y,", "z,", "w," };
/*static*/ const char* sonyvu_disassembler::VFREG[] = /*static*/ char const *const sonyvu_disassembler::VFREG[] =
{ {
"$vf00", "$vf01", "$vf02", "$vf03", "$vf04", "$vf05", "$vf06", "$vf07", "$vf00", "$vf01", "$vf02", "$vf03", "$vf04", "$vf05", "$vf06", "$vf07",
"$vf08", "$vf09", "$vf10", "$vf11", "$vf12", "$vf13", "$vf14", "$vf15", "$vf08", "$vf09", "$vf10", "$vf11", "$vf12", "$vf13", "$vf14", "$vf15",
@ -32,7 +32,7 @@
"$vf24", "$vf25", "$vf26", "$vf27", "$vf28", "$vf29", "$vf30", "$vf31" "$vf24", "$vf25", "$vf26", "$vf27", "$vf28", "$vf29", "$vf30", "$vf31"
}; };
/*static*/ const char* sonyvu_disassembler::VIREG[] = /*static*/ char const *const sonyvu_disassembler::VIREG[] =
{ {
"$vi00", "$vi01", "$vi02", "$vi03", "$vi04", "$vi05", "$vi06", "$vi07", "$vi00", "$vi01", "$vi02", "$vi03", "$vi04", "$vi05", "$vi06", "$vi07",
"$vi08", "$vi09", "$vi10", "$vi11", "$vi12", "$vi13", "$vi14", "$vi15", "$vi08", "$vi09", "$vi10", "$vi11", "$vi12", "$vi13", "$vi14", "$vi15",

12
src/devices/cpu/mips/vudasm.h
View File

@ -30,12 +30,12 @@ private:
std::string signed_11bit_x8(uint16_t val); std::string signed_11bit_x8(uint16_t val);
std::string signed_15bit(uint16_t val); std::string signed_15bit(uint16_t val);
static const char * DEST_STR[16]; static char const *const DEST_STR[16];
static const char * DEST_COMMA_STR[16]; static char const *const DEST_COMMA_STR[16];
static const char * BC_STR[16]; static char const *const BC_STR[16];
static const char * BC_COMMA_STR[16]; static char const *const BC_COMMA_STR[16];
static const char * VFREG[32]; static char const *const VFREG[32];
static const char * VIREG[32]; static char const *const VIREG[32];
}; };
#endif // MAME_CPU_MIPS_VUDASM_H #endif // MAME_CPU_MIPS_VUDASM_H

4
src/devices/cpu/pps4/pps4dasm.cpp
View File

@ -13,7 +13,7 @@
#include "emu.h" #include "emu.h"
#include "pps4dasm.h" #include "pps4dasm.h"
const char *pps4_disassembler::token_str[t_COUNT] = { char const *const pps4_disassembler::token_str[t_COUNT] = {
"ad", /* add */ "ad", /* add */
"adc", /* add with carry-in */ "adc", /* add with carry-in */
"adsk", /* add and skip on carry-out */ "adsk", /* add and skip on carry-out */
@ -66,7 +66,7 @@ const char *pps4_disassembler::token_str[t_COUNT] = {
"sag" /* special address generation */ "sag" /* special address generation */
}; };
const uint16_t pps4_disassembler::table[] = { uint16_t const pps4_disassembler::table[] = {
/* 00 */ t_LBL | t_I8c, /* 00 */ t_LBL | t_I8c,
/* 01 */ t_TML | t_I4 | t_I8, /* 01 */ t_TML | t_I4 | t_I8,
/* 02 */ t_TML | t_I4 | t_I8, /* 02 */ t_TML | t_I4 | t_I8,

4
src/devices/cpu/pps4/pps4dasm.h
View File

@ -51,8 +51,8 @@ private:
t_OUT = 1 << 15 /* Debugger step out (RETURN) */ t_OUT = 1 << 15 /* Debugger step out (RETURN) */
} pps4_token_e; } pps4_token_e;
static const char *token_str[t_COUNT]; static char const *const token_str[t_COUNT];
static const uint16_t table[]; static uint16_t const table[];
}; };

2
src/devices/cpu/st62xx/st62xx_dasm.cpp
View File

@ -19,7 +19,7 @@ uint32_t st62xx_disassembler::opcode_alignment() const
std::string st62xx_disassembler::reg_name(const uint8_t reg) std::string st62xx_disassembler::reg_name(const uint8_t reg)
{ {
static const char* REG_NAMES[256] = static char const *const REG_NAMES[256] =
{ {
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,

14
src/devices/cpu/tms32082/dis_mp.cpp
View File

@ -8,7 +8,7 @@
#define SIMM15(v) (int32_t)((v & 0x4000) ? (v | 0xffffe000) : (v)) #define SIMM15(v) (int32_t)((v & 0x4000) ? (v | 0xffffe000) : (v))
#define UIMM15(v) (v) #define UIMM15(v) (v)
const char *tms32082_mp_disassembler::BCND_CONDITION[32] = char const *const tms32082_mp_disassembler::BCND_CONDITION[32] =
{ {
"nev.b", "gt0.b", "eq0.b", "ge0.b", "lt0.b", "ne0.b", "le0.b", "alw.b", "nev.b", "gt0.b", "eq0.b", "ge0.b", "lt0.b", "ne0.b", "le0.b", "alw.b",
"nev.h", "gt0.h", "eq0.h", "ge0.h", "lt0.h", "ne0.h", "le0.h", "alw.h", "nev.h", "gt0.h", "eq0.h", "ge0.h", "lt0.h", "ne0.h", "le0.h", "alw.h",
@ -16,7 +16,7 @@ const char *tms32082_mp_disassembler::BCND_CONDITION[32] =
"nev.d", "gt0.d", "eq0.d", "ge0.d", "lt0.d", "ne0.d", "le0.d", "alw.d", "nev.d", "gt0.d", "eq0.d", "ge0.d", "lt0.d", "ne0.d", "le0.d", "alw.d",
}; };
const char *tms32082_mp_disassembler::BITNUM_CONDITION[32] = char const *const tms32082_mp_disassembler::BITNUM_CONDITION[32] =
{ {
"eq.b", "ne.b", "gt.b", "le.b", "lt.b", "ge.b", "hi.b", "ls.b", "eq.b", "ne.b", "gt.b", "le.b", "lt.b", "ge.b", "hi.b", "ls.b",
"lo.b", "hs.b", "eq.h", "ne.h", "gt.h", "le.h", "lt.h", "ge.h", "lo.b", "hs.b", "eq.h", "ne.h", "gt.h", "le.h", "lt.h", "ge.h",
@ -24,27 +24,27 @@ const char *tms32082_mp_disassembler::BITNUM_CONDITION[32] =
"lt.w", "ge.w", "hi.w", "ls.w", "lo.w", "hs.w", "?", "?", "lt.w", "ge.w", "hi.w", "ls.w", "lo.w", "hs.w", "?", "?",
}; };
const char *tms32082_mp_disassembler::MEMOP_S[2] = char const *const tms32082_mp_disassembler::MEMOP_S[2] =
{ {
":s", "" ":s", ""
}; };
const char *tms32082_mp_disassembler::MEMOP_M[2] = char const *const tms32082_mp_disassembler::MEMOP_M[2] =
{ {
":m", "" ":m", ""
}; };
const char *tms32082_mp_disassembler::FLOATOP_PRECISION[4] = char const *const tms32082_mp_disassembler::FLOATOP_PRECISION[4] =
{ {
"s", "d", "i", "u" "s", "d", "i", "u"
}; };
const char *tms32082_mp_disassembler::ACC_SEL[4] = char const *const tms32082_mp_disassembler::ACC_SEL[4] =
{ {
"A0", "A1", "A2", "A3" "A0", "A1", "A2", "A3"
}; };
const char *tms32082_mp_disassembler::FLOATOP_ROUND[4] = char const *const tms32082_mp_disassembler::FLOATOP_ROUND[4] =
{ {
"n", "z", "p", "m" "n", "z", "p", "m"
}; };

14
src/devices/cpu/tms32082/dis_mp.h
View File

@ -17,13 +17,13 @@ public:
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override; virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
private: private:
static const char *BCND_CONDITION[32]; static char const *const BCND_CONDITION[32];
static const char *BITNUM_CONDITION[32]; static char const *const BITNUM_CONDITION[32];
static const char *MEMOP_S[2]; static char const *const MEMOP_S[2];
static const char *MEMOP_M[2]; static char const *const MEMOP_M[2];
static const char *FLOATOP_PRECISION[4]; static char const *const FLOATOP_PRECISION[4];
static const char *ACC_SEL[4]; static char const *const ACC_SEL[4];
static const char *FLOATOP_ROUND[4]; static char const *const FLOATOP_ROUND[4];
std::ostream *output; std::ostream *output;

6
src/devices/cpu/tms32082/dis_pp.cpp
View File

@ -5,7 +5,7 @@
#include "emu.h" #include "emu.h"
#include "dis_pp.h" #include "dis_pp.h"
const char *tms32082_pp_disassembler::REG_NAMES[128] = char const *const tms32082_pp_disassembler::REG_NAMES[128] =
{ {
// 0 - 15 // 0 - 15
"a0", "a1", "a2", "a3", "a4", "???", "a6", "a7", "a0", "a1", "a2", "a3", "a4", "???", "a6", "a7",
@ -33,7 +33,7 @@ const char *tms32082_pp_disassembler::REG_NAMES[128] =
"???", "???", "???", "???", "tag0", "tag1", "tag2", "tag3" "???", "???", "???", "???", "tag0", "tag1", "tag2", "tag3"
}; };
const char *tms32082_pp_disassembler::CONDITION_CODES[16] = char const *const tms32082_pp_disassembler::CONDITION_CODES[16] =
{ {
"", "[p] ", "[ls] ", "[hi] ", "", "[p] ", "[ls] ", "[hi] ",
"[lt] ", "[le] ", "[ge] ", "[gt] ", "[lt] ", "[le] ", "[ge] ", "[gt] ",
@ -41,7 +41,7 @@ const char *tms32082_pp_disassembler::CONDITION_CODES[16] =
"[v] ", "[nv] ", "[n] ", "[nn] " "[v] ", "[nv] ", "[n] ", "[nn] "
}; };
const char *tms32082_pp_disassembler::TRANSFER_SIZE[4] = char const *const tms32082_pp_disassembler::TRANSFER_SIZE[4] =
{ {
"b:", "h:", "w:", "" "b:", "h:", "w:", ""
}; };

6
src/devices/cpu/tms32082/dis_pp.h
View File

@ -17,9 +17,9 @@ public:
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override; virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
private: private:
static const char *REG_NAMES[128]; static char const *const REG_NAMES[128];
static const char *CONDITION_CODES[16]; static char const *const CONDITION_CODES[16];
static const char *TRANSFER_SIZE[4]; static char const *const TRANSFER_SIZE[4];
std::ostream *output; std::ostream *output;

4
src/devices/cpu/tms9900/tms9900.cpp
View File

@ -328,7 +328,7 @@ void tms99xx_device::device_reset()
m_irq_state = false; m_irq_state = false;
} }
const char* tms99xx_device::s_statename[20] = char const *const tms99xx_device::s_statename[20] =
{ {
"PC", "WP", "ST", "IR", "PC", "WP", "ST", "IR",
"R0", "R1", "R2", "R3", "R0", "R1", "R2", "R3",
@ -405,7 +405,7 @@ void tms99xx_device::state_export(const device_state_entry &entry)
*/ */
void tms99xx_device::state_string_export(const device_state_entry &entry, std::string &str) const void tms99xx_device::state_string_export(const device_state_entry &entry, std::string &str) const
{ {
static const char *statestr = "LAECOPX-----IIII"; static char const statestr[] = "LAECOPX-----IIII";
char flags[17]; char flags[17];
for (auto &flag : flags) flag = 0x00; for (auto &flag : flags) flag = 0x00;
uint16_t val = 0x8000; uint16_t val = 0x8000;

2
src/devices/cpu/tms9900/tms9900.h
View File

@ -223,7 +223,7 @@ private:
// State / debug management // State / debug management
uint16_t m_state_any; uint16_t m_state_any;
static const char* s_statename[]; static char const *const s_statename[];
virtual void state_import(const device_state_entry &entry) override; virtual void state_import(const device_state_entry &entry) override;
virtual void state_export(const device_state_entry &entry) override; virtual void state_export(const device_state_entry &entry) override;
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

4
src/devices/cpu/tms9900/tms9995.cpp
View File

@ -305,7 +305,7 @@ void tms9995_device::device_start()
// save_item(NAME(m_first_cycle)); // only for log output // save_item(NAME(m_first_cycle)); // only for log output
} }
const char* tms9995_device::s_statename[20] = char const *const tms9995_device::s_statename[20] =
{ {
"PC", "WP", "ST", "IR", "PC", "WP", "ST", "IR",
"R0", "R1", "R2", "R3", "R0", "R1", "R2", "R3",
@ -384,7 +384,7 @@ void tms9995_device::state_export(const device_state_entry &entry)
*/ */
void tms9995_device::state_string_export(const device_state_entry &entry, std::string &str) const void tms9995_device::state_string_export(const device_state_entry &entry, std::string &str) const
{ {
static const char *statestr = "LAECOPX-----IIII"; static char const statestr[] = "LAECOPX-----IIII";
char flags[17]; char flags[17];
memset(flags, 0x00, ARRAY_LENGTH(flags)); memset(flags, 0x00, ARRAY_LENGTH(flags));
uint16_t val = 0x8000; uint16_t val = 0x8000;

2
src/devices/cpu/tms9900/tms9995.h
View File

@ -88,7 +88,7 @@ protected:
private: private:
// State / debug management // State / debug management
uint16_t m_state_any; uint16_t m_state_any;
static const char* s_statename[]; static char const *const s_statename[];
void state_import(const device_state_entry &entry) override; void state_import(const device_state_entry &entry) override;
void state_export(const device_state_entry &entry) override; void state_export(const device_state_entry &entry) override;
void state_string_export(const device_state_entry &entry, std::string &str) const override; void state_string_export(const device_state_entry &entry, std::string &str) const override;

6
src/devices/cpu/unsp/unspdasm.cpp
View File

@ -13,18 +13,18 @@
/*****************************************************************************/ /*****************************************************************************/
const char *unsp_disassembler::reg[] = char const *const unsp_disassembler::reg[] =
{ {
"sp", "r1", "r2", "r3", "r4", "bp", "sr", "pc" "sp", "r1", "r2", "r3", "r4", "bp", "sr", "pc"
}; };
const char *unsp_disassembler::jmp[] = char const *const unsp_disassembler::jmp[] =
{ {
"jb", "jae", "jge", "jl", "jne", "je", "jpl", "jmi", "jb", "jae", "jge", "jl", "jne", "je", "jpl", "jmi",
"jbe", "ja", "jle", "jg", "jvc", "jvs", "jmp", "<inv>" "jbe", "ja", "jle", "jg", "jvc", "jvs", "jmp", "<inv>"
}; };
const char *unsp_disassembler::alu[] = char const *const unsp_disassembler::alu[] =
{ {
"add", "adc", "sub", "sbc", "add", "adc", "sub", "sbc",
"cmp", "<inv>", "neg", "<inv>", "cmp", "<inv>", "neg", "<inv>",

6
src/devices/cpu/unsp/unspdasm.h
View File

@ -24,9 +24,9 @@ public:
virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override; virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
private: private:
static const char *reg[]; static char const *const reg[];
static const char *jmp[]; static char const *const jmp[];
static const char *alu[]; static char const *const alu[];
}; };
#endif #endif

4
src/devices/cpu/z80/tmpz84c015.cpp
View File

@ -150,8 +150,8 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
if (m_irq_priority != data) if (m_irq_priority != data)
{ {
static const char *dev[3] = { "tmpz84c015_ctc", "tmpz84c015_sio", "tmpz84c015_pio" }; static char const *const dev[3] = { "tmpz84c015_ctc", "tmpz84c015_sio", "tmpz84c015_pio" };
static const int prio[6][3] = static int const prio[6][3] =
{ {
{ 0, 1, 2 }, // 0: ctc -> sio -> pio -> ext { 0, 1, 2 }, // 0: ctc -> sio -> pio -> ext
{ 1, 0, 2 }, // 1: sio -> ctc -> pio -> ext { 1, 0, 2 }, // 1: sio -> ctc -> pio -> ext

2
src/devices/imagedev/cassette.cpp
View File

@ -379,7 +379,7 @@ std::string cassette_image_device::call_display()
int n; int n;
double position, length; double position, length;
cassette_state uistate; cassette_state uistate;
static const char *shapes[] = { u8"\u2500", u8"\u2572", u8"\u2502", u8"\u2571" }; static char const *const shapes[] = { u8"\u2500", u8"\u2572", u8"\u2502", u8"\u2571" };
// figure out where we are in the cassette // figure out where we are in the cassette
position = get_position(); position = get_position();

2
src/devices/imagedev/diablo.cpp
View File

@ -20,7 +20,7 @@ OPTION_GUIDE_START(dsk_option_guide)
OPTION_INT('K', "hunksize", "Hunk Bytes") OPTION_INT('K', "hunksize", "Hunk Bytes")
OPTION_GUIDE_END OPTION_GUIDE_END
static const char *dsk_option_spec = static char const *const dsk_option_spec =
"C1-[203]-1024;H1/[2]/4/8;S1-[12]-64;L267;K6408"; "C1-[203]-1024;H1/[2]/4/8;S1-[12]-64;L267;K6408";

2
src/devices/imagedev/harddriv.cpp
View File

@ -29,7 +29,7 @@ OPTION_GUIDE_START(hd_option_guide)
OPTION_INT('K', "hunksize", "Hunk Bytes") OPTION_INT('K', "hunksize", "Hunk Bytes")
OPTION_GUIDE_END OPTION_GUIDE_END
static const char *hd_option_spec = static char const *const hd_option_spec =
"C1-[512]-1024;H1/2/[4]/8;S1-[16]-64;L128/256/[512]/1024;K512/1024/2048/[4096]"; "C1-[512]-1024;H1/2/[4]/8;S1-[16]-64;L128/256/[512]/1024;K512/1024/2048/[4096]";

6
src/devices/machine/53c7xx.cpp
View File

@ -1736,7 +1736,7 @@ void ncr53c7xx_device::tc_int()
const char* ncr53c7xx_device::disassemble_scripts() const char* ncr53c7xx_device::disassemble_scripts()
{ {
static const char* phases[] = static char const *const phases[] =
{ {
"Data Out", "Data Out",
"Data In", "Data In",
@ -1760,7 +1760,7 @@ const char* ncr53c7xx_device::disassemble_scripts()
} }
case 1: case 1:
{ {
static const char* ops[] = static char const *const ops[] =
{ {
"SELECT", "SELECT",
"DISCONNECT", "DISCONNECT",
@ -1777,7 +1777,7 @@ const char* ncr53c7xx_device::disassemble_scripts()
} }
case 2: case 2:
{ {
static const char* ops[] = static char const *const ops[] =
{ {
"JUMP", "JUMP",
"CALL", "CALL",

10
src/devices/machine/amigafdc.cpp
View File

@ -38,7 +38,7 @@ void amiga_fdc_device::device_start()
m_write_dsksyn.resolve_safe(); m_write_dsksyn.resolve_safe();
m_leds.resolve(); m_leds.resolve();
static const char *names[] = { "0", "1", "2", "3" }; static char const *const names[] = { "0", "1", "2", "3" };
for(int i=0; i != 4; i++) { for(int i=0; i != 4; i++) {
floppy_connector *con = subdevice<floppy_connector>(names[i]); floppy_connector *con = subdevice<floppy_connector>(names[i]);
if(con) if(con)
@ -567,15 +567,15 @@ int amiga_fdc_device::pll_t::get_next_bit(attotime &tm, floppy_image_device *flo
int bit = transition_time != 0xffff; int bit = transition_time != 0xffff;
if(transition_time != 0xffff) { if(transition_time != 0xffff) {
static const uint8_t pha[8] = { 0xf, 0x7, 0x3, 0x1, 0, 0, 0, 0 }; static uint8_t const pha[8] = { 0xf, 0x7, 0x3, 0x1, 0, 0, 0, 0 };
static const uint8_t phs[8] = { 0, 0, 0, 0, 0x1, 0x3, 0x7, 0xf }; static uint8_t const phs[8] = { 0, 0, 0, 0, 0x1, 0x3, 0x7, 0xf };
static const uint8_t freqa[4][8] = { static uint8_t const freqa[4][8] = {
{ 0xf, 0x7, 0x3, 0x1, 0, 0, 0, 0 }, { 0xf, 0x7, 0x3, 0x1, 0, 0, 0, 0 },
{ 0x7, 0x3, 0x1, 0, 0, 0, 0, 0 }, { 0x7, 0x3, 0x1, 0, 0, 0, 0, 0 },
{ 0x7, 0x3, 0x1, 0, 0, 0, 0, 0 }, { 0x7, 0x3, 0x1, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, 0, 0 } { 0, 0, 0, 0, 0, 0, 0, 0 }
}; };
static const uint8_t freqs[4][8] = { static uint8_t const freqs[4][8] = {
{ 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0x1, 0x3, 0x7 }, { 0, 0, 0, 0, 0, 0x1, 0x3, 0x7 },
{ 0, 0, 0, 0, 0, 0x1, 0x3, 0x7 }, { 0, 0, 0, 0, 0, 0x1, 0x3, 0x7 },

2
src/devices/machine/ioptimer.cpp
View File

@ -130,7 +130,7 @@ void iop_timer_device::update_count()
void iop_timer_device::set_ctrl(uint32_t data) void iop_timer_device::set_ctrl(uint32_t data)
{ {
static const char *gatm_names[4] = { "low?", "reset+rising?", "reset+falling?", "reset+both?" }; static char const *const gatm_names[4] = { "low?", "reset+rising?", "reset+falling?", "reset+both?" };
logerror("%s: set_ctrl: GATE=%d, GATM=%s, ZRET=%d\n", machine().describe_context(), data & CTRL_GATE, gatm_names[(data & CTRL_GATM) >> 1], (data & CTRL_ZRET) >> 3); logerror("%s: set_ctrl: GATE=%d, GATM=%s, ZRET=%d\n", machine().describe_context(), data & CTRL_GATE, gatm_names[(data & CTRL_GATM) >> 1], (data & CTRL_ZRET) >> 3);
logerror("%s: CMPE=%d, OVFE=%d, REP_INT=%d, TOG_INT=%d\n", machine().describe_context(), (data & CTRL_CMPE) >> 4, (data & CTRL_OVFE) >> 5, (data & CTRL_REPI) >> 6, (data & CTRL_TOGI) >> 7); logerror("%s: CMPE=%d, OVFE=%d, REP_INT=%d, TOG_INT=%d\n", machine().describe_context(), (data & CTRL_CMPE) >> 4, (data & CTRL_OVFE) >> 5, (data & CTRL_REPI) >> 6, (data & CTRL_TOGI) >> 7);

4
src/devices/machine/ncr539x.cpp
View File

@ -56,7 +56,7 @@ enum
#define CR2_GENERATE_REGISTER_PARITY 0x02 #define CR2_GENERATE_REGISTER_PARITY 0x02
#define CR2_GENERATE_DATA_PARITY 0x01 #define CR2_GENERATE_DATA_PARITY 0x01
static const char *rdregs[16] = { static char const *const rdregs[16] = {
"Transfer count LSB", // 0 "Transfer count LSB", // 0
"Transfer count MSB", // 1 "Transfer count MSB", // 1
"FIFO", // 2 "FIFO", // 2
@ -75,7 +75,7 @@ static const char *rdregs[16] = {
"0xF" "0xF"
}; };
static const char *wrregs[16] = { static char const *const wrregs[16] = {
"Start Transfer count LSB", "Start Transfer count LSB",
"Start Transfer count MSB", "Start Transfer count MSB",
"FIFO", "FIFO",

2
src/devices/machine/nscsi_bus.cpp
View File

@ -50,7 +50,7 @@ void nscsi_bus_device::regen_data()
void nscsi_bus_device::regen_ctrl(int refid) void nscsi_bus_device::regen_ctrl(int refid)
{ {
static const char *phase[8] = { static char const *const phase[8] = {
"dout", "din ", "cmd ", "stat", "4 ", "5 ", "mout", "min " "dout", "din ", "cmd ", "stat", "4 ", "5 ", "mout", "min "
}; };

2
src/devices/machine/ps2dma.cpp
View File

@ -604,7 +604,7 @@ READ32_MEMBER(ps2_dmac_device::channel_r)
WRITE32_MEMBER(ps2_dmac_device::channel_w) WRITE32_MEMBER(ps2_dmac_device::channel_w)
{ {
static const char* mode_strings[4] = { "Normal", "Chain", "Interleave", "Undefined" }; static char const *const mode_strings[4] = { "Normal", "Chain", "Interleave", "Undefined" };
switch (offset + 0x8000/8) switch (offset + 0x8000/8)
{ {

4
src/devices/machine/ps2timer.cpp
View File

@ -142,8 +142,8 @@ void ps2_timer_device::update_hold()
void ps2_timer_device::set_mode(uint32_t data) void ps2_timer_device::set_mode(uint32_t data)
{ {
static const char *clks_names[4] = { "BUSCLK", "BUSCLK/16", "BUSCLK/256", "HBLNK" }; static char const *const clks_names[4] = { "BUSCLK", "BUSCLK/16", "BUSCLK/256", "HBLNK" };
static const char *gatm_names[4] = { "low", "reset+rising", "reset+falling", "reset+both" }; static char const *const gatm_names[4] = { "low", "reset+rising", "reset+falling", "reset+both" };
logerror("%s: CLKS=%s, GATE=%d, GATS=%cBLNK\n", machine().describe_context(), clks_names[data & 3], BIT(data, 2), BIT(data, 3) ? 'V' : 'H'); logerror("%s: CLKS=%s, GATE=%d, GATS=%cBLNK\n", machine().describe_context(), clks_names[data & 3], BIT(data, 2), BIT(data, 3) ? 'V' : 'H');
logerror("%s: GATM=%s, ZRET=%d, CUE=%d\n", machine().describe_context(), gatm_names[(data >> 4) & 3], BIT(data, 6), BIT(data, 7)); logerror("%s: GATM=%s, ZRET=%d, CUE=%d\n", machine().describe_context(), gatm_names[(data >> 4) & 3], BIT(data, 6), BIT(data, 7));
logerror("%s: CMPE=%d, OVFE=%d, %s, %s\n", machine().describe_context(), BIT(data, 8), BIT(data, 9), BIT(data, 10) ? "Clear Equal" : "", BIT(data, 11) ? "Clear Overflow" : ""); logerror("%s: CMPE=%d, OVFE=%d, %s, %s\n", machine().describe_context(), BIT(data, 8), BIT(data, 9), BIT(data, 10) ? "Clear Equal" : "", BIT(data, 11) ? "Clear Overflow" : "");

4
src/devices/machine/rtc4543.cpp
View File

@ -25,7 +25,7 @@
// MACROS / CONSTANTS // MACROS / CONSTANTS
//************************************************************************** //**************************************************************************
const char *rtc4543_device::s_reg_names[7] = char const *const rtc4543_device::s_reg_names[7] =
{ {
"second", "second",
"minute", "minute",
@ -116,7 +116,7 @@ void rtc4543_device::device_timer(emu_timer &timer, device_timer_id id, int para
void rtc4543_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) void rtc4543_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second)
{ {
static const int weekday[7] = { 7, 1, 2, 3, 4, 5, 6 }; static int const weekday[7] = { 7, 1, 2, 3, 4, 5, 6 };
m_regs[0] = convert_to_bcd(second); // seconds (BCD, 0-59) in bits 0-6, bit 7 = battery low m_regs[0] = convert_to_bcd(second); // seconds (BCD, 0-59) in bits 0-6, bit 7 = battery low
m_regs[1] = convert_to_bcd(minute); // minutes (BCD, 0-59) m_regs[1] = convert_to_bcd(minute); // minutes (BCD, 0-59)

2
src/devices/machine/rtc4543.h
View File

@ -40,7 +40,7 @@
class rtc4543_device : public device_t, class rtc4543_device : public device_t,
public device_rtc_interface public device_rtc_interface
{ {
static const char *s_reg_names[7]; static char const *const s_reg_names[7];
public: public:
// construction/destruction // construction/destruction

6
src/devices/sound/spu.cpp
View File

@ -108,7 +108,7 @@ enum srrr_flags
srrr_rr_mask=0x1f srrr_rr_mask=0x1f
}; };
static const unsigned int /*sound_buffer_size=65536*4,*/ static unsigned int const /*sound_buffer_size=65536*4,*/
xa_sector_size=(18*28*8)<<1, xa_sector_size=(18*28*8)<<1,
xa_buffer_sectors=16, xa_buffer_sectors=16,
cdda_sector_size=2352, cdda_sector_size=2352,
@ -132,7 +132,7 @@ static const unsigned int /*sound_buffer_size=65536*4,*/
// //
// //
static const int filter_coef[5][2]= static int const filter_coef[5][2]=
{ {
{ 0,0 }, { 0,0 },
{ 60,0 }, { 60,0 },
@ -160,7 +160,7 @@ static const int filter_coef[5][2]=
_name##"0-15", \ _name##"0-15", \
_name##"16-23" _name##"16-23"
static const char *spu_register_names[256]= static char const *const spu_register_names[256]=
{ {
_voice_registers(0), _voice_registers(0),
_voice_registers(1), _voice_registers(1),

8
src/devices/video/gba_lcd.cpp
View File

@ -113,7 +113,7 @@ public:
void size(int &width, int &height) void size(int &width, int &height)
{ {
static const int size_table[4][4][2] = static int const size_table[4][4][2] =
{ {
{ { 8, 8 }, { 16, 16 }, { 32, 32 }, { 64, 64 } }, // square { { 8, 8 }, { 16, 16 }, { 32, 32 }, { 64, 64 } }, // square
{ { 16, 8 }, { 32, 8 }, { 32, 16 }, { 64, 32 } }, // horizontal rect { { 16, 8 }, { 32, 8 }, { 32, 16 }, { 64, 32 } }, // horizontal rect
@ -207,7 +207,7 @@ inline uint32_t gba_lcd_device::bg_screen_base(uint16_t bgxcnt)
inline void gba_lcd_device::bg_screen_size(uint16_t bgxcnt, bool text, int &width, int &height) inline void gba_lcd_device::bg_screen_size(uint16_t bgxcnt, bool text, int &width, int &height)
{ {
static const int size_table[2][4][2] = static int const size_table[2][4][2] =
{ {
{ { 256, 256 }, { 512, 256 }, { 256, 512 }, { 512, 512 } }, // text mode { { 256, 256 }, { 512, 256 }, { 256, 512 }, { 512, 512 } }, // text mode
{ { 128, 128 }, { 256, 256 }, { 512, 512 }, { 1024, 1024 } } // rotation/scaling (roz) mode { { 128, 128 }, { 256, 256 }, { 512, 512 }, { 1024, 1024 } } // rotation/scaling (roz) mode
@ -1466,7 +1466,7 @@ inline bool gba_lcd_device::is_in_window_v(int y, int window)
return false; return false;
} }
static const int coeff[32] = { static int const coeff[32] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
}; };
@ -1536,7 +1536,7 @@ inline uint32_t gba_lcd_device::decrease_brightness(uint32_t color)
return (color & 0xffff0000) | (b << 10) | (g << 5) | r; return (color & 0xffff0000) | (b << 10) | (g << 5) | r;
} }
static const char *reg_names[] = { static char const *const reg_names[] = {
/* LCD I/O Registers */ /* LCD I/O Registers */
"DISPCNT", "GRNSWAP", "DISPSTAT", "VCOUNT", "DISPCNT", "GRNSWAP", "DISPSTAT", "VCOUNT",
"BG0CNT", "BG1CNT", "BG2CNT", "BG3CNT", "BG0CNT", "BG1CNT", "BG2CNT", "BG3CNT",

10
src/devices/video/ps2gs.cpp
View File

@ -14,7 +14,7 @@
DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS") DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
/*static*/ const size_t ps2_gs_device::FORMAT_PIXEL_WIDTHS[] = { /*static*/ size_t const ps2_gs_device::FORMAT_PIXEL_WIDTHS[] = {
32, 24, 16, 0, 0, 0, 0, 0, 32, 24, 16, 0, 0, 0, 0, 0,
0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0,
0, 0, 0, 8, 4, 0, 0, 0, 0, 0, 0, 8, 4, 0, 0, 0,
@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
0, 0, 16, 0, 0, 0, 0, 0 0, 0, 16, 0, 0, 0, 0, 0
}; };
/*static*/ const char* ps2_gs_device::FORMAT_NAMES[] = { /*static*/ char const *const ps2_gs_device::FORMAT_NAMES[] = {
"PSMCT32", "PSMCT24", "PSMCT16", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "PSMCT32", "PSMCT24", "PSMCT16", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown",
"Unknown", "Unknown", "PCMCT16S", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "PCMCT16S", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown",
"Unknown", "Unknown", "Unknown", "PSMT8", "PSMT4", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "PSMT8", "PSMT4", "Unknown", "Unknown", "Unknown",
@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
"Unknown", "Unknown", "PSMZ16S", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown" "Unknown", "Unknown", "PSMZ16S", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown"
}; };
/*static*/ const uint32_t ps2_gs_device::KICK_COUNTS[] = { /*static*/ uint32_t const ps2_gs_device::KICK_COUNTS[] = {
1, 2, 2, 3, 3, 3, 2, 1 1, 2, 2, 3, 3, 3, 2, 1
}; };
@ -442,10 +442,10 @@ void ps2_gs_device::write_packed(const uint8_t reg, const uint64_t hi, const uin
WRITE64_MEMBER(ps2_gs_device::regs_w) WRITE64_MEMBER(ps2_gs_device::regs_w)
{ {
static const char* dir_strs[4] = { static char const *const dir_strs[4] = {
"Host->Local", "Local->Host", "Local->Local", "None" "Host->Local", "Local->Host", "Local->Local", "None"
}; };
static const char* prim_strs[8] = { static char const *const prim_strs[8] = {
"Point", "Line", "Line Strip", "Tri", "Tri Strip", "Tri Fan", "Sprite", "Invalid" "Point", "Line", "Line Strip", "Tri", "Tri Strip", "Tri Fan", "Sprite", "Invalid"
}; };

6
src/devices/video/ps2gs.h
View File

@ -307,9 +307,9 @@ protected:
uint8_t m_curr_field; uint8_t m_curr_field;
static const size_t FORMAT_PIXEL_WIDTHS[0x40]; static size_t const FORMAT_PIXEL_WIDTHS[0x40];
static const char* FORMAT_NAMES[0x40]; static char const *const FORMAT_NAMES[0x40];
static const uint32_t KICK_COUNTS[8]; static uint32_t const KICK_COUNTS[8];
}; };
DECLARE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device) DECLARE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device)

14
src/emu/softlist.cpp
View File

@ -475,7 +475,7 @@ void softlist_parser::parse_root_start(const char *tagname, const char **attribu
// <softwarelist name='' description=''> // <softwarelist name='' description=''>
if (strcmp(tagname, "softwarelist") == 0) if (strcmp(tagname, "softwarelist") == 0)
{ {
static const char *attrnames[] = { "name", "description" }; static char const *const attrnames[] = { "name", "description" };
const auto attrvalues = parse_attributes(attributes, attrnames); const auto attrvalues = parse_attributes(attributes, attrnames);
if (!attrvalues[1].empty()) if (!attrvalues[1].empty())
@ -496,7 +496,7 @@ void softlist_parser::parse_main_start(const char *tagname, const char **attribu
// <software name='' cloneof='' supported=''> // <software name='' cloneof='' supported=''>
if (strcmp(tagname, "software") == 0) if (strcmp(tagname, "software") == 0)
{ {
static const char *attrnames[] = { "name", "cloneof", "supported" }; static char const *const attrnames[] = { "name", "cloneof", "supported" };
auto attrvalues = parse_attributes(attributes, attrnames); auto attrvalues = parse_attributes(attributes, attrnames);
if (!attrvalues[0].empty()) if (!attrvalues[0].empty())
@ -563,7 +563,7 @@ void softlist_parser::parse_soft_start(const char *tagname, const char **attribu
// <part name='' interface=''> // <part name='' interface=''>
else if (strcmp(tagname, "part" ) == 0) else if (strcmp(tagname, "part" ) == 0)
{ {
static const char *attrnames[] = { "name", "interface" }; static char const *const attrnames[] = { "name", "interface" };
auto attrvalues = parse_attributes(attributes, attrnames); auto attrvalues = parse_attributes(attributes, attrnames);
if (!attrvalues[0].empty() && !attrvalues[1].empty()) if (!attrvalues[0].empty() && !attrvalues[1].empty())
@ -596,7 +596,7 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu
// <dataarea name='' size=''> // <dataarea name='' size=''>
if (strcmp(tagname, "dataarea") == 0) if (strcmp(tagname, "dataarea") == 0)
{ {
static const char *attrnames[] = { "name", "size", "width", "endianness" }; static char const *const attrnames[] = { "name", "size", "width", "endianness" };
auto attrvalues = parse_attributes(attributes, attrnames); auto attrvalues = parse_attributes(attributes, attrnames);
if (!attrvalues[0].empty() && !attrvalues[1].empty()) if (!attrvalues[0].empty() && !attrvalues[1].empty())
@ -638,7 +638,7 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu
// <diskarea name=''> // <diskarea name=''>
else if (strcmp(tagname, "diskarea") == 0) else if (strcmp(tagname, "diskarea") == 0)
{ {
static const char *attrnames[] = { "name" }; static char const *const attrnames[] = { "name" };
auto attrvalues = parse_attributes(attributes, attrnames); auto attrvalues = parse_attributes(attributes, attrnames);
if (!attrvalues[0].empty()) if (!attrvalues[0].empty())
@ -683,7 +683,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu
// <rom name='' size='' crc='' sha1='' offset='' value='' status='' loadflag=''> // <rom name='' size='' crc='' sha1='' offset='' value='' status='' loadflag=''>
if (strcmp(tagname, "rom") == 0) if (strcmp(tagname, "rom") == 0)
{ {
static const char *attrnames[] = { "name", "size", "crc", "sha1", "offset", "value", "status", "loadflag" }; static char const *const attrnames[] = { "name", "size", "crc", "sha1", "offset", "value", "status", "loadflag" };
auto attrvalues = parse_attributes(attributes, attrnames); auto attrvalues = parse_attributes(attributes, attrnames);
std::string &name = attrvalues[0]; std::string &name = attrvalues[0];
@ -757,7 +757,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu
// <rom name='' sha1='' status='' writeable=''> // <rom name='' sha1='' status='' writeable=''>
else if (strcmp(tagname, "disk") == 0) else if (strcmp(tagname, "disk") == 0)
{ {
static const char *attrnames[] = { "name", "sha1", "status", "writeable" }; static char const *const attrnames[] = { "name", "sha1", "status", "writeable" };
auto attrvalues = parse_attributes(attributes, attrnames); auto attrvalues = parse_attributes(attributes, attrnames);
std::string &name = attrvalues[0]; std::string &name = attrvalues[0];

2
src/emu/validity.cpp
View File

@ -81,7 +81,7 @@ void validity_checker::validate_tag(const char *tag)
osd_printf_error("Invalid generic tag '%s' used\n", tag); osd_printf_error("Invalid generic tag '%s' used\n", tag);
// scan for invalid characters // scan for invalid characters
static const char *validchars = "abcdefghijklmnopqrstuvwxyz0123456789_.:^$"; static char const *const validchars = "abcdefghijklmnopqrstuvwxyz0123456789_.:^$";
for (const char *p = tag; *p != 0; p++) for (const char *p = tag; *p != 0; p++)
{ {
// only lower-case permitted // only lower-case permitted

6
src/frontend/mame/ui/ui.cpp
View File

@ -49,7 +49,7 @@ enum
***************************************************************************/ ***************************************************************************/
// list of natural keyboard keys that are not associated with UI_EVENT_CHARs // list of natural keyboard keys that are not associated with UI_EVENT_CHARs
static const input_item_id non_char_keys[] = static input_item_id const non_char_keys[] =
{ {
ITEM_ID_ESC, ITEM_ID_ESC,
ITEM_ID_F1, ITEM_ID_F1,
@ -92,7 +92,7 @@ static const input_item_id non_char_keys[] =
ITEM_ID_CANCEL ITEM_ID_CANCEL
}; };
static const char *s_color_list[] = { static char const *const s_color_list[] = {
OPTION_UI_BORDER_COLOR, OPTION_UI_BORDER_COLOR,
OPTION_UI_BACKGROUND_COLOR, OPTION_UI_BACKGROUND_COLOR,
OPTION_UI_GFXVIEWER_BG_COLOR, OPTION_UI_GFXVIEWER_BG_COLOR,
@ -129,7 +129,7 @@ slider_state *mame_ui_manager::slider_current;
CORE IMPLEMENTATION CORE IMPLEMENTATION
***************************************************************************/ ***************************************************************************/
static const uint32_t mouse_bitmap[32*32] = static uint32_t const mouse_bitmap[32*32] =
{ {
0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff, 0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,
0x09a46f30,0x81ac7c43,0x24af8049,0x00ad7d45,0x00a8753a,0x00a46f30,0x009f6725,0x009b611c,0x00985b14,0x0095560d,0x00935308,0x00915004,0x00904e02,0x008f4e01,0x008f4d00,0x008f4d00,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff, 0x09a46f30,0x81ac7c43,0x24af8049,0x00ad7d45,0x00a8753a,0x00a46f30,0x009f6725,0x009b611c,0x00985b14,0x0095560d,0x00935308,0x00915004,0x00904e02,0x008f4e01,0x008f4d00,0x008f4d00,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,

5
src/lib/formats/cbm_crt.cpp
View File

@ -40,9 +40,10 @@
*********************************************************************/ *********************************************************************/
#include "emu.h" // fatalerror #include "emu.h" // fatalerror
#include "corefile.h"
#include "cbm_crt.h" #include "cbm_crt.h"
#include "corefile.h"
//************************************************************************** //**************************************************************************
// MACROS/CONSTANTS // MACROS/CONSTANTS
@ -52,7 +53,7 @@
// slot names for the C64 cartridge types // slot names for the C64 cartridge types
static const char * CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] = static char const *const CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] =
{ {
"standard", // 0 - Normal cartridge "standard", // 0 - Normal cartridge
UNSUPPORTED, // 1 - Action Replay UNSUPPORTED, // 1 - Action Replay

4
src/lib/netlist/plib/ptypes.h
View File

@ -83,7 +83,7 @@ namespace plib
enum E { __VA_ARGS__ }; \ enum E { __VA_ARGS__ }; \
ename (E v) : m_v(v) { } \ ename (E v) : m_v(v) { } \
bool set_from_string (const pstring &s) { \ bool set_from_string (const pstring &s) { \
static const char *strings = # __VA_ARGS__; \ static char const *const strings = # __VA_ARGS__; \
int f = from_string_int(strings, s.c_str()); \ int f = from_string_int(strings, s.c_str()); \
if (f>=0) { m_v = static_cast<E>(f); return true; } else { return false; } \ if (f>=0) { m_v = static_cast<E>(f); return true; } else { return false; } \
} \ } \
@ -91,7 +91,7 @@ namespace plib
bool operator==(const ename &rhs) const {return m_v == rhs.m_v;} \ bool operator==(const ename &rhs) const {return m_v == rhs.m_v;} \
bool operator==(const E &rhs) const {return m_v == rhs;} \ bool operator==(const E &rhs) const {return m_v == rhs;} \
const pstring name() const { \ const pstring name() const { \
static const char *strings = # __VA_ARGS__; \ static char const *const strings = # __VA_ARGS__; \
return nthstr(static_cast<int>(m_v), strings); \ return nthstr(static_cast<int>(m_v), strings); \
} \ } \
private: E m_v; }; private: E m_v; };

2
src/mame/drivers/geneve.cpp
View File

@ -637,7 +637,7 @@ WRITE_LINE_MEMBER( geneve_state::keyboard_interrupt )
WRITE8_MEMBER( geneve_state::external_operation ) WRITE8_MEMBER( geneve_state::external_operation )
{ {
static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" }; static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
if (offset != IDLE_OP) if (offset != IDLE_OP)
LOGMASKED(LOG_WARN, "External operation %s not implemented on Geneve board\n", extop[offset]); LOGMASKED(LOG_WARN, "External operation %s not implemented on Geneve board\n", extop[offset]);
} }

16
src/mame/drivers/indy_indigo2.cpp
View File

@ -96,10 +96,10 @@ private:
static void cdrom_config(device_t *device); static void cdrom_config(device_t *device);
static const char* HAL2_TAG; static char const *const HAL2_TAG;
static const char* HPC3_TAG; static char const *const HPC3_TAG;
static const char* IOC2_TAG; static char const *const IOC2_TAG;
static const char* RTC_TAG; static char const *const RTC_TAG;
required_device<mips3_device> m_maincpu; required_device<mips3_device> m_maincpu;
required_shared_ptr<uint32_t> m_mainram; required_shared_ptr<uint32_t> m_mainram;
@ -114,10 +114,10 @@ private:
inline void ATTR_PRINTF(3,4) verboselog(int n_level, const char *s_fmt, ... ); inline void ATTR_PRINTF(3,4) verboselog(int n_level, const char *s_fmt, ... );
}; };
/*static*/ const char* ip22_state::HAL2_TAG = "hal2"; /*static*/ char const *const ip22_state::HAL2_TAG = "hal2";
/*static*/ const char* ip22_state::HPC3_TAG = "hpc3"; /*static*/ char const *const ip22_state::HPC3_TAG = "hpc3";
/*static*/ const char* ip22_state::IOC2_TAG = "ioc2"; /*static*/ char const *const ip22_state::IOC2_TAG = "ioc2";
/*static*/ const char* ip22_state::RTC_TAG = "rtc"; /*static*/ char const *const ip22_state::RTC_TAG = "rtc";
#define VERBOSE_LEVEL ( 0 ) #define VERBOSE_LEVEL ( 0 )

8
src/mame/drivers/next.cpp
View File

@ -258,19 +258,19 @@ void next_state::irq_check()
} }
} }
const char *next_state::dma_targets[0x20] = { char const *const next_state::dma_targets[0x20] = {
nullptr, "scsi", nullptr, nullptr, "soundout", "disk", nullptr, nullptr, nullptr, "scsi", nullptr, nullptr, "soundout", "disk", nullptr, nullptr,
"soundin", "printer", nullptr, nullptr, "scc", "dsp", nullptr, nullptr, "soundin", "printer", nullptr, nullptr, "scc", "dsp", nullptr, nullptr,
"s-enetx", "enetx", nullptr, nullptr, "s-enetr", "enetr", nullptr, nullptr, "s-enetx", "enetx", nullptr, nullptr, "s-enetr", "enetr", nullptr, nullptr,
"video", nullptr, nullptr, nullptr, "r2m", "m2r", nullptr, nullptr "video", nullptr, nullptr, nullptr, "r2m", "m2r", nullptr, nullptr
}; };
const int next_state::dma_irqs[0x20] = { int const next_state::dma_irqs[0x20] = {
-1, 26, -1, -1, 23, 25, -1, -1, 22, 24, -1, -1, 21, 20, -1, -1, -1, 26, -1, -1, 23, 25, -1, -1, 22, 24, -1, -1, 21, 20, -1, -1,
-1, 28, -1, -1, -1, 27, -1, -1, 5, -1, -1, -1, 18, 19, -1, -1 -1, 28, -1, -1, -1, 27, -1, -1, 5, -1, -1, -1, 18, 19, -1, -1
}; };
const bool next_state::dma_has_saved[0x20] = { bool const next_state::dma_has_saved[0x20] = {
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, true, false, false, false, true, false, false, false, true, false, false, false, true, false, false,
@ -557,7 +557,7 @@ void next_state::dma_do_ctrl_w(int slot, uint8_t data)
} }
} }
const int next_state::scsi_clocks[4] = { 10000000, 12000000, 20000000, 16000000 }; int const next_state::scsi_clocks[4] = { 10000000, 12000000, 20000000, 16000000 };
READ32_MEMBER( next_state::scsictrl_r ) READ32_MEMBER( next_state::scsictrl_r )
{ {

2
src/mame/drivers/ps2sony.cpp
View File

@ -400,7 +400,7 @@ WRITE32_MEMBER(ps2sony_state::ipu_w)
break; break;
case 0x03: /* VDEC */ case 0x03: /* VDEC */
{ {
static const char *vlc[4] = static char const *const vlc[4] =
{ {
"Macroblock Address Increment", "Macroblock Address Increment",
"Macroblock Type", "Macroblock Type",

2
src/mame/drivers/stratos.cpp
View File

@ -83,7 +83,7 @@ void stratos_state::machine_reset()
void stratos_state::show_leds() void stratos_state::show_leds()
{ {
static const char *led_pos[18] = { static char const *const led_pos[18] = {
nullptr, nullptr, "gPawn", "gKnight", "gBishop", "gRook", "gQueen", "gKing", nullptr, nullptr, "rPawn", "rKnight", "rBishop", "rRook", "rQueen", "rKing", nullptr, nullptr nullptr, nullptr, "gPawn", "gKnight", "gBishop", "gRook", "gQueen", "gKing", nullptr, nullptr, "rPawn", "rKnight", "rBishop", "rRook", "rQueen", "rKing", nullptr, nullptr
}; };
char str_red[64]; char str_red[64];

2
src/mame/drivers/ti990_4.cpp
View File

@ -180,7 +180,7 @@ WRITE_LINE_MEMBER(ti990_4_state::asrkey_interrupt)
WRITE8_MEMBER( ti990_4_state::external_operation ) WRITE8_MEMBER( ti990_4_state::external_operation )
{ {
static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" }; static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
switch (offset) switch (offset)
{ {
case IDLE_OP: case IDLE_OP:

2
src/mame/drivers/ti99_4p.cpp
View File

@ -940,7 +940,7 @@ READ8_MEMBER( ti99_4p_state::interrupt_level )
WRITE8_MEMBER( ti99_4p_state::external_operation ) WRITE8_MEMBER( ti99_4p_state::external_operation )
{ {
static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" }; static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
if (offset != IDLE_OP) logerror("External operation %s not implemented on the SGCPU board\n", extop[offset]); if (offset != IDLE_OP) logerror("External operation %s not implemented on the SGCPU board\n", extop[offset]);
} }

2
src/mame/drivers/ti99_4x.cpp
View File

@ -442,7 +442,7 @@ WRITE8_MEMBER( ti99_4x_state::cruwrite )
WRITE8_MEMBER( ti99_4x_state::external_operation ) WRITE8_MEMBER( ti99_4x_state::external_operation )
{ {
static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" }; static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
// Some games (e.g. Slymoids) actually use IDLE for synchronization // Some games (e.g. Slymoids) actually use IDLE for synchronization
if (offset == IDLE_OP) return; if (offset == IDLE_OP) return;
else else

2
src/mame/drivers/ti99_8.cpp
View File

@ -680,7 +680,7 @@ WRITE_LINE_MEMBER( ti99_8_state::notconnected )
WRITE8_MEMBER( ti99_8_state::external_operation ) WRITE8_MEMBER( ti99_8_state::external_operation )
{ {
static const char* extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" }; static char const *const extop[8] = { "inv1", "inv2", "IDLE", "RSET", "inv3", "CKON", "CKOF", "LREX" };
if (offset == IDLE_OP) return; if (offset == IDLE_OP) return;
else else
LOGMASKED(LOG_WARN, "External operation %s not implemented on TI-99/8 board\n", extop[offset]); LOGMASKED(LOG_WARN, "External operation %s not implemented on TI-99/8 board\n", extop[offset]);

8
src/mame/includes/next.h
View File

@ -170,10 +170,10 @@ private:
DMA_BUSEXC = 0x10 DMA_BUSEXC = 0x10
}; };
static const char *dma_targets[0x20]; static char const *const dma_targets[0x20];
static const int dma_irqs[0x20]; static int const dma_irqs[0x20];
static const bool dma_has_saved[0x20]; static bool const dma_has_saved[0x20];
static const int scsi_clocks[4]; static int const scsi_clocks[4];
dma_slot dma_slots[0x20]; dma_slot dma_slots[0x20];
uint32_t esp; uint32_t esp;

14
src/mame/includes/xbox_nv2a.h
View File

@ -14,13 +14,13 @@
#include <mutex> #include <mutex>
class vertex_program_disassembler { class vertex_program_disassembler {
static const char *srctypes[]; static char const *const srctypes[];
static const char *scaops[]; static char const *const scaops[];
static const int scapar2[]; static int const scapar2[];
static const char *vecops[]; static char const *const vecops[];
static const int vecpar2[]; static int const vecpar2[];
static const char *vecouts[]; static char const *const vecouts[];
static const char compchar[]; static char const compchar[];
int o[6]; int o[6];
int state; int state;

16
src/mame/machine/apollo_dbg.cpp
View File

@ -21,7 +21,7 @@
// TRAP 0 // TRAP 0
//------------------------------------------------------ //------------------------------------------------------
static const char* trap0[] = { static char const *const trap0[] = {
/* 0x00 */nullptr, nullptr, /* 0x00 */nullptr, nullptr,
/* 0x01 */"FIM_$GET_FIM_ADDR", "", /* 0x01 */"FIM_$GET_FIM_ADDR", "",
/* 0x02 */nullptr, nullptr, /* 0x02 */nullptr, nullptr,
@ -66,7 +66,7 @@ static const char* trap0[] = {
// TRAP1 // TRAP1
//------------------------------------------------------ //------------------------------------------------------
static const char* trap1[] = { static char const *const trap1[] = {
/* 0x00 */nullptr, nullptr, /* 0x00 */nullptr, nullptr,
/* 0x01 */nullptr, nullptr, /* 0x01 */nullptr, nullptr,
/* 0x02 */"FIM_$INSTALL", "x", /* 0x02 */"FIM_$INSTALL", "x",
@ -142,7 +142,7 @@ static const char* trap1[] = {
// TRAP2 // TRAP2
//------------------------------------------------------ //------------------------------------------------------
static const char* trap2[] = { static char const *const trap2[] = {
/* 0x00 */nullptr, nullptr, /* 0x00 */nullptr, nullptr,
/* 0x01 */nullptr, nullptr, /* 0x01 */nullptr, nullptr,
/* 0x02 */"FILE_$DELETE", "x,x", /* 0x02 */"FILE_$DELETE", "x,x",
@ -294,7 +294,7 @@ static const char* trap2[] = {
// TRAP3 // TRAP3
//------------------------------------------------------ //------------------------------------------------------
static const char* trap3[] = { static char const *const trap3[] = {
/* 0x00 */"PBU2_$DMA_STOP", "x,x,x", /* 0x00 */"PBU2_$DMA_STOP", "x,x,x",
/* 0x01 */nullptr, nullptr, /* 0x01 */nullptr, nullptr,
/* 0x02 */"FILE_$CREATE", "x,x,x", /* 0x02 */"FILE_$CREATE", "x,x,x",
@ -474,7 +474,7 @@ static const char* trap3[] = {
// TRAP4 // TRAP4
//------------------------------------------------------ //------------------------------------------------------
static const char* trap4[] = { static char const *const trap4[] = {
/* 0x00 */nullptr, nullptr, /* 0x00 */nullptr, nullptr,
/* 0x01 */"MST_$SET_GUARD", "u,x,x,x", /* 0x01 */"MST_$SET_GUARD", "u,x,x,x",
/* 0x02 */"MST_$UNMAP_GLOBAL", "u,x,x,x", /* 0x02 */"MST_$UNMAP_GLOBAL", "u,x,x,x",
@ -621,7 +621,7 @@ static const char* trap4[] = {
// TRAP5 // TRAP5
//------------------------------------------------------ //------------------------------------------------------
static const char* trap5[] = { static char const *const trap5[] = {
/* 0x00 */nullptr, nullptr, /* 0x00 */nullptr, nullptr,
/* 0x01 */"MST_$MAP_AREA", "x,x,x,u,x", /* 0x01 */"MST_$MAP_AREA", "x,x,x,u,x",
/* 0x02 */nullptr, nullptr, /* 0x02 */nullptr, nullptr,
@ -732,7 +732,7 @@ static const char* trap5[] = {
// TRAP7 // TRAP7
//------------------------------------------------------ //------------------------------------------------------
static const char* trap7[] = { static char const *const trap7[] = {
/* 0x00 */"FILE_$LOCK", "u,x,x,x,x,x,x", /* 0x00 */"FILE_$LOCK", "u,x,x,x,x,x,x",
/* 0x01 */"VFMT_$WRITE", "s,x,x,x,x,x,x", /* 0x01 */"VFMT_$WRITE", "s,x,x,x,x,x,x",
/* 0x02 */"MST_$MAP_AREA_AT", "x,x,x,x,x,x,x", /* 0x02 */"MST_$MAP_AREA_AT", "x,x,x,x,x,x,x",
@ -799,7 +799,7 @@ static const char* trap7[] = {
// TRAP8 // TRAP8
//------------------------------------------------------ //------------------------------------------------------
static const char* trap8[] = { static char const *const trap8[] = {
/* 0x00 - 0x07 */"MST_$MAP", "u,x,x,x,x,x,x", /* 0x00 - 0x07 */"MST_$MAP", "u,x,x,x,x,x,x",
/* 0x01 - 0x08 */"MST_$MAP_AT", "x,u,x,x,x,x,x,x", /* 0x01 - 0x08 */"MST_$MAP_AT", "x,u,x,x,x,x,x,x",
/* 0x02 - 0x07 */"MST_$MAP_GLOBAL", "u,x,x,x,x,x,x", /* 0x02 - 0x07 */"MST_$MAP_GLOBAL", "u,x,x,x,x,x,x",

4
src/mame/machine/esqpanel.h
View File

@ -114,10 +114,6 @@ protected:
virtual bool write_contents(std::ostream &o) override; virtual bool write_contents(std::ostream &o) override;
required_device<esq2x40_device> m_vfd; required_device<esq2x40_device> m_vfd;
private:
static const char *html;
static const char *js;
}; };
class esqpanel2x40_sq1_device : public esqpanel_device { class esqpanel2x40_sq1_device : public esqpanel_device {

12
src/mame/machine/ioc2.cpp
View File

@ -10,12 +10,12 @@
#include "bus/rs232/rs232.h" #include "bus/rs232/rs232.h"
#include "machine/ioc2.h" #include "machine/ioc2.h"
/*static*/ const char *ioc2_device::SCC_TAG = "scc"; /*static*/ char const *const ioc2_device::SCC_TAG = "scc";
/*static*/ const char *ioc2_device::PI1_TAG = "pi1"; /*static*/ char const *const ioc2_device::PI1_TAG = "pi1";
/*static*/ const char *ioc2_device::KBDC_TAG = "kbdc"; /*static*/ char const *const ioc2_device::KBDC_TAG = "kbdc";
/*static*/ const char *ioc2_device::PIT_TAG = "pit"; /*static*/ char const *const ioc2_device::PIT_TAG = "pit";
/*static*/ const char *ioc2_device::RS232A_TAG = "rs232a"; /*static*/ char const *const ioc2_device::RS232A_TAG = "rs232a";
/*static*/ const char *ioc2_device::RS232B_TAG = "rs232b"; /*static*/ char const *const ioc2_device::RS232B_TAG = "rs232b";
/*static*/ const XTAL ioc2_device::SCC_PCLK = 10_MHz_XTAL; /*static*/ const XTAL ioc2_device::SCC_PCLK = 10_MHz_XTAL;
/*static*/ const XTAL ioc2_device::SCC_RXA_CLK = 3.6864_MHz_XTAL; // Needs verification /*static*/ const XTAL ioc2_device::SCC_RXA_CLK = 3.6864_MHz_XTAL; // Needs verification

12
src/mame/machine/ioc2.h
View File

@ -167,12 +167,12 @@ protected:
uint32_t m_par_cntl; uint32_t m_par_cntl;
uint8_t m_system_id; uint8_t m_system_id;
static const char *SCC_TAG; static char const *const SCC_TAG;
static const char *PI1_TAG; static char const *const PI1_TAG;
static const char *KBDC_TAG; static char const *const KBDC_TAG;
static const char *PIT_TAG; static char const *const PIT_TAG;
static const char *RS232A_TAG; static char const *const RS232A_TAG;
static const char *RS232B_TAG; static char const *const RS232B_TAG;
static const XTAL SCC_PCLK; static const XTAL SCC_PCLK;
static const XTAL SCC_RXA_CLK; static const XTAL SCC_RXA_CLK;

4
src/mame/machine/macadb.cpp
View File

@ -72,7 +72,7 @@ enum
* *************************************************************************/ * *************************************************************************/
#if LOG_ADB #if LOG_ADB
static const char *const adb_statenames[4] = { "NEW", "EVEN", "ODD", "IDLE" }; static char const *const adb_statenames[4] = { "NEW", "EVEN", "ODD", "IDLE" };
#endif #endif
int mac_state::adb_pollkbd(int update) int mac_state::adb_pollkbd(int update)
@ -1223,7 +1223,7 @@ void mac_state::adb_reset()
WRITE_LINE_MEMBER(mac_state::adb_linechange_w) WRITE_LINE_MEMBER(mac_state::adb_linechange_w)
{ {
int dtime = 0; int dtime = 0;
/* static const char *states[] = /* static char const *const states[] =
{ {
"idle", "idle",
"attention", "attention",

2
src/mame/machine/psion_pack.cpp
View File

@ -49,7 +49,7 @@ OPTION_GUIDE_START( datapack_option_guide )
OPTION_INT('C', "copy", "Copyable" ) OPTION_INT('C', "copy", "Copyable" )
OPTION_GUIDE_END OPTION_GUIDE_END
static const char *datapack_option_spec = static char const *const datapack_option_spec =
"S1/2/4/[8]/16;R0/[1];P[0]/1;W[0]/1;B[0]/1;C0/[1]"; "S1/2/4/[8]/16;R0/[1];P[0]/1;W[0]/1;B[0]/1;C0/[1]";

6
src/mame/video/apollo.cpp
View File

@ -285,17 +285,17 @@ uint32_t apollo_graphics_15i::bt458::get_rgb(uint8_t index)
const char *apollo_graphics_15i::cr_text(offs_t offset, uint8_t data, uint8_t rw) const char *apollo_graphics_15i::cr_text(offs_t offset, uint8_t data, uint8_t rw)
{ {
static const char *cr0[8] = static char const *const cr0[8] =
{ "cr0 mode=0 CPU dest BLT", "cr0 mode=1 Alternating BLT", { "cr0 mode=0 CPU dest BLT", "cr0 mode=1 Alternating BLT",
"cr0 mode=2 Vector mode", "cr0 mode=3 CPU Source BLT", "cr0 mode=2 Vector mode", "cr0 mode=3 CPU Source BLT",
"cr0 mode=4 Double access BLT ", "cr0 mode=5 ???", "cr0 mode=4 Double access BLT ", "cr0 mode=5 ???",
"cr0 mode=6 ???", "cr0 mode=7 Normal" }; "cr0 mode=6 ???", "cr0 mode=7 Normal" };
static const char *cr2[4] = static char const *const cr2[4] =
{ "cr2 Constant access", "cr2 Pixel access", "cr2 ???", { "cr2 Constant access", "cr2 Pixel access", "cr2 ???",
"cr2 Plane access" }; "cr2 Plane access" };
static const char *cr2b[4] = static char const *const cr2b[4] =
{ "cr2b Constant access", "cr2b Pixel access", "cr2b ???", { "cr2b Constant access", "cr2b Pixel access", "cr2b ???",
"cr2b Plane access" }; "cr2b Plane access" };

2
src/mame/video/k053250_ps.cpp
View File

@ -556,7 +556,7 @@ READ_LINE_MEMBER(k053250ps_device::dmairq_r)
WRITE16_MEMBER(k053250ps_device::reg_w) WRITE16_MEMBER(k053250ps_device::reg_w)
{ {
#if 0 #if 0
static const char * regnames[] = static char const *const regnames[] =
{ {
"SCROLL_X_L", "SCROLL_X_L",
"SCROLL_X_H", "SCROLL_X_H",

12
src/mame/video/n64.cpp
View File

@ -600,7 +600,7 @@ void n64_rdp::set_blender_input(int32_t cycle, int32_t which, color_t** input_rg
} }
} }
const uint8_t n64_rdp::s_bayer_matrix[16] = uint8_t const n64_rdp::s_bayer_matrix[16] =
{ /* Bayer matrix */ { /* Bayer matrix */
0, 4, 1, 5, 0, 4, 1, 5,
6, 2, 7, 3, 6, 2, 7, 3,
@ -608,7 +608,7 @@ const uint8_t n64_rdp::s_bayer_matrix[16] =
7, 3, 6, 2 7, 3, 6, 2
}; };
const uint8_t n64_rdp::s_magic_matrix[16] = uint8_t const n64_rdp::s_magic_matrix[16] =
{ /* Magic square matrix */ { /* Magic square matrix */
0, 6, 1, 7, 0, 6, 1, 7,
4, 2, 5, 3, 4, 2, 5, 3,
@ -616,7 +616,7 @@ const uint8_t n64_rdp::s_magic_matrix[16] =
7, 1, 6, 0 7, 1, 6, 0
}; };
const z_decompress_entry_t n64_rdp::m_z_dec_table[8] = z_decompress_entry_t const n64_rdp::m_z_dec_table[8] =
{ {
{ 6, 0x00000 }, { 6, 0x00000 },
{ 5, 0x20000 }, { 5, 0x20000 },
@ -1109,10 +1109,10 @@ uint64_t n64_rdp::read_data(uint32_t address)
} }
} }
const char* n64_rdp::s_image_format[] = { "RGBA", "YUV", "CI", "IA", "I", "???", "???", "???" }; char const *const n64_rdp::s_image_format[] = { "RGBA", "YUV", "CI", "IA", "I", "???", "???", "???" };
const char* n64_rdp::s_image_size[] = { "4-bit", "8-bit", "16-bit", "32-bit" }; char const *const n64_rdp::s_image_size[] = { "4-bit", "8-bit", "16-bit", "32-bit" };
const int32_t n64_rdp::s_rdp_command_length[64] = int32_t const n64_rdp::s_rdp_command_length[64] =
{ {
8, // 0x00, No Op 8, // 0x00, No Op
8, // 0x01, ??? 8, // 0x01, ???

14
src/mame/video/n64.h
View File

@ -374,14 +374,14 @@ private:
pin64_t m_capture; pin64_t m_capture;
static uint32_t s_special_9bit_clamptable[512]; static uint32_t s_special_9bit_clamptable[512];
static const z_decompress_entry_t m_z_dec_table[8]; static z_decompress_entry_t const m_z_dec_table[8];
static const uint8_t s_bayer_matrix[16]; static uint8_t const s_bayer_matrix[16];
static const uint8_t s_magic_matrix[16]; static uint8_t const s_magic_matrix[16];
static const rdp_command_t m_commands[0x40]; static rdp_command_t const m_commands[0x40];
static const int32_t s_rdp_command_length[]; static int32_t const s_rdp_command_length[];
static const char* s_image_format[]; static char const *const s_image_format[];
static const char* s_image_size[]; static char const *const s_image_size[];
public: public:
bool ignore; bool ignore;

14
src/mame/video/xbox_nv2a.cpp
View File

@ -10,13 +10,13 @@
//#define LOG_NV2A //#define LOG_NV2A
#define DEBUG_CHECKS // enable for debugging #define DEBUG_CHECKS // enable for debugging
const char *vertex_program_disassembler::srctypes[] = { "??", "Rn", "Vn", "Cn" }; char const *const vertex_program_disassembler::srctypes[] = { "??", "Rn", "Vn", "Cn" };
const char *vertex_program_disassembler::scaops[] = { "NOP", "IMV", "RCP", "RCC", "RSQ", "EXP", "LOG", "LIT", "???", "???", "???", "???", "???", "???", "???", "???", "???" }; char const *const vertex_program_disassembler::scaops[] = { "NOP", "IMV", "RCP", "RCC", "RSQ", "EXP", "LOG", "LIT", "???", "???", "???", "???", "???", "???", "???", "???", "???" };
const int vertex_program_disassembler::scapar2[] = { 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; int const vertex_program_disassembler::scapar2[] = { 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
const char *vertex_program_disassembler::vecops[] = { "NOP", "MOV", "MUL", "ADD", "MAD", "DP3", "DPH", "DP4", "DST", "MIN", "MAX", "SLT", "SGE", "ARL", "???", "???", "???" }; char const *const vertex_program_disassembler::vecops[] = { "NOP", "MOV", "MUL", "ADD", "MAD", "DP3", "DPH", "DP4", "DST", "MIN", "MAX", "SLT", "SGE", "ARL", "???", "???", "???" };
const int vertex_program_disassembler::vecpar2[] = { 0, 4, 6, 5, 7, 6, 6, 6, 6, 6, 6, 6, 6, 4, 0, 0, 0 }; int const vertex_program_disassembler::vecpar2[] = { 0, 4, 6, 5, 7, 6, 6, 6, 6, 6, 6, 6, 6, 4, 0, 0, 0 };
const char *vertex_program_disassembler::vecouts[] = { "oPos", "???", "???", "oD0", "oD1", "oFog", "oPts", "oB0", "oB1", "oT0", "oT1", "oT2", "oT3" }; char const *const vertex_program_disassembler::vecouts[] = { "oPos", "???", "???", "oD0", "oD1", "oFog", "oPts", "oB0", "oB1", "oT0", "oT1", "oT2", "oT3" };
const char vertex_program_disassembler::compchar[] = { 'x', 'y', 'z', 'w' }; char const vertex_program_disassembler::compchar[] = { 'x', 'y', 'z', 'w' };
/* /*
Each vertex program instruction is a 128 bit word made of the fields: Each vertex program instruction is a 128 bit word made of the fields:

10
src/osd/modules/opengl/gl_shader_mgr.cpp
View File

@ -15,12 +15,12 @@
#ifdef GLSL_SOURCE_ON_DISK #ifdef GLSL_SOURCE_ON_DISK
static const char * glsl_mamebm_vsh_files [GLSL_VERTEX_SHADER_INT_NUMBER] = static char const *const glsl_mamebm_vsh_files [GLSL_VERTEX_SHADER_INT_NUMBER] =
{ {
"/tmp/glsl_general.vsh" // general "/tmp/glsl_general.vsh" // general
}; };
static const char * glsl_mamebm_fsh_files [GLSL_SHADER_FEAT_INT_NUMBER] = static char const *const glsl_mamebm_fsh_files [GLSL_SHADER_FEAT_INT_NUMBER] =
{ {
"/tmp/glsl_plain_rgb32_dir.fsh", // rgb32 dir plain "/tmp/glsl_plain_rgb32_dir.fsh", // rgb32 dir plain
"/tmp/glsl_bilinear_rgb32_dir.fsh", // rgb32 dir bilinear "/tmp/glsl_bilinear_rgb32_dir.fsh", // rgb32 dir bilinear
@ -35,12 +35,12 @@ static const char * glsl_mamebm_fsh_files [GLSL_SHADER_FEAT_INT_NUMBER] =
#include "shader/glsl_bilinear_rgb32_dir.fsh.c" #include "shader/glsl_bilinear_rgb32_dir.fsh.c"
#include "shader/glsl_bicubic_rgb32_dir.fsh.c" #include "shader/glsl_bicubic_rgb32_dir.fsh.c"
static const char * glsl_mamebm_vsh_sources [GLSL_VERTEX_SHADER_INT_NUMBER] = static char const *const glsl_mamebm_vsh_sources [GLSL_VERTEX_SHADER_INT_NUMBER] =
{ {
glsl_general_vsh_src // general glsl_general_vsh_src // general
}; };
static const char * glsl_mamebm_fsh_sources [GLSL_SHADER_FEAT_INT_NUMBER] = static char const *const glsl_mamebm_fsh_sources [GLSL_SHADER_FEAT_INT_NUMBER] =
{ {
glsl_plain_rgb32_dir_fsh_src, // rgb32 dir plain glsl_plain_rgb32_dir_fsh_src, // rgb32 dir plain
glsl_bilinear_rgb32_dir_fsh_src, // rgb32 dir bilinear glsl_bilinear_rgb32_dir_fsh_src, // rgb32 dir bilinear
@ -49,7 +49,7 @@ static const char * glsl_mamebm_fsh_sources [GLSL_SHADER_FEAT_INT_NUMBER] =
#endif // GLSL_SOURCE_ON_DISK #endif // GLSL_SOURCE_ON_DISK
static const char * glsl_mamebm_filter_names [GLSL_SHADER_FEAT_MAX_NUMBER] = static char const *const glsl_mamebm_filter_names [GLSL_SHADER_FEAT_MAX_NUMBER] =
{ {
"plain", "plain",
"bilinear", "bilinear",

8
src/osd/modules/render/drawbgfx.cpp
View File

@ -55,10 +55,10 @@
// CONSTANTS // CONSTANTS
//============================================================ //============================================================
const uint16_t renderer_bgfx::CACHE_SIZE = 1024; uint16_t const renderer_bgfx::CACHE_SIZE = 1024;
const uint32_t renderer_bgfx::PACKABLE_SIZE = 128; uint32_t const renderer_bgfx::PACKABLE_SIZE = 128;
const uint32_t renderer_bgfx::WHITE_HASH = 0x87654321; uint32_t const renderer_bgfx::WHITE_HASH = 0x87654321;
const char* renderer_bgfx::WINDOW_PREFIX = "Window 0, "; char const *const renderer_bgfx::WINDOW_PREFIX = "Window 0, ";
//============================================================ //============================================================
// MACROS // MACROS

2
src/osd/modules/render/drawbgfx.h
View File

@ -80,7 +80,7 @@ public:
return &win->target()->get_primitives(); return &win->target()->get_primitives();
} }
static const char* WINDOW_PREFIX; static char const *const WINDOW_PREFIX;
private: private:
void vertex(ScreenVertex* vertex, float x, float y, float z, uint32_t rgba, float u, float v); void vertex(ScreenVertex* vertex, float x, float y, float z, uint32_t rgba, float u, float v);