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

Fixed the paths to the MDA and WY700 character ROM's.

Browse Source
This commit is contained in:
OBattler
2017-07-17 16:26:53 +02:00
parent 0759e6e3be
commit 7c3337a563
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CPU/x86seg.c
View File

@@ -426,7 +426,6 @@ void loadseg(uint16_t seg, x86seg *s)
if (s->base == 0 && s->limit_low == 0 && s->limit_high == 0xffffffff) if (s->base == 0 && s->limit_low == 0 && s->limit_high == 0xffffffff)
cpu_cur_status |= CPU_STATUS_FLATDS; cpu_cur_status |= CPU_STATUS_FLATDS;
else else
cpu_cur_status &= ~CPU_STATUS_FLATDS; cpu_cur_status &= ~CPU_STATUS_FLATDS;
} }
if (s == &_ss) if (s == &_ss)
@@ -625,6 +624,7 @@ void loadcsjmp(uint16_t seg, uint32_t oxpc)
{ {
if (!(segdat[2]&0x8000)) if (!(segdat[2]&0x8000))
{ {
x86np("Load CS JMP system selector not present\n", seg & 0xfffc);
return; return;
} }
type=segdat[2]&0xF00; type=segdat[2]&0xF00;
@@ -637,14 +637,12 @@ void loadcsjmp(uint16_t seg, uint32_t oxpc)
cgate32=(type&0x800); cgate32=(type&0x800);
cgate16=!cgate32; cgate16=!cgate32;
oldcs=CS; oldcs=CS;
cpu_state.oldpc=cpu_state.pc; cpu_state.oldpc = cpu_state.pc;
#if 0
if ((DPL < CPL) || (DPL < (seg&3))) if ((DPL < CPL) || (DPL < (seg&3)))
{ {
x86gpf(NULL,seg&~3); x86gpf(NULL,seg&~3);
return; return;
} }
#endif
if (DPL < CPL) if (DPL < CPL)
{ {
x86gpf("loadcsjmp(): ex DPL < CPL",seg&~3); x86gpf("loadcsjmp(): ex DPL < CPL",seg&~3);
@@ -939,7 +937,7 @@ void loadcscall(uint16_t seg)
cgate16=!cgate32; cgate16=!cgate32;
oldcs=CS; oldcs=CS;
count=segdat[2]&31; count=segdat[2]&31;
if ((DPL < CPL)) if (DPL < CPL)
{ {
x86gpf("loadcscall(): ex DPL < CPL",seg&~3); x86gpf("loadcscall(): ex DPL < CPL",seg&~3);
return; return;

4
src/mem.c
View File

@@ -97,8 +97,8 @@ int loadbios()
FILE *f=NULL,*ff=NULL; FILE *f=NULL,*ff=NULL;
int c; int c;
loadfont(L"roms/graphics/mda/mda.rom", 0); loadfont(L"roms/video/mda/mda.rom", 0);
loadfont(L"roms/graphics/wyse700/wy700.rom", 3); loadfont(L"roms/video/wyse700/wy700.rom", 3);
biosmask = 0xffff; biosmask = 0xffff;