80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Do the wraparounds properly on 64-bit binaries, fixes #3421.

Browse Source
This commit is contained in:
OBattler
2023-06-25 22:20:11 +02:00
parent ca607fe76a
commit 2fe3bcd5d2
2 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/cpu/386_common.h
View File

@@ -20,6 +20,7 @@
#define _386_COMMON_H_ #define _386_COMMON_H_
#include <stddef.h> #include <stddef.h>
#include <inttypes.h>
#define readmemb_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF) ? readmembl_no_mmut((s) + (a), b) : *(uint8_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a)))) #define readmemb_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF) ? readmembl_no_mmut((s) + (a), b) : *(uint8_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uintptr_t) ((s) + (a))))
#define readmemw_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1)) ? readmemwl_no_mmut((s) + (a), b) : *(uint16_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a)))) #define readmemw_n(s, a, b) ((readlookup2[(uint32_t) ((s) + (a)) >> 12] == (uintptr_t) LOOKUP_INV || (s) == 0xFFFFFFFF || (((s) + (a)) & 1)) ? readmemwl_no_mmut((s) + (a), b) : *(uint16_t *) (readlookup2[(uint32_t) ((s) + (a)) >> 12] + (uint32_t) ((s) + (a))))
@@ -196,13 +197,21 @@ fastreadb(uint32_t a)
uint8_t *t; uint8_t *t;
if ((a >> 12) == pccache) if ((a >> 12) == pccache)
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint8_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint8_t *) &pccache2[a]); return *((uint8_t *) &pccache2[a]);
#endif
t = getpccache(a); t = getpccache(a);
if (cpu_state.abrt) if (cpu_state.abrt)
return 0; return 0;
pccache = a >> 12; pccache = a >> 12;
pccache2 = t; pccache2 = t;
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint8_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint8_t *) &pccache2[a]); return *((uint8_t *) &pccache2[a]);
#endif
} }
static __inline uint16_t static __inline uint16_t
@@ -216,14 +225,22 @@ fastreadw(uint32_t a)
return val; return val;
} }
if ((a >> 12) == pccache) if ((a >> 12) == pccache)
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint16_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint16_t *) &pccache2[a]); return *((uint16_t *) &pccache2[a]);
#endif
t = getpccache(a); t = getpccache(a);
if (cpu_state.abrt) if (cpu_state.abrt)
return 0; return 0;
pccache = a >> 12; pccache = a >> 12;
pccache2 = t; pccache2 = t;
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint16_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint16_t *) &pccache2[a]); return *((uint16_t *) &pccache2[a]);
#endif
} }
static __inline uint32_t static __inline uint32_t
@@ -239,7 +256,11 @@ fastreadl(uint32_t a)
pccache2 = t; pccache2 = t;
pccache = a >> 12; pccache = a >> 12;
} }
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint32_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint32_t *) &pccache2[a]); return *((uint32_t *) &pccache2[a]);
#endif
} }
val = fastreadw(a); val = fastreadw(a);
val |= (fastreadw(a + 2) << 16); val |= (fastreadw(a + 2) << 16);
@@ -250,10 +271,18 @@ static __inline void *
get_ram_ptr(uint32_t a) get_ram_ptr(uint32_t a)
{ {
if ((a >> 12) == pccache) if ((a >> 12) == pccache)
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return (void *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL));
#else
return &pccache2[a]; return &pccache2[a];
#endif
else { else {
uint8_t *t = getpccache(a); uint8_t *t = getpccache(a);
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return (void *) (((uintptr_t) &t[a] & 0x00000000ffffffffULL) | ((uintptr_t) &t[0] & 0xffffffff00000000ULL));
#else
return &t[a]; return &t[a];
#endif
} }
} }
@@ -271,14 +300,22 @@ fastreadw_fetch(uint32_t a)
return val; return val;
} }
if ((a >> 12) == pccache) if ((a >> 12) == pccache)
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint16_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint16_t *) &pccache2[a]); return *((uint16_t *) &pccache2[a]);
#endif
t = getpccache(a); t = getpccache(a);
if (cpu_state.abrt) if (cpu_state.abrt)
return 0; return 0;
pccache = a >> 12; pccache = a >> 12;
pccache2 = t; pccache2 = t;
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint16_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint16_t *) &pccache2[a]); return *((uint16_t *) &pccache2[a]);
#endif
} }
static __inline uint32_t static __inline uint32_t
@@ -294,7 +331,11 @@ fastreadl_fetch(uint32_t a)
pccache2 = t; pccache2 = t;
pccache = a >> 12; pccache = a >> 12;
} }
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
return *((uint32_t *) (((uintptr_t) &pccache2[a] & 0x00000000ffffffffULL) | ((uintptr_t) &pccache2[0] & 0xffffffff00000000ULL)));
#else
return *((uint32_t *) &pccache2[a]); return *((uint32_t *) &pccache2[a]);
#endif
} }
val = fastreadw_fetch(a); val = fastreadw_fetch(a);
if (opcode_length[val & 0xff] > 2) if (opcode_length[val & 0xff] > 2)

8
src/mem/mem.c
View File

@@ -657,6 +657,9 @@ uint8_t *
getpccache(uint32_t a) getpccache(uint32_t a)
{ {
uint64_t a64 = (uint64_t) a; uint64_t a64 = (uint64_t) a;
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
uint8_t *p;
#endif
uint32_t a2; uint32_t a2;
a2 = a; a2 = a;
@@ -677,7 +680,12 @@ getpccache(uint32_t a)
cpu_prefetch_cycles = cpu_mem_prefetch_cycles; cpu_prefetch_cycles = cpu_mem_prefetch_cycles;
} }
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
p = &_mem_exec[a64 >> MEM_GRANULARITY_BITS][(uintptr_t) (a64 & MEM_GRANULARITY_PAGE) - (uintptr_t) (a2 & ~0xfff)];
return (uint8_t *) (((uintptr_t) p & 0x00000000ffffffffULL) | ((uintptr_t) &_mem_exec[a64 >> MEM_GRANULARITY_BITS][0] & 0xffffffff00000000ULL));
#else
return &_mem_exec[a64 >> MEM_GRANULARITY_BITS][(uintptr_t) (a64 & MEM_GRANULARITY_PAGE) - (uintptr_t) (a2 & ~0xfff)]; return &_mem_exec[a64 >> MEM_GRANULARITY_BITS][(uintptr_t) (a64 & MEM_GRANULARITY_PAGE) - (uintptr_t) (a2 & ~0xfff)];
#endif
} }
mem_log("Bad getpccache %08X%08X\n", (uint32_t) (a64 >> 32), (uint32_t) (a64 & 0xffffffffULL)); mem_log("Bad getpccache %08X%08X\n", (uint32_t) (a64 >> 32), (uint32_t) (a64 & 0xffffffffULL));