diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-19 13:07:26 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-19 13:07:26 -0800 |
| commit | 64934d9204dc854d40893634a66e29ece09ad578 (patch) | |
| tree | 7de86210e3015280f2dcf1f419982a7153caaed4 /src/target/etm.h | |
| parent | e25819645ee2beb0818a79006eed9c9cedaaf5bb (diff) | |
| download | openocd+libswd-64934d9204dc854d40893634a66e29ece09ad578.tar.gz openocd+libswd-64934d9204dc854d40893634a66e29ece09ad578.tar.bz2 openocd+libswd-64934d9204dc854d40893634a66e29ece09ad578.tar.xz openocd+libswd-64934d9204dc854d40893634a66e29ece09ad578.zip | |
ETM: more ETM_CTRL bit cleanup
Change handling of the CYCLE_ACCURATE, BRANCH_OUTPUT, and
TRACE_* flags; also the CONTEXTID size values.
- Convert to symbols matching the actual register bits, instead of
some random *other* bits (and then correcting that abuse).
- Get rid of a now-needless enum.
- Keep those values in etm->control, and remove etm->tracemode.
These values all affect the trace data that's recorded by a trace
pod or in the ETB. I modified the file format used to dump ETB
data; since it's fairly clear nobody can use this mechanism now,
this can't cause anyone trouble.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/etm.h')
| -rw-r--r-- | src/target/etm.h | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/target/etm.h b/src/target/etm.h index e4d46852..8a482c1e 100644 --- a/src/target/etm.h +++ b/src/target/etm.h @@ -89,7 +89,10 @@ enum ETM_CTRL_POWERDOWN = (1 << 0), ETM_CTRL_MONITOR_CPRT = (1 << 1), - // bits 3:2 == trace type (ETMV1_TRACE_* << 2) + /* bits 3:2 == trace type */ + ETM_CTRL_TRACE_DATA = (1 << 2), + ETM_CTRL_TRACE_ADDR = (2 << 2), + ETM_CTRL_TRACE_MASK = (3 << 2), /* Port width (bits 21 and 6:4) */ ETM_PORT_4BIT = 0x00, @@ -116,7 +119,11 @@ enum ETM_PORT_CLOCK_MASK = (1 << 13), // bits 15:14 == context ID size used in tracing - // ETMV1_CONTEXTID_* << 8 + ETM_CTRL_CONTEXTID_NONE = (0 << 14), + ETM_CTRL_CONTEXTID_8 = (1 << 14), + ETM_CTRL_CONTEXTID_16 = (2 << 14), + ETM_CTRL_CONTEXTID_32 = (3 << 14), + ETM_CTRL_CONTEXTID_MASK = (3 << 14), /* Port modes -- bits 17:16, tied to clocking mode */ ETM_PORT_NORMAL = (0 << 16), @@ -127,24 +134,6 @@ enum // bits 31:18 defined in v3.0 and later (e.g. ARM11+) }; -enum -{ - /* Data trace */ - ETMV1_TRACE_NONE = 0x00, - ETMV1_TRACE_DATA = 0x01, - ETMV1_TRACE_ADDR = 0x02, - ETMV1_TRACE_MASK = 0x03, - /* ContextID */ - ETMV1_CONTEXTID_NONE = 0x00, - ETMV1_CONTEXTID_8 = 0x10, - ETMV1_CONTEXTID_16 = 0x20, - ETMV1_CONTEXTID_32 = 0x30, - ETMV1_CONTEXTID_MASK = 0x30, - /* Misc */ - ETMV1_CYCLE_ACCURATE = 0x100, - ETMV1_BRANCH_OUTPUT = 0x200 -}; - /* forward-declare ETM context */ struct etm_context; @@ -187,7 +176,6 @@ struct etm_context struct etmv1_trace_data *trace_data; /* trace data */ uint32_t trace_depth; /* number of cycles to be analyzed, 0 if no data available */ uint32_t control; /* shadow of ETM_CTRL */ - uint32_t tracemode; /* type of info trace contains */ int /*arm_state*/ core_state; /* current core state */ struct image *image; /* source for target opcodes */ uint32_t pipe_index; /* current trace cycle */ |