--- np2/i386c/ia32/instructions/string_inst.c	2003/12/08 00:55:32	1.1
+++ np2/i386c/ia32/instructions/string_inst.c	2011/01/15 17:17:23	1.4
@@ -1,5 +1,3 @@
-/*	$Id: string_inst.c,v 1.1 2003/12/08 00:55:32 yui 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
@@ -38,7 +34,7 @@
 void
 MOVSB_XbYb(void)
 {
-	BYTE tmp;
+	UINT8 tmp;
 
 	CPU_WORKCLOCK(5);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -58,7 +54,7 @@ MOVSB_XbYb(void)
 void
 MOVSW_XwYw(void)
 {
-	WORD tmp;
+	UINT16 tmp;
 
 	CPU_WORKCLOCK(5);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -78,7 +74,7 @@ MOVSW_XwYw(void)
 void
 MOVSD_XdYd(void)
 {
-	DWORD tmp;
+	UINT32 tmp;
 
 	CPU_WORKCLOCK(5);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -100,7 +96,7 @@ MOVSD_XdYd(void)
 void
 CMPSB_XbYb(void)
 {
-	DWORD src, dst, res;
+	UINT32 src, dst, res;
 
 	CPU_WORKCLOCK(8);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -122,7 +118,7 @@ CMPSB_XbYb(void)
 void
 CMPSW_XwYw(void)
 {
-	DWORD src, dst, res;
+	UINT32 src, dst, res;
 
 	CPU_WORKCLOCK(8);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -144,7 +140,7 @@ CMPSW_XwYw(void)
 void
 CMPSD_XdYd(void)
 {
-	DWORD src, dst, res;
+	UINT32 src, dst, res;
 
 	CPU_WORKCLOCK(8);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
@@ -168,7 +164,7 @@ CMPSD_XdYd(void)
 void
 SCASB_ALXb(void)
 {
-	DWORD src, dst, res;
+	UINT32 src, dst, res;
 
 	CPU_WORKCLOCK(7);
 	dst = CPU_AL;
@@ -186,7 +182,7 @@ SCASB_ALXb(void)
 void
 SCASW_AXXw(void)
 {
-	DWORD src, dst, res;
+	UINT32 src, dst, res;
 
 	CPU_WORKCLOCK(7);
 	dst = CPU_AX;
@@ -204,7 +200,7 @@ SCASW_AXXw(void)
 void
 SCASD_EAXXd(void)
 {
-	DWORD src, dst, res;
+	UINT32 src, dst, res;
 
 	CPU_WORKCLOCK(7);
 	dst = CPU_EAX;
@@ -331,9 +327,9 @@ _REPE(void)
 void
 INSB_YbDX(void)
 {
-	BYTE data;
+	UINT8 data;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	data = cpu_in(CPU_DX);
 	if (!CPU_INST_AS32) {
 		cpu_vmemorywrite(CPU_ES_INDEX, CPU_DI, data);
@@ -347,9 +343,9 @@ INSB_YbDX(void)
 void
 INSW_YwDX(void)
 {
-	WORD data;
+	UINT16 data;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	data = cpu_in_w(CPU_DX);
 	if (!CPU_INST_AS32) {
 		cpu_vmemorywrite_w(CPU_ES_INDEX, CPU_DI, data);
@@ -363,9 +359,9 @@ INSW_YwDX(void)
 void
 INSD_YdDX(void)
 {
-	DWORD data;
+	UINT32 data;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(12);
 	data = cpu_in_d(CPU_DX);
 	if (!CPU_INST_AS32) {
 		cpu_vmemorywrite_d(CPU_ES_INDEX, CPU_DI, data);
@@ -381,9 +377,9 @@ INSD_YdDX(void)
 void
 OUTSB_DXXb(void)
 {
-	BYTE data;
+	UINT8 data;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(14);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
 	if (!CPU_INST_AS32) {
 		data = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, CPU_SI);
@@ -399,9 +395,9 @@ OUTSB_DXXb(void)
 void
 OUTSW_DXXw(void)
 {
-	WORD data;
+	UINT16 data;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(14);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
 	if (!CPU_INST_AS32) {
 		data = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, CPU_SI);
@@ -417,9 +413,9 @@ OUTSW_DXXw(void)
 void
 OUTSD_DXXd(void)
 {
-	DWORD data;
+	UINT32 data;
 
-	CPU_WORKCLOCK(5);
+	CPU_WORKCLOCK(14);
 	CPU_INST_SEGREG_INDEX = DS_FIX;
 	if (!CPU_INST_AS32) {
 		data = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, CPU_SI);