mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 21:43:16 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into feature/recompiler_improvements

Browse Source
This commit is contained in:
OBattler
2026-01-19 23:04:46 +01:00
parent 392dfdbaf4 f925685ba8
commit 7ffe6afbcb
104 changed files with 3337 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/386.c
View File

@@ -237,7 +237,7 @@ exec386_2386(int32_t cycs)
cycles += cycs;
while (cycles > 0) {
cycle_period = (timer_target - (uint32_t) tsc) + 1;
cycle_period = (timer_target - (uint64_t) tsc) + 1;
x86_was_reset = 0;
cycdiff = 0;
@@ -411,7 +411,7 @@ block_ended:
fatal("Life expired\n");
}
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint32_t) tsc))
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint64_t) tsc))
timer_process();
#ifdef USE_GDBSTUB

8
src/cpu/386_dynarec.c
View File

@@ -280,7 +280,7 @@ update_tsc(void)
tsc += cycdiff;
if (cycdiff > 0) {
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint32_t) tsc))
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint64_t) tsc))
timer_process();
}
}
@@ -879,7 +879,7 @@ exec386_dynarec(int32_t cycs)
}
if (cycdiff > 0) {
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint32_t) tsc))
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint64_t) tsc))
timer_process();
}
@@ -908,7 +908,7 @@ exec386(int32_t cycs)
cycles += cycs;
while (cycles > 0) {
cycle_period = (timer_target - (uint32_t) tsc) + 1;
cycle_period = (timer_target - (uint64_t) tsc) + 1;
x86_was_reset = 0;
cycdiff = 0;
@@ -1092,7 +1092,7 @@ block_ended:
fatal("Life expired\n");
}
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint32_t) tsc))
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint64_t) tsc))
timer_process();
#ifdef USE_GDBSTUB

2
src/cpu/808x.c
View File

@@ -272,7 +272,7 @@ clock_end(void)
/* On 808x systems, clock speed is usually crystal frequency divided by an integer. */
tsc += (uint64_t) diff * ((uint64_t) xt_cpu_multi >> 32ULL); /* Shift xt_cpu_multi by 32 bits to the right and then multiply. */
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint32_t) tsc))
if (TIMER_VAL_LESS_THAN_VAL(timer_target, (uint64_t) tsc))
timer_process();
}