--- np2/i286c/i286c_0f.c	2003/10/19 14:56:15	1.4
+++ np2/i286c/i286c_0f.c	2003/11/24 09:14:01	1.7
@@ -1,21 +1,23 @@
 #include	"compiler.h"
 #include	"i286.h"
 #include	"i286c.h"
-#include	"i286c.mcr"
 #include	"memory.h"
-#include	"nevent.h"
+#include	"i286c.mcr"
 
 
 I286_0F _sgdt(UINT op) {
 
+	UINT32	seg;
+	UINT16	ad;
+
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286_memorywrite_w(ad + EA_FIX, i286reg.GDTR.limit);
+		ad = GET_EA(op, &seg);
+		i286_memorywrite_w(seg + ad, i286reg.GDTR.limit);
 		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX, i286reg.GDTR.base);
+		i286_memorywrite_w(seg + ad, i286reg.GDTR.base);
 		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX,
+		i286_memorywrite_w(seg + ad,
 									(UINT16)(0xff00 + i286reg.GDTR.base24));
 	}
 	else {
@@ -25,14 +27,17 @@ I286_0F _sgdt(UINT op) {
 
 I286_0F _sidt(UINT op) {
 
+	UINT32	seg;
+	UINT16	ad;
+
 	I286_WORKCLOCK(12);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286_memorywrite_w(ad + EA_FIX, i286reg.IDTR.limit);
+		ad = GET_EA(op, &seg);
+		i286_memorywrite_w(seg + ad, i286reg.IDTR.limit);
 		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX, i286reg.IDTR.base);
+		i286_memorywrite_w(seg + ad, i286reg.IDTR.base);
 		ad += 2;
-		i286_memorywrite_w(ad + EA_FIX,
+		i286_memorywrite_w(seg + ad,
 									(UINT16)(0xff00 + i286reg.IDTR.base24));
 	}
 	else {
@@ -42,16 +47,19 @@ I286_0F _sidt(UINT op) {
 
 I286_0F _lgdt(UINT op) {
 
+	UINT32	seg;
+	UINT16	ad;
+
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286reg.GDTR.limit = i286_memoryread_w(ad + EA_FIX);
+		ad = GET_EA(op, &seg);
+		i286reg.GDTR.limit = i286_memoryread_w(seg + ad);
 		ad += 2;
-		i286reg.GDTR.base = i286_memoryread_w(ad + EA_FIX);
+		i286reg.GDTR.base = i286_memoryread_w(seg + ad);
 		ad += 2;
-		i286reg.GDTR.base24 = i286_memoryread(ad + EA_FIX);
+		i286reg.GDTR.base24 = i286_memoryread(seg + ad);
 		ad++;
-		i286reg.GDTR.reserved = i286_memoryread(ad + EA_FIX);
+		i286reg.GDTR.reserved = i286_memoryread(seg + ad);
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -60,16 +68,19 @@ I286_0F _lgdt(UINT op) {
 
 I286_0F _lidt(UINT op) {
 
+	UINT32	seg;
+	UINT16	ad;
+
 	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
-		UINT16 ad = c_get_ea[op]();
-		i286reg.IDTR.limit = i286_memoryread_w(ad + EA_FIX);
+		ad = GET_EA(op, &seg);
+		i286reg.IDTR.limit = i286_memoryread_w(seg + ad);
 		ad += 2;
-		i286reg.IDTR.base = i286_memoryread_w(ad + EA_FIX);
+		i286reg.IDTR.base = i286_memoryread_w(seg + ad);
 		ad += 2;
-		i286reg.IDTR.base24 = i286_memoryread(ad + EA_FIX);
+		i286reg.IDTR.base24 = i286_memoryread(seg + ad);
 		ad++;
-		i286reg.IDTR.reserved = i286_memoryread(ad + EA_FIX);
+		i286reg.IDTR.reserved = i286_memoryread(seg + ad);
 	}
 	else {
 		INT_NUM(6, I286_IP - 2);
@@ -80,11 +91,11 @@ I286_0F _smsw(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		*(reg16_b20[op]) = i286reg.MSW;
+		*(REG16_B20(op)) = i286reg.MSW;
 	}
 	else {
 		I286_WORKCLOCK(6);
-		i286_memorywrite_w(c_calc_ea_dst[op](), i286reg.MSW);
+		i286_memorywrite_w(CALC_EA(op), i286reg.MSW);
 	}
 }
 
@@ -92,11 +103,11 @@ I286_0F _lmsw(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		i286reg.MSW = *(reg16_b20[op]);
+		i286reg.MSW = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(3);
-		i286reg.MSW = i286_memoryread_w(c_calc_ea_dst[op]());
+		i286reg.MSW = i286_memoryread_w(CALC_EA(op));
 	}
 }