diff options
Diffstat (limited to 'src/devices/cpu/m68000/m68k_in.cpp')
-rw-r--r-- | src/devices/cpu/m68000/m68k_in.cpp | 2634 |
1 files changed, 1317 insertions, 1317 deletions
diff --git a/src/devices/cpu/m68000/m68k_in.cpp b/src/devices/cpu/m68000/m68k_in.cpp index df98a736226..36800d226b3 100644 --- a/src/devices/cpu/m68000/m68k_in.cpp +++ b/src/devices/cpu/m68000/m68k_in.cpp @@ -925,10 +925,10 @@ M68KMAKE_OP(040fpu1, 32, ., .) M68KMAKE_OP(abcd, 8, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ @@ -951,10 +951,10 @@ M68KMAKE_OP(abcd, 8, rr, .) M68KMAKE_OP(abcd, 8, mm, ax7) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ @@ -977,10 +977,10 @@ M68KMAKE_OP(abcd, 8, mm, ax7) M68KMAKE_OP(abcd, 8, mm, ay7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ @@ -1003,10 +1003,10 @@ M68KMAKE_OP(abcd, 8, mm, ay7) M68KMAKE_OP(abcd, 8, mm, axy7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ @@ -1029,10 +1029,10 @@ M68KMAKE_OP(abcd, 8, mm, axy7) M68KMAKE_OP(abcd, 8, mm, .) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ @@ -1055,10 +1055,10 @@ M68KMAKE_OP(abcd, 8, mm, .) M68KMAKE_OP(add, 8, er, d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1071,10 +1071,10 @@ M68KMAKE_OP(add, 8, er, d) M68KMAKE_OP(add, 8, er, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_8; - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_8; + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1087,10 +1087,10 @@ M68KMAKE_OP(add, 8, er, .) M68KMAKE_OP(add, 16, er, d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1103,10 +1103,10 @@ M68KMAKE_OP(add, 16, er, d) M68KMAKE_OP(add, 16, er, a) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1119,10 +1119,10 @@ M68KMAKE_OP(add, 16, er, a) M68KMAKE_OP(add, 16, er, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_16; - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_16; + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1135,10 +1135,10 @@ M68KMAKE_OP(add, 16, er, .) M68KMAKE_OP(add, 32, er, d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1151,10 +1151,10 @@ M68KMAKE_OP(add, 32, er, d) M68KMAKE_OP(add, 32, er, a) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = AY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = AY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1167,10 +1167,10 @@ M68KMAKE_OP(add, 32, er, a) M68KMAKE_OP(add, 32, er, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_32; - UINT32 dst = *r_dst; - UINT32 res = src + dst; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_32; + uint32_t dst = *r_dst; + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1183,10 +1183,10 @@ M68KMAKE_OP(add, 32, er, .) M68KMAKE_OP(add, 8, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = MASK_OUT_ABOVE_8(DX(mc68kcpu)); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = MASK_OUT_ABOVE_8(DX(mc68kcpu)); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1199,10 +1199,10 @@ M68KMAKE_OP(add, 8, re, .) M68KMAKE_OP(add, 16, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = MASK_OUT_ABOVE_16(DX(mc68kcpu)); - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = MASK_OUT_ABOVE_16(DX(mc68kcpu)); + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1215,10 +1215,10 @@ M68KMAKE_OP(add, 16, re, .) M68KMAKE_OP(add, 32, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 src = DX(mc68kcpu); - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t src = DX(mc68kcpu); + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1231,7 +1231,7 @@ M68KMAKE_OP(add, 32, re, .) M68KMAKE_OP(adda, 16, ., d) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(DY(mc68kcpu))); } @@ -1239,7 +1239,7 @@ M68KMAKE_OP(adda, 16, ., d) M68KMAKE_OP(adda, 16, ., a) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(AY(mc68kcpu))); } @@ -1247,8 +1247,8 @@ M68KMAKE_OP(adda, 16, ., a) M68KMAKE_OP(adda, 16, ., .) { - UINT32* r_dst = &AX(mc68kcpu); - UINT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + uint32_t* r_dst = &AX(mc68kcpu); + uint32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); } @@ -1256,7 +1256,7 @@ M68KMAKE_OP(adda, 16, ., .) M68KMAKE_OP(adda, 32, ., d) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst + DY(mc68kcpu)); } @@ -1264,7 +1264,7 @@ M68KMAKE_OP(adda, 32, ., d) M68KMAKE_OP(adda, 32, ., a) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst + AY(mc68kcpu)); } @@ -1272,8 +1272,8 @@ M68KMAKE_OP(adda, 32, ., a) M68KMAKE_OP(adda, 32, ., .) { - UINT32* r_dst = &AX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_32; + uint32_t* r_dst = &AX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_32; *r_dst = MASK_OUT_ABOVE_32(*r_dst + src); } @@ -1281,10 +1281,10 @@ M68KMAKE_OP(adda, 32, ., .) M68KMAKE_OP(addi, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1297,10 +1297,10 @@ M68KMAKE_OP(addi, 8, ., d) M68KMAKE_OP(addi, 8, ., .) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1313,10 +1313,10 @@ M68KMAKE_OP(addi, 8, ., .) M68KMAKE_OP(addi, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1329,10 +1329,10 @@ M68KMAKE_OP(addi, 16, ., d) M68KMAKE_OP(addi, 16, ., .) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1345,10 +1345,10 @@ M68KMAKE_OP(addi, 16, ., .) M68KMAKE_OP(addi, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = src + dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1361,10 +1361,10 @@ M68KMAKE_OP(addi, 32, ., d) M68KMAKE_OP(addi, 32, ., .) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1377,10 +1377,10 @@ M68KMAKE_OP(addi, 32, ., .) M68KMAKE_OP(addq, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1393,10 +1393,10 @@ M68KMAKE_OP(addq, 8, ., d) M68KMAKE_OP(addq, 8, ., .) { - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1409,10 +1409,10 @@ M68KMAKE_OP(addq, 8, ., .) M68KMAKE_OP(addq, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src + dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1425,7 +1425,7 @@ M68KMAKE_OP(addq, 16, ., d) M68KMAKE_OP(addq, 16, ., a) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst + ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1); } @@ -1433,10 +1433,10 @@ M68KMAKE_OP(addq, 16, ., a) M68KMAKE_OP(addq, 16, ., .) { - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1449,10 +1449,10 @@ M68KMAKE_OP(addq, 16, ., .) M68KMAKE_OP(addq, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 dst = *r_dst; - UINT32 res = src + dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t dst = *r_dst; + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1465,7 +1465,7 @@ M68KMAKE_OP(addq, 32, ., d) M68KMAKE_OP(addq, 32, ., a) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst + ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1); } @@ -1473,10 +1473,10 @@ M68KMAKE_OP(addq, 32, ., a) M68KMAKE_OP(addq, 32, ., .) { - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = src + dst; + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = src + dst; (mc68kcpu)->n_flag = NFLAG_32(res); @@ -1490,10 +1490,10 @@ M68KMAKE_OP(addq, 32, ., .) M68KMAKE_OP(addx, 8, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1508,10 +1508,10 @@ M68KMAKE_OP(addx, 8, rr, .) M68KMAKE_OP(addx, 16, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1526,10 +1526,10 @@ M68KMAKE_OP(addx, 16, rr, .) M68KMAKE_OP(addx, 32, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1544,10 +1544,10 @@ M68KMAKE_OP(addx, 32, rr, .) M68KMAKE_OP(addx, 8, mm, ax7) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1562,10 +1562,10 @@ M68KMAKE_OP(addx, 8, mm, ax7) M68KMAKE_OP(addx, 8, mm, ay7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1580,10 +1580,10 @@ M68KMAKE_OP(addx, 8, mm, ay7) M68KMAKE_OP(addx, 8, mm, axy7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1598,10 +1598,10 @@ M68KMAKE_OP(addx, 8, mm, axy7) M68KMAKE_OP(addx, 8, mm, .) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->v_flag = VFLAG_ADD_8(src, dst, res); @@ -1616,10 +1616,10 @@ M68KMAKE_OP(addx, 8, mm, .) M68KMAKE_OP(addx, 16, mm, .) { - UINT32 src = OPER_AY_PD_16(mc68kcpu); - UINT32 ea = EA_AX_PD_16(mc68kcpu); - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_16(mc68kcpu); + uint32_t ea = EA_AX_PD_16(mc68kcpu); + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->v_flag = VFLAG_ADD_16(src, dst, res); @@ -1634,10 +1634,10 @@ M68KMAKE_OP(addx, 16, mm, .) M68KMAKE_OP(addx, 32, mm, .) { - UINT32 src = OPER_AY_PD_32(mc68kcpu); - UINT32 ea = EA_AX_PD_32(mc68kcpu); - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = src + dst + XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_32(mc68kcpu); + uint32_t ea = EA_AX_PD_32(mc68kcpu); + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = src + dst + XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->v_flag = VFLAG_ADD_32(src, dst, res); @@ -1712,8 +1712,8 @@ M68KMAKE_OP(and, 32, er, .) M68KMAKE_OP(and, 8, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = DX(mc68kcpu) & m68ki_read_8((mc68kcpu), ea); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = DX(mc68kcpu) & m68ki_read_8((mc68kcpu), ea); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->c_flag = CFLAG_CLEAR; @@ -1726,8 +1726,8 @@ M68KMAKE_OP(and, 8, re, .) M68KMAKE_OP(and, 16, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = DX(mc68kcpu) & m68ki_read_16((mc68kcpu), ea); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = DX(mc68kcpu) & m68ki_read_16((mc68kcpu), ea); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->c_flag = CFLAG_CLEAR; @@ -1740,8 +1740,8 @@ M68KMAKE_OP(and, 16, re, .) M68KMAKE_OP(and, 32, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = DX(mc68kcpu) & m68ki_read_32((mc68kcpu), ea); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = DX(mc68kcpu) & m68ki_read_32((mc68kcpu), ea); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -1764,9 +1764,9 @@ M68KMAKE_OP(andi, 8, ., d) M68KMAKE_OP(andi, 8, ., .) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = src & m68ki_read_8((mc68kcpu), ea); + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = src & m68ki_read_8((mc68kcpu), ea); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -1789,9 +1789,9 @@ M68KMAKE_OP(andi, 16, ., d) M68KMAKE_OP(andi, 16, ., .) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = src & m68ki_read_16((mc68kcpu), ea); + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = src & m68ki_read_16((mc68kcpu), ea); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -1814,9 +1814,9 @@ M68KMAKE_OP(andi, 32, ., d) M68KMAKE_OP(andi, 32, ., .) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = src & m68ki_read_32((mc68kcpu), ea); + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = src & m68ki_read_32((mc68kcpu), ea); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -1837,7 +1837,7 @@ M68KMAKE_OP(andi, 16, tos, .) { if((mc68kcpu)->s_flag) { - UINT32 src = OPER_I_16(mc68kcpu); + uint32_t src = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr((mc68kcpu), m68ki_get_sr(mc68kcpu) & src); return; @@ -1848,10 +1848,10 @@ M68KMAKE_OP(andi, 16, tos, .) M68KMAKE_OP(asr, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src >> shift; if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -1870,10 +1870,10 @@ M68KMAKE_OP(asr, 8, s, .) M68KMAKE_OP(asr, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src >> shift; if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -1892,10 +1892,10 @@ M68KMAKE_OP(asr, 16, s, .) M68KMAKE_OP(asr, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = *r_dst; - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = *r_dst; + uint32_t res = src >> shift; if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -1914,10 +1914,10 @@ M68KMAKE_OP(asr, 32, s, .) M68KMAKE_OP(asr, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src >> shift; if(shift != 0) { @@ -1966,10 +1966,10 @@ M68KMAKE_OP(asr, 8, r, .) M68KMAKE_OP(asr, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src >> shift; if(shift != 0) { @@ -2018,10 +2018,10 @@ M68KMAKE_OP(asr, 16, r, .) M68KMAKE_OP(asr, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = *r_dst; - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = *r_dst; + uint32_t res = src >> shift; if(shift != 0) { @@ -2070,9 +2070,9 @@ M68KMAKE_OP(asr, 32, r, .) M68KMAKE_OP(asr, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = src >> 1; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = src >> 1; if(GET_MSB_16(src)) res |= 0x8000; @@ -2088,10 +2088,10 @@ M68KMAKE_OP(asr, 16, ., .) M68KMAKE_OP(asl, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = MASK_OUT_ABOVE_8(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -2108,10 +2108,10 @@ M68KMAKE_OP(asl, 8, s, .) M68KMAKE_OP(asl, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = MASK_OUT_ABOVE_16(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -2128,10 +2128,10 @@ M68KMAKE_OP(asl, 16, s, .) M68KMAKE_OP(asl, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = *r_dst; - UINT32 res = MASK_OUT_ABOVE_32(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = *r_dst; + uint32_t res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -2148,10 +2148,10 @@ M68KMAKE_OP(asl, 32, s, .) M68KMAKE_OP(asl, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = MASK_OUT_ABOVE_8(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) { @@ -2185,10 +2185,10 @@ M68KMAKE_OP(asl, 8, r, .) M68KMAKE_OP(asl, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = MASK_OUT_ABOVE_16(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) { @@ -2222,10 +2222,10 @@ M68KMAKE_OP(asl, 16, r, .) M68KMAKE_OP(asl, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = *r_dst; - UINT32 res = MASK_OUT_ABOVE_32(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = *r_dst; + uint32_t res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) { @@ -2259,9 +2259,9 @@ M68KMAKE_OP(asl, 32, r, .) M68KMAKE_OP(asl, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = MASK_OUT_ABOVE_16(src << 1); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = MASK_OUT_ABOVE_16(src << 1); m68ki_write_16((mc68kcpu), ea, res); @@ -2289,7 +2289,7 @@ M68KMAKE_OP(bcc, 16, ., .) { if(M68KMAKE_CC) { - UINT32 offset = OPER_I_16(mc68kcpu); + uint32_t offset = OPER_I_16(mc68kcpu); REG_PC(mc68kcpu) -= 2; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16((mc68kcpu), offset); @@ -2306,7 +2306,7 @@ M68KMAKE_OP(bcc, 32, ., .) { if(M68KMAKE_CC) { - UINT32 offset = OPER_I_32(mc68kcpu); + uint32_t offset = OPER_I_32(mc68kcpu); REG_PC(mc68kcpu) -= 4; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_branch_32((mc68kcpu), offset); @@ -2330,8 +2330,8 @@ M68KMAKE_OP(bcc, 32, ., .) M68KMAKE_OP(bchg, 32, r, d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 mask = 1 << (DX(mc68kcpu) & 0x1f); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t mask = 1 << (DX(mc68kcpu) & 0x1f); (mc68kcpu)->not_z_flag = *r_dst & mask; *r_dst ^= mask; @@ -2340,9 +2340,9 @@ M68KMAKE_OP(bchg, 32, r, d) M68KMAKE_OP(bchg, 8, r, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); - UINT32 mask = 1 << (DX(mc68kcpu) & 7); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); + uint32_t mask = 1 << (DX(mc68kcpu) & 7); (mc68kcpu)->not_z_flag = src & mask; m68ki_write_8((mc68kcpu), ea, src ^ mask); @@ -2351,8 +2351,8 @@ M68KMAKE_OP(bchg, 8, r, .) M68KMAKE_OP(bchg, 32, s, d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 mask = 1 << (OPER_I_8(mc68kcpu) & 0x1f); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t mask = 1 << (OPER_I_8(mc68kcpu) & 0x1f); (mc68kcpu)->not_z_flag = *r_dst & mask; *r_dst ^= mask; @@ -2361,9 +2361,9 @@ M68KMAKE_OP(bchg, 32, s, d) M68KMAKE_OP(bchg, 8, s, .) { - UINT32 mask = 1 << (OPER_I_8(mc68kcpu) & 7); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); + uint32_t mask = 1 << (OPER_I_8(mc68kcpu) & 7); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); (mc68kcpu)->not_z_flag = src & mask; m68ki_write_8((mc68kcpu), ea, src ^ mask); @@ -2372,8 +2372,8 @@ M68KMAKE_OP(bchg, 8, s, .) M68KMAKE_OP(bclr, 32, r, d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 mask = 1 << (DX(mc68kcpu) & 0x1f); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t mask = 1 << (DX(mc68kcpu) & 0x1f); (mc68kcpu)->not_z_flag = *r_dst & mask; *r_dst &= ~mask; @@ -2382,9 +2382,9 @@ M68KMAKE_OP(bclr, 32, r, d) M68KMAKE_OP(bclr, 8, r, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); - UINT32 mask = 1 << (DX(mc68kcpu) & 7); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); + uint32_t mask = 1 << (DX(mc68kcpu) & 7); (mc68kcpu)->not_z_flag = src & mask; m68ki_write_8((mc68kcpu), ea, src & ~mask); @@ -2393,8 +2393,8 @@ M68KMAKE_OP(bclr, 8, r, .) M68KMAKE_OP(bclr, 32, s, d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 mask = 1 << (OPER_I_8(mc68kcpu) & 0x1f); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t mask = 1 << (OPER_I_8(mc68kcpu) & 0x1f); (mc68kcpu)->not_z_flag = *r_dst & mask; *r_dst &= ~mask; @@ -2403,9 +2403,9 @@ M68KMAKE_OP(bclr, 32, s, d) M68KMAKE_OP(bclr, 8, s, .) { - UINT32 mask = 1 << (OPER_I_8(mc68kcpu) & 7); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); + uint32_t mask = 1 << (OPER_I_8(mc68kcpu) & 7); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); (mc68kcpu)->not_z_flag = src & mask; m68ki_write_8((mc68kcpu), ea, src & ~mask); @@ -2416,11 +2416,11 @@ M68KMAKE_OP(bfchg, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32* data = &DY(mc68kcpu); - UINT64 mask; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t* data = &DY(mc68kcpu); + uint64_t mask; if(BIT_B(word2)) @@ -2451,15 +2451,15 @@ M68KMAKE_OP(bfchg, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 mask_base; - UINT32 data_long; - UINT32 mask_long; - UINT32 data_byte = 0; - UINT32 mask_byte = 0; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t mask_base; + uint32_t data_long; + uint32_t mask_long; + uint32_t data_byte = 0; + uint32_t mask_byte = 0; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -2505,11 +2505,11 @@ M68KMAKE_OP(bfclr, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32* data = &DY(mc68kcpu); - UINT64 mask; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t* data = &DY(mc68kcpu); + uint64_t mask; if(BIT_B(word2)) @@ -2542,15 +2542,15 @@ M68KMAKE_OP(bfclr, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 mask_base; - UINT32 data_long; - UINT32 mask_long; - UINT32 data_byte = 0; - UINT32 mask_byte = 0; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t mask_base; + uint32_t data_long; + uint32_t mask_long; + uint32_t data_byte = 0; + uint32_t mask_byte = 0; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -2596,10 +2596,10 @@ M68KMAKE_OP(bfexts, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT64 data = DY(mc68kcpu); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint64_t data = DY(mc68kcpu); if(BIT_B(word2)) @@ -2630,11 +2630,11 @@ M68KMAKE_OP(bfexts, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 data; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t data; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -2682,10 +2682,10 @@ M68KMAKE_OP(bfextu, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT64 data = DY(mc68kcpu); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint64_t data = DY(mc68kcpu); if(BIT_B(word2)) @@ -2716,11 +2716,11 @@ M68KMAKE_OP(bfextu, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 data; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t data; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -2767,11 +2767,11 @@ M68KMAKE_OP(bfffo, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT64 data = DY(mc68kcpu); - UINT32 bit; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint64_t data = DY(mc68kcpu); + uint32_t bit; if(BIT_B(word2)) @@ -2805,13 +2805,13 @@ M68KMAKE_OP(bfffo, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - INT32 local_offset; - UINT32 width = word2; - UINT32 data; - UINT32 bit; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + int32_t local_offset; + uint32_t width = word2; + uint32_t data; + uint32_t bit; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -2857,12 +2857,12 @@ M68KMAKE_OP(bfins, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32* data = &DY(mc68kcpu); - UINT64 mask; - UINT64 insert = REG_D(mc68kcpu)[(word2>>12)&7]; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t* data = &DY(mc68kcpu); + uint64_t mask; + uint64_t insert = REG_D(mc68kcpu)[(word2>>12)&7]; if(BIT_B(word2)) @@ -2899,18 +2899,18 @@ M68KMAKE_OP(bfins, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 insert_base = REG_D(mc68kcpu)[(word2>>12)&7]; - UINT32 insert_long; - UINT32 insert_byte; - UINT32 mask_base; - UINT32 data_long; - UINT32 mask_long; - UINT32 data_byte = 0; - UINT32 mask_byte = 0; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t insert_base = REG_D(mc68kcpu)[(word2>>12)&7]; + uint32_t insert_long; + uint32_t insert_byte; + uint32_t mask_base; + uint32_t data_long; + uint32_t mask_long; + uint32_t data_byte = 0; + uint32_t mask_byte = 0; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) @@ -2975,11 +2975,11 @@ M68KMAKE_OP(bfset, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32* data = &DY(mc68kcpu); - UINT64 mask; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t* data = &DY(mc68kcpu); + uint64_t mask; if(BIT_B(word2)) @@ -3012,15 +3012,15 @@ M68KMAKE_OP(bfset, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 mask_base; - UINT32 data_long; - UINT32 mask_long; - UINT32 data_byte = 0; - UINT32 mask_byte = 0; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t mask_base; + uint32_t data_long; + uint32_t mask_long; + uint32_t data_byte = 0; + uint32_t mask_byte = 0; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) offset = MAKE_INT_32(REG_D(mc68kcpu)[offset&7]); @@ -3065,11 +3065,11 @@ M68KMAKE_OP(bftst, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32* data = &DY(mc68kcpu); - UINT64 mask; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t* data = &DY(mc68kcpu); + uint64_t mask; if(BIT_B(word2)) @@ -3100,15 +3100,15 @@ M68KMAKE_OP(bftst, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - INT32 offset = (word2>>6)&31; - UINT32 width = word2; - UINT32 mask_base; - UINT32 data_long; - UINT32 mask_long; - UINT32 data_byte = 0; - UINT32 mask_byte = 0; - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + int32_t offset = (word2>>6)&31; + uint32_t width = word2; + uint32_t mask_base; + uint32_t data_long; + uint32_t mask_long; + uint32_t data_byte = 0; + uint32_t mask_byte = 0; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(BIT_B(word2)) offset = MAKE_INT_32(REG_D(mc68kcpu)[offset&7]); @@ -3169,7 +3169,7 @@ M68KMAKE_OP(bra, 8, ., .) M68KMAKE_OP(bra, 16, ., .) { - UINT32 offset = OPER_I_16(mc68kcpu); + uint32_t offset = OPER_I_16(mc68kcpu); REG_PC(mc68kcpu) -= 2; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16((mc68kcpu), offset); @@ -3182,7 +3182,7 @@ M68KMAKE_OP(bra, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 offset = OPER_I_32(mc68kcpu); + uint32_t offset = OPER_I_32(mc68kcpu); REG_PC(mc68kcpu) -= 4; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_branch_32((mc68kcpu), offset); @@ -3202,8 +3202,8 @@ M68KMAKE_OP(bra, 32, ., .) M68KMAKE_OP(bset, 32, r, d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 mask = 1 << (DX(mc68kcpu) & 0x1f); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t mask = 1 << (DX(mc68kcpu) & 0x1f); (mc68kcpu)->not_z_flag = *r_dst & mask; *r_dst |= mask; @@ -3212,9 +3212,9 @@ M68KMAKE_OP(bset, 32, r, d) M68KMAKE_OP(bset, 8, r, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); - UINT32 mask = 1 << (DX(mc68kcpu) & 7); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); + uint32_t mask = 1 << (DX(mc68kcpu) & 7); (mc68kcpu)->not_z_flag = src & mask; m68ki_write_8((mc68kcpu), ea, src | mask); @@ -3223,8 +3223,8 @@ M68KMAKE_OP(bset, 8, r, .) M68KMAKE_OP(bset, 32, s, d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 mask = 1 << (OPER_I_8(mc68kcpu) & 0x1f); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t mask = 1 << (OPER_I_8(mc68kcpu) & 0x1f); (mc68kcpu)->not_z_flag = *r_dst & mask; *r_dst |= mask; @@ -3233,9 +3233,9 @@ M68KMAKE_OP(bset, 32, s, d) M68KMAKE_OP(bset, 8, s, .) { - UINT32 mask = 1 << (OPER_I_8(mc68kcpu) & 7); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); + uint32_t mask = 1 << (OPER_I_8(mc68kcpu) & 7); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); (mc68kcpu)->not_z_flag = src & mask; m68ki_write_8((mc68kcpu), ea, src | mask); @@ -3252,7 +3252,7 @@ M68KMAKE_OP(bsr, 8, ., .) M68KMAKE_OP(bsr, 16, ., .) { - UINT32 offset = OPER_I_16(mc68kcpu); + uint32_t offset = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_push_32((mc68kcpu), REG_PC(mc68kcpu)); REG_PC(mc68kcpu) -= 2; @@ -3264,7 +3264,7 @@ M68KMAKE_OP(bsr, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 offset = OPER_I_32(mc68kcpu); + uint32_t offset = OPER_I_32(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_push_32((mc68kcpu), REG_PC(mc68kcpu)); REG_PC(mc68kcpu) -= 4; @@ -3300,7 +3300,7 @@ M68KMAKE_OP(btst, 32, s, d) M68KMAKE_OP(btst, 8, s, .) { - UINT32 bit = OPER_I_8(mc68kcpu) & 7; + uint32_t bit = OPER_I_8(mc68kcpu) & 7; (mc68kcpu)->not_z_flag = M68KMAKE_GET_OPER_AY_8 & (1 << bit); } @@ -3311,7 +3311,7 @@ M68KMAKE_OP(callm, 32, ., .) /* note: watch out for pcrelative modes */ if(CPU_TYPE_IS_020_VARIANT((mc68kcpu)->cpu_type)) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; + uint32_t ea = M68KMAKE_GET_EA_AY_32; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ REG_PC(mc68kcpu) += 2; @@ -3328,11 +3328,11 @@ M68KMAKE_OP(cas, 8, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dest = m68ki_read_8((mc68kcpu), ea); - UINT32* compare = ®_D(mc68kcpu)[word2 & 7]; - UINT32 res = dest - MASK_OUT_ABOVE_8(*compare); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dest = m68ki_read_8((mc68kcpu), ea); + uint32_t* compare = ®_D(mc68kcpu)[word2 & 7]; + uint32_t res = dest - MASK_OUT_ABOVE_8(*compare); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ (mc68kcpu)->n_flag = NFLAG_8(res); @@ -3357,11 +3357,11 @@ M68KMAKE_OP(cas, 16, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 dest = m68ki_read_16((mc68kcpu), ea); - UINT32* compare = ®_D(mc68kcpu)[word2 & 7]; - UINT32 res = dest - MASK_OUT_ABOVE_16(*compare); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t dest = m68ki_read_16((mc68kcpu), ea); + uint32_t* compare = ®_D(mc68kcpu)[word2 & 7]; + uint32_t res = dest - MASK_OUT_ABOVE_16(*compare); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ (mc68kcpu)->n_flag = NFLAG_16(res); @@ -3386,11 +3386,11 @@ M68KMAKE_OP(cas, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 dest = m68ki_read_32((mc68kcpu), ea); - UINT32* compare = ®_D(mc68kcpu)[word2 & 7]; - UINT32 res = dest - *compare; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t dest = m68ki_read_32((mc68kcpu), ea); + uint32_t* compare = ®_D(mc68kcpu)[word2 & 7]; + uint32_t res = dest - *compare; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ (mc68kcpu)->n_flag = NFLAG_32(res); @@ -3415,15 +3415,15 @@ M68KMAKE_OP(cas2, 16, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_32(mc68kcpu); - UINT32* compare1 = ®_D(mc68kcpu)[(word2 >> 16) & 7]; - UINT32 ea1 = REG_DA(mc68kcpu)[(word2 >> 28) & 15]; - UINT32 dest1 = m68ki_read_16((mc68kcpu), ea1); - UINT32 res1 = dest1 - MASK_OUT_ABOVE_16(*compare1); - UINT32* compare2 = ®_D(mc68kcpu)[word2 & 7]; - UINT32 ea2 = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; - UINT32 dest2 = m68ki_read_16((mc68kcpu), ea2); - UINT32 res2; + uint32_t word2 = OPER_I_32(mc68kcpu); + uint32_t* compare1 = ®_D(mc68kcpu)[(word2 >> 16) & 7]; + uint32_t ea1 = REG_DA(mc68kcpu)[(word2 >> 28) & 15]; + uint32_t dest1 = m68ki_read_16((mc68kcpu), ea1); + uint32_t res1 = dest1 - MASK_OUT_ABOVE_16(*compare1); + uint32_t* compare2 = ®_D(mc68kcpu)[word2 & 7]; + uint32_t ea2 = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; + uint32_t dest2 = m68ki_read_16((mc68kcpu), ea2); + uint32_t res2; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ (mc68kcpu)->n_flag = NFLAG_16(res1); @@ -3460,15 +3460,15 @@ M68KMAKE_OP(cas2, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_32(mc68kcpu); - UINT32* compare1 = ®_D(mc68kcpu)[(word2 >> 16) & 7]; - UINT32 ea1 = REG_DA(mc68kcpu)[(word2 >> 28) & 15]; - UINT32 dest1 = m68ki_read_32((mc68kcpu), ea1); - UINT32 res1 = dest1 - *compare1; - UINT32* compare2 = ®_D(mc68kcpu)[word2 & 7]; - UINT32 ea2 = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; - UINT32 dest2 = m68ki_read_32((mc68kcpu), ea2); - UINT32 res2; + uint32_t word2 = OPER_I_32(mc68kcpu); + uint32_t* compare1 = ®_D(mc68kcpu)[(word2 >> 16) & 7]; + uint32_t ea1 = REG_DA(mc68kcpu)[(word2 >> 28) & 15]; + uint32_t dest1 = m68ki_read_32((mc68kcpu), ea1); + uint32_t res1 = dest1 - *compare1; + uint32_t* compare2 = ®_D(mc68kcpu)[word2 & 7]; + uint32_t ea2 = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; + uint32_t dest2 = m68ki_read_32((mc68kcpu), ea2); + uint32_t res2; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ (mc68kcpu)->n_flag = NFLAG_32(res1); @@ -3503,8 +3503,8 @@ M68KMAKE_OP(cas2, 32, ., .) M68KMAKE_OP(chk, 16, ., d) { - INT32 src = MAKE_INT_16(DX(mc68kcpu)); - INT32 bound = MAKE_INT_16(DY(mc68kcpu)); + int32_t src = MAKE_INT_16(DX(mc68kcpu)); + int32_t bound = MAKE_INT_16(DY(mc68kcpu)); (mc68kcpu)->not_z_flag = ZFLAG_16(src); /* Undocumented */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -3521,8 +3521,8 @@ M68KMAKE_OP(chk, 16, ., d) M68KMAKE_OP(chk, 16, ., .) { - INT32 src = MAKE_INT_16(DX(mc68kcpu)); - INT32 bound = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + int32_t src = MAKE_INT_16(DX(mc68kcpu)); + int32_t bound = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); (mc68kcpu)->not_z_flag = ZFLAG_16(src); /* Undocumented */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -3541,8 +3541,8 @@ M68KMAKE_OP(chk, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - INT32 src = MAKE_INT_32(DX(mc68kcpu)); - INT32 bound = MAKE_INT_32(DY(mc68kcpu)); + int32_t src = MAKE_INT_32(DX(mc68kcpu)); + int32_t bound = MAKE_INT_32(DY(mc68kcpu)); (mc68kcpu)->not_z_flag = ZFLAG_32(src); /* Undocumented */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -3564,8 +3564,8 @@ M68KMAKE_OP(chk, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - INT32 src = MAKE_INT_32(DX(mc68kcpu)); - INT32 bound = MAKE_INT_32(M68KMAKE_GET_OPER_AY_32); + int32_t src = MAKE_INT_32(DX(mc68kcpu)); + int32_t bound = MAKE_INT_32(M68KMAKE_GET_OPER_AY_32); (mc68kcpu)->not_z_flag = ZFLAG_32(src); /* Undocumented */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undocumented */ @@ -3587,11 +3587,11 @@ M68KMAKE_OP(chk2cmp2, 8, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xff; - UINT32 ea = EA_PCDI_8(mc68kcpu); - UINT32 lower_bound = m68ki_read_pcrel_8((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_pcrel_8((mc68kcpu), ea + 1); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xff; + uint32_t ea = EA_PCDI_8(mc68kcpu); + uint32_t lower_bound = m68ki_read_pcrel_8((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_pcrel_8((mc68kcpu), ea + 1); if(!BIT_F(word2)) (mc68kcpu)->c_flag = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound); @@ -3618,11 +3618,11 @@ M68KMAKE_OP(chk2cmp2, 8, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xff; - UINT32 ea = EA_PCIX_8(mc68kcpu); - UINT32 lower_bound = m68ki_read_pcrel_8((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_pcrel_8((mc68kcpu), ea + 1); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xff; + uint32_t ea = EA_PCIX_8(mc68kcpu); + uint32_t lower_bound = m68ki_read_pcrel_8((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_pcrel_8((mc68kcpu), ea + 1); if(!BIT_F(word2)) (mc68kcpu)->c_flag = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound); @@ -3649,11 +3649,11 @@ M68KMAKE_OP(chk2cmp2, 8, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xff; - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 lower_bound = m68ki_read_8((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_8((mc68kcpu), ea + 1); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xff; + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t lower_bound = m68ki_read_8((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_8((mc68kcpu), ea + 1); if(!BIT_F(word2)) (mc68kcpu)->c_flag = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound); @@ -3680,11 +3680,11 @@ M68KMAKE_OP(chk2cmp2, 16, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xffff; - UINT32 ea = EA_PCDI_16(mc68kcpu); - UINT32 lower_bound = m68ki_read_pcrel_16((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_pcrel_16((mc68kcpu), ea + 2); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xffff; + uint32_t ea = EA_PCDI_16(mc68kcpu); + uint32_t lower_bound = m68ki_read_pcrel_16((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_pcrel_16((mc68kcpu), ea + 2); if(!BIT_F(word2)) (mc68kcpu)->c_flag = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound); @@ -3716,11 +3716,11 @@ M68KMAKE_OP(chk2cmp2, 16, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xffff; - UINT32 ea = EA_PCIX_16(mc68kcpu); - UINT32 lower_bound = m68ki_read_pcrel_16((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_pcrel_16((mc68kcpu), ea + 2); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xffff; + uint32_t ea = EA_PCIX_16(mc68kcpu); + uint32_t lower_bound = m68ki_read_pcrel_16((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_pcrel_16((mc68kcpu), ea + 2); if(!BIT_F(word2)) (mc68kcpu)->c_flag = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound); @@ -3752,11 +3752,11 @@ M68KMAKE_OP(chk2cmp2, 16, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xffff; - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 lower_bound = m68ki_read_16((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_16((mc68kcpu), ea + 2); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]&0xffff; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t lower_bound = m68ki_read_16((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_16((mc68kcpu), ea + 2); if(!BIT_F(word2)) (mc68kcpu)->c_flag = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound); @@ -3789,11 +3789,11 @@ M68KMAKE_OP(chk2cmp2, 32, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; - UINT32 ea = EA_PCDI_32(mc68kcpu); - UINT32 lower_bound = m68ki_read_pcrel_32((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_pcrel_32((mc68kcpu), ea + 4); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; + uint32_t ea = EA_PCDI_32(mc68kcpu); + uint32_t lower_bound = m68ki_read_pcrel_32((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_pcrel_32((mc68kcpu), ea + 4); (mc68kcpu)->c_flag = compare - lower_bound; (mc68kcpu)->not_z_flag = !((upper_bound==compare) | (lower_bound==compare)); @@ -3819,11 +3819,11 @@ M68KMAKE_OP(chk2cmp2, 32, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; - UINT32 ea = EA_PCIX_32(mc68kcpu); - UINT32 lower_bound = m68ki_read_pcrel_32((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_pcrel_32((mc68kcpu), ea + 4); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; + uint32_t ea = EA_PCIX_32(mc68kcpu); + uint32_t lower_bound = m68ki_read_pcrel_32((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_pcrel_32((mc68kcpu), ea + 4); (mc68kcpu)->c_flag = compare - lower_bound; (mc68kcpu)->not_z_flag = !((upper_bound==compare) | (lower_bound==compare)); @@ -3849,11 +3849,11 @@ M68KMAKE_OP(chk2cmp2, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 lower_bound = m68ki_read_32((mc68kcpu), ea); - UINT32 upper_bound = m68ki_read_32((mc68kcpu), ea + 4); + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t compare = REG_DA(mc68kcpu)[(word2 >> 12) & 15]; + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t lower_bound = m68ki_read_32((mc68kcpu), ea); + uint32_t upper_bound = m68ki_read_32((mc68kcpu), ea + 4); (mc68kcpu)->c_flag = compare - lower_bound; (mc68kcpu)->not_z_flag = !((upper_bound==compare) | (lower_bound==compare)); @@ -3888,7 +3888,7 @@ M68KMAKE_OP(clr, 8, ., d) M68KMAKE_OP(clr, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t ea = M68KMAKE_GET_EA_AY_8; if(CPU_TYPE_IS_000((mc68kcpu)->cpu_type)) { @@ -3917,7 +3917,7 @@ M68KMAKE_OP(clr, 16, ., d) M68KMAKE_OP(clr, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; + uint32_t ea = M68KMAKE_GET_EA_AY_16; if(CPU_TYPE_IS_000((mc68kcpu)->cpu_type)) { @@ -3946,7 +3946,7 @@ M68KMAKE_OP(clr, 32, ., d) M68KMAKE_OP(clr, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; + uint32_t ea = M68KMAKE_GET_EA_AY_32; if(CPU_TYPE_IS_000((mc68kcpu)->cpu_type)) { @@ -3964,9 +3964,9 @@ M68KMAKE_OP(clr, 32, ., .) M68KMAKE_OP(cmp, 8, ., d) { - UINT32 src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_8(DX(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_8(DX(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3977,9 +3977,9 @@ M68KMAKE_OP(cmp, 8, ., d) M68KMAKE_OP(cmp, 8, ., .) { - UINT32 src = M68KMAKE_GET_OPER_AY_8; - UINT32 dst = MASK_OUT_ABOVE_8(DX(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = M68KMAKE_GET_OPER_AY_8; + uint32_t dst = MASK_OUT_ABOVE_8(DX(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -3990,9 +3990,9 @@ M68KMAKE_OP(cmp, 8, ., .) M68KMAKE_OP(cmp, 16, ., d) { - UINT32 src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(DX(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(DX(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4003,9 +4003,9 @@ M68KMAKE_OP(cmp, 16, ., d) M68KMAKE_OP(cmp, 16, ., a) { - UINT32 src = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(DX(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(DX(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4016,9 +4016,9 @@ M68KMAKE_OP(cmp, 16, ., a) M68KMAKE_OP(cmp, 16, ., .) { - UINT32 src = M68KMAKE_GET_OPER_AY_16; - UINT32 dst = MASK_OUT_ABOVE_16(DX(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = M68KMAKE_GET_OPER_AY_16; + uint32_t dst = MASK_OUT_ABOVE_16(DX(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4029,9 +4029,9 @@ M68KMAKE_OP(cmp, 16, ., .) M68KMAKE_OP(cmp, 32, ., d) { - UINT32 src = DY(mc68kcpu); - UINT32 dst = DX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = DY(mc68kcpu); + uint32_t dst = DX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4042,9 +4042,9 @@ M68KMAKE_OP(cmp, 32, ., d) M68KMAKE_OP(cmp, 32, ., a) { - UINT32 src = AY(mc68kcpu); - UINT32 dst = DX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = AY(mc68kcpu); + uint32_t dst = DX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4055,9 +4055,9 @@ M68KMAKE_OP(cmp, 32, ., a) M68KMAKE_OP(cmp, 32, ., .) { - UINT32 src = M68KMAKE_GET_OPER_AY_32; - UINT32 dst = DX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = M68KMAKE_GET_OPER_AY_32; + uint32_t dst = DX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4068,9 +4068,9 @@ M68KMAKE_OP(cmp, 32, ., .) M68KMAKE_OP(cmpa, 16, ., d) { - UINT32 src = MAKE_INT_16(DY(mc68kcpu)); - UINT32 dst = AX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = MAKE_INT_16(DY(mc68kcpu)); + uint32_t dst = AX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4081,9 +4081,9 @@ M68KMAKE_OP(cmpa, 16, ., d) M68KMAKE_OP(cmpa, 16, ., a) { - UINT32 src = MAKE_INT_16(AY(mc68kcpu)); - UINT32 dst = AX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = MAKE_INT_16(AY(mc68kcpu)); + uint32_t dst = AX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4094,9 +4094,9 @@ M68KMAKE_OP(cmpa, 16, ., a) M68KMAKE_OP(cmpa, 16, ., .) { - UINT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); - UINT32 dst = AX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + uint32_t dst = AX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4107,9 +4107,9 @@ M68KMAKE_OP(cmpa, 16, ., .) M68KMAKE_OP(cmpa, 32, ., d) { - UINT32 src = DY(mc68kcpu); - UINT32 dst = AX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = DY(mc68kcpu); + uint32_t dst = AX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4120,9 +4120,9 @@ M68KMAKE_OP(cmpa, 32, ., d) M68KMAKE_OP(cmpa, 32, ., a) { - UINT32 src = AY(mc68kcpu); - UINT32 dst = AX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = AY(mc68kcpu); + uint32_t dst = AX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4133,9 +4133,9 @@ M68KMAKE_OP(cmpa, 32, ., a) M68KMAKE_OP(cmpa, 32, ., .) { - UINT32 src = M68KMAKE_GET_OPER_AY_32; - UINT32 dst = AX(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = M68KMAKE_GET_OPER_AY_32; + uint32_t dst = AX(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4146,9 +4146,9 @@ M68KMAKE_OP(cmpa, 32, ., .) M68KMAKE_OP(cmpi, 8, ., d) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 dst = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t dst = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4159,9 +4159,9 @@ M68KMAKE_OP(cmpi, 8, ., d) M68KMAKE_OP(cmpi, 8, ., .) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 dst = M68KMAKE_GET_OPER_AY_8; - UINT32 res = dst - src; + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t dst = M68KMAKE_GET_OPER_AY_8; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4174,9 +4174,9 @@ M68KMAKE_OP(cmpi, 8, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 dst = OPER_PCDI_8(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t dst = OPER_PCDI_8(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4192,9 +4192,9 @@ M68KMAKE_OP(cmpi, 8, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 dst = OPER_PCIX_8(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t dst = OPER_PCIX_8(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4208,9 +4208,9 @@ M68KMAKE_OP(cmpi, 8, ., pcix) M68KMAKE_OP(cmpi, 16, ., d) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 dst = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 res = dst - src; + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t dst = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4221,9 +4221,9 @@ M68KMAKE_OP(cmpi, 16, ., d) M68KMAKE_OP(cmpi, 16, ., .) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 dst = M68KMAKE_GET_OPER_AY_16; - UINT32 res = dst - src; + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t dst = M68KMAKE_GET_OPER_AY_16; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4236,9 +4236,9 @@ M68KMAKE_OP(cmpi, 16, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 dst = OPER_PCDI_16(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t dst = OPER_PCDI_16(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4254,9 +4254,9 @@ M68KMAKE_OP(cmpi, 16, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 dst = OPER_PCIX_16(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t dst = OPER_PCIX_16(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4270,9 +4270,9 @@ M68KMAKE_OP(cmpi, 16, ., pcix) M68KMAKE_OP(cmpi, 32, ., d) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 dst = DY(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t dst = DY(mc68kcpu); + uint32_t res = dst - src; if (!(mc68kcpu)->cmpild_instr_callback.isnull()) ((mc68kcpu)->cmpild_instr_callback)(*(mc68kcpu)->program, (mc68kcpu)->ir & 7, src, 0xffffffff); @@ -4286,9 +4286,9 @@ M68KMAKE_OP(cmpi, 32, ., d) M68KMAKE_OP(cmpi, 32, ., .) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 dst = M68KMAKE_GET_OPER_AY_32; - UINT32 res = dst - src; + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t dst = M68KMAKE_GET_OPER_AY_32; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4301,9 +4301,9 @@ M68KMAKE_OP(cmpi, 32, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 dst = OPER_PCDI_32(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t dst = OPER_PCDI_32(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4319,9 +4319,9 @@ M68KMAKE_OP(cmpi, 32, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 dst = OPER_PCIX_32(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t dst = OPER_PCIX_32(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4335,9 +4335,9 @@ M68KMAKE_OP(cmpi, 32, ., pcix) M68KMAKE_OP(cmpm, 8, ., ax7) { - UINT32 src = OPER_AY_PI_8(mc68kcpu); - UINT32 dst = OPER_A7_PI_8(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_AY_PI_8(mc68kcpu); + uint32_t dst = OPER_A7_PI_8(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4348,9 +4348,9 @@ M68KMAKE_OP(cmpm, 8, ., ax7) M68KMAKE_OP(cmpm, 8, ., ay7) { - UINT32 src = OPER_A7_PI_8(mc68kcpu); - UINT32 dst = OPER_AX_PI_8(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_A7_PI_8(mc68kcpu); + uint32_t dst = OPER_AX_PI_8(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4361,9 +4361,9 @@ M68KMAKE_OP(cmpm, 8, ., ay7) M68KMAKE_OP(cmpm, 8, ., axy7) { - UINT32 src = OPER_A7_PI_8(mc68kcpu); - UINT32 dst = OPER_A7_PI_8(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_A7_PI_8(mc68kcpu); + uint32_t dst = OPER_A7_PI_8(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4374,9 +4374,9 @@ M68KMAKE_OP(cmpm, 8, ., axy7) M68KMAKE_OP(cmpm, 8, ., .) { - UINT32 src = OPER_AY_PI_8(mc68kcpu); - UINT32 dst = OPER_AX_PI_8(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_AY_PI_8(mc68kcpu); + uint32_t dst = OPER_AX_PI_8(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -4387,9 +4387,9 @@ M68KMAKE_OP(cmpm, 8, ., .) M68KMAKE_OP(cmpm, 16, ., .) { - UINT32 src = OPER_AY_PI_16(mc68kcpu); - UINT32 dst = OPER_AX_PI_16(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_AY_PI_16(mc68kcpu); + uint32_t dst = OPER_AX_PI_16(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -4400,9 +4400,9 @@ M68KMAKE_OP(cmpm, 16, ., .) M68KMAKE_OP(cmpm, 32, ., .) { - UINT32 src = OPER_AY_PI_32(mc68kcpu); - UINT32 dst = OPER_AX_PI_32(mc68kcpu); - UINT32 res = dst - src; + uint32_t src = OPER_AY_PI_32(mc68kcpu); + uint32_t dst = OPER_AX_PI_32(mc68kcpu); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -4488,13 +4488,13 @@ M68KMAKE_OP(dbt, 16, ., .) M68KMAKE_OP(dbf, 16, ., .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_16(*r_dst - 1); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - UINT32 offset = OPER_I_16(mc68kcpu); + uint32_t offset = OPER_I_16(mc68kcpu); REG_PC(mc68kcpu) -= 2; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16((mc68kcpu), offset); @@ -4510,13 +4510,13 @@ M68KMAKE_OP(dbcc, 16, ., .) { if(M68KMAKE_NOT_CC) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_16(*r_dst - 1); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(*r_dst - 1); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; if(res != 0xffff) { - UINT32 offset = OPER_I_16(mc68kcpu); + uint32_t offset = OPER_I_16(mc68kcpu); REG_PC(mc68kcpu) -= 2; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16((mc68kcpu), offset); @@ -4533,14 +4533,14 @@ M68KMAKE_OP(dbcc, 16, ., .) M68KMAKE_OP(divs, 16, ., d) { - UINT32* r_dst = &DX(mc68kcpu); - INT32 src = MAKE_INT_16(DY(mc68kcpu)); - INT32 quotient; - INT32 remainder; + uint32_t* r_dst = &DX(mc68kcpu); + int32_t src = MAKE_INT_16(DY(mc68kcpu)); + int32_t quotient; + int32_t remainder; if(src != 0) { - if((UINT32)*r_dst == 0x80000000 && src == -1) + if((uint32_t)*r_dst == 0x80000000 && src == -1) { (mc68kcpu)->not_z_flag = 0; (mc68kcpu)->n_flag = NFLAG_CLEAR; @@ -4571,14 +4571,14 @@ M68KMAKE_OP(divs, 16, ., d) M68KMAKE_OP(divs, 16, ., .) { - UINT32* r_dst = &DX(mc68kcpu); - INT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); - INT32 quotient; - INT32 remainder; + uint32_t* r_dst = &DX(mc68kcpu); + int32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + int32_t quotient; + int32_t remainder; if(src != 0) { - if((UINT32)*r_dst == 0x80000000 && src == -1) + if((uint32_t)*r_dst == 0x80000000 && src == -1) { (mc68kcpu)->not_z_flag = 0; (mc68kcpu)->n_flag = NFLAG_CLEAR; @@ -4609,13 +4609,13 @@ M68KMAKE_OP(divs, 16, ., .) M68KMAKE_OP(divu, 16, ., d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); if(src != 0) { - UINT32 quotient = *r_dst / src; - UINT32 remainder = *r_dst % src; + uint32_t quotient = *r_dst / src; + uint32_t remainder = *r_dst % src; if(quotient < 0x10000) { @@ -4635,13 +4635,13 @@ M68KMAKE_OP(divu, 16, ., d) M68KMAKE_OP(divu, 16, ., .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_16; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_16; if(src != 0) { - UINT32 quotient = *r_dst / src; - UINT32 remainder = *r_dst % src; + uint32_t quotient = *r_dst / src; + uint32_t remainder = *r_dst % src; if(quotient < 0x10000) { @@ -4663,11 +4663,11 @@ M68KMAKE_OP(divl, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT64 divisor = DY(mc68kcpu); - UINT64 dividend = 0; - UINT64 quotient = 0; - UINT64 remainder = 0; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint64_t divisor = DY(mc68kcpu); + uint64_t dividend = 0; + uint64_t quotient = 0; + uint64_t remainder = 0; if(divisor != 0) { @@ -4679,9 +4679,9 @@ M68KMAKE_OP(divl, 32, ., d) if(BIT_B(word2)) /* signed */ { - quotient = (UINT64)((INT64)dividend / (INT64)((INT32)divisor)); - remainder = (UINT64)((INT64)dividend % (INT64)((INT32)divisor)); - if((INT64)quotient != (INT64)((INT32)quotient)) + quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); + remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); + if((int64_t)quotient != (int64_t)((int32_t)quotient)) { (mc68kcpu)->v_flag = VFLAG_SET; return; @@ -4703,8 +4703,8 @@ M68KMAKE_OP(divl, 32, ., d) dividend = REG_D(mc68kcpu)[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (UINT64)((INT64)((INT32)dividend) / (INT64)((INT32)divisor)); - remainder = (UINT64)((INT64)((INT32)dividend) % (INT64)((INT32)divisor)); + quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); + remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); } else /* unsigned */ { @@ -4733,11 +4733,11 @@ M68KMAKE_OP(divl, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT64 divisor = M68KMAKE_GET_OPER_AY_32; - UINT64 dividend = 0; - UINT64 quotient = 0; - UINT64 remainder = 0; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint64_t divisor = M68KMAKE_GET_OPER_AY_32; + uint64_t dividend = 0; + uint64_t quotient = 0; + uint64_t remainder = 0; if(divisor != 0) { @@ -4749,9 +4749,9 @@ M68KMAKE_OP(divl, 32, ., .) if(BIT_B(word2)) /* signed */ { - quotient = (UINT64)((INT64)dividend / (INT64)((INT32)divisor)); - remainder = (UINT64)((INT64)dividend % (INT64)((INT32)divisor)); - if((INT64)quotient != (INT64)((INT32)quotient)) + quotient = (uint64_t)((int64_t)dividend / (int64_t)((int32_t)divisor)); + remainder = (uint64_t)((int64_t)dividend % (int64_t)((int32_t)divisor)); + if((int64_t)quotient != (int64_t)((int32_t)quotient)) { (mc68kcpu)->v_flag = VFLAG_SET; return; @@ -4773,8 +4773,8 @@ M68KMAKE_OP(divl, 32, ., .) dividend = REG_D(mc68kcpu)[(word2 >> 12) & 7]; if(BIT_B(word2)) /* signed */ { - quotient = (UINT64)((INT64)((INT32)dividend) / (INT64)((INT32)divisor)); - remainder = (UINT64)((INT64)((INT32)dividend) % (INT64)((INT32)divisor)); + quotient = (uint64_t)((int64_t)((int32_t)dividend) / (int64_t)((int32_t)divisor)); + remainder = (uint64_t)((int64_t)((int32_t)dividend) % (int64_t)((int32_t)divisor)); } else /* unsigned */ { @@ -4801,7 +4801,7 @@ M68KMAKE_OP(divl, 32, ., .) M68KMAKE_OP(eor, 8, ., d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu) ^= MASK_OUT_ABOVE_8(DX(mc68kcpu))); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu) ^= MASK_OUT_ABOVE_8(DX(mc68kcpu))); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -4812,8 +4812,8 @@ M68KMAKE_OP(eor, 8, ., d) M68KMAKE_OP(eor, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = MASK_OUT_ABOVE_8(DX(mc68kcpu) ^ m68ki_read_8((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = MASK_OUT_ABOVE_8(DX(mc68kcpu) ^ m68ki_read_8((mc68kcpu), ea)); m68ki_write_8((mc68kcpu), ea, res); @@ -4826,7 +4826,7 @@ M68KMAKE_OP(eor, 8, ., .) M68KMAKE_OP(eor, 16, ., d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu) ^= MASK_OUT_ABOVE_16(DX(mc68kcpu))); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu) ^= MASK_OUT_ABOVE_16(DX(mc68kcpu))); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -4837,8 +4837,8 @@ M68KMAKE_OP(eor, 16, ., d) M68KMAKE_OP(eor, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = MASK_OUT_ABOVE_16(DX(mc68kcpu) ^ m68ki_read_16((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = MASK_OUT_ABOVE_16(DX(mc68kcpu) ^ m68ki_read_16((mc68kcpu), ea)); m68ki_write_16((mc68kcpu), ea, res); @@ -4851,7 +4851,7 @@ M68KMAKE_OP(eor, 16, ., .) M68KMAKE_OP(eor, 32, ., d) { - UINT32 res = DY(mc68kcpu) ^= DX(mc68kcpu); + uint32_t res = DY(mc68kcpu) ^= DX(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -4862,8 +4862,8 @@ M68KMAKE_OP(eor, 32, ., d) M68KMAKE_OP(eor, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = DX(mc68kcpu) ^ m68ki_read_32((mc68kcpu), ea); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = DX(mc68kcpu) ^ m68ki_read_32((mc68kcpu), ea); m68ki_write_32((mc68kcpu), ea, res); @@ -4876,7 +4876,7 @@ M68KMAKE_OP(eor, 32, ., .) M68KMAKE_OP(eori, 8, ., d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu) ^= OPER_I_8(mc68kcpu)); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu) ^= OPER_I_8(mc68kcpu)); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -4887,9 +4887,9 @@ M68KMAKE_OP(eori, 8, ., d) M68KMAKE_OP(eori, 8, ., .) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = src ^ m68ki_read_8((mc68kcpu), ea); + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = src ^ m68ki_read_8((mc68kcpu), ea); m68ki_write_8((mc68kcpu), ea, res); @@ -4902,7 +4902,7 @@ M68KMAKE_OP(eori, 8, ., .) M68KMAKE_OP(eori, 16, ., d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu) ^= OPER_I_16(mc68kcpu)); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu) ^= OPER_I_16(mc68kcpu)); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -4913,9 +4913,9 @@ M68KMAKE_OP(eori, 16, ., d) M68KMAKE_OP(eori, 16, ., .) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = src ^ m68ki_read_16((mc68kcpu), ea); + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = src ^ m68ki_read_16((mc68kcpu), ea); m68ki_write_16((mc68kcpu), ea, res); @@ -4928,7 +4928,7 @@ M68KMAKE_OP(eori, 16, ., .) M68KMAKE_OP(eori, 32, ., d) { - UINT32 res = DY(mc68kcpu) ^= OPER_I_32(mc68kcpu); + uint32_t res = DY(mc68kcpu) ^= OPER_I_32(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -4939,9 +4939,9 @@ M68KMAKE_OP(eori, 32, ., d) M68KMAKE_OP(eori, 32, ., .) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = src ^ m68ki_read_32((mc68kcpu), ea); + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = src ^ m68ki_read_32((mc68kcpu), ea); m68ki_write_32((mc68kcpu), ea, res); @@ -4962,7 +4962,7 @@ M68KMAKE_OP(eori, 16, tos, .) { if((mc68kcpu)->s_flag) { - UINT32 src = OPER_I_16(mc68kcpu); + uint32_t src = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr((mc68kcpu), m68ki_get_sr(mc68kcpu) ^ src); return; @@ -4973,9 +4973,9 @@ M68KMAKE_OP(eori, 16, tos, .) M68KMAKE_OP(exg, 32, dd, .) { - UINT32* reg_a = &DX(mc68kcpu); - UINT32* reg_b = &DY(mc68kcpu); - UINT32 tmp = *reg_a; + uint32_t* reg_a = &DX(mc68kcpu); + uint32_t* reg_b = &DY(mc68kcpu); + uint32_t tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; } @@ -4983,9 +4983,9 @@ M68KMAKE_OP(exg, 32, dd, .) M68KMAKE_OP(exg, 32, aa, .) { - UINT32* reg_a = &AX(mc68kcpu); - UINT32* reg_b = &AY(mc68kcpu); - UINT32 tmp = *reg_a; + uint32_t* reg_a = &AX(mc68kcpu); + uint32_t* reg_b = &AY(mc68kcpu); + uint32_t tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; } @@ -4993,9 +4993,9 @@ M68KMAKE_OP(exg, 32, aa, .) M68KMAKE_OP(exg, 32, da, .) { - UINT32* reg_a = &DX(mc68kcpu); - UINT32* reg_b = &AY(mc68kcpu); - UINT32 tmp = *reg_a; + uint32_t* reg_a = &DX(mc68kcpu); + uint32_t* reg_b = &AY(mc68kcpu); + uint32_t tmp = *reg_a; *reg_a = *reg_b; *reg_b = tmp; } @@ -5003,7 +5003,7 @@ M68KMAKE_OP(exg, 32, da, .) M68KMAKE_OP(ext, 16, ., .) { - UINT32* r_dst = &DY(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); *r_dst = MASK_OUT_BELOW_16(*r_dst) | MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xff00 : 0); @@ -5016,7 +5016,7 @@ M68KMAKE_OP(ext, 16, ., .) M68KMAKE_OP(ext, 32, ., .) { - UINT32* r_dst = &DY(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); *r_dst = MASK_OUT_ABOVE_16(*r_dst) | (GET_MSB_16(*r_dst) ? 0xffff0000 : 0); @@ -5031,7 +5031,7 @@ M68KMAKE_OP(extb, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32* r_dst = &DY(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); *r_dst = MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xffffff00 : 0); @@ -5061,7 +5061,7 @@ M68KMAKE_OP(jmp, 32, ., .) M68KMAKE_OP(jsr, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; + uint32_t ea = M68KMAKE_GET_EA_AY_32; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_push_32((mc68kcpu), REG_PC(mc68kcpu)); m68ki_jump((mc68kcpu), ea); @@ -5084,7 +5084,7 @@ M68KMAKE_OP(link, 16, ., a7) M68KMAKE_OP(link, 16, ., .) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); m68ki_push_32((mc68kcpu), *r_dst); *r_dst = REG_A(mc68kcpu)[7]; @@ -5109,7 +5109,7 @@ M68KMAKE_OP(link, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); m68ki_push_32((mc68kcpu), *r_dst); *r_dst = REG_A(mc68kcpu)[7]; @@ -5122,10 +5122,10 @@ M68KMAKE_OP(link, 32, ., .) M68KMAKE_OP(lsr, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src >> shift; if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -5141,10 +5141,10 @@ M68KMAKE_OP(lsr, 8, s, .) M68KMAKE_OP(lsr, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src >> shift; if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -5160,10 +5160,10 @@ M68KMAKE_OP(lsr, 16, s, .) M68KMAKE_OP(lsr, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = *r_dst; - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = *r_dst; + uint32_t res = src >> shift; if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -5179,10 +5179,10 @@ M68KMAKE_OP(lsr, 32, s, .) M68KMAKE_OP(lsr, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = src >> shift; if(shift != 0) { @@ -5216,10 +5216,10 @@ M68KMAKE_OP(lsr, 8, r, .) M68KMAKE_OP(lsr, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = src >> shift; if(shift != 0) { @@ -5253,10 +5253,10 @@ M68KMAKE_OP(lsr, 16, r, .) M68KMAKE_OP(lsr, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = *r_dst; - UINT32 res = src >> shift; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = *r_dst; + uint32_t res = src >> shift; if(shift != 0) { @@ -5289,9 +5289,9 @@ M68KMAKE_OP(lsr, 32, r, .) M68KMAKE_OP(lsr, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = src >> 1; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = src >> 1; m68ki_write_16((mc68kcpu), ea, res); @@ -5304,10 +5304,10 @@ M68KMAKE_OP(lsr, 16, ., .) M68KMAKE_OP(lsl, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = MASK_OUT_ABOVE_8(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -5323,10 +5323,10 @@ M68KMAKE_OP(lsl, 8, s, .) M68KMAKE_OP(lsl, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = MASK_OUT_ABOVE_16(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -5342,10 +5342,10 @@ M68KMAKE_OP(lsl, 16, s, .) M68KMAKE_OP(lsl, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = *r_dst; - UINT32 res = MASK_OUT_ABOVE_32(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = *r_dst; + uint32_t res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -5361,10 +5361,10 @@ M68KMAKE_OP(lsl, 32, s, .) M68KMAKE_OP(lsl, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = MASK_OUT_ABOVE_8(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) { @@ -5398,10 +5398,10 @@ M68KMAKE_OP(lsl, 8, r, .) M68KMAKE_OP(lsl, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = MASK_OUT_ABOVE_16(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) { @@ -5435,10 +5435,10 @@ M68KMAKE_OP(lsl, 16, r, .) M68KMAKE_OP(lsl, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = DX(mc68kcpu) & 0x3f; - UINT32 src = *r_dst; - UINT32 res = MASK_OUT_ABOVE_32(src << shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = DX(mc68kcpu) & 0x3f; + uint32_t src = *r_dst; + uint32_t res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) { @@ -5471,9 +5471,9 @@ M68KMAKE_OP(lsl, 32, r, .) M68KMAKE_OP(lsl, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = MASK_OUT_ABOVE_16(src << 1); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = MASK_OUT_ABOVE_16(src << 1); m68ki_write_16((mc68kcpu), ea, res); @@ -5486,8 +5486,8 @@ M68KMAKE_OP(lsl, 16, ., .) M68KMAKE_OP(move, 8, d, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -5500,8 +5500,8 @@ M68KMAKE_OP(move, 8, d, d) M68KMAKE_OP(move, 8, d, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -5514,8 +5514,8 @@ M68KMAKE_OP(move, 8, d, .) M68KMAKE_OP(move, 8, ai, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AX_AI_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AX_AI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5528,8 +5528,8 @@ M68KMAKE_OP(move, 8, ai, d) M68KMAKE_OP(move, 8, ai, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AX_AI_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AX_AI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5542,8 +5542,8 @@ M68KMAKE_OP(move, 8, ai, .) M68KMAKE_OP(move, 8, pi7, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_A7_PI_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_A7_PI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5556,8 +5556,8 @@ M68KMAKE_OP(move, 8, pi7, d) M68KMAKE_OP(move, 8, pi, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AX_PI_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AX_PI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5570,8 +5570,8 @@ M68KMAKE_OP(move, 8, pi, d) M68KMAKE_OP(move, 8, pi7, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_A7_PI_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_A7_PI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5584,8 +5584,8 @@ M68KMAKE_OP(move, 8, pi7, .) M68KMAKE_OP(move, 8, pi, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AX_PI_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AX_PI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5598,8 +5598,8 @@ M68KMAKE_OP(move, 8, pi, .) M68KMAKE_OP(move, 8, pd7, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_A7_PD_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_A7_PD_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5612,8 +5612,8 @@ M68KMAKE_OP(move, 8, pd7, d) M68KMAKE_OP(move, 8, pd, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AX_PD_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AX_PD_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5626,8 +5626,8 @@ M68KMAKE_OP(move, 8, pd, d) M68KMAKE_OP(move, 8, pd7, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_A7_PD_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_A7_PD_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5640,8 +5640,8 @@ M68KMAKE_OP(move, 8, pd7, .) M68KMAKE_OP(move, 8, pd, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AX_PD_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AX_PD_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5654,8 +5654,8 @@ M68KMAKE_OP(move, 8, pd, .) M68KMAKE_OP(move, 8, di, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AX_DI_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AX_DI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5668,8 +5668,8 @@ M68KMAKE_OP(move, 8, di, d) M68KMAKE_OP(move, 8, di, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AX_DI_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AX_DI_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5682,8 +5682,8 @@ M68KMAKE_OP(move, 8, di, .) M68KMAKE_OP(move, 8, ix, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AX_IX_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AX_IX_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5696,8 +5696,8 @@ M68KMAKE_OP(move, 8, ix, d) M68KMAKE_OP(move, 8, ix, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AX_IX_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AX_IX_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5710,8 +5710,8 @@ M68KMAKE_OP(move, 8, ix, .) M68KMAKE_OP(move, 8, aw, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AW_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AW_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5724,8 +5724,8 @@ M68KMAKE_OP(move, 8, aw, d) M68KMAKE_OP(move, 8, aw, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AW_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AW_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5738,8 +5738,8 @@ M68KMAKE_OP(move, 8, aw, .) M68KMAKE_OP(move, 8, al, d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 ea = EA_AL_8(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t ea = EA_AL_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5752,8 +5752,8 @@ M68KMAKE_OP(move, 8, al, d) M68KMAKE_OP(move, 8, al, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; - UINT32 ea = EA_AL_8(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_8; + uint32_t ea = EA_AL_8(mc68kcpu); m68ki_write_8((mc68kcpu), ea, res); @@ -5766,8 +5766,8 @@ M68KMAKE_OP(move, 8, al, .) M68KMAKE_OP(move, 16, d, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -5780,8 +5780,8 @@ M68KMAKE_OP(move, 16, d, d) M68KMAKE_OP(move, 16, d, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -5794,8 +5794,8 @@ M68KMAKE_OP(move, 16, d, a) M68KMAKE_OP(move, 16, d, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -5808,8 +5808,8 @@ M68KMAKE_OP(move, 16, d, .) M68KMAKE_OP(move, 16, ai, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AX_AI_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AX_AI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5822,8 +5822,8 @@ M68KMAKE_OP(move, 16, ai, d) M68KMAKE_OP(move, 16, ai, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AX_AI_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AX_AI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5836,8 +5836,8 @@ M68KMAKE_OP(move, 16, ai, a) M68KMAKE_OP(move, 16, ai, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AX_AI_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AX_AI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5850,8 +5850,8 @@ M68KMAKE_OP(move, 16, ai, .) M68KMAKE_OP(move, 16, pi, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AX_PI_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AX_PI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5864,8 +5864,8 @@ M68KMAKE_OP(move, 16, pi, d) M68KMAKE_OP(move, 16, pi, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AX_PI_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AX_PI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5878,8 +5878,8 @@ M68KMAKE_OP(move, 16, pi, a) M68KMAKE_OP(move, 16, pi, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AX_PI_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AX_PI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5892,8 +5892,8 @@ M68KMAKE_OP(move, 16, pi, .) M68KMAKE_OP(move, 16, pd, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AX_PD_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AX_PD_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5906,8 +5906,8 @@ M68KMAKE_OP(move, 16, pd, d) M68KMAKE_OP(move, 16, pd, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AX_PD_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AX_PD_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5920,8 +5920,8 @@ M68KMAKE_OP(move, 16, pd, a) M68KMAKE_OP(move, 16, pd, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AX_PD_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AX_PD_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5934,8 +5934,8 @@ M68KMAKE_OP(move, 16, pd, .) M68KMAKE_OP(move, 16, di, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AX_DI_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AX_DI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5948,8 +5948,8 @@ M68KMAKE_OP(move, 16, di, d) M68KMAKE_OP(move, 16, di, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AX_DI_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AX_DI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5962,8 +5962,8 @@ M68KMAKE_OP(move, 16, di, a) M68KMAKE_OP(move, 16, di, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AX_DI_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AX_DI_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5976,8 +5976,8 @@ M68KMAKE_OP(move, 16, di, .) M68KMAKE_OP(move, 16, ix, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AX_IX_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AX_IX_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -5990,8 +5990,8 @@ M68KMAKE_OP(move, 16, ix, d) M68KMAKE_OP(move, 16, ix, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AX_IX_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AX_IX_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6004,8 +6004,8 @@ M68KMAKE_OP(move, 16, ix, a) M68KMAKE_OP(move, 16, ix, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AX_IX_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AX_IX_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6018,8 +6018,8 @@ M68KMAKE_OP(move, 16, ix, .) M68KMAKE_OP(move, 16, aw, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AW_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AW_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6032,8 +6032,8 @@ M68KMAKE_OP(move, 16, aw, d) M68KMAKE_OP(move, 16, aw, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AW_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AW_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6046,8 +6046,8 @@ M68KMAKE_OP(move, 16, aw, a) M68KMAKE_OP(move, 16, aw, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AW_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AW_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6060,8 +6060,8 @@ M68KMAKE_OP(move, 16, aw, .) M68KMAKE_OP(move, 16, al, d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 ea = EA_AL_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t ea = EA_AL_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6074,8 +6074,8 @@ M68KMAKE_OP(move, 16, al, d) M68KMAKE_OP(move, 16, al, a) { - UINT32 res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 ea = EA_AL_16(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t ea = EA_AL_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6088,8 +6088,8 @@ M68KMAKE_OP(move, 16, al, a) M68KMAKE_OP(move, 16, al, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; - UINT32 ea = EA_AL_16(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16; + uint32_t ea = EA_AL_16(mc68kcpu); m68ki_write_16((mc68kcpu), ea, res); @@ -6102,8 +6102,8 @@ M68KMAKE_OP(move, 16, al, .) M68KMAKE_OP(move, 32, d, d) { - UINT32 res = DY(mc68kcpu); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = res; @@ -6116,8 +6116,8 @@ M68KMAKE_OP(move, 32, d, d) M68KMAKE_OP(move, 32, d, a) { - UINT32 res = AY(mc68kcpu); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = res; @@ -6130,8 +6130,8 @@ M68KMAKE_OP(move, 32, d, a) M68KMAKE_OP(move, 32, d, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32* r_dst = &DX(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = res; @@ -6144,8 +6144,8 @@ M68KMAKE_OP(move, 32, d, .) M68KMAKE_OP(move, 32, ai, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AX_AI_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AX_AI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6158,8 +6158,8 @@ M68KMAKE_OP(move, 32, ai, d) M68KMAKE_OP(move, 32, ai, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AX_AI_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AX_AI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6172,8 +6172,8 @@ M68KMAKE_OP(move, 32, ai, a) M68KMAKE_OP(move, 32, ai, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AX_AI_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AX_AI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6186,8 +6186,8 @@ M68KMAKE_OP(move, 32, ai, .) M68KMAKE_OP(move, 32, pi, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AX_PI_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AX_PI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6200,8 +6200,8 @@ M68KMAKE_OP(move, 32, pi, d) M68KMAKE_OP(move, 32, pi, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AX_PI_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AX_PI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6214,8 +6214,8 @@ M68KMAKE_OP(move, 32, pi, a) M68KMAKE_OP(move, 32, pi, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AX_PI_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AX_PI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6228,8 +6228,8 @@ M68KMAKE_OP(move, 32, pi, .) M68KMAKE_OP(move, 32, pd, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AX_PD_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AX_PD_32(mc68kcpu); m68ki_write_16((mc68kcpu), ea+2, res & 0xFFFF ); m68ki_write_16((mc68kcpu), ea, (res >> 16) & 0xFFFF ); @@ -6243,8 +6243,8 @@ M68KMAKE_OP(move, 32, pd, d) M68KMAKE_OP(move, 32, pd, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AX_PD_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AX_PD_32(mc68kcpu); m68ki_write_16((mc68kcpu), ea+2, res & 0xFFFF ); m68ki_write_16((mc68kcpu), ea, (res >> 16) & 0xFFFF ); @@ -6258,8 +6258,8 @@ M68KMAKE_OP(move, 32, pd, a) M68KMAKE_OP(move, 32, pd, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AX_PD_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AX_PD_32(mc68kcpu); m68ki_write_16((mc68kcpu), ea+2, res & 0xFFFF ); m68ki_write_16((mc68kcpu), ea, (res >> 16) & 0xFFFF ); @@ -6273,8 +6273,8 @@ M68KMAKE_OP(move, 32, pd, .) M68KMAKE_OP(move, 32, di, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AX_DI_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AX_DI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6287,8 +6287,8 @@ M68KMAKE_OP(move, 32, di, d) M68KMAKE_OP(move, 32, di, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AX_DI_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AX_DI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6301,8 +6301,8 @@ M68KMAKE_OP(move, 32, di, a) M68KMAKE_OP(move, 32, di, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AX_DI_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AX_DI_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6315,8 +6315,8 @@ M68KMAKE_OP(move, 32, di, .) M68KMAKE_OP(move, 32, ix, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AX_IX_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AX_IX_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6329,8 +6329,8 @@ M68KMAKE_OP(move, 32, ix, d) M68KMAKE_OP(move, 32, ix, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AX_IX_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AX_IX_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6343,8 +6343,8 @@ M68KMAKE_OP(move, 32, ix, a) M68KMAKE_OP(move, 32, ix, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AX_IX_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AX_IX_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6357,8 +6357,8 @@ M68KMAKE_OP(move, 32, ix, .) M68KMAKE_OP(move, 32, aw, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AW_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AW_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6371,8 +6371,8 @@ M68KMAKE_OP(move, 32, aw, d) M68KMAKE_OP(move, 32, aw, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AW_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AW_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6385,8 +6385,8 @@ M68KMAKE_OP(move, 32, aw, a) M68KMAKE_OP(move, 32, aw, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AW_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AW_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6399,8 +6399,8 @@ M68KMAKE_OP(move, 32, aw, .) M68KMAKE_OP(move, 32, al, d) { - UINT32 res = DY(mc68kcpu); - UINT32 ea = EA_AL_32(mc68kcpu); + uint32_t res = DY(mc68kcpu); + uint32_t ea = EA_AL_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6413,8 +6413,8 @@ M68KMAKE_OP(move, 32, al, d) M68KMAKE_OP(move, 32, al, a) { - UINT32 res = AY(mc68kcpu); - UINT32 ea = EA_AL_32(mc68kcpu); + uint32_t res = AY(mc68kcpu); + uint32_t ea = EA_AL_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6427,8 +6427,8 @@ M68KMAKE_OP(move, 32, al, a) M68KMAKE_OP(move, 32, al, .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; - UINT32 ea = EA_AL_32(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_32; + uint32_t ea = EA_AL_32(mc68kcpu); m68ki_write_32((mc68kcpu), ea, res); @@ -6524,7 +6524,7 @@ M68KMAKE_OP(move, 16, frs, .) { if(CPU_TYPE_IS_000((mc68kcpu)->cpu_type) || (mc68kcpu)->s_flag) /* NS990408 */ { - UINT32 ea = M68KMAKE_GET_EA_AY_16; + uint32_t ea = M68KMAKE_GET_EA_AY_16; m68ki_write_16((mc68kcpu), ea, m68ki_get_sr(mc68kcpu)); return; } @@ -6547,7 +6547,7 @@ M68KMAKE_OP(move, 16, tos, .) { if((mc68kcpu)->s_flag) { - UINT32 new_sr = M68KMAKE_GET_OPER_AY_16; + uint32_t new_sr = M68KMAKE_GET_OPER_AY_16; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr((mc68kcpu), new_sr); return; @@ -6585,7 +6585,7 @@ M68KMAKE_OP(movec, 32, cr, .) { if((mc68kcpu)->s_flag) { - UINT32 word2 = OPER_I_16(mc68kcpu); + uint32_t word2 = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ switch (word2 & 0xfff) @@ -6799,7 +6799,7 @@ M68KMAKE_OP(movec, 32, rc, .) { if((mc68kcpu)->s_flag) { - UINT32 word2 = OPER_I_16(mc68kcpu); + uint32_t word2 = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ switch (word2 & 0xfff) @@ -7049,10 +7049,10 @@ M68KMAKE_OP(movec, 32, rc, .) M68KMAKE_OP(movem, 16, re, pd) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = AY(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = AY(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7069,10 +7069,10 @@ M68KMAKE_OP(movem, 16, re, pd) M68KMAKE_OP(movem, 16, re, .) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7088,10 +7088,10 @@ M68KMAKE_OP(movem, 16, re, .) M68KMAKE_OP(movem, 32, re, pd) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = AY(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = AY(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7109,10 +7109,10 @@ M68KMAKE_OP(movem, 32, re, pd) M68KMAKE_OP(movem, 32, re, .) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7128,10 +7128,10 @@ M68KMAKE_OP(movem, 32, re, .) M68KMAKE_OP(movem, 16, er, pi) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = AY(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = AY(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7148,10 +7148,10 @@ M68KMAKE_OP(movem, 16, er, pi) M68KMAKE_OP(movem, 16, er, pcdi) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = EA_PCDI_16(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = EA_PCDI_16(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7167,10 +7167,10 @@ M68KMAKE_OP(movem, 16, er, pcdi) M68KMAKE_OP(movem, 16, er, pcix) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = EA_PCIX_16(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = EA_PCIX_16(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7186,10 +7186,10 @@ M68KMAKE_OP(movem, 16, er, pcix) M68KMAKE_OP(movem, 16, er, .) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7205,10 +7205,10 @@ M68KMAKE_OP(movem, 16, er, .) M68KMAKE_OP(movem, 32, er, pi) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = AY(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = AY(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7225,10 +7225,10 @@ M68KMAKE_OP(movem, 32, er, pi) M68KMAKE_OP(movem, 32, er, pcdi) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = EA_PCDI_32(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = EA_PCDI_32(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7244,10 +7244,10 @@ M68KMAKE_OP(movem, 32, er, pcdi) M68KMAKE_OP(movem, 32, er, pcix) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = EA_PCIX_32(mc68kcpu); - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = EA_PCIX_32(mc68kcpu); + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7263,10 +7263,10 @@ M68KMAKE_OP(movem, 32, er, pcix) M68KMAKE_OP(movem, 32, er, .) { - UINT32 i = 0; - UINT32 register_list = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 count = 0; + uint32_t i = 0; + uint32_t register_list = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t count = 0; for(; i < 16; i++) if(register_list & (1 << i)) @@ -7282,8 +7282,8 @@ M68KMAKE_OP(movem, 32, er, .) M68KMAKE_OP(movep, 16, re, .) { - UINT32 ea = EA_AY_DI_16(mc68kcpu); - UINT32 src = DX(mc68kcpu); + uint32_t ea = EA_AY_DI_16(mc68kcpu); + uint32_t src = DX(mc68kcpu); m68ki_write_8((mc68kcpu), ea, MASK_OUT_ABOVE_8(src >> 8)); m68ki_write_8((mc68kcpu), ea += 2, MASK_OUT_ABOVE_8(src)); @@ -7292,8 +7292,8 @@ M68KMAKE_OP(movep, 16, re, .) M68KMAKE_OP(movep, 32, re, .) { - UINT32 ea = EA_AY_DI_32(mc68kcpu); - UINT32 src = DX(mc68kcpu); + uint32_t ea = EA_AY_DI_32(mc68kcpu); + uint32_t src = DX(mc68kcpu); m68ki_write_8((mc68kcpu), ea, MASK_OUT_ABOVE_8(src >> 24)); m68ki_write_8((mc68kcpu), ea += 2, MASK_OUT_ABOVE_8(src >> 16)); @@ -7304,8 +7304,8 @@ M68KMAKE_OP(movep, 32, re, .) M68KMAKE_OP(movep, 16, er, .) { - UINT32 ea = EA_AY_DI_16(mc68kcpu); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t ea = EA_AY_DI_16(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_16(*r_dst) | ((m68ki_read_8((mc68kcpu), ea) << 8) + m68ki_read_8((mc68kcpu), ea + 2)); } @@ -7313,7 +7313,7 @@ M68KMAKE_OP(movep, 16, er, .) M68KMAKE_OP(movep, 32, er, .) { - UINT32 ea = EA_AY_DI_32(mc68kcpu); + uint32_t ea = EA_AY_DI_32(mc68kcpu); DX(mc68kcpu) = (m68ki_read_8((mc68kcpu), ea) << 24) + (m68ki_read_8((mc68kcpu), ea + 2) << 16) + (m68ki_read_8((mc68kcpu), ea + 4) << 8) + m68ki_read_8((mc68kcpu), ea + 6); @@ -7326,8 +7326,8 @@ M68KMAKE_OP(moves, 8, ., .) { if((mc68kcpu)->s_flag) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -7361,8 +7361,8 @@ M68KMAKE_OP(moves, 16, ., .) { if((mc68kcpu)->s_flag) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -7396,8 +7396,8 @@ M68KMAKE_OP(moves, 32, ., .) { if((mc68kcpu)->s_flag) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ if(BIT_B(word2)) /* Register to memory */ @@ -7422,7 +7422,7 @@ M68KMAKE_OP(moves, 32, ., .) M68KMAKE_OP(moveq, 32, ., .) { - UINT32 res = DX(mc68kcpu) = MAKE_INT_8(MASK_OUT_ABOVE_8((mc68kcpu)->ir)); + uint32_t res = DX(mc68kcpu) = MAKE_INT_8(MASK_OUT_ABOVE_8((mc68kcpu)->ir)); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -7433,7 +7433,7 @@ M68KMAKE_OP(moveq, 32, ., .) M68KMAKE_OP(move16, 32, ., .) { - UINT16 w2 = OPER_I_16(mc68kcpu); + uint16_t w2 = OPER_I_16(mc68kcpu); int ax = (mc68kcpu)->ir & 7; int ay = (w2 >> 12) & 7; m68ki_write_32((mc68kcpu), REG_A(mc68kcpu)[ay], m68ki_read_32((mc68kcpu), REG_A(mc68kcpu)[ax])); @@ -7448,8 +7448,8 @@ M68KMAKE_OP(move16, 32, ., .) M68KMAKE_OP(muls, 16, ., d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY(mc68kcpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY(mc68kcpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -7462,8 +7462,8 @@ M68KMAKE_OP(muls, 16, ., d) M68KMAKE_OP(muls, 16, ., .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_32(MAKE_INT_16(M68KMAKE_GET_OPER_AY_16) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_32(MAKE_INT_16(M68KMAKE_GET_OPER_AY_16) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst))); *r_dst = res; @@ -7476,8 +7476,8 @@ M68KMAKE_OP(muls, 16, ., .) M68KMAKE_OP(mulu, 16, ., d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)) * MASK_OUT_ABOVE_16(*r_dst); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)) * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -7490,8 +7490,8 @@ M68KMAKE_OP(mulu, 16, ., d) M68KMAKE_OP(mulu, 16, ., .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 res = M68KMAKE_GET_OPER_AY_16 * MASK_OUT_ABOVE_16(*r_dst); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t res = M68KMAKE_GET_OPER_AY_16 * MASK_OUT_ABOVE_16(*r_dst); *r_dst = res; @@ -7506,21 +7506,21 @@ M68KMAKE_OP(mull, 32, ., d) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT64 src = DY(mc68kcpu); - UINT64 dst = REG_D(mc68kcpu)[(word2 >> 12) & 7]; - UINT64 res; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint64_t src = DY(mc68kcpu); + uint64_t dst = REG_D(mc68kcpu)[(word2 >> 12) & 7]; + uint64_t res; (mc68kcpu)->c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (INT64)((INT32)src) * (INT64)((INT32)dst); + res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); if(!BIT_A(word2)) { (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); (mc68kcpu)->n_flag = NFLAG_32(res); - (mc68kcpu)->v_flag = ((INT64)res != (INT32)res)<<7; + (mc68kcpu)->v_flag = ((int64_t)res != (int32_t)res)<<7; REG_D(mc68kcpu)[(word2 >> 12) & 7] = (mc68kcpu)->not_z_flag; return; } @@ -7556,21 +7556,21 @@ M68KMAKE_OP(mull, 32, ., .) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 word2 = OPER_I_16(mc68kcpu); - UINT64 src = M68KMAKE_GET_OPER_AY_32; - UINT64 dst = REG_D(mc68kcpu)[(word2 >> 12) & 7]; - UINT64 res; + uint32_t word2 = OPER_I_16(mc68kcpu); + uint64_t src = M68KMAKE_GET_OPER_AY_32; + uint64_t dst = REG_D(mc68kcpu)[(word2 >> 12) & 7]; + uint64_t res; (mc68kcpu)->c_flag = CFLAG_CLEAR; if(BIT_B(word2)) /* signed */ { - res = (INT64)((INT32)src) * (INT64)((INT32)dst); + res = (int64_t)((int32_t)src) * (int64_t)((int32_t)dst); if(!BIT_A(word2)) { (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); (mc68kcpu)->n_flag = NFLAG_32(res); - (mc68kcpu)->v_flag = ((INT64)res != (INT32)res)<<7; + (mc68kcpu)->v_flag = ((int64_t)res != (int32_t)res)<<7; REG_D(mc68kcpu)[(word2 >> 12) & 7] = (mc68kcpu)->not_z_flag; return; } @@ -7604,9 +7604,9 @@ M68KMAKE_OP(mull, 32, ., .) M68KMAKE_OP(nbcd, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1(mc68kcpu)); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1(mc68kcpu)); if(res != 0x9a) { @@ -7637,9 +7637,9 @@ M68KMAKE_OP(nbcd, 8, ., d) M68KMAKE_OP(nbcd, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1(mc68kcpu)); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1(mc68kcpu)); if(res != 0x9a) { @@ -7670,8 +7670,8 @@ M68KMAKE_OP(nbcd, 8, ., .) M68KMAKE_OP(neg, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = 0 - MASK_OUT_ABOVE_8(*r_dst); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = 0 - MASK_OUT_ABOVE_8(*r_dst); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = CFLAG_8(res); @@ -7684,9 +7684,9 @@ M68KMAKE_OP(neg, 8, ., d) M68KMAKE_OP(neg, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); - UINT32 res = 0 - src; + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); + uint32_t res = 0 - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = CFLAG_8(res); @@ -7699,8 +7699,8 @@ M68KMAKE_OP(neg, 8, ., .) M68KMAKE_OP(neg, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = 0 - MASK_OUT_ABOVE_16(*r_dst); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = 0 - MASK_OUT_ABOVE_16(*r_dst); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = CFLAG_16(res); @@ -7713,9 +7713,9 @@ M68KMAKE_OP(neg, 16, ., d) M68KMAKE_OP(neg, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = 0 - src; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = 0 - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = CFLAG_16(res); @@ -7728,8 +7728,8 @@ M68KMAKE_OP(neg, 16, ., .) M68KMAKE_OP(neg, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = 0 - *r_dst; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = 0 - *r_dst; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = CFLAG_SUB_32(*r_dst, 0, res); @@ -7742,9 +7742,9 @@ M68KMAKE_OP(neg, 32, ., d) M68KMAKE_OP(neg, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 src = m68ki_read_32((mc68kcpu), ea); - UINT32 res = 0 - src; + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t src = m68ki_read_32((mc68kcpu), ea); + uint32_t res = 0 - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = CFLAG_SUB_32(src, 0, res); @@ -7757,8 +7757,8 @@ M68KMAKE_OP(neg, 32, ., .) M68KMAKE_OP(negx, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -7773,9 +7773,9 @@ M68KMAKE_OP(negx, 8, ., d) M68KMAKE_OP(negx, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = m68ki_read_8((mc68kcpu), ea); - UINT32 res = 0 - src - XFLAG_AS_1(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = m68ki_read_8((mc68kcpu), ea); + uint32_t res = 0 - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -7790,8 +7790,8 @@ M68KMAKE_OP(negx, 8, ., .) M68KMAKE_OP(negx, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -7806,9 +7806,9 @@ M68KMAKE_OP(negx, 16, ., d) M68KMAKE_OP(negx, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -7823,8 +7823,8 @@ M68KMAKE_OP(negx, 16, ., .) M68KMAKE_OP(negx, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(*r_dst, 0, res); @@ -7839,9 +7839,9 @@ M68KMAKE_OP(negx, 32, ., d) M68KMAKE_OP(negx, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 src = m68ki_read_32((mc68kcpu), ea); - UINT32 res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t src = m68ki_read_32((mc68kcpu), ea); + uint32_t res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(src, 0, res); @@ -7862,8 +7862,8 @@ M68KMAKE_OP(nop, 0, ., .) M68KMAKE_OP(not, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_8(~*r_dst); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_8(~*r_dst); *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -7876,8 +7876,8 @@ M68KMAKE_OP(not, 8, ., d) M68KMAKE_OP(not, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = MASK_OUT_ABOVE_8(~m68ki_read_8((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = MASK_OUT_ABOVE_8(~m68ki_read_8((mc68kcpu), ea)); m68ki_write_8((mc68kcpu), ea, res); @@ -7890,8 +7890,8 @@ M68KMAKE_OP(not, 8, ., .) M68KMAKE_OP(not, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = MASK_OUT_ABOVE_16(~*r_dst); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = MASK_OUT_ABOVE_16(~*r_dst); *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -7904,8 +7904,8 @@ M68KMAKE_OP(not, 16, ., d) M68KMAKE_OP(not, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = MASK_OUT_ABOVE_16(~m68ki_read_16((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = MASK_OUT_ABOVE_16(~m68ki_read_16((mc68kcpu), ea)); m68ki_write_16((mc68kcpu), ea, res); @@ -7918,8 +7918,8 @@ M68KMAKE_OP(not, 16, ., .) M68KMAKE_OP(not, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -7930,8 +7930,8 @@ M68KMAKE_OP(not, 32, ., d) M68KMAKE_OP(not, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = MASK_OUT_ABOVE_32(~m68ki_read_32((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = MASK_OUT_ABOVE_32(~m68ki_read_32((mc68kcpu), ea)); m68ki_write_32((mc68kcpu), ea, res); @@ -7944,7 +7944,7 @@ M68KMAKE_OP(not, 32, ., .) M68KMAKE_OP(or, 8, er, d) { - UINT32 res = MASK_OUT_ABOVE_8((DX(mc68kcpu) |= MASK_OUT_ABOVE_8(DY(mc68kcpu)))); + uint32_t res = MASK_OUT_ABOVE_8((DX(mc68kcpu) |= MASK_OUT_ABOVE_8(DY(mc68kcpu)))); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -7955,7 +7955,7 @@ M68KMAKE_OP(or, 8, er, d) M68KMAKE_OP(or, 8, er, .) { - UINT32 res = MASK_OUT_ABOVE_8((DX(mc68kcpu) |= M68KMAKE_GET_OPER_AY_8)); + uint32_t res = MASK_OUT_ABOVE_8((DX(mc68kcpu) |= M68KMAKE_GET_OPER_AY_8)); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -7966,7 +7966,7 @@ M68KMAKE_OP(or, 8, er, .) M68KMAKE_OP(or, 16, er, d) { - UINT32 res = MASK_OUT_ABOVE_16((DX(mc68kcpu) |= MASK_OUT_ABOVE_16(DY(mc68kcpu)))); + uint32_t res = MASK_OUT_ABOVE_16((DX(mc68kcpu) |= MASK_OUT_ABOVE_16(DY(mc68kcpu)))); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -7977,7 +7977,7 @@ M68KMAKE_OP(or, 16, er, d) M68KMAKE_OP(or, 16, er, .) { - UINT32 res = MASK_OUT_ABOVE_16((DX(mc68kcpu) |= M68KMAKE_GET_OPER_AY_16)); + uint32_t res = MASK_OUT_ABOVE_16((DX(mc68kcpu) |= M68KMAKE_GET_OPER_AY_16)); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -7988,7 +7988,7 @@ M68KMAKE_OP(or, 16, er, .) M68KMAKE_OP(or, 32, er, d) { - UINT32 res = DX(mc68kcpu) |= DY(mc68kcpu); + uint32_t res = DX(mc68kcpu) |= DY(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -7999,7 +7999,7 @@ M68KMAKE_OP(or, 32, er, d) M68KMAKE_OP(or, 32, er, .) { - UINT32 res = DX(mc68kcpu) |= M68KMAKE_GET_OPER_AY_32; + uint32_t res = DX(mc68kcpu) |= M68KMAKE_GET_OPER_AY_32; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -8010,8 +8010,8 @@ M68KMAKE_OP(or, 32, er, .) M68KMAKE_OP(or, 8, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = MASK_OUT_ABOVE_8(DX(mc68kcpu) | m68ki_read_8((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = MASK_OUT_ABOVE_8(DX(mc68kcpu) | m68ki_read_8((mc68kcpu), ea)); m68ki_write_8((mc68kcpu), ea, res); @@ -8024,8 +8024,8 @@ M68KMAKE_OP(or, 8, re, .) M68KMAKE_OP(or, 16, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = MASK_OUT_ABOVE_16(DX(mc68kcpu) | m68ki_read_16((mc68kcpu), ea)); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = MASK_OUT_ABOVE_16(DX(mc68kcpu) | m68ki_read_16((mc68kcpu), ea)); m68ki_write_16((mc68kcpu), ea, res); @@ -8038,8 +8038,8 @@ M68KMAKE_OP(or, 16, re, .) M68KMAKE_OP(or, 32, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = DX(mc68kcpu) | m68ki_read_32((mc68kcpu), ea); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = DX(mc68kcpu) | m68ki_read_32((mc68kcpu), ea); m68ki_write_32((mc68kcpu), ea, res); @@ -8052,7 +8052,7 @@ M68KMAKE_OP(or, 32, re, .) M68KMAKE_OP(ori, 8, ., d) { - UINT32 res = MASK_OUT_ABOVE_8((DY(mc68kcpu) |= OPER_I_8(mc68kcpu))); + uint32_t res = MASK_OUT_ABOVE_8((DY(mc68kcpu) |= OPER_I_8(mc68kcpu))); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -8063,9 +8063,9 @@ M68KMAKE_OP(ori, 8, ., d) M68KMAKE_OP(ori, 8, ., .) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 res = MASK_OUT_ABOVE_8(src | m68ki_read_8((mc68kcpu), ea)); + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t res = MASK_OUT_ABOVE_8(src | m68ki_read_8((mc68kcpu), ea)); m68ki_write_8((mc68kcpu), ea, res); @@ -8078,7 +8078,7 @@ M68KMAKE_OP(ori, 8, ., .) M68KMAKE_OP(ori, 16, ., d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu) |= OPER_I_16(mc68kcpu)); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu) |= OPER_I_16(mc68kcpu)); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -8089,9 +8089,9 @@ M68KMAKE_OP(ori, 16, ., d) M68KMAKE_OP(ori, 16, ., .) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 res = MASK_OUT_ABOVE_16(src | m68ki_read_16((mc68kcpu), ea)); + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t res = MASK_OUT_ABOVE_16(src | m68ki_read_16((mc68kcpu), ea)); m68ki_write_16((mc68kcpu), ea, res); @@ -8104,7 +8104,7 @@ M68KMAKE_OP(ori, 16, ., .) M68KMAKE_OP(ori, 32, ., d) { - UINT32 res = DY(mc68kcpu) |= OPER_I_32(mc68kcpu); + uint32_t res = DY(mc68kcpu) |= OPER_I_32(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -8115,9 +8115,9 @@ M68KMAKE_OP(ori, 32, ., d) M68KMAKE_OP(ori, 32, ., .) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 res = src | m68ki_read_32((mc68kcpu), ea); + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t res = src | m68ki_read_32((mc68kcpu), ea); m68ki_write_32((mc68kcpu), ea, res); @@ -8138,7 +8138,7 @@ M68KMAKE_OP(ori, 16, tos, .) { if((mc68kcpu)->s_flag) { - UINT32 src = OPER_I_16(mc68kcpu); + uint32_t src = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ m68ki_set_sr((mc68kcpu), m68ki_get_sr(mc68kcpu) | src); return; @@ -8152,8 +8152,8 @@ M68KMAKE_OP(pack, 16, rr, .) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: DX(mc68kcpu) and DY(mc68kcpu) are reversed in Motorola's docs */ - UINT32 src = DY(mc68kcpu) + OPER_I_16(mc68kcpu); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu) + OPER_I_16(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_8(*r_dst) | ((src >> 4) & 0x00f0) | (src & 0x000f); return; @@ -8167,8 +8167,8 @@ M68KMAKE_OP(pack, 16, mm, ax7) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: AX and AY are reversed in Motorola's docs */ - UINT32 ea_src = EA_AY_PD_8(mc68kcpu); - UINT32 src = m68ki_read_8((mc68kcpu), ea_src); + uint32_t ea_src = EA_AY_PD_8(mc68kcpu); + uint32_t src = m68ki_read_8((mc68kcpu), ea_src); ea_src = EA_AY_PD_8(mc68kcpu); src = ((src << 8) | m68ki_read_8((mc68kcpu), ea_src)) + OPER_I_16(mc68kcpu); @@ -8184,8 +8184,8 @@ M68KMAKE_OP(pack, 16, mm, ay7) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: AX and AY are reversed in Motorola's docs */ - UINT32 ea_src = EA_A7_PD_8(mc68kcpu); - UINT32 src = m68ki_read_8((mc68kcpu), ea_src); + uint32_t ea_src = EA_A7_PD_8(mc68kcpu); + uint32_t src = m68ki_read_8((mc68kcpu), ea_src); ea_src = EA_A7_PD_8(mc68kcpu); src = ((src << 8) | m68ki_read_8((mc68kcpu), ea_src)) + OPER_I_16(mc68kcpu); @@ -8200,8 +8200,8 @@ M68KMAKE_OP(pack, 16, mm, axy7) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 ea_src = EA_A7_PD_8(mc68kcpu); - UINT32 src = m68ki_read_8((mc68kcpu), ea_src); + uint32_t ea_src = EA_A7_PD_8(mc68kcpu); + uint32_t src = m68ki_read_8((mc68kcpu), ea_src); ea_src = EA_A7_PD_8(mc68kcpu); src = ((src << 8) | m68ki_read_8((mc68kcpu), ea_src)) + OPER_I_16(mc68kcpu); @@ -8217,8 +8217,8 @@ M68KMAKE_OP(pack, 16, mm, .) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: AX and AY are reversed in Motorola's docs */ - UINT32 ea_src = EA_AY_PD_8(mc68kcpu); - UINT32 src = m68ki_read_8((mc68kcpu), ea_src); + uint32_t ea_src = EA_AY_PD_8(mc68kcpu); + uint32_t src = m68ki_read_8((mc68kcpu), ea_src); ea_src = EA_AY_PD_8(mc68kcpu); src = ((src << 8) | m68ki_read_8((mc68kcpu), ea_src)) + OPER_I_16(mc68kcpu); @@ -8231,7 +8231,7 @@ M68KMAKE_OP(pack, 16, mm, .) M68KMAKE_OP(pea, 32, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; + uint32_t ea = M68KMAKE_GET_EA_AY_32; m68ki_push_32((mc68kcpu), ea); } @@ -8296,11 +8296,11 @@ M68KMAKE_OP(reset, 0, ., .) M68KMAKE_OP(ror, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 shift = orig_shift & 7; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROR_8(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t shift = orig_shift & 7; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROR_8(src, shift); if(orig_shift != 0) (mc68kcpu)->remaining_cycles -= orig_shift<<(mc68kcpu)->cyc_shift; @@ -8316,10 +8316,10 @@ M68KMAKE_OP(ror, 8, s, .) M68KMAKE_OP(ror, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROR_16(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROR_16(src, shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8335,10 +8335,10 @@ M68KMAKE_OP(ror, 16, s, .) M68KMAKE_OP(ror, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT64 src = *r_dst; - UINT32 res = ROR_32(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint64_t src = *r_dst; + uint32_t res = ROR_32(src, shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8354,11 +8354,11 @@ M68KMAKE_OP(ror, 32, s, .) M68KMAKE_OP(ror, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; - UINT32 shift = orig_shift & 7; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROR_8(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t shift = orig_shift & 7; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROR_8(src, shift); if(orig_shift != 0) { @@ -8381,11 +8381,11 @@ M68KMAKE_OP(ror, 8, r, .) M68KMAKE_OP(ror, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; - UINT32 shift = orig_shift & 15; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROR_16(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t shift = orig_shift & 15; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROR_16(src, shift); if(orig_shift != 0) { @@ -8408,11 +8408,11 @@ M68KMAKE_OP(ror, 16, r, .) M68KMAKE_OP(ror, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; - UINT32 shift = orig_shift & 31; - UINT64 src = *r_dst; - UINT32 res = ROR_32(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t shift = orig_shift & 31; + uint64_t src = *r_dst; + uint32_t res = ROR_32(src, shift); if(orig_shift != 0) { @@ -8435,9 +8435,9 @@ M68KMAKE_OP(ror, 32, r, .) M68KMAKE_OP(ror, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = ROR_16(src, 1); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = ROR_16(src, 1); m68ki_write_16((mc68kcpu), ea, res); @@ -8450,11 +8450,11 @@ M68KMAKE_OP(ror, 16, ., .) M68KMAKE_OP(rol, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 shift = orig_shift & 7; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROL_8(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t shift = orig_shift & 7; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROL_8(src, shift); if(orig_shift != 0) (mc68kcpu)->remaining_cycles -= orig_shift<<(mc68kcpu)->cyc_shift; @@ -8470,10 +8470,10 @@ M68KMAKE_OP(rol, 8, s, .) M68KMAKE_OP(rol, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROL_16(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROL_16(src, shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8489,10 +8489,10 @@ M68KMAKE_OP(rol, 16, s, .) M68KMAKE_OP(rol, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT64 src = *r_dst; - UINT32 res = ROL_32(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint64_t src = *r_dst; + uint32_t res = ROL_32(src, shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8508,11 +8508,11 @@ M68KMAKE_OP(rol, 32, s, .) M68KMAKE_OP(rol, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; - UINT32 shift = orig_shift & 7; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROL_8(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t shift = orig_shift & 7; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROL_8(src, shift); if(orig_shift != 0) { @@ -8543,11 +8543,11 @@ M68KMAKE_OP(rol, 8, r, .) M68KMAKE_OP(rol, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; - UINT32 shift = orig_shift & 15; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = MASK_OUT_ABOVE_16(ROL_16(src, shift)); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t shift = orig_shift & 15; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = MASK_OUT_ABOVE_16(ROL_16(src, shift)); if(orig_shift != 0) { @@ -8578,11 +8578,11 @@ M68KMAKE_OP(rol, 16, r, .) M68KMAKE_OP(rol, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; - UINT32 shift = orig_shift & 31; - UINT64 src = *r_dst; - UINT32 res = ROL_32(src, shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t shift = orig_shift & 31; + uint64_t src = *r_dst; + uint32_t res = ROL_32(src, shift); if(orig_shift != 0) { @@ -8606,9 +8606,9 @@ M68KMAKE_OP(rol, 32, r, .) M68KMAKE_OP(rol, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = MASK_OUT_ABOVE_16(ROL_16(src, 1)); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = MASK_OUT_ABOVE_16(ROL_16(src, 1)); m68ki_write_16((mc68kcpu), ea, res); @@ -8621,10 +8621,10 @@ M68KMAKE_OP(rol, 16, ., .) M68KMAKE_OP(roxr, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROR_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROR_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8642,10 +8642,10 @@ M68KMAKE_OP(roxr, 8, s, .) M68KMAKE_OP(roxr, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROR_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROR_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8663,10 +8663,10 @@ M68KMAKE_OP(roxr, 16, s, .) M68KMAKE_OP(roxr, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT64 src = *r_dst; - UINT64 res = src | (((UINT64)XFLAG_AS_1(mc68kcpu)) << 32); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint64_t src = *r_dst; + uint64_t res = src | (((uint64_t)XFLAG_AS_1(mc68kcpu)) << 32); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8686,14 +8686,14 @@ M68KMAKE_OP(roxr, 32, s, .) M68KMAKE_OP(roxr, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; if(orig_shift != 0) { - UINT32 shift = orig_shift % 9; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROR_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); + uint32_t shift = orig_shift % 9; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROR_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); (mc68kcpu)->remaining_cycles -= orig_shift<<(mc68kcpu)->cyc_shift; @@ -8716,14 +8716,14 @@ M68KMAKE_OP(roxr, 8, r, .) M68KMAKE_OP(roxr, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; if(orig_shift != 0) { - UINT32 shift = orig_shift % 17; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROR_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); + uint32_t shift = orig_shift % 17; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROR_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); (mc68kcpu)->remaining_cycles -= orig_shift<<(mc68kcpu)->cyc_shift; @@ -8746,14 +8746,14 @@ M68KMAKE_OP(roxr, 16, r, .) M68KMAKE_OP(roxr, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; if(orig_shift != 0) { - UINT32 shift = orig_shift % 33; - UINT64 src = *r_dst; - UINT64 res = src | (((UINT64)XFLAG_AS_1(mc68kcpu)) << 32); + uint32_t shift = orig_shift % 33; + uint64_t src = *r_dst; + uint64_t res = src | (((uint64_t)XFLAG_AS_1(mc68kcpu)) << 32); res = ROR_33_64(res, shift); @@ -8778,9 +8778,9 @@ M68KMAKE_OP(roxr, 32, r, .) M68KMAKE_OP(roxr, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = ROR_17(src | (XFLAG_AS_1(mc68kcpu) << 16), 1); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = ROR_17(src | (XFLAG_AS_1(mc68kcpu) << 16), 1); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -8795,10 +8795,10 @@ M68KMAKE_OP(roxr, 16, ., .) M68KMAKE_OP(roxl, 8, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROL_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROL_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8816,10 +8816,10 @@ M68KMAKE_OP(roxl, 8, s, .) M68KMAKE_OP(roxl, 16, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROL_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROL_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8837,10 +8837,10 @@ M68KMAKE_OP(roxl, 16, s, .) M68KMAKE_OP(roxl, 32, s, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT64 src = *r_dst; - UINT64 res = src | (((UINT64)XFLAG_AS_1(mc68kcpu)) << 32); + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t shift = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint64_t src = *r_dst; + uint64_t res = src | (((uint64_t)XFLAG_AS_1(mc68kcpu)) << 32); if(shift != 0) (mc68kcpu)->remaining_cycles -= shift<<(mc68kcpu)->cyc_shift; @@ -8860,15 +8860,15 @@ M68KMAKE_OP(roxl, 32, s, .) M68KMAKE_OP(roxl, 8, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; if(orig_shift != 0) { - UINT32 shift = orig_shift % 9; - UINT32 src = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = ROL_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); + uint32_t shift = orig_shift % 9; + uint32_t src = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = ROL_9(src | (XFLAG_AS_1(mc68kcpu) << 8), shift); (mc68kcpu)->remaining_cycles -= orig_shift<<(mc68kcpu)->cyc_shift; @@ -8891,14 +8891,14 @@ M68KMAKE_OP(roxl, 8, r, .) M68KMAKE_OP(roxl, 16, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; if(orig_shift != 0) { - UINT32 shift = orig_shift % 17; - UINT32 src = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = ROL_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); + uint32_t shift = orig_shift % 17; + uint32_t src = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = ROL_17(src | (XFLAG_AS_1(mc68kcpu) << 16), shift); (mc68kcpu)->remaining_cycles -= orig_shift<<(mc68kcpu)->cyc_shift; @@ -8921,14 +8921,14 @@ M68KMAKE_OP(roxl, 16, r, .) M68KMAKE_OP(roxl, 32, r, .) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 orig_shift = DX(mc68kcpu) & 0x3f; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t orig_shift = DX(mc68kcpu) & 0x3f; if(orig_shift != 0) { - UINT32 shift = orig_shift % 33; - UINT64 src = *r_dst; - UINT64 res = src | (((UINT64)XFLAG_AS_1(mc68kcpu)) << 32); + uint32_t shift = orig_shift % 33; + uint64_t src = *r_dst; + uint64_t res = src | (((uint64_t)XFLAG_AS_1(mc68kcpu)) << 32); res = ROL_33_64(res, shift); @@ -8953,9 +8953,9 @@ M68KMAKE_OP(roxl, 32, r, .) M68KMAKE_OP(roxl, 16, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = m68ki_read_16((mc68kcpu), ea); - UINT32 res = ROL_17(src | (XFLAG_AS_1(mc68kcpu) << 16), 1); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = m68ki_read_16((mc68kcpu), ea); + uint32_t res = ROL_17(src | (XFLAG_AS_1(mc68kcpu) << 16), 1); (mc68kcpu)->c_flag = (mc68kcpu)->x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -8972,7 +8972,7 @@ M68KMAKE_OP(rtd, 32, ., .) { if(CPU_TYPE_IS_010_PLUS((mc68kcpu)->cpu_type)) { - UINT32 new_pc = m68ki_pull_32(mc68kcpu); + uint32_t new_pc = m68ki_pull_32(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ REG_A(mc68kcpu)[7] = MASK_OUT_ABOVE_32(REG_A(mc68kcpu)[7] + MAKE_INT_16(OPER_I_16(mc68kcpu))); @@ -8987,9 +8987,9 @@ M68KMAKE_OP(rte, 32, ., .) { if((mc68kcpu)->s_flag) { - UINT32 new_sr; - UINT32 new_pc; - UINT32 format_word; + uint32_t new_sr; + uint32_t new_pc; + uint32_t format_word; if (!(mc68kcpu)->rte_instr_callback.isnull()) ((mc68kcpu)->rte_instr_callback)(1); @@ -9177,10 +9177,10 @@ M68KMAKE_OP(rts, 32, ., .) M68KMAKE_OP(sbcd, 8, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); // (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to assume cleared. */ @@ -9209,10 +9209,10 @@ M68KMAKE_OP(sbcd, 8, rr, .) M68KMAKE_OP(sbcd, 8, mm, ax7) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); // (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ @@ -9241,10 +9241,10 @@ M68KMAKE_OP(sbcd, 8, mm, ax7) M68KMAKE_OP(sbcd, 8, mm, ay7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); // (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ @@ -9273,10 +9273,10 @@ M68KMAKE_OP(sbcd, 8, mm, ay7) M68KMAKE_OP(sbcd, 8, mm, axy7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); // (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ @@ -9305,10 +9305,10 @@ M68KMAKE_OP(sbcd, 8, mm, axy7) M68KMAKE_OP(sbcd, 8, mm, .) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(mc68kcpu); // (mc68kcpu)->v_flag = ~res; /* Undefined V behavior */ (mc68kcpu)->v_flag = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ @@ -9381,7 +9381,7 @@ M68KMAKE_OP(stop, 0, ., .) { if((mc68kcpu)->s_flag) { - UINT32 new_sr = OPER_I_16(mc68kcpu); + uint32_t new_sr = OPER_I_16(mc68kcpu); m68ki_trace_t0(mc68kcpu); /* auto-disable (see m68kcpu.h) */ (mc68kcpu)->stopped |= STOP_LEVEL_STOP; m68ki_set_sr((mc68kcpu), new_sr); @@ -9394,10 +9394,10 @@ M68KMAKE_OP(stop, 0, ., .) M68KMAKE_OP(sub, 8, er, d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9410,10 +9410,10 @@ M68KMAKE_OP(sub, 8, er, d) M68KMAKE_OP(sub, 8, er, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_8; - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_8; + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9426,10 +9426,10 @@ M68KMAKE_OP(sub, 8, er, .) M68KMAKE_OP(sub, 16, er, d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -9442,10 +9442,10 @@ M68KMAKE_OP(sub, 16, er, d) M68KMAKE_OP(sub, 16, er, a) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(AY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(AY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -9458,10 +9458,10 @@ M68KMAKE_OP(sub, 16, er, a) M68KMAKE_OP(sub, 16, er, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_16; - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_16; + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -9474,10 +9474,10 @@ M68KMAKE_OP(sub, 16, er, .) M68KMAKE_OP(sub, 32, er, d) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(src, dst, res); @@ -9490,10 +9490,10 @@ M68KMAKE_OP(sub, 32, er, d) M68KMAKE_OP(sub, 32, er, a) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = AY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = AY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(src, dst, res); @@ -9506,10 +9506,10 @@ M68KMAKE_OP(sub, 32, er, a) M68KMAKE_OP(sub, 32, er, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_32; - UINT32 dst = *r_dst; - UINT32 res = dst - src; + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_32; + uint32_t dst = *r_dst; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(src, dst, res); @@ -9522,10 +9522,10 @@ M68KMAKE_OP(sub, 32, er, .) M68KMAKE_OP(sub, 8, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 src = MASK_OUT_ABOVE_8(DX(mc68kcpu)); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t src = MASK_OUT_ABOVE_8(DX(mc68kcpu)); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -9538,10 +9538,10 @@ M68KMAKE_OP(sub, 8, re, .) M68KMAKE_OP(sub, 16, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 src = MASK_OUT_ABOVE_16(DX(mc68kcpu)); - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t src = MASK_OUT_ABOVE_16(DX(mc68kcpu)); + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -9554,10 +9554,10 @@ M68KMAKE_OP(sub, 16, re, .) M68KMAKE_OP(sub, 32, re, .) { - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 src = DX(mc68kcpu); - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t src = DX(mc68kcpu); + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -9570,7 +9570,7 @@ M68KMAKE_OP(sub, 32, re, .) M68KMAKE_OP(suba, 16, ., d) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(DY(mc68kcpu))); } @@ -9578,7 +9578,7 @@ M68KMAKE_OP(suba, 16, ., d) M68KMAKE_OP(suba, 16, ., a) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(AY(mc68kcpu))); } @@ -9586,8 +9586,8 @@ M68KMAKE_OP(suba, 16, ., a) M68KMAKE_OP(suba, 16, ., .) { - UINT32* r_dst = &AX(mc68kcpu); - UINT32 src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); + uint32_t* r_dst = &AX(mc68kcpu); + uint32_t src = MAKE_INT_16(M68KMAKE_GET_OPER_AY_16); *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); } @@ -9595,7 +9595,7 @@ M68KMAKE_OP(suba, 16, ., .) M68KMAKE_OP(suba, 32, ., d) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst - DY(mc68kcpu)); } @@ -9603,7 +9603,7 @@ M68KMAKE_OP(suba, 32, ., d) M68KMAKE_OP(suba, 32, ., a) { - UINT32* r_dst = &AX(mc68kcpu); + uint32_t* r_dst = &AX(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst - AY(mc68kcpu)); } @@ -9611,8 +9611,8 @@ M68KMAKE_OP(suba, 32, ., a) M68KMAKE_OP(suba, 32, ., .) { - UINT32* r_dst = &AX(mc68kcpu); - UINT32 src = M68KMAKE_GET_OPER_AY_32; + uint32_t* r_dst = &AX(mc68kcpu); + uint32_t src = M68KMAKE_GET_OPER_AY_32; *r_dst = MASK_OUT_ABOVE_32(*r_dst - src); } @@ -9620,10 +9620,10 @@ M68KMAKE_OP(suba, 32, ., .) M68KMAKE_OP(subi, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -9636,10 +9636,10 @@ M68KMAKE_OP(subi, 8, ., d) M68KMAKE_OP(subi, 8, ., .) { - UINT32 src = OPER_I_8(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t src = OPER_I_8(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -9652,10 +9652,10 @@ M68KMAKE_OP(subi, 8, ., .) M68KMAKE_OP(subi, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -9668,10 +9668,10 @@ M68KMAKE_OP(subi, 16, ., d) M68KMAKE_OP(subi, 16, ., .) { - UINT32 src = OPER_I_16(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t src = OPER_I_16(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -9684,10 +9684,10 @@ M68KMAKE_OP(subi, 16, ., .) M68KMAKE_OP(subi, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = dst - src; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -9700,10 +9700,10 @@ M68KMAKE_OP(subi, 32, ., d) M68KMAKE_OP(subi, 32, ., .) { - UINT32 src = OPER_I_32(mc68kcpu); - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t src = OPER_I_32(mc68kcpu); + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -9716,10 +9716,10 @@ M68KMAKE_OP(subi, 32, ., .) M68KMAKE_OP(subq, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -9732,10 +9732,10 @@ M68KMAKE_OP(subq, 8, ., d) M68KMAKE_OP(subq, 8, ., .) { - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(res); @@ -9748,10 +9748,10 @@ M68KMAKE_OP(subq, 8, ., .) M68KMAKE_OP(subq, 16, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = dst - src; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -9764,7 +9764,7 @@ M68KMAKE_OP(subq, 16, ., d) M68KMAKE_OP(subq, 16, ., a) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst - (((((mc68kcpu)->ir >> 9) - 1) & 7) + 1)); } @@ -9772,10 +9772,10 @@ M68KMAKE_OP(subq, 16, ., a) M68KMAKE_OP(subq, 16, ., .) { - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 ea = M68KMAKE_GET_EA_AY_16; - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t ea = M68KMAKE_GET_EA_AY_16; + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_16(res); @@ -9788,10 +9788,10 @@ M68KMAKE_OP(subq, 16, ., .) M68KMAKE_OP(subq, 32, ., d) { - UINT32* r_dst = &DY(mc68kcpu); - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 dst = *r_dst; - UINT32 res = dst - src; + uint32_t* r_dst = &DY(mc68kcpu); + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t dst = *r_dst; + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -9804,7 +9804,7 @@ M68KMAKE_OP(subq, 32, ., d) M68KMAKE_OP(subq, 32, ., a) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); *r_dst = MASK_OUT_ABOVE_32(*r_dst - (((((mc68kcpu)->ir >> 9) - 1) & 7) + 1)); } @@ -9812,10 +9812,10 @@ M68KMAKE_OP(subq, 32, ., a) M68KMAKE_OP(subq, 32, ., .) { - UINT32 src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; - UINT32 ea = M68KMAKE_GET_EA_AY_32; - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = dst - src; + uint32_t src = ((((mc68kcpu)->ir >> 9) - 1) & 7) + 1; + uint32_t ea = M68KMAKE_GET_EA_AY_32; + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = dst - src; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(res); @@ -9828,10 +9828,10 @@ M68KMAKE_OP(subq, 32, ., .) M68KMAKE_OP(subx, 8, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_8(*r_dst); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_8(*r_dst); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9846,10 +9846,10 @@ M68KMAKE_OP(subx, 8, rr, .) M68KMAKE_OP(subx, 16, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); - UINT32 dst = MASK_OUT_ABOVE_16(*r_dst); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t dst = MASK_OUT_ABOVE_16(*r_dst); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -9864,10 +9864,10 @@ M68KMAKE_OP(subx, 16, rr, .) M68KMAKE_OP(subx, 32, rr, .) { - UINT32* r_dst = &DX(mc68kcpu); - UINT32 src = DY(mc68kcpu); - UINT32 dst = *r_dst; - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t dst = *r_dst; + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(src, dst, res); @@ -9882,10 +9882,10 @@ M68KMAKE_OP(subx, 32, rr, .) M68KMAKE_OP(subx, 8, mm, ax7) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9900,10 +9900,10 @@ M68KMAKE_OP(subx, 8, mm, ax7) M68KMAKE_OP(subx, 8, mm, ay7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9918,10 +9918,10 @@ M68KMAKE_OP(subx, 8, mm, ay7) M68KMAKE_OP(subx, 8, mm, axy7) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea = EA_A7_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea = EA_A7_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9936,10 +9936,10 @@ M68KMAKE_OP(subx, 8, mm, axy7) M68KMAKE_OP(subx, 8, mm, .) { - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea = EA_AX_PD_8(mc68kcpu); - UINT32 dst = m68ki_read_8((mc68kcpu), ea); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea = EA_AX_PD_8(mc68kcpu); + uint32_t dst = m68ki_read_8((mc68kcpu), ea); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_8(res); @@ -9954,10 +9954,10 @@ M68KMAKE_OP(subx, 8, mm, .) M68KMAKE_OP(subx, 16, mm, .) { - UINT32 src = OPER_AY_PD_16(mc68kcpu); - UINT32 ea = EA_AX_PD_16(mc68kcpu); - UINT32 dst = m68ki_read_16((mc68kcpu), ea); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_16(mc68kcpu); + uint32_t ea = EA_AX_PD_16(mc68kcpu); + uint32_t dst = m68ki_read_16((mc68kcpu), ea); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_16(res); @@ -9972,10 +9972,10 @@ M68KMAKE_OP(subx, 16, mm, .) M68KMAKE_OP(subx, 32, mm, .) { - UINT32 src = OPER_AY_PD_32(mc68kcpu); - UINT32 ea = EA_AX_PD_32(mc68kcpu); - UINT32 dst = m68ki_read_32((mc68kcpu), ea); - UINT32 res = dst - src - XFLAG_AS_1(mc68kcpu); + uint32_t src = OPER_AY_PD_32(mc68kcpu); + uint32_t ea = EA_AX_PD_32(mc68kcpu); + uint32_t dst = m68ki_read_32((mc68kcpu), ea); + uint32_t res = dst - src - XFLAG_AS_1(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->x_flag = (mc68kcpu)->c_flag = CFLAG_SUB_32(src, dst, res); @@ -9990,7 +9990,7 @@ M68KMAKE_OP(subx, 32, mm, .) M68KMAKE_OP(swap, 32, ., .) { - UINT32* r_dst = &DY(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_32(*r_dst<<16); *r_dst = (*r_dst>>16) | (mc68kcpu)->not_z_flag; @@ -10004,7 +10004,7 @@ M68KMAKE_OP(swap, 32, ., .) M68KMAKE_OP(tas, 8, ., d) { - UINT32* r_dst = &DY(mc68kcpu); + uint32_t* r_dst = &DY(mc68kcpu); (mc68kcpu)->not_z_flag = MASK_OUT_ABOVE_8(*r_dst); (mc68kcpu)->n_flag = NFLAG_8(*r_dst); @@ -10016,8 +10016,8 @@ M68KMAKE_OP(tas, 8, ., d) M68KMAKE_OP(tas, 8, ., .) { - UINT32 ea = M68KMAKE_GET_EA_AY_8; - UINT32 dst = m68ki_read_8((mc68kcpu), ea); + uint32_t ea = M68KMAKE_GET_EA_AY_8; + uint32_t dst = m68ki_read_8((mc68kcpu), ea); (mc68kcpu)->not_z_flag = dst; (mc68kcpu)->n_flag = NFLAG_8(dst); @@ -10164,7 +10164,7 @@ M68KMAKE_OP(trapv, 0, ., .) M68KMAKE_OP(tst, 8, ., d) { - UINT32 res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); + uint32_t res = MASK_OUT_ABOVE_8(DY(mc68kcpu)); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -10175,7 +10175,7 @@ M68KMAKE_OP(tst, 8, ., d) M68KMAKE_OP(tst, 8, ., .) { - UINT32 res = M68KMAKE_GET_OPER_AY_8; + uint32_t res = M68KMAKE_GET_OPER_AY_8; (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -10188,7 +10188,7 @@ M68KMAKE_OP(tst, 8, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_PCDI_8(mc68kcpu); + uint32_t res = OPER_PCDI_8(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -10204,7 +10204,7 @@ M68KMAKE_OP(tst, 8, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_PCIX_8(mc68kcpu); + uint32_t res = OPER_PCIX_8(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -10220,7 +10220,7 @@ M68KMAKE_OP(tst, 8, ., i) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_I_8(mc68kcpu); + uint32_t res = OPER_I_8(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_8(res); (mc68kcpu)->not_z_flag = res; @@ -10234,7 +10234,7 @@ M68KMAKE_OP(tst, 8, ., i) M68KMAKE_OP(tst, 16, ., d) { - UINT32 res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); + uint32_t res = MASK_OUT_ABOVE_16(DY(mc68kcpu)); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -10247,7 +10247,7 @@ M68KMAKE_OP(tst, 16, ., a) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = MAKE_INT_16(AY(mc68kcpu)); + uint32_t res = MAKE_INT_16(AY(mc68kcpu)); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -10261,7 +10261,7 @@ M68KMAKE_OP(tst, 16, ., a) M68KMAKE_OP(tst, 16, ., .) { - UINT32 res = M68KMAKE_GET_OPER_AY_16; + uint32_t res = M68KMAKE_GET_OPER_AY_16; (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -10274,7 +10274,7 @@ M68KMAKE_OP(tst, 16, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_PCDI_16(mc68kcpu); + uint32_t res = OPER_PCDI_16(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -10290,7 +10290,7 @@ M68KMAKE_OP(tst, 16, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_PCIX_16(mc68kcpu); + uint32_t res = OPER_PCIX_16(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -10306,7 +10306,7 @@ M68KMAKE_OP(tst, 16, ., i) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_I_16(mc68kcpu); + uint32_t res = OPER_I_16(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_16(res); (mc68kcpu)->not_z_flag = res; @@ -10320,7 +10320,7 @@ M68KMAKE_OP(tst, 16, ., i) M68KMAKE_OP(tst, 32, ., d) { - UINT32 res = DY(mc68kcpu); + uint32_t res = DY(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -10333,7 +10333,7 @@ M68KMAKE_OP(tst, 32, ., a) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = AY(mc68kcpu); + uint32_t res = AY(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -10347,7 +10347,7 @@ M68KMAKE_OP(tst, 32, ., a) M68KMAKE_OP(tst, 32, ., .) { - UINT32 res = M68KMAKE_GET_OPER_AY_32; + uint32_t res = M68KMAKE_GET_OPER_AY_32; (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -10360,7 +10360,7 @@ M68KMAKE_OP(tst, 32, ., pcdi) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_PCDI_32(mc68kcpu); + uint32_t res = OPER_PCDI_32(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -10376,7 +10376,7 @@ M68KMAKE_OP(tst, 32, ., pcix) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_PCIX_32(mc68kcpu); + uint32_t res = OPER_PCIX_32(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -10392,7 +10392,7 @@ M68KMAKE_OP(tst, 32, ., i) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 res = OPER_I_32(mc68kcpu); + uint32_t res = OPER_I_32(mc68kcpu); (mc68kcpu)->n_flag = NFLAG_32(res); (mc68kcpu)->not_z_flag = res; @@ -10412,7 +10412,7 @@ M68KMAKE_OP(unlk, 32, ., a7) M68KMAKE_OP(unlk, 32, ., .) { - UINT32* r_dst = &AY(mc68kcpu); + uint32_t* r_dst = &AY(mc68kcpu); REG_A(mc68kcpu)[7] = *r_dst; *r_dst = m68ki_pull_32(mc68kcpu); @@ -10424,8 +10424,8 @@ M68KMAKE_OP(unpk, 16, rr, .) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: DX(mc68kcpu) and DY(mc68kcpu) are reversed in Motorola's docs */ - UINT32 src = DY(mc68kcpu); - UINT32* r_dst = &DX(mc68kcpu); + uint32_t src = DY(mc68kcpu); + uint32_t* r_dst = &DX(mc68kcpu); *r_dst = MASK_OUT_BELOW_16(*r_dst) | (((((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(mc68kcpu)) & 0xffff); return; @@ -10439,8 +10439,8 @@ M68KMAKE_OP(unpk, 16, mm, ax7) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: AX and AY are reversed in Motorola's docs */ - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea_dst; + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(mc68kcpu); ea_dst = EA_A7_PD_8(mc68kcpu); @@ -10458,8 +10458,8 @@ M68KMAKE_OP(unpk, 16, mm, ay7) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: AX and AY are reversed in Motorola's docs */ - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea_dst; + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(mc68kcpu); ea_dst = EA_AX_PD_8(mc68kcpu); @@ -10476,8 +10476,8 @@ M68KMAKE_OP(unpk, 16, mm, axy7) { if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { - UINT32 src = OPER_A7_PD_8(mc68kcpu); - UINT32 ea_dst; + uint32_t src = OPER_A7_PD_8(mc68kcpu); + uint32_t ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(mc68kcpu); ea_dst = EA_A7_PD_8(mc68kcpu); @@ -10495,8 +10495,8 @@ M68KMAKE_OP(unpk, 16, mm, .) if(CPU_TYPE_IS_EC020_PLUS((mc68kcpu)->cpu_type)) { /* Note: AX and AY are reversed in Motorola's docs */ - UINT32 src = OPER_AY_PD_8(mc68kcpu); - UINT32 ea_dst; + uint32_t src = OPER_AY_PD_8(mc68kcpu); + uint32_t ea_dst; src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16(mc68kcpu); ea_dst = EA_AX_PD_8(mc68kcpu); @@ -10513,9 +10513,9 @@ M68KMAKE_OP(cinv, 32, ., .) { if(CPU_TYPE_IS_040_PLUS((mc68kcpu)->cpu_type)) { - UINT16 ir = mc68kcpu->ir; - UINT8 cache = (ir >> 6) & 3; -// UINT8 scope = (ir >> 3) & 3; + uint16_t ir = mc68kcpu->ir; + uint8_t cache = (ir >> 6) & 3; +// uint8_t scope = (ir >> 3) & 3; // 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) { |