From 7c3337a56350416e021702794e832d4e92c75ecf Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 17 Jul 2017 16:26:53 +0200
Subject: [PATCH] Fixed the paths to the MDA and WY700 character ROM's.

---
 src/CPU/x86seg.c | 8 +++-----
 src/mem.c        | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/CPU/x86seg.c b/src/CPU/x86seg.c
index 62ef17da4..d14ac1445 100644
--- a/src/CPU/x86seg.c
+++ b/src/CPU/x86seg.c
@@ -426,7 +426,6 @@ void loadseg(uint16_t seg, x86seg *s)
                 if (s->base == 0 && s->limit_low == 0 && s->limit_high == 0xffffffff)
                         cpu_cur_status |= CPU_STATUS_FLATDS;
                 else
-
                        cpu_cur_status &= ~CPU_STATUS_FLATDS;
         }
         if (s == &_ss)
@@ -625,6 +624,7 @@ void loadcsjmp(uint16_t seg, uint32_t oxpc)
                 {
                         if (!(segdat[2]&0x8000))
                         {
+                                x86np("Load CS JMP system selector not present\n", seg & 0xfffc);
                                 return;
                         }
                         type=segdat[2]&0xF00;
@@ -637,14 +637,12 @@ void loadcsjmp(uint16_t seg, uint32_t oxpc)
                                 cgate32=(type&0x800);
                                 cgate16=!cgate32;
                                 oldcs=CS;
-                                cpu_state.oldpc=cpu_state.pc;
-#if 0
+                                cpu_state.oldpc = cpu_state.pc;
                                 if ((DPL < CPL) || (DPL < (seg&3)))
                                 {
                                         x86gpf(NULL,seg&~3);
                                         return;
                                 }
-#endif
                                 if (DPL < CPL)
                                 {
                                         x86gpf("loadcsjmp(): ex DPL < CPL",seg&~3);
@@ -939,7 +937,7 @@ void loadcscall(uint16_t seg)
                                 cgate16=!cgate32;
                                 oldcs=CS;
                                 count=segdat[2]&31;
-                                if ((DPL < CPL))
+                                if (DPL < CPL)
                                 {
                                         x86gpf("loadcscall(): ex DPL < CPL",seg&~3);
                                         return;
diff --git a/src/mem.c b/src/mem.c
index 59042049b..fb6b701d6 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -97,8 +97,8 @@ int loadbios()
         FILE *f=NULL,*ff=NULL;
         int c;
         
-        loadfont(L"roms/graphics/mda/mda.rom", 0);
-	loadfont(L"roms/graphics/wyse700/wy700.rom", 3);
+        loadfont(L"roms/video/mda/mda.rom", 0);
+	loadfont(L"roms/video/wyse700/wy700.rom", 3);
 
         biosmask = 0xffff;