From 12e097c84cef710fa4f254b1811ff70b876e9e9a Mon Sep 17 00:00:00 2001 From: Artem Serov Date: Mon, 8 Aug 2016 15:13:26 +0100 Subject: ARM: VIXL32: Implement VIXL-based assembler. This patch introduces new ARM assembler (Thumb2) based on VIXL and ARM VIXL JNI Macro Assembler. Both are turned off by default (JNI one will be turned on in the following patch). Change-Id: I5f7eb35da5318d7170b3c7e8553364ebe29cc991 --- compiler/utils/arm/assembler_arm.h | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 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 8ba6fb4f91..33f2fec790 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -28,6 +28,7 @@ #include "base/stl_util.h" #include "base/value_object.h" #include "constants_arm.h" +#include "utils/arm/assembler_arm_shared.h" #include "utils/arm/managed_register_arm.h" #include "utils/assembler.h" #include "utils/jni_macro_assembler.h" @@ -214,29 +215,6 @@ class ShifterOperand { #endif }; - -enum LoadOperandType { - kLoadSignedByte, - kLoadUnsignedByte, - kLoadSignedHalfword, - kLoadUnsignedHalfword, - kLoadWord, - kLoadWordPair, - kLoadSWord, - kLoadDWord -}; - - -enum StoreOperandType { - kStoreByte, - kStoreHalfword, - kStoreWord, - kStoreWordPair, - kStoreSWord, - kStoreDWord -}; - - // Load/store multiple addressing mode. enum BlockAddressMode { // bit encoding P U W @@ -417,13 +395,6 @@ enum ItState { kItE = kItElse }; -// Set condition codes request. -enum SetCc { - kCcDontCare, // Allows prioritizing 16-bit instructions on Thumb2 whether they set CCs or not. - kCcSet, - kCcKeep, -}; - constexpr uint32_t kNoItCondition = 3; constexpr uint32_t kInvalidModifiedImmediate = -1; -- cgit v1.2.3-59-g8ed1b