diff options
| author | Andreas Gampe <agampe@google.com> | 2014-06-24 18:44:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-24 18:00:13 +0000 |
| commit | fbd18f1923334f3208cfe6ba5f1d4f9eb421b063 (patch) | |
| tree | 79eefb2dd1ae2cade357ef5d8367973bd08b0a34 /compiler/dex/quick/x86/target_x86.cc | |
| parent | 7e47f713067b55e24b5d24f2c892ceefd7971ebf (diff) | |
| parent | de68676b24f61a55adc0b22fe828f036a5925c41 (diff) | |
| download | art-fbd18f1923334f3208cfe6ba5f1d4f9eb421b063.zip art-fbd18f1923334f3208cfe6ba5f1d4f9eb421b063.tar.gz art-fbd18f1923334f3208cfe6ba5f1d4f9eb421b063.tar.bz2 | |
Merge "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter""
Diffstat (limited to 'compiler/dex/quick/x86/target_x86.cc')
| -rw-r--r-- | compiler/dex/quick/x86/target_x86.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/compiler/dex/quick/x86/target_x86.cc b/compiler/dex/quick/x86/target_x86.cc index e369d26..078dd5a 100644 --- a/compiler/dex/quick/x86/target_x86.cc +++ b/compiler/dex/quick/x86/target_x86.cc @@ -1866,7 +1866,7 @@ void X86Mir2Lir::FlushIns(RegLocation* ArgLocs, RegLocation rl_method) { StoreValue(rl_method, rl_src); // If Method* has been promoted, explicitly flush if (rl_method.location == kLocPhysReg) { - StoreRefDisp(TargetReg(kSp), 0, TargetReg(kArg0), kNotVolatile); + StoreRefDisp(TargetReg(kSp), 0, TargetReg(kArg0)); } if (cu_->num_ins == 0) { @@ -1916,11 +1916,11 @@ void X86Mir2Lir::FlushIns(RegLocation* ArgLocs, RegLocation rl_method) { } if (need_flush) { if (t_loc->wide && t_loc->fp) { - StoreBaseDisp(TargetReg(kSp), SRegOffset(start_vreg + i), reg, k64, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), SRegOffset(start_vreg + i), reg, k64); // Increment i to skip the next one i++; } else if (t_loc->wide && !t_loc->fp) { - StoreBaseDisp(TargetReg(kSp), SRegOffset(start_vreg + i), reg, k64, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), SRegOffset(start_vreg + i), reg, k64); // Increment i to skip the next one i++; } else { @@ -2018,14 +2018,14 @@ int X86Mir2Lir::GenDalvikArgsRange(CallInfo* info, int call_state, loc = UpdateLocWide(loc); if (loc.location == kLocPhysReg) { ScopedMemRefType mem_ref_type(this, ResourceMask::kDalvikReg); - StoreBaseDisp(TargetReg(kSp), SRegOffset(loc.s_reg_low), loc.reg, k64, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), SRegOffset(loc.s_reg_low), loc.reg, k64); } next_arg += 2; } else { loc = UpdateLoc(loc); if (loc.location == kLocPhysReg) { ScopedMemRefType mem_ref_type(this, ResourceMask::kDalvikReg); - StoreBaseDisp(TargetReg(kSp), SRegOffset(loc.s_reg_low), loc.reg, k32, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), SRegOffset(loc.s_reg_low), loc.reg, k32); } next_arg++; } @@ -2161,18 +2161,18 @@ int X86Mir2Lir::GenDalvikArgsRange(CallInfo* info, int call_state, ScopedMemRefType mem_ref_type(this, ResourceMask::kDalvikReg); if (rl_arg.wide) { if (rl_arg.location == kLocPhysReg) { - StoreBaseDisp(TargetReg(kSp), out_offset, rl_arg.reg, k64, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), out_offset, rl_arg.reg, k64); } else { LoadValueDirectWideFixed(rl_arg, regWide); - StoreBaseDisp(TargetReg(kSp), out_offset, regWide, k64, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), out_offset, regWide, k64); } i++; } else { if (rl_arg.location == kLocPhysReg) { - StoreBaseDisp(TargetReg(kSp), out_offset, rl_arg.reg, k32, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), out_offset, rl_arg.reg, k32); } else { LoadValueDirectFixed(rl_arg, regSingle); - StoreBaseDisp(TargetReg(kSp), out_offset, regSingle, k32, kNotVolatile); + StoreBaseDisp(TargetReg(kSp), out_offset, regSingle, k32); } } } |