summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/Process
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Plugins/Process')
-rw-r--r--lldb/source/Plugins/Process/Utility/ARMDefines.h12
-rw-r--r--lldb/source/Plugins/Process/Utility/ARMUtils.h10
2 files changed, 11 insertions, 11 deletions
diff --git a/lldb/source/Plugins/Process/Utility/ARMDefines.h b/lldb/source/Plugins/Process/Utility/ARMDefines.h
index 6453a3c1a4b..9a4dcc15a8e 100644
--- a/lldb/source/Plugins/Process/Utility/ARMDefines.h
+++ b/lldb/source/Plugins/Process/Utility/ARMDefines.h
@@ -10,12 +10,20 @@
#ifndef lldb_ARMDefines_h_
#define lldb_ARMDefines_h_
-#include "InstructionUtils.h"
-
// Common defintions for the ARM/Thumb Instruction Set Architecture.
namespace lldb_private {
+// ARM shifter types
+typedef enum
+{
+ SRType_LSL,
+ SRType_LSR,
+ SRType_ASR,
+ SRType_ROR,
+ SRType_RRX
+} ARM_ShifterType;
+
// ARM conditions // Meaning (integer) Meaning (floating-point) Condition flags
#define COND_EQ 0x0 // Equal Equal Z == 1
#define COND_NE 0x1 // Not equal Not equal, or unordered Z == 0
diff --git a/lldb/source/Plugins/Process/Utility/ARMUtils.h b/lldb/source/Plugins/Process/Utility/ARMUtils.h
index 523d0fc36c4..53a04bb06b7 100644
--- a/lldb/source/Plugins/Process/Utility/ARMUtils.h
+++ b/lldb/source/Plugins/Process/Utility/ARMUtils.h
@@ -10,6 +10,7 @@
#ifndef lldb_ARMUtils_h_
#define lldb_ARMUtils_h_
+#include "ARMDefines.h"
#include "InstructionUtils.h"
#include "llvm/Support/MathExtras.h" // for SignExtend64 template function
@@ -17,15 +18,6 @@
namespace lldb_private {
-typedef enum
-{
- SRType_LSL,
- SRType_LSR,
- SRType_ASR,
- SRType_ROR,
- SRType_RRX
-} ARM_ShifterType;
-
static inline uint32_t DecodeImmShift(const uint32_t type, const uint32_t imm5, ARM_ShifterType &shift_t)
{
switch (type) {
OpenPOWER on IntegriCloud