--- np2/debugsub.c	2003/11/22 12:49:48	1.3
+++ np2/debugsub.c	2004/01/12 08:51:24	1.6
@@ -1,8 +1,7 @@
 #include	"compiler.h"
 #include	"strres.h"
 #include	"dosio.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"debugsub.h"
@@ -101,10 +100,10 @@ const char *debugsub_regs(void) {
 
 static char work[256];
 
-	SPRINTF(work, str_register, I286_AX, I286_BX, I286_CX, I286_DX,
-								I286_SP, I286_BP, I286_SI, I286_DI,
-								I286_DS, I286_ES, I286_SS, I286_CS, I286_IP);
-	milstr_ncat(work, debugsub_flags(I286_FLAG), sizeof(work));
+	SPRINTF(work, str_register, CPU_AX, CPU_BX, CPU_CX, CPU_DX,
+								CPU_SP, CPU_BP, CPU_SI, CPU_DI,
+								CPU_DS, CPU_ES, CPU_SS, CPU_CS, CPU_IP);
+	milstr_ncat(work, debugsub_flags(CPU_FLAG), sizeof(work));
 	milstr_ncat(work, CRCONST, sizeof(work));
 	return(work);
 }
@@ -169,8 +168,8 @@ void debugsub_memorydump(void) {
 
 	fh = file_create_c(file_memorybin);
 	if (fh != FILEH_INVALID) {
-//		for (i=0; i<34; i++) {
-		for (i=0; i<64; i++) {
+		for (i=0; i<34; i++) {
+//		for (i=0; i<64; i++) {
 			file_write(fh, mem + i*0x8000, 0x8000);
 		}
 		file_close(fh);