X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv8_opcodes.c;h=6887b295399da30c841f72df7ab92ede0c3d61ee;hb=57962f4d1c2db12dffa03c7357f5d7e0d8f71fb8;hp=75ea946184d30222634d5a2c39894738fa5b2ab4;hpb=946958cb723f0b123505234275ce9a653ddbfbd2;p=openocd.git diff --git a/src/target/armv8_opcodes.c b/src/target/armv8_opcodes.c index 75ea946184..6887b29539 100644 --- a/src/target/armv8_opcodes.c +++ b/src/target/armv8_opcodes.c @@ -24,6 +24,7 @@ #include "armv8_opcodes.h" static const uint32_t a64_opcodes[ARMV8_OPC_NUM] = { + [READ_REG_CTR] = ARMV8_MRS(SYSTEM_CTR, 0), [READ_REG_CLIDR] = ARMV8_MRS(SYSTEM_CLIDR, 0), [READ_REG_CSSELR] = ARMV8_MRS(SYSTEM_CSSELR, 0), [READ_REG_CCSIDR] = ARMV8_MRS(SYSTEM_CCSIDR, 0), @@ -36,9 +37,21 @@ static const uint32_t a64_opcodes[ARMV8_OPC_NUM] = { [ARMV8_OPC_DSB_SY] = ARMV8_DSB_SY, [ARMV8_OPC_DCPS] = ARMV8_DCPS(0, 11), [ARMV8_OPC_DRPS] = ARMV8_DRPS, + [ARMV8_OPC_ISB_SY] = ARMV8_ISB, + [ARMV8_OPC_DCCISW] = ARMV8_SYS(SYSTEM_DCCISW, 0), + [ARMV8_OPC_DCCIVAC] = ARMV8_SYS(SYSTEM_DCCIVAC, 0), + [ARMV8_OPC_ICIVAU] = ARMV8_SYS(SYSTEM_ICIVAU, 0), + [ARMV8_OPC_HLT] = ARMV8_HLT(11), + [ARMV8_OPC_LDRB_IP] = ARMV8_LDRB_IP(1, 0), + [ARMV8_OPC_LDRH_IP] = ARMV8_LDRH_IP(1, 0), + [ARMV8_OPC_LDRW_IP] = ARMV8_LDRW_IP(1, 0), + [ARMV8_OPC_STRB_IP] = ARMV8_STRB_IP(1, 0), + [ARMV8_OPC_STRH_IP] = ARMV8_STRH_IP(1, 0), + [ARMV8_OPC_STRW_IP] = ARMV8_STRW_IP(1, 0), }; static const uint32_t t32_opcodes[ARMV8_OPC_NUM] = { + [READ_REG_CTR] = ARMV4_5_MRC(15, 0, 0, 0, 0, 1), [READ_REG_CLIDR] = ARMV4_5_MRC(15, 1, 0, 0, 0, 1), [READ_REG_CSSELR] = ARMV4_5_MRC(15, 2, 0, 0, 0, 0), [READ_REG_CCSIDR] = ARMV4_5_MRC(15, 1, 0, 0, 0, 0), @@ -51,6 +64,17 @@ static const uint32_t t32_opcodes[ARMV8_OPC_NUM] = { [ARMV8_OPC_DSB_SY] = ARMV8_DSB_SY_T1, [ARMV8_OPC_DCPS] = ARMV8_DCPS_T1(0), [ARMV8_OPC_DRPS] = ARMV8_ERET_T1, + [ARMV8_OPC_ISB_SY] = ARMV8_ISB_SY_T1, + [ARMV8_OPC_DCCISW] = ARMV4_5_MCR(15, 0, 0, 7, 14, 2), + [ARMV8_OPC_DCCIVAC] = ARMV4_5_MCR(15, 0, 0, 7, 14, 1), + [ARMV8_OPC_ICIVAU] = ARMV4_5_MCR(15, 0, 0, 7, 5, 1), + [ARMV8_OPC_HLT] = ARMV8_HLT_A1(11), + [ARMV8_OPC_LDRB_IP] = ARMV4_5_LDRB_IP(1, 0), + [ARMV8_OPC_LDRH_IP] = ARMV4_5_LDRH_IP(1, 0), + [ARMV8_OPC_LDRW_IP] = ARMV4_5_LDRW_IP(1, 0), + [ARMV8_OPC_STRB_IP] = ARMV4_5_STRB_IP(1, 0), + [ARMV8_OPC_STRH_IP] = ARMV4_5_STRH_IP(1, 0), + [ARMV8_OPC_STRW_IP] = ARMV4_5_STRW_IP(1, 0), }; void armv8_select_opcodes(struct armv8_common *armv8, bool state_is_aarch64)