diff options
Diffstat (limited to 'src/emu')
52 files changed, 442 insertions, 442 deletions
diff --git a/src/emu/addrmap.c b/src/emu/addrmap.c index ea44d804bf7..6e3e9ce6975 100644 --- a/src/emu/addrmap.c +++ b/src/emu/addrmap.c @@ -190,9 +190,9 @@ void address_map_entry::set_write_bank(const device_config &devconfig, const cha void address_map_entry::set_readwrite_bank(const device_config &devconfig, const char *tag) { - m_read.m_type = AMH_BANK; + m_read.m_type = AMH_BANK; m_read.set_tag(devconfig, tag); - m_write.m_type = AMH_BANK; + m_write.m_type = AMH_BANK; m_write.set_tag(devconfig, tag); } diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h index a9bee27fed8..2cc2da6f90e 100644 --- a/src/emu/addrmap.h +++ b/src/emu/addrmap.h @@ -105,7 +105,7 @@ class address_map_entry public: // construction/destruction address_map_entry(address_map &map, offs_t start, offs_t end); - + // getters address_map_entry *next() const { return m_next; } @@ -670,7 +670,7 @@ void ADDRESS_MAP_NAME(_name)(address_map &map, const device_config &devconfig) \ #define AM_RAM_READ(_read) AM_READ(_read) AM_WRITEONLY #define AM_RAM_WRITE(_write) AM_READONLY AM_WRITE(_write) #define AM_RAM_DEVREAD(_tag, _read) AM_DEVREAD(_tag, _read) AM_WRITEONLY -#define AM_RAM_DEVWRITE(_tag, _write) AM_READONLY AM_DEVWRITE(_tag, _write) +#define AM_RAM_DEVWRITE(_tag, _write) AM_READONLY AM_DEVWRITE(_tag, _write) #define AM_BASE_SIZE_MEMBER(_struct, _base, _size) AM_BASE_MEMBER(_struct, _base) AM_SIZE_MEMBER(_struct, _size) #define AM_BASE_SIZE_GENERIC(_member) AM_BASE_GENERIC(_member) AM_SIZE_GENERIC(_member) diff --git a/src/emu/cpu/dsp56k/dsp56dsm.c b/src/emu/cpu/dsp56k/dsp56dsm.c index 8cc109c2dc4..4a9aead9d67 100644 --- a/src/emu/cpu/dsp56k/dsp56dsm.c +++ b/src/emu/cpu/dsp56k/dsp56dsm.c @@ -1,8 +1,8 @@ /*************************************************************************** - dsp56dsm.c - Disassembler for the portable Motorola/Freescale dsp56k emulator. - Written by Andrew Gardner + dsp56dsm.c + Disassembler for the portable Motorola/Freescale dsp56k emulator. + Written by Andrew Gardner ***************************************************************************/ diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c index 42c8bce9e2b..b526067a95b 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -21,7 +21,7 @@ - 1-9 For fractional arithmetic, the 31-bit product is added to the 40-bit contents of A or B. No pipeline! - 1-10 Two types of rounding: convergent rounding and two's complement rounding. See status register bit R. - 1-10 Logic unit is 16-bits wide and works on MSP portion of accum register - - 1-10 The AGU can implement three types of arithmetic: linear, modulo, and reverse carry. + - 1-10 The AGU can implement three types of arithmetic: linear, modulo, and reverse carry. - 1-12 "Two external interrupt pins!!!" - 1-12 Take care of all interrupt priority (IPR) stuff! - 1-19 Memory WAIT states @@ -319,7 +319,7 @@ static size_t execute_one_new(dsp56k_core* cpustate) UINT16 w0 = ROPCODE(ADDRESS(PC)); UINT16 w1 = ROPCODE(ADDRESS(PC) + ADDRESS(1)); - + Opcode op(w0, w1); op.evaluate(cpustate); PC += op.evalSize(); // Special size function needed to handle jmps, etc. @@ -505,8 +505,8 @@ CPU_GET_INFO( dsp56k ) case CPUINFO_INT_CLOCK_DIVIDER: info->i = 2; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 4; break; - case CPUINFO_INT_MIN_CYCLES: info->i = 1; // ? break; - case CPUINFO_INT_MAX_CYCLES: info->i = 8; // ? break; + case CPUINFO_INT_MIN_CYCLES: info->i = 1; // ? break; + case CPUINFO_INT_MAX_CYCLES: info->i = 8; // ? break; case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break; case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break; diff --git a/src/emu/cpu/dsp56k/inst.c b/src/emu/cpu/dsp56k/inst.c index 23838d6c73f..e19648e95ba 100644 --- a/src/emu/cpu/dsp56k/inst.c +++ b/src/emu/cpu/dsp56k/inst.c @@ -5,8 +5,8 @@ namespace DSP56K { // Factory -Instruction* Instruction::decodeInstruction(const Opcode* opc, - const UINT16 word0, +Instruction* Instruction::decodeInstruction(const Opcode* opc, + const UINT16 word0, const UINT16 word1, bool shifted) { @@ -18,7 +18,7 @@ Instruction* Instruction::decodeInstruction(const Opcode* opc, w0 = w1; w1 = 0x0000; } - + /**************************************************************************/ /* The very funky case of the XMemoryDataMoveWithShortDisplacement */ /**************************************************************************/ @@ -112,8 +112,8 @@ Instruction* Instruction::decodeInstruction(const Opcode* opc, /* No Parallel Data Move : 0100 1010 .... .... : A-131 */ /* Register to Register Data Move : 0100 IIII .... .... : A-133 */ /* Address Register Update : 0011 0zRR .... .... : A-135 */ - /* X Memory Data Move : 1mRR HHHW .... .... : A-137 */ - /* X Memory Data Move : 0101 HHHW .... .... : A-137 */ + /* X Memory Data Move : 1mRR HHHW .... .... : A-137 */ + /* X Memory Data Move : 0101 HHHW .... .... : A-137 */ /* Quote: (32 General parallel move instructions) */ /****************************************************************/ else if (((w0 & 0xff00) == 0x4a00) || diff --git a/src/emu/cpu/dsp56k/inst.h b/src/emu/cpu/dsp56k/inst.h index d42995a5a3c..3bc076d1be4 100644 --- a/src/emu/cpu/dsp56k/inst.h +++ b/src/emu/cpu/dsp56k/inst.h @@ -26,7 +26,7 @@ public: Instruction(const Opcode* oco) : m_valid(false), m_oco(oco), m_sizeIncrement(0), - m_source(iINVALID), + m_source(iINVALID), m_destination(iINVALID) { } virtual ~Instruction() {} @@ -39,9 +39,9 @@ public: virtual size_t accumulatorBitsModified() const = 0; // Potentially make this always return ALL (like flags) virtual size_t flags() const { return 0; } - static Instruction* decodeInstruction(const Opcode* opc, - const UINT16 word0, - const UINT16 word1, + static Instruction* decodeInstruction(const Opcode* opc, + const UINT16 word0, + const UINT16 word1, bool shifted=false); const bool valid() const { return m_valid; } @@ -70,7 +70,7 @@ protected: class Abs: public Instruction { public: - Abs(const Opcode* oco, const UINT16 word0, const UINT16 word1) : Instruction(oco) + Abs(const Opcode* oco, const UINT16 word0, const UINT16 word1) : Instruction(oco) { m_valid = decode(word0, word1); } @@ -98,7 +98,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JF_table(BITSn(word0,0x0001), BITSn(word0,0x0008), + decode_JF_table(BITSn(word0,0x0001), BITSn(word0,0x0008), m_source, m_destination); return true; } @@ -121,7 +121,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), + decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -147,7 +147,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_uuuuF_table(BITSn(word0,0x17), BITSn(word0,0x08), + decode_uuuuF_table(BITSn(word0,0x17), BITSn(word0,0x08), m_opcode, m_source, m_destination); // TODO: m_opcode = "add"; return true; @@ -175,7 +175,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), + decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), m_source, m_destination); return true; } @@ -213,7 +213,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT8 m_immediate; }; @@ -354,7 +354,7 @@ public: case BBB_UPPER: m_iVal <<= 8; break; case BBB_MIDDLE: m_iVal <<= 4; break; case BBB_LOWER: m_iVal <<= 0; break; - + case BBB_INVALID: return false; break; } @@ -415,7 +415,7 @@ public: case BBB_UPPER: m_iVal <<= 8; break; case BBB_MIDDLE: m_iVal <<= 4; break; case BBB_LOWER: m_iVal <<= 0; break; - + case BBB_INVALID: return false; break; } @@ -449,7 +449,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: reg_id m_r; UINT16 m_iVal; @@ -481,7 +481,7 @@ public: case BBB_UPPER: m_iVal <<= 8; break; case BBB_MIDDLE: m_iVal <<= 4; break; case BBB_LOWER: m_iVal <<= 0; break; - + case BBB_INVALID: return false; break; } @@ -538,7 +538,7 @@ public: { std::string opcode = "b" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "b.%s", M); - + char temp[32]; sprintf(temp, ">*+$%x", 2 + m_immediate); // NEW // sprintf(temp, "$%04x (%d)", pc + 2 + (INT16)word1, (INT16)word1); @@ -547,7 +547,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: op_mnem m_mnem; INT16 m_immediate; @@ -573,7 +573,7 @@ public: { std::string opcode = "b" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "b.%s", M); - + char temp[32]; if (m_immediate >= 0) sprintf(temp, "<*+$%x", m_immediate + 1); else sprintf(temp, "<*-$%x", 1 - m_immediate - 2); @@ -643,7 +643,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT16 m_immediate; }; @@ -673,7 +673,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_immediate; }; @@ -760,7 +760,7 @@ public: size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } size_t flags() { return DASMFLAG_STEP_OVER; } - + private: op_mnem m_mnem; INT16 m_immediate; @@ -822,7 +822,7 @@ public: size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } size_t flags() { return DASMFLAG_STEP_OVER; } - + private: INT16 m_immediate; }; @@ -926,8 +926,8 @@ public: bool decode(const UINT16 word0, const UINT16 word1) { /* Note: This is a JJJF limited in the docs, but other opcodes sneak - in before cmp, so the same decode function can be used. */ - decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), + in before cmp, so the same decode function can be used. */ + decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -951,8 +951,8 @@ public: bool decode(const UINT16 word0, const UINT16 word1) { /* Note: This is a JJJF limited in the docs, but other opcodes sneak - in before cmp, so the same decode function can be used. */ - decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), + in before cmp, so the same decode function can be used. */ + decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -1068,7 +1068,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_DDF_table(BITSn(word0,0x0003), BITSn(word0,0x0008), + decode_DDF_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_destination); return true; } @@ -1093,7 +1093,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), + decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_source2, m_destination); decode_ss_table(BITSn(word0,0x0024), m_mnem); @@ -1103,16 +1103,16 @@ public: void disassemble(std::string& retString) const { std::string opcode = "dmac" + opMnemonicAsString(m_mnem); - - retString = opcode + " " + - regIdAsString(m_source) + "," + + + retString = opcode + " " + + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "dmac(%s)", A); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: op_mnem m_mnem; reg_id m_source2; @@ -1139,10 +1139,10 @@ public: sprintf(temp, "*+$%x", 2 + m_immediate); std::string destination = temp; // NEW // sprintf(temp, "X:(R%d),$%02x", Rnum, pc + 2 + word1); - + sprintf(temp, "X:(%s)", regIdAsString(m_source).c_str()); std::string source = temp; - + retString = "do " + source + "," + destination; } void evaluate(dsp56k_core* cpustate) {} @@ -1179,7 +1179,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT8 m_immediate; UINT16 m_displacement; @@ -1197,7 +1197,7 @@ public: bool decode(const UINT16 word0, const UINT16 word1) { m_displacement = word1; - + decode_DDDDD_table(BITSn(word0,0x001f), m_source); if (m_source == iSSH) return false; if (m_source == iINVALID) return false; @@ -1213,7 +1213,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT16 m_displacement; }; @@ -1243,7 +1243,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT16 m_displacement; }; @@ -1279,7 +1279,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), + decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), m_source, m_destination); return true; } @@ -1346,20 +1346,20 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), + decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "imac " + - regIdAsString(m_source) + "," + + retString = "imac " + + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: reg_id m_source2; }; @@ -1375,13 +1375,13 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), + decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "impy " + + retString = "impy " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } @@ -1457,7 +1457,7 @@ public: { std::string opcode = "j" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "j.%s", M); - + char temp[32]; sprintf(temp, ">$%x", m_displacement); // NEW // sprintf(temp, "$%04x", word1); @@ -1590,7 +1590,7 @@ public: { std::string opcode = "js" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "js.%s", M); - + char temp[32]; sprintf(temp, ">$%x", m_displacement); // NEW // sprintf(temp, "$%04x", word1); @@ -1691,7 +1691,7 @@ public: size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } size_t flags() { return DASMFLAG_STEP_OVER; } - + private: UINT8 m_bAddr; }; @@ -1747,7 +1747,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: std::string m_ea; }; @@ -1840,7 +1840,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), + decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_source2, m_destination); decode_kSign_table(BITSn(word0,0x40), m_sign); @@ -1850,9 +1850,9 @@ public: { std::string ts = m_sign; if (ts != "-") ts = ""; - retString = "mac " + + retString = "mac " + ts + - regIdAsString(m_source) + "," + + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} @@ -1875,13 +1875,13 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), + decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "mac " + + retString = "mac " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } @@ -1904,13 +1904,13 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), + decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "mac " + + retString = "mac " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } @@ -1934,7 +1934,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), + decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_source2, m_destination); decode_kSign_table(BITSn(word0,0x40), m_sign); @@ -1944,9 +1944,9 @@ public: { std::string ts = m_sign; if (ts != "-") ts = ""; - retString = "macr " + + retString = "macr " + ts + - regIdAsString(m_source) + "," + + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} @@ -1969,14 +1969,14 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), + decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "macr " + - regIdAsString(m_source) + "," + + retString = "macr " + + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} @@ -2000,7 +2000,7 @@ public: bool decode(const UINT16 word0, const UINT16 word1) { // Special QQF - decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), + decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_source2, m_destination); decode_s_table(BITSn(word0,0x0004), m_mnem); @@ -2009,9 +2009,9 @@ public: void disassemble(std::string& retString) const { std::string opcode = "mac" + opMnemonicAsString(m_mnem); - - retString = opcode + " " + - regIdAsString(m_source) + "," + + + retString = opcode + " " + + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "mac(%s)", A); } @@ -2122,7 +2122,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_b; UINT8 m_W; @@ -2161,7 +2161,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_W; reg_id m_SD; @@ -2316,7 +2316,7 @@ public: } size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT8 m_t; UINT8 m_W; @@ -2381,7 +2381,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_b; UINT8 m_W; @@ -2411,14 +2411,14 @@ public: else sprintf(temp, "#<-$%x", 1 - m_immediate - 1); // NEW // sprintf(temp, "#$%02x,%s", BITSn(word0,0x00ff), D1); - retString = "move " + + retString = "move " + std::string(temp) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "move(i)"); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_immediate; }; @@ -2498,7 +2498,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT8 m_W; std::string m_ea; @@ -2534,7 +2534,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 2; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_b; UINT8 m_W; @@ -2677,8 +2677,8 @@ public: bool decode(const UINT16 word0, const UINT16 word1) { /* There are inconsistencies with the S1 & S2 operand ordering in the docs, - but since it's a multiply it doesn't matter */ - decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), + but since it's a multiply it doesn't matter */ + decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_source2, m_destination); decode_kSign_table(BITSn(word0,0x40), m_sign); @@ -2688,7 +2688,7 @@ public: { std::string ts = m_sign; if (ts != "-") ts = ""; - retString = "mpy " + + retString = "mpy " + ts + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); @@ -2696,7 +2696,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: std::string m_sign; reg_id m_source2; @@ -2713,20 +2713,20 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), + decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "mpy " + + retString = "mpy " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: reg_id m_source2; }; @@ -2742,20 +2742,20 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), + decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "mpy " + + retString = "mpy " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: reg_id m_source2; }; @@ -2773,8 +2773,8 @@ public: bool decode(const UINT16 word0, const UINT16 word1) { /* There are inconsistencies with the S1 & S2 operand ordering in the docs, - but since it's a multiply it doesn't matter */ - decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), + but since it's a multiply it doesn't matter */ + decode_QQQF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_source2, m_destination); decode_kSign_table(BITSn(word0,0x40), m_sign); @@ -2784,7 +2784,7 @@ public: { std::string ts = m_sign; if (ts != "-") ts = ""; - retString = "mpyr " + + retString = "mpyr " + ts + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); @@ -2792,7 +2792,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: std::string m_sign; reg_id m_source2; @@ -2809,20 +2809,20 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), + decode_QQF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_source2, m_destination); return true; } void disassemble(std::string& retString) const { - retString = "mpyr " + + retString = "mpyr " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: reg_id m_source2; }; @@ -2839,7 +2839,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), + decode_QQF_special_table(BITSn(word0,0x0003), BITSn(word0,0x0008), m_source, m_source2, m_destination); decode_s_table(BITSn(word0,0x0004), m_mnem); @@ -2848,8 +2848,8 @@ public: void disassemble(std::string& retString) const { std::string opcode = "mpy" + opMnemonicAsString(m_mnem); - - retString = opcode + " " + + + retString = opcode + " " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); // NEW // sprintf(opcode_str, "mpy(%s)", A); @@ -2857,7 +2857,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: op_mnem m_mnem; reg_id m_source2; @@ -2984,7 +2984,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), + decode_JJF_table(BITSn(word0,0x03),BITSn(word0,0x08), m_source, m_destination); return true; } @@ -3023,7 +3023,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: UINT8 m_immediate; }; @@ -3273,7 +3273,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JF_table(BITSn(word0,0x01), BITSn(word0,0x08), + decode_JF_table(BITSn(word0,0x01), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -3317,7 +3317,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), + decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -3341,7 +3341,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_uuuuF_table(BITSn(word0,0x17), BITSn(word0,0x08), + decode_uuuuF_table(BITSn(word0,0x17), BITSn(word0,0x08), m_opcode, m_source, m_destination); // TODO // m_opcode = "sub"; @@ -3354,7 +3354,7 @@ public: void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: std::string m_opcode; }; @@ -3446,9 +3446,9 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_h0hF_table(BITSn(word0,0x0007),BITSn(word0,0x0008), + decode_h0hF_table(BITSn(word0,0x0007),BITSn(word0,0x0008), m_source, m_destination); - + decode_RR_table(BITSn(word0,0x0030), m_destination2); decode_cccc_table(BITSn(word0,0x03c0), m_mnem); @@ -3456,25 +3456,25 @@ public: return true; if (m_destination2 != iR0) return true; - + return false; } void disassemble(std::string& retString) const { std::string opcode = "t" + opMnemonicAsString(m_mnem); // NEW // sprintf(opcode_str, "t.%s", M); - + retString = opcode; if (m_source != m_destination) retString += std::string(" ") + regIdAsString(m_source) + "," + regIdAsString(m_destination); - + if (m_destination2 != iR0) retString += std::string(" R0,") + regIdAsString(m_destination2); } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: op_mnem m_mnem; reg_id m_destination2; @@ -3490,7 +3490,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), + decode_JJJF_table(BITSn(word0,0x07), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -3513,7 +3513,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_DDF_table(BITSn(word0,0x03), BITSn(word0,0x08), + decode_DDF_table(BITSn(word0,0x03), BITSn(word0,0x08), m_source, m_destination); return true; } @@ -3536,7 +3536,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_JF_table(BITSn(word0,0x0001),BITSn(word0,0x0008), + decode_JF_table(BITSn(word0,0x0001),BITSn(word0,0x0008), m_destination, m_source); return true; } @@ -3564,9 +3564,9 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_DDF_table(BITSn(word0,0x0030), BITSn(word0,0x0008), + decode_DDF_table(BITSn(word0,0x0030), BITSn(word0,0x0008), m_destination, m_source); - + decode_HHH_table(BITSn(word0,0x0007), m_SD); // If the destination of the second move is the same as the first, you're invalid if (m_SD == m_destination && BITSn(word0,0x0100)) return false; @@ -3582,14 +3582,14 @@ public: std::string source2; std::string destination2; assemble_arguments_from_W_table(m_W, 'X', m_SD, m_ea, source2, destination2); - retString = "tfr3 " + - regIdAsString(m_source) + "," + regIdAsString(m_destination) + " " + + retString = "tfr3 " + + regIdAsString(m_source) + "," + regIdAsString(m_destination) + " " + source2 + "," + destination2; } void evaluate(dsp56k_core* cpustate) {} size_t size() const { return 1; } size_t accumulatorBitsModified() const { return BM_HIGH | BM_MIDDLE | BM_LOW; } - + private: INT8 m_W; reg_id m_SD; @@ -3696,13 +3696,13 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), + decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); - + // This hackery amounts to a very strange QQQF table... if (m_source == iX0 && m_source2 == iX0) return false; if (m_source == iX1 && m_source2 == iX0) return false; - + if (m_source == iY0 && m_source2 == iX1) { m_source = iX1; @@ -3717,7 +3717,7 @@ public: } void disassemble(std::string& retString) const { - retString = "shfl " + + retString = "shfl " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } @@ -3740,13 +3740,13 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), + decode_QQQF_table(BITSn(word0,0x0007), BITSn(word0,0x0008), m_source, m_source2, m_destination); - + // This hackery amounts to a very strange QQQF table... if (m_source == iX0 && m_source2 == iX0) return false; if (m_source == iX1 && m_source2 == iX0) return false; - + if (m_source == iY0 && m_source2 == iX1) { m_source = iX1; @@ -3761,7 +3761,7 @@ public: } void disassemble(std::string& retString) const { - retString = "shfr " + + retString = "shfr " + regIdAsString(m_source) + "," + regIdAsString(m_source2) + "," + regIdAsString(m_destination); } diff --git a/src/emu/cpu/dsp56k/opcode.h b/src/emu/cpu/dsp56k/opcode.h index 710cc27844a..e3ad74771cd 100644 --- a/src/emu/cpu/dsp56k/opcode.h +++ b/src/emu/cpu/dsp56k/opcode.h @@ -33,7 +33,7 @@ public: const reg_id& instSource() const; const reg_id& instDestination() const; const size_t instAccumulatorBitsModified() const; - + private: Instruction* m_instruction; ParallelMove* m_parallelMove; diff --git a/src/emu/cpu/dsp56k/pmove.c b/src/emu/cpu/dsp56k/pmove.c index 37d60cc3a5e..a3f6a0dada4 100644 --- a/src/emu/cpu/dsp56k/pmove.c +++ b/src/emu/cpu/dsp56k/pmove.c @@ -12,7 +12,7 @@ ParallelMove* ParallelMove::decodeParallelMove(const Opcode* opc, const UINT16 w { const UINT16 w0 = word0; const UINT16 w1 = word1; - + /* Dual X Memory Data Read : 011m mKKK .rr. .... : A-142*/ if ((w0 & 0xe000) == 0x6000) { diff --git a/src/emu/cpu/dsp56k/pmove.h b/src/emu/cpu/dsp56k/pmove.h index 02ec5507b72..63a99d6196a 100644 --- a/src/emu/cpu/dsp56k/pmove.h +++ b/src/emu/cpu/dsp56k/pmove.h @@ -63,7 +63,7 @@ public: std::string ea; assemble_ea_from_m_table(BITSn(word0,0x4000), regIDAsNum(r), ea); - assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, ea, + assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, ea, m_source, m_destination); // If the destination of the instruction overlaps with our destination, abort. @@ -105,7 +105,7 @@ public: reg_id SD; decode_HHH_table(BITSn(word0,0x0e00), SD); - assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, ea, + assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, ea, m_source, m_destination); // If the destination of the instruction overlaps with our destination, abort. @@ -119,7 +119,7 @@ public: retString = m_source + "," + m_destination; } void evaluate() {} - + private: std::string m_source; std::string m_destination; @@ -190,7 +190,7 @@ public: } bool decode(const UINT16 word0, const UINT16 word1) { - decode_IIIIx_table(BITSn(word0,0x0f00), BITSn(word0,0x0008), + decode_IIIIx_table(BITSn(word0,0x0f00), BITSn(word0,0x0008), m_source, m_destination); if (m_source == iINVALID) @@ -211,7 +211,7 @@ public: // Don't return a failure, just let everything fall through (nop). //if (m_source == "?" && m_destination == "?") - // return false; + // return false; return true; } @@ -224,7 +224,7 @@ public: retString = regIdAsString(m_source) + "," + regIdAsString(m_destination); } void evaluate() {} - + private: reg_id m_source; reg_id m_destination; @@ -267,7 +267,7 @@ public: retString = pms + " " + pms2; } void evaluate() {} - + private: std::string pms; // TODO std::string pms2; @@ -296,7 +296,7 @@ public: retString = m_ea; } void evaluate() {} - + private: std::string m_ea; }; @@ -329,7 +329,7 @@ public: retString = m_source + "," + m_destination; } void evaluate() {} - + private: std::string m_source; std::string m_destination; diff --git a/src/emu/cpu/dsp56k/tables.c b/src/emu/cpu/dsp56k/tables.c index 62a018121dd..cf859a04c75 100644 --- a/src/emu/cpu/dsp56k/tables.c +++ b/src/emu/cpu/dsp56k/tables.c @@ -570,9 +570,9 @@ void assemble_D_from_P_table(UINT16 P, UINT16 ppppp, std::string& D) switch(P) { - case 0x0: - sprintf(temp, "X:<$%x", ppppp); - // NEW // sprintf(temp, "X:$%02x", ppppp); + case 0x0: + sprintf(temp, "X:<$%x", ppppp); + // NEW // sprintf(temp, "X:$%02x", ppppp); break; case 0x1: assemble_address_from_IO_short_address(ppppp, fullAddy); @@ -583,7 +583,7 @@ void assemble_D_from_P_table(UINT16 P, UINT16 ppppp, std::string& D) D = temp; } -void assemble_arguments_from_W_table(UINT16 W, char ma, const reg_id& SD, const std::string& ea, +void assemble_arguments_from_W_table(UINT16 W, char ma, const reg_id& SD, const std::string& ea, std::string& source, std::string& destination) { char temp[32]; @@ -595,7 +595,7 @@ void assemble_arguments_from_W_table(UINT16 W, char ma, const reg_id& SD, const } } -void assemble_arguments_from_W_table(UINT16 W, char ma, const std::string& SD, const std::string& ea, +void assemble_arguments_from_W_table(UINT16 W, char ma, const std::string& SD, const std::string& ea, std::string& source, std::string& destination) { char temp[32]; @@ -679,7 +679,7 @@ bool registerOverlap(const reg_id& r0, const size_t bmd, const reg_id& r1) { if (bmd == BM_NONE) return false; - + if (r0 == r1) return true; @@ -720,7 +720,7 @@ UINT16 regValue16(dsp56k_core* cpustate, const reg_id& reg) if (reg == iM1) return M1; if (reg == iM2) return M2; if (reg == iM3) return M3; - + mame_printf_debug("The dsp561xx core is requesting a 16 bit value from non-16 bit register!"); return 0xdead; } @@ -797,7 +797,7 @@ std::string regIdAsString(const reg_id& regId) case iINVALID: return "!!"; break; case iWEIRD: return "?"; break; } - + return "INVALID_REG_ID"; } @@ -821,13 +821,13 @@ std::string opMnemonicAsString(const op_mnem& mnem) case oES: return "es"; break; case oLS: return "ls"; break; case oLE: return "le"; break; - + case oSS: return "ss"; break; case oSU: return "su"; break; case oUU: return "uu"; break; case oINVALID: return "!!"; break; } - + return "INVALID_OPCODE_MNEMONIC"; } @@ -872,7 +872,7 @@ reg_id stringAsRegID(const std::string& str) if (str == "^F") return iFHAT; if (str == "!!") return iINVALID; if (str == "?") return iWEIRD; - + return iINVALID; } @@ -892,7 +892,7 @@ UINT8 regIDAsNum(const reg_id& regId) if (regId == iM1) return 1; if (regId == iM2) return 2; if (regId == iM3) return 3; - + return 255; } diff --git a/src/emu/cpu/dsp56k/tables.h b/src/emu/cpu/dsp56k/tables.h index 6636a7c59a5..fae8c5fc890 100644 --- a/src/emu/cpu/dsp56k/tables.h +++ b/src/emu/cpu/dsp56k/tables.h @@ -16,15 +16,15 @@ namespace DSP56K enum bitsModified {BM_NONE = 0x0, BM_LOW = 0x1, BM_MIDDLE = 0x2, BM_HIGH = 0x4}; enum bfShift {BBB_UPPER, BBB_MIDDLE, BBB_LOWER, BBB_INVALID}; -enum reg_id {iX, iX0, iX1, - iY, iY0, iY1, - iA, iA0, iA1, iA2, +enum reg_id {iX, iX0, iX1, + iY, iY0, iY1, + iA, iA0, iA1, iA2, iB, iB0, iB1, iB2, - iR0, iR1, iR2, iR3, - iN0, iN1, iN2, iN3, + iR0, iR1, iR2, iR3, + iN0, iN1, iN2, iN3, iM0, iM1, iM2, iM3, - iLC, iSR, iOMR, iSP, iSSH, iSSL, iLA, iMR, iCCR, - iF, iFHAT, + iLC, iSR, iOMR, iSP, iSSH, iSSL, iLA, iMR, iCCR, + iF, iFHAT, iINVALID, iWEIRD}; enum op_mnem {oCC, oGE, oNE, oPL, diff --git a/src/emu/cpu/hcd62121/hcd62121.c b/src/emu/cpu/hcd62121/hcd62121.c index 905842296a2..446b4818985 100644 --- a/src/emu/cpu/hcd62121/hcd62121.c +++ b/src/emu/cpu/hcd62121/hcd62121.c @@ -6,7 +6,7 @@ The Hitachi hcd62121 is the custom cpu which was used in the Casio CFX-9850 (and maybe some other things too). This CPU core is based on the information provided by Martin Poupe. -Martin Poupe's site can be found at http://prg.rkk.cz/~mpoupe/ +Martin Poupe's site can be found at http://prg.rkk.cz/~mpoupe/ **********************************************************************/ @@ -141,7 +141,7 @@ INLINE void read_regreg( hcd62121_state *cpustate, int size, UINT8 op1, UINT8 op cpustate->temp1[i] = cpustate->temp2[i]; cpustate->temp2[i] = v; } - } + } } @@ -382,8 +382,8 @@ static CPU_SET_INFO( hcd62121 ) case CPUINFO_INT_REGISTER + HCD62121_IP: cpustate->ip = info->i; break; case CPUINFO_INT_REGISTER + HCD62121_SP: cpustate->sp = info->i; break; -// case CPUINFO_INT_REGISTER + HCD62121_R00: break; -// case CPUINFO_INT_REGISTER + HCD62121_R02: break; +// case CPUINFO_INT_REGISTER + HCD62121_R00: break; +// case CPUINFO_INT_REGISTER + HCD62121_R02: break; } } @@ -432,7 +432,7 @@ CPU_GET_INFO( hcd62121 ) case CPUINFO_INT_REGISTER + HCD62121_SS: info->i = cpustate->sseg; break; case CPUINFO_INT_REGISTER + HCD62121_DSIZE: info->i = cpustate->dsize; break; case CPUINFO_INT_REGISTER + HCD62121_R00: info->i = ( cpustate->reg[0x00] << 24 ) | ( cpustate->reg[0x01] << 16 ) | ( cpustate->reg[0x02] << 8 ) | cpustate->reg[0x03]; break; -// case CPUINFO_INT_REGISTER + HCD62121_R02: info->i = cpustate->; break; +// case CPUINFO_INT_REGISTER + HCD62121_R02: info->i = cpustate->; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(hcd62121); break; diff --git a/src/emu/cpu/hcd62121/hcd62121_ops.h b/src/emu/cpu/hcd62121/hcd62121_ops.h index 8d9871e2cd9..50ed1bee283 100644 --- a/src/emu/cpu/hcd62121/hcd62121_ops.h +++ b/src/emu/cpu/hcd62121/hcd62121_ops.h @@ -747,7 +747,7 @@ case 0xC3: /* movw reg,i80 */ int i; int size = datasize( cpustate, op ); UINT8 reg = read_op( cpustate ); - + for( i = 0; i < size; i++ ) { cpustate->reg[(reg + i) & 0x7f] = read_op( cpustate ); diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index ff787143415..99fae31bd5f 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -956,7 +956,7 @@ static CPU_RESET( m6800 ) cpustate->txstate = M6800_TX_STATE_INIT; cpustate->txbits = cpustate->rxbits = 0; cpustate->trcsr_read = 0; - + cpustate->cc = 0xc0; } diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 5596f83295e..1ab3dd3f0fc 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -985,7 +985,7 @@ void m68k_memory_interface::init16(address_space &space) m_direct = &space.direct(); m_cpustate = get_safe_token(&space.device()); opcode_xor = 0; - + readimm16 = m68k_readimm16_delegate(m68k_readimm16_proto_delegate::create_member(m68k_memory_interface, simple_read_immediate_16), *this); read8 = m68k_read8_delegate(m68k_read8_proto_delegate::create_member(address_space, read_byte), space); read16 = m68k_read16_delegate(m68k_read16_proto_delegate::create_member(address_space, read_word), space); @@ -1006,7 +1006,7 @@ void m68k_memory_interface::init32(address_space &space) m_direct = &space.direct(); m_cpustate = get_safe_token(&space.device()); opcode_xor = WORD_XOR_BE(0); - + readimm16 = m68k_readimm16_delegate(m68k_readimm16_proto_delegate::create_member(m68k_memory_interface, read_immediate_16), *this); read8 = m68k_read8_delegate(m68k_read8_proto_delegate::create_member(address_space, read_byte), space); read16 = m68k_read16_delegate(m68k_read16_proto_delegate::create_member(address_space, read_word_unaligned), space); @@ -1132,7 +1132,7 @@ void m68k_memory_interface::init32mmu(address_space &space) m_direct = &space.direct(); m_cpustate = get_safe_token(&space.device()); opcode_xor = WORD_XOR_BE(0); - + readimm16 = m68k_readimm16_delegate(m68k_readimm16_proto_delegate::create_member(m68k_memory_interface, read_immediate_16_mmu), *this); read8 = m68k_read8_delegate(m68k_read8_proto_delegate::create_member(m68k_memory_interface, read_byte_32_mmu), *this); read16 = m68k_read16_delegate(m68k_read16_proto_delegate::create_member(m68k_memory_interface, readword_d32_mmu), *this); diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index cb570e10c4f..b188aee9f37 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -503,7 +503,7 @@ static CPU_EXECUTE( m6809 ) /* NS 970908 */ m68_state->ireg = ROP(PCD); PC++; - (*m6809_main[m68_state->ireg])(m68_state); + (*m6809_main[m68_state->ireg])(m68_state); m68_state->icount -= cycles1[m68_state->ireg]; } while( m68_state->icount > 0 ); diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c index af458a36e00..889f1ae6c07 100644 --- a/src/emu/cpu/sm8500/sm8500.c +++ b/src/emu/cpu/sm8500/sm8500.c @@ -165,8 +165,8 @@ static CPU_EXIT( sm8500 ) INLINE void sm8500_do_interrupt(sm8500_state *cpustate, UINT16 vector) { /* Get regs from ram */ sm8500_get_sp(cpustate); - cpustate->SYS = cpustate->program->read_byte(0x19); - cpustate->PS1 = cpustate->program->read_byte(0x1f); + cpustate->SYS = cpustate->program->read_byte(0x19); + cpustate->PS1 = cpustate->program->read_byte(0x1f); /* Push PC */ PUSH_BYTE( cpustate->PC & 0xFF ); PUSH_BYTE( cpustate->PC >> 8 ); diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index ee2f5b299ce..a538c49de66 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -14,9 +14,9 @@ #define OpRead32(s, a) ((s)->direct->read_decrypted_dword(a)) #else #define OpRead8(s, a) ((s)->direct->read_decrypted_byte((a) ^ (s)->fetch_xor)) -#define OpRead16(s, a) (((s)->direct->read_decrypted_byte(((a)+0) ^ (s)->fetch_xor) << 0) | \ +#define OpRead16(s, a) (((s)->direct->read_decrypted_byte(((a)+0) ^ (s)->fetch_xor) << 0) | \ ((s)->direct->read_decrypted_byte(((a)+1) ^ (s)->fetch_xor) << 8)) -#define OpRead32(s, a) (((s)->direct->read_decrypted_byte(((a)+0) ^ (s)->fetch_xor) << 0) | \ +#define OpRead32(s, a) (((s)->direct->read_decrypted_byte(((a)+0) ^ (s)->fetch_xor) << 0) | \ ((s)->direct->read_decrypted_byte(((a)+1) ^ (s)->fetch_xor) << 8) | \ ((s)->direct->read_decrypted_byte(((a)+2) ^ (s)->fetch_xor) << 16) | \ ((s)->direct->read_decrypted_byte(((a)+3) ^ (s)->fetch_xor) << 24)) diff --git a/src/emu/delegate.c b/src/emu/delegate.c index aafb8143714..14f8451f908 100644 --- a/src/emu/delegate.c +++ b/src/emu/delegate.c @@ -92,6 +92,6 @@ delegate_generic_function delegate_convert_raw(delegate_generic_class *&object, // otherwise, it is the byte index into the vtable where the actual function lives UINT8 *vtable_base = *reinterpret_cast<UINT8 **>(object); return *reinterpret_cast<delegate_generic_function *>(vtable_base + mfp.u.vtable_index - 1); -} +} #endif diff --git a/src/emu/delegate.h b/src/emu/delegate.h index a65e2bdaf1c..4e673813752 100644 --- a/src/emu/delegate.h +++ b/src/emu/delegate.h @@ -37,68 +37,68 @@ **************************************************************************** - There are many implementations of delegate-like functionality for - C++ code, but none of them is a perfect drop-in fit for use in MAME. - In order to be useful in MAME, we need the following properties: - - * No significant overhead; we want to use these for memory - accessors, and memory accessor overhead is already the dominant - performance aspect for most drivers. - - * Existing static functions need to be bound with an additional - pointer parameter as the first argument. All existing - implementations that allow static function binding assume the - same signature as the member functions. - - * We must be able to bind the function separately from the - object. This is to allow configurations to bind functions - before the objects are created. - - Thus, the implementations below are based on existing works but are - really a new implementation that is specific to MAME. - - -------------------------------------------------------------------- - - The "compatible" version of delegates is based on an implementation - from Sergey Ryazanov, found here: - - http://www.codeproject.com/KB/cpp/ImpossiblyFastCppDelegate.aspx - - These delegates essentially generate a templated static stub function - for each target function. The static function takes the first - parameter, uses it as the object pointer, and calls through the - member function. For static functions, the stub is compatible with - the signature of a static function, so we just set the stub directly. - - Pros: - * should work with any modern compiler - * static bindings are just as fast as direct calls - - Cons: - * lots of little stub functions generated - * double-hops on member function calls means more overhead - * calling through stub functions repackages parameters - - -------------------------------------------------------------------- - - The "internal" version of delegates makes use of the internal - structure of member function pointers in order to convert them at - binding time into simple static function pointers. This only works - on platforms where object->func(p1, p2) is equivalent in calling - convention to func(object, p1, p2). - - Most of the information on how this works comes from Don Clugston - in this article: - - http://www.codeproject.com/KB/cpp/FastDelegate.aspx - - Pros: - * as fast as a standard function call in static and member cases - * no stub functions or double-hops needed - - Cons: - * requires internal knowledge of the member function pointer - * only works for GCC (for now; MSVC info is also readily available) + There are many implementations of delegate-like functionality for + C++ code, but none of them is a perfect drop-in fit for use in MAME. + In order to be useful in MAME, we need the following properties: + + * No significant overhead; we want to use these for memory + accessors, and memory accessor overhead is already the dominant + performance aspect for most drivers. + + * Existing static functions need to be bound with an additional + pointer parameter as the first argument. All existing + implementations that allow static function binding assume the + same signature as the member functions. + + * We must be able to bind the function separately from the + object. This is to allow configurations to bind functions + before the objects are created. + + Thus, the implementations below are based on existing works but are + really a new implementation that is specific to MAME. + + -------------------------------------------------------------------- + + The "compatible" version of delegates is based on an implementation + from Sergey Ryazanov, found here: + + http://www.codeproject.com/KB/cpp/ImpossiblyFastCppDelegate.aspx + + These delegates essentially generate a templated static stub function + for each target function. The static function takes the first + parameter, uses it as the object pointer, and calls through the + member function. For static functions, the stub is compatible with + the signature of a static function, so we just set the stub directly. + + Pros: + * should work with any modern compiler + * static bindings are just as fast as direct calls + + Cons: + * lots of little stub functions generated + * double-hops on member function calls means more overhead + * calling through stub functions repackages parameters + + -------------------------------------------------------------------- + + The "internal" version of delegates makes use of the internal + structure of member function pointers in order to convert them at + binding time into simple static function pointers. This only works + on platforms where object->func(p1, p2) is equivalent in calling + convention to func(object, p1, p2). + + Most of the information on how this works comes from Don Clugston + in this article: + + http://www.codeproject.com/KB/cpp/FastDelegate.aspx + + Pros: + * as fast as a standard function call in static and member cases + * no stub functions or double-hops needed + + Cons: + * requires internal knowledge of the member function pointer + * only works for GCC (for now; MSVC info is also readily available) ***************************************************************************/ @@ -125,8 +125,8 @@ // nicer macros to hide the template gobblety-gook and to pass the names #define create_member_name(_class, _member, _name) _create_member<_class, &_class::_member>(_name) -#define create_member(_class, _member) _create_member<_class, &_class::_member>(#_class "::" #_member) -#define create_static(_class, _func) _crate_static<_class, &_func>(#_func) +#define create_member(_class, _member) _create_member<_class, &_class::_member>(#_class "::" #_member) +#define create_static(_class, _func) _crate_static<_class, &_func>(#_func) @@ -147,7 +147,7 @@ class delegate_generic_class; // ======================> bindable_object -// define a bindable_object base class that must be at the root of any object +// define a bindable_object base class that must be at the root of any object // hierarchy which intends to do late binding class bindable_object { @@ -157,8 +157,8 @@ public: virtual ~bindable_object(); }; -// define a deferred cast helper function that does a proper dynamic_cast -// from a bindable_object to the target class, and returns a delegate_generic_class +// define a deferred cast helper function that does a proper dynamic_cast +// from a bindable_object to the target class, and returns a delegate_generic_class template<class _TargetClass> static delegate_generic_class *deferred_cast(bindable_object &object) { @@ -190,7 +190,7 @@ public: const char *name() const { return m_name; } protected: - deferred_cast_func m_caster; // pointer to helper function that does the cast + deferred_cast_func m_caster; // pointer to helper function that does the cast const char * m_name; // name string }; @@ -216,18 +216,18 @@ public: proto_delegate_0param(static_func function = NULL, deferred_cast_func caster = NULL, const char *name = NULL) : delegate_base(caster, name), m_function(function) { } - + proto_delegate_0param(const proto_delegate_0param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)()> static proto_delegate_0param _create_member(const char *name = NULL) { return proto_delegate_0param(&method_stub<_FunctionClass, _FunctionPtr>, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *)> static proto_delegate_0param _create_static(const char *name = NULL) @@ -264,26 +264,26 @@ class delegate_0param : public proto_delegate_0param<_ReturnType> using delegate_base::m_caster; using proto_base::m_function; - + public: // constructors delegate_0param() : m_object(NULL) { } - + delegate_0param(proto_base proto) : proto_delegate_0param<_ReturnType>(proto), m_object(NULL) { } - + delegate_0param(proto_base proto, bindable_object &object) : proto_delegate_0param<_ReturnType>(proto), m_object((*m_caster)(object)) { } - + // bind the actual object void bind(bindable_object &object) { m_object = (*m_caster)(object); } // call the function _ReturnType operator()() const { return (*m_function)(m_object); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_0param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -308,18 +308,18 @@ public: proto_delegate_1param(static_func function = NULL, deferred_cast_func caster = NULL, const char *name = NULL) : delegate_base(caster, name), m_function(function) { } - + proto_delegate_1param(const proto_delegate_1param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type)> static proto_delegate_1param _create_member(const char *name = NULL) { return proto_delegate_1param(&method_stub<_FunctionClass, _FunctionPtr>, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type)> static proto_delegate_1param _create_static(const char *name = NULL) @@ -353,7 +353,7 @@ template<typename _ReturnType, typename _P1Type> class delegate_1param : public proto_delegate_1param<_ReturnType, _P1Type> { typedef proto_delegate_1param<_ReturnType, _P1Type> proto_base; - + using delegate_base::m_caster; using proto_base::m_function; @@ -361,21 +361,21 @@ public: // constructors delegate_1param() : m_object(NULL) { } - + delegate_1param(proto_delegate_1param<_ReturnType, _P1Type> proto) : proto_delegate_1param<_ReturnType, _P1Type>(proto), m_object(NULL) { } - + delegate_1param(proto_delegate_1param<_ReturnType, _P1Type> proto, bindable_object &object) : proto_delegate_1param<_ReturnType, _P1Type>(proto), m_object((*m_caster)(object)) { } - + // bind the actual object void bind(bindable_object &object) { m_object = (*m_caster)(object); } // call the function _ReturnType operator()(_P1Type p1) const { return (*m_function)(m_object, p1); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_1param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -400,18 +400,18 @@ public: proto_delegate_2param(static_func function = NULL, deferred_cast_func caster = NULL, const char *name = NULL) : delegate_base(caster, name), m_function(function) { } - + proto_delegate_2param(const proto_delegate_2param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type, _P2Type)> static proto_delegate_2param _create_member(const char *name = NULL) { return proto_delegate_2param(&method_stub<_FunctionClass, _FunctionPtr>, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type, _P2Type)> static proto_delegate_2param _create_static(const char *name = NULL) @@ -445,7 +445,7 @@ template<typename _ReturnType, typename _P1Type, typename _P2Type> class delegate_2param : public proto_delegate_2param<_ReturnType, _P1Type, _P2Type> { typedef proto_delegate_2param<_ReturnType, _P1Type, _P2Type> proto_base; - + using delegate_base::m_caster; using proto_base::m_function; @@ -453,21 +453,21 @@ public: // constructors delegate_2param() : m_object(NULL) { } - + delegate_2param(proto_delegate_2param<_ReturnType, _P1Type, _P2Type> proto) : proto_delegate_2param<_ReturnType, _P1Type, _P2Type>(proto), m_object(NULL) { } - + delegate_2param(proto_delegate_2param<_ReturnType, _P1Type, _P2Type> proto, bindable_object &object) : proto_delegate_2param<_ReturnType, _P1Type, _P2Type>(proto), m_object((*m_caster)(object)) { } - + // bind the actual object void bind(bindable_object &object) { m_object = (*m_caster)(object); } // call the function _ReturnType operator()(_P1Type p1, _P2Type p2) const { return (*m_function)(m_object, p1, p2); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_2param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -492,18 +492,18 @@ public: proto_delegate_3param(static_func function = NULL, deferred_cast_func caster = NULL, const char *name = NULL) : delegate_base(caster, name), m_function(function) { } - + proto_delegate_3param(const proto_delegate_3param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type, _P2Type, _P3Type)> static proto_delegate_3param _create_member(const char *name = NULL) { return proto_delegate_3param(&method_stub<_FunctionClass, _FunctionPtr>, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type, _P2Type, _P3Type)> static proto_delegate_3param _create_static(const char *name = NULL) @@ -537,7 +537,7 @@ template<typename _ReturnType, typename _P1Type, typename _P2Type, typename _P3T class delegate_3param : public proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type> { typedef proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type> proto_base; - + using delegate_base::m_caster; using proto_base::m_function; @@ -545,21 +545,21 @@ public: // constructors delegate_3param() : m_object(NULL) { } - + delegate_3param(proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type> proto) : proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type>(proto), m_object(NULL) { } - + delegate_3param(proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type> proto, bindable_object &object) : proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type>(proto), m_object((*m_caster)(object)) { } - + // bind the actual object void bind(bindable_object &object) { m_object = (*m_caster)(object); } // call the function _ReturnType operator()(_P1Type p1, _P2Type p2, _P3Type p3) const { return (*m_function)(m_object, p1, p2, p3); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_3param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -584,18 +584,18 @@ public: proto_delegate_4param(static_func function = NULL, deferred_cast_func caster = NULL, const char *name = NULL) : delegate_base(caster, name), m_function(function) { } - + proto_delegate_4param(const proto_delegate_4param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type, _P2Type, _P3Type, _P4Type)> static proto_delegate_4param _create_member(const char *name = NULL) { return proto_delegate_4param(&method_stub<_FunctionClass, _FunctionPtr>, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type, _P2Type, _P3Type, _P4Type)> static proto_delegate_4param _create_static(const char *name = NULL) @@ -629,7 +629,7 @@ template<typename _ReturnType, typename _P1Type, typename _P2Type, typename _P3T class delegate_4param : public proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type> { typedef proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type> proto_base; - + using delegate_base::m_caster; using proto_base::m_function; @@ -637,21 +637,21 @@ public: // constructors delegate_4param() : m_object(NULL) { } - + delegate_4param(proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type> proto) : proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type>(proto), m_object(NULL) { } - + delegate_4param(proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type> proto, bindable_object &object) : proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type>(proto), m_object((*m_caster)(object)) { } - + // bind the actual object void bind(bindable_object &object) { m_object = (*m_caster)(object); } // call the function _ReturnType operator()(_P1Type p1, _P2Type p2, _P3Type p3, _P4Type p4) const { return (*m_function)(m_object, p1, p2, p3, p4); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_4param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -680,7 +680,7 @@ struct delegate_gcc_mfp_internal union // first item can be one of two things: { delegate_generic_function funcptr; // if even, it's a pointer to the function - FPTR vtable_index; // if odd, it's the byte offset into the vtable + FPTR vtable_index; // if odd, it's the byte offset into the vtable } u; int this_delta; // delta to apply to the 'this' pointer }; @@ -707,12 +707,12 @@ public: : delegate_base(caster, name), m_function(function), m_rawfunction(mfp) { } - + proto_delegate_0param(const proto_delegate_0param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function), m_rawfunction(proto.m_rawfunction) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)()> static proto_delegate_0param _create_member(const char *name = NULL) @@ -725,19 +725,19 @@ public: tempunion.mfp = _FunctionPtr; return proto_delegate_0param(tempunion.internal, NULL, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *)> static proto_delegate_0param _create_static(const char *name = NULL) { return proto_delegate_0param(delegate_gcc_mfp_null, reinterpret_cast<static_func>(_FunctionPtr), &deferred_cast<_FunctionClass>, name); } - + // equality testing bool operator==(const proto_delegate_0param &rhs) const { - return (m_function == rhs.m_function && m_caster == rhs.m_caster && - m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && + return (m_function == rhs.m_function && m_caster == rhs.m_caster && + m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && m_rawfunction.this_delta == rhs.m_rawfunction.this_delta); } @@ -764,11 +764,11 @@ public: // constructors delegate_0param() : m_object(NULL) { } - + delegate_0param(proto_base proto) : proto_delegate_0param<_ReturnType>(proto), m_object(NULL) { } - + delegate_0param(proto_base proto, bindable_object &object) : proto_delegate_0param<_ReturnType>(proto), m_object(NULL) { bind(object); } @@ -780,10 +780,10 @@ public: if (m_rawfunction.u.funcptr != NULL) m_function = reinterpret_cast<static_func>(delegate_convert_raw(m_object, m_rawfunction)); } - + // call the function _ReturnType operator()() const { return (*m_function)(m_object); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_0param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -809,12 +809,12 @@ public: : delegate_base(caster, name), m_function(function), m_rawfunction(mfp) { } - + proto_delegate_1param(const proto_delegate_1param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function), m_rawfunction(proto.m_rawfunction) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type)> static proto_delegate_1param _create_member(const char *name = NULL) @@ -827,19 +827,19 @@ public: tempunion.mfp = _FunctionPtr; return proto_delegate_1param(tempunion.internal, NULL, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type)> static proto_delegate_1param _create_static(const char *name = NULL) { return proto_delegate_1param(delegate_gcc_mfp_null, reinterpret_cast<static_func>(_FunctionPtr), &deferred_cast<_FunctionClass>, name); } - + // equality testing bool operator==(const proto_delegate_1param &rhs) const { - return (m_function == rhs.m_function && m_caster == rhs.m_caster && - m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && + return (m_function == rhs.m_function && m_caster == rhs.m_caster && + m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && m_rawfunction.this_delta == rhs.m_rawfunction.this_delta); } @@ -866,11 +866,11 @@ public: // constructors delegate_1param() : m_object(NULL) { } - + delegate_1param(proto_base proto) : proto_delegate_1param<_ReturnType, _P1Type>(proto), m_object(NULL) { } - + delegate_1param(proto_base proto, bindable_object &object) : proto_delegate_1param<_ReturnType, _P1Type>(proto), m_object(NULL) { bind(object); } @@ -882,10 +882,10 @@ public: if (m_rawfunction.u.funcptr != NULL) m_function = reinterpret_cast<static_func>(delegate_convert_raw(m_object, m_rawfunction)); } - + // call the function _ReturnType operator()(_P1Type p1) const { return (*m_function)(m_object, p1); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_1param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -911,12 +911,12 @@ public: : delegate_base(caster, name), m_function(function), m_rawfunction(mfp) { } - + proto_delegate_2param(const proto_delegate_2param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function), m_rawfunction(proto.m_rawfunction) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type, _P2Type)> static proto_delegate_2param _create_member(const char *name = NULL) @@ -929,19 +929,19 @@ public: tempunion.mfp = _FunctionPtr; return proto_delegate_2param(tempunion.internal, NULL, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type, _P2Type)> static proto_delegate_2param _create_static(const char *name = NULL) { return proto_delegate_2param(delegate_gcc_mfp_null, reinterpret_cast<static_func>(_FunctionPtr), &deferred_cast<_FunctionClass>, name); } - + // equality testing bool operator==(const proto_delegate_2param &rhs) const { - return (m_function == rhs.m_function && m_caster == rhs.m_caster && - m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && + return (m_function == rhs.m_function && m_caster == rhs.m_caster && + m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && m_rawfunction.this_delta == rhs.m_rawfunction.this_delta); } @@ -968,11 +968,11 @@ public: // constructors delegate_2param() : m_object(NULL) { } - + delegate_2param(proto_base proto) : proto_delegate_2param<_ReturnType, _P1Type, _P2Type>(proto), m_object(NULL) { } - + delegate_2param(proto_base proto, bindable_object &object) : proto_delegate_2param<_ReturnType, _P1Type, _P2Type>(proto), m_object(NULL) { bind(object); } @@ -984,10 +984,10 @@ public: if (m_rawfunction.u.funcptr != NULL) m_function = reinterpret_cast<static_func>(delegate_convert_raw(m_object, m_rawfunction)); } - + // call the function _ReturnType operator()(_P1Type p1, _P2Type p2) const { return (*m_function)(m_object, p1, p2); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_2param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -1013,12 +1013,12 @@ public: : delegate_base(caster, name), m_function(function), m_rawfunction(mfp) { } - + proto_delegate_3param(const proto_delegate_3param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function), m_rawfunction(proto.m_rawfunction) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type, _P2Type, _P3Type)> static proto_delegate_3param _create_member(const char *name = NULL) @@ -1031,19 +1031,19 @@ public: tempunion.mfp = _FunctionPtr; return proto_delegate_3param(tempunion.internal, NULL, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type, _P2Type, _P3Type)> static proto_delegate_3param _create_static(const char *name = NULL) { return proto_delegate_3param(delegate_gcc_mfp_null, reinterpret_cast<static_func>(_FunctionPtr), &deferred_cast<_FunctionClass>, name); } - + // equality testing bool operator==(const proto_delegate_3param &rhs) const { - return (m_function == rhs.m_function && m_caster == rhs.m_caster && - m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && + return (m_function == rhs.m_function && m_caster == rhs.m_caster && + m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && m_rawfunction.this_delta == rhs.m_rawfunction.this_delta); } @@ -1070,11 +1070,11 @@ public: // constructors delegate_3param() : m_object(NULL) { } - + delegate_3param(proto_base proto) : proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type>(proto), m_object(NULL) { } - + delegate_3param(proto_base proto, bindable_object &object) : proto_delegate_3param<_ReturnType, _P1Type, _P2Type, _P3Type>(proto), m_object(NULL) { bind(object); } @@ -1086,10 +1086,10 @@ public: if (m_rawfunction.u.funcptr != NULL) m_function = reinterpret_cast<static_func>(delegate_convert_raw(m_object, m_rawfunction)); } - + // call the function _ReturnType operator()(_P1Type p1, _P2Type p2, _P3Type p3) const { return (*m_function)(m_object, p1, p2, p3); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_3param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } @@ -1115,12 +1115,12 @@ public: : delegate_base(caster, name), m_function(function), m_rawfunction(mfp) { } - + proto_delegate_4param(const proto_delegate_4param &proto) : delegate_base(proto.m_caster, proto.m_name), m_function(proto.m_function), m_rawfunction(proto.m_rawfunction) { } - + // create a member function proto-delegate template<class _FunctionClass, _ReturnType (_FunctionClass::*_FunctionPtr)(_P1Type, _P2Type, _P3Type, _P4Type)> static proto_delegate_4param _create_member(const char *name = NULL) @@ -1133,19 +1133,19 @@ public: tempunion.mfp = _FunctionPtr; return proto_delegate_4param(tempunion.internal, NULL, &deferred_cast<_FunctionClass>, name); } - + // create a static function proto-delegate template<class _FunctionClass, _ReturnType (*_FunctionPtr)(_FunctionClass *, _P1Type, _P2Type, _P3Type, _P4Type)> static proto_delegate_4param _create_static(const char *name = NULL) { return proto_delegate_4param(delegate_gcc_mfp_null, reinterpret_cast<static_func>(_FunctionPtr), &deferred_cast<_FunctionClass>, name); } - + // equality testing bool operator==(const proto_delegate_4param &rhs) const { - return (m_function == rhs.m_function && m_caster == rhs.m_caster && - m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && + return (m_function == rhs.m_function && m_caster == rhs.m_caster && + m_rawfunction.u.funcptr == rhs.m_rawfunction.u.funcptr && m_rawfunction.this_delta == rhs.m_rawfunction.this_delta); } @@ -1172,11 +1172,11 @@ public: // constructors delegate_4param() : m_object(NULL) { } - + delegate_4param(proto_base proto) : proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type>(proto), m_object(NULL) { } - + delegate_4param(proto_base proto, bindable_object &object) : proto_delegate_4param<_ReturnType, _P1Type, _P2Type, _P3Type, _P4Type>(proto), m_object(NULL) { bind(object); } @@ -1188,10 +1188,10 @@ public: if (m_rawfunction.u.funcptr != NULL) m_function = reinterpret_cast<static_func>(delegate_convert_raw(m_object, m_rawfunction)); } - + // call the function _ReturnType operator()(_P1Type p1, _P2Type p2, _P3Type p3, _P4Type p4) const { return (*m_function)(m_object, p1, p2, p3, p4); } - + // testing bool has_object() const { return (m_object != NULL); } bool operator==(const delegate_4param &rhs) const { return (m_object == rhs.m_object && proto_base::operator==(rhs)); } diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 37be4a93051..8406a8dec48 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -399,7 +399,7 @@ const rom_entry *device_config::rom_region() const //------------------------------------------------- // machine_config - return a pointer to a machine -// config constructor describing sub-devices for +// config constructor describing sub-devices for // this device //------------------------------------------------- diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index 6c94f52ff57..fd2e7b10350 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -247,7 +247,7 @@ public: // methods that wrap both interface-level and device-level behavior void config_complete(); bool validity_check(const game_driver &driver) const; - + // configuration helpers static void static_set_clock(device_config *device, UINT32 clock) { device->m_clock = clock; } static void static_set_static_config(device_config *device, const void *config) { device->m_static_config = config; } diff --git a/src/emu/devlegcy.c b/src/emu/devlegcy.c index 9eb8e416003..b75930cf7db 100644 --- a/src/emu/devlegcy.c +++ b/src/emu/devlegcy.c @@ -170,7 +170,7 @@ void legacy_device_config_base::static_set_inline64(device_config *device, UINT3 //------------------------------------------------- -// static_set_inline_float - configuration helper +// static_set_inline_float - configuration helper // to set a floating-point value in the inline // configuration //------------------------------------------------- diff --git a/src/emu/diexec.c b/src/emu/diexec.c index 4d34e6e4520..8c00f5a65c8 100644 --- a/src/emu/diexec.c +++ b/src/emu/diexec.c @@ -93,7 +93,7 @@ device_config_execute_interface::~device_config_execute_interface() //------------------------------------------------- -// static_set_disable - configuration helper to +// static_set_disable - configuration helper to // set the disabled state of a device //------------------------------------------------- @@ -107,7 +107,7 @@ void device_config_execute_interface::static_set_disable(device_config *device) //------------------------------------------------- -// static_set_vblank_int - configuration helper +// static_set_vblank_int - configuration helper // to set up VBLANK interrupts on the device //------------------------------------------------- @@ -123,7 +123,7 @@ void device_config_execute_interface::static_set_vblank_int(device_config *devic //------------------------------------------------- -// static_set_periodic_int - configuration helper +// static_set_periodic_int - configuration helper // to set up periodic interrupts on the device //------------------------------------------------- diff --git a/src/emu/dimemory.c b/src/emu/dimemory.c index d522ab3abcd..8bce0c07ccb 100644 --- a/src/emu/dimemory.c +++ b/src/emu/dimemory.c @@ -144,7 +144,7 @@ const address_space_config *device_config_memory_interface::memory_space_config( //------------------------------------------------- -// static_set_vblank_int - configuration helper +// static_set_vblank_int - configuration helper // to set up VBLANK interrupts on the device //------------------------------------------------- diff --git a/src/emu/disound.c b/src/emu/disound.c index 2a0abf16810..29c13c1d114 100644 --- a/src/emu/disound.c +++ b/src/emu/disound.c @@ -68,7 +68,7 @@ device_config_sound_interface::~device_config_sound_interface() //------------------------------------------------- -// static_add_route - configuration helper to add +// static_add_route - configuration helper to add // a new route to the device //------------------------------------------------- @@ -85,7 +85,7 @@ void device_config_sound_interface::static_add_route(device_config *device, UINT //------------------------------------------------- -// static_reset_routes - configuration helper to +// static_reset_routes - configuration helper to // reset all existing routes to the device //------------------------------------------------- diff --git a/src/emu/emucore.h b/src/emu/emucore.h index e8063ca859e..cb3e7876ed2 100644 --- a/src/emu/emucore.h +++ b/src/emu/emucore.h @@ -392,7 +392,7 @@ public: num++; return -1; } - + T &prepend(T &object) { object.m_next = m_head; diff --git a/src/emu/machine.h b/src/emu/machine.h index 5d05eaf9c08..8c8f8a357e2 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -161,17 +161,17 @@ typedef tagged_list<region_info> region_list; class driver_data_t : public bindable_object { friend class running_machine; - + public: driver_data_t(running_machine &machine); virtual ~driver_data_t(); virtual void machine_start(); virtual void machine_reset(); - + virtual void sound_start(); virtual void sound_reset(); - + virtual void palette_init(const UINT8 *color_prom); virtual void video_start(); virtual void video_reset(); diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c index 71d91b4bcb0..6c809fe1751 100644 --- a/src/emu/machine/6526cia.c +++ b/src/emu/machine/6526cia.c @@ -507,7 +507,7 @@ TIMER_CALLBACK( mos6526_device::clock_tod_callback ) /*------------------------------------------------- - cnt_w + cnt_w -------------------------------------------------*/ void mos6526_device::cnt_w(UINT8 state) diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c index 2101c184c01..1ddafa17589 100644 --- a/src/emu/machine/74123.c +++ b/src/emu/machine/74123.c @@ -172,7 +172,7 @@ int ttl74123_device::timer_running() /*------------------------------------------------- - TIMER_CALLBACK( output_callback ) + TIMER_CALLBACK( output_callback ) -------------------------------------------------*/ TIMER_CALLBACK( ttl74123_device::output_callback ) diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c index ca42b052e96..84193267d87 100644 --- a/src/emu/machine/7474.c +++ b/src/emu/machine/7474.c @@ -176,7 +176,7 @@ void ttl7474_device::device_reset() void ttl7474_device::update() { - if (!m_preset && m_clear) /* line 1 in truth table */ + if (!m_preset && m_clear) /* line 1 in truth table */ { m_output = 1; m_output_comp = 0; @@ -191,7 +191,7 @@ void ttl7474_device::update() m_output = 1; m_output_comp = 1; } - else if (!m_last_clock && m_clk) /* line 4 in truth table */ + else if (!m_last_clock && m_clk) /* line 4 in truth table */ { m_output = m_d; m_output_comp = !m_d; diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h index 405bc65d35e..a4ed2b270ab 100644 --- a/src/emu/machine/7474.h +++ b/src/emu/machine/7474.h @@ -139,7 +139,7 @@ private: /* inputs */ UINT8 m_clear; /* pin 1/13 */ UINT8 m_preset; /* pin 4/10 */ - UINT8 m_clk; /* pin 3/11 */ + UINT8 m_clk; /* pin 3/11 */ UINT8 m_d; /* pin 2/12 */ /* outputs */ @@ -173,4 +173,4 @@ READ_LINE_DEVICE_HANDLER( ttl7474_output_r ); READ_LINE_DEVICE_HANDLER( ttl7474_output_comp_r ); /* NOT strictly the same as !ttl7474_output_r() */ -#endif /* __TTL7474_H__ */
\ No newline at end of file +#endif /* __TTL7474_H__ */ diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c index f5d23ddbe31..d7fee2977b4 100644 --- a/src/emu/machine/8237dma.c +++ b/src/emu/machine/8237dma.c @@ -284,7 +284,7 @@ void i8237_device::i8237_timerproc() /* Check if a new DMA request has been received. */ /* Bit 6 of the command register determines whether the DREQ signals are active - high or active low. */ + high or active low. */ UINT16 pending_request = ( ( m_command & 0x40 ) ? ~m_drq : m_drq ) & ~m_mask; if ( pending_request & 0x0f ) diff --git a/src/emu/machine/devhelpr.h b/src/emu/machine/devhelpr.h index 96f5a1b281e..8d35dc7a295 100644 --- a/src/emu/machine/devhelpr.h +++ b/src/emu/machine/devhelpr.h @@ -69,4 +69,4 @@ virtual void device_reset(); \ }; -#endif // __DEVHELPR_H__
\ No newline at end of file +#endif // __DEVHELPR_H__ diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c index ea5a692ec8f..6be7f010694 100644 --- a/src/emu/machine/eeprom.c +++ b/src/emu/machine/eeprom.c @@ -107,7 +107,7 @@ device_t *eeprom_device_config::alloc_device(running_machine &machine) const //------------------------------------------------- -// static_set_interface - configuration helper +// static_set_interface - configuration helper // to set the interface //------------------------------------------------- @@ -133,7 +133,7 @@ void eeprom_device_config::static_set_default_data(device_config *device, const { eeprom_device_config *eeprom = downcast<eeprom_device_config *>(device); if (eeprom->m_data_bits != 8) mame_printf_warning("16-bit EEPROM set with 8-bit data\n"); -// assert(eeprom->m_data_bits == 8); +// assert(eeprom->m_data_bits == 8); eeprom->m_default_data = data; eeprom->m_default_data_size = size; } @@ -142,7 +142,7 @@ void eeprom_device_config::static_set_default_data(device_config *device, const { eeprom_device_config *eeprom = downcast<eeprom_device_config *>(device); if (eeprom->m_data_bits != 16) mame_printf_warning("8-bit EEPROM set with 16-bit data\n"); -// assert(eeprom->m_data_bits == 16); +// assert(eeprom->m_data_bits == 16); eeprom->m_default_data = reinterpret_cast<const UINT8 *>(data); eeprom->m_default_data_size = size; } diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c index 8e689381296..3ee448e47bf 100644 --- a/src/emu/machine/f3853.c +++ b/src/emu/machine/f3853.c @@ -1,22 +1,22 @@ /********************************************************************** - Fairchild F3853 SRAM interface with integrated interrupt - controller and timer (SMI) + Fairchild F3853 SRAM interface with integrated interrupt + controller and timer (SMI) - This chip is a timer shift register, basically the same as in the - F3851. + This chip is a timer shift register, basically the same as in the + F3851. - Based on a datasheet obtained from www.freetradezone.com + Based on a datasheet obtained from www.freetradezone.com - The SMI does not have DC0 and DC1, only DC0; as a result, it does - not respond to the main CPU's DC0/DC1 swap instruction. This may - lead to two devices responding to the same DC0 address and - attempting to place their bytes on the data bus simultaneously! + The SMI does not have DC0 and DC1, only DC0; as a result, it does + not respond to the main CPU's DC0/DC1 swap instruction. This may + lead to two devices responding to the same DC0 address and + attempting to place their bytes on the data bus simultaneously! - 8-bit shift register: - Feedback in0 = !((out3 ^ out4) ^ (out5 ^ out7)) - Interrupts are at 0xfe - 0xff stops the register (0xfe is never reached) + 8-bit shift register: + Feedback in0 = !((out3 ^ out4) ^ (out5 ^ out7)) + Interrupts are at 0xfe + 0xff stops the register (0xfe is never reached) **********************************************************************/ diff --git a/src/emu/machine/f3853.h b/src/emu/machine/f3853.h index 716d8bb518c..74640a78470 100644 --- a/src/emu/machine/f3853.h +++ b/src/emu/machine/f3853.h @@ -1,10 +1,10 @@ /********************************************************************** - Fairchild F3853 SRAM interface with integrated interrupt - controller and timer + Fairchild F3853 SRAM interface with integrated interrupt + controller and timer - This chip is a timer shift register, basically the same as in the - F3851. + This chip is a timer shift register, basically the same as in the + F3851. **********************************************************************/ diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c index 94efd738d1b..ee5ed8fb9f7 100644 --- a/src/emu/machine/i2cmem.c +++ b/src/emu/machine/i2cmem.c @@ -110,7 +110,7 @@ device_t *i2cmem_device_config::alloc_device( running_machine &machine ) const //------------------------------------------------- -// static_set_interface - set the device +// static_set_interface - set the device // configuration //------------------------------------------------- diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c index 7a774f0d46d..f5bb8960723 100644 --- a/src/emu/machine/timekpr.c +++ b/src/emu/machine/timekpr.c @@ -3,10 +3,10 @@ timekpr.h Various ST Microelectronics timekeeper SRAM implementations: - - M48T02 - - M48T35 - - M48T58 - - MK48T08 + - M48T02 + - M48T35 + - M48T58 + - MK48T08 ***************************************************************************/ diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h index e62919ed325..ad9df486356 100644 --- a/src/emu/machine/timekpr.h +++ b/src/emu/machine/timekpr.h @@ -3,10 +3,10 @@ timekpr.h Various ST Microelectronics timekeeper SRAM implementations: - - M48T02 - - M48T35 - - M48T58 - - MK48T08 + - M48T02 + - M48T35 + - M48T58 + - MK48T08 ***************************************************************************/ diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c index dd653ce16c8..0e66bfc93d2 100644 --- a/src/emu/machine/z80dart.c +++ b/src/emu/machine/z80dart.c @@ -5,11 +5,11 @@ Copyright (c) 2008, The MESS Team. Visit http://mamedev.org for licensing and usage restrictions. - The z80dart/z80sio itself is based on an older intel serial chip, the i8274 MPSC - (see http://doc.chipfind.ru/pdf/intel/8274.pdf), which also has almost identical - behavior, except lacks the interrupt daisy chaining and has its own interrupt/dma - scheme which uses write register 2 on channel A, that register which is unused on - the z80dart and z80sio. + The z80dart/z80sio itself is based on an older intel serial chip, the i8274 MPSC + (see http://doc.chipfind.ru/pdf/intel/8274.pdf), which also has almost identical + behavior, except lacks the interrupt daisy chaining and has its own interrupt/dma + scheme which uses write register 2 on channel A, that register which is unused on + the z80dart and z80sio. ***************************************************************************/ @@ -21,8 +21,8 @@ - wr0 reset tx interrupt pending - wait/ready - 1.5 stop bits - - synchronous mode (Z80-SIO/1,2) - - SDLC mode (Z80-SIO/1,2) + - synchronous mode (Z80-SIO/1,2) + - SDLC mode (Z80-SIO/1,2) */ diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 5d0ad0b3f80..7ed1a5e7379 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -117,7 +117,7 @@ device_config *machine_config::device_add(device_config *owner, const char *tag, //------------------------------------------------- -// device_replace - configuration helper to +// device_replace - configuration helper to // replace one device with a new device //------------------------------------------------- @@ -130,7 +130,7 @@ device_config *machine_config::device_replace(device_config *owner, const char * //------------------------------------------------- -// device_remove - configuration helper to +// device_remove - configuration helper to // remove a device //------------------------------------------------- @@ -144,7 +144,7 @@ device_config *machine_config::device_remove(device_config *owner, const char *t //------------------------------------------------- -// device_find - configuration helper to +// device_find - configuration helper to // locate a device //------------------------------------------------- diff --git a/src/emu/memory.c b/src/emu/memory.c index 47899a25232..2bf2ff47b29 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -3289,7 +3289,7 @@ void address_table::populate_range_mirrored(offs_t bytestart, offs_t byteend, of //------------------------------------------------- // depopulate_unused - scan the table and -// eliminate entries that are no longer used +// eliminate entries that are no longer used //------------------------------------------------- void address_table::depopulate_unused() diff --git a/src/emu/memory.h b/src/emu/memory.h index ef6dfb899a8..f5c617fd184 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -212,7 +212,7 @@ typedef delegate_4param<void, address_space &, offs_t, UINT64, UINT64> write64_d class direct_read_data { friend class address_table; - + public: // direct_range is an internal class that is part of a list of start/end ranges class direct_range @@ -226,7 +226,7 @@ public: // getters direct_range *next() const { return m_next; } - + // internal state direct_range * m_next; // pointer to the next range in the list offs_t m_bytestart; // starting byte offset of the range @@ -281,8 +281,8 @@ private: offs_t m_bytestart; // minimum valid byte address offs_t m_byteend; // maximum valid byte address UINT8 m_entry; // live entry - simple_list<direct_range> m_rangelist[256]; // list of ranges for each entry - simple_list<direct_range> m_freerangelist; // list of recycled range entries + simple_list<direct_range> m_rangelist[256]; // list of ranges for each entry + simple_list<direct_range> m_freerangelist; // list of recycled range entries direct_update_delegate m_directupdate; // fast direct-access update callback }; @@ -420,7 +420,7 @@ public: // decryption void set_decrypted_region(offs_t addrstart, offs_t addrend, void *base); - + // direct access direct_update_delegate set_direct_update_handler(direct_update_delegate function) { return m_direct.set_direct_update(function); } bool set_direct_region(offs_t &byteaddress); @@ -551,7 +551,7 @@ protected: // space read/write handler function macros -#define READ8_MEMBER(name) UINT8 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 mem_mask) +#define READ8_MEMBER(name) UINT8 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 mem_mask) #define WRITE8_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data, ATTR_UNUSED UINT8 mem_mask) #define READ16_MEMBER(name) UINT16 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask) #define WRITE16_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) @@ -560,7 +560,7 @@ protected: #define READ64_MEMBER(name) UINT64 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask) #define WRITE64_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask) -#define DECLARE_READ8_MEMBER(name) UINT8 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 mem_mask = 0xff) +#define DECLARE_READ8_MEMBER(name) UINT8 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 mem_mask = 0xff) #define DECLARE_WRITE8_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data, ATTR_UNUSED UINT8 mem_mask = 0xff) #define DECLARE_READ16_MEMBER(name) UINT16 name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask = 0xffff) #define DECLARE_WRITE16_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask = 0xffff) @@ -781,14 +781,14 @@ inline UINT8 direct_read_data::read_raw_byte(offs_t byteaddress) return m_raw[byteaddress & m_bytemask]; return m_space.read_byte(byteaddress); } - + inline UINT8 direct_read_data::read_decrypted_byte(offs_t byteaddress) { if (address_is_valid(byteaddress)) return m_decrypted[byteaddress & m_bytemask]; return m_space.read_byte(byteaddress); } - + //------------------------------------------------- // read_raw_word - read a word via the @@ -801,14 +801,14 @@ inline UINT16 direct_read_data::read_raw_word(offs_t byteaddress) return *reinterpret_cast<UINT16 *>(&m_raw[byteaddress & m_bytemask]); return m_space.read_word(byteaddress); } - + inline UINT16 direct_read_data::read_decrypted_word(offs_t byteaddress) { if (address_is_valid(byteaddress)) return *reinterpret_cast<UINT16 *>(&m_decrypted[byteaddress & m_bytemask]); return m_space.read_word(byteaddress); } - + //------------------------------------------------- // read_raw_dword - read a dword via the @@ -821,14 +821,14 @@ inline UINT32 direct_read_data::read_raw_dword(offs_t byteaddress) return *reinterpret_cast<UINT32 *>(&m_raw[byteaddress & m_bytemask]); return m_space.read_dword(byteaddress); } - + inline UINT32 direct_read_data::read_decrypted_dword(offs_t byteaddress) { if (address_is_valid(byteaddress)) return *reinterpret_cast<UINT32 *>(&m_decrypted[byteaddress & m_bytemask]); return m_space.read_dword(byteaddress); } - + //------------------------------------------------- // read_raw_qword - read a qword via the @@ -841,13 +841,13 @@ inline UINT64 direct_read_data::read_raw_qword(offs_t byteaddress) return *reinterpret_cast<UINT64 *>(&m_raw[byteaddress & m_bytemask]); return m_space.read_qword(byteaddress); } - + inline UINT64 direct_read_data::read_decrypted_qword(offs_t byteaddress) { if (address_is_valid(byteaddress)) return *reinterpret_cast<UINT64 *>(&m_decrypted[byteaddress & m_bytemask]); return m_space.read_qword(byteaddress); } - + #endif /* __MEMORY_H__ */ diff --git a/src/emu/profiler.c b/src/emu/profiler.c index 1faca5c6de2..507b31c09ed 100644 --- a/src/emu/profiler.c +++ b/src/emu/profiler.c @@ -37,14 +37,14 @@ **************************************************************************** - Profiling is scope-based. To start profiling, put a profiler_scope - object on the stack. To end profiling, just end the scope: + Profiling is scope-based. To start profiling, put a profiler_scope + object on the stack. To end profiling, just end the scope: - { - profiler_scope scope(PROFILER_VIDEO); - - your_work_here(); - } + { + profiler_scope scope(PROFILER_VIDEO); + + your_work_here(); + } the profiler handles a FILO list so calls may be nested. @@ -282,7 +282,7 @@ const char *real_profiler_state::text(running_machine &machine, astring &string) // we are ready once we have wrapped around if (m_dataindex == 0) m_dataready = true; - + g_profiler.stop(); return string; } diff --git a/src/emu/profiler.h b/src/emu/profiler.h index 9e6c8ab8996..29301b8662a 100644 --- a/src/emu/profiler.h +++ b/src/emu/profiler.h @@ -37,14 +37,14 @@ **************************************************************************** - Profiling is scope-based. To start profiling, put a profiler_scope - object on the stack. To end profiling, just end the scope: + Profiling is scope-based. To start profiling, put a profiler_scope + object on the stack. To end profiling, just end the scope: - { - profiler_scope scope(PROFILER_VIDEO); - - your_work_here(); - } + { + profiler_scope scope(PROFILER_VIDEO); + + your_work_here(); + } the profiler handles a FILO list so calls may be nested. @@ -116,7 +116,7 @@ class real_profiler_state public: // construction/destruction real_profiler_state(); - + // getters bool enabled() const { return m_enabled; } const char *text(running_machine &machine, astring &string); diff --git a/src/emu/sound.c b/src/emu/sound.c index b00b154643d..38a45c0da30 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -496,7 +496,7 @@ device_t *speaker_device_config::alloc_device(running_machine &machine) const //------------------------------------------------- -// static_set_position - configuration helper to +// static_set_position - configuration helper to // set the speaker position //------------------------------------------------- diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c index b784b1a6f89..73c4de2d35e 100644 --- a/src/emu/sound/bsmt2000.c +++ b/src/emu/sound/bsmt2000.c @@ -67,7 +67,7 @@ struct _bsmt2000_chip bsmt2000_voice voice[MAX_VOICES]; /* the voices */ UINT16 * regmap[128]; /* mapping of registers to voice params */ UINT8 mode; /* current mode */ - + UINT32 clock; /* original clock on the chip */ UINT8 stereo; /* stereo output? */ UINT8 voices; /* number of voices */ diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index d45c6478621..3c553313ddb 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -241,7 +241,7 @@ static DEVICE_START( k053260 ) /* register with the save state system */ state_save_register_device_item(device, 0, ic->mode); state_save_register_device_item_array(device, 0, ic->regs); - + for ( i = 0; i < 4; i++ ) { state_save_register_device_item(device, i, ic->channels[i].rate); diff --git a/src/emu/validity.c b/src/emu/validity.c index d593d4a9f87..e305c94286b 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -562,7 +562,7 @@ static bool validate_roms(int drivnum, const machine_config *config, region_arra error = true; } } - + // count copies/fills as valid items else if (ROMENTRY_ISCOPY(romp) || ROMENTRY_ISFILL(romp)) items_since_region++; diff --git a/src/emu/video.c b/src/emu/video.c index d27fe989c8e..ea270e8b5c4 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -1802,7 +1802,7 @@ void screen_device_config::static_set_size(device_config *device, UINT16 width, //------------------------------------------------- -// static_set_visarea - configuration helper to +// static_set_visarea - configuration helper to // set the visible area of the screen //------------------------------------------------- @@ -1817,7 +1817,7 @@ void screen_device_config::static_set_visarea(device_config *device, INT16 minx, //------------------------------------------------- -// static_set_default_position - configuration +// static_set_default_position - configuration // helper to set the default position and scale // factors for the screen //------------------------------------------------- diff --git a/src/emu/video.h b/src/emu/video.h index 76a3ea92967..da2134947a8 100644 --- a/src/emu/video.h +++ b/src/emu/video.h @@ -280,7 +280,7 @@ extern const device_type SCREEN; screen_device_config::static_set_type(device, SCREEN_TYPE_##_type); \ #define MDRV_SCREEN_RAW_PARAMS(_pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart) \ - screen_device_config::static_set_raw(device, _pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart); + screen_device_config::static_set_raw(device, _pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart); #define MDRV_SCREEN_REFRESH_RATE(_rate) \ screen_device_config::static_set_refresh(device, HZ_TO_ATTOSECONDS(_rate)); \ |
