gwj / at91sam9263 · Commits

Commit bf7c65bdf482923f34c3cbb42bd93f10416e3025

Authored by bellard
1 parent 8e5a0667

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
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
op_string.h
  View file @bf7c65b
... ... @@ -193,7 +193,7 @@ void OPPROTO glue(glue(op_outs, SUFFIX), STRING_SUFFIX)(void)
193 193 int v, dx, inc;
194 194 dx = EDX & 0xffff;
195 195 v = glue(ldu, SUFFIX)(SI_ADDR);
196   - glue(cpu_x86_out, SUFFIX)(dx, v);
  196 + glue(cpu_x86_out, SUFFIX)(env, dx, v);
197 197 inc = (DF << SHIFT);
198 198 INC_SI();
199 199 }
... ... @@ -205,7 +205,7 @@ void OPPROTO glue(glue(op_rep_outs, SUFFIX), STRING_SUFFIX)(void)
205 205 dx = EDX & 0xffff;
206 206 while (CX != 0) {
207 207 v = glue(ldu, SUFFIX)(SI_ADDR);
208   - glue(cpu_x86_out, SUFFIX)(dx, v);
  208 + glue(cpu_x86_out, SUFFIX)(env, dx, v);
209 209 INC_SI();
210 210 DEC_CX();
211 211 }
... ... @@ -216,7 +216,7 @@ void OPPROTO glue(glue(op_ins, SUFFIX), STRING_SUFFIX)(void)
216 216 {
217 217 int v, dx, inc;
218 218 dx = EDX & 0xffff;
219   - v = glue(cpu_x86_in, SUFFIX)(dx);
  219 + v = glue(cpu_x86_in, SUFFIX)(env, dx);
220 220 glue(st, SUFFIX)(DI_ADDR, v);
221 221 inc = (DF << SHIFT);
222 222 INC_DI();
... ... @@ -228,7 +228,7 @@ void OPPROTO glue(glue(op_rep_ins, SUFFIX), STRING_SUFFIX)(void)
228 228 inc = (DF << SHIFT);
229 229 dx = EDX & 0xffff;
230 230 while (CX != 0) {
231   - v = glue(cpu_x86_in, SUFFIX)(dx);
  231 + v = glue(cpu_x86_in, SUFFIX)(env, dx);
232 232 glue(st, SUFFIX)(DI_ADDR, v);
233 233 INC_DI();
234 234 DEC_CX();
... ...
ops_template.h
  View file @bf7c65b
... ... @@ -843,12 +843,12 @@ void OPPROTO glue(glue(op_bsr, SUFFIX), _T0_cc)(void)
843 843  
844 844 void OPPROTO glue(glue(op_out, SUFFIX), _T0_T1)(void)
845 845 {
846   - glue(cpu_x86_out, SUFFIX)(T0 & 0xffff, T1 & DATA_MASK);
  846 + glue(cpu_x86_out, SUFFIX)(env, T0 & 0xffff, T1 & DATA_MASK);
847 847 }
848 848  
849 849 void OPPROTO glue(glue(op_in, SUFFIX), _T0_T1)(void)
850 850 {
851   - T1 = glue(cpu_x86_in, SUFFIX)(T0 & 0xffff);
  851 + T1 = glue(cpu_x86_in, SUFFIX)(env, T0 & 0xffff);
852 852 }
853 853  
854 854 #undef DATA_BITS
... ...