diff options
| author | Andreas Gampe <agampe@google.com> | 2014-06-24 18:42:06 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-06-24 18:42:06 +0000 |
| commit | de68676b24f61a55adc0b22fe828f036a5925c41 (patch) | |
| tree | c71dacfb709787b57fba2ce117fb8ba120d7b150 /compiler/dex/quick/arm/codegen_arm.h | |
| parent | 2689fbad6b5ec1ae8f8c8791a80c6fd3cf24144d (diff) | |
| download | android_art-de68676b24f61a55adc0b22fe828f036a5925c41.tar.gz android_art-de68676b24f61a55adc0b22fe828f036a5925c41.tar.bz2 android_art-de68676b24f61a55adc0b22fe828f036a5925c41.zip | |
Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"
This reverts commit 2689fbad6b5ec1ae8f8c8791a80c6fd3cf24144d.
Breaks the build.
Change-Id: I9faad4e9a83b32f5f38b2ef95d6f9a33345efa33
Diffstat (limited to 'compiler/dex/quick/arm/codegen_arm.h')
| -rw-r--r-- | compiler/dex/quick/arm/codegen_arm.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/dex/quick/arm/codegen_arm.h b/compiler/dex/quick/arm/codegen_arm.h index 70dce7f11e..44998627ca 100644 --- a/compiler/dex/quick/arm/codegen_arm.h +++ b/compiler/dex/quick/arm/codegen_arm.h @@ -33,16 +33,20 @@ class ArmMir2Lir FINAL : public Mir2Lir { LIR* CheckSuspendUsingLoad() OVERRIDE; RegStorage LoadHelper(ThreadOffset<4> offset) OVERRIDE; RegStorage LoadHelper(ThreadOffset<8> offset) OVERRIDE; + LIR* LoadBaseDispVolatile(RegStorage r_base, int displacement, RegStorage r_dest, + OpSize size) OVERRIDE; LIR* LoadBaseDisp(RegStorage r_base, int displacement, RegStorage r_dest, - OpSize size, VolatileKind is_volatile) OVERRIDE; + OpSize size) OVERRIDE; LIR* LoadBaseIndexed(RegStorage r_base, RegStorage r_index, RegStorage r_dest, int scale, OpSize size) OVERRIDE; LIR* LoadBaseIndexedDisp(RegStorage r_base, RegStorage r_index, int scale, int displacement, RegStorage r_dest, OpSize size) OVERRIDE; LIR* LoadConstantNoClobber(RegStorage r_dest, int value); LIR* LoadConstantWide(RegStorage r_dest, int64_t value); + LIR* StoreBaseDispVolatile(RegStorage r_base, int displacement, RegStorage r_src, + OpSize size) OVERRIDE; LIR* StoreBaseDisp(RegStorage r_base, int displacement, RegStorage r_src, - OpSize size, VolatileKind is_volatile) OVERRIDE; + OpSize size) OVERRIDE; LIR* StoreBaseIndexed(RegStorage r_base, RegStorage r_index, RegStorage r_src, int scale, OpSize size) OVERRIDE; LIR* StoreBaseIndexedDisp(RegStorage r_base, RegStorage r_index, int scale, int displacement, |