summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-08-12 04:24:53 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-08-12 04:24:53 +0000
commitab18e234b023edd78802ff5192218e304e946928 (patch)
tree5dc206caef2e2195cc7f42ce84daaa91c17b7a10
parent302396a054d4ff49be011ffbf8ccae678b3dd354 (diff)
Cleanups and version bump.mame0139u1
-rw-r--r--src/emu/addrmap.c14
-rw-r--r--src/emu/addrmap.h16
-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.h284
-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.c12
-rw-r--r--src/emu/cpu/dsp56k/tables.h6
-rw-r--r--src/emu/devimage.c2
-rw-r--r--src/emu/machine.c2
-rw-r--r--src/emu/machine.h2
-rw-r--r--src/emu/machine/z80dma.c2
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/sound/namco.c2
-rw-r--r--src/emu/validity.c2
-rw-r--r--src/mame/drivers/atarisy4.c82
-rw-r--r--src/mame/drivers/blitz.c70
-rw-r--r--src/mame/drivers/cps1.c6
-rw-r--r--src/mame/drivers/miniboy7.c4
-rw-r--r--src/mame/drivers/mpu4drvr.c8
-rw-r--r--src/mame/drivers/norautp.c8
-rw-r--r--src/mame/drivers/raiden2.c18
-rw-r--r--src/mame/drivers/ssv.c2
-rw-r--r--src/mame/drivers/toaplan2.c6
-rw-r--r--src/mame/includes/toaplan2.h2
-rw-r--r--src/mame/video/gp9001.c102
-rw-r--r--src/mame/video/gp9001.h2
-rw-r--r--src/mame/video/toaplan2.c14
-rw-r--r--src/version.c2
32 files changed, 359 insertions, 359 deletions
diff --git a/src/emu/addrmap.c b/src/emu/addrmap.c
index 47b9611ac80..650072bdbd6 100644
--- a/src/emu/addrmap.c
+++ b/src/emu/addrmap.c
@@ -139,7 +139,7 @@ void address_map_entry::set_write_port(const device_config &devconfig, const cha
//-------------------------------------------------
-// set_readwrite_port - set up a handler for
+// set_readwrite_port - set up a handler for
// reading and writing an I/O port
//-------------------------------------------------
@@ -171,21 +171,21 @@ void address_map_entry::set_read_bank(const device_config &devconfig, const char
void address_map_entry::set_write_bank(const device_config &devconfig, const char *tag)
{
- m_write.type = AMH_BANK;
+ m_write.type = AMH_BANK;
m_write.tag = devconfig.siblingtag(m_write.derived_tag, tag);
}
//-------------------------------------------------
-// set_readwrite_bank - set up a handler for
+// set_readwrite_bank - set up a handler for
// writing to a memory bank
//-------------------------------------------------
void address_map_entry::set_readwrite_bank(const device_config &devconfig, const char *tag)
{
- m_read.type = AMH_BANK;
+ m_read.type = AMH_BANK;
m_read.tag = devconfig.siblingtag(m_read.derived_tag, tag);
- m_write.type = AMH_BANK;
+ m_write.type = AMH_BANK;
m_write.tag = devconfig.siblingtag(m_write.derived_tag, tag);
}
@@ -607,8 +607,8 @@ void address_map::configure(UINT8 spacenum, UINT8 databits)
void address_map::set_global_mask(offs_t mask)
{
-// if (m_entrylist != NULL)
-// throw emu_fatalerror("AM_GLOBALMASK must be specified before any entries");
+// if (m_entrylist != NULL)
+// throw emu_fatalerror("AM_GLOBALMASK must be specified before any entries");
m_globalmask = mask;
}
diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h
index 2efeb98806d..2a397bd1afa 100644
--- a/src/emu/addrmap.h
+++ b/src/emu/addrmap.h
@@ -146,7 +146,7 @@ public:
// construction/destruction
address_map_entry(address_map &map, offs_t start, offs_t end);
- // simple inline setters
+ // simple inline setters
void set_mirror(offs_t _mirror) { m_addrmirror = _mirror; }
void set_read_type(map_handler_type _type) { m_read.type = _type; }
void set_write_type(map_handler_type _type) { m_write.type = _type; }
@@ -161,11 +161,11 @@ public:
// mask setting
void set_mask(offs_t _mask);
- // I/O port configuration
+ // I/O port configuration
void set_read_port(const device_config &devconfig, const char *tag);
void set_write_port(const device_config &devconfig, const char *tag);
void set_readwrite_port(const device_config &devconfig, const char *tag);
-
+
// memory bank configuration
void set_read_bank(const device_config &devconfig, const char *tag);
void set_write_bank(const device_config &devconfig, const char *tag);
@@ -249,7 +249,7 @@ public:
address_map_entry8(address_map &map, offs_t start, offs_t end);
void set_baseptr(UINT8 **baseptr) { internal_set_baseptr(reinterpret_cast<void **>(baseptr)); }
-
+
// native-size handlers
void set_handler(read8_space_func func, const char *string) { internal_set_handler(func, string, 0); }
void set_handler(write8_space_func func, const char *string) { internal_set_handler(func, string, 0); }
@@ -269,7 +269,7 @@ public:
address_map_entry16(address_map &map, offs_t start, offs_t end);
void set_baseptr(UINT16 **baseptr) { internal_set_baseptr(reinterpret_cast<void **>(baseptr)); }
-
+
// native-size handlers
void set_handler(read16_space_func func, const char *string) { internal_set_handler(func, string, 0); }
void set_handler(write16_space_func func, const char *string) { internal_set_handler(func, string, 0); }
@@ -297,7 +297,7 @@ public:
address_map_entry32(address_map &map, offs_t start, offs_t end);
void set_baseptr(UINT32 **baseptr) { internal_set_baseptr(reinterpret_cast<void **>(baseptr)); }
-
+
// native-size handlers
void set_handler(read32_space_func func, const char *string) { internal_set_handler(func, string, 0); }
void set_handler(write32_space_func func, const char *string) { internal_set_handler(func, string, 0); }
@@ -333,7 +333,7 @@ public:
address_map_entry64(address_map &map, offs_t start, offs_t end);
void set_baseptr(UINT64 **baseptr) { internal_set_baseptr(reinterpret_cast<void **>(baseptr)); }
-
+
// native-size handlers
void set_handler(read64_space_func func, const char *string) { internal_set_handler(func, string, 0); }
void set_handler(write64_space_func func, const char *string) { internal_set_handler(func, string, 0); }
@@ -377,7 +377,7 @@ public:
// construction/destruction
address_map(const device_config &devconfig, int spacenum);
~address_map();
-
+
// configuration
void configure(UINT8 _spacenum, UINT8 _databits);
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 3c10695e537..4b362ca6bdd 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
@@ -318,7 +318,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.
@@ -464,8 +464,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 c775724853f..b88c8ec04ff 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 aad7bdc3578..aee86c4b47e 100644
--- a/src/emu/cpu/dsp56k/inst.h
+++ b/src/emu/cpu/dsp56k/inst.h
@@ -24,7 +24,7 @@ public:
m_oco(oco),
m_sizeIncrement(0),
m_opcode(""),
- m_source(""),
+ m_source(""),
m_destination("") { }
virtual ~Instruction() {}
@@ -37,9 +37,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);
}
@@ -99,7 +99,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);
m_opcode = "adc";
return true;
@@ -123,7 +123,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);
m_opcode = "add";
return true;
@@ -149,7 +149,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;
@@ -176,7 +176,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);
m_opcode = "and";
return true;
@@ -203,7 +203,7 @@ public:
{
m_immediate = BITSn(word0,0x00ff);
decode_EE_table(BITSn(word0,0x0600), m_destination);
-
+
m_opcode = "andi";
// NEW // sprintf(opcode_str, "and(i)");
return true;
@@ -217,7 +217,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;
};
@@ -373,7 +373,7 @@ public:
case BBB_UPPER: iVal <<= 8; break;
case BBB_MIDDLE: iVal <<= 4; break;
case BBB_LOWER: iVal <<= 0; break;
-
+
case BBB_INVALID: return false; break;
}
@@ -433,7 +433,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_immediate = (INT16)word1;
-
+
std::string M;
decode_cccc_table(BITSn(word0,0x000f), M);
m_opcode = "b" + M;
@@ -450,7 +450,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;
};
@@ -532,7 +532,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_immediate = (INT16)word1;
-
+
m_opcode = "bra";
return true;
}
@@ -546,7 +546,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;
};
@@ -577,7 +577,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;
};
@@ -597,7 +597,7 @@ public:
decode_RR_table(BITSn(word0,0x0003), rNum);
sprintf(temp, "R%d", rNum);
m_destination = temp;
-
+
m_opcode = "bra";
return true;
}
@@ -647,7 +647,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_immediate = (INT16)word1;
-
+
std::string M;
decode_cccc_table(BITSn(word0,0x000f), M);
m_opcode = "bs" + M;
@@ -667,7 +667,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;
};
@@ -690,7 +690,7 @@ public:
std::string M;
decode_cccc_table(BITSn(word0,0x000f), M);
m_destination = temp;
-
+
m_opcode = "bs" + M;
// NEW // sprintf(opcode_str, "bs.%s", M);
return true;
@@ -717,7 +717,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_immediate = (INT16)word1;
-
+
m_opcode = "bsr";
return true;
}
@@ -733,7 +733,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;
};
@@ -753,7 +753,7 @@ public:
decode_RR_table(BITSn(word0,0x0003), rNum);
sprintf(temp, "R%d", rNum);
m_destination = temp;
-
+
m_opcode = "bsr";
return true;
}
@@ -846,8 +846,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);
m_opcode = "cmp";
return true;
@@ -872,8 +872,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);
m_opcode = "cmpm";
return true;
@@ -990,7 +990,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);
m_opcode = "div";
return true;
@@ -1015,27 +1015,27 @@ 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);
std::string a;
decode_ss_table(BITSn(word0,0x0024), a);
if (a == "!!") return false;
-
+
m_opcode = "dmac" + a;
// NEW // sprintf(opcode_str, "dmac(%s)", A);
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
+ retString = m_opcode + " " +
+ m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -1058,7 +1058,7 @@ public:
decode_RR_table(BITSn(word0,0x0003), rNum);
sprintf(temp, "X:(R%d)", rNum);
m_source = temp;
-
+
m_opcode = "do";
return true;
}
@@ -1091,7 +1091,7 @@ public:
{
m_immediate = BITSn(word0,0x00ff);
m_displacement = word1;
-
+
m_opcode = "do";
return true;
}
@@ -1105,7 +1105,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;
@@ -1123,7 +1123,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_displacement = word1;
-
+
decode_DDDDD_table(BITSn(word0,0x001f), m_source);
if (m_source == "SSH") return false; // NEW //
if (m_source == "!!") return false; // NEW //
@@ -1140,7 +1140,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;
};
@@ -1171,7 +1171,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;
};
@@ -1208,7 +1208,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);
m_opcode = "eor";
return true;
@@ -1278,21 +1278,21 @@ 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);
m_opcode = "imac";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
+ retString = m_opcode + " " +
+ m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -1308,14 +1308,14 @@ 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);
m_opcode = "impy";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + m_destination;
}
@@ -1385,7 +1385,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_displacement = word1;
-
+
std::string M;
decode_cccc_table(BITSn(word0,0x000f), M);
m_opcode = "j" + M;
@@ -1450,7 +1450,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_displacement = word1;
-
+
m_opcode = "jmp";
return true;
}
@@ -1484,7 +1484,7 @@ public:
decode_RR_table(BITSn(word0,0x0003), rNum);
sprintf(temp, "R%d", rNum);
m_destination = temp;
-
+
m_opcode = "jmp";
return true;
}
@@ -1495,7 +1495,7 @@ public:
void evaluate(dsp56k_core* cpustate)
{
// Get value from source
-
+
// Set the PC
PC = 0;
@@ -1519,7 +1519,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_displacement = word1;
-
+
std::string M;
decode_cccc_table(BITSn(word0,0x000f), M);
m_opcode = "js" + M;
@@ -1586,7 +1586,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_displacement = word1;
-
+
m_opcode = "jsr";
return true;
}
@@ -1618,7 +1618,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_bAddr = BITSn(word0,0x00ff);
-
+
m_opcode = "jsr";
return true;
}
@@ -1633,7 +1633,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;
};
@@ -1691,7 +1691,7 @@ public:
decode_RR_table(BITSn(word0,0x0003), rNum);
assemble_ea_from_MM_table(BITSn(word0,0x000c), rNum, ea);
m_source = ea;
-
+
m_opcode = "lea";
return true;
}
@@ -1799,7 +1799,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);
std::string sign;
@@ -1812,8 +1812,8 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
+ retString = m_opcode + " " +
+ m_source + "," +
m_source2 + "," + m_destination;
}
void evaluate(dsp56k_core* cpustate) {}
@@ -1835,7 +1835,7 @@ 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);
m_opcode = "mac";
@@ -1843,7 +1843,7 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + m_destination;
}
@@ -1866,14 +1866,14 @@ 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);
m_opcode = "mac";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + m_destination;
}
@@ -1896,7 +1896,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);
std::string sign;
@@ -1909,8 +1909,8 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
+ retString = m_opcode + " " +
+ m_source + "," +
m_source2 + "," + m_destination;
}
void evaluate(dsp56k_core* cpustate) {}
@@ -1932,15 +1932,15 @@ 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);
m_opcode = "macr";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
+ retString = m_opcode + " " +
+ m_source + "," +
m_source2 + "," + m_destination;
}
void evaluate(dsp56k_core* cpustate) {}
@@ -1963,7 +1963,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);
std::string a;
@@ -1974,8 +1974,8 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
+ retString = m_opcode + " " +
+ m_source + "," +
m_source2 + "," + m_destination;
}
void evaluate(dsp56k_core* cpustate) {}
@@ -2086,7 +2086,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;
};
@@ -2108,7 +2108,7 @@ public:
std::string SD;
decode_DDDDD_table(BITSn(word0,0x03e0), SD);
- assemble_arguments_from_W_table(BITSn(word0,0x0400), 'X', SD, ea,
+ assemble_arguments_from_W_table(BITSn(word0,0x0400), 'X', SD, ea,
m_source, m_destination);
if (SD == "!!") return false;
@@ -2143,7 +2143,7 @@ public:
std::string SD;
decode_DDDDD_table(BITSn(word0,0x03e0), SD);
- assemble_arguments_from_W_table(BITSn(word0,0x0400), 'X', SD, ea,
+ assemble_arguments_from_W_table(BITSn(word0,0x0400), 'X', SD, ea,
m_source, m_destination);
if (SD == "!!") return false;
@@ -2176,7 +2176,7 @@ public:
std::string SD;
decode_DDDDD_table(BITSn(word0,0x03e0), SD);
- assemble_arguments_from_W_table(BITSn(word0,0x0400), 'X', SD, ea,
+ assemble_arguments_from_W_table(BITSn(word0,0x0400), 'X', SD, ea,
m_source, m_destination);
if (SD == "!!") return false;
@@ -2217,9 +2217,9 @@ public:
if ((word0 & 0x000c) == 0x000c && (word0 & 0x0400) == 0x0000)
return false;
- if (BITSn(word0,0x0400))
+ if (BITSn(word0,0x0400))
sprintf(temp, "%s,%s", ea.c_str(), SD.c_str());
- else
+ else
sprintf(temp, "%s,%s", SD.c_str(), ea.c_str());
m_args = temp; // TODO
@@ -2234,7 +2234,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:
std::string m_args;
};
@@ -2283,7 +2283,7 @@ public:
std::string SD;
decode_DDDDD_table(BITSn(word1,0x03e0), SD);
- assemble_reg_from_W_table(BITSn(word1,0x0400), 'X', SD, m_b,
+ assemble_reg_from_W_table(BITSn(word1,0x0400), 'X', SD, m_b,
m_source, m_destination);
m_opcode = "move";
@@ -2297,7 +2297,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;
};
@@ -2328,13 +2328,13 @@ public:
else sprintf(temp, "#<-$%x", 1 - m_immediate - 1);
// NEW // sprintf(temp, "#$%02x,%s", BITSn(word0,0x00ff), D1);
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
std::string(temp) + "," + 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:
INT8 m_immediate;
};
@@ -2356,7 +2356,7 @@ public:
std::string ea;
decode_HHH_table(BITSn(word0,0x0007), SD);
assemble_ea_from_MM_table(BITSn(word0,0x0018), rNum, ea);
- assemble_arguments_from_W_table(BITSn(word0,0x0100), 'P', SD, ea,
+ assemble_arguments_from_W_table(BITSn(word0,0x0100), 'P', SD, ea,
m_source, m_destination);
m_opcode = "move";
@@ -2424,7 +2424,7 @@ public:
std::string SD;
decode_HHH_table(BITSn(word1,0x0007), SD);
- assemble_reg_from_W_table(BITSn(word1,0x0100), 'P', SD, b,
+ assemble_reg_from_W_table(BITSn(word1,0x0100), 'P', SD, b,
m_source, m_destination);
m_opcode = "move";
@@ -2457,7 +2457,7 @@ public:
assemble_address_from_IO_short_address(BITSn(word0,0x001f), fullAddy);
fullAddy = "<<$" + fullAddy;
- assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, fullAddy,
+ assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, fullAddy,
m_source, m_destination);
m_opcode = "movep";
@@ -2496,7 +2496,7 @@ public:
SD = "X:<<$" + fullAddy;
// NEW // sprintf(SD, "X:$%s", fullAddy);
- 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);
m_opcode = "movep";
@@ -2530,9 +2530,9 @@ public:
sprintf(temp, "<$%x", BITSn(word0,0x001f));
a = temp;
- assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, a,
+ assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, a,
m_source, m_destination);
-
+
m_opcode = "moves";
// NEW // sprintf(opcode_str, "move(s)");
return true;
@@ -2558,8 +2558,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);
std::string sign;
@@ -2572,14 +2572,14 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -2595,7 +2595,7 @@ 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);
m_opcode = "mpy";
@@ -2603,14 +2603,14 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -2626,22 +2626,22 @@ 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);
-
+
m_opcode = "mpy";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -2658,8 +2658,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);
std::string sign;
@@ -2672,14 +2672,14 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -2695,7 +2695,7 @@ 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);
m_opcode = "mpyr";
@@ -2703,14 +2703,14 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -2726,7 +2726,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);
std::string a;
@@ -2737,14 +2737,14 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + 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:
std::string m_source2;
};
@@ -2882,7 +2882,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);
m_opcode = "or";
return true;
@@ -2908,7 +2908,7 @@ public:
bool decode(const UINT16 word0, const UINT16 word1)
{
m_immediate = BITSn(word0,0x00ff);
-
+
decode_EE_table(BITSn(word0,0x0600), m_destination);
m_opcode = "ori";
// NEW // sprintf(opcode_str, "or(i)");
@@ -2924,7 +2924,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;
};
@@ -3001,7 +3001,7 @@ public:
{
decode_DDDDD_table(BITSn(word0,0x001f), m_source);
if (m_source == "!!") return false;
-
+
m_opcode = "rep";
return true;
}
@@ -3189,7 +3189,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);
m_opcode = "sbc";
@@ -3236,7 +3236,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);
m_opcode = "sub";
return true;
@@ -3260,7 +3260,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";
@@ -3366,9 +3366,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);
-
+
INT8 rNum;
char temp[32];
decode_RR_table(BITSn(word0,0x0030), rNum);
@@ -3383,7 +3383,7 @@ public:
return true;
if (m_destination2 != "R0")
return true;
-
+
return false;
}
void disassemble(std::string& retString) const
@@ -3391,14 +3391,14 @@ public:
retString = m_opcode;
if (m_source != m_destination)
retString += std::string(" ") + m_source + "," + m_destination;
-
+
if (m_destination2 != "R0")
retString += std::string(" R0,") + 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:
std::string m_destination2;
};
@@ -3413,7 +3413,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);
m_opcode = "tfr";
@@ -3438,7 +3438,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);
m_opcode = "tfr";
@@ -3463,7 +3463,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);
m_opcode = "tfr2";
@@ -3490,9 +3490,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);
-
+
std::string SD;
decode_HHH_table(BITSn(word0,0x0007), SD);
// If the destination of the second move is the same as the first, you're invalid
@@ -3504,7 +3504,7 @@ public:
std::string ea;
assemble_ea_from_m_table(BITSn(word0,0x0200), rNum, ea);
- assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, ea,
+ assemble_arguments_from_W_table(BITSn(word0,0x0100), 'X', SD, ea,
m_source2, m_destination2);
m_opcode = "tfr3";
@@ -3512,15 +3512,15 @@ public:
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
- m_source + "," +
- m_destination + " " +
+ retString = m_opcode + " " +
+ m_source + "," +
+ m_destination + " " +
m_source2 + "," + 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:
std::string m_source2;
std::string m_destination2;
@@ -3631,13 +3631,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 == "X0" && m_source2 == "X0") return false;
if (m_source == "X1" && m_source2 == "X0") return false;
-
+
if (m_source == "Y0" && m_source2 == "X1")
{
m_source = "X1";
@@ -3648,13 +3648,13 @@ public:
m_source = "X1";
m_source2 = "Y1";
}
-
+
m_opcode = "shfl";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + m_destination;
}
@@ -3677,13 +3677,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 == "X0" && m_source2 == "X0") return false;
if (m_source == "X1" && m_source2 == "X0") return false;
-
+
if (m_source == "Y0" && m_source2 == "X1")
{
m_source = "X1";
@@ -3694,13 +3694,13 @@ public:
m_source = "X1";
m_source2 = "Y1";
}
-
+
m_opcode = "shfr";
return true;
}
void disassemble(std::string& retString) const
{
- retString = m_opcode + " " +
+ retString = m_opcode + " " +
m_source + "," +
m_source2 + "," + m_destination;
}
diff --git a/src/emu/cpu/dsp56k/opcode.h b/src/emu/cpu/dsp56k/opcode.h
index e26f544958b..6ab83d39f9a 100644
--- a/src/emu/cpu/dsp56k/opcode.h
+++ b/src/emu/cpu/dsp56k/opcode.h
@@ -33,7 +33,7 @@ public:
const std::string& instSource() const;
const std::string& 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 05af4a33e73..0e83f6a0dc2 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 d5a723fb609..193b3c7112b 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), rNum, 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:
std::string 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 == "!")
@@ -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 = m_source + "," + m_destination;
}
void evaluate() {}
-
+
private:
std::string m_source;
std::string 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 5da910323ac..6191c7f3750 100644
--- a/src/emu/cpu/dsp56k/tables.c
+++ b/src/emu/cpu/dsp56k/tables.c
@@ -545,9 +545,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);
@@ -558,7 +558,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 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];
@@ -642,8 +642,8 @@ bool registerOverlap(const std::string& r0, const size_t bmd, const std::string&
{
if (bmd == BM_NONE)
return false;
-
- if (r0 == r1)
+
+ if (r0 == r1)
return true;
if (r0 == "A" && (bmd & BM_LOW) && r1 == "A0") return true;
diff --git a/src/emu/cpu/dsp56k/tables.h b/src/emu/cpu/dsp56k/tables.h
index 00d5e507251..7bcc8329f16 100644
--- a/src/emu/cpu/dsp56k/tables.h
+++ b/src/emu/cpu/dsp56k/tables.h
@@ -13,9 +13,9 @@ namespace DSP56K
#define BITSn(CUR,MASK) (dsp56k_op_maskn(CUR,MASK))
enum bbbType {BBB_UPPER, BBB_MIDDLE, BBB_LOWER, BBB_INVALID};
-enum bitsModified {BM_NONE = 0x0,
- BM_LOW = 0x1,
- BM_MIDDLE = 0x2,
+enum bitsModified {BM_NONE = 0x0,
+ BM_LOW = 0x1,
+ BM_MIDDLE = 0x2,
BM_HIGH = 0x4};
int decode_BBB_table(UINT16 BBB);
diff --git a/src/emu/devimage.c b/src/emu/devimage.c
index 7000a7eb685..6991fcea82a 100644
--- a/src/emu/devimage.c
+++ b/src/emu/devimage.c
@@ -391,7 +391,7 @@ bool legacy_image_device_base::load_internal(const char *path, bool is_create, i
/* did we fail to find the file? */
if (!is_loaded() && !softload)
- {
+ {
m_err = IMAGE_ERROR_FILENOTFOUND;
goto done;
}
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 93a75a40145..9cabef0fe6d 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -974,7 +974,7 @@ running_machine::logerror_callback_item::logerror_callback_item(logerror_callbac
//-------------------------------------------------
driver_data_t::driver_data_t(running_machine &machine)
- : m_machine(machine)
+ : m_machine(machine)
{
}
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 9cb5dd91fbd..bd03b754b6c 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -163,7 +163,7 @@ class driver_data_t
public:
driver_data_t(running_machine &machine);
virtual ~driver_data_t();
-
+
running_machine & m_machine;
};
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index 21aa49b08de..48e1ef22c7a 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -12,7 +12,7 @@
- Only memory to memory is tested!
TODO:
- - rewrite to match documentation
+ - rewrite to match documentation
- implement missing features
- implement more asserts
- implement a INPUT_LINE_BUSREQ for Z80. As a workaround,
diff --git a/src/emu/memory.c b/src/emu/memory.c
index be350dd7a34..506c399f7f8 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -1768,7 +1768,7 @@ static void memory_init_preflight(running_machine *machine)
/* if we have a share entry, add it to our map */
if (entry->m_share != NULL)
memdata->sharemap.add(entry->m_share, UNMAPPED_SHARE_PTR, FALSE);
-
+
/* computed adjusted addresses first */
entry->m_bytestart = entry->m_addrstart;
entry->m_byteend = entry->m_addrend;
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index 904da17f150..60549efd0be 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -121,7 +121,7 @@ static void build_decoded_waveform(running_machine *machine, namco_sound *chip,
int v;
chip->wavedata = (rgnbase != NULL) ? rgnbase : auto_alloc_array_clear(machine, UINT8, 0x400);
-
+
/* 20pacgal has waves in RAM but old sound system */
if (rgnbase == NULL && chip->num_voices != 3)
{
diff --git a/src/emu/validity.c b/src/emu/validity.c
index 961b7f35e24..4bcba891916 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -1237,7 +1237,7 @@ bool mame_validitychecks(const game_driver *curdriver)
global_free(config);
throw emu_fatalerror("Validating %s (%s): %s", driver->name, driver->source_file, err.string());
}
-
+
global_free(config);
}
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index e1c191ae49a..ef0d7361cb9 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -66,7 +66,7 @@ struct _gpu_
INT16 x;
INT16 y;
} points[16];
-
+
UINT16 pt_idx;
bool poly_open;
@@ -157,7 +157,7 @@ static VIDEO_UPDATE( atarisy4 )
static inline UINT32 xy_to_screen_addr(UINT32 x, UINT32 y)
{
-// UINT32 offset = ((gpu.mcr >> 4) & 3) << 9;
+// UINT32 offset = ((gpu.mcr >> 4) & 3) << 9;
UINT32 offset = 0;
if (~gpu.bcrw & 0x80)
@@ -196,7 +196,7 @@ static void image_mem_to_screen(bool clip)
if (x >= 0 && x <= 511)
{
UINT16 pix = screen_ram[xy_to_screen_addr(x,y) >> 1];
-
+
if (x & 1)
pix = (pix & (0x00ff)) | gpu.idr << 8;
else
@@ -221,7 +221,7 @@ static void draw_scanline(void *dest, INT32 scanline, const poly_extent *extent,
{
UINT32 addr = xy_to_screen_addr(x, scanline);
UINT16 pix = screen_ram[addr >> 1];
-
+
if (x & 1)
pix = (pix & (0x00ff)) | color << 8;
else
@@ -263,32 +263,32 @@ static void draw_polygon(UINT16 color)
}
/*
- GPU commands
-
- REXP 0x00 Reset expansion
- SEXP 0x01 Set expansion
- ROFF 0x02 Reset offset on update
- SOFF 0x03 Set offset
- RTPS 0x04 Reset transposition
- STPS 0x05 Set transposition
- SIMD 0x06 Load IDR register
- SICD 0x07 Load partial transfer compare value
- RCW 0x08 Reset clipping window
- SCW 0x09 Set clipping window
- WVB 0x0B Wait for VBlank
- FXOT 0x10 Fill x offset table
- FYOT 0x11 Fill y offset table
- FERT 0x14 Fill expansion table
- FCT 0x15 Fill color table
- SMCT 0x16 Screen memory to color table
- ITSN 0x20 Image memory to screen memory transfer
- ITSC 0x21 Image memory to screen memory transfer with clip
- PPA 0x24 Plot point absolute
- PFOA 0x28 Polygon open absolute
- PFOR 0x29 Polygon open relative
- PFVA 0x2A Polygon vector absolute
- PFVR 0x2B Polygon vector relative
- PFC 0x2C Polygon close
+ GPU commands
+
+ REXP 0x00 Reset expansion
+ SEXP 0x01 Set expansion
+ ROFF 0x02 Reset offset on update
+ SOFF 0x03 Set offset
+ RTPS 0x04 Reset transposition
+ STPS 0x05 Set transposition
+ SIMD 0x06 Load IDR register
+ SICD 0x07 Load partial transfer compare value
+ RCW 0x08 Reset clipping window
+ SCW 0x09 Set clipping window
+ WVB 0x0B Wait for VBlank
+ FXOT 0x10 Fill x offset table
+ FYOT 0x11 Fill y offset table
+ FERT 0x14 Fill expansion table
+ FCT 0x15 Fill color table
+ SMCT 0x16 Screen memory to color table
+ ITSN 0x20 Image memory to screen memory transfer
+ ITSC 0x21 Image memory to screen memory transfer with clip
+ PPA 0x24 Plot point absolute
+ PFOA 0x28 Polygon open absolute
+ PFOR 0x29 Polygon open relative
+ PFVA 0x2A Polygon vector absolute
+ PFVR 0x2B Polygon vector relative
+ PFC 0x2C Polygon close
*/
void execute_gpu_command(running_machine *machine)
{
@@ -331,13 +331,13 @@ void execute_gpu_command(running_machine *machine)
case 0x16:
{
/*
- Copy screen RAM to color RAM
- GR0 : Color start X
- GR1 : Color start Y
- GR2 : Color table offset
- GR3 : Size
- GR4 : Channels to set (R: 0x10, G: 0x20, B: 0x40)
- */
+ Copy screen RAM to color RAM
+ GR0 : Color start X
+ GR1 : Color start Y
+ GR2 : Color table offset
+ GR3 : Size
+ GR4 : Channels to set (R: 0x10, G: 0x20, B: 0x40)
+ */
int i;
int offset = xy_to_screen_addr(gpu.gr[0] - 0x400, gpu.gr[1] - 0x200);
int table_offs = gpu.gr[2];
@@ -754,7 +754,7 @@ ROM_START( airrace )
ROM_REGION( 0x20000, "dsp", 0 )
ROM_LOAD( "mathbs.lda", 0x00000, 0x01e00, CRC(d215acd4) SHA1(853e792b343dc6bcb5b11d455af478a79edfd740) )
-
+
ROM_REGION( 0x20000, "gfx", 0 )
ROM_LOAD( "2d_data", 0x00000, 0x077cb, NO_DUMP )
ROM_END
@@ -799,12 +799,12 @@ void load_ldafile(const address_space *space, const UINT8 *file)
c = READ_CHAR();
len |= c << 8;
- sum += c;
+ sum += c;
/* End of file */
if (len == 6)
break;
-
+
addr = READ_CHAR();
sum += addr;
@@ -907,7 +907,7 @@ void load_hexfile(const address_space *space, const UINT8 *file)
while (len)
{
UINT8 data;
-
+
data = READ_HEX_CHAR() << 4;
data |= READ_HEX_CHAR();
sum += data >> 4;
diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c
index 6485a1e1ce8..a7ee4c8501f 100644
--- a/src/mame/drivers/blitz.c
+++ b/src/mame/drivers/blitz.c
@@ -154,7 +154,7 @@
CPU R6502AP (U6)
.--------\ /--------.
- MCU (01-05-07), MEGA-2 (14-20), MEGA-3 (14-20) ---|01 VSS /RES 40|---
+ MCU (01-05-07), MEGA-2 (14-20), MEGA-3 (14-20) ---|01 VSS ? /RES 40|---
MCU (02) ---|02 RDY PH2(O) 39|---
MCU (04) ---|03 PH1(O) /SO 38|---
---|04 /IRQ PH0(I) 37|---
@@ -179,7 +179,7 @@
MCU MC68705P5S (U1)
.--------\ /--------.
- MEGA-2 (12, 20), MEGA-3 (12, 20) ---|01 VSS /RES 28|---
+ MEGA-2 (12, 20), MEGA-3 (12, 20) ---|01 VSS ? /RES 28|---
CPU (02) ---|02 /INT PA7 27|---
MEGA-2 (01, 28), MEGA-3 (01, 28) ---|03 VCC PA6 26|---
CPU (03) ---|04 EXTAL PA5 25|---
@@ -198,7 +198,7 @@
MEGA-2 27C256 (U2)
.-------\ /-------.
- ---|01 VPP VCC 28|---
+ ---|01 VPP ? VCC 28|---
---|02 A12 A14 27|---
---|03 A7 A13 26|---
---|04 A6 A8 25|---
@@ -217,7 +217,7 @@
MEGA-3 27C256 (U3)
.-------\ /-------.
- ---|01 VPP VCC 28|---
+ ---|01 VPP ? VCC 28|---
---|02 A12 A14 27|---
---|03 A7 A13 26|---
---|04 A6 A8 25|---
@@ -425,16 +425,16 @@ static WRITE8_DEVICE_HANDLER( mux_w )
static WRITE8_DEVICE_HANDLER( lamps_a_w )
{
-// output_set_lamp_value(0, 1 - ((data) & 1)); /* Lamp 0 */
-// output_set_lamp_value(1, 1 - ((data >> 1) & 1)); /* Lamp 1 */
-// output_set_lamp_value(2, 1 - ((data >> 2) & 1)); /* Lamp 2 */
-// output_set_lamp_value(3, 1 - ((data >> 3) & 1)); /* Lamp 3 */
-// output_set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */
+// output_set_lamp_value(0, 1 - ((data) & 1)); /* Lamp 0 */
+// output_set_lamp_value(1, 1 - ((data >> 1) & 1)); /* Lamp 1 */
+// output_set_lamp_value(2, 1 - ((data >> 2) & 1)); /* Lamp 2 */
+// output_set_lamp_value(3, 1 - ((data >> 3) & 1)); /* Lamp 3 */
+// output_set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */
// popmessage("written : %02X", data);
-// coin_counter_w(device->machine, 0, data & 0x40); /* counter1 */
-// coin_counter_w(device->machine, 1, data & 0x80); /* counter2 */
-// coin_counter_w(device->machine, 2, data & 0x20); /* counter3 */
+// coin_counter_w(device->machine, 0, data & 0x40); /* counter1 */
+// coin_counter_w(device->machine, 1, data & 0x80); /* counter2 */
+// coin_counter_w(device->machine, 2, data & 0x20); /* counter3 */
/* Counters:
@@ -453,19 +453,19 @@ static WRITE8_DEVICE_HANDLER( sound_w )
*********************************************/
static ADDRESS_MAP_START( megadpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
-// ADDRESS_MAP_GLOBAL_MASK(0x7fff) // seems that hardware is playing with A14 & A15 CPU lines...
+// ADDRESS_MAP_GLOBAL_MASK(0x7fff) // seems that hardware is playing with A14 & A15 CPU lines...
- AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
-// AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
-// AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_BASE_SIZE_GENERIC(nvram) /* battery backed RAM */
+// AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
+// AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
/* There is another set of PIAs controlled by the code.
Maybe they are just mirrors...
- AM_RANGE(0x10f4, 0x10f7) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
- AM_RANGE(0x10f8, 0x10fb) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
+ AM_RANGE(0x10f4, 0x10f7) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
+ AM_RANGE(0x10f8, 0x10fb) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
*/
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(megadpkr_videoram_w) AM_BASE(&videoram)
@@ -478,7 +478,7 @@ ADDRESS_MAP_END
0844-0847 / 0848-084b --> PIAS?
10f4-10f7 / 10f8-10fb --> PIAS?
-
+
Also 47f4-47f7 & 47f8-47fb are treated as PIA offsets... (code at $6eaf and $6f74)
@@ -487,9 +487,9 @@ ADDRESS_MAP_END
FE99: 78 sei ; set IRQ
FE9A: 4E 2F 02 lsr $022F
- FE9D: D8 cld
+ FE9D: D8 cld
FE9E: A2 FF ldx #$FF
- FEA0: 9A txs
+ FEA0: 9A txs
FEA1: A9 00 lda #$00
FEA3: 8D 25 02 sta $0225
FEA6: A9 F7 lda #$F7 ; load 0xf7
@@ -529,16 +529,16 @@ ADDRESS_MAP_END
EEDA: A2 00 ldx #$00
EEDC: BD 22 EF lda $EF22,x
EEDF: 9D 00 01 sta $0100,x
- EEE2: E8 inx
+ EEE2: E8 inx
EEE3: E0 80 cpx #$80
EEE5: D0 F5 bne $EEDC
- EEE7: 78 sei
+ EEE7: 78 sei
EEE8: 20 00 01 jsr $0100
- EEEB: 58 cli
+ EEEB: 58 cli
Here the copied subroutine:
- EF22: 38 sec
+ EF22: 38 sec
EF23: B0 08 bcs $EF2D
EF25: C5 3A cmp $3A
EF27: A3 5C lax ($5C,x) ------> Indexed LAX???
@@ -550,9 +550,9 @@ ADDRESS_MAP_END
EF35: A0 08 ldy #$08
EF37: 8D F7 47 sta $47F7
EF3A: 6A ror a
- EF3B: 88 dey
+ EF3B: 88 dey
EF3C: D0 F9 bne $EF37
- EF3E: E8 inx
+ EF3E: E8 inx
EF3F: E0 08 cpx #$08
EF41: D0 EF bne $EF32
EF43: A2 00 ldx #$00
@@ -560,22 +560,22 @@ ADDRESS_MAP_END
EF47: AD F7 47 lda $47F7
EF4A: 4A lsr a
EF4B: 76 B0 ror $B0,x
- EF4D: 88 dey
+ EF4D: 88 dey
EF4E: D0 F7 bne $EF47
- EF50: E8 inx
+ EF50: E8 inx
EF51: E0 08 cpx #$08
EF53: D0 F0 bne $EF45
EF55: A9 00 lda #$00
EF57: 85 B0 sta $B0
- EF59: 60 rts
+ EF59: 60 rts
*/
/*
static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0080, 0x07ff) AM_ROM
+ ADDRESS_MAP_GLOBAL_MASK(0x7ff)
+ AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
*/
@@ -773,10 +773,10 @@ static MACHINE_DRIVER_START( megadpkr )
MDRV_CPU_PROGRAM_MAP(megadpkr_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
-// MDRV_CPU_ADD("mcu", M68705, CPU_CLOCK) /* unknown */
-// MDRV_CPU_PROGRAM_MAP(mcu_map)
+// MDRV_CPU_ADD("mcu", M68705, CPU_CLOCK) /* unknown */
+// MDRV_CPU_PROGRAM_MAP(mcu_map)
-// MDRV_NVRAM_HANDLER(generic_0fill)
+// MDRV_NVRAM_HANDLER(generic_0fill)
MDRV_PIA6821_ADD("pia0", megadpkr_pia0_intf)
MDRV_PIA6821_ADD("pia1", megadpkr_pia1_intf)
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 98b7ef5529e..6c61e8367aa 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -4390,7 +4390,7 @@ ROM_START( ffightu )
ROM_LOAD16_BYTE( "ff_36.11f", 0x00000, 0x20000, CRC(f9a5ce83) SHA1(0756ae576a1f6d5b8b22f8630dca40ef38567ea6) ) // in "30" socket
ROM_LOAD16_BYTE( "ff_42.11h", 0x00001, 0x20000, CRC(65f11215) SHA1(5045a467f3e228c02b4a355b52f58263ffa90113) ) // in "35" socket
ROM_LOAD16_BYTE( "ff_37.12f", 0x40000, 0x20000, CRC(e1033784) SHA1(38f44434c8befd623953ae23d6e5ff4e201d6627) ) // in "31" socket
- ROM_LOAD16_BYTE( "ff_43.12h", 0x40001, 0x20000, CRC(4ca65947) SHA1(74ffe00df96273770a24d9a46f13e53ea8812670) ) // in "36" socket /* seen the same pcb with FFU_43.12H */
+ ROM_LOAD16_BYTE( "ff_43.12h", 0x40001, 0x20000, CRC(4ca65947) SHA1(74ffe00df96273770a24d9a46f13e53ea8812670) ) // in "36" socket /* seen the same pcb with FFU_43.12H */
ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) )
ROM_REGION( 0x200000, "gfx", 0 )
@@ -4470,7 +4470,7 @@ ROM_START( ffightub )
ROMX_LOAD( "ff-3m.5a", 0x000006, 0x80000, CRC(52291cd2) SHA1(df5f3d3aa96a7a33ff22f2a31382942c4c4f1111) , ROM_GROUPWORD | ROM_SKIP(6) )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "ff_23.12b", 0x00000, 0x08000, CRC(b8367eb5) SHA1(ec3db29fdd6200e9a8f4f8073a7e34aef731354f) ) // == ff_09.12b /* label is FF_23, pcb verified */
+ ROM_LOAD( "ff_23.12b", 0x00000, 0x08000, CRC(b8367eb5) SHA1(ec3db29fdd6200e9a8f4f8073a7e34aef731354f) ) // == ff_09.12b /* label is FF_23, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -9754,7 +9754,7 @@ GAME( 1992, sf2yyc, sf2ce, cps1_12MHz, sf2hack, sf2hack, ROT0, "bo
GAME( 1992, sf2koryu, sf2ce, cps1_12MHz, sf2hack, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (Xiang Long, Chinese bootleg)", GAME_SUPPORTS_SAVE ) // 811102 !!! - based on World version
GAME( 1992, sf2mdt, sf2ce, sf2mdt, sf2hack, sf2mdt, ROT0, "bootleg", "Street Fighter II': Magic Delta Turbo (bootleg)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) // 920313 - based on (heavily modified) World version
GAME( 1992, cworld2j, 0, cps1_12MHz, cworld2j, cps1, ROT0, "Capcom", "Adventure Quiz Capcom World 2 (Japan 920611)", GAME_SUPPORTS_SAVE )
-GAME( 1992, varth, 0, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (World 920714)", GAME_SUPPORTS_SAVE ) // "ETC" // 12MHz verified
+GAME( 1992, varth, 0, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (World 920714)", GAME_SUPPORTS_SAVE ) // "ETC" // 12MHz verified
GAME( 1992, varthr1, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (World 920612)", GAME_SUPPORTS_SAVE ) // "ETC"
GAME( 1992, varthu, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom, distributed by Romstar", "Varth: Operation Thunderstorm (USA 920612)", GAME_SUPPORTS_SAVE )
GAME( 1992, varthj, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (Japan 920714)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 1f8bd252c4b..e3cb7c416b8 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -43,7 +43,7 @@
--------------
Board silkscreened on top:
- be MVX-001-01 ('be' is a Bonanza Enterprises logo).
+ be MVX-001-01 ('be' is a Bonanza Enterprises logo).
- CPU: 1x R6502P.
- Sound: 1x AY-3-8910.
@@ -471,7 +471,7 @@ MACHINE_DRIVER_END
/*
Board silkscreened on top:
- be MVX-001-01 ('be' is a Bonanza Enterprises logo).
+ be MVX-001-01 ('be' is a Bonanza Enterprises logo).
1x 6502.
1x AY-3-8910.
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 5b0fa5557ab..380cc19383e 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -2137,7 +2137,7 @@ static TIMER_DEVICE_CALLBACK( scanline_timer_callback )
// and used by the renderer to render the correct data
rowcounter = 0; linecounter = 0;
- // scn2674_status_register &= ~0x10; // clear vblank
+ // scn2674_status_register &= ~0x10; // clear vblank
scn2674_status_register |= 0x02;
/* Ready - this triggers for the first scanline of the screen */
@@ -2149,10 +2149,10 @@ static TIMER_DEVICE_CALLBACK( scanline_timer_callback )
update_mpu68_interrupts(timer.machine);
}
}
-
+
// should be triggered at the start of each ROW (line zero for that row)
if ((current_scanline%8 == 7) && (current_scanline<296))
- {
+ {
scn2674_status_register |= 0x08;
if (scn2674_irq_mask&0x08)
{
@@ -2220,7 +2220,7 @@ static TIMER_DEVICE_CALLBACK( scanline_timer_callback )
scn2674_status_register |= 0x10;
}
-// printf("scanline %d\n",current_scanline);
+// printf("scanline %d\n",current_scanline);
}
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index f4e54e05870..62b5bcf035a 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -3451,11 +3451,11 @@ static DRIVER_INIT( ssa )
/* Passing the video PPI handshaking lines */
/* Just for debugging purposes */
{
-// UINT8 *ROM = memory_region(machine, "maincpu");
+// UINT8 *ROM = memory_region(machine, "maincpu");
-// ROM[0x073b] = 0x00;
-// ROM[0x073c] = 0x00;
-// ROM[0x073d] = 0x00;
+// ROM[0x073b] = 0x00;
+// ROM[0x073c] = 0x00;
+// ROM[0x073d] = 0x00;
// ROM[0x07af] = 0x00;
// ROM[0x07b0] = 0x00;
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index c84adfee053..1aa4ff7fd8c 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -2132,23 +2132,23 @@ static ADDRESS_MAP_START( rdx_v33_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00434, 0x00435) AM_READ(rdx_v33_unknown_r)
AM_RANGE(0x00436, 0x00437) AM_READ(rdx_v33_unknown_r)
-// AM_RANGE(0x00620, 0x00621) AM_WRITE(scroll_w) // scroll1
-// AM_RANGE(0x00622, 0x00623) AM_WRITE(scroll_w) // scroll1
+// AM_RANGE(0x00620, 0x00621) AM_WRITE(scroll_w) // scroll1
+// AM_RANGE(0x00622, 0x00623) AM_WRITE(scroll_w) // scroll1
-// AM_RANGE(0x00624, 0x00625) AM_WRITE(scroll_w) // scroll2
-// AM_RANGE(0x00626, 0x00627) AM_WRITE(scroll_w) // scroll2
+// AM_RANGE(0x00624, 0x00625) AM_WRITE(scroll_w) // scroll2
+// AM_RANGE(0x00626, 0x00627) AM_WRITE(scroll_w) // scroll2
-// AM_RANGE(0x00628, 0x00629) AM_WRITE(scroll_w) // scroll3
-// AM_RANGE(0x0062a, 0x0062b) AM_WRITE(scroll_w) // scroll3
+// AM_RANGE(0x00628, 0x00629) AM_WRITE(scroll_w) // scroll3
+// AM_RANGE(0x0062a, 0x0062b) AM_WRITE(scroll_w) // scroll3
AM_RANGE(0x006b0, 0x006b1) AM_WRITE(mcu_prog_w)
AM_RANGE(0x006b2, 0x006b3) AM_WRITE(mcu_prog_w2)
AM_RANGE(0x006b4, 0x006b5) AM_WRITENOP
AM_RANGE(0x006b6, 0x006b7) AM_WRITENOP
AM_RANGE(0x006bc, 0x006bd) AM_WRITE(mcu_prog_offs_w)
-// AM_RANGE(0x006d8, 0x006d9) AM_WRITE(bbbbll_w) // scroll?
+// AM_RANGE(0x006d8, 0x006d9) AM_WRITE(bbbbll_w) // scroll?
AM_RANGE(0x006dc, 0x006dd) AM_READ(rdx_v33_unknown2_r)
-// AM_RANGE(0x006de, 0x006df) AM_WRITE(mcu_unkaa_w) // mcu command related?
+// AM_RANGE(0x006de, 0x006df) AM_WRITE(mcu_unkaa_w) // mcu command related?
AM_RANGE(0x00700, 0x00701) AM_DEVWRITE("eeprom", rdx_v33_eeprom_w)
AM_RANGE(0x00740, 0x00741) AM_READ(rdx_v33_unknown2_r)
AM_RANGE(0x00744, 0x00745) AM_READ(r2_playerin_r)
@@ -2250,7 +2250,7 @@ static INPUT_PORTS_START( nzerotea )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 94010a2ad35..92b7b8a7419 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -419,7 +419,7 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; }
AM_RANGE(0x160000, 0x17ffff) AM_RAM /* */ \
AM_RANGE(0x1c0000, 0x1c0001) AM_READ(ssv_vblank_r ) /* Vblank? */ \
/**/AM_RANGE(0x1c0002, 0x1c007f) AM_READONLY /* Scroll */ \
- AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(ssv_scroll_w) AM_BASE_MEMBER(ssv_state, scroll) /* Scroll */ \
+ AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(ssv_scroll_w) AM_BASE_MEMBER(ssv_state, scroll) /* Scroll */ \
AM_RANGE(0x210002, 0x210003) AM_READ_PORT("DSW1") \
AM_RANGE(0x210004, 0x210005) AM_READ_PORT("DSW2") \
AM_RANGE(0x210008, 0x210009) AM_READ_PORT("P1") \
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index fd7e8a30d0e..e575e06dfff 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -4261,7 +4261,7 @@ static MACHINE_DRIVER_START( fixeight )
MDRV_GFXDECODE(truxton2)
MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
-
+
MDRV_DEVICE_ADD_VDP0
MDRV_VIDEO_START(truxton2)
@@ -4712,7 +4712,7 @@ static MACHINE_DRIVER_START( batrider )
MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
MDRV_DEVICE_ADD_VDP0
-
+
MDRV_VIDEO_START(batrider)
MDRV_VIDEO_UPDATE(batrider)
@@ -4762,7 +4762,7 @@ static MACHINE_DRIVER_START( bbakraid )
MDRV_GFXDECODE(batrider)
MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
-
+
MDRV_DEVICE_ADD_VDP0
MDRV_VIDEO_START(batrider)
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index 89f651548b7..a821015f985 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -13,7 +13,7 @@ public:
toaplan2_state(running_machine &machine)
: driver_data_t(machine)
- {
+ {
vdp0 = NULL;
vdp1 = NULL;
}
diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index c8e2c042559..dfff1fc9836 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -137,7 +137,7 @@ static WRITE16_DEVICE_HANDLER( gp9001_bg_tilemap_w )
COMBINE_DATA(&vdp->bgvideoram16[offset]);
tilemap_mark_tile_dirty(vdp->bg_tilemap,offset/2);
}
-
+
static WRITE16_DEVICE_HANDLER( gp9001_fg_tilemap_w )
{
gp9001vdp_device *vdp = (gp9001vdp_device*)device;
@@ -157,7 +157,7 @@ static READ16_DEVICE_HANDLER( gp9001_bg_tilemap_r )
gp9001vdp_device *vdp = (gp9001vdp_device*)device;
return vdp->bgvideoram16[offset];
}
-
+
static READ16_DEVICE_HANDLER( gp9001_fg_tilemap_r )
{
gp9001vdp_device *vdp = (gp9001vdp_device*)device;
@@ -184,11 +184,11 @@ static WRITE16_DEVICE_HANDLER( gp9001_spram_w )
/* how to create a generic map which uses the CURRENT device? we have to create specific ones below at the moment */
static ADDRESS_MAP_START( gp9001vdp_map, 0, 16 )
-// AM_RANGE(0x0000, 0x0fff) AM_DEVREADWRITE( this, gp9001_bg_tilemap_r, gp9001_bg_tilemap_w)
-// AM_RANGE(0x1000, 0x1fff) AM_DEVREADWRITE( this, gp9001_fg_tilemap_r, gp9001_fg_tilemap_w)
-// AM_RANGE(0x2000, 0x2fff) AM_DEVREADWRITE( this, gp9001_top_tilemap_r, gp9001_top_tilemap_w)
-// AM_RANGE(0x3000, 0x37ff) AM_DEVREADWRITE( this, gp9001_spram_r, gp9001_spram_w)
-// AM_RANGE(0x3800, 0x3fff) AM_RAM // sprite mirror?
+// AM_RANGE(0x0000, 0x0fff) AM_DEVREADWRITE( this, gp9001_bg_tilemap_r, gp9001_bg_tilemap_w)
+// AM_RANGE(0x1000, 0x1fff) AM_DEVREADWRITE( this, gp9001_fg_tilemap_r, gp9001_fg_tilemap_w)
+// AM_RANGE(0x2000, 0x2fff) AM_DEVREADWRITE( this, gp9001_top_tilemap_r, gp9001_top_tilemap_w)
+// AM_RANGE(0x3000, 0x37ff) AM_DEVREADWRITE( this, gp9001_spram_r, gp9001_spram_w)
+// AM_RANGE(0x3800, 0x3fff) AM_RAM // sprite mirror?
ADDRESS_MAP_END
ADDRESS_MAP_START( gp9001vdp0_map, 0, 16 )
@@ -389,11 +389,11 @@ void gp9001vdp_device::device_start()
state_save_register_device_item(this,0, fg_flip);
state_save_register_device_item(this,0, top_flip);
state_save_register_device_item(this,0, sprite_flip);
-
+
gp9001_gfxrom_is_banked = 0;
gp9001_gfxrom_bank_dirty = 0;
state_save_register_device_item_array(this,0,gp9001_gfxrom_bank);
-
+
extra_xoffset[0]=0;
extra_xoffset[1]=0;
extra_xoffset[2]=0;
@@ -402,7 +402,7 @@ void gp9001vdp_device::device_start()
extra_yoffset[0]=0;
extra_yoffset[1]=0;
extra_yoffset[2]=0;
- extra_yoffset[3]=0;
+ extra_yoffset[3]=0;
}
void gp9001vdp_device::device_reset()
@@ -620,7 +620,7 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1
}
}
#endif
-
+
default: logerror("Hmmm, writing %08x to unknown video control register (%08x) Video controller %01x !!!\n",data ,vdp->gp9001_scroll_reg,vdp->tile_region>>1);
break;
}
@@ -631,15 +631,15 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1
if (vdp->tile_region == 0)
{
/* this is non-vdp
- if ( input_code_pressed_once(vdp->machine, KEYCODE_W) )
- {
- display_tx += 1;
- display_tx &= 1;
- if (gp9001_txvideoram16 != 0)
- tilemap_set_enable(tx_tilemap, display_tx);
- }
- */
-
+ if ( input_code_pressed_once(vdp->machine, KEYCODE_W) )
+ {
+ display_tx += 1;
+ display_tx &= 1;
+ if (gp9001_txvideoram16 != 0)
+ tilemap_set_enable(tx_tilemap, display_tx);
+ }
+ */
+
if ( input_code_pressed_once(vdp->machine, KEYCODE_L) )
{
vdp->display_sp += 1;
@@ -664,7 +664,7 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1
tilemap_set_enable(vdp->bg_tilemap, vdp->display_bg);
}
}
-
+
// 2nd vdp
if (vdp->tile_region == 2)
{
@@ -696,7 +696,7 @@ static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT1
}
WRITE16_DEVICE_HANDLER( gp9001_scroll_reg_devvdata_w )
-{
+{
gp9001vdp_device *vdp = (gp9001vdp_device*)device;
gp9001_scroll_reg_data_w(vdp, offset, data, mem_mask);
}
@@ -717,7 +717,7 @@ READ16_DEVICE_HANDLER( gp9001_vdp_r )
default:
logerror("gp9001_vdp_r: read from unhandled offset %04x\n",offset*2);
}
-
+
return 0xffff;
}
@@ -764,7 +764,7 @@ READ16_DEVICE_HANDLER( gp9001_vdp_alt_r )
default:
logerror("gp9001_vdp_alt_r: read from unhandled offset %04x\n",offset*2);
}
-
+
return 0xffff;
}
@@ -868,7 +868,7 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
{
UINT16 *source_now0 = 0;
UINT16 *source_new0 = 0;
- UINT16 *source_now1 = 0;
+ UINT16 *source_now1 = 0;
UINT16 *source_new1 = 0;
int schar[2],sattr[2],sxpos[2],sypos[2];
@@ -881,7 +881,7 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
source_new0 = (UINT16 *)(vdp->spriteram16_new);
logerror("---0--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
+
if (vdp->tile_region == 2)
{
source_now1 = (UINT16 *)(vdp->spriteram16_now);
@@ -890,8 +890,8 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
logerror("Scrolls BG-X BG-Y FG-X FG-Y TOP-X TOP-Y Sprite-X Sprite-Y\n");
logerror("---1--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
-
+
+
for ( sprite_voffs = 0; sprite_voffs < (GP9001_SPRITERAM_SIZE/2); sprite_voffs += 4 )
{
if (vdp->tile_region == 0)
@@ -909,7 +909,7 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
schar[0], sattr[0],sxpos[0], sypos[0],
schar[1], sattr[1],sxpos[1], sypos[1]);
}
-
+
if (vdp->tile_region == 2)
{
sattr[0] = source_now1[sprite_voffs];
@@ -926,12 +926,12 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
}
}
}
-
+
if ( input_code_pressed(machine, KEYCODE_N) )
{
int tchar[2], tattr[2];
logerror("Scrolls BG-X BG-Y FG-X FG-Y TOP-X TOP-Y Sprite-X Sprite-Y\n");
-
+
if (vdp->tile_region == 0)
{
logerror("---0--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
@@ -940,8 +940,8 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
{
logerror("---1--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
-
+
+
for ( tile_voffs = 0; tile_voffs < (GP9001_TOP_VRAM_SIZE/2); tile_voffs += 2 )
{
if (vdp->tile_region == 0)
@@ -950,7 +950,7 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
tattr[0] = vdp->topvideoram16[tile_voffs];
logerror("TOPoffs:%04x Tile0:%04x Attr0:%04x\n", tile_voffs, tchar[0], tattr[0]);
}
-
+
if (vdp->tile_region == 2)
{
tchar[1] = vdp->topvideoram16[tile_voffs + 1];
@@ -969,23 +969,23 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
{
logerror("---0--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
+
if (vdp->tile_region == 2)
{
logerror("---1--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
-
+
+
for ( tile_voffs = 0; tile_voffs < (GP9001_FG_VRAM_SIZE/2); tile_voffs += 2 )
{
if (vdp->tile_region == 0)
- {
+ {
tchar[0] = vdp->fgvideoram16[tile_voffs + 1];
tattr[0] = vdp->fgvideoram16[tile_voffs];
logerror("FGoffs:%04x Tile0:%04x Attr0:%04x\n", tile_voffs, tchar[0], tattr[0]);
}
-
-
+
+
if (vdp->tile_region == 2)
{
tchar[1] = vdp->fgvideoram16[tile_voffs + 1];
@@ -998,24 +998,24 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
{
int tchar[2], tattr[2];
logerror("Scrolls BG-X BG-Y FG-X FG-Y TOP-X TOP-Y Sprite-X Sprite-Y\n");
-
+
if (vdp->tile_region == 0)
- {
+ {
logerror("---0--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
+
if (vdp->tile_region == 2)
- {
+ {
logerror("---1--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
+
for ( tile_voffs = 0; tile_voffs < (GP9001_BG_VRAM_SIZE/2); tile_voffs += 2 )
{
if (vdp->tile_region == 0)
- {
+ {
tchar[0] = vdp->bgvideoram16[tile_voffs + 1];
tattr[0] = vdp->bgvideoram16[tile_voffs];
- logerror("BGoffs:%04x Tile0:%04x Attr0:%04x\n", tile_voffs, tchar[0], tattr[0]);
+ logerror("BGoffs:%04x Tile0:%04x Attr0:%04x\n", tile_voffs, tchar[0], tattr[0]);
}
if (vdp->tile_region == 2)
@@ -1038,14 +1038,14 @@ void gp9001_log_vram(gp9001vdp_device* vdp, running_machine *machine)
if (gp9001_displog)
{
logerror("Scrolls BG-X BG-Y FG-X FG-Y TOP-X TOP-Y Sprite-X Sprite-Y\n");
-
+
if (vdp->tile_region == 0)
- {
+ {
logerror("---0--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
-
+
if (vdp->tile_region == 2)
- {
+ {
logerror("---1--> %04x %04x %04x %04x %04x %04x %04x %04x\n", vdp->bg_scrollx,vdp->bg_scrolly,vdp->fg_scrollx,vdp->fg_scrolly,vdp->top_scrollx,vdp->top_scrolly,vdp->sprite_scrollx, vdp->sprite_scrolly);
}
}
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index bae559a6e85..b788950adce 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -52,7 +52,7 @@ public:
UINT16 tile_limit; // prevent bad tile in Batsugun, might be something like the CPS1 tile addressing limits?
int tile_region; // we also use this to figure out which vdp we're using in some debug logging features
tilemap_t *top_tilemap, *fg_tilemap, *bg_tilemap;
-
+
// debug
int display_bg;
int display_fg;
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index d3054b7f8ca..56a81a7ad1b 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -108,9 +108,9 @@ VIDEO_START( toaplan2 )
gp9001_custom_priority_bitmap = auto_bitmap_alloc(machine, width, height, BITMAP_FORMAT_INDEXED8);
gp9001_displog = 0; // debug flag
-
+
display_tx = 1;
-
+
register_state_save(machine);
}
@@ -130,7 +130,7 @@ VIDEO_START( fixeighb )
toaplan2_state *state = machine->driver_data<toaplan2_state>();
VIDEO_START_CALL( truxton2 );
-
+
/* This bootleg has additional layer offsets on the VDP */
state->vdp0->extra_xoffset[0]=-26;
state->vdp0->extra_xoffset[1]=-22;
@@ -141,7 +141,7 @@ VIDEO_START( fixeighb )
state->vdp0->extra_yoffset[1]=-15;
state->vdp0->extra_yoffset[2]=-15;
state->vdp0->extra_yoffset[3]=8;
-
+
tilemap_set_scrolldx(tx_tilemap, 0, 0);
}
@@ -167,7 +167,7 @@ VIDEO_START( batrider )
gfx_element_set_source(machine->gfx[2], (UINT8 *)raizing_tx_gfxram16);
truxton2_create_tx_tilemap(machine);
tilemap_set_scrolldx(tx_tilemap, 0x1d4, 0x2a);
-
+
/* Has special banking */
state->vdp0->gp9001_gfxrom_is_banked = 1;
}
@@ -327,7 +327,7 @@ VIDEO_UPDATE( toaplan2 )
state->vdp0->gp9001_render_vdp(screen->machine, bitmap, cliprect);
}
}
-
+
/* debug code, render 2nd VDP to 2nd screen if they exist for test */
#ifdef DUAL_SCREEN_VDPS
if (state->vdp1)
@@ -385,7 +385,7 @@ VIDEO_UPDATE( batrider )
VDP then the priorities for that VDP are correct, however, it is completely unclear how the priorities of the
two VDPs should actually mix together, as a result these games are broken for now. */
VIDEO_UPDATE( dogyuun )
-{
+{
#ifdef DUAL_SCREEN_VDPS
VIDEO_UPDATE_CALL( toaplan2 );
#else
diff --git a/src/version.c b/src/version.c
index 2696dc9e521..8f230f4c445 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.139 ("__DATE__")";
+const char build_version[] = "0.139u1 ("__DATE__")";