diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/devices/cpu/sh2/sh2dasm.cpp | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/devices/cpu/sh2/sh2dasm.cpp')
-rw-r--r-- | src/devices/cpu/sh2/sh2dasm.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/cpu/sh2/sh2dasm.cpp b/src/devices/cpu/sh2/sh2dasm.cpp index e37611b9d28..30cb8fdb98d 100644 --- a/src/devices/cpu/sh2/sh2dasm.cpp +++ b/src/devices/cpu/sh2/sh2dasm.cpp @@ -4,8 +4,8 @@ #include "debugger.h" #include "sh2.h" -#define SIGNX8(x) (((INT32)(x) << 24) >> 24) -#define SIGNX12(x) (((INT32)(x) << 20) >> 20) +#define SIGNX8(x) (((int32_t)(x) << 24) >> 24) +#define SIGNX12(x) (((int32_t)(x) << 20) >> 20) #define Rn ((opcode >> 8) & 15) #define Rm ((opcode >> 4) & 15) @@ -15,9 +15,9 @@ static const char *const regname[16] = { "R8", "R9", "R10","R11","R12","R13","R14","SP" }; -static UINT32 op0000(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0000(char *buffer, uint32_t pc, uint16_t opcode) { - UINT32 flags = 0; + uint32_t flags = 0; switch(opcode & 0x3f) { case 0x02: @@ -129,13 +129,13 @@ static UINT32 op0000(char *buffer, UINT32 pc, UINT16 opcode) return flags; } -static UINT32 op0001(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0001(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "MOV.L %s,@($%02X,%s)", regname[Rm], (opcode & 15) * 4, regname[Rn]); return 0; } -static UINT32 op0010(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0010(char *buffer, uint32_t pc, uint16_t opcode) { switch (opcode & 15) { @@ -191,7 +191,7 @@ static UINT32 op0010(char *buffer, UINT32 pc, UINT16 opcode) return 0; } -static UINT32 op0011(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0011(char *buffer, uint32_t pc, uint16_t opcode) { switch (opcode & 15) { @@ -247,9 +247,9 @@ static UINT32 op0011(char *buffer, UINT32 pc, UINT16 opcode) return 0; } -static UINT32 op0100(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0100(char *buffer, uint32_t pc, uint16_t opcode) { - UINT32 flags = 0; + uint32_t flags = 0; switch(opcode & 0x3F) { case 0x00: @@ -376,13 +376,13 @@ static UINT32 op0100(char *buffer, UINT32 pc, UINT16 opcode) return flags; } -static UINT32 op0101(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0101(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "MOV.L @($%02X,%s),%s", (opcode & 15) * 4, regname[Rm], regname[Rn]); return 0; } -static UINT32 op0110(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0110(char *buffer, uint32_t pc, uint16_t opcode) { switch(opcode & 0xF) @@ -439,13 +439,13 @@ static UINT32 op0110(char *buffer, UINT32 pc, UINT16 opcode) return 0; } -static UINT32 op0111(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op0111(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "ADD #$%02X,%s", opcode & 0xff, regname[Rn]); return 0; } -static UINT32 op1000(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1000(char *buffer, uint32_t pc, uint16_t opcode) { switch((opcode >> 8) & 15) { @@ -482,27 +482,27 @@ static UINT32 op1000(char *buffer, UINT32 pc, UINT16 opcode) return 0; } -static UINT32 op1001(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1001(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "MOV.W @($%04X,PC),%s [%08X]", (opcode & 0xff) * 2, regname[Rn], pc+((opcode & 0xff) * 2)+2); return 0; } -static UINT32 op1010(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1010(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "BRA $%08X", SIGNX12(opcode & 0xfff) * 2 + pc + 2); return 0; } -static UINT32 op1011(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1011(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "BSR $%08X", SIGNX12(opcode & 0xfff) * 2 + pc + 2); return DASMFLAG_STEP_OVER | DASMFLAG_STEP_OVER_EXTRA(1); } -static UINT32 op1100(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1100(char *buffer, uint32_t pc, uint16_t opcode) { - UINT32 flags = 0; + uint32_t flags = 0; switch((opcode >> 8) & 15) { case 0: @@ -558,27 +558,27 @@ static UINT32 op1100(char *buffer, UINT32 pc, UINT16 opcode) return flags; } -static UINT32 op1101(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1101(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "MOV.L @($%02X,PC),%s [%08X]", (opcode * 4) & 0xff, regname[Rn], ((pc + 2) & ~3) + (opcode & 0xff) * 4); return 0; } -static UINT32 op1110(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1110(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "MOV #$%02X,%s", (opcode & 0xff), regname[Rn]); return 0; } -static UINT32 op1111(char *buffer, UINT32 pc, UINT16 opcode) +static uint32_t op1111(char *buffer, uint32_t pc, uint16_t opcode) { sprintf(buffer, "unknown $%04X", opcode); return 0; } -unsigned DasmSH2(char *buffer, unsigned pc, UINT16 opcode) +unsigned DasmSH2(char *buffer, unsigned pc, uint16_t opcode) { - UINT32 flags; + uint32_t flags; pc += 2; |