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

Add more missing memory checking

Browse Source
This commit is contained in:
Cacodemon345
2024-01-15 01:19:21 +06:00
parent 911deeab1a
commit 2eb39a8c5c
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mem/mem.c
View File

@@ -901,6 +901,7 @@ readmembl_no_mmut(uint32_t addr, uint32_t a64)
mem_mapping_t *map; mem_mapping_t *map;
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
mem_debug_check_addr(addr, 0);
mem_logical_addr = addr; mem_logical_addr = addr;
@@ -928,6 +929,7 @@ writemembl_no_mmut(uint32_t addr, uint32_t a64, uint8_t val)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 1);
if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_b) { if (page_lookup[addr >> 12] && page_lookup[addr >> 12]->write_b) {
page_lookup[addr >> 12]->write_b(addr, val, page_lookup[addr >> 12]); page_lookup[addr >> 12]->write_b(addr, val, page_lookup[addr >> 12]);
@@ -1092,6 +1094,8 @@ readmemwl_no_mmut(uint32_t addr, uint32_t *a64)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 2); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 2);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 0);
mem_debug_check_addr(addr + 1, 0);
if (addr & 1) { if (addr & 1) {
if (!cpu_cyrix_alignment || (addr & 7) == 7) if (!cpu_cyrix_alignment || (addr & 7) == 7)
@@ -1138,6 +1142,8 @@ writememwl_no_mmut(uint32_t addr, uint32_t *a64, uint16_t val)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 2); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 2);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 1);
mem_debug_check_addr(addr + 1, 1);
if (addr & 1) { if (addr & 1) {
if (!cpu_cyrix_alignment || (addr & 7) == 7) if (!cpu_cyrix_alignment || (addr & 7) == 7)
@@ -1366,6 +1372,10 @@ readmemll_no_mmut(uint32_t addr, uint32_t *a64)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 4); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 4);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 0);
mem_debug_check_addr(addr + 1, 0);
mem_debug_check_addr(addr + 2, 0);
mem_debug_check_addr(addr + 3, 0);
if (addr & 3) { if (addr & 3) {
if (!cpu_cyrix_alignment || (addr & 7) > 4) if (!cpu_cyrix_alignment || (addr & 7) > 4)
@@ -1414,6 +1424,10 @@ writememll_no_mmut(uint32_t addr, uint32_t *a64, uint32_t val)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 4); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 4);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 1);
mem_debug_check_addr(addr + 1, 1);
mem_debug_check_addr(addr + 2, 1);
mem_debug_check_addr(addr + 3, 1);
if (addr & 3) { if (addr & 3) {
if (!cpu_cyrix_alignment || (addr & 7) > 4) if (!cpu_cyrix_alignment || (addr & 7) > 4)

15
src/mem/mmu_2386.c
View File

@@ -300,6 +300,7 @@ readmembl_no_mmut_2386(uint32_t addr, uint32_t a64)
mem_mapping_t *map; mem_mapping_t *map;
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 1);
mem_debug_check_addr(addr, 0);
mem_logical_addr = addr; mem_logical_addr = addr;
@@ -325,6 +326,7 @@ writemembl_no_mmut_2386(uint32_t addr, uint32_t a64, uint8_t val)
mem_mapping_t *map; mem_mapping_t *map;
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 1);
mem_debug_check_addr(addr, 1);
mem_logical_addr = addr; mem_logical_addr = addr;
@@ -473,6 +475,8 @@ readmemwl_no_mmut_2386(uint32_t addr, uint32_t *a64)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 2); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 2);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 0);
mem_debug_check_addr(addr + 1, 0);
if (addr & 1) { if (addr & 1) {
if (!cpu_cyrix_alignment || (addr & 7) == 7) if (!cpu_cyrix_alignment || (addr & 7) == 7)
@@ -514,6 +518,8 @@ writememwl_no_mmut_2386(uint32_t addr, uint32_t *a64, uint16_t val)
mem_mapping_t *map; mem_mapping_t *map;
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 2); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 2);
mem_debug_check_addr(addr, 1);
mem_debug_check_addr(addr + 1, 1);
mem_logical_addr = addr; mem_logical_addr = addr;
@@ -719,6 +725,11 @@ readmemll_no_mmut_2386(uint32_t addr, uint32_t *a64)
mem_mapping_t *map; mem_mapping_t *map;
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 4); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_READ, 4);
mem_debug_check_addr(addr, 0);
mem_debug_check_addr(addr + 1, 0);
mem_debug_check_addr(addr + 2, 0);
mem_debug_check_addr(addr + 3, 0);
mem_logical_addr = addr; mem_logical_addr = addr;
@@ -766,6 +777,10 @@ writememll_no_mmut_2386(uint32_t addr, uint32_t *a64, uint32_t val)
GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 4); GDBSTUB_MEM_ACCESS(addr, GDBSTUB_MEM_WRITE, 4);
mem_logical_addr = addr; mem_logical_addr = addr;
mem_debug_check_addr(addr, 1);
mem_debug_check_addr(addr + 1, 1);
mem_debug_check_addr(addr + 2, 2);
mem_debug_check_addr(addr + 3, 3);
if (addr & 3) { if (addr & 3) {
if (!cpu_cyrix_alignment || (addr & 7) > 4) if (!cpu_cyrix_alignment || (addr & 7) > 4)