--- np2/i386c/ia32/instructions/bin_arith.c	2011/01/15 17:17:23	1.13
+++ np2/i386c/ia32/instructions/bin_arith.c	2011/12/29 13:32:13	1.15
@@ -43,7 +43,7 @@ ARITH_INSTRUCTION_3(SBB)
 /*
  * IMUL
  */
-void
+void CPUCALL
 IMUL_ALEb(UINT32 op)
 {
 	UINT32 madr;
@@ -63,7 +63,7 @@ IMUL_ALEb(UINT32 op)
 	CPU_AX = (UINT16)res;
 }
 
-void
+void CPUCALL
 IMUL_AXEw(UINT32 op)
 {
 	UINT32 madr;
@@ -84,7 +84,7 @@ IMUL_AXEw(UINT32 op)
 	CPU_DX = (UINT16)(res >> 16);
 }
 
-void
+void CPUCALL
 IMUL_EAXEd(UINT32 op)
 {
 	UINT32 madr;
@@ -193,7 +193,7 @@ IMUL_GdEdId(void)
 /*
  * MUL
  */
-void
+void CPUCALL
 MUL_ALEb(UINT32 op)
 {
 	UINT32 res, madr;
@@ -212,7 +212,7 @@ MUL_ALEb(UINT32 op)
 	CPU_AX = (UINT16)res;
 }
 
-void
+void CPUCALL
 MUL_AXEw(UINT32 op)
 {
 	UINT32 res, madr;
@@ -232,7 +232,7 @@ MUL_AXEw(UINT32 op)
 	CPU_DX = (UINT16)(res >> 16);
 }
 
-void
+void CPUCALL
 MUL_EAXEd(UINT32 op)
 {
 	UINT32 res, madr;
@@ -256,7 +256,7 @@ MUL_EAXEd(UINT32 op)
 /*
  * IDIV
  */
-void
+void CPUCALL
 IDIV_ALEb(UINT32 op)
 {
 	UINT32 madr;
@@ -286,7 +286,7 @@ IDIV_ALEb(UINT32 op)
 	EXCEPTION(DE_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 IDIV_AXEw(UINT32 op)
 {
 	SINT32 tmp, r;
@@ -316,7 +316,7 @@ IDIV_AXEw(UINT32 op)
 	EXCEPTION(DE_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 IDIV_EAXEd(UINT32 op)
 {
 	SINT64 tmp, r;
@@ -350,7 +350,7 @@ IDIV_EAXEd(UINT32 op)
 /*
  * DIV
  */
-void
+void CPUCALL
 DIV_ALEb(UINT32 op)
 {
 	UINT32 madr;
@@ -379,7 +379,7 @@ DIV_ALEb(UINT32 op)
 	EXCEPTION(DE_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 DIV_AXEw(UINT32 op)
 {
 	UINT32 madr;
@@ -408,7 +408,7 @@ DIV_AXEw(UINT32 op)
 	EXCEPTION(DE_EXCEPTION, 0);
 }
 
-void
+void CPUCALL
 DIV_EAXEd(UINT32 op)
 {
 	UINT32 madr;
@@ -490,34 +490,31 @@ void DEC_EDI(void) { DWORD_DEC(CPU_EDI);
 /*
  * NEG
  */
-static UINT32
+static UINT32 CPUCALL
 NEG1(UINT32 src, void *arg)
 {
 	UINT32 dst;
-	(void)arg;
 	BYTE_NEG(dst, src);
 	return dst;
 }
 
-static UINT32
+static UINT32 CPUCALL
 NEG2(UINT32 src, void *arg)
 {
 	UINT32 dst;
-	(void)arg;
 	WORD_NEG(dst, src);
 	return dst;
 }
 
-static UINT32
+static UINT32 CPUCALL
 NEG4(UINT32 src, void *arg)
 {
 	UINT32 dst;
-	(void)arg;
 	DWORD_NEG(dst, src);
 	return dst;
 }
 
-void
+void CPUCALL
 NEG_Eb(UINT32 op)
 {
 	UINT8 *out;
@@ -536,7 +533,7 @@ NEG_Eb(UINT32 op)
 	}
 }
 
-void
+void CPUCALL
 NEG_Ew(UINT32 op)
 {
 	UINT16 *out;
@@ -555,7 +552,7 @@ NEG_Ew(UINT32 op)
 	}
 }
 
-void
+void CPUCALL
 NEG_Ed(UINT32 op)
 {
 	UINT32 *out;
@@ -701,7 +698,7 @@ CMP_EAXId(void)
 	DWORD_SUB(res, dst, src);
 }
 
-void
+void CPUCALL
 CMP_EbIb(UINT8 *regp, UINT32 src)
 {
 	UINT32 dst, res;
@@ -710,7 +707,7 @@ CMP_EbIb(UINT8 *regp, UINT32 src)
 	BYTE_SUB(res, dst, src);
 }
 
-void
+void CPUCALL
 CMP_EbIb_ext(UINT32 madr, UINT32 src)
 {
 	UINT32 dst, res;
@@ -719,7 +716,7 @@ CMP_EbIb_ext(UINT32 madr, UINT32 src)
 	BYTE_SUB(res, dst, src);
 }
 
-void
+void CPUCALL
 CMP_EwIx(UINT16 *regp, UINT32 src)
 {
 	UINT32 dst, res;
@@ -728,7 +725,7 @@ CMP_EwIx(UINT16 *regp, UINT32 src)
 	WORD_SUB(res, dst, src);
 }
 
-void
+void CPUCALL
 CMP_EwIx_ext(UINT32 madr, UINT32 src)
 {
 	UINT32 dst, res;
@@ -737,7 +734,7 @@ CMP_EwIx_ext(UINT32 madr, UINT32 src)
 	WORD_SUB(res, dst, src);
 }
 
-void
+void CPUCALL
 CMP_EdIx(UINT32 *regp, UINT32 src)
 {
 	UINT32 dst, res;
@@ -746,7 +743,7 @@ CMP_EdIx(UINT32 *regp, UINT32 src)
 	DWORD_SUB(res, dst, src);
 }
 
-void
+void CPUCALL
 CMP_EdIx_ext(UINT32 madr, UINT32 src)
 {
 	UINT32 dst, res;