--- np2/i286c/i286c_0f.c	2003/11/24 09:14:01	1.7
+++ np2/i286c/i286c_0f.c	2003/12/12 01:04:40	1.12
@@ -1,24 +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;
-	UINT16	ad;
+	UINT	ad;
 
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
 		ad = GET_EA(op, &seg);
-		i286_memorywrite_w(seg + ad, i286reg.GDTR.limit);
-		ad += 2;
-		i286_memorywrite_w(seg + ad, i286reg.GDTR.base);
-		ad += 2;
-		i286_memorywrite_w(seg + ad,
-									(UINT16)(0xff00 + i286reg.GDTR.base24));
+		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);
@@ -28,17 +25,15 @@ I286_0F _sgdt(UINT op) {
 I286_0F _sidt(UINT op) {
 
 	UINT32	seg;
-	UINT16	ad;
+	UINT	ad;
 
 	I286_WORKCLOCK(12);
 	if (op < 0xc0) {
 		ad = GET_EA(op, &seg);
-		i286_memorywrite_w(seg + ad, i286reg.IDTR.limit);
-		ad += 2;
-		i286_memorywrite_w(seg + ad, i286reg.IDTR.base);
-		ad += 2;
-		i286_memorywrite_w(seg + ad,
-									(UINT16)(0xff00 + i286reg.IDTR.base24));
+		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);
@@ -48,18 +43,15 @@ I286_0F _sidt(UINT op) {
 I286_0F _lgdt(UINT op) {
 
 	UINT32	seg;
-	UINT16	ad;
+	UINT	ad;
 
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
 		ad = GET_EA(op, &seg);
-		i286reg.GDTR.limit = i286_memoryread_w(seg + ad);
-		ad += 2;
-		i286reg.GDTR.base = i286_memoryread_w(seg + ad);
-		ad += 2;
-		i286reg.GDTR.base24 = i286_memoryread(seg + ad);
-		ad++;
-		i286reg.GDTR.reserved = i286_memoryread(seg + ad);
+		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);
@@ -69,18 +61,15 @@ I286_0F _lgdt(UINT op) {
 I286_0F _lidt(UINT op) {
 
 	UINT32	seg;
-	UINT16	ad;
+	UINT	ad;
 
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
 		ad = GET_EA(op, &seg);
-		i286reg.IDTR.limit = i286_memoryread_w(seg + ad);
-		ad += 2;
-		i286reg.IDTR.base = i286_memoryread_w(seg + ad);
-		ad += 2;
-		i286reg.IDTR.base24 = i286_memoryread(seg + ad);
-		ad++;
-		i286reg.IDTR.reserved = i286_memoryread(seg + ad);
+		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);
@@ -91,11 +80,11 @@ 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(CALC_EA(op), i286reg.MSW);
+		i286_memorywrite_w(CALC_EA(op), I286_MSW);
 	}
 }
 
@@ -103,11 +92,11 @@ I286_0F _lmsw(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		i286reg.MSW = *(REG16_B20(op));
+		I286_MSW = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(3);
-		i286reg.MSW = i286_memoryread_w(CALC_EA(op));
+		I286_MSW = i286_memoryread_w(CALC_EA(op));
 	}
 }
 
@@ -123,7 +112,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);