diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-10 16:09:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-10 16:09:25 +0000 |
| commit | f719fdd20e6282f3579cb99529bb65e852612647 (patch) | |
| tree | 668bc03809956d3a7a9967283881d284f950335a | |
| parent | 7e9c99bd850e22b8a5e2b5419bcf0b1abf0e29e5 (diff) | |
| parent | 6ad40cd6f28c5d3a75929a20eb18da32ef0ab421 (diff) | |
| download | art-f719fdd20e6282f3579cb99529bb65e852612647.tar.gz art-f719fdd20e6282f3579cb99529bb65e852612647.tar.bz2 art-f719fdd20e6282f3579cb99529bb65e852612647.zip | |
Merge "[MIPS64] Fix GenInlinedPeek and GenInlinedPoke functions."
| -rw-r--r-- | compiler/dex/quick/mips64/int_mips64.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/dex/quick/mips64/int_mips64.cc b/compiler/dex/quick/mips64/int_mips64.cc index 9023970519..8a57c82575 100644 --- a/compiler/dex/quick/mips64/int_mips64.cc +++ b/compiler/dex/quick/mips64/int_mips64.cc @@ -260,9 +260,8 @@ bool Mips64Mir2Lir::GenInlinedPeek(CallInfo* info, OpSize size) { return false; } RegLocation rl_src_address = info->args[0]; // Long address. - rl_src_address = NarrowRegLoc(rl_src_address); // Ignore high half in info->args[1]. RegLocation rl_dest = InlineTarget(info); - RegLocation rl_address = LoadValue(rl_src_address, kCoreReg); + RegLocation rl_address = LoadValueWide(rl_src_address, kCoreReg); RegLocation rl_result = EvalLoc(rl_dest, kCoreReg, true); DCHECK(size == kSignedByte); LoadBaseDisp(rl_address.reg, 0, rl_result.reg, size, kNotVolatile); @@ -276,9 +275,8 @@ bool Mips64Mir2Lir::GenInlinedPoke(CallInfo* info, OpSize size) { return false; } RegLocation rl_src_address = info->args[0]; // Long address. - rl_src_address = NarrowRegLoc(rl_src_address); // Ignore high half in info->args[1]. RegLocation rl_src_value = info->args[2]; // [size] value. - RegLocation rl_address = LoadValue(rl_src_address, kCoreReg); + RegLocation rl_address = LoadValueWide(rl_src_address, kCoreReg); DCHECK(size == kSignedByte); RegLocation rl_value = LoadValue(rl_src_value, kCoreReg); StoreBaseDisp(rl_address.reg, 0, rl_value.reg, size, kNotVolatile); |