From ddb290d5f615019c33c42b8d94e5a5254cabcf33 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Oct 2016 13:13:17 +0200 Subject: 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 --- src/tools/unidasm.cpp | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'src/tools/unidasm.cpp') diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp index 96b6913b94c..ef1c2304726 100644 --- a/src/tools/unidasm.cpp +++ b/src/tools/unidasm.cpp @@ -42,7 +42,7 @@ struct dasm_table_entry { const char * name; display_type display; - INT8 pcshift; + int8_t pcshift; cpu_disassemble_func func; }; @@ -51,14 +51,14 @@ struct options { const char * filename; offs_t basepc; - UINT8 norawbytes; - UINT8 lower; - UINT8 upper; - UINT8 flipped; + uint8_t norawbytes; + uint8_t lower; + uint8_t upper; + uint8_t flipped; int mode; const dasm_table_entry *dasm; - UINT32 skip; - UINT32 count; + uint32_t skip; + uint32_t count; }; @@ -214,14 +214,14 @@ CPU_DISASSEMBLE( z8 ); CPU_DISASSEMBLE( z80 ); CPU_DISASSEMBLE( z8000 ); -CPU_DISASSEMBLE( sparcv7 ) { static sparc_disassembler dasm(nullptr, 7); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv8 ) { static sparc_disassembler dasm(nullptr, 8); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv9 ) { static sparc_disassembler dasm(nullptr, 9); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv9vis1 ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_1); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv9vis2 ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_2); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv9vis2p ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_2p); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv9vis3 ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_3); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } -CPU_DISASSEMBLE( sparcv9vis3b ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_3b); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv7 ) { static sparc_disassembler dasm(nullptr, 7); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv8 ) { static sparc_disassembler dasm(nullptr, 8); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv9 ) { static sparc_disassembler dasm(nullptr, 9); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv9vis1 ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_1); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv9vis2 ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_2); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv9vis2p ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_2p); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv9vis3 ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_3); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } +CPU_DISASSEMBLE( sparcv9vis3b ) { static sparc_disassembler dasm(nullptr, 9, sparc_disassembler::vis_3b); return dasm.dasm(buffer, pc, big_endianize_int32(*reinterpret_cast(oprom))); } static const dasm_table_entry dasm_table[] = @@ -412,23 +412,23 @@ static int parse_options(int argc, char *argv[], options *opts) if (pending_base || pending_arch || pending_mode || pending_skip || pending_count) goto usage; - if (tolower((UINT8)curarg[1]) == 'a') + if (tolower((uint8_t)curarg[1]) == 'a') pending_arch = TRUE; - else if (tolower((UINT8)curarg[1]) == 'b') + else if (tolower((uint8_t)curarg[1]) == 'b') pending_base = TRUE; - else if (tolower((UINT8)curarg[1]) == 'f') + else if (tolower((uint8_t)curarg[1]) == 'f') opts->flipped = TRUE; - else if (tolower((UINT8)curarg[1]) == 'l') + else if (tolower((uint8_t)curarg[1]) == 'l') opts->lower = TRUE; - else if (tolower((UINT8)curarg[1]) == 'm') + else if (tolower((uint8_t)curarg[1]) == 'm') pending_mode = TRUE; - else if (tolower((UINT8)curarg[1]) == 's') + else if (tolower((uint8_t)curarg[1]) == 's') pending_skip = TRUE; - else if (tolower((UINT8)curarg[1]) == 'c') + else if (tolower((uint8_t)curarg[1]) == 'c') pending_count = TRUE; - else if (tolower((UINT8)curarg[1]) == 'n') + else if (tolower((uint8_t)curarg[1]) == 'n') opts->norawbytes = TRUE; - else if (tolower((UINT8)curarg[1]) == 'u') + else if (tolower((uint8_t)curarg[1]) == 'u') opts->upper = TRUE; else goto usage; @@ -532,10 +532,10 @@ int main(int argc, char *argv[]) osd_file::error filerr; int displayendian; int displaychunk; - UINT32 curbyte; - UINT32 length; + uint32_t curbyte; + uint32_t length; int maxchunks; - UINT32 curpc; + uint32_t curpc; options opts; int numbytes; void *data; @@ -574,9 +574,9 @@ int main(int argc, char *argv[]) curpc = opts.basepc; for (curbyte = 0; curbyte < length; curbyte += numbytes) { - UINT8 *oprom = (UINT8 *)data + opts.skip + curbyte; + uint8_t *oprom = (uint8_t *)data + opts.skip + curbyte; char buffer[1024]; - UINT32 pcdelta; + uint32_t pcdelta; int numchunks; // disassemble @@ -591,12 +591,12 @@ int main(int argc, char *argv[]) if (opts.lower) { for (p = buffer; *p != 0; p++) - *p = tolower((UINT8)*p); + *p = tolower((uint8_t)*p); } else if (opts.upper) { for (p = buffer; *p != 0; p++) - *p = toupper((UINT8)*p); + *p = toupper((uint8_t)*p); } // round to the nearest display chunk -- cgit v1.2.3-70-g09d2