summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/cpu')
-rw-r--r--src/emu/cpu/dsp56k/dsp56dsm.c6
-rw-r--r--src/emu/cpu/dsp56k/dsp56k.c8
-rw-r--r--src/emu/cpu/dsp56k/inst.c10
-rw-r--r--src/emu/cpu/dsp56k/inst.h244
-rw-r--r--src/emu/cpu/dsp56k/opcode.h2
-rw-r--r--src/emu/cpu/dsp56k/pmove.c2
-rw-r--r--src/emu/cpu/dsp56k/pmove.h18
-rw-r--r--src/emu/cpu/dsp56k/tables.c24
-rw-r--r--src/emu/cpu/dsp56k/tables.h14
-rw-r--r--src/emu/cpu/hcd62121/hcd62121.c10
-rw-r--r--src/emu/cpu/hcd62121/hcd62121_ops.h2
-rw-r--r--src/emu/cpu/m6800/m6800.c2
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c6
-rw-r--r--src/emu/cpu/m6809/m6809.c2
-rw-r--r--src/emu/cpu/sm8500/sm8500.c4
-rw-r--r--src/emu/cpu/v60/v60.c4
16 files changed, 179 insertions, 179 deletions
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))