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

A number of recompiler fixes and put some of the timer/cycle-related changes behind #ifdef's as they are no longer used but someone may want to still try them out.

Browse Source
This commit is contained in:
OBattler
2020-07-15 18:30:27 +02:00
parent db3364fb4b
commit 0b4b2b4d2f
14 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/mem/mem.c
View File

@@ -219,12 +219,12 @@ flushmmucache(void)
for (c = 0; c < 256; c++) {
if (readlookup[c] != (int) 0xffffffff) {
readlookup2[readlookup[c]] = -1;
readlookup2[readlookup[c]] = LOOKUP_INV;
readlookup[c] = 0xffffffff;
}
if (writelookup[c] != (int) 0xffffffff) {
page_lookup[writelookup[c]] = NULL;
writelookup2[writelookup[c]] = -1;
writelookup2[writelookup[c]] = LOOKUP_INV;
writelookup[c] = 0xffffffff;
}
}
@@ -246,12 +246,12 @@ flushmmucache_nopc(void)
for (c = 0; c < 256; c++) {
if (readlookup[c] != (int) 0xffffffff) {
readlookup2[readlookup[c]] = -1;
readlookup2[readlookup[c]] = LOOKUP_INV;
readlookup[c] = 0xffffffff;
}
if (writelookup[c] != (int) 0xffffffff) {
page_lookup[writelookup[c]] = NULL;
writelookup2[writelookup[c]] = -1;
writelookup2[writelookup[c]] = LOOKUP_INV;
writelookup[c] = 0xffffffff;
}
}
@@ -265,12 +265,12 @@ flushmmucache_cr3(void)
for (c = 0; c < 256; c++) {
if (readlookup[c] != (int) 0xffffffff) {
readlookup2[readlookup[c]] = -1;
readlookup2[readlookup[c]] = LOOKUP_INV;
readlookup[c] = 0xffffffff;
}
if (writelookup[c] != (int) 0xffffffff) {
page_lookup[writelookup[c]] = NULL;
writelookup2[writelookup[c]] = -1;
writelookup2[writelookup[c]] = LOOKUP_INV;
writelookup[c] = 0xffffffff;
}
}
@@ -295,7 +295,7 @@ mem_flush_write_page(uint32_t addr, uint32_t virt)
target = (uintptr_t)&ram[a];
if (writelookup2[writelookup[c]] == target || page_lookup[writelookup[c]] == page_target) {
writelookup2[writelookup[c]] = -1;
writelookup2[writelookup[c]] = LOOKUP_INV;
page_lookup[writelookup[c]] = NULL;
writelookup[c] = 0xffffffff;
}
@@ -583,10 +583,10 @@ addreadlookup(uint32_t virt, uint32_t phys)
if (virt == 0xffffffff) return;
if (readlookup2[virt>>12] != (uintptr_t) -1) return;
if (readlookup2[virt>>12] != (uintptr_t) LOOKUP_INV) return;
if (readlookup[readlnext] != (int) 0xffffffff)
readlookup2[readlookup[readlnext]] = -1;
readlookup2[readlookup[readlnext]] = LOOKUP_INV;
a = (uintptr_t)(phys & ~0xfff) - (uintptr_t)(virt & ~0xfff);
@@ -614,7 +614,7 @@ addwritelookup(uint32_t virt, uint32_t phys)
if (writelookup[writelnext] != -1) {
page_lookup[writelookup[writelnext]] = NULL;
writelookup2[writelookup[writelnext]] = -1;
writelookup2[writelookup[writelnext]] = LOOKUP_INV;
}
#ifdef USE_NEW_DYNAREC
@@ -756,7 +756,7 @@ readmemwl(uint32_t addr)
return 0xffff;
}
return readmembl(addr)|(readmembl(addr+1)<<8);
} else if (readlookup2[addr >> 12] != -1)
} else if (readlookup2[addr >> 12] != LOOKUP_INV)
return *(uint16_t *)(readlookup2[addr >> 12] + addr);
}
if (cr0>>31) {
@@ -802,7 +802,7 @@ writememwl(uint32_t addr, uint16_t val)
writemembl(addr,val);
writemembl(addr+1,val>>8);
return;
} else if (writelookup2[addr >> 12] != -1) {
} else if (writelookup2[addr >> 12] != LOOKUP_INV) {
*(uint16_t *)(writelookup2[addr >> 12] + addr) = val;
return;
}
@@ -853,7 +853,7 @@ readmemll(uint32_t addr)
return 0xffffffff;
}
return readmemwl(addr)|(readmemwl(addr+2)<<16);
} else if (readlookup2[addr >> 12] != -1)
} else if (readlookup2[addr >> 12] != LOOKUP_INV)
return *(uint32_t *)(readlookup2[addr >> 12] + addr);
}
@@ -905,7 +905,7 @@ writememll(uint32_t addr, uint32_t val)
writememwl(addr,val);
writememwl(addr+2,val>>16);
return;
} else if (writelookup2[addr >> 12] != -1) {
} else if (writelookup2[addr >> 12] != LOOKUP_INV) {
*(uint32_t *)(writelookup2[addr >> 12] + addr) = val;
return;
}
@@ -959,7 +959,7 @@ readmemql(uint32_t addr)
return 0xffffffffffffffffULL;
}
return readmemll(addr)|((uint64_t)readmemll(addr+4)<<32);
} else if (readlookup2[addr >> 12] != -1)
} else if (readlookup2[addr >> 12] != LOOKUP_INV)
return *(uint64_t *)(readlookup2[addr >> 12] + addr);
}
@@ -1001,7 +1001,7 @@ writememql(uint32_t addr, uint64_t val)
writememll(addr, val);
writememll(addr+4, val >> 32);
return;
} else if (writelookup2[addr >> 12] != -1) {
} else if (writelookup2[addr >> 12] != LOOKUP_INV) {
*(uint64_t *)(writelookup2[addr >> 12] + addr) = val;
return;
}
@@ -1078,7 +1078,7 @@ readmemwl(uint32_t seg, uint32_t addr)
if (is386) return readmemb386l(seg,addr)|(((uint16_t) readmemb386l(seg,addr+1))<<8);
else return readmembl(seg+addr)|(((uint16_t) readmembl(seg+addr+1))<<8);
}
else if (readlookup2[addr2 >> 12] != (uintptr_t) -1)
else if (readlookup2[addr2 >> 12] != (uintptr_t) LOOKUP_INV)
return *(uint16_t *)(readlookup2[addr2 >> 12] + addr2);
}
@@ -1134,7 +1134,7 @@ writememwl(uint32_t seg, uint32_t addr, uint16_t val)
writemembl(seg+addr+1,val>>8);
}
return;
} else if (writelookup2[addr2 >> 12] != (uintptr_t) -1) {
} else if (writelookup2[addr2 >> 12] != (uintptr_t) LOOKUP_INV) {
*(uint16_t *)(writelookup2[addr2 >> 12] + addr2) = val;
return;
}
@@ -1187,7 +1187,7 @@ readmemll(uint32_t seg, uint32_t addr)
if (mmutranslate_read(addr2+3) == 0xffffffffffffffffULL) return 0xffffffff;
}
return readmemwl(seg,addr)|(readmemwl(seg,addr+2)<<16);
} else if (readlookup2[addr2 >> 12] != (uintptr_t) -1)
} else if (readlookup2[addr2 >> 12] != (uintptr_t) LOOKUP_INV)
return *(uint32_t *)(readlookup2[addr2 >> 12] + addr2);
}
@@ -1239,7 +1239,7 @@ writememll(uint32_t seg, uint32_t addr, uint32_t val)
writememwl(seg,addr,val);
writememwl(seg,addr+2,val>>16);
return;
} else if (writelookup2[addr2 >> 12] != (uintptr_t) -1) {
} else if (writelookup2[addr2 >> 12] != (uintptr_t) LOOKUP_INV) {
*(uint32_t *)(writelookup2[addr2 >> 12] + addr2) = val;
return;
}
@@ -1297,7 +1297,7 @@ readmemql(uint32_t seg, uint32_t addr)
if (mmutranslate_read(addr2+7) == 0xffffffffffffffffULL) return 0xffffffffffffffffULL;
}
return readmemll(seg,addr)|((uint64_t)readmemll(seg,addr+4)<<32);
} else if (readlookup2[addr2 >> 12] != (uintptr_t) -1)
} else if (readlookup2[addr2 >> 12] != (uintptr_t) LOOKUP_INV)
return *(uint64_t *)(readlookup2[addr2 >> 12] + addr2);
}
@@ -1337,7 +1337,7 @@ writememql(uint32_t seg, uint32_t addr, uint64_t val)
writememll(seg, addr, val);
writememll(seg, addr+4, val >> 32);
return;
} else if (writelookup2[addr2 >> 12] != (uintptr_t) -1) {
} else if (writelookup2[addr2 >> 12] != (uintptr_t) LOOKUP_INV) {
*(uint64_t *)(writelookup2[addr2 >> 12] + addr2) = val;
return;
}