From 1f277e3cef6c33cd35e91123978491d83338d2ad Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 21 May 2015 12:26:31 +0000 Subject: Revert "Introduce a NearLabel in thumb2." Fails some benchmarks and libcore tests. This reverts commit db0bbab279534974dca507946c66cff2d05dc9f9. Change-Id: I5d1afef5ede87e65d61f49529027c5c2f35b17fb --- compiler/utils/arm/assembler_arm.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'compiler/utils/arm/assembler_arm.h') diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h index a19a7645c2..dee8287e67 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -33,16 +33,6 @@ namespace arm { class Arm32Assembler; class Thumb2Assembler; -// This class indicates that the label and its uses -// will fall into a range that is encodable in 16bits on thumb2. -class NearLabel : public Label { - public: - NearLabel() {} - - private: - DISALLOW_COPY_AND_ASSIGN(NearLabel); -}; - class ShifterOperand { public: ShifterOperand() : type_(kUnknown), rm_(kNoRegister), rs_(kNoRegister), @@ -529,9 +519,6 @@ class ArmAssembler : public Assembler { // Branch instructions. virtual void b(Label* label, Condition cond = AL) = 0; - virtual void b(NearLabel* label, Condition cond = AL) { - b(reinterpret_cast(label), cond); - } virtual void bl(Label* label, Condition cond = AL) = 0; virtual void blx(Register rm, Condition cond = AL) = 0; virtual void bx(Register rm, Condition cond = AL) = 0; @@ -667,9 +654,6 @@ class ArmAssembler : public Assembler { virtual void Bind(Label* label) = 0; virtual void CompareAndBranchIfZero(Register r, Label* label) = 0; - virtual void CompareAndBranchIfZero(Register r, NearLabel* label) { - CompareAndBranchIfZero(r, reinterpret_cast(label)); - } virtual void CompareAndBranchIfNonZero(Register r, Label* label) = 0; // -- cgit v1.2.3-59-g8ed1b