arm_load_store_instr_t -> struct arm_load_store_instr

[openocd.git] / src / target / arm_disassembler.h

diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index d3101cb6fdca21385725f333eb99e8e0cc466c8a..c69ab65920625f4fb3c17b75a0037ec49245a589 100644 (file)
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -25,13 +25,13 @@
 enum arm_instruction_type
 {
        ARM_UNKNOWN_INSTUCTION,
-       
+
        /* Branch instructions */
        ARM_B,
        ARM_BL,
        ARM_BX,
        ARM_BLX,
-       
+
        /* Data processing instructions */
        ARM_AND,
        ARM_EOR,
@@ -49,32 +49,32 @@ enum arm_instruction_type
        ARM_MOV,
        ARM_BIC,
        ARM_MVN,
-       
+
        /* Load/store instructions */
        ARM_LDR,
        ARM_LDRB,
        ARM_LDRT,
        ARM_LDRBT,
-       
+
        ARM_LDRH,
        ARM_LDRSB,
        ARM_LDRSH,
-       
+
        ARM_LDM,
 
        ARM_STR,
        ARM_STRB,
        ARM_STRT,
        ARM_STRBT,
-       
+
        ARM_STRH,
-       
+
        ARM_STM,
-       
+
        /* Status register access instructions */
        ARM_MRS,
        ARM_MSR,
-       
+
        /* Multiply instructions */
        ARM_MUL,
        ARM_MLA,
@@ -82,25 +82,25 @@ enum arm_instruction_type
        ARM_SMLAL,
        ARM_UMULL,
        ARM_UMLAL,
-       
+
        /* Miscellaneous instructions */
        ARM_CLZ,
-       
+
        /* Exception generating instructions */
        ARM_BKPT,
        ARM_SWI,
-       
+
        /* Coprocessor instructions */
        ARM_CDP,
        ARM_LDC,
        ARM_STC,
        ARM_MCR,
        ARM_MRC,
-       
+
        /* Semaphore instructions */
        ARM_SWP,
        ARM_SWPB,
-       
+
        /* Enhanced DSP extensions */
        ARM_MCRR,
        ARM_MRRC,
@@ -120,16 +120,16 @@ enum arm_instruction_type
        ARM_UNDEFINED_INSTRUCTION = 0xffffffff,
 };
 
-typedef struct arm_b_bl_bx_blx_instr_s
+struct arm_b_bl_bx_blx_instr
 {
        int reg_operand;
-       u32 target_address;
-} arm_b_bl_bx_blx_instr_t;
+       uint32_t target_address;
+};
 
 union arm_shifter_operand
 {
        struct {
-               u32 immediate;
+               uint32_t immediate;
        } immediate;
        struct {
                uint8_t Rm;
@@ -143,16 +143,16 @@ union arm_shifter_operand
        } register_shift;
 };
 
-typedef struct arm_data_proc_instr_s
+struct arm_data_proc_instr
 {
        int variant; /* 0: immediate, 1: immediate_shift, 2: register_shift */
        uint8_t S;
        uint8_t Rn;
        uint8_t Rd;
        union arm_shifter_operand shifter_operand;
-} arm_data_proc_instr_t;
+};
 
-typedef struct arm_load_store_instr_s
+struct arm_load_store_instr
 {
        uint8_t Rd;
        uint8_t Rn;
@@ -161,19 +161,19 @@ typedef struct arm_load_store_instr_s
        int offset_mode; /* 0: immediate, 1: (scaled) register */
        union
        {
-               u32 offset;
+               uint32_t offset;
                struct {
                        uint8_t Rm;
                        uint8_t shift; /* 0: LSL, 1: LSR, 2: ASR, 3: ROR, 4: RRX */
                        uint8_t shift_imm;
                } reg;
        } offset;
-} arm_load_store_instr_t;
+};
 
 typedef struct arm_load_store_multiple_instr_s
 {
        uint8_t Rn;
-       u32 register_list;
+       uint32_t register_list;
        uint8_t addressing_mode; /* 0: IA, 1: IB, 2: DA, 3: DB */
        uint8_t S;
        uint8_t W;
@@ -183,21 +183,28 @@ typedef struct arm_instruction_s
 {
        enum arm_instruction_type type;
        char text[128];
-       u32 opcode;
-       
+       uint32_t opcode;
+
+       /* return value ... Thumb-2 sizes vary */
+       unsigned instruction_size;
+
        union {
-               arm_b_bl_bx_blx_instr_t b_bl_bx_blx;
-               arm_data_proc_instr_t data_proc;
-               arm_load_store_instr_t load_store;
+               struct arm_b_bl_bx_blx_instr b_bl_bx_blx;
+               struct arm_data_proc_instr data_proc;
+               struct arm_load_store_instr load_store;
                arm_load_store_multiple_instr_t load_store_multiple;
        } info;
 
 } arm_instruction_t;
 
-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);
+int arm_evaluate_opcode(uint32_t opcode, uint32_t address,
+               arm_instruction_t *instruction);
+int thumb_evaluate_opcode(uint16_t opcode, uint32_t address,
+               arm_instruction_t *instruction);
+int thumb2_opcode(target_t *target, uint32_t address,
+               arm_instruction_t *instruction);
+int arm_access_size(arm_instruction_t *instruction);
 
-#define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000)>>28])
+#define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000) >> 28])
 
 #endif /* ARM_DISASSEMBLER_H */