X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_disassembler.h;h=d0fcabd863169886ff82bec582eac6487dab7b64;hp=c6dc6967d809daca2dbb70dd3e66aec22f50476b;hb=53d1f9b2ca5718e4996e9cf3406f857d0ed26df2;hpb=1f76f6999974a3a1765aaa96fecc3f2433e7b5b6

diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index c6dc6967d8..d0fcabd863 100644
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -126,28 +126,30 @@ typedef struct arm_b_bl_bx_blx_instr_s
 	u32 target_address;
 } arm_b_bl_bx_blx_instr_t;
 
+union arm_shifter_operand
+{
+	struct {
+		u32 immediate;
+	} immediate;
+	struct {
+		u8 Rm;
+		u8 shift; /* 0: LSL, 1: LSR, 2: ASR, 3: ROR, 4: RRX */
+		u8 shift_imm;
+	} immediate_shift;
+	struct {
+		u8 Rm;
+		u8 shift;
+		u8 Rs;
+	} register_shift;
+};
+
 typedef struct arm_data_proc_instr_s
 {
 	int variant; /* 0: immediate, 1: immediate_shift, 2: register_shift */
 	u8 S;
 	u8 Rn;
 	u8 Rd;
-	union
-	{
-		struct {
-			u8 immediate;
-		} immediate;
-		struct {
-			u8 Rm;
-			u8 shift;
-			u8 shift_imm;
-		} immediate_shift;
-		struct {
-			u8 Rm;
-			u8 shift;
-			u8 Rs;
-		} register_shift;
-	} shifter_operand;
+	union arm_shifter_operand shifter_operand;
 } arm_data_proc_instr_t;
 
 typedef struct arm_load_store_instr_s
@@ -162,7 +164,7 @@ typedef struct arm_load_store_instr_s
 		u32 offset;
 		struct {
 			u8 Rm;
-			u8 shift;
+			u8 shift; /* 0: LSL, 1: LSR, 2: ASR, 3: ROR, 4: RRX */
 			u8 shift_imm;
 		} reg;
 	} offset;
@@ -192,7 +194,9 @@ typedef struct arm_instruction_s
 
 } arm_instruction_t;
 
-extern int evaluate_opcode(u32 opcode, u32 address, arm_instruction_t *instruction);
+extern int arm_evaluate_opcode(u32 opcode, u32 address, arm_instruction_t *instruction);
+extern int thumb_evaluate_opcode(u16 opcode, u32 address, arm_instruction_t *instruction);
+extern int arm_access_size(arm_instruction_t *instruction);
 
 #define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000)>>28])