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

Added support for the D86F floppy image format I invented that allows things not possible with IMG images;

Browse Source 
Applied all mainline PCem commits;
Settings dialog now says 86Box instead of PCem;
Manifest renamed from PCem to 86Box.
This commit is contained in:
OBattler
2016-08-31 22:49:56 +02:00
parent d860ea79ed
commit 1ddad56c8c
81 changed files with 4255 additions and 3899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mem.c
View File

@@ -736,8 +736,6 @@ int loadbios()
int abrt=0;
void resetreadlookup()
{
int c;
@@ -902,7 +900,7 @@ uint32_t mmutranslatereal(uint32_t addr, int rw)
uint32_t addr2;
uint32_t temp,temp2,temp3;
if (abrt)
if (cpu_state.abrt)
{
// pclog("Translate recursive abort\n");
return -1;
@@ -922,7 +920,7 @@ uint32_t mmutranslatereal(uint32_t addr, int rw)
temp&=1;
if (CPL==3) temp|=4;
if (rw) temp|=2;
abrt = ABRT_PF;
cpu_state.abrt = ABRT_PF;
abrt_error = temp;
/* if (addr == 0x70046D)
{
@@ -952,9 +950,9 @@ uint32_t mmutranslatereal(uint32_t addr, int rw)
temp&=1;
if (CPL==3) temp|=4;
if (rw) temp|=2;
abrt = ABRT_PF;
cpu_state.abrt = ABRT_PF;
abrt_error = temp;
// pclog("%04X\n",abrt);
// pclog("%04X\n",cpu_state.abrt);
return -1;
}
mmu_perm=temp&4;
@@ -970,7 +968,7 @@ uint32_t mmutranslate_noabrt(uint32_t addr, int rw)
uint32_t addr2;
uint32_t temp,temp2,temp3;
if (abrt)
if (cpu_state.abrt)
return -1;
addr2 = ((cr3 & ~0xfff) + ((addr >> 20) & 0xffc));