--- np2/i386c/ia32/cpu.h	2008/03/22 04:03:07	1.37
+++ np2/i386c/ia32/cpu.h	2012/01/08 11:32:16	1.42
@@ -1,5 +1,3 @@
-/*	$Id: cpu.h,v 1.37 2008/03/22 04:03:07 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -215,20 +213,20 @@ typedef struct {
 } FPU_REGS;
 
 typedef struct {
-	UINT8		valid;	/* 伊斥旦正肣躲 */
-	UINT8		sign;	/* 扞寞 */
-	UINT8		zero;	/* 未伕 */
-	UINT8		inf;	/* ∠ */
+	UINT8		valid;	/* 伊斥旦正肣躲 */
+	UINT8		sign;	/* 扞寞 */
+	UINT8		zero;	/* 未伕 */
+	UINT8		inf;	/* ∠ */
 	UINT8		nan;	/* NaN */
-	UINT8		denorm;	/* �懇筋祭 */
-	SINT16		exp;	/* 隙醒朿 */
-	UINT64		num;	/* 凝醒朿 */
+	UINT8		denorm;	/* 巃塯亙＝藂曄痴 */
+	SINT16		exp;	/* 錎株妦鼖奴 */
+	UINT64		num;	/* 窶曇妦鼖奴 */
 } FP_REG;
 
 typedef struct {
-	UINT8		top;	/* ’弗’末’氾’永□白氾亥 */
-	UINT8		pc;	/* 正戊瓜伙 */
-	UINT8		rc;	/* 巨件﹜*/
+	UINT8		top;	/* 旦正永弁匏譆 */
+	UINT8		pc;	/* 擎蘸 */
+	UINT8		rc;	/* 殘戶 */
 	UINT8		dmy[1];
 
 	FP_REG		reg[FPU_REG_NUM];
@@ -266,7 +264,7 @@ typedef struct {
 } I386EXT;
 
 typedef struct {
-	I386STAT	s;				/* STATsave﹜左﹜囍鷍伕 */
+	I386STAT	s;				/* STATsave槦忴�槻嗥’巨 */
 	I386EXT		e;
 } I386CORE;
 
@@ -452,8 +450,8 @@ extern sigjmp_buf	exec_1step_jmpbuf;
 #define	REAL_FLAGREG	((CPU_FLAG & 0xf7ff) | (CPU_OV ? O_FLAG : 0) | 2)
 #define	REAL_EFLAGREG	((CPU_EFLAG & 0xfffff7ff) | (CPU_OV ? O_FLAG : 0) | 2)
 
-void FASTCALL set_flags(UINT16 new_flags, UINT16 mask);
-void FASTCALL set_eflags(UINT32 new_flags, UINT32 mask);
+void CPUCALL set_flags(UINT16 new_flags, UINT16 mask);
+void CPUCALL set_eflags(UINT32 new_flags, UINT32 mask);
 
 
 #define	CPU_INST_OP32		CPU_STATSAVE.cpu_inst.op_32
@@ -483,7 +481,7 @@ do { \
 	CPU_PREV_ESP = (esp); \
 } while (/*CONSTCOND*/0)
 #define	CPU_SET_PREV_ESP()	CPU_SET_PREV_ESP1(CPU_ESP)
-#define	CPU_CLEAR_PREV_ESP(esp) \
+#define	CPU_CLEAR_PREV_ESP() \
 do { \
 	CPU_STATSAVE.cpu_stat.backout_sp = 0; \
 } while (/*CONSTCOND*/0)
@@ -621,7 +619,6 @@ void ia32a20enable(BOOL enable);
 void ia32(void);
 void ia32_step(void);
 void CPUCALL ia32_interrupt(int vect, int soft);
-void CPUCALL ia32_exception(int vect, int p1, int p2);
 
 void exec_1step(void);
 #define	INST_PREFIX	(1 << 0)
@@ -634,12 +631,12 @@ void ia32_panic(const char *buf, ...);
 
 void ia32_bioscall(void);
 
-void FASTCALL change_pm(BOOL onoff);
-void FASTCALL change_vm(BOOL onoff);
-void FASTCALL change_pg(BOOL onoff);
+void CPUCALL change_pm(BOOL onoff);
+void CPUCALL change_vm(BOOL onoff);
+void CPUCALL change_pg(BOOL onoff);
 
-void FASTCALL set_cr3(UINT32 new_cr3);
-void FASTCALL set_cpl(int new_cpl);
+void CPUCALL set_cr3(UINT32 new_cr3);
+void CPUCALL set_cpl(int new_cpl);
 
 extern const UINT8 iflags[];
 #define	szpcflag	iflags
@@ -687,20 +684,20 @@ void dbg_printf(const char *str, ...);
 #define	FPU_REG(i)		FPU_STAT.reg[i]
 
 /* FPU status register */
-#define	FP_IE_FLAG	(1 << 0)	/* 白左弁╕甩瓦□戊*/
-#define	FP_DE_FLAG	(1 << 1)	/* 犯用□穴仿奶朮玉’左矢仿件玉 */
-#define	FP_ZE_FLAG	(1 << 2)	/* 未伕卞方月輪遙 */
-#define	FP_OE_FLAG	(1 << 3)	/* 左□田□白伕□ */
-#define	FP_UE_FLAG	(1 << 4)	/* 失件母□白伕□ */
-#define	FP_PE_FLAG	(1 << 5)	/* 擎蘸 */
-#define	FP_SF_FLAG	(1 << 6)	/* 旦正永弁白巧伙玄 */
-#define	FP_ES_FLAG	(1 << 7)	/* 巨仿□扔穴伉旦氾□正旦 */
-#define	FP_C0_FLAG	(1 << 8)	/* 橢瘀戊□玉 */
-#define	FP_C1_FLAG	(1 << 9)	/* 橢瘀戊□玉 */
-#define	FP_C2_FLAG	(1 << 10)	/* 橢瘀戊□玉 */
-#define	FP_TOP_FLAG	(7 << 11)	/* 旦正永弁禾奶件玄及玄永皿 */
-#define	FP_C3_FLAG	(1 << 14)	/* 橢瘀戊□玉 */
-#define	FP_B_FLAG	(1 << 15)	/* FPU 申斥□ */
+#define	FP_IE_FLAG	(1 << 0)	/* 拑躲卅⑹綜 */
+#define	FP_DE_FLAG	(1 << 1)	/* 犯用□穴仿奶朮玉’左矢仿件玉 */
+#define	FP_ZE_FLAG	(1 << 2)	/* 未伕卞方月輪遙 */
+#define	FP_OE_FLAG	(1 << 3)	/* 左□田□白伕□ */
+#define	FP_UE_FLAG	(1 << 4)	/* 失件母□白伕□ */
+#define	FP_PE_FLAG	(1 << 5)	/* 擎蘸 */
+#define	FP_SF_FLAG	(1 << 6)	/* 旦正永弁白巧伙玄 */
+#define	FP_ES_FLAG	(1 << 7)	/* 巨仿□扔穴伉旦氾□正旦 */
+#define	FP_C0_FLAG	(1 << 8)	/* 橢瘀戊□玉 */
+#define	FP_C1_FLAG	(1 << 9)	/* 橢瘀戊□玉 */
+#define	FP_C2_FLAG	(1 << 10)	/* 橢瘀戊□玉 */
+#define	FP_TOP_FLAG	(7 << 11)	/* 旦正永弁禾奶件玄及玄永皿 */
+#define	FP_C3_FLAG	(1 << 14)	/* 橢瘀戊□玉 */
+#define	FP_B_FLAG	(1 << 15)	/* FPU 申斥□ */
 
 #define	FP_TOP_SHIFT	11
 #define	FP_TOP_GET()	((FPU_STATUSWORD & FP_TOP_FLAG) >> FP_TOP_SHIFT)
@@ -716,12 +713,12 @@ do { \
 } while (/*CONSTCOND*/0)
 
 /* FPU control register */
-#define	FP_CTRL_PC_SHIFT	8	/* 蘸孺豢 */
-#define	FP_CTRL_RC_SHIFT	10	/* 殘戶孺豢 */
+#define	FP_CTRL_PC_SHIFT	8	/* 蝎曉漲氆市篔﹝ */
+#define	FP_CTRL_RC_SHIFT	10	/* 頨弁槻Ｙ偶篔﹝ */
 
-#define	FP_CTRL_PC_24		0	/* 氾失正戊瓜伙 */
-#define	FP_CTRL_PC_53		1	/* 甘伐正戊瓜伙 */
-#define	FP_CTRL_PC_64		3	/* 它生玄’正戊瓜伙 */
+#define	FP_CTRL_PC_24		0	/* 澼剞奶本篥仲 */
+#define	FP_CTRL_PC_53		1	/* 歖粹奶本篥仲 */
+#define	FP_CTRL_PC_64		3	/* 錭﹝篨左豱本篥仲 */
 
 #define	FP_CTRL_RC_NEAREST_EVEN	0
 #define	FP_CTRL_RC_DOWN		1
@@ -777,6 +774,7 @@ typedef struct {
 } disasm_context_t;
 
 int disasm(UINT32 *eip, disasm_context_t *ctx);
+char *cpu_disasm2str(UINT32 eip);
 
 #ifdef __cplusplus
 }