--- np2/i286c/i286c_0f.c	2003/11/21 06:51:11	1.6
+++ np2/i286c/i286c_0f.c	2003/12/25 19:58:24	1.15
@@ -1,21 +1,21 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286c.h"
-#include	"memory.h"
 #include	"i286c.mcr"
 
 
 I286_0F _sgdt(UINT op) {
 
+	UINT32	seg;
+	UINT	ad;
+
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286_memorywrite_w(ad + EA_FIX, i286reg.GDTR.limit);
-		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX, i286reg.GDTR.base);
-		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX,
-									(UINT16)(0xff00 + i286reg.GDTR.base24));
+		ad = GET_EA(op, &seg);
+		i286_memorywrite_w(seg + ad, I286_GDTR.limit);
+		i286_memorywrite_w(seg + LOW16(ad + 2), I286_GDTR.base);
+		i286_memorywrite_w(seg + LOW16(ad + 4),
+										(REG16)(0xff00 + I286_GDTR.base24));
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -24,15 +24,16 @@ I286_0F _sgdt(UINT op) {
 
 I286_0F _sidt(UINT op) {
 
+	UINT32	seg;
+	UINT	ad;
+
 	I286_WORKCLOCK(12);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286_memorywrite_w(ad + EA_FIX, i286reg.IDTR.limit);
-		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX, i286reg.IDTR.base);
-		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX,
-									(UINT16)(0xff00 + i286reg.IDTR.base24));
+		ad = GET_EA(op, &seg);
+		i286_memorywrite_w(seg + ad, I286_IDTR.limit);
+		i286_memorywrite_w(seg + LOW16(ad + 2), I286_IDTR.base);
+		i286_memorywrite_w(seg + LOW16(ad + 4),
+										(REG16)(0xff00 + I286_IDTR.base24));
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -41,16 +42,16 @@ I286_0F _sidt(UINT op) {
 
 I286_0F _lgdt(UINT op) {
 
+	UINT32	seg;
+	UINT	ad;
+
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286reg.GDTR.limit = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		i286reg.GDTR.base = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		i286reg.GDTR.base24 = i286_memoryread(ad + EA_FIX);
-		ad++;
-		i286reg.GDTR.reserved = i286_memoryread(ad + EA_FIX);
+		ad = GET_EA(op, &seg);
+		I286_GDTR.limit = i286_memoryread_w(seg + ad);
+		I286_GDTR.base = i286_memoryread_w(seg + LOW16(ad + 2));
+		I286_GDTR.base24 = i286_memoryread(seg + LOW16(ad + 4));
+//		I286_GDTR.reserved = i286_memoryread(seg + LOW16(ad + 5));
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -59,16 +60,16 @@ I286_0F _lgdt(UINT op) {
 
 I286_0F _lidt(UINT op) {
 
+	UINT32	seg;
+	UINT	ad;
+
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286reg.IDTR.limit = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		i286reg.IDTR.base = i286_memoryread_w(ad + EA_FIX);
-		ad += 2;
-		i286reg.IDTR.base24 = i286_memoryread(ad + EA_FIX);
-		ad++;
-		i286reg.IDTR.reserved = i286_memoryread(ad + EA_FIX);
+		ad = GET_EA(op, &seg);
+		I286_IDTR.limit = i286_memoryread_w(seg + ad);
+		I286_IDTR.base = i286_memoryread_w(seg + LOW16(ad + 2));
+		I286_IDTR.base24 = i286_memoryread(seg + LOW16(ad + 4));
+//		I286_IDTR.reserved = i286_memoryread(seg + LOW16(ad + 5));
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -79,24 +80,27 @@ I286_0F _smsw(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		*(REG16_B20(op)) = i286reg.MSW;
+		*(REG16_B20(op)) = I286_MSW;
 	}
 	else {
 		I286_WORKCLOCK(6);
-		i286_memorywrite_w(c_calc_ea_dst[op](), i286reg.MSW);
+		i286_memorywrite_w(CALC_EA(op), I286_MSW);
 	}
 }
 
 I286_0F _lmsw(UINT op) {
 
+	REG16	msw;
+
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		i286reg.MSW = *(REG16_B20(op));
+		msw = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(3);
-		i286reg.MSW = i286_memoryread_w(c_calc_ea_dst[op]());
+		msw = i286_memoryread_w(CALC_EA(op));
 	}
+	I286_MSW = msw | (I286_MSW & 1);
 }
 
 static const I286OP_0F cts1_table[] = {
@@ -111,7 +115,7 @@ I286_0F _loadall286(void) {
 	UINT16	tmp;
 
 	I286_WORKCLOCK(195);
-	i286reg.MSW = LOADINTELWORD(mem + 0x804);
+	I286_MSW = LOADINTELWORD(mem + 0x804);
 	tmp = LOADINTELWORD(mem + 0x818);
 	I286_OV = tmp & O_FLAG;
 	I286_FLAG = tmp & (0xfff ^ O_FLAG);
@@ -155,7 +159,6 @@ I286EXT i286c_cts(void) {
 		_loadall286();
 	}
 	else {
-		I286_WORKCLOCK(20);
 		INT_NUM(6, ip - 1);
 	}
 }