Lots of RISC-V improvements.

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

diff --git a/src/target/riscv/riscv.h b/src/target/riscv/riscv.h
index 31f3cf63c47dd36ad03d52091f871e555ed97a7d..59414fc0886a0510e862ad6abc83127fadc0ef50 100644 (file)
--- a/src/target/riscv/riscv.h
+++ b/src/target/riscv/riscv.h
@@ -35,6 +35,11 @@ enum riscv_halt_reason {
        RISCV_HALT_ERROR
 };
 
+typedef struct {
+       struct target *target;
+       unsigned custom_number;
+} riscv_reg_info_t;
+
 typedef struct {
        unsigned dtm_version;
 
@@ -91,6 +96,10 @@ typedef struct {
 
        bool triggers_enumerated;
 
+       /* Decremented every scan, and when it reaches 0 we clear the learned
+        * delays, causing them to be relearned. Used for testing. */
+       int reset_delays_wait;
+
        /* Helper functions that target the various RISC-V debug spec
         * implementations. */
        int (*get_register)(struct target *target,
@@ -120,6 +129,11 @@ typedef struct {
 
        int (*dmi_read)(struct target *target, uint32_t *value, uint32_t address);
        int (*dmi_write)(struct target *target, uint32_t address, uint32_t value);
+
+       int (*test_sba_config_reg)(struct target *target, target_addr_t legal_address,
+                       uint32_t num_words, target_addr_t illegal_address, bool run_sbbusyerror_test);
+
+       int (*test_compliance)(struct target *target);
 } riscv_info_t;
 
 /* Wall-clock timeout for a command/access. Settable via RISC-V Target commands.*/
@@ -137,11 +151,11 @@ static inline riscv_info_t *riscv_info(const struct target *target)
 { return target->arch_info; }
 #define RISCV_INFO(R) riscv_info_t *R = riscv_info(target);
 
-extern uint8_t ir_dtmcontrol[1];
+extern uint8_t ir_dtmcontrol[4];
 extern struct scan_field select_dtmcontrol;
-extern uint8_t ir_dbus[1];
+extern uint8_t ir_dbus[4];
 extern struct scan_field select_dbus;
-extern uint8_t ir_idcode[1];
+extern uint8_t ir_idcode[4];
 extern struct scan_field select_idcode;
 
 /*** OpenOCD Interface */
@@ -253,6 +267,7 @@ int riscv_remove_breakpoint(struct target *target,
 int riscv_add_watchpoint(struct target *target, struct watchpoint *watchpoint);
 int riscv_remove_watchpoint(struct target *target,
                struct watchpoint *watchpoint);
+int riscv_hit_watchpoint(struct target *target, struct watchpoint **hit_wp_address);
 
 int riscv_init_registers(struct target *target);