commit d47fd907c898e0b8d4a4e50742f9b2f3003b906f
author Bill Buzbee <buzbee@google.com> Thu Jul 07 14:42:43 2016 +0000
committer buzbee <buzbee@google.com> Thu Jul 07 08:16:27 2016 -0700
tree dd6188a191d3d1d9eeb199fd538af4fc3ff6639f
parent 9fa78522de3eef6277631284598781479f289b0c

Revert "Revert "ART: Add Mterp export pc poison testing mode""

This reverts commit d7af522c0f03cd926b13bbef7c21a8a504969f36.

Fixes mips assembly typo: "mov" -> "move"

TEST: Previously tested arm/arm64/x86/x86_64 via test-art-host,
test-art-target plus injected error.  Neglected to test mips
builds.  Now those tested as well.

Change-Id: If2f9fb06973f8c1220a7d7699d79e6b9f1ce3197

runtime/interpreter/mterp/arm/alt_stub.S

diff --git a/runtime/interpreter/mterp/arm/alt_stub.S b/runtime/interpreter/mterp/arm/alt_stub.S
index 92ae0c6..9db5bf7 100644
--- a/runtime/interpreter/mterp/arm/alt_stub.S
+++ b/runtime/interpreter/mterp/arm/alt_stub.S
@@ -4,9 +4,9 @@
  * handler.  Note that the call to MterpCheckBefore is done as a tail call.
  */
     .extern MterpCheckBefore
-    EXPORT_PC
     ldr    rIBASE, [rSELF, #THREAD_CURRENT_IBASE_OFFSET]            @ refresh IBASE.
     adrl   lr, artMterpAsmInstructionStart + (${opnum} * 128)       @ Addr of primary handler.
     mov    r0, rSELF
     add    r1, rFP, #OFF_FP_SHADOWFRAME
-    b      MterpCheckBefore     @ (self, shadow_frame)              @ Tail call.
+    mov    r2, rPC
+    b      MterpCheckBefore     @ (self, shadow_frame, dex_pc_ptr)  @ Tail call.