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

Merge remote-tracking branch 'upstream/master' into feature/mtrr

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-13 04:54:17 -04:00
parent f75a41a88e 231e995434
commit 60d21964be
151 changed files with 3403 additions and 2250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mem/mem.c
View File

@@ -549,12 +549,6 @@ mmutranslate_noabrt(uint32_t addr, int rw)
return mmutranslate_noabrt_normal(addr, rw);
}
void
mmu_invalidate(uint32_t addr)
{
flushmmucache_cr3();
}
uint8_t
mem_addr_range_match(uint32_t addr, uint32_t start, uint32_t len)
{
@@ -2351,7 +2345,7 @@ mem_invalidate_range(uint32_t start_addr, uint32_t end_addr)
if (p) {
p->dirty_mask = 0xffffffffffffffffULL;
if (p->byte_dirty_mask)
if ((p->mem != page_ff) && p->byte_dirty_mask)
memset(p->byte_dirty_mask, 0xff, 64 * sizeof(uint64_t));
if (!page_in_evict_list(p))
@@ -2457,7 +2451,7 @@ mem_mapping_recalc(uint64_t base, uint64_t size)
map = map->next;
}
flushmmucache_cr3();
flushmmucache_nopc();
#ifdef ENABLE_MEM_LOG
pclog("\nMemory map:\n");