--- np2/debugsub386.c	2004/03/30 07:12:02	1.9
+++ np2/debugsub386.c	2005/02/07 14:46:07	1.12
@@ -69,11 +69,11 @@ static const char str_register[] =						
 					"EAX=%.8x  EBX=%.8x  ECX=%.8x  EDX=%.8x" CRLITERAL	\
 					"ESP=%.8x  EBP=%.8x  ESI=%.8x  EDI=%.8x" CRLITERAL	\
 					"DS=%.4x  ES=%.4x  SS=%.4x  CS=%.4x  "				\
-					"EIP=%.8x  ";
+					"EIP=%.8x  " CRLITERAL;
 static const char str_picstat[] = 										\
-					CRLITERAL "PIC0=%.2x:%.2x:%.2x"						\
-					CRLITERAL "PIC1=%.2x:%.2x:%.2x"						\
-					CRLITERAL "8255PORTC = %.2x / system-port = %.2x";
+					"PIC0=%.2x:%.2x:%.2x" CRLITERAL						\
+					"PIC1=%.2x:%.2x:%.2x" CRLITERAL						\
+					"8255PORTC = %.2x / system-port = %.2x" CRLITERAL;
 
 
 const char *debugsub_flags(UINT16 flag) {
@@ -115,7 +115,7 @@ void debugwriteseg(const char *fname, co
 												UINT32 addr, UINT32 size) {
 
 	FILEH	fh;
-	BYTE	buf[0x1000];
+	UINT8	buf[0x1000];
 	UINT32	limit;
 
 	limit = sd->u.seg.limit;
@@ -140,10 +140,10 @@ void debugwriteseg(const char *fname, co
 
 void debugsub_status(void) {
 
-static int			filenum = 0;
-	FILEH			fh;
-	char			work[512];
-const char			*p;
+static int		filenum = 0;
+	FILEH		fh;
+	char		work[512];
+const char		*p;
 
 	SPRINTF(work, file_i386reg, filenum);
 	fh = file_create_c(work);
@@ -155,6 +155,12 @@ const char			*p;
 								pic.pi[1].imr, pic.pi[1].irr, pic.pi[1].isr,
 								mouseif.upd8255.portc, sysport.c);
 		file_write(fh, work, strlen(work));
+
+		SPRINTF(work, "CS = %.8x:%.8x" CRLITERAL,
+						CPU_STAT_SREGBASE(CPU_CS_INDEX),
+						CPU_STAT_SREGLIMIT(CPU_CS_INDEX));
+		file_write(fh, work, strlen(work));
+
 		file_close(fh);
 	}
 
@@ -167,8 +173,6 @@ const char			*p;
 	SPRINTF(work, file_i386ss, filenum);
 	debugwriteseg(work, &CPU_STAT_SREG(CPU_SS_INDEX), CPU_ESP & 0xffff0000, 0x10000);
 	filenum++;
-
-	iptrace_out();
 }
 
 void debugsub_memorydump(void) {
@@ -178,9 +182,7 @@ 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++) {
 			file_write(fh, mem + i*0x8000, 0x8000);
 		}
 		file_close(fh);