--- np2/i386c/ia32/instructions/system_inst.h	2004/01/14 16:14:50	1.2
+++ np2/i386c/ia32/instructions/system_inst.h	2011/12/29 13:32:13	1.6
@@ -1,5 +1,3 @@
-/*	$Id: system_inst.h,v 1.2 2004/01/14 16:14:50 monaka Exp $	*/
-
 /*
  * Copyright (c) 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
@@ -35,22 +31,22 @@ extern "C" {
 #endif
 
 /* Load/Store system register */
-void LGDT_Ms(DWORD op);
-void SGDT_Ms(DWORD op);
-void LLDT_Ew(DWORD op);
-void SLDT_Ew(DWORD op);
-void LTR_Ew(DWORD op);
-void STR_Ew(DWORD op);
-void LIDT_Ms(DWORD op);
-void SIDT_Ms(DWORD op);
+void CPUCALL LGDT_Ms(UINT32);
+void CPUCALL SGDT_Ms(UINT32);
+void CPUCALL LLDT_Ew(UINT32);
+void CPUCALL SLDT_Ew(UINT32);
+void CPUCALL LTR_Ew(UINT32);
+void CPUCALL STR_Ew(UINT32);
+void CPUCALL LIDT_Ms(UINT32);
+void CPUCALL SIDT_Ms(UINT32);
 
 /* ctrl reg */
 void MOV_CdRd(void);
 void MOV_RdCd(void);
 
 /* msw */
-void LMSW_Ew(DWORD op);
-void SMSW_Ew(DWORD op);
+void CPUCALL LMSW_Ew(UINT32);
+void CPUCALL SMSW_Ew(UINT32);
 
 /* */
 void CLTS(void);
@@ -63,8 +59,8 @@ void LSL_GwEw(void);
 void LSL_GdEw(void);
 
 /* */
-void VERR_Ew(DWORD op);
-void VERW_Ew(DWORD op);
+void CPUCALL VERR_Ew(UINT32);
+void CPUCALL VERW_Ew(UINT32);
 
 /* dbg reg */
 void MOV_DdRd(void);
@@ -75,7 +71,7 @@ void INVD(void);
 void WBINVD(void);
 
 /* */
-void INVLPG(DWORD op);
+void CPUCALL INVLPG(UINT32);
 
 /* */
 void _LOCK(void);