--- np2/win9x/debuguty/viewasm.cpp	2003/10/16 17:59:10	1.1.1.1
+++ np2/win9x/debuguty/viewasm.cpp	2003/12/08 00:55:34	1.3
@@ -1,13 +1,13 @@
 #include	"compiler.h"
 #include	"resource.h"
 #include	"np2.h"
-#include	"i286.h"
 #include	"viewer.h"
 #include	"viewcmn.h"
 #include	"viewmenu.h"
 #include	"viewmem.h"
 #include	"viewasm.h"
 #include	"unasm.h"
+#include	"cpucore.h"
 
 
 static void set_viewseg(HWND hwnd, NP2VIEW_T *view, WORD seg) {
@@ -147,19 +147,19 @@ LRESULT CALLBACK viewasm_proc(NP2VIEW_T 
 		case WM_COMMAND:
 			switch(LOWORD(wp)) {
 				case IDM_SEGCS:
-					set_viewseg(hwnd, view, I286_CS);
+					set_viewseg(hwnd, view, CPU_CS);
 					break;
 
 				case IDM_SEGDS:
-					set_viewseg(hwnd, view, I286_DS);
+					set_viewseg(hwnd, view, CPU_DS);
 					break;
 
 				case IDM_SEGES:
-					set_viewseg(hwnd, view, I286_ES);
+					set_viewseg(hwnd, view, CPU_ES);
 					break;
 
 				case IDM_SEGSS:
-					set_viewseg(hwnd, view, I286_SS);
+					set_viewseg(hwnd, view, CPU_SS);
 					break;
 
 				case IDM_SEGTEXT:
@@ -215,8 +215,8 @@ void viewasm_init(NP2VIEW_T *dst, NP2VIE
 		}
 	}
 	if (!src) {
-		dst->seg = I286_CS;
-		dst->off = I286_IP;
+		dst->seg = CPU_CS;
+		dst->off = CPU_IP;
 	}
 	dst->type = VIEWMODE_ASM;
 	dst->maxline = 256;