changed I/O function prototype to include emulator state

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@133 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/op_string.h b/op_string.h
index 9d0b454c30dd180bd5df8305acf4b02a768a3706..c7ff74c05c50fd413eb9d728777803198a0a7522 100644 (file)
--- a/op_string.h
+++ b/op_string.h
@@ -193,7 +193,7 @@ void OPPROTO glue(glue(op_outs, SUFFIX), STRING_SUFFIX)(void)
     int v, dx, inc;
     dx = EDX & 0xffff;
     v = glue(ldu, SUFFIX)(SI_ADDR);
-    glue(cpu_x86_out, SUFFIX)(dx, v);
+    glue(cpu_x86_out, SUFFIX)(env, dx, v);
     inc = (DF << SHIFT);
     INC_SI();
 }
@@ -205,7 +205,7 @@ void OPPROTO glue(glue(op_rep_outs, SUFFIX), STRING_SUFFIX)(void)
     dx = EDX & 0xffff;
     while (CX != 0) {
         v = glue(ldu, SUFFIX)(SI_ADDR);
-        glue(cpu_x86_out, SUFFIX)(dx, v);
+        glue(cpu_x86_out, SUFFIX)(env, dx, v);
         INC_SI();
         DEC_CX();
     }
@@ -216,7 +216,7 @@ void OPPROTO glue(glue(op_ins, SUFFIX), STRING_SUFFIX)(void)
 {
     int v, dx, inc;
     dx = EDX & 0xffff;
-    v = glue(cpu_x86_in, SUFFIX)(dx);
+    v = glue(cpu_x86_in, SUFFIX)(env, dx);
     glue(st, SUFFIX)(DI_ADDR, v);
     inc = (DF << SHIFT);
     INC_DI();
@@ -228,7 +228,7 @@ void OPPROTO glue(glue(op_rep_ins, SUFFIX), STRING_SUFFIX)(void)
     inc = (DF << SHIFT);
     dx = EDX & 0xffff;
     while (CX != 0) {
-        v = glue(cpu_x86_in, SUFFIX)(dx);
+        v = glue(cpu_x86_in, SUFFIX)(env, dx);
         glue(st, SUFFIX)(DI_ADDR, v);
         INC_DI();
         DEC_CX();

diff --git a/ops_template.h b/ops_template.h
index b734d0f4508e2ca41dc5f276de1a019172eb9008..4cada782c2206f489cff13c2c3d35e63aab24f8b 100644 (file)
--- a/ops_template.h
+++ b/ops_template.h
@@ -843,12 +843,12 @@ void OPPROTO glue(glue(op_bsr, SUFFIX), _T0_cc)(void)
 
 void OPPROTO glue(glue(op_out, SUFFIX), _T0_T1)(void)
 {
-    glue(cpu_x86_out, SUFFIX)(T0 & 0xffff, T1 & DATA_MASK);
+    glue(cpu_x86_out, SUFFIX)(env, T0 & 0xffff, T1 & DATA_MASK);
 }
 
 void OPPROTO glue(glue(op_in, SUFFIX), _T0_T1)(void)
 {
-    T1 = glue(cpu_x86_in, SUFFIX)(T0 & 0xffff);
+    T1 = glue(cpu_x86_in, SUFFIX)(env, T0 & 0xffff);
 }
 
 #undef DATA_BITS