--- np2/i386c/ia32/instructions/bit_byte.c	2004/03/25 15:07:39	1.10
+++ np2/i386c/ia32/instructions/bit_byte.c	2011/12/29 13:32:13	1.13
@@ -1,5 +1,3 @@
-/*	$Id: bit_byte.c,v 1.10 2004/03/25 15:07:39 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -83,7 +79,7 @@ BT_EdGd(void)
 	CPU_FLAGL |= (dst >> BIT_INDEX32(src)) & 1;
 }
 
-void
+void CPUCALL
 BT_EwIb(UINT32 op)
 {
 	UINT32 src, dst, madr;
@@ -102,7 +98,7 @@ BT_EwIb(UINT32 op)
 	CPU_FLAGL |= (dst >> BIT_INDEX16(src)) & 1;
 }
 
-void
+void CPUCALL
 BT_EdIb(UINT32 op)
 {
 	UINT32 src, dst, madr;
@@ -194,7 +190,7 @@ BTS_EdGd(void)
 	}
 }
 
-void
+void CPUCALL
 BTS_EwIb(UINT32 op)
 {
 	UINT16 *out;
@@ -230,7 +226,7 @@ BTS_EwIb(UINT32 op)
 	}
 }
 
-void
+void CPUCALL
 BTS_EdIb(UINT32 op)
 {
 	UINT32 *out;
@@ -339,7 +335,7 @@ BTR_EdGd(void)
 	}
 }
 
-void
+void CPUCALL
 BTR_EwIb(UINT32 op)
 {
 	UINT16 *out;
@@ -375,7 +371,7 @@ BTR_EwIb(UINT32 op)
 	}
 }
 
-void
+void CPUCALL
 BTR_EdIb(UINT32 op)
 {
 	UINT32 *out;
@@ -484,7 +480,7 @@ BTC_EdGd(void)
 	}
 }
 
-void
+void CPUCALL
 BTC_EwIb(UINT32 op)
 {
 	UINT16 *out;
@@ -520,7 +516,7 @@ BTC_EwIb(UINT32 op)
 	}
 }
 
-void
+void CPUCALL
 BTC_EdIb(UINT32 op)
 {
 	UINT32 *out;
@@ -1008,7 +1004,7 @@ TEST_EAXId(void)
 	DWORD_AND(tmp, src);
 }
 
-void
+void CPUCALL
 TEST_EbIb(UINT32 op)
 {
 	UINT32 src, tmp, madr;
@@ -1025,7 +1021,7 @@ TEST_EbIb(UINT32 op)
 	BYTE_AND(tmp, src);
 }
 
-void
+void CPUCALL
 TEST_EwIw(UINT32 op)
 {
 	UINT32 src, tmp, madr;
@@ -1042,7 +1038,7 @@ TEST_EwIw(UINT32 op)
 	WORD_AND(tmp, src);
 }
 
-void
+void CPUCALL
 TEST_EdId(UINT32 op)
 {
 	UINT32 src, tmp, madr;