target: fix build with jimtcl 0.79

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

diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index 1636b7be8b6580af0d4994d790db533cb1b41862..6f15f4b5e102f94c8cf614ff86b994bb81cdba82 100644 (file)
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -13,16 +13,14 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef ARM_DISASSEMBLER_H
-#define ARM_DISASSEMBLER_H
+#ifndef OPENOCD_TARGET_ARM_DISASSEMBLER_H
+#define OPENOCD_TARGET_ARM_DISASSEMBLER_H
 
 enum arm_instruction_type {
-       ARM_UNKNOWN_INSTUCTION,
+       ARM_UNKNOWN_INSTRUCTION,
 
        /* Branch instructions */
        ARM_B,
@@ -84,9 +82,14 @@ enum arm_instruction_type {
        /* Miscellaneous instructions */
        ARM_CLZ,
 
+       /* Exception return instructions */
+       ARM_ERET,
+
        /* Exception generating instructions */
        ARM_BKPT,
        ARM_SWI,
+       ARM_HVC,
+       ARM_SMC,
 
        /* Coprocessor instructions */
        ARM_CDP,
@@ -103,15 +106,17 @@ enum arm_instruction_type {
        ARM_MCRR,
        ARM_MRRC,
        ARM_PLD,
+       ARM_DSB,
+       ARM_ISB,
        ARM_QADD,
        ARM_QDADD,
        ARM_QSUB,
        ARM_QDSUB,
-       ARM_SMLAxy,
-       ARM_SMLALxy,
-       ARM_SMLAWy,
-       ARM_SMULxy,
-       ARM_SMULWy,
+       ARM_SMLAXY,
+       ARM_SMLALXY,
+       ARM_SMLAWY,
+       ARM_SMULXY,
+       ARM_SMULWY,
        ARM_LDRD,
        ARM_STRD,
 
@@ -128,35 +133,35 @@ union arm_shifter_operand {
                uint32_t immediate;
        } immediate;
        struct {
-               uint8_t Rm;
+               uint8_t rm;
                uint8_t shift; /* 0: LSL, 1: LSR, 2: ASR, 3: ROR, 4: RRX */
                uint8_t shift_imm;
        } immediate_shift;
        struct {
-               uint8_t Rm;
+               uint8_t rm;
                uint8_t shift;
-               uint8_t Rs;
+               uint8_t rs;
        } register_shift;
 };
 
 struct arm_data_proc_instr {
        int variant; /* 0: immediate, 1: immediate_shift, 2: register_shift */
-       uint8_t S;
-       uint8_t Rn;
-       uint8_t Rd;
+       uint8_t s;
+       uint8_t rn;
+       uint8_t rd;
        union arm_shifter_operand shifter_operand;
 };
 
 struct arm_load_store_instr {
-       uint8_t Rd;
-       uint8_t Rn;
-       uint8_t U;
+       uint8_t rd;
+       uint8_t rn;
+       uint8_t u;
        int index_mode; /* 0: offset, 1: pre-indexed, 2: post-indexed */
        int offset_mode; /* 0: immediate, 1: (scaled) register */
        union {
                uint32_t offset;
                struct {
-                       uint8_t Rm;
+                       uint8_t rm;
                        uint8_t shift; /* 0: LSL, 1: LSR, 2: ASR, 3: ROR, 4: RRX */
                        uint8_t shift_imm;
                } reg;
@@ -164,11 +169,11 @@ struct arm_load_store_instr {
 };
 
 struct arm_load_store_multiple_instr {
-       uint8_t Rn;
+       uint8_t rn;
        uint32_t register_list;
        uint8_t addressing_mode; /* 0: IA, 1: IB, 2: DA, 3: DB */
-       uint8_t S;
-       uint8_t W;
+       uint8_t s;
+       uint8_t w;
 };
 
 struct arm_instruction {
@@ -192,10 +197,12 @@ int arm_evaluate_opcode(uint32_t opcode, uint32_t address,
                struct arm_instruction *instruction);
 int thumb_evaluate_opcode(uint16_t opcode, uint32_t address,
                struct arm_instruction *instruction);
-int thumb2_opcode(struct target *target, uint32_t address,
-               struct arm_instruction *instruction);
 int arm_access_size(struct arm_instruction *instruction);
+#if HAVE_CAPSTONE
+int arm_disassemble(struct command_invocation *cmd, struct target *target,
+               target_addr_t address, size_t count, bool thumb_mode);
+#endif
 
 #define COND(opcode) (arm_condition_strings[(opcode & 0xf0000000) >> 28])
 
-#endif /* ARM_DISASSEMBLER_H */
+#endif /* OPENOCD_TARGET_ARM_DISASSEMBLER_H */