Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
etm_capture_driver_t -> struct etm_capture_driver
[openocd.git] / src / target / etm.h
diff --git a/src/target/etm.h b/src/target/etm.h
index 43ec048fb7733076d2295721e7f3206cf3c92a5c..317474ce079f9be254dd733fe5db448484ee3728 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -25,49 +25,58 @@
 
 #include "trace.h"
 #include "arm_jtag.h"
-#include "armv4_5.h"
 
 struct image_s;
 
-/* ETM registers (V1.3 protocol) */
+/* ETM registers (JTAG protocol) */
 enum
 {
        ETM_CTRL = 0x00,
        ETM_CONFIG = 0x01,
        ETM_TRIG_EVENT = 0x02,
-       ETM_MMD_CTRL = 0x03,
+       ETM_ASIC_CTRL = 0x03,
        ETM_STATUS = 0x04,
        ETM_SYS_CONFIG = 0x05,
        ETM_TRACE_RESOURCE_CTRL = 0x06,
        ETM_TRACE_EN_CTRL2 = 0x07,
        ETM_TRACE_EN_EVENT = 0x08,
        ETM_TRACE_EN_CTRL1 = 0x09,
+       /* optional FIFOFULL */
        ETM_FIFOFULL_REGION = 0x0a,
        ETM_FIFOFULL_LEVEL = 0x0b,
+       /* viewdata support */
        ETM_VIEWDATA_EVENT = 0x0c,
        ETM_VIEWDATA_CTRL1 = 0x0d,
-       ETM_VIEWDATA_CTRL2 = 0x0e,
+       ETM_VIEWDATA_CTRL2 = 0x0e,      /* optional */
        ETM_VIEWDATA_CTRL3 = 0x0f,
+       /* N pairs of ADDR_{COMPARATOR,ACCESS} registers */
        ETM_ADDR_COMPARATOR_VALUE = 0x10,
        ETM_ADDR_ACCESS_TYPE = 0x20,
+       /* N pairs of DATA_COMPARATOR_{VALUE,MASK} registers */
        ETM_DATA_COMPARATOR_VALUE = 0x30,
        ETM_DATA_COMPARATOR_MASK = 0x40,
-       ETM_COUNTER_INITAL_VALUE = 0x50,
+       /* N quads of COUNTER_{RELOAD_{VALUE,EVENT},ENABLE,VALUE} registers */
+       ETM_COUNTER_RELOAD_VALUE = 0x50,
        ETM_COUNTER_ENABLE = 0x54,
-       ETM_COUNTER_RELOAD_VALUE = 0x58,
+       ETM_COUNTER_RELOAD_EVENT = 0x58,
        ETM_COUNTER_VALUE = 0x5c,
-       ETM_SEQUENCER_CTRL = 0x60,
+       /* 6 sequencer event transitions */
+       ETM_SEQUENCER_EVENT = 0x60,
        ETM_SEQUENCER_STATE = 0x67,
+       /* N triggered outputs */
        ETM_EXTERNAL_OUTPUT = 0x68,
+       /* N task contexts */
        ETM_CONTEXTID_COMPARATOR_VALUE = 0x6c,
        ETM_CONTEXTID_COMPARATOR_MASK = 0x6f,
+       ETM_ID = 0x79,
 };
 
-typedef struct etm_reg_s
+struct etm_reg
 {
-       int addr;
-       arm_jtag_t *jtag_info;
-} etm_reg_t;
+       uint32_t value;
+       const struct etm_reg_info *reg_info;
+       struct arm_jtag *jtag_info;
+};
 
 typedef enum
 {
@@ -75,7 +84,13 @@ typedef enum
        ETM_PORT_4BIT           = 0x00,
        ETM_PORT_8BIT           = 0x10,
        ETM_PORT_16BIT          = 0x20,
-       ETM_PORT_WIDTH_MASK     = 0x70,
+       ETM_PORT_24BIT          = 0x30,
+       ETM_PORT_32BIT          = 0x40,
+       ETM_PORT_48BIT          = 0x50,
+       ETM_PORT_64BIT          = 0x60,
+       ETM_PORT_1BIT           = 0x00 | (1 << 21),
+       ETM_PORT_2BIT           = 0x10 | (1 << 21),
+       ETM_PORT_WIDTH_MASK     = 0x70 | (1 << 21),
        /* Port modes */
        ETM_PORT_NORMAL    = 0x00000,
        ETM_PORT_MUXED     = 0x10000,
@@ -106,18 +121,18 @@ typedef enum
 } etmv1_tracemode_t;
 
 /* forward-declare ETM context */
