diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-24 13:11:06 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-24 13:11:06 -0700 |
| commit | 0b95bf17e077b9d6c52514fec5ed122017111edb (patch) | |
| tree | b83f95f33a3531085de97e27673dd1e8550dc29d /runtime | |
| parent | 1a63351b4b68a9ffb4e55ce8185e13cda6893ec1 (diff) | |
| download | art-0b95bf17e077b9d6c52514fec5ed122017111edb.zip art-0b95bf17e077b9d6c52514fec5ed122017111edb.tar.gz art-0b95bf17e077b9d6c52514fec5ed122017111edb.tar.bz2 | |
Fix imt conflict trampoline for mips64
Changed lwu to ld
Bug: 21815962
Change-Id: I137e871d9c00f83cd5efc9d3a87fa05e84dc5d23
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/mips64/quick_entrypoints_mips64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/mips64/quick_entrypoints_mips64.S b/runtime/arch/mips64/quick_entrypoints_mips64.S index 7f68c6f..b662821 100644 --- a/runtime/arch/mips64/quick_entrypoints_mips64.S +++ b/runtime/arch/mips64/quick_entrypoints_mips64.S @@ -1373,7 +1373,7 @@ ENTRY art_quick_imt_conflict_trampoline dla $t9, art_quick_invoke_interface_trampoline .cpreturn jalr $zero, $t9 - lwu $a0, MIRROR_LONG_ARRAY_DATA_OFFSET($a0) # load the target method + ld $a0, MIRROR_LONG_ARRAY_DATA_OFFSET($a0) # load the target method END art_quick_imt_conflict_trampoline .extern artQuickResolutionTrampoline |