diff --git a/target-i386/ops_template.h b/target-i386/ops_template.h
index 4ea94e4a7dd64978fdd4acdbbae95a270d453c11..5ffde89e48f78ef1766e9cdc3cc9bddb5ec87c8d 100644
--- a/target-i386/ops_template.h
+++ b/target-i386/ops_template.h
@@ -621,22 +621,22 @@ void OPPROTO glue(glue(op_jz_ecx, SUFFIX), _im)(void)
 
 void OPPROTO glue(glue(op_out, SUFFIX), _T0_T1)(void)
 {
-    glue(cpu_x86_out, SUFFIX)(env, T0, T1 & DATA_MASK);
+    glue(cpu_out, SUFFIX)(env, T0, T1 & DATA_MASK);
 }
 
 void OPPROTO glue(glue(op_in, SUFFIX), _T0_T1)(void)
 {
-    T1 = glue(cpu_x86_in, SUFFIX)(env, T0);
+    T1 = glue(cpu_in, SUFFIX)(env, T0);
 }
 
 void OPPROTO glue(glue(op_in, SUFFIX), _DX_T0)(void)
 {
-    T0 = glue(cpu_x86_in, SUFFIX)(env, EDX & 0xffff);
+    T0 = glue(cpu_in, SUFFIX)(env, EDX & 0xffff);
 }
 
 void OPPROTO glue(glue(op_out, SUFFIX), _DX_T0)(void)
 {
-    glue(cpu_x86_out, SUFFIX)(env, EDX & 0xffff, T0);
+    glue(cpu_out, SUFFIX)(env, EDX & 0xffff, T0);
 }
 
 void OPPROTO glue(glue(op_check_io, SUFFIX), _T0)(void)