--- np2/i386c/ia32/debug.c	2011/01/15 18:36:12	1.16
+++ np2/i386c/ia32/debug.c	2012/01/08 08:02:38	1.20
@@ -41,7 +41,7 @@ cpu_reg2str(void)
 	    "eax=%08x ecx=%08x edx=%08x ebx=%08x\n"
 	    "esp=%08x ebp=%08x esi=%08x edi=%08x\n"
 	    "eip=%08x prev_eip=%08x\n"
-	    "es=%04x cs=%04x ss=%04x ds=%04x fs=%04x gs=%04x\n"
+	    "cs=%04x ss=%04x ds=%04x es=%04x fs=%04x gs=%04x\n"
 	    "eflag=%08x "
 	    /* ID VIP VIF AC VM RF NT IOPL OF DF IF TF SF ZF AF PF CF */
 	    "[ ID=%d VIP=%d VIF=%d AC=%d VM=%d RF=%d NT=%d IOPL=%d %s %s %s TF=%d %s %s %s %s %s ]\n"
@@ -101,7 +101,7 @@ put_cpuinfo(void)
 #endif
 	strcat(buf, a20str());
 
-	printf(buf);
+	printf("%s", buf);
 }
 
 void
@@ -115,7 +115,7 @@ dbg_printf(const char *str, ...)
 	va_end(ap);
 	strcat(buf, "\n");
 
-	printf(buf);
+	printf("%s", buf);
 }
 
 void
@@ -134,7 +134,7 @@ memory_dump(int idx, UINT32 madr)
 		size = 0x100;
 		addr = madr - 0x80;
 	}
-	VERBOSE(("memory dump\n-- \n"));
+	VERBOSE(("memory dump\n--"));
 	for (s = 0; s < size; s++) {
 		if ((s % 16) == 0) {
 			VERBOSE(("%08x: ", addr + s));
@@ -251,7 +251,7 @@ segdesc_dump(descriptor_t *sdp)
 
 	__ASSERT(sdp != NULL);
 
-	VERBOSE(("\ndump descriptor", sdp));
+	VERBOSE(("\ndump descriptor: %p", sdp));
 
 	VERBOSE(("valid    : %s", SEG_IS_VALID(sdp) ? "true" : "false"));
 	VERBOSE(("present  : %s", SEG_IS_PRESENT(sdp) ? "true" : "false"));
@@ -335,7 +335,6 @@ segdesc_dump(descriptor_t *sdp)
 			break;
 		}
 	}
-	VERBOSE(("\n"));
 #endif
 }