claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some sanity checks to mem_invalidate_range(), fixes OS/2 2.0 segmentation faulting the emulator on IBM PS/2 Model 80 on the Dev builds.

Browse Source
This commit is contained in:
OBattler
2021-04-01 03:06:26 +02:00
parent 62bb4a99bb
commit 880f2f0304
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mem/mem.c
View File

@@ -2156,12 +2156,20 @@ mem_invalidate_range(uint32_t start_addr, uint32_t end_addr)
page_add_to_evict_list(p);
for (i = start_addr; (i <= end_addr) && (i < (start_addr + (1 << PAGE_MASK_SHIFT))); i++) {
byte_offset = (i >> PAGE_BYTE_MASK_SHIFT) & PAGE_BYTE_MASK_OFFSET_MASK;
byte_mask = (uint64_t)1 << (i & PAGE_BYTE_MASK_MASK);
/* Do not look at the byte stuff if start_addr >= (mem_size * 1024), as we do not allocate the
byte dirty and code present mask arrays beyond the end of RAM. */
if (i < (mem_size << 10)) {
byte_offset = (i >> PAGE_BYTE_MASK_SHIFT) & PAGE_BYTE_MASK_OFFSET_MASK;
byte_mask = (uint64_t)1 << (i & PAGE_BYTE_MASK_MASK);
p->byte_dirty_mask[byte_offset] |= byte_mask;
if ((p->byte_code_present_mask[byte_offset] & byte_mask) && !page_in_evict_list(p))
page_add_to_evict_list(p);
if (p) {
if (p->byte_dirty_mask)
p->byte_dirty_mask[byte_offset] |= byte_mask;
if (p->byte_code_present_mask && (p->byte_code_present_mask[byte_offset] & byte_mask) &&
!page_in_evict_list(p))
page_add_to_evict_list(p);
}
}
}
}
#else