uae_s32/uae_u32 type change update #2

diff --git a/custom.cpp b/custom.cpp
index dd477eac34d9406b141c20c7558a534fd1eb8485..344ac02501740467dc3e33600eb77e59c55bafa0 100644 (file)
--- 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 1a378d51717b96699b2a330398be1015c3afa42b..e8f76cf4a6370dcc2983c5ad0d8c84134011369d 100644 (file)
--- 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 ());