commit 19abfb4f9af450e2ce3a801c5a0c34c4193e3e57
author Brian Carlstrom <bdc@google.com> Sun Apr 01 16:58:53 2012 -0700
committer Brian Carlstrom <bdc@google.com> Sun Apr 01 17:57:36 2012 -0700
tree a4a34b2b5fd0ad28f323ddf84748ed389bf261a1
parent 0045a290e6b79a274250e3112880c04bde437d4a

Properly pass 64-bit value from art_set32_static_from_code to artGet64StaticFromCode

Change-Id: I0770cc812e72386d2e28cb723ad573663b3e7254

src/oat/runtime/arm/runtime_support_arm.S

diff --git a/src/oat/runtime/arm/runtime_support_arm.S b/src/oat/runtime/arm/runtime_support_arm.S
index 045feac..6163b3e 100644
--- a/src/oat/runtime/arm/runtime_support_arm.S
+++ b/src/oat/runtime/arm/runtime_support_arm.S
@@ -504,13 +504,16 @@
     DELIVER_PENDING_EXCEPTION
 
     .global art_set64_static_from_code
-    .extern artSet32StaticFromCode
+    .extern artSet64StaticFromCode
     /*
      * Called by managed code to resolve a static field and store a 64-bit primitive value.
+     * On entry r0 holds field index, r1:r2 hold new_val
      */
     ALIGN_FUNCTION_ENTRY
 art_set64_static_from_code:
     SETUP_REF_ONLY_CALLEE_SAVE_FRAME     @ save callee saves in case of GC
+    mov    r3, r2                        @ pass one half of wide argument
+    mov    r2, r1                        @ pass other half of wide argument
     ldr    r1, [sp, #32]                 @ pass referrer
     mov    r12, sp                       @ save SP
     sub    sp, #8                        @ grow frame for alignment with stack args