summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/m68000/m68kfpu.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/m68000/m68kfpu.hxx')
-rw-r--r--src/devices/cpu/m68000/m68kfpu.hxx376
1 files changed, 188 insertions, 188 deletions
diff --git a/src/devices/cpu/m68000/m68kfpu.hxx b/src/devices/cpu/m68000/m68kfpu.hxx
index 5c0d884311e..9c11acd5fb8 100644
--- a/src/devices/cpu/m68000/m68kfpu.hxx
+++ b/src/devices/cpu/m68000/m68kfpu.hxx
@@ -17,7 +17,7 @@
extern flag floatx80_is_nan( floatx80 a );
// masks for packed dwords, positive k-factor
-static const UINT32 pkmask2[18] =
+static const uint32_t pkmask2[18] =
{
0xffffffff, 0, 0xf0000000, 0xff000000, 0xfff00000, 0xffff0000,
0xfffff000, 0xffffff00, 0xfffffff0, 0xffffffff,
@@ -25,7 +25,7 @@ static const UINT32 pkmask2[18] =
0xffffffff, 0xffffffff, 0xffffffff
};
-static const UINT32 pkmask3[18] =
+static const uint32_t pkmask3[18] =
{
0xffffffff, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0xf0000000, 0xff000000, 0xfff00000, 0xffff0000,
@@ -34,7 +34,7 @@ static const UINT32 pkmask3[18] =
static inline double fx80_to_double(floatx80 fx)
{
- UINT64 d;
+ uint64_t d;
double *foo;
foo = (double *)&d;
@@ -46,17 +46,17 @@ static inline double fx80_to_double(floatx80 fx)
static inline floatx80 double_to_fx80(double in)
{
- UINT64 *d;
+ uint64_t *d;
- d = (UINT64 *)∈
+ d = (uint64_t *)∈
return float64_to_floatx80(*d);
}
-static inline floatx80 load_extended_float80(m68000_base_device *m68k, UINT32 ea)
+static inline floatx80 load_extended_float80(m68000_base_device *m68k, uint32_t ea)
{
- UINT32 d1,d2;
- UINT16 d3;
+ uint32_t d1,d2;
+ uint16_t d3;
floatx80 fp;
d3 = m68ki_read_16(m68k, ea);
@@ -64,12 +64,12 @@ static inline floatx80 load_extended_float80(m68000_base_device *m68k, UINT32 ea
d2 = m68ki_read_32(m68k, ea+8);
fp.high = d3;
- fp.low = ((UINT64)d1<<32) | (d2 & 0xffffffff);
+ fp.low = ((uint64_t)d1<<32) | (d2 & 0xffffffff);
return fp;
}
-static inline void store_extended_float80(m68000_base_device *m68k, UINT32 ea, floatx80 fpr)
+static inline void store_extended_float80(m68000_base_device *m68k, uint32_t ea, floatx80 fpr)
{
m68ki_write_16(m68k, ea+0, fpr.high);
m68ki_write_16(m68k, ea+2, 0);
@@ -77,9 +77,9 @@ static inline void store_extended_float80(m68000_base_device *m68k, UINT32 ea, f
m68ki_write_32(m68k, ea+8, fpr.low&0xffffffff);
}
-static inline floatx80 load_pack_float80(m68000_base_device *m68k, UINT32 ea)
+static inline floatx80 load_pack_float80(m68000_base_device *m68k, uint32_t ea)
{
- UINT32 dw1, dw2, dw3;
+ uint32_t dw1, dw2, dw3;
floatx80 result;
double tmp;
char str[128], *ch;
@@ -128,9 +128,9 @@ static inline floatx80 load_pack_float80(m68000_base_device *m68k, UINT32 ea)
return result;
}
-static inline void store_pack_float80(m68000_base_device *m68k, UINT32 ea, int k, floatx80 fpr)
+static inline void store_pack_float80(m68000_base_device *m68k, uint32_t ea, int k, floatx80 fpr)
{
- UINT32 dw1, dw2, dw3;
+ uint32_t dw1, dw2, dw3;
char str[128], *ch;
int i, j, exp;
@@ -262,9 +262,9 @@ static inline void store_pack_float80(m68000_base_device *m68k, UINT32 ea, int k
static inline void SET_CONDITION_CODES(m68000_base_device *m68k, floatx80 reg)
{
-// UINT64 *regi;
+// uint64_t *regi;
-// regi = (UINT64 *)&reg;
+// regi = (uint64_t *)&reg;
REG_FPSR(m68k) &= ~(FPCC_N|FPCC_Z|FPCC_I|FPCC_NAN);
@@ -355,7 +355,7 @@ static inline int TEST_CONDITION(m68000_base_device *m68k, int condition)
return r;
}
-static UINT8 READ_EA_8(m68000_base_device *m68k, int ea)
+static uint8_t READ_EA_8(m68000_base_device *m68k, int ea)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -368,27 +368,27 @@ static UINT8 READ_EA_8(m68000_base_device *m68k, int ea)
}
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
return m68ki_read_8(m68k, ea);
}
case 3: // (An)+
{
- UINT32 ea = EA_AY_PI_8(m68k);
+ uint32_t ea = EA_AY_PI_8(m68k);
return m68ki_read_8(m68k, ea);
}
case 4: // -(An)
{
- UINT32 ea = EA_AY_PD_8(m68k);
+ uint32_t ea = EA_AY_PD_8(m68k);
return m68ki_read_8(m68k, ea);
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_8(m68k);
+ uint32_t ea = EA_AY_DI_8(m68k);
return m68ki_read_8(m68k, ea);
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_8(m68k);
+ uint32_t ea = EA_AY_IX_8(m68k);
return m68ki_read_8(m68k, ea);
}
case 7:
@@ -397,24 +397,24 @@ static UINT8 READ_EA_8(m68000_base_device *m68k, int ea)
{
case 0: // (xxx).W
{
- UINT32 ea = (UINT32)OPER_I_16(m68k);
+ uint32_t ea = (uint32_t)OPER_I_16(m68k);
return m68ki_read_8(m68k, ea);
}
case 1: // (xxx).L
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
return m68ki_read_8(m68k, ea);
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_8(m68k);
+ uint32_t ea = EA_PCDI_8(m68k);
return m68ki_read_8(m68k, ea);
}
case 3: // (PC) + (Xn) + d8
{
- UINT32 ea = EA_PCIX_8(m68k);
+ uint32_t ea = EA_PCIX_8(m68k);
return m68ki_read_8(m68k, ea);
}
case 4: // #<data>
@@ -431,7 +431,7 @@ static UINT8 READ_EA_8(m68000_base_device *m68k, int ea)
return 0;
}
-static UINT16 READ_EA_16(m68000_base_device *m68k, int ea)
+static uint16_t READ_EA_16(m68000_base_device *m68k, int ea)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -440,31 +440,31 @@ static UINT16 READ_EA_16(m68000_base_device *m68k, int ea)
{
case 0: // Dn
{
- return (UINT16)(REG_D(m68k)[reg]);
+ return (uint16_t)(REG_D(m68k)[reg]);
}
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
return m68ki_read_16(m68k, ea);
}
case 3: // (An)+
{
- UINT32 ea = EA_AY_PI_16(m68k);
+ uint32_t ea = EA_AY_PI_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 4: // -(An)
{
- UINT32 ea = EA_AY_PD_16(m68k);
+ uint32_t ea = EA_AY_PD_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_16(m68k);
+ uint32_t ea = EA_AY_DI_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_16(m68k);
+ uint32_t ea = EA_AY_IX_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 7:
@@ -473,24 +473,24 @@ static UINT16 READ_EA_16(m68000_base_device *m68k, int ea)
{
case 0: // (xxx).W
{
- UINT32 ea = (UINT32)OPER_I_16(m68k);
+ uint32_t ea = (uint32_t)OPER_I_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 1: // (xxx).L
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
return m68ki_read_16(m68k, ea);
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_16(m68k);
+ uint32_t ea = EA_PCDI_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 3: // (PC) + (Xn) + d8
{
- UINT32 ea = EA_PCIX_16(m68k);
+ uint32_t ea = EA_PCIX_16(m68k);
return m68ki_read_16(m68k, ea);
}
case 4: // #<data>
@@ -508,7 +508,7 @@ static UINT16 READ_EA_16(m68000_base_device *m68k, int ea)
return 0;
}
-static UINT32 READ_EA_32(m68000_base_device *m68k, int ea)
+static uint32_t READ_EA_32(m68000_base_device *m68k, int ea)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -521,27 +521,27 @@ static UINT32 READ_EA_32(m68000_base_device *m68k, int ea)
}
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
return m68ki_read_32(m68k, ea);
}
case 3: // (An)+
{
- UINT32 ea = EA_AY_PI_32(m68k);
+ uint32_t ea = EA_AY_PI_32(m68k);
return m68ki_read_32(m68k, ea);
}
case 4: // -(An)
{
- UINT32 ea = EA_AY_PD_32(m68k);
+ uint32_t ea = EA_AY_PD_32(m68k);
return m68ki_read_32(m68k, ea);
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_32(m68k);
+ uint32_t ea = EA_AY_DI_32(m68k);
return m68ki_read_32(m68k, ea);
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_32(m68k);
+ uint32_t ea = EA_AY_IX_32(m68k);
return m68ki_read_32(m68k, ea);
}
case 7:
@@ -550,24 +550,24 @@ static UINT32 READ_EA_32(m68000_base_device *m68k, int ea)
{
case 0: // (xxx).W
{
- UINT32 ea = (UINT32)OPER_I_16(m68k);
+ uint32_t ea = (uint32_t)OPER_I_16(m68k);
return m68ki_read_32(m68k, ea);
}
case 1: // (xxx).L
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
return m68ki_read_32(m68k, ea);
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_32(m68k);
+ uint32_t ea = EA_PCDI_32(m68k);
return m68ki_read_32(m68k, ea);
}
case 3: // (PC) + (Xn) + d8
{
- UINT32 ea = EA_PCIX_32(m68k);
+ uint32_t ea = EA_PCIX_32(m68k);
return m68ki_read_32(m68k, ea);
}
case 4: // #<data>
@@ -583,50 +583,50 @@ static UINT32 READ_EA_32(m68000_base_device *m68k, int ea)
return 0;
}
-static UINT64 READ_EA_64(m68000_base_device *m68k, int ea)
+static uint64_t READ_EA_64(m68000_base_device *m68k, int ea)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
- UINT32 h1, h2;
+ uint32_t h1, h2;
switch (mode)
{
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 3: // (An)+
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
REG_A(m68k)[reg] += 8;
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 4: // -(An)
{
- UINT32 ea = REG_A(m68k)[reg]-8;
+ uint32_t ea = REG_A(m68k)[reg]-8;
REG_A(m68k)[reg] -= 8;
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_32(m68k);
+ uint32_t ea = EA_AY_DI_32(m68k);
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_32(m68k);
+ uint32_t ea = EA_AY_IX_32(m68k);
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 7:
{
@@ -634,30 +634,30 @@ static UINT64 READ_EA_64(m68000_base_device *m68k, int ea)
{
case 1: // (xxx).L
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
- return (UINT64)(m68ki_read_32(m68k, ea)) << 32 | (UINT64)(m68ki_read_32(m68k, ea+4));
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
+ return (uint64_t)(m68ki_read_32(m68k, ea)) << 32 | (uint64_t)(m68ki_read_32(m68k, ea+4));
}
case 3: // (PC) + (Xn) + d8
{
- UINT32 ea = EA_PCIX_32(m68k);
+ uint32_t ea = EA_PCIX_32(m68k);
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 4: // #<data>
{
h1 = OPER_I_32(m68k);
h2 = OPER_I_32(m68k);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_32(m68k);
+ uint32_t ea = EA_PCDI_32(m68k);
h1 = m68ki_read_32(m68k, ea+0);
h2 = m68ki_read_32(m68k, ea+4);
- return (UINT64)(h1) << 32 | (UINT64)(h2);
+ return (uint64_t)(h1) << 32 | (uint64_t)(h2);
}
default: fatalerror("M68kFPU: READ_EA_64: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC(m68k));
}
@@ -680,21 +680,21 @@ static floatx80 READ_EA_FPE(m68000_base_device *m68k, int ea)
{
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
fpr = load_extended_float80(m68k, ea);
break;
}
case 3: // (An)+
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
REG_A(m68k)[reg] += 12;
fpr = load_extended_float80(m68k, ea);
break;
}
case 4: // -(An)
{
- UINT32 ea = REG_A(m68k)[reg]-12;
+ uint32_t ea = REG_A(m68k)[reg]-12;
REG_A(m68k)[reg] -= 12;
fpr = load_extended_float80(m68k, ea);
break;
@@ -702,14 +702,14 @@ static floatx80 READ_EA_FPE(m68000_base_device *m68k, int ea)
case 5: // (d16, An)
{
// FIXME: will fail for fmovem
- UINT32 ea = EA_AY_DI_32(m68k);
+ uint32_t ea = EA_AY_DI_32(m68k);
fpr = load_extended_float80(m68k, ea);
break;
}
case 6: // (An) + (Xn) + d8
{
// FIXME: will fail for fmovem
- UINT32 ea = EA_AY_IX_32(m68k);
+ uint32_t ea = EA_AY_IX_32(m68k);
fpr = load_extended_float80(m68k, ea);
break;
}
@@ -720,23 +720,23 @@ static floatx80 READ_EA_FPE(m68000_base_device *m68k, int ea)
{
case 1: // (xxx)
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
fpr = load_extended_float80(m68k, ea);
}
break;
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_32(m68k);
+ uint32_t ea = EA_PCDI_32(m68k);
fpr = load_extended_float80(m68k, ea);
}
break;
case 3: // (d16,PC,Dx.w)
{
- UINT32 ea = EA_PCIX_32(m68k);
+ uint32_t ea = EA_PCIX_32(m68k);
fpr = load_extended_float80(m68k, ea);
}
break;
@@ -764,14 +764,14 @@ static floatx80 READ_EA_PACK(m68000_base_device *m68k, int ea)
{
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
fpr = load_pack_float80(m68k, ea);
break;
}
case 3: // (An)+
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
REG_A(m68k)[reg] += 12;
fpr = load_pack_float80(m68k, ea);
break;
@@ -783,7 +783,7 @@ static floatx80 READ_EA_PACK(m68000_base_device *m68k, int ea)
{
case 3: // (d16,PC,Dx.w)
{
- UINT32 ea = EA_PCIX_32(m68k);
+ uint32_t ea = EA_PCIX_32(m68k);
fpr = load_pack_float80(m68k, ea);
}
break;
@@ -801,7 +801,7 @@ static floatx80 READ_EA_PACK(m68000_base_device *m68k, int ea)
return fpr;
}
-static void WRITE_EA_8(m68000_base_device *m68k, int ea, UINT8 data)
+static void WRITE_EA_8(m68000_base_device *m68k, int ea, uint8_t data)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -815,31 +815,31 @@ static void WRITE_EA_8(m68000_base_device *m68k, int ea, UINT8 data)
}
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
m68ki_write_8(m68k, ea, data);
break;
}
case 3: // (An)+
{
- UINT32 ea = EA_AY_PI_8(m68k);
+ uint32_t ea = EA_AY_PI_8(m68k);
m68ki_write_8(m68k, ea, data);
break;
}
case 4: // -(An)
{
- UINT32 ea = EA_AY_PD_8(m68k);
+ uint32_t ea = EA_AY_PD_8(m68k);
m68ki_write_8(m68k, ea, data);
break;
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_8(m68k);
+ uint32_t ea = EA_AY_DI_8(m68k);
m68ki_write_8(m68k, ea, data);
break;
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_8(m68k);
+ uint32_t ea = EA_AY_IX_8(m68k);
m68ki_write_8(m68k, ea, data);
break;
}
@@ -849,15 +849,15 @@ static void WRITE_EA_8(m68000_base_device *m68k, int ea, UINT8 data)
{
case 1: // (xxx).B
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
m68ki_write_8(m68k, ea, data);
break;
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_16(m68k);
+ uint32_t ea = EA_PCDI_16(m68k);
m68ki_write_8(m68k, ea, data);
break;
}
@@ -869,7 +869,7 @@ static void WRITE_EA_8(m68000_base_device *m68k, int ea, UINT8 data)
}
}
-static void WRITE_EA_16(m68000_base_device *m68k, int ea, UINT16 data)
+static void WRITE_EA_16(m68000_base_device *m68k, int ea, uint16_t data)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -883,31 +883,31 @@ static void WRITE_EA_16(m68000_base_device *m68k, int ea, UINT16 data)
}
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
m68ki_write_16(m68k, ea, data);
break;
}
case 3: // (An)+
{
- UINT32 ea = EA_AY_PI_16(m68k);
+ uint32_t ea = EA_AY_PI_16(m68k);
m68ki_write_16(m68k, ea, data);
break;
}
case 4: // -(An)
{
- UINT32 ea = EA_AY_PD_16(m68k);
+ uint32_t ea = EA_AY_PD_16(m68k);
m68ki_write_16(m68k, ea, data);
break;
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_16(m68k);
+ uint32_t ea = EA_AY_DI_16(m68k);
m68ki_write_16(m68k, ea, data);
break;
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_16(m68k);
+ uint32_t ea = EA_AY_IX_16(m68k);
m68ki_write_16(m68k, ea, data);
break;
}
@@ -917,15 +917,15 @@ static void WRITE_EA_16(m68000_base_device *m68k, int ea, UINT16 data)
{
case 1: // (xxx).W
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
m68ki_write_16(m68k, ea, data);
break;
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_16(m68k);
+ uint32_t ea = EA_PCDI_16(m68k);
m68ki_write_16(m68k, ea, data);
break;
}
@@ -937,7 +937,7 @@ static void WRITE_EA_16(m68000_base_device *m68k, int ea, UINT16 data)
}
}
-static void WRITE_EA_32(m68000_base_device *m68k, int ea, UINT32 data)
+static void WRITE_EA_32(m68000_base_device *m68k, int ea, uint32_t data)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -956,31 +956,31 @@ static void WRITE_EA_32(m68000_base_device *m68k, int ea, UINT32 data)
}
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
m68ki_write_32(m68k, ea, data);
break;
}
case 3: // (An)+
{
- UINT32 ea = EA_AY_PI_32(m68k);
+ uint32_t ea = EA_AY_PI_32(m68k);
m68ki_write_32(m68k, ea, data);
break;
}
case 4: // -(An)
{
- UINT32 ea = EA_AY_PD_32(m68k);
+ uint32_t ea = EA_AY_PD_32(m68k);
m68ki_write_32(m68k, ea, data);
break;
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_32(m68k);
+ uint32_t ea = EA_AY_DI_32(m68k);
m68ki_write_32(m68k, ea, data);
break;
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_32(m68k);
+ uint32_t ea = EA_AY_IX_32(m68k);
m68ki_write_32(m68k, ea, data);
break;
}
@@ -990,21 +990,21 @@ static void WRITE_EA_32(m68000_base_device *m68k, int ea, UINT32 data)
{
case 0: // (xxx).W
{
- UINT32 ea = OPER_I_16(m68k);
+ uint32_t ea = OPER_I_16(m68k);
m68ki_write_32(m68k, ea, data);
break;
}
case 1: // (xxx).L
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
m68ki_write_32(m68k, ea, data);
break;
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_32(m68k);
+ uint32_t ea = EA_PCDI_32(m68k);
m68ki_write_32(m68k, ea, data);
break;
}
@@ -1016,7 +1016,7 @@ static void WRITE_EA_32(m68000_base_device *m68k, int ea, UINT32 data)
}
}
-static void WRITE_EA_64(m68000_base_device *m68k, int ea, UINT64 data)
+static void WRITE_EA_64(m68000_base_device *m68k, int ea, uint64_t data)
{
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
@@ -1025,40 +1025,40 @@ static void WRITE_EA_64(m68000_base_device *m68k, int ea, UINT64 data)
{
case 2: // (An)
{
- UINT32 ea = REG_A(m68k)[reg];
- m68ki_write_32(m68k, ea, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ uint32_t ea = REG_A(m68k)[reg];
+ m68ki_write_32(m68k, ea, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
case 3: // (An)+
{
- UINT32 ea = REG_A(m68k)[reg];
+ uint32_t ea = REG_A(m68k)[reg];
REG_A(m68k)[reg] += 8;
- m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ m68ki_write_32(m68k, ea+0, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
case 4: // -(An)
{
- UINT32 ea;
+ uint32_t ea;
REG_A(m68k)[reg] -= 8;
ea = REG_A(m68k)[reg];
- m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ m68ki_write_32(m68k, ea+0, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
case 5: // (d16, An)
{
- UINT32 ea = EA_AY_DI_32(m68k);
- m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ uint32_t ea = EA_AY_DI_32(m68k);
+ m68ki_write_32(m68k, ea+0, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
case 6: // (An) + (Xn) + d8
{
- UINT32 ea = EA_AY_IX_32(m68k);
- m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ uint32_t ea = EA_AY_IX_32(m68k);
+ m68ki_write_32(m68k, ea+0, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
case 7:
@@ -1067,25 +1067,25 @@ static void WRITE_EA_64(m68000_base_device *m68k, int ea, UINT64 data)
{
case 1: // (xxx).L
{
- UINT32 d1 = OPER_I_16(m68k);
- UINT32 d2 = OPER_I_16(m68k);
- UINT32 ea = (d1 << 16) | d2;
- m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ uint32_t d1 = OPER_I_16(m68k);
+ uint32_t d2 = OPER_I_16(m68k);
+ uint32_t ea = (d1 << 16) | d2;
+ m68ki_write_32(m68k, ea+0, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
case 2: // (d16, PC)
{
- UINT32 ea = EA_PCDI_32(m68k);
- m68ki_write_32(m68k, ea+0, (UINT32)(data >> 32));
- m68ki_write_32(m68k, ea+4, (UINT32)(data));
+ uint32_t ea = EA_PCDI_32(m68k);
+ m68ki_write_32(m68k, ea+0, (uint32_t)(data >> 32));
+ m68ki_write_32(m68k, ea+4, (uint32_t)(data));
break;
}
default: fatalerror("M68kFPU: WRITE_EA_64: unhandled mode %d, reg %d at %08X\n", mode, reg, REG_PC(m68k));
}
break;
}
- default: fatalerror("M68kFPU: WRITE_EA_64: unhandled mode %d, reg %d, data %08X%08X at %08X\n", mode, reg, (UINT32)(data >> 32), (UINT32)(data), REG_PC(m68k));
+ default: fatalerror("M68kFPU: WRITE_EA_64: unhandled mode %d, reg %d, data %08X%08X at %08X\n", mode, reg, (uint32_t)(data >> 32), (uint32_t)(data), REG_PC(m68k));
}
}
@@ -1098,7 +1098,7 @@ static void WRITE_EA_FPE(m68000_base_device *m68k, int ea, floatx80 fpr)
{
case 2: // (An)
{
- UINT32 ea;
+ uint32_t ea;
ea = REG_A(m68k)[reg];
store_extended_float80(m68k, ea, fpr);
break;
@@ -1106,7 +1106,7 @@ static void WRITE_EA_FPE(m68000_base_device *m68k, int ea, floatx80 fpr)
case 3: // (An)+
{
- UINT32 ea;
+ uint32_t ea;
ea = REG_A(m68k)[reg];
store_extended_float80(m68k, ea, fpr);
REG_A(m68k)[reg] += 12;
@@ -1115,7 +1115,7 @@ static void WRITE_EA_FPE(m68000_base_device *m68k, int ea, floatx80 fpr)
case 4: // -(An)
{
- UINT32 ea;
+ uint32_t ea;
REG_A(m68k)[reg] -= 12;
ea = REG_A(m68k)[reg];
store_extended_float80(m68k, ea, fpr);
@@ -1142,7 +1142,7 @@ static void WRITE_EA_PACK(m68000_base_device *m68k, int ea, int k, floatx80 fpr)
{
case 2: // (An)
{
- UINT32 ea;
+ uint32_t ea;
ea = REG_A(m68k)[reg];
store_pack_float80(m68k, ea, k, fpr);
break;
@@ -1150,7 +1150,7 @@ static void WRITE_EA_PACK(m68000_base_device *m68k, int ea, int k, floatx80 fpr)
case 3: // (An)+
{
- UINT32 ea;
+ uint32_t ea;
ea = REG_A(m68k)[reg];
store_pack_float80(m68k, ea, k, fpr);
REG_A(m68k)[reg] += 12;
@@ -1159,7 +1159,7 @@ static void WRITE_EA_PACK(m68000_base_device *m68k, int ea, int k, floatx80 fpr)
case 4: // -(An)
{
- UINT32 ea;
+ uint32_t ea;
REG_A(m68k)[reg] -= 12;
ea = REG_A(m68k)[reg];
store_pack_float80(m68k, ea, k, fpr);
@@ -1177,7 +1177,7 @@ static void WRITE_EA_PACK(m68000_base_device *m68k, int ea, int k, floatx80 fpr)
}
}
-static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
+static void fpgen_rm_reg(m68000_base_device *m68k, uint16_t w2)
{
int ea = m68k->ir & 0x3f;
int rm = (w2 >> 14) & 0x1;
@@ -1194,13 +1194,13 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
{
case 0: // Long-Word Integer
{
- INT32 d = READ_EA_32(m68k, ea);
+ int32_t d = READ_EA_32(m68k, ea);
source = int32_to_floatx80(d);
break;
}
case 1: // Single-precision Real
{
- UINT32 d = READ_EA_32(m68k, ea);
+ uint32_t d = READ_EA_32(m68k, ea);
source = float32_to_floatx80(d);
break;
}
@@ -1216,21 +1216,21 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
}
case 4: // Word Integer
{
- INT16 d = READ_EA_16(m68k, ea);
- source = int32_to_floatx80((INT32)d);
+ int16_t d = READ_EA_16(m68k, ea);
+ source = int32_to_floatx80((int32_t)d);
break;
}
case 5: // Double-precision Real
{
- UINT64 d = READ_EA_64(m68k, ea);
+ uint64_t d = READ_EA_64(m68k, ea);
source = float64_to_floatx80(d);
break;
}
case 6: // Byte Integer
{
- INT8 d = READ_EA_8(m68k, ea);
- source = int32_to_floatx80((INT32)d);
+ int8_t d = READ_EA_8(m68k, ea);
+ source = int32_to_floatx80((int32_t)d);
break;
}
case 7: // FMOVECR load from constant ROM
@@ -1263,7 +1263,7 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
break;
case 0xf: // 0.0
- source = int32_to_floatx80((INT32)0);
+ source = int32_to_floatx80((int32_t)0);
break;
case 0x30: // ln(2)
@@ -1277,26 +1277,26 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
break;
case 0x32: // 1 (or 100? manuals are unclear, but 1 would make more sense)
- source = int32_to_floatx80((INT32)1);
+ source = int32_to_floatx80((int32_t)1);
break;
case 0x33: // 10^1
- source = int32_to_floatx80((INT32)10);
+ source = int32_to_floatx80((int32_t)10);
break;
case 0x34: // 10^2
- source = int32_to_floatx80((INT32)10*10);
+ source = int32_to_floatx80((int32_t)10*10);
break;
case 0x35: // 10^4
- source = int32_to_floatx80((INT32)1000*10);
+ source = int32_to_floatx80((int32_t)1000*10);
break;
case 0x36: // 1.0e8
- source = int32_to_floatx80((INT32)10000000*10);
+ source = int32_to_floatx80((int32_t)10000000*10);
break;
- case 0x37: // 1.0e16 - can't get the right precision from INT32 so go "direct" with constants from h/w
+ case 0x37: // 1.0e16 - can't get the right precision from int32_t so go "direct" with constants from h/w
source.high = 0x4034;
source.low = U64(0x8e1bc9bf04000000);
break;
@@ -1372,14 +1372,14 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
}
case 0x01: // FINT
{
- INT32 temp;
+ int32_t temp;
temp = floatx80_to_int32(source);
REG_FP(m68k)[dst] = int32_to_floatx80(temp);
break;
}
case 0x03: // FINTRZ
{
- INT32 temp;
+ int32_t temp;
temp = floatx80_to_int32_round_to_zero(source);
REG_FP(m68k)[dst] = int32_to_floatx80(temp);
break;
@@ -1461,7 +1461,7 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
}
case 0x1e: // FGETEXP
{
- INT16 temp2;
+ int16_t temp2;
temp2 = source.high; // get the exponent
temp2 -= 0x3fff; // take off the bias
@@ -1549,7 +1549,7 @@ static void fpgen_rm_reg(m68000_base_device *m68k, UINT16 w2)
}
}
-static void fmove_reg_mem(m68000_base_device *m68k, UINT16 w2)
+static void fmove_reg_mem(m68000_base_device *m68k, uint16_t w2)
{
int ea = m68k->ir & 0x3f;
int src = (w2 >> 7) & 0x7;
@@ -1560,13 +1560,13 @@ static void fmove_reg_mem(m68000_base_device *m68k, UINT16 w2)
{
case 0: // Long-Word Integer
{
- INT32 d = (INT32)floatx80_to_int32(REG_FP(m68k)[src]);
+ int32_t d = (int32_t)floatx80_to_int32(REG_FP(m68k)[src]);
WRITE_EA_32(m68k, ea, d);
break;
}
case 1: // Single-precision Real
{
- UINT32 d = floatx80_to_float32(REG_FP(m68k)[src]);
+ uint32_t d = floatx80_to_float32(REG_FP(m68k)[src]);
WRITE_EA_32(m68k, ea, d);
break;
}
@@ -1589,12 +1589,12 @@ static void fmove_reg_mem(m68000_base_device *m68k, UINT16 w2)
{
REG_FPSR(m68k) |= FPES_OE | FPAE_IOP;
}
- WRITE_EA_16(m68k, ea, (INT16)value);
+ WRITE_EA_16(m68k, ea, (int16_t)value);
break;
}
case 5: // Double-precision Real
{
- UINT64 d;
+ uint64_t d;
d = floatx80_to_float64(REG_FP(m68k)[src]);
@@ -1608,7 +1608,7 @@ static void fmove_reg_mem(m68000_base_device *m68k, UINT16 w2)
{
REG_FPSR(m68k) |= FPES_OE | FPAE_IOP;
}
- WRITE_EA_8(m68k, ea, (INT8) value);
+ WRITE_EA_8(m68k, ea, (int8_t) value);
break;
}
case 7: // Packed-decimal Real with Dynamic K-factor
@@ -1621,7 +1621,7 @@ static void fmove_reg_mem(m68000_base_device *m68k, UINT16 w2)
m68k->remaining_cycles -= 12;
}
-static void fmove_fpcr(m68000_base_device *m68k, UINT16 w2)
+static void fmove_fpcr(m68000_base_device *m68k, uint16_t w2)
{
int ea = m68k->ir & 0x3f;
int dir = (w2 >> 13) & 0x1;
@@ -1630,7 +1630,7 @@ static void fmove_fpcr(m68000_base_device *m68k, UINT16 w2)
if ((mode == 5) || (mode == 6))
{
- UINT32 address = 0xffffffff; // force a bus error if this doesn't get assigned
+ uint32_t address = 0xffffffff; // force a bus error if this doesn't get assigned
if (mode == 5)
{
@@ -1721,7 +1721,7 @@ static void fmove_fpcr(m68000_base_device *m68k, UINT16 w2)
m68k->remaining_cycles -= 10;
}
-static void fmovem(m68000_base_device *m68k, UINT16 w2)
+static void fmovem(m68000_base_device *m68k, uint16_t w2)
{
int i;
int ea = m68k->ir & 0x3f;
@@ -1729,7 +1729,7 @@ static void fmovem(m68000_base_device *m68k, UINT16 w2)
int mode = (w2 >> 11) & 0x3;
int reglist = w2 & 0xff;
- UINT32 mem_addr = 0;
+ uint32_t mem_addr = 0;
switch (ea >> 3)
{
case 5: // (d16, An)
@@ -1838,7 +1838,7 @@ static void fmovem(m68000_base_device *m68k, UINT16 w2)
static void fscc(m68000_base_device *m68k)
{
int ea = m68k->ir & 0x3f;
- int condition = (INT16)(OPER_I_16(m68k));
+ int condition = (int16_t)(OPER_I_16(m68k));
WRITE_EA_8(m68k, ea, TEST_CONDITION(m68k, condition) ? 0xff : 0);
m68k->remaining_cycles -= 7; // ???
@@ -1846,10 +1846,10 @@ static void fscc(m68000_base_device *m68k)
static void fbcc16(m68000_base_device *m68k)
{
- INT32 offset;
+ int32_t offset;
int condition = m68k->ir & 0x3f;
- offset = (INT16)(OPER_I_16(m68k));
+ offset = (int16_t)(OPER_I_16(m68k));
// TODO: condition and jump!!!
if (TEST_CONDITION(m68k, condition))
@@ -1863,7 +1863,7 @@ static void fbcc16(m68000_base_device *m68k)
static void fbcc32(m68000_base_device *m68k)
{
- INT32 offset;
+ int32_t offset;
int condition = m68k->ir & 0x3f;
offset = OPER_I_32(m68k);
@@ -1887,7 +1887,7 @@ void m68040_fpu_op0(m68000_base_device *m68k)
{
case 0:
{
- UINT16 w2 = OPER_I_16(m68k);
+ uint16_t w2 = OPER_I_16(m68k);
switch ((w2 >> 13) & 0x7)
{
case 0x0: // FPU ALU FP, FP
@@ -1950,7 +1950,7 @@ void m68040_fpu_op0(m68000_base_device *m68k)
}
}
-static int perform_fsave(m68000_base_device *m68k, UINT32 addr, int inc)
+static int perform_fsave(m68000_base_device *m68k, uint32_t addr, int inc)
{
if(m68k->cpu_type & CPU_TYPE_040)
{
@@ -2010,7 +2010,7 @@ static void do_frestore_null(m68000_base_device *m68k)
m68k->fpu_just_reset = 1;
}
-static void m68040_do_fsave(m68000_base_device *m68k, UINT32 addr, int reg, int inc)
+static void m68040_do_fsave(m68000_base_device *m68k, uint32_t addr, int reg, int inc)
{
if (m68k->fpu_just_reset)
{
@@ -2025,10 +2025,10 @@ static void m68040_do_fsave(m68000_base_device *m68k, UINT32 addr, int reg, int
}
}
-static void m68040_do_frestore(m68000_base_device *m68k, UINT32 addr, int reg)
+static void m68040_do_frestore(m68000_base_device *m68k, uint32_t addr, int reg)
{
bool m40 = m68k->cpu_type & CPU_TYPE_040;
- UINT32 temp = m68ki_read_32(m68k, addr);
+ uint32_t temp = m68ki_read_32(m68k, addr);
// check for nullptr frame
if (temp & 0xff000000)
@@ -2068,7 +2068,7 @@ void m68040_fpu_op1(m68000_base_device *m68k)
int ea = m68k->ir & 0x3f;
int mode = (ea >> 3) & 0x7;
int reg = (ea & 0x7);
- UINT32 addr;
+ uint32_t addr;
switch ((m68k->ir >> 6) & 0x3)
{
@@ -2177,7 +2177,7 @@ void m68040_fpu_op1(m68000_base_device *m68k)
void m68881_ftrap(m68000_base_device *m68k)
{
- UINT16 w2 = OPER_I_16(m68k);
+ uint16_t w2 = OPER_I_16(m68k);
// now check the condition
if (TEST_CONDITION(m68k, w2 & 0x3f))