From: Toni Wilen Date: Sat, 18 Apr 2015 11:27:41 +0000 (+0300) Subject: Cleanups. X-Git-Tag: 3100~47 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3f28ae4ac1c726d716d494a887bc4e09a7f5924c;p=francis%2Fwinuae.git Cleanups. --- diff --git a/cpummu.cpp b/cpummu.cpp index a0a998d7..c70b8b10 100644 --- a/cpummu.cpp +++ b/cpummu.cpp @@ -63,13 +63,13 @@ uae_u32 mmu040_move16[4]; static void mmu_dump_ttr(const TCHAR * label, uae_u32 ttr) { DUNUSED(label); +#if MMUDEBUG > 0 uae_u32 from_addr, to_addr; from_addr = ttr & MMU_TTR_LOGICAL_BASE; to_addr = (ttr & MMU_TTR_LOGICAL_MASK) << 8; -#if MMUDEBUG > 0 - write_log(_T("%s: [%08lx] %08lx - %08lx enabled=%d supervisor=%d wp=%d cm=%02d\n"), + write_log(_T("%s: [%08x] %08x - %08x enabled=%d supervisor=%d wp=%d cm=%02d\n"), label, ttr, from_addr, to_addr, ttr & MMU_TTR_BIT_ENABLED ? 1 : 0, @@ -187,7 +187,7 @@ static void mmu_dump_table(const char * label, uaecptr root_ptr) uaecptr ptr_des_addr, page_addr, root_log, ptr_log, page_log; - console_out_f(_T("%s: root=%lx\n"), label, root_ptr); + console_out_f(_T("%s: root=%x\n"), label, root_ptr); for (root_idx = 0; root_idx < ROOT_TABLE_SIZE; root_idx++) { root_des = phys_get_long(root_ptr + root_idx); @@ -261,7 +261,7 @@ static void mmu_dump_table(const char * label, uaecptr root_ptr) page_des = page_info[page_idx].match; if ((page_des & MMU_PDT_MASK) == 2) { - console_out_f(_T(" PAGE: %03d-%03d log=%08lx INDIRECT --> addr=%08lx\n"), + console_out_f(_T(" PAGE: %03d-%03d log=%08x INDIRECT --> addr=%08x\n"), page_info[page_idx].start_idx, page_info[page_idx].start_idx + page_info[page_idx].n_pages - 1, page_info[page_idx].log, @@ -269,7 +269,7 @@ static void mmu_dump_table(const char * label, uaecptr root_ptr) ); } else { - console_out_f(_T(" PAGE: %03d-%03d log=%08lx addr=%08lx UR=%02d G=%d U1/0=%d S=%d CM=%d M=%d U=%d W=%d\n"), + console_out_f(_T(" PAGE: %03d-%03d log=%08x addr=%08x UR=%02d G=%d U1/0=%d S=%d CM=%d M=%d U=%d W=%d\n"), page_info[page_idx].start_idx, page_info[page_idx].start_idx + page_info[page_idx].n_pages - 1, page_info[page_idx].log, @@ -529,7 +529,7 @@ static ALWAYS_INLINE bool mmu_fill_atc_try(uaecptr addr, bool super, bool data, if (l1->write_protect) { *status |= MMU_FSLW_WP; #if MMUDEBUG > 0 - write_log(_T("MMU: write protected %lx by atc \n"), addr); + write_log(_T("MMU: write protected %x by atc \n"), addr); #endif mmu_dump_atc(); goto fail; @@ -626,12 +626,12 @@ static uaecptr REGPARAM2 mmu_lookup_pagetable(uaecptr addr, bool super, bool wri } if ((desc & 1) == 0) { #if MMUDEBUG > 2 - write_log(_T("MMU: invalid page descriptor log=%0lx desc=%08x @%08x\n"), addr, desc, desc_addr); + write_log(_T("MMU: invalid page descriptor log=%0x desc=%08x @%08x\n"), addr, desc, desc_addr); #endif if ((desc & 3) == 2) { *status |= MMU_FSLW_IL; #if MMUDEBUG > 1 - write_log(_T("MMU: double indirect descriptor log=%0lx desc=%08x @%08x\n"), addr, desc, desc_addr); + write_log(_T("MMU: double indirect descriptor log=%0x desc=%08x @%08x\n"), addr, desc, desc_addr); #endif } else { *status |= MMU_FSLW_PF; diff --git a/fpp.cpp b/fpp.cpp index 64c13ee1..cc6cfc75 100644 --- a/fpp.cpp +++ b/fpp.cpp @@ -1044,7 +1044,7 @@ static bool fp_is_neg(fpdata *fpd) return fpd->fp < 0.0; } -uae_u32 get_fpsr (void) +uae_u32 fpp_get_fpsr (void) { uae_u32 answer = regs.fpsr & 0x00ff00f8; @@ -1084,7 +1084,7 @@ uae_u32 get_fpsr (void) static void update_fpsr (uae_u32 v) { regs.fp_result_status = v; - get_fpsr (); + fpp_get_fpsr (); } STATIC_INLINE void set_fpsr (uae_u32 x) @@ -2826,7 +2826,7 @@ static void fpuop_arithmetic2 (uae_u32 opcode, uae_u16 extra) if (extra & 0x1000) m68k_dreg (regs, opcode & 7) = regs.fpcr & 0xffff; if (extra & 0x0800) - m68k_dreg (regs, opcode & 7) = get_fpsr (); + m68k_dreg (regs, opcode & 7) = fpp_get_fpsr (); if (extra & 0x0400) m68k_dreg (regs, opcode & 7) = regs.fpiar; } else { @@ -2846,7 +2846,7 @@ static void fpuop_arithmetic2 (uae_u32 opcode, uae_u16 extra) if (extra & 0x1000) m68k_areg (regs, opcode & 7) = regs.fpcr & 0xffff; if (extra & 0x0800) - m68k_areg (regs, opcode & 7) = get_fpsr (); + m68k_areg (regs, opcode & 7) = fpp_get_fpsr (); if (extra & 0x0400) m68k_areg (regs, opcode & 7) = regs.fpiar; } else { @@ -2913,7 +2913,7 @@ static void fpuop_arithmetic2 (uae_u32 opcode, uae_u16 extra) ad += 4; } if (extra & 0x0800) { - x_cp_put_long (ad, get_fpsr ()); + x_cp_put_long (ad, fpp_get_fpsr ()); ad += 4; } if (extra & 0x0400) { diff --git a/newcpu.cpp b/newcpu.cpp index ac9d5156..68ad0631 100644 --- a/newcpu.cpp +++ b/newcpu.cpp @@ -322,7 +322,7 @@ static bool check_trace (void) return true; if (!cputrace.readcounter && !cputrace.writecounter && !cputrace.cyclecounter) { if (cpu_tracer != -2) { - write_log (_T("CPU trace: dma_cycle() enabled. %08x %08x NOW=%08x\n"), + write_log (_T("CPU trace: dma_cycle() enabled. %08x %08x NOW=%08lx\n"), cputrace.cyclecounter_pre, cputrace.cyclecounter_post, get_cycles ()); cpu_tracer = -2; // dma_cycle() allowed to work now } @@ -346,7 +346,7 @@ static bool check_trace (void) x_do_cycles_pre = x2_do_cycles_pre; x_do_cycles_post = x2_do_cycles_post; set_x_cp_funcs(); - write_log (_T("CPU tracer playback complete. STARTCYCLES=%08x NOWCYCLES=%08x\n"), cputrace.startcycles, get_cycles ()); + write_log (_T("CPU tracer playback complete. STARTCYCLES=%08x NOWCYCLES=%08lx\n"), cputrace.startcycles, get_cycles ()); cputrace.needendcycles = 1; cpu_tracer = 0; return true; @@ -359,7 +359,7 @@ static bool get_trace (uaecptr addr, int accessmode, int size, uae_u32 *data) struct cputracememory *ctm = &cputrace.ctm[i]; if (ctm->addr == addr && ctm->mode == mode) { ctm->mode = 0; - write_log (_T("CPU trace: GET %d: PC=%08x %08x=%08x %d %d %08x/%08x/%08x %d/%d (%08x)\n"), + write_log (_T("CPU trace: GET %d: PC=%08x %08x=%08x %d %d %08x/%08x/%08x %d/%d (%08lx)\n"), i, cputrace.pc, addr, ctm->data, accessmode, size, cputrace.cyclecounter, cputrace.cyclecounter_pre, cputrace.cyclecounter_post, cputrace.readcounter, cputrace.writecounter, get_cycles ()); @@ -1567,14 +1567,12 @@ static uaecptr ShowEA (void *f, uaecptr pc, uae_u16 opcode, int reg, amodes mode _stprintf (buffer, _T("(%s%c%d.%c*%d+%d)+%d == $%08x"), name, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), - disp, outer, - (unsigned long)addr); + disp, outer, addr); } else { addr = m68k_areg (regs, reg) + (uae_s32)((uae_s8)disp8) + dispreg; _stprintf (buffer, _T("(A%d, %c%d.%c*%d, $%02x) == $%08x"), reg, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', - 1 << ((dp >> 9) & 3), disp8, - (unsigned long)addr); + 1 << ((dp >> 9) & 3), disp8, addr); } break; case PC16: @@ -1612,13 +1610,12 @@ static uaecptr ShowEA (void *f, uaecptr pc, uae_u16 opcode, int reg, amodes mode _stprintf (buffer, _T("(%s%c%d.%c*%d+%d)+%d == $%08x"), name, dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), - disp, outer, - (unsigned long)addr); + disp, outer, addr); } else { addr += (uae_s32)((uae_s8)disp8) + dispreg; _stprintf (buffer, _T("(PC, %c%d.%c*%d, $%02x) == $%08x"), dp & 0x8000 ? 'A' : 'D', (int)r, dp & 0x800 ? 'L' : 'W', 1 << ((dp >> 9) & 3), - disp8, (unsigned long)addr); + disp8, addr); } break; case absw: @@ -1628,21 +1625,21 @@ static uaecptr ShowEA (void *f, uaecptr pc, uae_u16 opcode, int reg, amodes mode break; case absl: addr = get_ilong_debug (pc); - _stprintf (buffer, _T("$%08x"), (unsigned long)addr); + _stprintf (buffer, _T("$%08x"), addr); pc += 4; break; case imm: switch (size){ case sz_byte: - _stprintf (buffer, _T("#$%02x"), (unsigned int)(get_iword_debug (pc) & 0xff)); + _stprintf (buffer, _T("#$%02x"), (get_iword_debug (pc) & 0xff)); pc += 2; break; case sz_word: - _stprintf (buffer, _T("#$%04x"), (unsigned int)(get_iword_debug (pc) & 0xffff)); + _stprintf (buffer, _T("#$%04x"), (get_iword_debug (pc) & 0xffff)); pc += 2; break; case sz_long: - _stprintf(buffer, _T("#$%08x"), (unsigned long)(get_ilong_debug(pc))); + _stprintf(buffer, _T("#$%08x"), (get_ilong_debug(pc))); pc += 4; break; case sz_single: @@ -1683,26 +1680,26 @@ static uaecptr ShowEA (void *f, uaecptr pc, uae_u16 opcode, int reg, amodes mode break; case imm0: offset = (uae_s32)(uae_s8)get_iword_debug (pc); - _stprintf (buffer, _T("#$%02x"), (unsigned int)(offset & 0xff)); + _stprintf (buffer, _T("#$%02x"), (uae_u32)(offset & 0xff)); addr = pc + 2 + offset; pc += 2; break; case imm1: offset = (uae_s32)(uae_s16)get_iword_debug (pc); buffer[0] = 0; - _stprintf (buffer, _T("#$%04x"), (unsigned int)(offset & 0xffff)); + _stprintf (buffer, _T("#$%04x"), (uae_u32)(offset & 0xffff)); addr = pc + offset; pc += 2; break; case imm2: offset = (uae_s32)get_ilong_debug (pc); - _stprintf (buffer, _T("#$%08x"), (unsigned long)offset); + _stprintf (buffer, _T("#$%08x"), (uae_u32)offset); addr = pc + offset; pc += 4; break; case immi: offset = (uae_s32)(uae_s8)(reg & 0xff); - _stprintf (buffer, _T("#$%08x"), (unsigned long)offset); + _stprintf (buffer, _T("#$%08x"), (uae_u32)offset); addr = pc + offset; break; default: @@ -5105,7 +5102,7 @@ void m68k_disasm_2 (TCHAR *buf, int bufsize, uaecptr pc, uaecptr *nextpc, int cn uae_u16 extra; struct mnemolookup *lookup; struct instr *dp; - int oldpc; + uaecptr oldpc; uaecptr m68kpc_illg = 0; bool illegal = false; @@ -5543,7 +5540,7 @@ void m68k_dumpstate (uaecptr pc, uaecptr *nextpc) if ((i & 3) == 3) console_out_f (_T("\n")); } - fpsr = get_fpsr (); + fpsr = fpp_get_fpsr (); console_out_f (_T("FPSR: %04X FPCR: %08x FPIAR: %08x N=%d Z=%d I=%d NAN=%d\n"), fpsr, regs.fpcr, regs.fpiar, (fpsr & 0x8000000) != 0, diff --git a/newcpu_common.cpp b/newcpu_common.cpp index 967aa80b..722a35d4 100644 --- a/newcpu_common.cpp +++ b/newcpu_common.cpp @@ -818,7 +818,7 @@ bool m68k_divl (uae_u32 opcode, uae_u32 src, uae_u16 extra) a |= (uae_s64)m68k_dreg (regs, extra & 7) << 32; } - if (a == 0x8000000000000000 && src == ~0) { + if (a == 0x8000000000000000 && src == ~0u) { SET_VFLG (1); SET_NFLG (1); SET_CFLG (0); diff --git a/od-win32/debug_win32.cpp b/od-win32/debug_win32.cpp index 07c41a31..38d6a69d 100644 --- a/od-win32/debug_win32.cpp +++ b/od-win32/debug_win32.cpp @@ -637,7 +637,7 @@ static void SetMemToPC(void) int i, id; dbgpage[currpage].dasmaddr = m68k_getpc (); - _stprintf(dbgpage[currpage].addrinput, _T("%08lX"), dbgpage[currpage].dasmaddr); + _stprintf(dbgpage[currpage].addrinput, _T("%08X"), dbgpage[currpage].dasmaddr); for (i = 0; i < MAXPAGECONTROLS; i++) { id = GetDlgCtrlID(dbgpage[currpage].ctrl[i]); if (id == IDC_DBG_MEMINPUT) @@ -1321,7 +1321,7 @@ static void ToggleFPSRFlag(HWND hwnd, int x, int y) { int size = GetTextSize(hwnd, NULL, 0); int index = y / size; - uae_u32 fpsr = get_fpsr(); + uae_u32 fpsr = fpp_get_fpsr(); fpsr ^= (0x8000000 >> index); set_fpsr(fpsr); @@ -1973,7 +1973,7 @@ static INT_PTR CALLBACK DebuggerProc (HWND hDlg, UINT message, WPARAM wParam, LP else if (text[pos] == '(' && _istdigit(text[pos + 2])) { //address register indirect int reg = _tstoi(text + pos + 2); uae_u32 loc = m68k_areg (regs, reg); - _stprintf(addrstr + 2, _T("%08lx"), loc); + _stprintf(addrstr + 2, _T("%08x"), loc); } } break; @@ -2125,14 +2125,14 @@ void update_debug_info(void) return; hwnd = GetDlgItem(hDbgWnd, IDC_DBG_DREG); for (i = 0; i < 8; i++) { - _stprintf(out, _T("D%d: %08lX"), i, m68k_dreg (regs, i)); + _stprintf(out, _T("D%d: %08X"), i, m68k_dreg (regs, i)); UpdateListboxString(hwnd, i, out, TRUE); } hwnd = GetDlgItem(hDbgWnd, IDC_DBG_AREG); for (i = 0; i < 8; i++) { hwnd = GetDlgItem(hDbgWnd, IDC_DBG_AREG); - _stprintf(out, _T("A%d: %08lX"), i, m68k_areg (regs, i)); + _stprintf(out, _T("A%d: %08X"), i, m68k_areg (regs, i)); UpdateListboxString(hwnd, i, out, TRUE); hwnd = GetDlgItem(hDbgWnd, IDC_DBG_AMEM); dumpmem2(m68k_areg (regs, i), out, sizeof(out)); @@ -2147,9 +2147,9 @@ void update_debug_info(void) UpdateListboxString(hwnd, 4, GET_CFLG() ? _T("C: 1") : _T("C: 0"), TRUE); hwnd = GetDlgItem(hDbgWnd, IDC_DBG_SP_VBR); - _stprintf(out, _T("USP: %08lX"), regs.usp); + _stprintf(out, _T("USP: %08X"), regs.usp); UpdateListboxString(hwnd, 0, out, TRUE); - _stprintf(out, _T("ISP: %08lX"), regs.isp); + _stprintf(out, _T("ISP: %08X"), regs.isp); UpdateListboxString(hwnd, 1, out, TRUE); ShowMiscCPU(GetDlgItem(hDbgWnd, IDC_DBG_MISCCPU)); @@ -2167,7 +2167,7 @@ void update_debug_info(void) UpdateListboxString(hwnd, 4, out, TRUE); hwnd = GetDlgItem(hDbgWnd, IDC_DBG_PC); - _stprintf(out, _T("PC: %08lX"), m68k_getpc ()); + _stprintf(out, _T("PC: %08X"), m68k_getpc ()); UpdateListboxString(hwnd, 0, out, TRUE); hwnd = GetDlgItem(hDbgWnd, IDC_DBG_PREFETCH); @@ -2187,7 +2187,7 @@ void update_debug_info(void) } hwnd = GetDlgItem(hDbgWnd, IDC_DBG_FPSR); - fpsr = get_fpsr(); + fpsr = fpp_get_fpsr(); for (i = 0; i < 4; i++) { _stprintf(out, _T("%s%d"), fpsrflag[i], (fpsr & (0x8000000 >> i)) != 0 ? 1 : 0); UpdateListboxString(hwnd, i, out, TRUE);