--- np2/i386c/ia32/debug.c	2004/02/20 16:09:04	1.8
+++ np2/i386c/ia32/debug.c	2005/03/05 16:47:04	1.12
@@ -1,4 +1,4 @@
-/*	$Id: debug.c,v 1.8 2004/02/20 16:09:04 monaka Exp $	*/
+/*	$Id: debug.c,v 1.12 2005/03/05 16:47:04 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -31,8 +31,8 @@
 
 #include "cpu.h"
 #include "memory.h"
-#ifdef USE_FPU
-#include "instructions/fpu/fpu.h"
+#if defined(USE_FPU)
+#include "instructions/fpu/fp.h"
 #endif
 
 
@@ -42,17 +42,17 @@ cpu_reg2str(void)
 	static char buf[512];
 
 	snprintf(buf, sizeof(buf),
-	    "eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
+	    "eax=%08x ecx=%08x edx=%08x ebx=%08x\n"
 	    "esp=%08x ebp=%08x esi=%08x edi=%08x\n"
 	    "eip=%08x prev_eip=%08x\n"
-	    "cs=%04x ss=%04x ds=%04x es=%04x fs=%04x gs=%04x\n"
+	    "es=%04x cs=%04x ss=%04x ds=%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"
 	    "gdtr=%08x:%04x idtr=%08x:%04x\n"
 	    "ldtr=%04x(%08x:%04x) tr=%04x(%08x:%04x)\n"
 	    "cr0=%08x cr1=%08x cr2=%08x cr3=%08x cr4=%08x mxcsr=%08x",
-	    CPU_EAX, CPU_EBX, CPU_ECX, CPU_EDX,
+	    CPU_EAX, CPU_ECX, CPU_EDX, CPU_EBX,
 	    CPU_ESP, CPU_EBP,CPU_ESI, CPU_EDI,
 	    CPU_EIP, CPU_PREV_EIP,
 	    CPU_CS, CPU_SS, CPU_DS, CPU_ES, CPU_FS, CPU_GS,
@@ -82,39 +82,6 @@ cpu_reg2str(void)
 	return buf;
 }
 
-#ifdef USE_FPU
-char *
-fpu_reg2str(void)
-{
-	static char buf[512];
-	char tmp[128];
-	int i;
-	int no;
-
-	strcpy(buf, "st=\n");
-	for (no = 0; no < 8; no++) {
-		for (i = 9; i >= 0; i--) {
-			snprintf(tmp, sizeof(tmp), "%02x", FPU_ST[no][i]);
-			strcat(buf, tmp);
-		}
-		strcat(buf, "\n");
-	}
-
-	snprintf(tmp, sizeof(tmp),
-	    "ctrl=%04x  status=%04x  tag=%04x\n"
-	    "inst=%08x%04x  data=%08x%04x  op=%03x\n",
-	    FPU_CTRLWORD,
-	    FPU_STATUSWORD,
-	    FPU_TAGWORD,
-	    FPU_INSTPTR_OFFSET, FPU_INSTPTR_SEG,
-	    FPU_DATAPTR_OFFSET, FPU_DATAPTR_SEG,
-	    FPU_LASTINSTOP);
-	strcat(buf, tmp);
-
-	return buf;
-}
-#endif
-
 static char *
 a20str(void)
 {
@@ -132,7 +99,7 @@ put_cpuinfo(void)
 
 	strcpy(buf, cpu_reg2str());
 	strcat(buf, "\n");
-#ifdef USE_FPU
+#if defined(USE_FPU)
 	strcat(buf, fpu_reg2str());
 	strcat(buf, "\n");
 #endif
@@ -243,6 +210,8 @@ tr_dump(UINT16 selector, UINT32 base, UI
 	UINT32 v;
 	UINT i;
 
+	(void)selector;
+
 	VERBOSE(("TR_DUMP: selector = %04x", selector));
 
 	for (i = 0; i < limit; i += 4) {