-struct etm_context_s;
+struct etm;
 
-typedef struct etm_capture_driver_s
+struct etm_capture_driver
 {
        char *name;
        int (*register_commands)(struct command_context_s *cmd_ctx);
-       int (*init)(struct etm_context_s *etm_ctx);
-       trace_status_t (*status)(struct etm_context_s *etm_ctx);
-       int (*read_trace)(struct etm_context_s *etm_ctx);
-       int (*start_capture)(struct etm_context_s *etm_ctx);
-       int (*stop_capture)(struct etm_context_s *etm_ctx);
-} etm_capture_driver_t;
+       int (*init)(struct etm *etm_ctx);
+       trace_status_t (*status)(struct etm *etm_ctx);
+       int (*read_trace)(struct etm *etm_ctx);
+       int (*start_capture)(struct etm *etm_ctx);
+       int (*stop_capture)(struct etm *etm_ctx);
+};
 
 enum
 {
@@ -137,11 +152,11 @@ typedef struct etmv1_trace_data_s
  * this will have to be split into version independent elements
  * and a version specific part
  */
-typedef struct etm_context_s
+typedef struct etm
 {
        target_t *target;               /* target this ETM is connected to */
        reg_cache_t *reg_cache;         /* ETM register cache */
-       etm_capture_driver_t *capture_driver;   /* driver used to access ETM data */
+       struct etm_capture_driver *capture_driver;      /* driver used to access ETM data */
        void *capture_driver_priv;      /* capture driver private data */
        uint32_t trigger_percent;       /* how much trace buffer to fill after trigger */
        trace_status_t capture_status;  /* current state of capture run */
@@ -149,13 +164,16 @@ typedef struct etm_context_s
        uint32_t trace_depth;           /* number of cycles to be analyzed, 0 if no data available */
        etm_portmode_t portmode;        /* normal, multiplexed or demultiplexed */
        etmv1_tracemode_t tracemode;    /* type of info trace contains */
-       armv4_5_state_t core_state;     /* current core state */
+       int /*armv4_5_state_t*/ core_state;     /* current core state */
        struct image_s *image;          /* source for target opcodes */
        uint32_t pipe_index;            /* current trace cycle */
        uint32_t data_index;            /* cycle holding next data packet */
        bool data_half;                 /* port half on a 16 bit port */
        bool pc_ok;                     /* full PC has been acquired */
        bool ptr_ok;                    /* whether last_ptr is valid */
+       uint8_t bcd_vers;               /* e.g. 0x13 == ETMv1.3 */
+       uint32_t config;                /* cache of ETM_CONFIG value */
+       uint32_t id;                    /* cache of ETM_ID value, or 0 */
        uint32_t current_pc;            /* current program counter */
        uint32_t last_branch;           /* last branch address output */
        uint32_t last_branch_reason;    /* type of last branch encountered */
@@ -189,8 +207,10 @@ typedef enum
        BR_RSVD7   = 0x7, /* reserved */
 } etmv1_branch_reason_t;
 
-extern reg_cache_t* etm_build_reg_cache(target_t *target, arm_jtag_t *jtag_info, etm_context_t *etm_ctx);
-extern int etm_setup(target_t *target);
+reg_cache_t* etm_build_reg_cache(target_t *target,
+               struct arm_jtag *jtag_info, etm_context_t *etm_ctx);
+
+int etm_setup(target_t *target);
 
 int etm_register_commands(struct command_context_s *cmd_ctx);
 
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)