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/mir_to_lir.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/mir_to_lir.cc')
-rw-r--r-- | compiler/dex/quick/mir_to_lir.cc | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc index 5d68187..1fc4163 100644 --- a/compiler/dex/quick/mir_to_lir.cc +++ b/compiler/dex/quick/mir_to_lir.cc @@ -92,7 +92,7 @@ RegStorage Mir2Lir::LoadArg(int in_position, RegisterClass reg_class, bool wide) if (!reg_arg.Valid()) { RegStorage new_reg = wide ? AllocTypedTempWide(false, reg_class) : AllocTypedTemp(false, reg_class); - LoadBaseDisp(TargetReg(kSp), offset, new_reg, wide ? k64 : k32, kNotVolatile); + LoadBaseDisp(TargetReg(kSp), offset, new_reg, wide ? k64 : k32); return new_reg; } else { // Check if we need to copy the arg to a different reg_class. @@ -120,7 +120,7 @@ RegStorage Mir2Lir::LoadArg(int in_position, RegisterClass reg_class, bool wide) // If the low part is not in a reg, we allocate a pair. Otherwise, we just load to high reg. if (!reg_arg_low.Valid()) { RegStorage new_regs = AllocTypedTempWide(false, reg_class); - LoadBaseDisp(TargetReg(kSp), offset, new_regs, k64, kNotVolatile); + LoadBaseDisp(TargetReg(kSp), offset, new_regs, k64); return new_regs; // The reg_class is OK, we can return. } else { // Assume that no ABI allows splitting a wide fp reg between a narrow fp reg and memory, @@ -193,7 +193,7 @@ void Mir2Lir::LoadArgDirect(int in_position, RegLocation rl_dest) { if (reg.Valid()) { OpRegCopy(rl_dest.reg, reg); } else { - LoadBaseDisp(TargetReg(kSp), offset, rl_dest.reg, k64, kNotVolatile); + LoadBaseDisp(TargetReg(kSp), offset, rl_dest.reg, k64); } return; } @@ -211,7 +211,7 @@ void Mir2Lir::LoadArgDirect(int in_position, RegLocation rl_dest) { OpRegCopy(rl_dest.reg.GetHigh(), reg_arg_high); Load32Disp(TargetReg(kSp), offset, rl_dest.reg.GetLow()); } else { - LoadBaseDisp(TargetReg(kSp), offset, rl_dest.reg, k64, kNotVolatile); + LoadBaseDisp(TargetReg(kSp), offset, rl_dest.reg, k64); } } } @@ -243,11 +243,14 @@ bool Mir2Lir::GenSpecialIGet(MIR* mir, const InlineMethod& special) { r_result = wide ? AllocTypedTempWide(rl_dest.fp, reg_class) : AllocTypedTemp(rl_dest.fp, reg_class); } - if (ref) { - LoadRefDisp(reg_obj, data.field_offset, r_result, data.is_volatile ? kVolatile : kNotVolatile); + if (data.is_volatile) { + LoadBaseDispVolatile(reg_obj, data.field_offset, r_result, size); + // Without context sensitive analysis, we must issue the most conservative barriers. + // In this case, either a load or store may follow so we issue both barriers. + GenMemBarrier(kLoadLoad); + GenMemBarrier(kLoadStore); } else { - LoadBaseDisp(reg_obj, data.field_offset, r_result, size, data.is_volatile ? kVolatile : - kNotVolatile); + LoadBaseDisp(reg_obj, data.field_offset, r_result, size); } if (r_result != rl_dest.reg) { if (wide) { @@ -285,11 +288,14 @@ bool Mir2Lir::GenSpecialIPut(MIR* mir, const InlineMethod& special) { RegStorage reg_obj = LoadArg(data.object_arg, kRefReg); RegisterClass reg_class = RegClassForFieldLoadStore(size, data.is_volatile); RegStorage reg_src = LoadArg(data.src_arg, reg_class, wide); - if (ref) { - StoreRefDisp(reg_obj, data.field_offset, reg_src, data.is_volatile ? kVolatile : kNotVolatile); + if (data.is_volatile) { + // There might have been a store before this volatile one so insert StoreStore barrier. + GenMemBarrier(kStoreStore); + StoreBaseDispVolatile(reg_obj, data.field_offset, reg_src, size); + // A load might follow the volatile store so insert a StoreLoad barrier. + GenMemBarrier(kStoreLoad); } else { - StoreBaseDisp(reg_obj, data.field_offset, reg_src, size, data.is_volatile ? kVolatile : - kNotVolatile); + StoreBaseDisp(reg_obj, data.field_offset, reg_src, size); } if (ref) { MarkGCCard(reg_src, reg_obj); |