summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author David Haywood <mamehaze@users.noreply.github.com>2016-01-26 19:36:47 +0000
committer David Haywood <mamehaze@users.noreply.github.com>2016-01-26 19:36:47 +0000
commit5041e430928188c98d786979cbe92abb82322a77 (patch)
tree41a729afb9d172326a419d43faad47efe0b71946
parentf5a805928417786d66969edbb858fb6fe31e7407 (diff)
make m68make actually build code that can be compiled now. (still needs to be built / called manually)
check in files generated with latest version of m68kmake..
-rw-r--r--src/devices/cpu/m68000/m68k_in.cpp31
-rw-r--r--src/devices/cpu/m68000/m68kmake.cpp4
-rw-r--r--src/devices/cpu/m68000/m68kops.cpp200
3 files changed, 119 insertions, 116 deletions
diff --git a/src/devices/cpu/m68000/m68k_in.cpp b/src/devices/cpu/m68000/m68k_in.cpp
index ce90654df4e..df98a736226 100644
--- a/src/devices/cpu/m68000/m68k_in.cpp
+++ b/src/devices/cpu/m68000/m68k_in.cpp
@@ -81,7 +81,8 @@ must fix:
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
M68KMAKE_PROTOTYPE_HEADER
-
+// license:BSD-3-Clause
+// copyright-holders:Karl Stenerud
/* ======================================================================== */
/* ============================ OPCODE HANDLERS =========================== */
/* ======================================================================== */
@@ -139,7 +140,7 @@ static const opcode_handler_struct m68k_opcode_handler_table[] =
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
M68KMAKE_TABLE_FOOTER
- {0, 0, 0, {0, 0, 0, 0, 0}}
+ {nullptr, 0, 0, {0, 0, 0, 0, 0}}
};
@@ -3315,7 +3316,7 @@ M68KMAKE_OP(callm, 32, ., .)
m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */
REG_PC(mc68kcpu) += 2;
(void)ea; /* just to avoid an 'unused variable' warning */
- logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (callm)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -4414,7 +4415,7 @@ M68KMAKE_OP(cpbcc, 32, ., .)
{
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
- logerror("%s at %08x: called unimplemented instruction %04x (cpbcc)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpbcc)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -4426,7 +4427,7 @@ M68KMAKE_OP(cpdbcc, 32, ., .)
{
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
- logerror("%s at %08x: called unimplemented instruction %04x (cpdbcc)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpdbcc)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -4438,7 +4439,7 @@ M68KMAKE_OP(cpgen, 32, ., .)
{
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type) && (mc68kcpu->has_fpu || mc68kcpu->has_pmmu))
{
- logerror("%s at %08x: called unimplemented instruction %04x (cpgen)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpgen)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -4450,7 +4451,7 @@ M68KMAKE_OP(cpscc, 32, ., .)
{
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
- logerror("%s at %08x: called unimplemented instruction %04x (cpscc)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpscc)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -4462,7 +4463,7 @@ M68KMAKE_OP(cptrapcc, 32, ., .)
{
if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type))
{
- logerror("%s at %08x: called unimplemented instruction %04x (cptrapcc)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cptrapcc)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -6827,7 +6828,7 @@ M68KMAKE_OP(movec, 32, rc, .)
(mc68kcpu)->cacr = REG_DA(mc68kcpu)[(word2 >> 12) & 15] & 0x0f;
}
-// logerror("movec to cacr=%04x\n", (mc68kcpu)->cacr);
+// mc68kcpu->logerror("movec to cacr=%04x\n", (mc68kcpu)->cacr);
if ((mc68kcpu)->cacr & (M68K_CACR_CI | M68K_CACR_CEI))
{
m68ki_ic_clear(mc68kcpu);
@@ -8239,7 +8240,7 @@ M68KMAKE_OP(pflusha, 32, ., .)
{
if ((CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) && ((mc68kcpu)->has_pmmu))
{
- logerror("68040: unhandled PFLUSHA (ir=%04x)\n", mc68kcpu->ir);
+ mc68kcpu->logerror("68040: unhandled PFLUSHA (ir=%04x)\n", mc68kcpu->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -8249,7 +8250,7 @@ M68KMAKE_OP(pflushan, 32, ., .)
{
if ((CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) && ((mc68kcpu)->has_pmmu))
{
- logerror("68040: unhandled PFLUSHAN (ir=%04x)\n", mc68kcpu->ir);
+ mc68kcpu->logerror("68040: unhandled PFLUSHAN (ir=%04x)\n", mc68kcpu->ir);
return;
}
m68ki_exception_1111(mc68kcpu);
@@ -8271,7 +8272,7 @@ M68KMAKE_OP(ptest, 32, ., .)
{
if ((CPU_TYPE_IS_040_PLUS((mc68kcpu)->cpu_type)) && ((mc68kcpu)->has_pmmu))
{
- logerror("68040: unhandled PTEST\n");
+ mc68kcpu->logerror("68040: unhandled PTEST\n");
return;
}
else
@@ -9151,7 +9152,7 @@ M68KMAKE_OP(rtm, 32, ., .)
if(CPU_TYPE_IS_020_VARIANT((mc68kcpu)->cpu_type))
{
m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */
- logerror("%s at %08x: called unimplemented instruction %04x (rtm)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (rtm)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
@@ -10515,7 +10516,7 @@ M68KMAKE_OP(cinv, 32, ., .)
UINT16 ir = mc68kcpu->ir;
UINT8 cache = (ir >> 6) & 3;
// UINT8 scope = (ir >> 3) & 3;
-// logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", REG_PPC(mc68kcpu), ir, cache, scope, ir & 7);
+// mc68kcpu->logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", REG_PPC(mc68kcpu), ir, cache, scope, ir & 7);
switch (cache)
{
case 2:
@@ -10532,7 +10533,7 @@ M68KMAKE_OP(cpush, 32, ., .)
{
if(CPU_TYPE_IS_040_PLUS((mc68kcpu)->cpu_type))
{
- logerror("%s at %08x: called unimplemented instruction %04x (cpush)\n",
+ mc68kcpu->logerror("%s at %08x: called unimplemented instruction %04x (cpush)\n",
(mc68kcpu)->tag(), REG_PC(mc68kcpu) - 2, (mc68kcpu)->ir);
return;
}
diff --git a/src/devices/cpu/m68000/m68kmake.cpp b/src/devices/cpu/m68000/m68kmake.cpp
index 9b732dbec59..f36797d76ba 100644
--- a/src/devices/cpu/m68000/m68kmake.cpp
+++ b/src/devices/cpu/m68000/m68kmake.cpp
@@ -92,9 +92,9 @@ static const char g_version[] = "4.90";
#define MAX_OPCODE_OUTPUT_TABLE_LENGTH 3000 /* Max length of opcode handler tbl */
/* Default filenames */
-#define FILENAME_INPUT "m68k_in.c"
+#define FILENAME_INPUT "m68k_in.cpp"
#define FILENAME_PROTOTYPE "m68kops.h"
-#define FILENAME_TABLE "m68kops.c"
+#define FILENAME_TABLE "m68kops.cpp"
/* Identifier sequences recognized by this program */
diff --git a/src/devices/cpu/m68000/m68kops.cpp b/src/devices/cpu/m68000/m68kops.cpp
index e3884c55195..4cbeb42d78c 100644
--- a/src/devices/cpu/m68000/m68kops.cpp
+++ b/src/devices/cpu/m68000/m68kops.cpp
@@ -5311,8 +5311,8 @@ void m68000_base_device_ops::m68k_op_bfchg_32_ai(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_AI_8(mc68kcpu);
@@ -5365,8 +5365,8 @@ void m68000_base_device_ops::m68k_op_bfchg_32_di(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_DI_8(mc68kcpu);
@@ -5419,8 +5419,8 @@ void m68000_base_device_ops::m68k_op_bfchg_32_ix(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_IX_8(mc68kcpu);
@@ -5473,8 +5473,8 @@ void m68000_base_device_ops::m68k_op_bfchg_32_aw(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AW_8(mc68kcpu);
@@ -5527,8 +5527,8 @@ void m68000_base_device_ops::m68k_op_bfchg_32_al(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AL_8(mc68kcpu);
@@ -5618,8 +5618,8 @@ void m68000_base_device_ops::m68k_op_bfclr_32_ai(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_AI_8(mc68kcpu);
@@ -5672,8 +5672,8 @@ void m68000_base_device_ops::m68k_op_bfclr_32_di(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_DI_8(mc68kcpu);
@@ -5726,8 +5726,8 @@ void m68000_base_device_ops::m68k_op_bfclr_32_ix(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_IX_8(mc68kcpu);
@@ -5780,8 +5780,8 @@ void m68000_base_device_ops::m68k_op_bfclr_32_aw(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AW_8(mc68kcpu);
@@ -5834,8 +5834,8 @@ void m68000_base_device_ops::m68k_op_bfclr_32_al(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AL_8(mc68kcpu);
@@ -7124,8 +7124,8 @@ void m68000_base_device_ops::m68k_op_bfins_32_ai(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_AI_8(mc68kcpu);
@@ -7176,9 +7176,9 @@ void m68000_base_device_ops::m68k_op_bfins_32_ai(m68000_base_device* mc68kcpu)
if((width + offset) > 32)
{
mask_byte = MASK_OUT_ABOVE_8(mask_base) << (8-offset);
- insert_byte = MASK_OUT_ABOVE_8(insert_base);
+ insert_byte = MASK_OUT_ABOVE_8(insert_base) << (8-offset);
data_byte = m68ki_read_8((mc68kcpu), ea+4);
- (mc68kcpu)->not_z_flag |= (data_byte & mask_byte);
+ (mc68kcpu)->not_z_flag |= (insert_byte & mask_byte);
m68ki_write_8((mc68kcpu), ea+4, (data_byte & ~mask_byte) | insert_byte);
}
return;
@@ -7200,8 +7200,8 @@ void m68000_base_device_ops::m68k_op_bfins_32_di(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_DI_8(mc68kcpu);
@@ -7252,9 +7252,9 @@ void m68000_base_device_ops::m68k_op_bfins_32_di(m68000_base_device* mc68kcpu)
if((width + offset) > 32)
{
mask_byte = MASK_OUT_ABOVE_8(mask_base) << (8-offset);
- insert_byte = MASK_OUT_ABOVE_8(insert_base);
+ insert_byte = MASK_OUT_ABOVE_8(insert_base) << (8-offset);
data_byte = m68ki_read_8((mc68kcpu), ea+4);
- (mc68kcpu)->not_z_flag |= (data_byte & mask_byte);
+ (mc68kcpu)->not_z_flag |= (insert_byte & mask_byte);
m68ki_write_8((mc68kcpu), ea+4, (data_byte & ~mask_byte) | insert_byte);
}
return;
@@ -7276,8 +7276,8 @@ void m68000_base_device_ops::m68k_op_bfins_32_ix(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_IX_8(mc68kcpu);
@@ -7328,9 +7328,9 @@ void m68000_base_device_ops::m68k_op_bfins_32_ix(m68000_base_device* mc68kcpu)
if((width + offset) > 32)
{
mask_byte = MASK_OUT_ABOVE_8(mask_base) << (8-offset);
- insert_byte = MASK_OUT_ABOVE_8(insert_base);
+ insert_byte = MASK_OUT_ABOVE_8(insert_base) << (8-offset);
data_byte = m68ki_read_8((mc68kcpu), ea+4);
- (mc68kcpu)->not_z_flag |= (data_byte & mask_byte);
+ (mc68kcpu)->not_z_flag |= (insert_byte & mask_byte);
m68ki_write_8((mc68kcpu), ea+4, (data_byte & ~mask_byte) | insert_byte);
}
return;
@@ -7352,8 +7352,8 @@ void m68000_base_device_ops::m68k_op_bfins_32_aw(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AW_8(mc68kcpu);
@@ -7404,9 +7404,9 @@ void m68000_base_device_ops::m68k_op_bfins_32_aw(m68000_base_device* mc68kcpu)
if((width + offset) > 32)
{
mask_byte = MASK_OUT_ABOVE_8(mask_base) << (8-offset);
- insert_byte = MASK_OUT_ABOVE_8(insert_base);
+ insert_byte = MASK_OUT_ABOVE_8(insert_base) << (8-offset);
data_byte = m68ki_read_8((mc68kcpu), ea+4);
- (mc68kcpu)->not_z_flag |= (data_byte & mask_byte);
+ (mc68kcpu)->not_z_flag |= (insert_byte & mask_byte);
m68ki_write_8((mc68kcpu), ea+4, (data_byte & ~mask_byte) | insert_byte);
}
return;
@@ -7428,8 +7428,8 @@ void m68000_base_device_ops::m68k_op_bfins_32_al(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AL_8(mc68kcpu);
@@ -7480,9 +7480,9 @@ void m68000_base_device_ops::m68k_op_bfins_32_al(m68000_base_device* mc68kcpu)
if((width + offset) > 32)
{
mask_byte = MASK_OUT_ABOVE_8(mask_base) << (8-offset);
- insert_byte = MASK_OUT_ABOVE_8(insert_base);
+ insert_byte = MASK_OUT_ABOVE_8(insert_base) << (8-offset);
data_byte = m68ki_read_8((mc68kcpu), ea+4);
- (mc68kcpu)->not_z_flag |= (data_byte & mask_byte);
+ (mc68kcpu)->not_z_flag |= (insert_byte & mask_byte);
m68ki_write_8((mc68kcpu), ea+4, (data_byte & ~mask_byte) | insert_byte);
}
return;
@@ -7538,8 +7538,8 @@ void m68000_base_device_ops::m68k_op_bfset_32_ai(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_AI_8(mc68kcpu);
if(BIT_B(word2))
@@ -7591,8 +7591,8 @@ void m68000_base_device_ops::m68k_op_bfset_32_di(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_DI_8(mc68kcpu);
if(BIT_B(word2))
@@ -7644,8 +7644,8 @@ void m68000_base_device_ops::m68k_op_bfset_32_ix(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_IX_8(mc68kcpu);
if(BIT_B(word2))
@@ -7697,8 +7697,8 @@ void m68000_base_device_ops::m68k_op_bfset_32_aw(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AW_8(mc68kcpu);
if(BIT_B(word2))
@@ -7750,8 +7750,8 @@ void m68000_base_device_ops::m68k_op_bfset_32_al(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AL_8(mc68kcpu);
if(BIT_B(word2))
@@ -7838,8 +7838,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_ai(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_AI_8(mc68kcpu);
if(BIT_B(word2))
@@ -7889,8 +7889,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_di(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_DI_8(mc68kcpu);
if(BIT_B(word2))
@@ -7940,8 +7940,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_ix(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AY_IX_8(mc68kcpu);
if(BIT_B(word2))
@@ -7991,8 +7991,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_aw(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AW_8(mc68kcpu);
if(BIT_B(word2))
@@ -8042,8 +8042,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_al(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_AL_8(mc68kcpu);
if(BIT_B(word2))
@@ -8093,8 +8093,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_pcdi(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_PCDI_8(mc68kcpu);
if(BIT_B(word2))
@@ -8144,8 +8144,8 @@ void m68000_base_device_ops::m68k_op_bftst_32_pcix(m68000_base_device* mc68kcpu)
UINT32 mask_base;
UINT32 data_long;
UINT32 mask_long;
- UINT32 data_byte;
- UINT32 mask_byte;
+ UINT32 data_byte = 0;
+ UINT32 mask_byte = 0;
UINT32 ea = EA_PCIX_8(mc68kcpu);
if(BIT_B(word2))
@@ -13608,9 +13608,9 @@ void m68000_base_device_ops::m68k_op_divl_32_d(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = DY(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -13678,9 +13678,9 @@ void m68000_base_device_ops::m68k_op_divl_32_ai(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AY_AI_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -13748,9 +13748,9 @@ void m68000_base_device_ops::m68k_op_divl_32_pi(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AY_PI_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -13818,9 +13818,9 @@ void m68000_base_device_ops::m68k_op_divl_32_pd(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AY_PD_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -13888,9 +13888,9 @@ void m68000_base_device_ops::m68k_op_divl_32_di(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AY_DI_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -13958,9 +13958,9 @@ void m68000_base_device_ops::m68k_op_divl_32_ix(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AY_IX_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -14028,9 +14028,9 @@ void m68000_base_device_ops::m68k_op_divl_32_aw(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AW_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -14098,9 +14098,9 @@ void m68000_base_device_ops::m68k_op_divl_32_al(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_AL_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -14168,9 +14168,9 @@ void m68000_base_device_ops::m68k_op_divl_32_pcdi(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_PCDI_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -14238,9 +14238,9 @@ void m68000_base_device_ops::m68k_op_divl_32_pcix(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_PCIX_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -14308,9 +14308,9 @@ void m68000_base_device_ops::m68k_op_divl_32_i(m68000_base_device* mc68kcpu)
{
UINT32 word2 = OPER_I_16(mc68kcpu);
UINT64 divisor = OPER_I_32(mc68kcpu);
- UINT64 dividend;
- UINT64 quotient;
- UINT64 remainder;
+ UINT64 dividend = 0;
+ UINT64 quotient = 0;
+ UINT64 remainder = 0;
if(divisor != 0)
{
@@ -21288,7 +21288,7 @@ void m68000_base_device_ops::m68k_op_movec_32_rc(m68000_base_device* mc68kcpu)
(mc68kcpu)->cacr = REG_DA(mc68kcpu)[(word2 >> 12) & 15] & 0x0f;
}
-// logerror("movec to cacr=%04x\n", (mc68kcpu)->cacr);
+// mc68kcpu->logerror("movec to cacr=%04x\n", (mc68kcpu)->cacr);
if ((mc68kcpu)->cacr & (M68K_CACR_CI | M68K_CACR_CEI))
{
m68ki_ic_clear(mc68kcpu);
@@ -32728,7 +32728,7 @@ void m68000_base_device_ops::m68k_op_cinv_32(m68000_base_device* mc68kcpu)
UINT16 ir = mc68kcpu->ir;
UINT8 cache = (ir >> 6) & 3;
// UINT8 scope = (ir >> 3) & 3;
-// logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", REG_PPC(mc68kcpu), ir, cache, scope, ir & 7);
+// mc68kcpu->logerror("68040 %s: pc=%08x ir=%04x cache=%d scope=%d register=%d\n", ir & 0x0020 ? "cpush" : "cinv", REG_PPC(mc68kcpu), ir, cache, scope, ir & 7);
switch (cache)
{
case 2:
@@ -34872,3 +34872,5 @@ void m68ki_build_opcode_table(void)
/* ======================================================================== */
/* ============================== END OF FILE ============================= */
/* ======================================================================== */
+
+