From e17b9c72b54a63a27b4b7ee660a01c1446efff3c Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Fri, 1 Oct 2021 22:47:33 +0300 Subject: [PATCH] uae_s32/uae_u32 type change update #2 --- custom.cpp | 8 ++++---- newcpu.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/custom.cpp b/custom.cpp index dd477eac..344ac025 100644 --- a/custom.cpp +++ b/custom.cpp @@ -118,7 +118,7 @@ extern float vsync_vblank, vsync_hblank; /* Events */ uae_u32 vsync_cycles; -static int extra_cycle; +static uae_u32 extra_cycle; static int rpt_did_reset; struct ev eventtab[ev_max]; @@ -13026,7 +13026,7 @@ uae_u8 *restore_cycles (uae_u8 *src) restore_u32 (); start_cycles = restore_u64 (); extra_cycle = restore_u32 (); - if (extra_cycle < 0 || extra_cycle >= 2 * CYCLE_UNIT) + if (extra_cycle >= 2 * CYCLE_UNIT) extra_cycle = 0; write_log (_T("RESTORECYCLES %08lX\n"), start_cycles); return src; @@ -13428,7 +13428,7 @@ void do_cycles_ce(uae_u32 cycles) void do_cycles_ce020(uae_u32 cycles) { uae_u32 c; - int extra; + uae_u32 extra; if (!cycles) { return; @@ -13459,7 +13459,7 @@ void do_cycles_ce020(uae_u32 cycles) do_cycles(1 * CYCLE_UNIT); c -= CYCLE_UNIT; } - if (c > 0) { + if (c) { do_cycles(c); } } diff --git a/newcpu.cpp b/newcpu.cpp index 1a378d51..e8f76cf4 100644 --- a/newcpu.cpp +++ b/newcpu.cpp @@ -397,7 +397,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=%08lx\n"), + write_log (_T("CPU trace: dma_cycle() enabled. %08x %08x NOW=%08x\n"), cputrace.cyclecounter_pre, cputrace.cyclecounter_post, get_cycles ()); cpu_tracer = -2; // dma_cycle() allowed to work now } @@ -434,7 +434,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 (%08lx)\n"), + write_log (_T("CPU trace: GET %d: PC=%08x %08x=%08x %d %d %08x/%08x/%08x %d/%d (%08x)\n"), i, cputrace.pc, addr, ctm->data, accessmode, size, cputrace.cyclecounter, cputrace.cyclecounter_pre, cputrace.cyclecounter_post, cputrace.readcounter, cputrace.writecounter, get_cycles ()); -- 2.47.3