diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-12 20:24:41 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-12 20:24:41 -0800 |
| commit | d47764ff7176b6e3d97b49e82d4db7fe17c8e552 (patch) | |
| tree | c8f1c14a6041a4a70f546afa1047b7633a73476d /src/target/etm.h | |
| parent | 26849ad60d269b0e8d254882bc75268a393dd2a1 (diff) | |
| download | openocd+libswd-d47764ff7176b6e3d97b49e82d4db7fe17c8e552.tar.gz openocd+libswd-d47764ff7176b6e3d97b49e82d4db7fe17c8e552.tar.bz2 openocd+libswd-d47764ff7176b6e3d97b49e82d4db7fe17c8e552.tar.xz openocd+libswd-d47764ff7176b6e3d97b49e82d4db7fe17c8e552.zip | |
ETM: start support for ETMv2+
ARM11 and newer cores include updated ETM modules. Recognize
their version codes and some key config differences. Sanity
checked on an OMAP2, with an ETM11RV r0p1 (ETMv3.1).
This still handles only scan chain 6, with at most 128 registers.
Newer cores (mostly, Cortex) will need to use the DAP instead.
Note that the newer ETM modules don't quite fit the quirky config
model of the older ones ... having more port widths is easy, but
the modes aren't the same. That still needs to change.
Fix a curious bug ... how did the register cache NOT get saved??
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/etm.h')
| -rw-r--r-- | src/target/etm.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/target/etm.h b/src/target/etm.h index 254db925..ead45855 100644 --- a/src/target/etm.h +++ b/src/target/etm.h @@ -68,6 +68,7 @@ enum /* N task contexts */ ETM_CONTEXTID_COMPARATOR_VALUE = 0x6c, ETM_CONTEXTID_COMPARATOR_MASK = 0x6f, + ETM_ID = 0x79, }; typedef struct etm_reg_s @@ -83,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, @@ -166,6 +173,7 @@ typedef struct etm 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 */ |