summaryrefslogtreecommitdiffstats
path: root/runtime/arch
diff options
context:
space:
mode:
authorGoran Jakovljevic <Goran.Jakovljevic@imgtec.com>2015-04-03 15:45:21 +0200
committerAndreas Gampe <agampe@google.com>2015-04-06 15:43:02 -0700
commit75c40d419b621342ac834e5b61abcdcd84537063 (patch)
tree2066ed8e4c6bad6221d2512132444696bdde89b1 /runtime/arch
parent9104503b4053231d518c3e796033ee01f02bcdf1 (diff)
downloadart-75c40d419b621342ac834e5b61abcdcd84537063.tar.gz
art-75c40d419b621342ac834e5b61abcdcd84537063.tar.bz2
art-75c40d419b621342ac834e5b61abcdcd84537063.zip
Fix JNI compiler for mips64
Fix assembly instructions in JNI stub to store the right size. Fix callee-saves in JNI calling convention to reflect return registers. Fix pointer size in mips64 assembler. Change-Id: I4eccd1f56f62fa9119918192ec424e9073398bc7
Diffstat (limited to 'runtime/arch')
-rw-r--r--runtime/arch/mips64/jni_entrypoints_mips64.S16
1 files changed, 8 insertions, 8 deletions
diff --git a/runtime/arch/mips64/jni_entrypoints_mips64.S b/runtime/arch/mips64/jni_entrypoints_mips64.S
index 90fd3ee63e..10856668a2 100644
--- a/runtime/arch/mips64/jni_entrypoints_mips64.S
+++ b/runtime/arch/mips64/jni_entrypoints_mips64.S
@@ -28,21 +28,21 @@ ENTRY art_jni_dlsym_lookup_stub
.cfi_adjust_cfa_offset 80
sd $ra, 64($sp)
.cfi_rel_offset 31, 64
- sw $a7, 56($sp)
+ sd $a7, 56($sp)
.cfi_rel_offset 11, 56
- sw $a6, 48($sp)
+ sd $a6, 48($sp)
.cfi_rel_offset 10, 48
- sw $a5, 40($sp)
+ sd $a5, 40($sp)
.cfi_rel_offset 9, 40
- sw $a4, 32($sp)
+ sd $a4, 32($sp)
.cfi_rel_offset 8, 32
- sw $a3, 24($sp)
+ sd $a3, 24($sp)
.cfi_rel_offset 7, 24
- sw $a2, 16($sp)
+ sd $a2, 16($sp)
.cfi_rel_offset 6, 16
- sw $a1, 8($sp)
+ sd $a1, 8($sp)
.cfi_rel_offset 5, 8
- sw $a0, 0($sp)
+ sd $a0, 0($sp)
.cfi_rel_offset 4, 0
jal artFindNativeMethod # (Thread*)
move $a0, $s1 # pass Thread::Current()