commit a4a19037f75e0e3c85fb5f3c7fa31732f8475719
author buzbee <buzbee@google.com> Tue Apr 05 10:55:21 2011 -0700
committer buzbee <buzbee@google.com> Tue Apr 05 10:55:21 2011 -0700
tree f163d0ebf941be92c05c688cd17158cc97519e06
parent 8b94be1f80b135e7a5c1f542861f3e80c4c52823

Fix x86 fast interpreter

Was passing wrong value to dvmResolveField() in OP_IGET_WIDE_JUMBO

Change-Id: I7773fd0932d7d032fce30dc57b33ef6a8fbc7afb

vm/mterp/out/InterpAsm-x86.S

diff --git a/vm/mterp/out/InterpAsm-x86.S b/vm/mterp/out/InterpAsm-x86.S
index ed9b4e9..68fccd1 100644
--- a/vm/mterp/out/InterpAsm-x86.S
+++ b/vm/mterp/out/InterpAsm-x86.S
@@ -8433,7 +8433,7 @@
     movl    offThread_method(rIBASE),rIBASE     # rIBASE<- current method
     movl    offMethod_clazz(rIBASE),rIBASE      # rIBASE<- method->clazz
     SPILL_TMP1(%ecx)                            # save objpointer across call
-    movl    rPC,OUT_ARG0(%esp)                  # pass in method->clazz
+    movl    rIBASE,OUT_ARG0(%esp)               # pass in method->clazz
     call    dvmResolveInstField                 #  ... to dvmResolveInstField
     UNSPILL_TMP1(%ecx)
     testl   %eax,%eax                           # returns InstrField ptr

vm/mterp/x86/OP_IGET_WIDE_JUMBO.S

diff --git a/vm/mterp/x86/OP_IGET_WIDE_JUMBO.S b/vm/mterp/x86/OP_IGET_WIDE_JUMBO.S
index f20970f..5e253d5 100644
--- a/vm/mterp/x86/OP_IGET_WIDE_JUMBO.S
+++ b/vm/mterp/x86/OP_IGET_WIDE_JUMBO.S
@@ -23,7 +23,7 @@
     movl    offThread_method(rIBASE),rIBASE     # rIBASE<- current method
     movl    offMethod_clazz(rIBASE),rIBASE      # rIBASE<- method->clazz
     SPILL_TMP1(%ecx)                            # save objpointer across call
-    movl    rPC,OUT_ARG0(%esp)                  # pass in method->clazz
+    movl    rIBASE,OUT_ARG0(%esp)               # pass in method->clazz
     call    dvmResolveInstField                 #  ... to dvmResolveInstField
     UNSPILL_TMP1(%ecx)
     testl   %eax,%eax                           # returns InstrField ptr