x86 mterp: reduce x86/x86-atom differences

[android-x86/dalvik.git] / vm / mterp / x86 / OP_MOVE_WIDE_16.S

diff --git a/vm/mterp/x86/OP_MOVE_WIDE_16.S b/vm/mterp/x86/OP_MOVE_WIDE_16.S
index d7be1d1..4cec42c 100644 (file)
--- a/vm/mterp/x86/OP_MOVE_WIDE_16.S
+++ b/vm/mterp/x86/OP_MOVE_WIDE_16.S
@@ -3,10 +3,10 @@
     /* NOTE: regs can overlap, e.g. "move v6,v7" or "move v7,v6" */
     movzwl    4(rPC),%ecx            # ecx<- BBBB
     movzwl    2(rPC),%eax            # eax<- AAAA
-    GET_VREG_WORD(rINST_FULL,%ecx,0) # rINST_WORD<- v[BBBB+0]
-    GET_VREG_WORD(%ecx,%ecx,1)       # ecx<- v[BBBB+1]
-    SET_VREG_WORD(rINST_FULL,%eax,0) # v[AAAA+0]<- rINST_FULL
-    FETCH_INST_WORD(3)
-    ADVANCE_PC(3)
-    SET_VREG_WORD(%ecx,%eax,1)       # v[AAAA+1]<- ecx
-    GOTO_NEXT
+    GET_VREG_WORD rINST %ecx 0       # rINSTw_WORD<- v[BBBB+0]
+    GET_VREG_WORD %ecx %ecx 1        # ecx<- v[BBBB+1]
+    FETCH_INST_OPCODE 3 %edx
+    SET_VREG_WORD rINST %eax 0       # v[AAAA+0]<- rINST
+    ADVANCE_PC 3
+    SET_VREG_WORD %ecx %eax 1        # v[AAAA+1]<- ecx
+    GOTO_NEXT_R %edx