diff options
| author | 2014-11-05 23:10:54 +0000 | |
|---|---|---|
| committer | 2014-11-05 23:10:55 +0000 | |
| commit | 1991fed6e39fc97c2dd4d55af33818008b3906a1 (patch) | |
| tree | d38253ec1079145af18ea5c93d1bd7dde721a46d | |
| parent | 77dbcdd24fc99938c37ab0a32373466838ec8880 (diff) | |
| parent | 8ba17f6ce3853d4bdeee7527c9900e018781cf24 (diff) | |
Merge "Don't enable ARM_R4_SUSPEND_FLAG."
| -rw-r--r-- | compiler/dex/quick/arm/arm_lir.h | 2 | ||||
| -rw-r--r-- | compiler/dex/quick/arm/int_arm.cc | 2 | ||||
| -rw-r--r-- | runtime/arch/arm/asm_support_arm.h | 2 | ||||
| -rw-r--r-- | runtime/oat.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/compiler/dex/quick/arm/arm_lir.h b/compiler/dex/quick/arm/arm_lir.h index b2db36d831..4c7f87433d 100644 --- a/compiler/dex/quick/arm/arm_lir.h +++ b/compiler/dex/quick/arm/arm_lir.h @@ -97,7 +97,7 @@ namespace art { // First FP callee save. #define ARM_FP_CALLEE_SAVE_BASE 16 // Flag for using R4 to do suspend check -#define ARM_R4_SUSPEND_FLAG +// #define ARM_R4_SUSPEND_FLAG enum ArmResourceEncodingPos { kArmGPReg0 = 0, diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index ebf1905579..57544b5187 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -1102,7 +1102,7 @@ LIR* ArmMir2Lir::OpTestSuspend(LIR* target) { #else RegStorage t_reg = AllocTemp(); LoadBaseDisp(rs_rARM_SELF, Thread::ThreadFlagsOffset<4>().Int32Value(), - t_reg, kUnsignedHalf); + t_reg, kUnsignedHalf, kNotVolatile); LIR* cmp_branch = OpCmpImmBranch((target == NULL) ? kCondNe : kCondEq, t_reg, 0, target); FreeTemp(t_reg); diff --git a/runtime/arch/arm/asm_support_arm.h b/runtime/arch/arm/asm_support_arm.h index 8cd2a27b9b..1fa566bb5c 100644 --- a/runtime/arch/arm/asm_support_arm.h +++ b/runtime/arch/arm/asm_support_arm.h @@ -24,6 +24,6 @@ #define FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE 112 // Flag for enabling R4 optimization in arm runtime -#define ARM_R4_SUSPEND_FLAG +// #define ARM_R4_SUSPEND_FLAG #endif // ART_RUNTIME_ARCH_ARM_ASM_SUPPORT_ARM_H_ diff --git a/runtime/oat.cc b/runtime/oat.cc index d39b55cfcb..6bda6beac4 100644 --- a/runtime/oat.cc +++ b/runtime/oat.cc @@ -23,7 +23,7 @@ namespace art { const uint8_t OatHeader::kOatMagic[] = { 'o', 'a', 't', '\n' }; -const uint8_t OatHeader::kOatVersion[] = { '0', '4', '4', '\0' }; +const uint8_t OatHeader::kOatVersion[] = { '0', '4', '5', '\0' }; static size_t ComputeOatHeaderSize(const SafeMap<std::string, std::string>* variable_data) { size_t estimate = 0U; |