From: Toni Wilen Date: Wed, 17 Jun 2026 13:22:31 +0000 (+0300) Subject: "Internal CCK counter changed to 64-bit" didn't update counter variable to 64-bit. X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=939e37959ecd17d07689054ac31d93d35c0b8b7e;p=francis%2Fwinuae.git "Internal CCK counter changed to 64-bit" didn't update counter variable to 64-bit. --- diff --git a/debug.cpp b/debug.cpp index f4b0a2d1..d6e78f51 100644 --- a/debug.cpp +++ b/debug.cpp @@ -1907,7 +1907,7 @@ static void debug_draw_cycles(uae_u8 *buf, uae_u8 *genlock, int line, int width, dx = width - xplus * ((maxhpos + 1) & ~1) - 16; bool ended = false; - uae_u32 tick = dr->tick; + evt_t tick = dr->tick; uae_s8 intlev = 0; for (x = 0; x < NR_DMA_REC_COLS_MAX; x++) { uae_u32 c = debug_colors[0].l[0]; @@ -3066,7 +3066,7 @@ static struct dma_rec *find_dma_record(int hpos, int vpos, int toggle) if ((dr->hpos == 2 || dr->hpos == hpos && hpos >= 2) && dr->vpos[dma_record_vpos_type] == vpos) { for (;;) { dr = &dma_record_data[idx]; - int tick = dr->tick; + evt_t tick = dr->tick; if (dr->vpos[dma_record_vpos_type] == vpos && dr->frame == frame) { if (dr->hpos == hpos) { break; diff --git a/events.cpp b/events.cpp index 304d23cb..c0154ffa 100644 --- a/events.cpp +++ b/events.cpp @@ -26,7 +26,7 @@ extern int linear_hpos; void custom_trigger_start_fast(void); evt_t event_cycles, nextevent, currcycle; -uae_u32 currcycle_cck; +evt_t currcycle_cck; int is_syncline; static int syncline_cnt; frame_time_t is_syncline_end; diff --git a/include/debug.h b/include/debug.h index ff3d4564..29a07195 100644 --- a/include/debug.h +++ b/include/debug.h @@ -229,7 +229,7 @@ struct dma_rec { int hpos, vpos[2]; int frame; - uae_u32 tick; + evt_t tick; int dhpos[2]; uae_u16 reg; uae_u64 dat; diff --git a/include/events.h b/include/events.h index 8996e5f2..5edf0138 100644 --- a/include/events.h +++ b/include/events.h @@ -43,7 +43,7 @@ extern void clear_events(void); extern bool is_cycle_ce(uaecptr); extern evt_t currcycle, nextevent; -extern uae_u32 currcycle_cck; +extern evt_t currcycle_cck; extern int is_syncline; extern evt_t is_syncline_end; typedef void (*evfunc)(void);