d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import OpenCSD v0.14.2

Browse Source 
Sponsored by:	Innovate UK
This commit is contained in:
Andrew Turner 2020-06-15 11:30:04 +00:00
parent cf98ba14dc
commit d7aa8d0a1f
262 changed files with 205176 additions and 1523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
HOWTO.md
View File

@ -4,37 +4,39 @@ HOWTO - using the library with perf {#howto_perf}
@brief Using command line perf and OpenCSD to collect and decode trace. @brief Using command line perf and OpenCSD to collect and decode trace.
This HOWTO explains how to use the perf cmd line tools and the openCSD This HOWTO explains how to use the perf cmd line tools and the openCSD
library to collect and extract program flow traces generated by the library to collect and extract program flow traces generated by the
CoreSight IP blocks on a Linux system. The examples have been generated using CoreSight IP blocks on a Linux system. The examples have been generated using
an aarch64 Juno-r0 platform. All information is considered accurate and tested an aarch64 Juno-r0 platform.
using the latest version of the library and the `master` branch on the
[perf-opencsd github repository][1].
On Target Trace Acquisition - Perf Record On Target Trace Acquisition - Perf Record
----------------------------------------- -----------------------------------------
All the enhancement to the Perf tools that support the new `cs_etm` pmu have
not been upstreamed yet. To get the required functionality branch
`perf-opencsd-master` needs to be downloaded to the target system where
traces are to be collected. This branch is a vanilla upstream kernel
supplemented with modifications to the CoreSight framework and drivers to be
usable by the Perf core. The remaining out of tree patches are being
upstreamed incrementally.
From there compiling the perf tools with `make -C tools/perf CORESIGHT=1` will Compile the perf tool from the same kernel source code version you are using with:
yield a `perf` executable that will support CoreSight trace collection. Note
that if traces are to be decompressed *off* target, there is no need to download make -C tools/perf
This will yield a `perf` executable that will support CoreSight trace collection.
*Note:* If traces are to be decompressed **off** target, there is no need to download
and compile the openCSD library (on the target). and compile the openCSD library (on the target).
If you are instead planning to use perf to record and decode the trace on the target,
compile the perf tool linking against the openCSD library, in the following way:
make -C tools/perf VF=1 CORESIGHT=1
Further information on the needed build environments and options are detailed later
in the section **Off Target Perf Tools Compilation**.
Before launching a trace run a sink that will collect trace data needs to be Before launching a trace run a sink that will collect trace data needs to be
identified. All CoreSight blocks identified by the framework are registed in identified. All CoreSight blocks identified by the framework are registed in
sysFS: sysFS:
linaro@linaro-nano:~$ ls /sys/bus/coresight/devices/ linaro@linaro-nano:~$ ls /sys/bus/coresight/devices/
20010000.etf 20040000.main_funnel 22040000.etm 22140000.etm etm0 etm2 etm4 etm6 funnel0 funnel2 funnel4 stm0 tmc_etr0
230c0000.A53_funnel 23240000.etm replicator@20020000 20030000.tpiu etm1 etm3 etm5 etm7 funnel1 funnel3 replicator0 tmc_etf0
20070000.etr 220c0000.A57_funnel 23040000.etm 23140000.etm 23340000.etm
CoreSight blocks are listed in the device tree for a specific system and CoreSight blocks are listed in the device tree for a specific system and
@ -43,7 +45,7 @@ the sink that will recieve trace data needs to be identified and given as an
option on the perf command line. Once a sink has been identify trace collection option on the perf command line. Once a sink has been identify trace collection
can start. An easy and yet interesting example is the `uname` command: can start. An easy and yet interesting example is the `uname` command:
linaro@linaro-nano:~/kernel$ ./tools/perf/perf record -e cs_etm/@20070000.etr/ --per-thread uname linaro@linaro-nano:~/kernel$ ./tools/perf/perf record -e cs_etm/@tmc_etr0/ --per-thread uname
This will generate a `perf.data` file where execution has been traced for both This will generate a `perf.data` file where execution has been traced for both
user and kernel space. To narrow the field to either user or kernel space the user and kernel space. To narrow the field to either user or kernel space the
@ -51,7 +53,7 @@ user and kernel space. To narrow the field to either user or kernel space the
traces to user space: traces to user space:
linaro@linaro-nano:~/kernel$ ./tools/perf/perf record -vvv -e cs_etm/@20070000.etr/u --per-thread uname linaro@linaro-nano:~/kernel$ ./tools/perf/perf record -vvv -e cs_etm/@tmc_etr0/u --per-thread uname
Problems setting modules path maps, continuing anyway... Problems setting modules path maps, continuing anyway...
----------------------------------------------------------- -----------------------------------------------------------
perf_event_attr: perf_event_attr:
@ -131,9 +133,9 @@ falls within the specified range. Any work done by the CPU outside of that
range will not be traced. Address range filters can be specified for both range will not be traced. Address range filters can be specified for both
user and kernel space session: user and kernel space session:
perf record -e cs_etm/@20070000.etr/k --filter 'filter 0xffffff8008562d0c/0x48' --per-thread uname perf record -e cs_etm/@tmc_etr0/k --filter 'filter 0xffffff8008562d0c/0x48' --per-thread uname
perf record -e cs_etm/@20070000.etr/u --filter 'filter 0x72c/0x40@/opt/lib/libcstest.so.1.0' --per-thread ./main perf record -e cs_etm/@tmc_etr0/u --filter 'filter 0x72c/0x40@/opt/lib/libcstest.so.1.0' --per-thread ./main
When dealing with kernel space trace addresses are typically taken in the When dealing with kernel space trace addresses are typically taken in the
'System.map' file. In user space addresses are relocatable and can be 'System.map' file. In user space addresses are relocatable and can be
@ -171,20 +173,20 @@ equal to the start address. Incidentally traces stop being generated when the
insruction pointer is equal to the stop address. Anything that happens between insruction pointer is equal to the stop address. Anything that happens between
there to events is traced: there to events is traced:
perf record -e cs_etm/@20070000.etr/k --filter 'start 0xffffff800856bc50,stop 0xffffff800856bcb0' --per-thread uname perf record -e cs_etm/@tmc_etr0/k --filter 'start 0xffffff800856bc50,stop 0xffffff800856bcb0' --per-thread uname
perf record -vvv -e cs_etm/@20070000.etr/u --filter 'start 0x72c@/opt/lib/libcstest.so.1.0, \ perf record -vvv -e cs_etm/@tmc_etr0/u --filter 'start 0x72c@/opt/lib/libcstest.so.1.0, \
stop 0x40082c@/home/linaro/main' \ stop 0x40082c@/home/linaro/main' \
--per-thread ./main --per-thread ./main
**Limitation on address filters:** **Limitation on address filters:**
The only limitation on address filters is the amount of address comparator The only limitation on address filters is the amount of address comparator
found on an implementation and the mutual exclusion between range and found on an implementation and the mutual exclusion between range and
start stop filters. As such the following example would _not_ work: start stop filters. As such the following example would _not_ work:
perf record -e cs_etm/@20070000.etr/k --filter 'start 0xffffff800856bc50,stop 0xffffff800856bcb0, \ // start/stop perf record -e cs_etm/@tmc_etr0/k --filter 'start 0xffffff800856bc50,stop 0xffffff800856bcb0, \ // start/stop
filter 0x72c/0x40@/opt/lib/libcstest.so.1.0' \ // address range filter 0x72c/0x40@/opt/lib/libcstest.so.1.0' \ // address range
--per-thread uname --per-thread uname
Additional Trace Options Additional Trace Options
------------------------ ------------------------
@ -198,10 +200,32 @@ Presently this threshold is fixed at 256 cycles for `perf record`.
Command line options in `perf record` to use these features are part of the options for the `cs_etm` event: Command line options in `perf record` to use these features are part of the options for the `cs_etm` event:
perf record -e cs_etm/timestamp,cycacc,@20070000.etr/ --per-thread uname perf record -e cs_etm/timestamp,cycacc,@tmc_etr0/ --per-thread uname
At current version, `perf record` and `perf script` do not use this additional information. At current version, `perf record` and `perf script` do not use this additional information.
The cs_etm perf event
---------------------
System information for this perf pmu event can be found at:
/sys/devices/cs_etm
This contains internal format of the parameters described above:
root@linaro-developer:~# ls /sys/devices/cs_etm/format
contextid cycacc retstack sinkid timestamp
and names of registered sinks:
root@linaro-developer:~# ls /sys/devices/cs_etm/sinks
tmc_etf0 tmc_etr0 tpiu0
Note: The `sinkid` parameter is there to document the usage of a 32-bit internal parameter to
pass the sink name used in the cs_etm/@sink/ command to the kernel drivers. It can be used
directly as cs_etm/sinkid=<hash_value>/ but this is not recommended as the values used are
considered opaque and subject to changes.
On Target Trace Collection On Target Trace Collection
-------------------------- --------------------------
The entire program flow will have been recorded in the `perf.data` file. The entire program flow will have been recorded in the `perf.data` file.
@ -248,7 +272,7 @@ The openCSD library is not part of the perf tools. It is available on
[github][1] and needs to be compiled before the perf tools. Checkout the [github][1] and needs to be compiled before the perf tools. Checkout the
required branch/tag version into a local directory. required branch/tag version into a local directory.
linaro@t430:~/linaro/coresight$ git clone -b v0.8 https://github.com/Linaro/OpenCSD.git my-opencsd linaro@t430:~/linaro/coresight$ git clone https://github.com/Linaro/OpenCSD.git my-opencsd
Cloning into 'OpenCSD'... Cloning into 'OpenCSD'...
remote: Counting objects: 2063, done. remote: Counting objects: 2063, done.
remote: Total 2063 (delta 0), reused 0 (delta 0), pack-reused 2063 remote: Total 2063 (delta 0), reused 0 (delta 0), pack-reused 2063
@ -301,7 +325,8 @@ distribution without having to be compiled.
Off Target Perf Tools Compilation Off Target Perf Tools Compilation
--------------------------------- ---------------------------------
As mentionned above the openCSD library is not part of the perf tools' code base
As mentioned above the openCSD library is not part of the perf tools' code base
and needs to be installed on a system prior to compilation. Information about and needs to be installed on a system prior to compilation. Information about
the status of the openCSD library on a system is given at compile time by the the status of the openCSD library on a system is given at compile time by the
perf tools build script: perf tools build script:
@ -366,8 +391,8 @@ output as follows:-
Set to any other value will remove the RAW_PACKED lines. Set to any other value will remove the RAW_PACKED lines.
Working with a debug version of the openCSD library Working with an alternate version of the openCSD library
--------------------------------------------------- --------------------------------------------------------
When compiling the perf tools it is possible to reference another version of When compiling the perf tools it is possible to reference another version of
the openCSD library than the one installed on the system. This is useful when the openCSD library than the one installed on the system. This is useful when
working with multiple development trees or having the desire to keep system working with multiple development trees or having the desire to keep system
@ -407,9 +432,13 @@ where the perf tools and openCSD library have been compiled.
-rw------- 1 linaro linaro 78016 Feb 24 12:21 perf.data -rw------- 1 linaro linaro 78016 Feb 24 12:21 perf.data
-rw-rw-r-- 1 linaro linaro 1245881 Feb 24 12:25 uname.v4.user.sept20.tgz -rw-rw-r-- 1 linaro linaro 1245881 Feb 24 12:25 uname.v4.user.sept20.tgz
Perf is expecting files related to the trace capture (`perf.data`) to be located Perf is expecting files related to the trace capture (`perf.data`) to be located in the `buildid` directory.
under `~/.debug` [3]. This example will remove the current `~/.debug` directory By default this is under `~/.debug`. Alternatively the default `buildid` directory can be changed
to be sure everything is clean. using the command:
perf config --system buildid.dir=/my/own/buildid/dir
This example will remove the current `~/.debug` directory to be sure everything is clean.
linaro@t430:~/linaro/coresight/sept20$ rm -rf ~/.debug linaro@t430:~/linaro/coresight/sept20$ rm -rf ~/.debug
linaro@t430:~/linaro/coresight/sept20$ cp -dpR .debug ~/ linaro@t430:~/linaro/coresight/sept20$ cp -dpR .debug ~/
@ -586,12 +615,18 @@ Use as follows:-
1. Prior to building perf, edit `perf-setup-env.bash` to conform to your environment. There are four lines at the top of the file that will require editing. 1. Prior to building perf, edit `perf-setup-env.bash` to conform to your environment. There are four lines at the top of the file that will require editing.
2. Execute the script using the command 2. Execute the script using the command:
source perf-setup-env.bash source perf-setup-env.bash
This will set up all the environment variables mentioned in the sections on building and running This will set up a perf execute environment for using the perf report and script commands.
perf above, and these are used by the `perf-test...` scripts to run the tests.
Alternatively use the command:
source perf-setup-env.base buildenv
This will add in the build environment variables mentioned in the sections on building above alongside the
environment for using the used by the `perf-test...` scripts to run the tests.
3. Build perf as described above. 3. Build perf as described above.
4. Follow the instructions for downloading the test capture, or create a capture from your target. 4. Follow the instructions for downloading the test capture, or create a capture from your target.
@ -629,8 +664,6 @@ Best regards,
*The Linaro CoreSight Team* *The Linaro CoreSight Team*
-------------------------------------- --------------------------------------
[1]: https://github.com/Linaro/perf-opencsd "perf-opencsd Github" [1]: https://github.com/Linaro/OpenCSD
[2]: http://people.linaro.org/~mathieu.poirier/openCSD/uname.v4.user.sept20.tgz [2]: http://people.linaro.org/~mathieu.poirier/openCSD/uname.v4.user.sept20.tgz
[3]: Get in touch with us if you know a way to change this.

105
README.md
View File

@ -27,11 +27,11 @@ Releases will appear on the master branch in the git repository with an appropri
CoreSight Trace Component Support. CoreSight Trace Component Support.
---------------------------------- ----------------------------------
_Current Version 0.12.0_ _Current Version 0.14.2_
### Current support: ### Current support:
- ETMv4 (v4.4) instruction trace - packet processing and packet decode. - ETMv4 (v4.5 [A/R profile] v4.4 [M profile]) instruction trace - packet processing and packet decode.
- PTM (v1.1) instruction trace - packet processing and packet decode. - PTM (v1.1) instruction trace - packet processing and packet decode.
- ETMv3 (v3.5) instruction trace - packet processing and packet decode. - ETMv3 (v3.5) instruction trace - packet processing and packet decode.
- ETMv3 (v3.5) data trace - packet processing. - ETMv3 (v3.5) data trace - packet processing.
@ -55,12 +55,11 @@ Note on the Git Repository.
This git repository for OpenCSD contains only source for the OpenCSD decoder library. This git repository for OpenCSD contains only source for the OpenCSD decoder library.
From version 0.4, releases appear as versioned tags on the master branch. From version 0.4, releases appear as versioned tags on the master branch.
From version 0.7.4, the required updates to CoreSight drivers and perf, that are not CoreSight kernel drivers and perf suport for CoreSight trace is maintained in the latest
currently upstream in the linux kernel tree, are now contained in a separate upstream kernel versions.
repository to be found at:
https://github.com/Linaro/perf-opencsd
One exception is a minor patch required for autoFDO support.
See [autofdo.md](@ref AutoFDO).
Documentation Documentation
------------- -------------
@ -142,29 +141,75 @@ Version and Modification Information
AutoFDO: update documentation for AutoFDO usage and add in "record.sh" script AutoFDO: update documentation for AutoFDO usage and add in "record.sh" script
- _Version 0.9.3_: Bugfix: Test snapshot library not handling 'offset' parameters in dump file sections. - _Version 0.9.3_: Bugfix: Test snapshot library not handling 'offset' parameters in dump file sections.
Install: ocsd_if_version.h moved to opencsd/include to allow installation on OS & use in compiling client apps. Install: ocsd_if_version.h moved to opencsd/include to allow installation on OS & use in compiling client apps.
- _Version 0.10.0_: __Updates__: Add additional information about the last instruction to the generic output packet. - _Version 0.10.0_:
__Docs__: update docs for updated output packet. - __Updates__: Add additional information about the last instruction to the generic output packet.
__Bugfix__: typecast removed from OCSD_VER_NUM in ocsd_if_version.h to allow use in C pre-processor. - __Docs__: update docs for updated output packet.
__Bugfix__: ETMV4: Interworking ISA change between A32-T32 occasionally missed during instruction decode. - __Bugfix__: typecast removed from OCSD_VER_NUM in ocsd_if_version.h to allow use in C pre-processor.
- _Version 0.10.1_: __Updates__: Build update - allow multi-thread make (make -j<N>). - __Bugfix__: ETMV4: Interworking ISA change between A32-T32 occasionally missed during instruction decode.
__Docs__: Minor update to AutoFDO documentation.
- _Version 0.11.0_: __Update__: ETM v4 decoder updated to support ETM version up to v4.4 - _Version 0.10.1_:
__Update__: Memory access callback function - added new callback signature to provide TraceID to client when requesting memory. - __Updates__: Build update - allow multi-thread make (make -j<N>).
__Update__: Created new example program to demonstrate using memory buffer in APIs. - __Docs__: Minor update to AutoFDO documentation.
__Bugfix__: Typos in docs and source.
__Bugfix__: Memory accessor - validate callback return values. - _Version 0.11.0_:
- _Version 0.11.1_: __Update__: build:- change -fpic to -fPIC to allow Debian build on sparc. - __Update__: ETM v4 decoder updated to support ETM version up to v4.4
__Bugfix__: build:- remove unused variable - __Update__: Memory access callback function - added new callback signature to provide TraceID to client when requesting memory.
- _Version 0.11.2_: __Update__: docs:- HOWTO.md update to match new perf build requirements. - __Update__: Created new example program to demonstrate using memory buffer in APIs.
__Bugfix__: Minor spelling typos fixed. - __Bugfix__: Typos in docs and source.
- _Version 0.12.0_: __Update__: Frame deformatter - TPIU FSYNC and HSYNC support added. - __Bugfix__: Memory accessor - validate callback return values.
__Update__: ETM v4: Bugfix & clarification on Exception trace handling. Where exception occurs at a branch target before any instructions
have been executed, the preferred return address is also the target address of the branch instruction. This case now includes as specific flag in - _Version 0.11.1_:
the packet. Additionally any context change associated with this target address was being applied incorrectly. - __Update__: build:- change -fpic to -fPIC to allow Debian build on sparc.
__Update__: Core / Architecture mapping to core names as used by test programs / snapshots updated to include additional recent ARM cores. - __Bugfix__: build:- remove unused variable
__Update__: Docs: Update to reflect new exception flag. Update test program example to reflect latest output.
__Bugfix__: ETM v4: Valid trace info packet was not handled correctly (0x01, 0x00). - _Version 0.11.2_:
__Bugfix__: ETM v4: Error messaging on commit stack overflow. - __Update__: docs:- HOWTO.md update to match new perf build requirements.
- __Bugfix__: Minor spelling typos fixed.
- _Version 0.12.0_:
- __Update__: Frame deformatter - TPIU FSYNC and HSYNC support added.
- __Update__: ETM v4: Bugfix & clarification on Exception trace handling. Where exception occurs at a branch target before any instructions
have been executed, the preferred return address is also the target address of the branch instruction. This case now includes as specific flag in
the packet. Additionally any context change associated with this target address was being applied incorrectly.
- _Update__: Core / Architecture mapping to core names as used by test programs / snapshots updated to include additional recent ARM cores.
- __Update__: Docs: Update to reflect new exception flag. Update test program example to reflect latest output.
- __Bugfix__: ETM v4: Valid trace info packet was not handled correctly (0x01, 0x00).
- __Bugfix__: ETM v4: Error messaging on commit stack overflow.
- _Version 0.12.1_:
- __Update__: build: remove -g option from release build.
- __Update__: tests: Snapshots can now use generic arch+profile names rather than core names, e.g. ARMv8-A
- __Bugfix__: Instruction decode - v8.3 B[L]A{A|B}[Z] instructions mis-identified.
-__Bugfix__: Transition from A64 to A32 can be mis-decoded if the trace implementation represents the transition
as an individual address packet followed by a context packet.
- _Version 0.12.2_:
- __Bugfix__: Clean up memory leaks.
- __Bugfix__: ETMv4: Ensure addressing history zeroed after TINFO.
- __Update__: Allow GCC version to be included in build output path.
- __Bugfix__: Packet printing update when WFI/WFE is P0 element.
- _Version 0.13.x_ : Intermediate development version.
- _Version 0.14.0_:
- __Update__: ETMv4 - decoder update & simplification to handle advanced trace features.
- __Update__: ETMv4 - decoder support for speculative trace.
- __Update__: Generic Elements: Additional information in EOT, UNSYNC, ON packets to give reason.
- __Update__: Memaccess: Add EL2 secure memory space flag.
- __Update__: Documentation: Updated for release changes and to reflect latest kernel version support for CoreSight.
- __Update__: Perf helper scripts updated to reflect latest build flow.
- __Bugfix__: Fix for component operational flag inputs.
- _Version 0.14.1_:
- __Update__: ETMv4 - Add support for Q elements.
- __Bugfix__: build: fix logic issue for && operator. (github issue #23, sumitted by yabinc)
- _Version 0.14.2_:
- __Update__: Architecture versioning. Set enum tag values to make conversion to numeric version easier.
- __Update__: I-decode: remove global temporary decode state data and replace with local instance data
to make library more easily usable in multi-threaded programs.
- __Bugfix__: I-decode: Some Thumb instructions not correctly reported as implied returns.
(github issue #24, submitted by kongy).
Licence Information Licence Information

8
decoder/build/linux/makefile
View File

@ -70,8 +70,8 @@ INSTALL_BIN_DIR=$(PREFIX)/bin
export INSTALL_INCLUDE_DIR=$(PREFIX)/include/ export INSTALL_INCLUDE_DIR=$(PREFIX)/include/
# compile flags # compile flags
CFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -fPIC CFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -Wlogical-op -fPIC
CXXFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -fPIC -std=c++11 CXXFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -Wlogical-op -fPIC -std=c++11
LDFLAGS += -Wl,-z,defs LDFLAGS += -Wl,-z,defs
ARFLAGS ?= rcs ARFLAGS ?= rcs
@ -81,8 +81,8 @@ CFLAGS += -g -O0 -DDEBUG
CXXFLAGS += -g -O0 -DDEBUG CXXFLAGS += -g -O0 -DDEBUG
BUILD_VARIANT=dbg BUILD_VARIANT=dbg
else else
CFLAGS += -g -O2 -DNDEBUG CFLAGS += -O2 -DNDEBUG
CXXFLAGS += -g -O2 -DNDEBUG CXXFLAGS += -O2 -DNDEBUG
BUILD_VARIANT=rel BUILD_VARIANT=rel
endif endif

5
decoder/build/linux/makefile.dev
View File

@ -56,7 +56,12 @@ CXXFLAGS += $(MFLAG)
CFLAGS += $(MFLAG) CFLAGS += $(MFLAG)
LDFLAGS += $(MFLAG) LDFLAGS += $(MFLAG)
ifdef GCCDIR
GCCVER:= $(shell $(CROSS_COMPILE)gcc -dumpversion | cut -c 1-3)
PLAT_DIR=builddir/linux$(BIT_VARIANT)/GCC_$(GCCVER)
else
PLAT_DIR=linux$(BIT_VARIANT)/$(BUILD_VARIANT) PLAT_DIR=linux$(BIT_VARIANT)/$(BUILD_VARIANT)
endif
# include the main makefile # include the main makefile
include makefile include makefile

5
decoder/build/linux/ref_trace_decode_lib/makefile
View File

@ -59,11 +59,9 @@ ETMV3OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv3.o \
$(BUILD_DIR)/trc_pkt_proc_etmv3_impl.o $(BUILD_DIR)/trc_pkt_proc_etmv3_impl.o
ETMV4OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv4.o \ ETMV4OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv4.o \
$(BUILD_DIR)/trc_pkt_proc_etmv4.o \ $(BUILD_DIR)/trc_pkt_proc_etmv4i.o \
$(BUILD_DIR)/trc_pkt_proc_etmv4i_impl.o \
$(BUILD_DIR)/trc_pkt_decode_etmv4i.o \ $(BUILD_DIR)/trc_pkt_decode_etmv4i.o \
$(BUILD_DIR)/trc_pkt_elem_etmv4i.o \ $(BUILD_DIR)/trc_pkt_elem_etmv4i.o \
$(BUILD_DIR)/trc_pkt_elem_etmv4d.o \
$(BUILD_DIR)/trc_etmv4_stack_elem.o $(BUILD_DIR)/trc_etmv4_stack_elem.o
PTMOBJ= $(BUILD_DIR)/trc_cmp_cfg_ptm.o \ PTMOBJ= $(BUILD_DIR)/trc_cmp_cfg_ptm.o \
@ -94,6 +92,7 @@ OBJECTS=$(BUILD_DIR)/ocsd_code_follower.o \
$(BUILD_DIR)/ocsd_error.o \ $(BUILD_DIR)/ocsd_error.o \
$(BUILD_DIR)/ocsd_error_logger.o \ $(BUILD_DIR)/ocsd_error_logger.o \
$(BUILD_DIR)/ocsd_gen_elem_list.o \ $(BUILD_DIR)/ocsd_gen_elem_list.o \
$(BUILD_DIR)/ocsd_gen_elem_stack.o \
$(BUILD_DIR)/ocsd_lib_dcd_register.o \ $(BUILD_DIR)/ocsd_lib_dcd_register.o \
$(BUILD_DIR)/ocsd_msg_logger.o \ $(BUILD_DIR)/ocsd_msg_logger.o \
$(BUILD_DIR)/ocsd_version.o \ $(BUILD_DIR)/ocsd_version.o \

8
decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
View File

@ -323,6 +323,7 @@
<ClInclude Include="..\..\..\include\common\ocsd_error.h" /> <ClInclude Include="..\..\..\include\common\ocsd_error.h" />
<ClInclude Include="..\..\..\include\common\ocsd_error_logger.h" /> <ClInclude Include="..\..\..\include\common\ocsd_error_logger.h" />
<ClInclude Include="..\..\..\include\common\ocsd_gen_elem_list.h" /> <ClInclude Include="..\..\..\include\common\ocsd_gen_elem_list.h" />
<ClInclude Include="..\..\..\include\common\ocsd_gen_elem_stack.h" />
<ClInclude Include="..\..\..\include\common\ocsd_lib_dcd_register.h" /> <ClInclude Include="..\..\..\include\common\ocsd_lib_dcd_register.h" />
<ClInclude Include="..\..\..\include\common\ocsd_msg_logger.h" /> <ClInclude Include="..\..\..\include\common\ocsd_msg_logger.h" />
<ClInclude Include="..\..\..\include\common\ocsd_pe_context.h" /> <ClInclude Include="..\..\..\include\common\ocsd_pe_context.h" />
@ -400,8 +401,6 @@
<ClInclude Include="..\..\..\include\opencsd\trc_gen_elem_types.h" /> <ClInclude Include="..\..\..\include\opencsd\trc_gen_elem_types.h" />
<ClInclude Include="..\..\..\include\opencsd\trc_pkt_types.h" /> <ClInclude Include="..\..\..\include\opencsd\trc_pkt_types.h" />
<ClInclude Include="..\..\..\source\etmv3\trc_pkt_proc_etmv3_impl.h" /> <ClInclude Include="..\..\..\source\etmv3\trc_pkt_proc_etmv3_impl.h" />
<ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4d_impl.h" />
<ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.h" />
<ClInclude Include="..\..\..\source\trc_frame_deformatter_impl.h" /> <ClInclude Include="..\..\..\source\trc_frame_deformatter_impl.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -413,10 +412,8 @@
<ClCompile Include="..\..\..\source\etmv4\trc_cmp_cfg_etmv4.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_cmp_cfg_etmv4.cpp" />
<ClCompile Include="..\..\..\source\etmv4\trc_etmv4_stack_elem.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_etmv4_stack_elem.cpp" />
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_decode_etmv4i.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_decode_etmv4i.cpp" />
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4d.cpp" />
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4i.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4i.cpp" />
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i.cpp" />
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.cpp" />
<ClCompile Include="..\..\..\source\i_dec\trc_idec_arminst.cpp" /> <ClCompile Include="..\..\..\source\i_dec\trc_idec_arminst.cpp" />
<ClCompile Include="..\..\..\source\i_dec\trc_i_decode.cpp" /> <ClCompile Include="..\..\..\source\i_dec\trc_i_decode.cpp" />
<ClCompile Include="..\..\..\source\mem_acc\trc_mem_acc_base.cpp" /> <ClCompile Include="..\..\..\source\mem_acc\trc_mem_acc_base.cpp" />
@ -430,6 +427,7 @@
<ClCompile Include="..\..\..\source\ocsd_error.cpp" /> <ClCompile Include="..\..\..\source\ocsd_error.cpp" />
<ClCompile Include="..\..\..\source\ocsd_error_logger.cpp" /> <ClCompile Include="..\..\..\source\ocsd_error_logger.cpp" />
<ClCompile Include="..\..\..\source\ocsd_gen_elem_list.cpp" /> <ClCompile Include="..\..\..\source\ocsd_gen_elem_list.cpp" />
<ClCompile Include="..\..\..\source\ocsd_gen_elem_stack.cpp" />
<ClCompile Include="..\..\..\source\ocsd_lib_dcd_register.cpp" /> <ClCompile Include="..\..\..\source\ocsd_lib_dcd_register.cpp" />
<ClCompile Include="..\..\..\source\ocsd_msg_logger.cpp" /> <ClCompile Include="..\..\..\source\ocsd_msg_logger.cpp" />
<ClCompile Include="..\..\..\source\ocsd_version.cpp" /> <ClCompile Include="..\..\..\source\ocsd_version.cpp" />

24
decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
View File

@ -221,12 +221,6 @@
<ClInclude Include="..\..\..\include\opencsd\ptm\trc_pkt_decode_ptm.h"> <ClInclude Include="..\..\..\include\opencsd\ptm\trc_pkt_decode_ptm.h">
<Filter>Header Files\ptm</Filter> <Filter>Header Files\ptm</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4d_impl.h">
<Filter>Source Files\etmv4</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.h">
<Filter>Source Files\etmv4</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\etmv3\trc_pkt_proc_etmv3_impl.h"> <ClInclude Include="..\..\..\source\etmv3\trc_pkt_proc_etmv3_impl.h">
<Filter>Source Files\etmv3</Filter> <Filter>Source Files\etmv3</Filter>
</ClInclude> </ClInclude>
@ -359,6 +353,9 @@
<ClInclude Include="..\..\..\include\opencsd\ocsd_if_version.h"> <ClInclude Include="..\..\..\include\opencsd\ocsd_if_version.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\include\common\ocsd_gen_elem_stack.h">
<Filter>Header Files\common</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\source\trc_component.cpp"> <ClCompile Include="..\..\..\source\trc_component.cpp">
@ -385,18 +382,9 @@
<ClCompile Include="..\..\..\source\ptm\trc_pkt_proc_ptm.cpp"> <ClCompile Include="..\..\..\source\ptm\trc_pkt_proc_ptm.cpp">
<Filter>Source Files\ptm</Filter> <Filter>Source Files\ptm</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4d.cpp">
<Filter>Source Files\etmv4</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4i.cpp"> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4i.cpp">
<Filter>Source Files\etmv4</Filter> <Filter>Source Files\etmv4</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4.cpp">
<Filter>Source Files\etmv4</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.cpp">
<Filter>Source Files\etmv4</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_decode_etmv4i.cpp"> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_decode_etmv4i.cpp">
<Filter>Source Files\etmv4</Filter> <Filter>Source Files\etmv4</Filter>
</ClCompile> </ClCompile>
@ -490,5 +478,11 @@
<ClCompile Include="..\..\..\source\mem_acc\trc_mem_acc_cache.cpp"> <ClCompile Include="..\..\..\source\mem_acc\trc_mem_acc_cache.cpp">
<Filter>Source Files\mem_acc</Filter> <Filter>Source Files\mem_acc</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i.cpp">
<Filter>Source Files\etmv4</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\ocsd_gen_elem_stack.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
decoder/docs/doxygen_config.dox
View File

@ -38,7 +38,7 @@ PROJECT_NAME = "OpenCSD - CoreSight Trace Decode Library"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 0.10.0 PROJECT_NUMBER = 0.14.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

15
decoder/docs/prog_guide/prog_guide_generic_pkts.md
View File

@ -83,7 +83,7 @@ typedef struct _ocsd_generic_trace_elem {
trace_on_reason_t trace_on_reason; /* reason for the trace on packet */ trace_on_reason_t trace_on_reason; /* reason for the trace on packet */
ocsd_swt_info_t sw_trace_info; /* software trace packet info */ ocsd_swt_info_t sw_trace_info; /* software trace packet info */
uint32_t num_instr_range; /* number of instructions covered by range packet (for T32 this cannot be calculated from en-st/i_size) */ uint32_t num_instr_range; /* number of instructions covered by range packet (for T32 this cannot be calculated from en-st/i_size) */
unsync_info_t unsync_eot_info; /* additional information for unsync / end-of-trace packets. */
}; };
const void *ptr_extended_data; /* pointer to extended data buffer (data trace, sw trace payload) / custom structure */ const void *ptr_extended_data; /* pointer to extended data buffer (data trace, sw trace payload) / custom structure */
@ -142,6 +142,19 @@ __ETMv3, PTM__ : These protocols can output a cycle count directly as part of th
the trace range. In this case `has_cc` will be 1 and `cycle_count` will be valid. the trace range. In this case `has_cc` will be 1 and `cycle_count` will be valid.
### OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH ###
__packet fields valid__: `isa, st_addr, en_addr, num_instr_range`
`num_instr_range` represents the number of instructions executed in this range, but there is incomplete information
as to program execution path from start to end of range.
If `num_instr` is 0, then an unknown number of instructions were executed between the start and end of the range.
`st_addr` represents the start of execution represented by this packet.
`en_addr` represents the address where execution will continue from after the instructions represented by this packet.
`isa` represents the ISA for the instruction at `en_addr`.
Used when ETMv4 Q elements are being traced.
### OCSD_GEN_TRC_ELEM_ADDR_NACC ### ### OCSD_GEN_TRC_ELEM_ADDR_NACC ###
__packet fields valid__: `st_addr` __packet fields valid__: `st_addr`

3
decoder/docs/test_progs.md
View File

@ -20,6 +20,9 @@ See [external_custom.md](@ref custom_decoders) for details.
These programs are both built at the same time as the library for the same set of platforms. These programs are both built at the same time as the library for the same set of platforms.
See [build_libs.md](@ref build_lib) for build details. See [build_libs.md](@ref build_lib) for build details.
_Note:_ The programs above use the library's [core name mapper helper class] (@ref CoreArchProfileMap) to map
the name of the core into a profile / architecture pair that the library can use.
The snapshot definition must use one of the names recognised by this class or an error will occur.
Trace "Snapshot" directory. Trace "Snapshot" directory.
---------------------------- ----------------------------

6
decoder/include/common/ocsd_dcd_mngr.h
View File

@ -115,6 +115,9 @@ ocsd_err_t DecoderMngrBase<P,Pt,Pc>::createDecoder(const int create_flags, cons
if(!pkt_proc) if(!pkt_proc)
return OCSD_ERR_MEM; return OCSD_ERR_MEM;
// set the op mode flags
pkt_proc->setComponentOpMode(create_flags & (OCSD_OPFLG_COMP_MODE_MASK | OCSD_OPFLG_PKTPROC_COMMON));
// set the configuration // set the configuration
TrcPktProcBase<P,Pt,Pc> *pProcBase = dynamic_cast< TrcPktProcBase<P,Pt,Pc> *>(pkt_proc); TrcPktProcBase<P,Pt,Pc> *pProcBase = dynamic_cast< TrcPktProcBase<P,Pt,Pc> *>(pkt_proc);
if(pProcBase == 0) if(pProcBase == 0)
@ -133,6 +136,9 @@ ocsd_err_t DecoderMngrBase<P,Pt,Pc>::createDecoder(const int create_flags, cons
if(!pkt_dcd) if(!pkt_dcd)
return OCSD_ERR_MEM; return OCSD_ERR_MEM;
// set the op mode flags
pkt_dcd->setComponentOpMode(create_flags & (OCSD_OPFLG_COMP_MODE_MASK | OCSD_OPFLG_PKTDEC_COMMON));
// get the decoder base // get the decoder base
TrcPktDecodeBase<P,Pc> *pBase = dynamic_cast< TrcPktDecodeBase<P,Pc> *>(pkt_dcd); TrcPktDecodeBase<P,Pc> *pBase = dynamic_cast< TrcPktDecodeBase<P,Pc> *>(pkt_dcd);
if(pBase == 0) if(pBase == 0)

8
decoder/include/common/ocsd_gen_elem_list.h
View File

@ -1,6 +1,6 @@
/* /*
* \file ocsd_gen_elem_stack.h * \file ocsd_gen_elem_list.h
* \brief OpenCSD : Generic element output stack. * \brief OpenCSD : Generic element output list.
* *
* \copyright Copyright (c) 2016, ARM Limited. All Rights Reserved. * \copyright Copyright (c) 2016, ARM Limited. All Rights Reserved.
*/ */
@ -47,7 +47,7 @@
* This should remove some of the requirement on the packet processing to be re-enterant, * This should remove some of the requirement on the packet processing to be re-enterant,
* simplifying this code. * simplifying this code.
* *
* Last element(s) on this stack can be marked pending to allow for later cancellation. * Last element(s) on this list can be marked pending to allow for later cancellation.
* (This required for cancel element in ETMv3 exeception branch). * (This required for cancel element in ETMv3 exeception branch).
* *
* The "list" is actually a ring buffer - maintaining pointers to indicate current valid elements. * The "list" is actually a ring buffer - maintaining pointers to indicate current valid elements.
@ -150,4 +150,4 @@ inline void OcsdGenElemList::initSendIf(componentAttachPt<ITrcGenElemIn> *pGenEl
m_sendIf = pGenElemIf; m_sendIf = pGenElemIf;
} }
/* End of File ocsd_gen_elem_stack.h */ /* End of File ocsd_gen_elem_list.h */

109
decoder/include/common/ocsd_gen_elem_stack.h Normal file
View File

@ -0,0 +1,109 @@
/*
* \file ocsd_gen_elem_stack.h
* \brief OpenCSD : Generic element output stack.
*
* \copyright Copyright (c) 2020, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "trc_gen_elem.h"
#include "comp_attach_pt_t.h"
#include "interfaces/trc_gen_elem_in_i.h"
/* element stack to handle cases where a trace element can generate multiple output packets
maintains the "current" element, which might be sent independently of this stack, and also
ensures that persistent data in the output elements is maintained between elements.
*/
class OcsdGenElemStack
{
public:
OcsdGenElemStack();
~OcsdGenElemStack();
void initSendIf(componentAttachPt<ITrcGenElemIn> *pGenElemIf);
void initCSID(const uint8_t CSID) { m_CSID = CSID; };
OcsdTraceElement &getCurrElem(); //!< get the current element.
ocsd_err_t resetElemStack(); //!< set pointers to base of stack
ocsd_err_t addElem(const ocsd_trc_index_t trc_pkt_idx); //!< add elem to stack and set current.
void setCurrElemIdx(const ocsd_trc_index_t trc_pkt_idx); //!< packet index for this element
ocsd_err_t addElemType(const ocsd_trc_index_t trc_pkt_idx, ocsd_gen_trc_elem_t elem_type);
ocsd_datapath_resp_t sendElements(); //!< send elements on the stack
const int numElemToSend() const;
private:
typedef struct _elemPtr {
OcsdTraceElement *pElem; //!< pointer to the listed trace element
ocsd_trc_index_t trc_pkt_idx; //!< packet index in the trace stream
} elemPtr_t;
const bool isInit(); //!< check correctly initialised.
ocsd_err_t growArray();
void copyPersistentData(int src, int dst); //!< copy across persistent state data between elements
void resetIndexes(); //!< clear down all indexes - reset or send complete.
elemPtr_t *m_pElemArray; //!< an array of pointers to elements.
int m_elemArraySize; //!< number of element pointers in the array
int m_elem_to_send; //!< number of live elements in the stack - init to 1.
int m_curr_elem_idx; //!< index into the element array.
int m_send_elem_idx; //!< next element to send.
//!< send packet info
uint8_t m_CSID;
componentAttachPt<ITrcGenElemIn> *m_sendIf; //!< element send interface.
bool m_is_init;
};
inline const int OcsdGenElemStack::numElemToSend() const
{
return m_elem_to_send;
}
inline void OcsdGenElemStack::initSendIf(componentAttachPt<ITrcGenElemIn> *pGenElemIf)
{
m_sendIf = pGenElemIf;
}
inline void OcsdGenElemStack::setCurrElemIdx(const ocsd_trc_index_t trc_pkt_idx)
{
m_pElemArray[m_curr_elem_idx].trc_pkt_idx = trc_pkt_idx;
}
inline OcsdTraceElement &OcsdGenElemStack::getCurrElem()
{
return *(m_pElemArray[m_curr_elem_idx].pElem);
}
/* End of File ocsd_gen_elem_stack.h */

34
decoder/include/common/trc_core_arch_map.h
View File

@ -39,6 +39,23 @@
#include <string> #include <string>
#include "opencsd/ocsd_if_types.h" #include "opencsd/ocsd_if_types.h"
/** @class CoreArchProfileMap
*
* @brief Map core / arch name to profile for decoder.
*
* Helper class for library clients to map core or architecture version names onto
* a profile / arch version pair suitable for use with the decode library.
*
* Valid core names are:-
* - Cortex-Axx : where xx = 5,7,12,15,17,32,35,53,55,57,65,72,73,75,76,77;
* - Cortex-Rxx : where xx = 5,7,8,52;
* - Cortex-Mxx : where xx = 0,0+,3,4,23,33;
*
* Valid architecture profile names are:-
* - ARMv7-A, ARMv7-R, ARMv7-M;
* - ARMv8-A, ARMv8.3A, ARMv8-R, ARMv8-M;
*
*/
class CoreArchProfileMap class CoreArchProfileMap
{ {
public: public:
@ -50,16 +67,31 @@ class CoreArchProfileMap
private: private:
std::map<std::string, ocsd_arch_profile_t> core_profiles; std::map<std::string, ocsd_arch_profile_t> core_profiles;
std::map<std::string, ocsd_arch_profile_t> arch_profiles;
}; };
inline ocsd_arch_profile_t CoreArchProfileMap::getArchProfile(const std::string &coreName) inline ocsd_arch_profile_t CoreArchProfileMap::getArchProfile(const std::string &coreName)
{ {
ocsd_arch_profile_t ap = { ARCH_UNKNOWN, profile_Unknown }; ocsd_arch_profile_t ap = { ARCH_UNKNOWN, profile_Unknown };
bool bFound = false;
std::map<std::string, ocsd_arch_profile_t>::const_iterator it; std::map<std::string, ocsd_arch_profile_t>::const_iterator it;
/* match against the core name map. */
it = core_profiles.find(coreName); it = core_profiles.find(coreName);
if(it != core_profiles.end()) if (it != core_profiles.end())
{
ap = it->second; ap = it->second;
bFound = true;
}
/* scan architecture profiles on no core name match */
if (!bFound)
{
it = arch_profiles.find(coreName);
if (it != arch_profiles.end())
ap = it->second;
}
return ap; return ap;
} }

19
decoder/include/common/trc_gen_elem.h
View File

@ -72,6 +72,7 @@ class OcsdTraceElement : public trcPrintableElem, public ocsd_generic_trace_elem
void setTraceOnReason(const trace_on_reason_t reason); void setTraceOnReason(const trace_on_reason_t reason);
void setUnSyncEOTReason(const unsync_info_t reason);
void setAddrRange(const ocsd_vaddr_t st_addr, const ocsd_vaddr_t en_addr, const int num_instr = 1); void setAddrRange(const ocsd_vaddr_t st_addr, const ocsd_vaddr_t en_addr, const int num_instr = 1);
void setLastInstrInfo(const bool exec, const ocsd_instr_type last_i_type, const ocsd_instr_subtype last_i_subtype, const uint8_t size); void setLastInstrInfo(const bool exec, const ocsd_instr_type last_i_type, const ocsd_instr_subtype last_i_subtype, const uint8_t size);
@ -94,7 +95,8 @@ class OcsdTraceElement : public trcPrintableElem, public ocsd_generic_trace_elem
// return current context // return current context
const ocsd_pe_context &getContext() const { return context; }; const ocsd_pe_context &getContext() const { return context; };
void copyPersistentData(const OcsdTraceElement &src);
private: private:
void printSWInfoPkt(std::ostringstream &oss) const; void printSWInfoPkt(std::ostringstream &oss) const;
void clearPerPktData(); //!< clear flags that indicate validity / have values on a per packet basis void clearPerPktData(); //!< clear flags that indicate validity / have values on a per packet basis
@ -171,8 +173,8 @@ inline void OcsdTraceElement::init()
inline void OcsdTraceElement::clearPerPktData() inline void OcsdTraceElement::clearPerPktData()
{ {
flag_bits = 0; // union with trace_on_reason / trace_event flag_bits = 0; // bit-field with various flags.
exception_number = 0; // union with trace_on_reason / trace_event
ptr_extended_data = 0; // extended data pointer ptr_extended_data = 0; // extended data pointer
} }
@ -181,6 +183,11 @@ inline void OcsdTraceElement::setTraceOnReason(const trace_on_reason_t reason)
trace_on_reason = reason; trace_on_reason = reason;
} }
inline void OcsdTraceElement::setUnSyncEOTReason(const unsync_info_t reason)
{
unsync_eot_info = reason;
}
inline void OcsdTraceElement::setISA(const ocsd_isa isa_update) inline void OcsdTraceElement::setISA(const ocsd_isa isa_update)
{ {
isa = isa_update; isa = isa_update;
@ -201,6 +208,12 @@ inline void OcsdTraceElement::setExtendedDataPtr(const void *data_ptr)
ptr_extended_data = data_ptr; ptr_extended_data = data_ptr;
} }
// set persistent data between output packets.
inline void OcsdTraceElement::copyPersistentData(const OcsdTraceElement &src)
{
isa = src.isa;
context = src.context;
}
/** @}*/ /** @}*/

5
decoder/include/common/trc_pkt_decode_base.h
View File

@ -85,7 +85,10 @@ class TrcPktDecodeI : public TraceComponent
virtual ocsd_err_t onProtocolConfig() = 0; virtual ocsd_err_t onProtocolConfig() = 0;
virtual const uint8_t getCoreSightTraceID() = 0; virtual const uint8_t getCoreSightTraceID() = 0;
/* init handling */
const bool checkInit(); const bool checkInit();
/* Called on first init confirmation */
virtual void onFirstInitOK() {};
/* data output */ /* data output */
ocsd_datapath_resp_t outputTraceElement(const OcsdTraceElement &elem); // use current index ocsd_datapath_resp_t outputTraceElement(const OcsdTraceElement &elem); // use current index
@ -147,6 +150,8 @@ inline const bool TrcPktDecodeI::checkInit()
init_err_msg = "No instruction decoder interface attached and enabled"; init_err_msg = "No instruction decoder interface attached and enabled";
else else
m_decode_init_ok = true; m_decode_init_ok = true;
if (m_decode_init_ok)
onFirstInitOK();
} }
return m_decode_init_ok; return m_decode_init_ok;
} }

96
decoder/include/common/trc_raw_buffer.h Normal file
View File

@ -0,0 +1,96 @@
/*
* \file trc_raw_buffer.h
* \brief OpenCSD : Trace raw data byte buffer
*
* \copyright Copyright (c) 2019, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ARM_TRC_RAW_BUFFER_H_INCLUDED
#define ARM_TRC_RAW_BUFFER_H_INCLUDED
#include <vector>
class TraceRawBuffer
{
public:
TraceRawBuffer() :
m_bufSize(0),
m_bufProcessed(0),
m_pBuffer(0),
pkt(0)
{};
~TraceRawBuffer() {};
// init the buffer
void init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet);
void copyByteToPkt(); // move a byte to the packet buffer
uint8_t peekNextByte(); // value of next byte in buffer.
bool empty() { return m_bufProcessed == m_bufSize; };
// bytes processed.
uint32_t processed() { return m_bufProcessed; };
// buffer size;
uint32_t size() { return m_bufSize; }
private:
uint32_t m_bufSize;
uint32_t m_bufProcessed;
const uint8_t *m_pBuffer;
std::vector<uint8_t> *pkt;
};
// init the buffer
inline void TraceRawBuffer::init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet)
{
m_bufSize = size;
m_bufProcessed = 0;
m_pBuffer = rawtrace;
pkt = out_packet;
}
inline void TraceRawBuffer::copyByteToPkt()
{
if (!empty()) {
pkt->push_back(m_pBuffer[m_bufProcessed]);
m_bufProcessed++;
}
}
inline uint8_t TraceRawBuffer::peekNextByte()
{
uint8_t val = 0;
if (!empty())
val = m_pBuffer[m_bufProcessed];
return val;
}
#endif // ARM_TRC_RAW_BUFFER_H_INCLUDED

7
decoder/include/i_dec/trc_i_decode.h
View File

@ -46,10 +46,9 @@ class TrcIDecode : public IInstrDecode
virtual ocsd_err_t DecodeInstruction(ocsd_instr_info *instr_info); virtual ocsd_err_t DecodeInstruction(ocsd_instr_info *instr_info);
private: private:
ocsd_err_t DecodeA32(ocsd_instr_info *instr_info); ocsd_err_t DecodeA32(ocsd_instr_info *instr_info, struct decode_info *info);
ocsd_err_t DecodeA64(ocsd_instr_info *instr_info); ocsd_err_t DecodeA64(ocsd_instr_info *instr_info, struct decode_info *info);
ocsd_err_t DecodeT32(ocsd_instr_info *instr_info); ocsd_err_t DecodeT32(ocsd_instr_info *instr_info, struct decode_info *info);
void SetArchVersion(ocsd_instr_info *instr_info);
}; };
#endif // ARM_TRC_I_DECODE_H_INCLUDED #endif // ARM_TRC_I_DECODE_H_INCLUDED

44
decoder/include/i_dec/trc_idec_arminst.h
View File

@ -42,6 +42,12 @@
#include "opencsd/ocsd_if_types.h" #include "opencsd/ocsd_if_types.h"
#include <cstdint> #include <cstdint>
/* supplementary decode information */
struct decode_info {
uint16_t arch_version;
ocsd_instr_subtype instr_sub_type;
};
/* /*
For Thumb2, test if a halfword is the first half of a 32-bit instruction, For Thumb2, test if a halfword is the first half of a 32-bit instruction,
as opposed to a complete 16-bit instruction. as opposed to a complete 16-bit instruction.
@ -63,19 +69,19 @@ instructions that write to the PC. It does not include exception
instructions such as SVC, HVC and SMC. instructions such as SVC, HVC and SMC.
(Performance event 0x0C includes these.) (Performance event 0x0C includes these.)
*/ */
int inst_ARM_is_branch(uint32_t inst); int inst_ARM_is_branch(uint32_t inst, struct decode_info *info);
int inst_Thumb_is_branch(uint32_t inst); int inst_Thumb_is_branch(uint32_t inst, struct decode_info *info);
int inst_A64_is_branch(uint32_t inst); int inst_A64_is_branch(uint32_t inst, struct decode_info *info);
/* /*
Test whether an instruction is a direct (aka immediate) branch. Test whether an instruction is a direct (aka immediate) branch.
Performance event 0x0D counts these. Performance event 0x0D counts these.
*/ */
int inst_ARM_is_direct_branch(uint32_t inst); int inst_ARM_is_direct_branch(uint32_t inst);
int inst_Thumb_is_direct_branch(uint32_t inst); int inst_Thumb_is_direct_branch(uint32_t inst, struct decode_info *info);
int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond); int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond, struct decode_info *info);
int inst_A64_is_direct_branch(uint32_t inst); int inst_A64_is_direct_branch(uint32_t inst, struct decode_info *info);
int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link); int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info);
/* /*
Get branch destination for a direct branch. Get branch destination for a direct branch.
@ -84,15 +90,15 @@ int inst_ARM_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc);
int inst_Thumb_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc); int inst_Thumb_branch_destination(uint32_t addr, uint32_t inst, uint32_t *pnpc);
int inst_A64_branch_destination(uint64_t addr, uint32_t inst, uint64_t *pnpc); int inst_A64_branch_destination(uint64_t addr, uint32_t inst, uint64_t *pnpc);
int inst_ARM_is_indirect_branch(uint32_t inst); int inst_ARM_is_indirect_branch(uint32_t inst, struct decode_info *info);
int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link); int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info);
int inst_Thumb_is_indirect_branch(uint32_t inst); int inst_Thumb_is_indirect_branch(uint32_t inst, struct decode_info *info);
int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link); int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info);
int inst_A64_is_indirect_branch(uint32_t inst); int inst_A64_is_indirect_branch(uint32_t inst, struct decode_info *info);
int inst_ARM_is_branch_and_link(uint32_t inst); int inst_ARM_is_branch_and_link(uint32_t inst, struct decode_info *info);
int inst_Thumb_is_branch_and_link(uint32_t inst); int inst_Thumb_is_branch_and_link(uint32_t inst, struct decode_info *info);
int inst_A64_is_branch_and_link(uint32_t inst); int inst_A64_is_branch_and_link(uint32_t inst, struct decode_info *info);
int inst_ARM_is_conditional(uint32_t inst); int inst_ARM_is_conditional(uint32_t inst);
int inst_Thumb_is_conditional(uint32_t inst); int inst_Thumb_is_conditional(uint32_t inst);
@ -128,14 +134,6 @@ int inst_ARM_is_UDF(uint32_t inst);
int inst_Thumb_is_UDF(uint32_t inst); int inst_Thumb_is_UDF(uint32_t inst);
int inst_A64_is_UDF(uint32_t inst); int inst_A64_is_UDF(uint32_t inst);
/* access sub-type information */
ocsd_instr_subtype get_instr_subtype();
void clear_instr_subtype();
/* set arch version info. */
void set_arch_version(uint16_t version);
#endif // ARM_TRC_IDEC_ARMINST_H_INCLUDED #endif // ARM_TRC_IDEC_ARMINST_H_INCLUDED
/* End of File trc_idec_arminst.h */ /* End of File trc_idec_arminst.h */

1
decoder/include/mem_acc/trc_mem_acc_bufptr.h
View File

@ -68,7 +68,6 @@ class TrcMemAccBufPtr: public TrcMemAccessorBase
private: private:
const uint8_t *m_p_buffer; /**< pointer to the memory buffer */ const uint8_t *m_p_buffer; /**< pointer to the memory buffer */
const uint32_t m_size; /**< size of the memory buffer. */
}; };
#endif // ARM_TRC_MEM_ACC_BUFPTR_H_INCLUDED #endif // ARM_TRC_MEM_ACC_BUFPTR_H_INCLUDED

1
decoder/include/opencsd/etmv3/trc_pkt_decode_etmv3.h
View File

@ -264,6 +264,7 @@ class TrcPktDecodeEtmV3 : public TrcPktDecodeBase<EtmV3TrcPacket, EtmV3Config>
} processor_state_t; } processor_state_t;
processor_state_t m_curr_state; processor_state_t m_curr_state;
unsync_info_t m_unsync_info; //!< additional state for unsync
uint8_t m_CSID; //!< Coresight trace ID for this decoder. uint8_t m_CSID; //!< Coresight trace ID for this decoder.
}; };

1
decoder/include/opencsd/etmv4/etmv4_decoder.h
View File

@ -38,7 +38,6 @@
#include "trc_cmp_cfg_etmv4.h" #include "trc_cmp_cfg_etmv4.h"
#include "trc_pkt_elem_etmv4i.h" #include "trc_pkt_elem_etmv4i.h"
#include "trc_pkt_elem_etmv4d.h"
#include "trc_pkt_proc_etmv4.h" #include "trc_pkt_proc_etmv4.h"
#include "trc_pkt_types_etmv4.h" #include "trc_pkt_types_etmv4.h"
#include "trc_pkt_decode_etmv4i.h" #include "trc_pkt_decode_etmv4i.h"

99
decoder/include/opencsd/etmv4/trc_etmv4_stack_elem.h
View File

@ -56,6 +56,7 @@ typedef enum _p0_elem_t
P0_TS, P0_TS,
P0_CC, P0_CC,
P0_TS_CC, P0_TS_CC,
P0_Q,
P0_OVERFLOW, P0_OVERFLOW,
P0_FUNC_RET, P0_FUNC_RET,
} p0_elem_t; } p0_elem_t;
@ -119,6 +120,44 @@ inline TrcStackElemAddr::TrcStackElemAddr(const ocsd_etmv4_i_pkt_type root_pkt,
m_addr_val.isa = 0; m_addr_val.isa = 0;
} }
/************************************************************/
/** Q element */
class TrcStackQElem : public TrcStackElem
{
protected:
TrcStackQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index);
virtual ~TrcStackQElem() {};
friend class EtmV4P0Stack;
public:
void setInstrCount(const int instr_count) { m_instr_count = instr_count; };
const int getInstrCount() const { return m_instr_count; }
void setAddr(const etmv4_addr_val_t &addr_val)
{
m_addr_val = addr_val;
m_has_addr = true;
};
const etmv4_addr_val_t &getAddr() const { return m_addr_val; };
const bool hasAddr() const { return m_has_addr; };
private:
bool m_has_addr;
etmv4_addr_val_t m_addr_val;
int m_instr_count;
};
inline TrcStackQElem::TrcStackQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
TrcStackElem(P0_Q , true, root_pkt, root_index)
{
m_addr_val.val = 0;
m_addr_val.isa = 0;
m_has_addr = false;
m_instr_count = 0;
}
/************************************************************/ /************************************************************/
/** Context element */ /** Context element */
@ -133,9 +172,12 @@ class TrcStackElemCtxt : public TrcStackElem
public: public:
void setContext(const etmv4_context_t &ctxt) { m_context = ctxt; }; void setContext(const etmv4_context_t &ctxt) { m_context = ctxt; };
const etmv4_context_t &getContext() const { return m_context; }; const etmv4_context_t &getContext() const { return m_context; };
void setIS(const uint8_t IS) { m_IS = IS; };
const uint8_t getIS() const { return m_IS; };
private: private:
etmv4_context_t m_context; etmv4_context_t m_context;
uint8_t m_IS; //!< IS value at time of generation of packet.
}; };
inline TrcStackElemCtxt::TrcStackElemCtxt(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) : inline TrcStackElemCtxt::TrcStackElemCtxt(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index) :
@ -188,6 +230,7 @@ class TrcStackElemAtom : public TrcStackElem
const ocsd_atm_val commitOldest(); const ocsd_atm_val commitOldest();
int cancelNewest(const int nCancel); int cancelNewest(const int nCancel);
void mispredictNewest();
const bool isEmpty() const { return (m_atom.num == 0); }; const bool isEmpty() const { return (m_atom.num == 0); };
private: private:
@ -217,6 +260,16 @@ inline int TrcStackElemAtom::cancelNewest(const int nCancel)
return nRemove; return nRemove;
} }
// mispredict newest - flip the bit of the newest atom
inline void TrcStackElemAtom::mispredictNewest()
{
uint32_t mask = 0x1 << (m_atom.num - 1);
if (m_atom.En_bits & mask)
m_atom.En_bits &= ~mask;
else
m_atom.En_bits |= mask;
}
/************************************************************/ /************************************************************/
/** Generic param element */ /** Generic param element */
@ -252,12 +305,20 @@ class EtmV4P0Stack
void push_front(TrcStackElem *pElem); void push_front(TrcStackElem *pElem);
void push_back(TrcStackElem *pElem); // insert element when processing void push_back(TrcStackElem *pElem); // insert element when processing
void pop_back(); void pop_back(bool pend_delete = true);
void pop_front(bool pend_delete = true);
TrcStackElem *back(); TrcStackElem *back();
TrcStackElem *front();
size_t size(); size_t size();
// iterate through stack from front
void from_front_init();
TrcStackElem *from_front_next();
void erase_curr_from_front(); // erase the element last returned
void delete_all(); void delete_all();
void delete_back(); void delete_back();
void delete_front();
void delete_popped(); void delete_popped();
// creation functions - create and push if successful. // creation functions - create and push if successful.
@ -265,13 +326,13 @@ class EtmV4P0Stack
TrcStackElem *createParamElemNoParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, bool back = false); TrcStackElem *createParamElemNoParam(const p0_elem_t p0_type, const bool isP0, const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, bool back = false);
TrcStackElemAtom *createAtomElem (const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const ocsd_pkt_atom &atom); TrcStackElemAtom *createAtomElem (const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const ocsd_pkt_atom &atom);
TrcStackElemExcept *createExceptElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const bool bSame, const uint16_t excepNum); TrcStackElemExcept *createExceptElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const bool bSame, const uint16_t excepNum);
TrcStackElemCtxt *createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context); TrcStackElemCtxt *createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context, const uint8_t IS, const bool back = false);
TrcStackElemAddr *createAddrElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_addr_val_t &addr_val); TrcStackElemAddr *createAddrElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_addr_val_t &addr_val);
TrcStackQElem *createQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const int count);
private: private:
std::deque<TrcStackElem *> m_P0_stack; //!< P0 decode element stack std::deque<TrcStackElem *> m_P0_stack; //!< P0 decode element stack
std::vector<TrcStackElem *> m_popped_elem; //!< save list of popped but not deleted elements. std::vector<TrcStackElem *> m_popped_elem; //!< save list of popped but not deleted elements.
std::deque<TrcStackElem *>::iterator m_iter; //!< iterate across the list w/o removing stuff
}; };
inline EtmV4P0Stack::~EtmV4P0Stack() inline EtmV4P0Stack::~EtmV4P0Stack()
@ -293,12 +354,20 @@ inline void EtmV4P0Stack::push_back(TrcStackElem *pElem)
} }
// pop last element pointer off the stack and stash it for later deletion // pop last element pointer off the stack and stash it for later deletion
inline void EtmV4P0Stack::pop_back() inline void EtmV4P0Stack::pop_back(bool pend_delete /* = true */)
{ {
m_popped_elem.push_back(m_P0_stack.back()); if (pend_delete)
m_popped_elem.push_back(m_P0_stack.back());
m_P0_stack.pop_back(); m_P0_stack.pop_back();
} }
inline void EtmV4P0Stack::pop_front(bool pend_delete /* = true */)
{
if (pend_delete)
m_popped_elem.push_back(m_P0_stack.front());
m_P0_stack.pop_front();
}
// pop last element pointer off the stack and delete immediately // pop last element pointer off the stack and delete immediately
inline void EtmV4P0Stack::delete_back() inline void EtmV4P0Stack::delete_back()
{ {
@ -310,12 +379,30 @@ inline void EtmV4P0Stack::delete_back()
} }
} }
// pop first element pointer off the stack and delete immediately
inline void EtmV4P0Stack::delete_front()
{
if (m_P0_stack.size() > 0)
{
TrcStackElem* pElem = m_P0_stack.front();
delete pElem;
m_P0_stack.pop_front();
}
}
// get a pointer to the last element on the stack // get a pointer to the last element on the stack
inline TrcStackElem *EtmV4P0Stack::back() inline TrcStackElem *EtmV4P0Stack::back()
{ {
return m_P0_stack.back(); return m_P0_stack.back();
} }
inline TrcStackElem *EtmV4P0Stack::front()
{
return m_P0_stack.front();
}
// remove and delete all the elements left on the stack // remove and delete all the elements left on the stack
inline void EtmV4P0Stack::delete_all() inline void EtmV4P0Stack::delete_all()
{ {

131
decoder/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
View File

@ -40,6 +40,7 @@
#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h" #include "opencsd/etmv4/trc_cmp_cfg_etmv4.h"
#include "common/trc_gen_elem.h" #include "common/trc_gen_elem.h"
#include "common/trc_ret_stack.h" #include "common/trc_ret_stack.h"
#include "common/ocsd_gen_elem_stack.h"
#include "opencsd/etmv4/trc_etmv4_stack_elem.h" #include "opencsd/etmv4/trc_etmv4_stack_elem.h"
class TrcStackElem; class TrcStackElem;
@ -65,35 +66,69 @@ class TrcPktDecodeEtmV4I : public TrcPktDecodeBase<EtmV4ITrcPacket, EtmV4Config>
/* local decode methods */ /* local decode methods */
void initDecoder(); // initial state on creation (zeros all config) void initDecoder(); // initial state on creation (zeros all config)
void resetDecoder(); // reset state to start of decode. (moves state, retains config) void resetDecoder(); // reset state to start of decode. (moves state, retains config)
virtual void onFirstInitOK(); // override to set init related info.
ocsd_datapath_resp_t decodePacket(bool &Complete); // return true to indicate decode complete - can change FSM to commit state - return is false. ocsd_err_t decodePacket(); // decode packet into trace elements. return true to indicate decode complete - can change FSM to commit state - return is false.
ocsd_datapath_resp_t commitElements(bool &Complete); // commit elements - may get wait response, or flag completion. ocsd_datapath_resp_t resolveElements(); // commit/cancel trace elements generated from latest / prior packets & send to output - may get wait response, or flag completion.
ocsd_datapath_resp_t flushEOT(); ocsd_err_t commitElements(); // commit elements - process element stack to generate output packets.
ocsd_err_t commitElemOnEOT();
ocsd_err_t cancelElements(); // cancel elements. These not output
ocsd_err_t mispredictAtom(); // mispredict an atom
ocsd_err_t discardElements(); // discard elements and flush
void doTraceInfoPacket(); void doTraceInfoPacket();
void updateContext(TrcStackElemCtxt *pCtxtElem); void updateContext(TrcStackElemCtxt *pCtxtElem, OcsdTraceElement &elem);
// process atom will output instruction trace, or no memory access trace elements. // process atom will create instruction trace, or no memory access trace output elements.
ocsd_datapath_resp_t processAtom(const ocsd_atm_val, bool &bCont); ocsd_err_t processAtom(const ocsd_atm_val atom);
// process an exception element - output instruction trace + exception generic type. // process an exception element - output instruction trace + exception generic type.
ocsd_datapath_resp_t processException(); ocsd_err_t processException();
// process Q element
ocsd_err_t processQElement();
// process an element that cannot be cancelled / discarded
ocsd_err_t processTS_CC_EventElem(TrcStackElem *pElem);
// process a bad packet // process a bad packet
ocsd_datapath_resp_t handleBadPacket(const char *reason); ocsd_err_t handleBadPacket(const char *reason);
ocsd_datapath_resp_t outputCC(TrcStackElemParam *pParamElem); ocsd_err_t addElemCC(TrcStackElemParam *pParamElem);
ocsd_datapath_resp_t outputTS(TrcStackElemParam *pParamElem, bool withCC); ocsd_err_t addElemTS(TrcStackElemParam *pParamElem, bool withCC);
ocsd_datapath_resp_t outputEvent(TrcStackElemParam *pParamElem); ocsd_err_t addElemEvent(TrcStackElemParam *pParamElem);
private: private:
void SetInstrInfoInAddrISA(const ocsd_vaddr_t addr_val, const uint8_t isa); void SetInstrInfoInAddrISA(const ocsd_vaddr_t addr_val, const uint8_t isa);
const ocsd_isa calcISA(const bool SF, const uint8_t IS) const
{
if (SF)
return ocsd_isa_aarch64;
return (IS == 0) ? ocsd_isa_arm : ocsd_isa_thumb2;
}
typedef enum {
WP_NOT_FOUND,
WP_FOUND,
WP_NACC
} WP_res_t;
ocsd_err_t traceInstrToWP(bool &bWPFound, const bool traceToAddrNext = false, const ocsd_vaddr_t nextAddrMatch = 0); //!< follow instructions from the current address to a WP. true if good, false if memory cannot be accessed. typedef struct {
ocsd_vaddr_t st_addr;
ocsd_vaddr_t en_addr;
uint32_t num_instr;
} instr_range_t;
ocsd_datapath_resp_t returnStackPop(); // pop return stack and update instruction address. //!< follow instructions from the current address to a WP. true if good, false if memory cannot be accessed.
ocsd_err_t traceInstrToWP(instr_range_t &instr_range, WP_res_t &WPRes, const bool traceToAddrNext = false, const ocsd_vaddr_t nextAddrMatch = 0);
ocsd_datapath_resp_t outputTraceRange(const bool executed, ocsd_trc_index_t index); inline const bool WPFound(WP_res_t res) const { return (res == WP_FOUND); };
inline const bool WPNacc(WP_res_t res) const { return (res == WP_NACC); };
ocsd_err_t returnStackPop(); // pop return stack and update instruction address.
void setElemTraceRange(OcsdTraceElement &elemIn, const instr_range_t &addr_range, const bool executed, ocsd_trc_index_t index);
ocsd_mem_space_acc_t getCurrMemSpace();
//** intra packet state (see ETMv4 spec 6.2.1); //** intra packet state (see ETMv4 spec 6.2.1);
@ -105,14 +140,18 @@ class TrcPktDecodeEtmV4I : public TrcPktDecodeBase<EtmV4ITrcPacket, EtmV4Config>
uint32_t m_vmid_id; // most recent VMID uint32_t m_vmid_id; // most recent VMID
bool m_is_secure; // true if Secure bool m_is_secure; // true if Secure
bool m_is_64bit; // true if 64 bit bool m_is_64bit; // true if 64 bit
uint8_t m_last_IS; // last instruction set value from address packet.
// cycle counts // cycle counts
int m_cc_threshold; int m_cc_threshold;
// speculative trace (unsupported at present in the decoder). // speculative trace
int m_curr_spec_depth; int m_curr_spec_depth;
int m_max_spec_depth; int m_max_spec_depth; // nax depth - from ID reg, beyond which auto-commit occurs
int m_unseen_spec_elem; // speculative elements at decode start
/** Remove elements that are associated with data trace */
#ifdef DATA_TRACE_SUPPORTED
// data trace associative elements (unsupported at present in the decoder). // data trace associative elements (unsupported at present in the decoder).
int m_p0_key; int m_p0_key;
int m_p0_key_max; int m_p0_key_max;
@ -121,6 +160,7 @@ class TrcPktDecodeEtmV4I : public TrcPktDecodeBase<EtmV4ITrcPacket, EtmV4Config>
int m_cond_c_key; int m_cond_c_key;
int m_cond_r_key; int m_cond_r_key;
int m_cond_key_max_incr; int m_cond_key_max_incr;
#endif
uint8_t m_CSID; //!< Coresight trace ID for this decoder. uint8_t m_CSID; //!< Coresight trace ID for this decoder.
@ -134,55 +174,52 @@ class TrcPktDecodeEtmV4I : public TrcPktDecodeBase<EtmV4ITrcPacket, EtmV4Config>
WAIT_SYNC, //!< waiting for sync packet. WAIT_SYNC, //!< waiting for sync packet.
WAIT_TINFO, //!< waiting for trace info packet. WAIT_TINFO, //!< waiting for trace info packet.
DECODE_PKTS, //!< processing packets - creating decode elements on stack DECODE_PKTS, //!< processing packets - creating decode elements on stack
COMMIT_ELEM, //!< commit elements for execution - create generic trace elements and pass on. RESOLVE_ELEM, //!< analyze / resolve decode elements - create generic trace elements and pass on.
} processor_state_t; } processor_state_t;
processor_state_t m_curr_state; processor_state_t m_curr_state;
unsync_info_t m_unsync_eot_info; //!< addition info when / why unsync / eot
//** P0 element stack //** P0 element stack
EtmV4P0Stack m_P0_stack; //!< P0 decode element stack EtmV4P0Stack m_P0_stack; //!< P0 decode element stack
int m_P0_commit; //!< number of elements to commit // element resolution
struct {
int P0_commit; //!< number of elements to commit
int P0_cancel; //!< elements to cancel
bool mispredict; //!< mispredict latest atom
bool discard; //!< discard elements
} m_elem_res;
//! true if any of the element resolution fields are non-zero
const bool isElemForRes() const {
return (m_elem_res.P0_commit || m_elem_res.P0_cancel ||
m_elem_res.mispredict || m_elem_res.discard);
}
void clearElemRes() {
m_elem_res.P0_commit = 0;
m_elem_res.P0_cancel = 0;
m_elem_res.mispredict = false;
m_elem_res.discard = false;
}
// packet decode state // packet decode state
bool m_need_ctxt; //!< need context to continue bool m_need_ctxt; //!< need context to continue
bool m_need_addr; //!< need an address to continue bool m_need_addr; //!< need an address to continue
bool m_except_pending_addr; //!< next address packet is part of exception. bool m_elem_pending_addr; //!< next address packet is needed for prev element.
// exception packet processing state (may need excep elem only, range+excep, range+
typedef enum {
EXCEP_POP, // start of processing read exception packets off the stack and analyze
EXCEP_RANGE, // output a range element
EXCEP_NACC, // output a nacc element
EXCEP_CTXT, // output a ctxt element
EXCEP_EXCEP, // output an ecxeption element.
} excep_proc_state_t;
struct {
excep_proc_state_t proc; //!< state of exception processing
etmv4_addr_val_t addr; //!< excetion return address.
uint32_t number; //!< exception number.
ocsd_trc_index_t index; //!< trace index for exception element
bool addr_b_tgt; //!< return address is also branch tgt address.
} m_excep_info; //!< exception info when processing exception packets
ocsd_instr_info m_instr_info; //!< instruction info for code follower - in address is the next to be decoded. ocsd_instr_info m_instr_info; //!< instruction info for code follower - in address is the next to be decoded.
bool m_mem_nacc_pending; //!< need to output a memory access failure packet
ocsd_vaddr_t m_nacc_addr; //!< record unaccessible address
ocsd_pe_context m_pe_context; //!< current context information
etmv4_trace_info_t m_trace_info; //!< trace info for this trace run. etmv4_trace_info_t m_trace_info; //!< trace info for this trace run.
bool m_prev_overflow; bool m_prev_overflow;
bool m_flush_EOT; //!< true if doing an end of trace flush - cleans up lingering events / TS / CC TrcAddrReturnStack m_return_stack; //!< the address return stack.
TrcAddrReturnStack m_return_stack;
//** output element
OcsdTraceElement m_output_elem;
//** output element handling
OcsdGenElemStack m_out_elem; //!< output element stack.
OcsdTraceElement &outElem() { return m_out_elem.getCurrElem(); }; //!< current out element
}; };
#endif // ARM_TRC_PKT_DECODE_ETMV4I_H_INCLUDED #endif // ARM_TRC_PKT_DECODE_ETMV4I_H_INCLUDED

73
decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
View File

@ -1,73 +0,0 @@
/*
* \file trc_pkt_elem_etmv4d.h
* \brief OpenCSD :
*
* \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
#define ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
#include "trc_pkt_types_etmv4.h"
#include "common/trc_printable_elem.h"
#include "common/trc_pkt_elem_base.h"
/** @addtogroup trc_pkts
@{*/
/*!
* @class EtmV4DTrcPacket
* @brief ETMv4 Data Trace Protocol Packet .
*
* This class represents a single ETMv4 instruction trace packet, along with intra packet state.
*
*/
class EtmV4DTrcPacket : public TrcPacketBase, public ocsd_etmv4_d_pkt, trcPrintableElem
{
public:
EtmV4DTrcPacket();
~EtmV4DTrcPacket();
// update interface - set packet values
// packet status interface - get packet info.
// printing
virtual void toString(std::string &str) const;
virtual void toStringFmt(const uint32_t fmtFlags, std::string &str) const;
};
/** @}*/
#endif // ARM_TRC_PKT_ELEM_ETMV4D_H_INCLUDED
/* End of File trc_pkt_elem_etmv4d.h */

40
decoder/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h
View File

@ -57,14 +57,7 @@ class Etmv4PktAddrStack
public: public:
Etmv4PktAddrStack() Etmv4PktAddrStack()
{ {
for (int i = 0; i < 3; i++) reset_stack();
{
m_v_addr[i].pkt_bits = 0;
m_v_addr[i].size = VA_64BIT;
m_v_addr[i].val = 0;
m_v_addr[i].valid_bits = 0;
m_v_addr_ISA[i] = 0;
}
} }
~Etmv4PktAddrStack() {}; ~Etmv4PktAddrStack() {};
@ -87,6 +80,20 @@ class Etmv4PktAddrStack
} }
} }
// explicit reset for TInfo.
void reset_stack()
{
for (int i = 0; i < 3; i++)
{
m_v_addr[i].pkt_bits = 0;
m_v_addr[i].size = OCSD_MAX_VA_BITSIZE == 64 ? VA_64BIT : VA_32BIT;
m_v_addr[i].val = 0;
m_v_addr[i].valid_bits = OCSD_MAX_VA_BITSIZE;
m_v_addr_ISA[i] = 0;
}
}
private: private:
ocsd_pkt_vaddr m_v_addr[3]; //!< most recently broadcast address packet ocsd_pkt_vaddr m_v_addr[3]; //!< most recently broadcast address packet
uint8_t m_v_addr_ISA[3]; uint8_t m_v_addr_ISA[3];
@ -172,6 +179,7 @@ class EtmV4ITrcPacket : public TrcPacketBase, public ocsd_etmv4_i_pkt, public t
// atom // atom
const ocsd_pkt_atom &getAtom() const { return atom; }; const ocsd_pkt_atom &getAtom() const { return atom; };
const int getNumAtoms() const { return atom.num; };
// context // context
const etmv4_context_t &getContext() const { return context; }; const etmv4_context_t &getContext() const { return context; };
@ -188,6 +196,10 @@ class EtmV4ITrcPacket : public TrcPacketBase, public ocsd_etmv4_i_pkt, public t
// cc // cc
const uint32_t getCC() const { return pkt_valid.bits.cc_valid ? cycle_count : 0; }; const uint32_t getCC() const { return pkt_valid.bits.cc_valid ? cycle_count : 0; };
// speculation
const int getCommitElem() const { return commit_elements; };
const int getCancelElem() const { return cancel_elements; };
// packet type // packet type
const bool isBadPacket() const; const bool isBadPacket() const;
@ -227,6 +239,10 @@ inline void EtmV4ITrcPacket::clearTraceInfo()
// set these as defaults - if they don't appear in TINFO this is the state. // set these as defaults - if they don't appear in TINFO this is the state.
setTraceInfo(0); setTraceInfo(0);
setTraceInfoSpec(0); setTraceInfoSpec(0);
// explicitly reset the stack & zero the current address.
m_addr_stack.reset_stack();
m_addr_stack.get_idx(0, v_addr, v_addr_ISA);
} }
inline void EtmV4ITrcPacket::setTraceInfo(const uint32_t infoVal) inline void EtmV4ITrcPacket::setTraceInfo(const uint32_t infoVal)
@ -450,17 +466,17 @@ inline void EtmV4ITrcPacket::set32BitAddress(const uint32_t addr, const uint8_t
if (pkt_valid.bits.context_valid && context.SF) if (pkt_valid.bits.context_valid && context.SF)
{ {
v_addr.size = VA_64BIT; v_addr.size = VA_64BIT;
if (v_addr.valid_bits < 32) // may be updating a 64 bit address so only set 32 if currently less.
v_addr.valid_bits = 32;
v_addr.val = (v_addr.val & ~mask) | (addr & mask); v_addr.val = (v_addr.val & ~mask) | (addr & mask);
} }
else else
{ {
v_addr.val = addr; v_addr.val = addr;
v_addr.size = VA_32BIT; v_addr.size = VA_32BIT;
v_addr.valid_bits = 32;
} }
if (v_addr.valid_bits < 32) // may be updating a 64 bit address so only set 32 if currently less.
v_addr.valid_bits = 32;
v_addr_ISA = IS; v_addr_ISA = IS;
push_vaddr(); push_vaddr();
} }

63
decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
View File

@ -35,70 +35,13 @@
#ifndef ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED #ifndef ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
#define ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED #define ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
// split I & D into separate files, retain this header for backward compatibility
// for now just include the I packet processor as that is the only one implemented.
#include "trc_pkt_types_etmv4.h" #include "trc_pkt_types_etmv4.h"
#include "trc_pkt_proc_etmv4i.h"
#include "common/trc_pkt_proc_base.h" #include "common/trc_pkt_proc_base.h"
class EtmV4IPktProcImpl; /**< ETMv4 I channel packet processor */
class EtmV4DPktProcImpl; /**< ETMv4 D channel packet processor */
class EtmV4ITrcPacket;
class EtmV4DTrcPacket;
class EtmV4Config;
/** @addtogroup ocsd_pkt_proc
@{*/
class TrcPktProcEtmV4I : public TrcPktProcBase< EtmV4ITrcPacket, ocsd_etmv4_i_pkt_type, EtmV4Config>
{
public:
TrcPktProcEtmV4I();
TrcPktProcEtmV4I(int instIDNum);
virtual ~TrcPktProcEtmV4I();
protected:
/* implementation packet processing interface */
virtual ocsd_datapath_resp_t processData( const ocsd_trc_index_t index,
const uint32_t dataBlockSize,
const uint8_t *pDataBlock,
uint32_t *numBytesProcessed);
virtual ocsd_datapath_resp_t onEOT();
virtual ocsd_datapath_resp_t onReset();
virtual ocsd_datapath_resp_t onFlush();
virtual ocsd_err_t onProtocolConfig();
virtual const bool isBadPacket() const;
friend class EtmV4IPktProcImpl;
EtmV4IPktProcImpl *m_pProcessor;
};
class TrcPktProcEtmV4D : public TrcPktProcBase< EtmV4DTrcPacket, ocsd_etmv4_d_pkt_type, EtmV4Config>
{
public:
TrcPktProcEtmV4D();
TrcPktProcEtmV4D(int instIDNum);
virtual ~TrcPktProcEtmV4D();
protected:
/* implementation packet processing interface */
virtual ocsd_datapath_resp_t processData( const ocsd_trc_index_t index,
const uint32_t dataBlockSize,
const uint8_t *pDataBlock,
uint32_t *numBytesProcessed);
virtual ocsd_datapath_resp_t onEOT();
virtual ocsd_datapath_resp_t onReset();
virtual ocsd_datapath_resp_t onFlush();
virtual ocsd_err_t onProtocolConfig();
virtual const bool isBadPacket() const;
friend class EtmV4DPktProcImpl;
EtmV4DPktProcImpl *m_pProcessor;
};
/** @}*/
#endif // ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED #endif // ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
/* End of File trc_pkt_proc_etmv4.h */ /* End of File trc_pkt_proc_etmv4.h */

71
decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.h → decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4i.h
View File

@ -1,8 +1,8 @@
/* /*
* \file trc_pkt_proc_etmv4i_impl.h * \file trc_pkt_proc_etmv4i.h
* \brief OpenCSD : Implementation of ETMv4 packet processing * \brief OpenCSD : Implementation of ETMv4 packet processing
* *
* \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved. * \copyright Copyright (c) 2015, 2019 ARM Limited. All Rights Reserved.
*/ */
/* /*
@ -35,54 +35,37 @@
#ifndef ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED #ifndef ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
#define ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED #define ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
#include "trc_pkt_types_etmv4.h"
#include "opencsd/etmv4/trc_pkt_proc_etmv4.h" #include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
#include "opencsd/etmv4/trc_cmp_cfg_etmv4.h" #include "opencsd/etmv4/trc_cmp_cfg_etmv4.h"
#include "opencsd/etmv4/trc_pkt_elem_etmv4i.h" #include "opencsd/etmv4/trc_pkt_elem_etmv4i.h"
#include "common/trc_raw_buffer.h"
#include "common/trc_pkt_proc_base.h"
class TraceRawBuffer class EtmV4ITrcPacket;
class EtmV4Config;
/** @addtogroup ocsd_pkt_proc
@{*/
class TrcPktProcEtmV4I : public TrcPktProcBase< EtmV4ITrcPacket, ocsd_etmv4_i_pkt_type, EtmV4Config>
{ {
public: public:
TraceRawBuffer(); TrcPktProcEtmV4I();
~TraceRawBuffer() {}; TrcPktProcEtmV4I(int instIDNum);
virtual ~TrcPktProcEtmV4I();
// init the buffer protected:
void init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet); /* implementation packet processing interface */
void copyByteToPkt(); // move a byte to the packet buffer virtual ocsd_datapath_resp_t processData( const ocsd_trc_index_t index,
uint8_t peekNextByte(); // value of next byte in buffer.
bool empty() { return m_bufProcessed == m_bufSize; };
// bytes processed.
uint32_t processed() { return m_bufProcessed; };
// buffer size;
uint32_t size() { return m_bufSize; }
private:
uint32_t m_bufSize;
uint32_t m_bufProcessed;
const uint8_t *m_pBuffer;
std::vector<uint8_t> *pkt;
};
class EtmV4IPktProcImpl
{
public:
EtmV4IPktProcImpl();
~EtmV4IPktProcImpl();
void Initialise(TrcPktProcEtmV4I *p_interface);
ocsd_err_t Configure(const EtmV4Config *p_config);
ocsd_datapath_resp_t processData( const ocsd_trc_index_t index,
const uint32_t dataBlockSize, const uint32_t dataBlockSize,
const uint8_t *pDataBlock, const uint8_t *pDataBlock,
uint32_t *numBytesProcessed); uint32_t *numBytesProcessed);
ocsd_datapath_resp_t onEOT(); virtual ocsd_datapath_resp_t onEOT();
ocsd_datapath_resp_t onReset(); virtual ocsd_datapath_resp_t onReset();
ocsd_datapath_resp_t onFlush(); virtual ocsd_datapath_resp_t onFlush();
const bool isBadPacket() const; virtual ocsd_err_t onProtocolConfig();
virtual const bool isBadPacket() const;
protected: protected:
typedef enum _process_state { typedef enum _process_state {
@ -100,7 +83,6 @@ class EtmV4IPktProcImpl
/** packet processor configuration **/ /** packet processor configuration **/
bool m_isInit; bool m_isInit;
TrcPktProcEtmV4I *m_interface; /**< The interface to the other decode components */
// etmv4 hardware configuration // etmv4 hardware configuration
EtmV4Config m_config; EtmV4Config m_config;
@ -111,7 +93,6 @@ class EtmV4IPktProcImpl
int m_currPktIdx; // index into raw packet when expanding int m_currPktIdx; // index into raw packet when expanding
EtmV4ITrcPacket m_curr_packet; // expanded packet EtmV4ITrcPacket m_curr_packet; // expanded packet
ocsd_trc_index_t m_packet_index; // index of the start of the current packet ocsd_trc_index_t m_packet_index; // index of the start of the current packet
// uint32_t m_blockBytesProcessed; // number of bytes processed in the current data block
ocsd_trc_index_t m_blockIndex; // index at the start of the current data block being processed ocsd_trc_index_t m_blockIndex; // index at the start of the current data block being processed
// searching for sync // searching for sync
@ -207,7 +188,7 @@ class EtmV4IPktProcImpl
int extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits); int extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits);
// packet processing is table driven. // packet processing is table driven.
typedef void (EtmV4IPktProcImpl::*PPKTFN)(uint8_t); typedef void (TrcPktProcEtmV4I::*PPKTFN)(uint8_t);
PPKTFN m_pIPktFn; PPKTFN m_pIPktFn;
struct _pkt_i_table_t { struct _pkt_i_table_t {
@ -221,11 +202,13 @@ class EtmV4IPktProcImpl
}; };
inline const bool EtmV4IPktProcImpl::isBadPacket() const inline const bool TrcPktProcEtmV4I::isBadPacket() const
{ {
return m_curr_packet.isBadPacket(); return m_curr_packet.isBadPacket();
} }
/** @}*/
#endif // ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED #endif // ARM_TRC_PKT_PROC_ETMV4I_IMPL_H_INCLUDED
/* End of File trc_pkt_proc_etmv4i_impl.h */ /* End of File trc_pkt_proc_etmv4i_impl.h */

3
decoder/include/opencsd/etmv4/trc_pkt_types_etmv4.h
View File

@ -85,7 +85,8 @@ typedef enum _ocsd_etmv4_i_pkt_type
// speculation // speculation
ETM4_PKT_I_COMMIT = 0x2D, /*!< b00101101 */ ETM4_PKT_I_COMMIT = 0x2D, /*!< b00101101 */
ETM4_PKT_I_CANCEL_F1 = 0x2E, /*!< b0010111x */ ETM4_PKT_I_CANCEL_F1 = 0x2E, /*!< b00101110 */
ETM4_PKT_I_CANCEL_F1_MISPRED = 0x2F, /*!< b00101111 */
ETM4_PKT_I_MISPREDICT = 0x30, /*!< b001100xx */ ETM4_PKT_I_MISPREDICT = 0x30, /*!< b001100xx */
ETM4_PKT_I_CANCEL_F2 = 0x34, /*!< b001101xx */ ETM4_PKT_I_CANCEL_F2 = 0x34, /*!< b001101xx */
ETM4_PKT_I_CANCEL_F3 = 0x38, /*!< b00111xxx */ ETM4_PKT_I_CANCEL_F3 = 0x38, /*!< b00111xxx */

39
decoder/include/opencsd/ocsd_if_types.h
View File

@ -273,11 +273,11 @@ typedef enum _ocsd_dcd_tree_src_t {
/** Core Architecture Version */ /** Core Architecture Version */
typedef enum _ocsd_arch_version { typedef enum _ocsd_arch_version {
ARCH_UNKNOWN, /**< unknown architecture */ ARCH_UNKNOWN = 0x0000, /**< unknown architecture */
ARCH_CUSTOM, /**< None ARM, custom architecture */ ARCH_CUSTOM = 0x0001, /**< None ARM, custom architecture */
ARCH_V7, /**< V7 architecture */ ARCH_V7 = 0x0700, /**< V7 architecture */
ARCH_V8, /**< V8 architecture */ ARCH_V8 = 0x0800, /**< V8 architecture */
ARCH_V8r3, /**< V8.3 architecture */ ARCH_V8r3 = 0x0803, /**< V8.3 architecture */
} ocsd_arch_version_t; } ocsd_arch_version_t;
// macros for arch version comparisons. // macros for arch version comparisons.
@ -430,9 +430,10 @@ typedef enum _ocsd_mem_space_acc_t {
OCSD_MEM_SPACE_EL1N = 0x2, /**< NS EL1/0 */ OCSD_MEM_SPACE_EL1N = 0x2, /**< NS EL1/0 */
OCSD_MEM_SPACE_EL2 = 0x4, /**< NS EL2 */ OCSD_MEM_SPACE_EL2 = 0x4, /**< NS EL2 */
OCSD_MEM_SPACE_EL3 = 0x8, /**< S EL3 */ OCSD_MEM_SPACE_EL3 = 0x8, /**< S EL3 */
OCSD_MEM_SPACE_S = 0x9, /**< Any S */ OCSD_MEM_SPACE_EL2S = 0x10, /**< S EL2 */
OCSD_MEM_SPACE_S = 0x19, /**< Any S */
OCSD_MEM_SPACE_N = 0x6, /**< Any NS */ OCSD_MEM_SPACE_N = 0x6, /**< Any NS */
OCSD_MEM_SPACE_ANY = 0xF, /**< Any sec level / EL - live system use current EL + sec state */ OCSD_MEM_SPACE_ANY = 0x1F, /**< Any sec level / EL - live system use current EL + sec state */
} ocsd_mem_space_acc_t; } ocsd_mem_space_acc_t;
/** /**
@ -494,13 +495,14 @@ typedef struct _ocsd_file_mem_region {
/** @name Packet Processor Operation Control Flags /** @name Packet Processor Operation Control Flags
common operational flags - bottom 16 bits, common operational flags - bottom 16 bits,
component specific - top 16 bits. protocol component specific - top 16 bits.
(common flags share bitfield with pkt decoder common flags and create flags)
@{*/ @{*/
#define OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS 0x00000001 /**< don't forward bad packets up data path */ #define OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS 0x00000010 /**< don't forward bad packets up data path */
#define OCSD_OPFLG_PKTPROC_NOMON_BAD_PKTS 0x00000002 /**< don't forward bad packets to monitor interface */ #define OCSD_OPFLG_PKTPROC_NOMON_BAD_PKTS 0x00000020 /**< don't forward bad packets to monitor interface */
#define OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS 0x00000004 /**< throw error for bad packets - halt decoding. */ #define OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS 0x00000040 /**< throw error for bad packets - halt decoding. */
#define OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS 0x00000008 /**< switch to unsynced state on bad packets - wait for next sync point */ #define OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS 0x00000080 /**< switch to unsynced state on bad packets - wait for next sync point */
/** mask to combine all common packet processor operational control flags */ /** mask to combine all common packet processor operational control flags */
#define OCSD_OPFLG_PKTPROC_COMMON (OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS | \ #define OCSD_OPFLG_PKTPROC_COMMON (OCSD_OPFLG_PKTPROC_NOFWD_BAD_PKTS | \
@ -508,14 +510,18 @@ typedef struct _ocsd_file_mem_region {
OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS | \ OCSD_OPFLG_PKTPROC_ERR_BAD_PKTS | \
OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS ) OCSD_OPFLG_PKTPROC_UNSYNC_ON_BAD_PKTS )
/** mask for the component spcific flags */
#define OCSD_OPFLG_COMP_MODE_MASK 0xFFFF0000
/** @}*/ /** @}*/
/** @name Packet Decoder Operation Control Flags /** @name Packet Decoder Operation Control Flags
common operational flags - bottom 16 bits, common operational flags - bottom 16 bits,
component specific - top 16 bits. protcol component specific - top 16 bits.
@{*/ (common flags share bitfield with pkt processor common flags and create flags)
@{*/
#define OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS 0x00000001 /**< throw error on bad packets input (default is to unsync and wait) */ #define OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS 0x00000100 /**< throw error on bad packets input (default is to unsync and wait) */
/** mask to combine all common packet processor operational control flags */ /** mask to combine all common packet processor operational control flags */
#define OCSD_OPFLG_PKTDEC_COMMON (OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS) #define OCSD_OPFLG_PKTDEC_COMMON (OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS)
@ -524,7 +530,8 @@ typedef struct _ocsd_file_mem_region {
/** @name Decoder creation information /** @name Decoder creation information
Flags to use when creating decoders by name Flags to use when creating decoders by name.
- share bitfield with pkt processor flags and packet decoder common flags.
Builtin decoder names. Builtin decoder names.

6
decoder/include/opencsd/ocsd_if_version.h
View File

@ -43,8 +43,8 @@
/** @name Library Versioning /** @name Library Versioning
@{*/ @{*/
#define OCSD_VER_MAJOR 0x0 /**< Library Major Version */ #define OCSD_VER_MAJOR 0x0 /**< Library Major Version */
#define OCSD_VER_MINOR 0xC /**< Library Minor Version */ #define OCSD_VER_MINOR 0xE /**< Library Minor Version */
#define OCSD_VER_PATCH 0x0 /**< Library Patch Version */ #define OCSD_VER_PATCH 0x2 /**< Library Patch Version */
/** Library version number - MMMMnnpp format. /** Library version number - MMMMnnpp format.
MMMM = major version, MMMM = major version,
@ -53,7 +53,7 @@
*/ */
#define OCSD_VER_NUM ((OCSD_VER_MAJOR << 16) | (OCSD_VER_MINOR << 8) | OCSD_VER_PATCH) #define OCSD_VER_NUM ((OCSD_VER_MAJOR << 16) | (OCSD_VER_MINOR << 8) | OCSD_VER_PATCH)
#define OCSD_VER_STRING "0.12.0" /**< Library Version string */ #define OCSD_VER_STRING "0.14.2" /**< Library Version string */
#define OCSD_LIB_NAME "OpenCSD Library" /**< Library name string */ #define OCSD_LIB_NAME "OpenCSD Library" /**< Library name string */
#define OCSD_LIB_SHORT_NAME "OCSD" /**< Library Short name string */ #define OCSD_LIB_SHORT_NAME "OCSD" /**< Library Short name string */
/** @}*/ /** @}*/

1
decoder/include/opencsd/ptm/trc_pkt_decode_ptm.h
View File

@ -154,6 +154,7 @@ class TrcPktDecodePtm : public TrcPktDecodeBase<PtmTrcPacket, PtmConfig>
} processor_state_t; } processor_state_t;
processor_state_t m_curr_state; processor_state_t m_curr_state;
unsync_info_t m_unsync_info;
const bool processStateIsCont() const; const bool processStateIsCont() const;

1
decoder/include/opencsd/stm/trc_pkt_decode_stm.h
View File

@ -79,6 +79,7 @@ class TrcPktDecodeStm : public TrcPktDecodeBase<StmTrcPacket, STMConfig>
} processor_state_t; } processor_state_t;
processor_state_t m_curr_state; processor_state_t m_curr_state;
unsync_info_t m_unsync_info;
ocsd_swt_info_t m_swt_packet_info; ocsd_swt_info_t m_swt_packet_info;

12
decoder/include/opencsd/trc_gen_elem_types.h
View File

@ -52,6 +52,7 @@ typedef enum _ocsd_gen_trc_elem_t
OCSD_GEN_TRC_ELEM_EO_TRACE, /*!< end of the available trace in the buffer. */ OCSD_GEN_TRC_ELEM_EO_TRACE, /*!< end of the available trace in the buffer. */
OCSD_GEN_TRC_ELEM_PE_CONTEXT, /*!< PE status update / change (arch, ctxtid, vmid etc). */ OCSD_GEN_TRC_ELEM_PE_CONTEXT, /*!< PE status update / change (arch, ctxtid, vmid etc). */
OCSD_GEN_TRC_ELEM_INSTR_RANGE, /*!< traced N consecutive instructions from addr (no intervening events or data elements), may have data assoc key */ OCSD_GEN_TRC_ELEM_INSTR_RANGE, /*!< traced N consecutive instructions from addr (no intervening events or data elements), may have data assoc key */
OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH, /*!< traced N instructions in a range, but incomplete information as to program execution path from start to end of range */
OCSD_GEN_TRC_ELEM_ADDR_NACC, /*!< tracing in inaccessible memory area */ OCSD_GEN_TRC_ELEM_ADDR_NACC, /*!< tracing in inaccessible memory area */
OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN, /*!< address currently unknown - need address packet update */ OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN, /*!< address currently unknown - need address packet update */
OCSD_GEN_TRC_ELEM_EXCEPTION, /*!< exception - start address may be exception target, end address may be preferred ret addr. */ OCSD_GEN_TRC_ELEM_EXCEPTION, /*!< exception - start address may be exception target, end address may be preferred ret addr. */
@ -75,6 +76,16 @@ typedef struct _trace_event_t {
uint16_t ev_number; /**< event number if numbered event type */ uint16_t ev_number; /**< event number if numbered event type */
} trace_event_t; } trace_event_t;
typedef enum _unsync_info_t {
UNSYNC_UNKNOWN, /**< unknown /undefined */
UNSYNC_INIT_DECODER, /**< decoder intialisation - start of trace. */
UNSYNC_RESET_DECODER, /**< decoder reset. */
UNSYNC_OVERFLOW, /**< overflow packet - need to re-sync / end of trace after overflow. */
UNSYNC_DISCARD, /**< specl trace discard - need to re-sync. */
UNSYNC_BAD_PACKET, /**< bad packet at input - resync to restart. */
UNSYNC_EOT, /**< end of trace - no additional info */
} unsync_info_t;
typedef struct _ocsd_generic_trace_elem { typedef struct _ocsd_generic_trace_elem {
ocsd_gen_trc_elem_t elem_type; /**< Element type - remaining data interpreted according to this value */ ocsd_gen_trc_elem_t elem_type; /**< Element type - remaining data interpreted according to this value */
ocsd_isa isa; /**< instruction set for executed instructions */ ocsd_isa isa; /**< instruction set for executed instructions */
@ -110,6 +121,7 @@ typedef struct _ocsd_generic_trace_elem {
trace_on_reason_t trace_on_reason; /**< reason for the trace on packet */ trace_on_reason_t trace_on_reason; /**< reason for the trace on packet */
ocsd_swt_info_t sw_trace_info; /**< software trace packet info */ ocsd_swt_info_t sw_trace_info; /**< software trace packet info */
uint32_t num_instr_range; /**< number of instructions covered by range packet (for T32 this cannot be calculated from en-st/i_size) */ uint32_t num_instr_range; /**< number of instructions covered by range packet (for T32 this cannot be calculated from en-st/i_size) */
unsync_info_t unsync_eot_info; /**< additional information for unsync / end-of-trace packets. */
}; };
const void *ptr_extended_data; /**< pointer to extended data buffer (data trace, sw trace payload) / custom structure */ const void *ptr_extended_data; /**< pointer to extended data buffer (data trace, sw trace payload) / custom structure */

2
decoder/include/pkt_printers/pkt_printer_t.h
View File

@ -102,7 +102,7 @@ template<class P> ocsd_datapath_resp_t PacketPrinter<P>::PacketDataIn( const ocs
if(!m_bRawPrint && (m_last_resp == OCSD_RESP_WAIT)) if(!m_bRawPrint && (m_last_resp == OCSD_RESP_WAIT))
{ {
// expect a flush or a complete reset after a wait. // expect a flush or a complete reset after a wait.
if((op != OCSD_OP_FLUSH) || (op != OCSD_OP_RESET)) if((op != OCSD_OP_FLUSH) && (op != OCSD_OP_RESET))
{ {
m_oss <<"ID:"<< std::hex << (uint32_t)m_trcID << "\tERROR: FLUSH operation expected after wait on trace decode path\n"; m_oss <<"ID:"<< std::hex << (uint32_t)m_trcID << "\tERROR: FLUSH operation expected after wait on trace decode path\n";
itemPrintLine(m_oss.str()); itemPrintLine(m_oss.str());

10
decoder/source/etmv3/trc_pkt_decode_etmv3.cpp
View File

@ -130,6 +130,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::onEOT()
try { try {
pElem = GetNextOpElem(resp); pElem = GetNextOpElem(resp);
pElem->setType(OCSD_GEN_TRC_ELEM_EO_TRACE); pElem->setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
pElem->setUnSyncEOTReason(UNSYNC_EOT);
m_outputElemList.commitAllPendElem(); m_outputElemList.commitAllPendElem();
m_curr_state = SEND_PKTS; m_curr_state = SEND_PKTS;
resp = m_outputElemList.sendElements(); resp = m_outputElemList.sendElements();
@ -147,6 +148,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::onEOT()
ocsd_datapath_resp_t TrcPktDecodeEtmV3::onReset() ocsd_datapath_resp_t TrcPktDecodeEtmV3::onReset()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
m_unsync_info = UNSYNC_RESET_DECODER;
resetDecoder(); resetDecoder();
return resp; return resp;
} }
@ -199,6 +201,7 @@ void TrcPktDecodeEtmV3::initDecoder()
{ {
m_CSID = 0; m_CSID = 0;
resetDecoder(); resetDecoder();
m_unsync_info = UNSYNC_INIT_DECODER;
m_code_follower.initInterfaces(getMemoryAccessAttachPt(),getInstrDecodeAttachPt()); m_code_follower.initInterfaces(getMemoryAccessAttachPt(),getInstrDecodeAttachPt());
m_outputElemList.initSendIf(getTraceElemOutAttachPt()); m_outputElemList.initSendIf(getTraceElemOutAttachPt());
} }
@ -355,6 +358,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::decodePacket(bool &pktDone)
catch(ocsdError &err) catch(ocsdError &err)
{ {
LogError(err); LogError(err);
m_unsync_info = UNSYNC_BAD_PACKET;
resetDecoder(); // mark decoder as unsynced - dump any current state. resetDecoder(); // mark decoder as unsynced - dump any current state.
pktDone = true; pktDone = true;
} }
@ -362,6 +366,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::decodePacket(bool &pktDone)
{ {
LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_index_curr_pkt,m_CSID,"Bad Packet sequence.")); LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_index_curr_pkt,m_CSID,"Bad Packet sequence."));
resp = OCSD_RESP_FATAL_SYS_ERR; resp = OCSD_RESP_FATAL_SYS_ERR;
m_unsync_info = UNSYNC_BAD_PACKET;
resetDecoder(); // mark decoder as unsynced - dump any current state. resetDecoder(); // mark decoder as unsynced - dump any current state.
pktDone = true; pktDone = true;
} }
@ -375,11 +380,13 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::sendUnsyncPacket()
try { try {
pElem = GetNextOpElem(resp); pElem = GetNextOpElem(resp);
pElem->setType(OCSD_GEN_TRC_ELEM_NO_SYNC); pElem->setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
pElem->setUnSyncEOTReason(m_unsync_info);
resp = m_outputElemList.sendElements(); resp = m_outputElemList.sendElements();
} }
catch(ocsdError &err) catch(ocsdError &err)
{ {
LogError(err); LogError(err);
m_unsync_info = UNSYNC_BAD_PACKET;
resetDecoder(); // mark decoder as unsynced - dump any current state. resetDecoder(); // mark decoder as unsynced - dump any current state.
} }
return resp; return resp;
@ -464,6 +471,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::processISync(const bool withCC, const bo
catch(ocsdError &err) catch(ocsdError &err)
{ {
LogError(err); LogError(err);
m_unsync_info = UNSYNC_BAD_PACKET;
resetDecoder(); // mark decoder as unsynced - dump any current state. resetDecoder(); // mark decoder as unsynced - dump any current state.
} }
return resp; return resp;
@ -531,6 +539,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::processBranchAddr()
catch(ocsdError &err) catch(ocsdError &err)
{ {
LogError(err); LogError(err);
m_unsync_info = UNSYNC_BAD_PACKET;
resetDecoder(); // mark decoder as unsynced - dump any current state. resetDecoder(); // mark decoder as unsynced - dump any current state.
} }
} }
@ -647,6 +656,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV3::processPHdr()
catch(ocsdError &err) catch(ocsdError &err)
{ {
LogError(err); LogError(err);
m_unsync_info = UNSYNC_BAD_PACKET;
resetDecoder(); // mark decoder as unsynced - dump any current state. resetDecoder(); // mark decoder as unsynced - dump any current state.
} }
return resp; return resp;

44
decoder/source/etmv4/trc_etmv4_stack_elem.cpp
View File

@ -90,13 +90,17 @@ TrcStackElemExcept *EtmV4P0Stack::createExceptElem(const ocsd_etmv4_i_pkt_type r
return pElem; return pElem;
} }
TrcStackElemCtxt *EtmV4P0Stack::createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context) TrcStackElemCtxt *EtmV4P0Stack::createContextElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const etmv4_context_t &context, const uint8_t IS, const bool back /*= false*/)
{ {
TrcStackElemCtxt *pElem = new (std::nothrow) TrcStackElemCtxt(root_pkt, root_index); TrcStackElemCtxt *pElem = new (std::nothrow) TrcStackElemCtxt(root_pkt, root_index);
if (pElem) if (pElem)
{ {
pElem->setContext(context); pElem->setContext(context);
push_front(pElem); pElem->setIS(IS);
if (back)
push_back(pElem);
else
push_front(pElem);
} }
return pElem; return pElem;
@ -113,4 +117,40 @@ TrcStackElemAddr *EtmV4P0Stack::createAddrElem(const ocsd_etmv4_i_pkt_type root_
return pElem; return pElem;
} }
TrcStackQElem *EtmV4P0Stack::createQElem(const ocsd_etmv4_i_pkt_type root_pkt, const ocsd_trc_index_t root_index, const int count)
{
TrcStackQElem *pElem = new (std::nothrow) TrcStackQElem(root_pkt, root_index);
if (pElem)
{
pElem->setInstrCount(count);
push_front(pElem);
}
return pElem;
}
// iteration functions
void EtmV4P0Stack::from_front_init()
{
m_iter = m_P0_stack.begin();
}
TrcStackElem *EtmV4P0Stack::from_front_next()
{
TrcStackElem *pElem = 0;
if (m_iter != m_P0_stack.end())
{
pElem = *m_iter++;
}
return pElem;
}
void EtmV4P0Stack::erase_curr_from_front()
{
std::deque<TrcStackElem *>::iterator erase_iter;
erase_iter = m_iter;
erase_iter--;
m_P0_stack.erase(erase_iter);
}
/* End of file trc_etmv4_stack_elem.cpp */ /* End of file trc_etmv4_stack_elem.cpp */

1338
decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp
View File

File diff suppressed because it is too large Load Diff

57
decoder/source/etmv4/trc_pkt_elem_etmv4d.cpp
View File

@ -1,57 +0,0 @@
/*
* \file trc_pkt_elem_etmv4d.cpp
* \brief OpenCSD :
*
* \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "opencsd/etmv4/trc_pkt_elem_etmv4d.h"
EtmV4DTrcPacket::EtmV4DTrcPacket()
{
}
EtmV4DTrcPacket::~EtmV4DTrcPacket()
{
}
// printing
void EtmV4DTrcPacket::toString(std::string &str) const
{
}
void EtmV4DTrcPacket::toStringFmt(const uint32_t fmtFlags, std::string &str) const
{
}
/* End of File trc_pkt_elem_etmv4d.cpp */

97
decoder/source/etmv4/trc_pkt_elem_etmv4i.cpp
View File

@ -161,6 +161,7 @@ void EtmV4ITrcPacket::toString(std::string &str) const
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "; INFO=" << std::hex << "0x" << trace_info.val; oss << "; INFO=" << std::hex << "0x" << trace_info.val;
oss << " { CC." << std::dec << trace_info.bits.cc_enabled << " }";
if (trace_info.bits.cc_enabled) if (trace_info.bits.cc_enabled)
oss << "; CC_THRESHOLD=" << std::hex << "0x" << cc_threshold; oss << "; CC_THRESHOLD=" << std::hex << "0x" << cc_threshold;
str += oss.str(); str += oss.str();
@ -176,8 +177,96 @@ void EtmV4ITrcPacket::toString(std::string &str) const
str += oss.str(); str += oss.str();
} }
break; break;
case ETM4_PKT_I_CANCEL_F1:
{
std::ostringstream oss;
oss << "; Cancel(" << std::dec << cancel_elements << ")";
str += oss.str();
}
break;
case ETM4_PKT_I_CANCEL_F1_MISPRED:
{
std::ostringstream oss;
oss << "; Cancel(" << std::dec << cancel_elements << "), Mispredict";
str += oss.str();
}
break;
case ETM4_PKT_I_MISPREDICT:
{
std::ostringstream oss;
oss << "; ";
if (atom.num) {
atomSeq(valStr);
oss << "Atom: " << valStr << ", ";
}
oss << "Mispredict";
str += oss.str();
}
break;
case ETM4_PKT_I_CANCEL_F2:
{
std::ostringstream oss;
oss << "; ";
if (atom.num) {
atomSeq(valStr);
oss << "Atom: " << valStr << ", ";
}
oss << "Cancel(1), Mispredict";
str += oss.str();
}
break;
case ETM4_PKT_I_CANCEL_F3:
{
std::ostringstream oss;
oss << "; ";
if (atom.num) {
oss << "Atom: E, ";
}
oss << "Cancel(" << std::dec << cancel_elements << "), Mispredict";
str += oss.str();
}
break;
case ETM4_PKT_I_COMMIT:
{
std::ostringstream oss;
oss << "; Commit(" << std::dec << commit_elements << ")";
str += oss.str();
}
break;
case ETM4_PKT_I_Q:
{
std::ostringstream oss;
if (Q_pkt.count_present)
{
oss << "; Count(" << std::dec << Q_pkt.q_count << ")";
str += oss.str();
}
else
str += "; Count(Unknown)";
if (Q_pkt.addr_match)
{
addrMatchIdx(valStr);
str += "; " + valStr;
}
if (Q_pkt.addr_present || Q_pkt.addr_match)
{
trcPrintableElem::getValStr(valStr, (v_addr.size == VA_64BIT) ? 64 : 32, v_addr.valid_bits, v_addr.val, true, (v_addr.pkt_bits < 64) ? v_addr.pkt_bits : 0);
str += "; Addr=" + valStr;
}
}
break;
} }
}
}
void EtmV4ITrcPacket::toStringFmt(const uint32_t fmtFlags, std::string &str) const void EtmV4ITrcPacket::toStringFmt(const uint32_t fmtFlags, std::string &str) const
{ {
@ -296,6 +385,12 @@ const char *EtmV4ITrcPacket::packetTypeName(const ocsd_etmv4_i_pkt_type type, co
pDesc = "Cancel Format 1."; pDesc = "Cancel Format 1.";
break; break;
case ETM4_PKT_I_CANCEL_F1_MISPRED:
pName = "I_CANCEL_F1_MISPRED";
pDesc = "Cancel Format 1 + Mispredict.";
break;
case ETM4_PKT_I_MISPREDICT: case ETM4_PKT_I_MISPREDICT:
pName = "I_MISPREDICT"; pName = "I_MISPREDICT";
pDesc = "Mispredict."; pDesc = "Mispredict.";

126
decoder/source/etmv4/trc_pkt_proc_etmv4.cpp
View File

@ -1,126 +0,0 @@
/*
* \file trc_pkt_proc_etmv4.cpp
* \brief OpenCSD :
*
* \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
#include "trc_pkt_proc_etmv4i_impl.h"
#include "common/ocsd_error.h"
#ifdef __GNUC__
// G++ doesn't like the ## pasting
#define ETMV4I_PKTS_NAME "PKTP_ETMV4I"
#else
// VC++ is fine
#define ETMV4I_PKTS_NAME OCSD_CMPNAME_PREFIX_PKTPROC##"_ETMV4I"
#endif
static const uint32_t ETMV4_SUPPORTED_OP_FLAGS = OCSD_OPFLG_PKTPROC_COMMON;
/***************************************************************************/
/*******************ETM V4 INSTRUCTION *************************************/
/***************************************************************************/
TrcPktProcEtmV4I::TrcPktProcEtmV4I() : TrcPktProcBase(ETMV4I_PKTS_NAME),
m_pProcessor(0)
{
m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
}
TrcPktProcEtmV4I::TrcPktProcEtmV4I(int instIDNum) : TrcPktProcBase(ETMV4I_PKTS_NAME, instIDNum),
m_pProcessor(0)
{
m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
}
TrcPktProcEtmV4I::~TrcPktProcEtmV4I()
{
if(m_pProcessor)
delete m_pProcessor;
m_pProcessor = 0;
}
ocsd_err_t TrcPktProcEtmV4I::onProtocolConfig()
{
if(m_pProcessor == 0)
{
m_pProcessor = new (std::nothrow) EtmV4IPktProcImpl();
if(m_pProcessor == 0)
{
LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_MEM));
return OCSD_ERR_MEM;
}
m_pProcessor->Initialise(this);
}
return m_pProcessor->Configure(m_config);
}
ocsd_datapath_resp_t TrcPktProcEtmV4I::processData( const ocsd_trc_index_t index,
const uint32_t dataBlockSize,
const uint8_t *pDataBlock,
uint32_t *numBytesProcessed)
{
if(m_pProcessor)
return m_pProcessor->processData(index,dataBlockSize,pDataBlock,numBytesProcessed);
return OCSD_RESP_FATAL_NOT_INIT;
}
ocsd_datapath_resp_t TrcPktProcEtmV4I::onEOT()
{
if(m_pProcessor)
return m_pProcessor->onEOT();
return OCSD_RESP_FATAL_NOT_INIT;
}
ocsd_datapath_resp_t TrcPktProcEtmV4I::onReset()
{
if(m_pProcessor)
return m_pProcessor->onReset();
return OCSD_RESP_FATAL_NOT_INIT;
}
ocsd_datapath_resp_t TrcPktProcEtmV4I::onFlush()
{
if(m_pProcessor)
return m_pProcessor->onFlush();
return OCSD_RESP_FATAL_NOT_INIT;
}
const bool TrcPktProcEtmV4I::isBadPacket() const
{
if(m_pProcessor)
return m_pProcessor->isBadPacket();
return false;
}
/* End of File trc_pkt_proc_etmv4.cpp */

71
decoder/source/etmv4/trc_pkt_proc_etmv4d_impl.h
View File

@ -1,71 +0,0 @@
/*
* \file trc_pkt_proc_etmv4d_impl.h
* \brief OpenCSD :
*
* \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ARM_TRC_PKT_PROC_ETMV4D_IMPL_H_INCLUDED
#define ARM_TRC_PKT_PROC_ETMV4D_IMPL_H_INCLUDED
#include "etmv4/trc_pkt_proc_etmv4.h"
#include "etmv4/trc_cmp_cfg_etmv4.h"
class EtmV4DPktProcImpl
{
public:
EtmV4DPktProcImpl();
~EtmV4DPktProcImpl();
void Initialise(TrcPktProcEtmV4D *p_interface);
ocsd_err_t Configure(const EtmV4Config *p_config);
ocsd_datapath_resp_t processData( const ocsd_trc_index_t index,
const uint32_t dataBlockSize,
const uint8_t *pDataBlock,
uint32_t *numBytesProcessed);
ocsd_datapath_resp_t onEOT();
ocsd_datapath_resp_t onReset();
ocsd_datapath_resp_t onFlush();
protected:
bool m_isInit;
TrcPktProcEtmV4D *m_interface; /**< The interface to the other decode components */
EtmV4Config m_config;
};
#endif // ARM_TRC_PKT_PROC_ETMV4D_IMPL_H_INCLUDED
/* End of File trc_pkt_proc_etmv4d_impl.h */

339
decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp → decoder/source/etmv4/trc_pkt_proc_etmv4i.cpp
View File

@ -1,8 +1,8 @@
/* /*
* \file trc_pkt_proc_etmv4i_impl.cpp * \file trc_pkt_proc_etmv4i.cpp
* \brief OpenCSD : * \brief OpenCSD : Packet processor for ETMv4
* *
* \copyright Copyright (c) 2015, ARM Limited. All Rights Reserved. * \copyright Copyright (c) 2015, 2019, ARM Limited. All Rights Reserved.
*/ */
/* /*
@ -32,87 +32,58 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "trc_pkt_proc_etmv4i_impl.h" #include "opencsd/etmv4/trc_pkt_proc_etmv4.h"
#include "common/ocsd_error.h"
/* Trace raw input buffer class */ #ifdef __GNUC__
TraceRawBuffer::TraceRawBuffer() // G++ doesn't like the ## pasting
{ #define ETMV4I_PKTS_NAME "PKTP_ETMV4I"
m_bufSize = 0; #else
m_bufProcessed = 0; // VC++ is fine
m_pBuffer = 0; #define ETMV4I_PKTS_NAME OCSD_CMPNAME_PREFIX_PKTPROC##"_ETMV4I"
pkt = 0; #endif
}
// init the buffer static const uint32_t ETMV4_SUPPORTED_OP_FLAGS = OCSD_OPFLG_PKTPROC_COMMON;
void TraceRawBuffer::init(const uint32_t size, const uint8_t *rawtrace, std::vector<uint8_t> *out_packet)
{
m_bufSize = size;
m_bufProcessed = 0;
m_pBuffer = rawtrace;
pkt = out_packet;
}
void TraceRawBuffer::copyByteToPkt()
{
if (!empty()) {
pkt->push_back(m_pBuffer[m_bufProcessed]);
m_bufProcessed++;
}
}
uint8_t TraceRawBuffer::peekNextByte()
{
uint8_t val = 0;
if (!empty())
val = m_pBuffer[m_bufProcessed];
return val;
}
/* trace etmv4 packet processing class */ /* trace etmv4 packet processing class */
EtmV4IPktProcImpl::EtmV4IPktProcImpl() : TrcPktProcEtmV4I::TrcPktProcEtmV4I() : TrcPktProcBase(ETMV4I_PKTS_NAME),
m_isInit(false), m_isInit(false),
m_interface(0),
m_first_trace_info(false) m_first_trace_info(false)
{ {
m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
} }
EtmV4IPktProcImpl::~EtmV4IPktProcImpl() TrcPktProcEtmV4I::TrcPktProcEtmV4I(int instIDNum) : TrcPktProcBase(ETMV4I_PKTS_NAME, instIDNum),
m_isInit(false),
m_first_trace_info(false)
{
m_supported_op_flags = ETMV4_SUPPORTED_OP_FLAGS;
}
TrcPktProcEtmV4I::~TrcPktProcEtmV4I()
{ {
} }
void EtmV4IPktProcImpl::Initialise(TrcPktProcEtmV4I *p_interface) ocsd_err_t TrcPktProcEtmV4I::onProtocolConfig()
{ {
if(p_interface) InitProcessorState();
{ m_config = *TrcPktProcBase::getProtocolConfig();
m_interface = p_interface; BuildIPacketTable(); // packet table based on config
m_isInit = true; m_isInit = true;
} return OCSD_OK;
InitProcessorState();
} }
ocsd_err_t EtmV4IPktProcImpl::Configure(const EtmV4Config *p_config) ocsd_datapath_resp_t TrcPktProcEtmV4I::processData( const ocsd_trc_index_t index,
{
ocsd_err_t err = OCSD_OK;
if(p_config != 0)
{
m_config = *p_config;
BuildIPacketTable(); // packet table based on config
}
else
{
err = OCSD_ERR_INVALID_PARAM_VAL;
if(m_isInit)
m_interface->LogError(ocsdError(OCSD_ERR_SEV_ERROR,err));
}
return err;
}
ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t index,
const uint32_t dataBlockSize, const uint32_t dataBlockSize,
const uint8_t *pDataBlock, const uint8_t *pDataBlock,
uint32_t *numBytesProcessed) uint32_t *numBytesProcessed)
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
if (!m_isInit)
return OCSD_RESP_FATAL_NOT_INIT;
m_trcIn.init(dataBlockSize, pDataBlock, &m_currPacketData); m_trcIn.init(dataBlockSize, pDataBlock, &m_currPacketData);
m_blockIndex = index; m_blockIndex = index;
bool done = false; bool done = false;
@ -122,9 +93,6 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind
{ {
try try
{ {
/* while (((m_blockBytesProcessed < dataBlockSize) ||
((m_blockBytesProcessed == dataBlockSize) && (m_process_state == SEND_PKT))) &&
OCSD_DATA_RESP_IS_CONT(resp))*/
while ( (!m_trcIn.empty() || (m_process_state == SEND_PKT)) && while ( (!m_trcIn.empty() || (m_process_state == SEND_PKT)) &&
OCSD_DATA_RESP_IS_CONT(resp) OCSD_DATA_RESP_IS_CONT(resp)
) )
@ -142,7 +110,7 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind
else else
{ {
// unsynced - process data until we see a sync point // unsynced - process data until we see a sync point
m_pIPktFn = &EtmV4IPktProcImpl::iNotSync; m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
m_curr_packet.type = ETM4_PKT_I_NOTSYNC; m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
} }
m_process_state = PROC_DATA; m_process_state = PROC_DATA;
@ -153,8 +121,6 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind
{ {
nextByte = m_trcIn.peekNextByte(); nextByte = m_trcIn.peekNextByte();
m_trcIn.copyByteToPkt(); // move next byte into the packet m_trcIn.copyByteToPkt(); // move next byte into the packet
// m_currPacketData.push_back(pDataBlock[m_blockBytesProcessed]);
// m_blockBytesProcessed++;
(this->*m_pIPktFn)(nextByte); (this->*m_pIPktFn)(nextByte);
} }
break; break;
@ -181,7 +147,7 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind
catch(ocsdError &err) catch(ocsdError &err)
{ {
done = true; done = true;
m_interface->LogError(err); LogError(err);
if( (err.getErrorCode() == OCSD_ERR_BAD_PACKET_SEQ) || if( (err.getErrorCode() == OCSD_ERR_BAD_PACKET_SEQ) ||
(err.getErrorCode() == OCSD_ERR_INVALID_PCKT_HDR)) (err.getErrorCode() == OCSD_ERR_INVALID_PCKT_HDR))
{ {
@ -201,7 +167,7 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind
/// vv bad at this point. /// vv bad at this point.
resp = OCSD_RESP_FATAL_SYS_ERR; resp = OCSD_RESP_FATAL_SYS_ERR;
const ocsdError &fatal = ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_packet_index,m_config.getTraceID(),"Unknown System Error decoding trace."); const ocsdError &fatal = ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_FAIL,m_packet_index,m_config.getTraceID(),"Unknown System Error decoding trace.");
m_interface->LogError(fatal); LogError(fatal);
} }
} while (!done); } while (!done);
@ -209,9 +175,12 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind
return resp; return resp;
} }
ocsd_datapath_resp_t EtmV4IPktProcImpl::onEOT() ocsd_datapath_resp_t TrcPktProcEtmV4I::onEOT()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
if (!m_isInit)
return OCSD_RESP_FATAL_NOT_INIT;
// if we have a partial packet then send to attached sinks // if we have a partial packet then send to attached sinks
if(m_currPacketData.size() != 0) if(m_currPacketData.size() != 0)
{ {
@ -222,31 +191,37 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::onEOT()
return resp; return resp;
} }
ocsd_datapath_resp_t EtmV4IPktProcImpl::onReset() ocsd_datapath_resp_t TrcPktProcEtmV4I::onReset()
{ {
if (!m_isInit)
return OCSD_RESP_FATAL_NOT_INIT;
// prepare for new decoding session // prepare for new decoding session
InitProcessorState(); InitProcessorState();
return OCSD_RESP_CONT; return OCSD_RESP_CONT;
} }
ocsd_datapath_resp_t EtmV4IPktProcImpl::onFlush() ocsd_datapath_resp_t TrcPktProcEtmV4I::onFlush()
{ {
if (!m_isInit)
return OCSD_RESP_FATAL_NOT_INIT;
// packet processor never holds on to flushable data (may have partial packet, // packet processor never holds on to flushable data (may have partial packet,
// but any full packets are immediately sent) // but any full packets are immediately sent)
return OCSD_RESP_CONT; return OCSD_RESP_CONT;
} }
void EtmV4IPktProcImpl::InitPacketState() void TrcPktProcEtmV4I::InitPacketState()
{ {
m_currPacketData.clear(); m_currPacketData.clear();
m_curr_packet.initNextPacket(); // clear for next packet. m_curr_packet.initNextPacket(); // clear for next packet.
m_update_on_unsync_packet_index = 0; m_update_on_unsync_packet_index = 0;
} }
void EtmV4IPktProcImpl::InitProcessorState() void TrcPktProcEtmV4I::InitProcessorState()
{ {
InitPacketState(); InitPacketState();
m_pIPktFn = &EtmV4IPktProcImpl::iNotSync; m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
m_packet_index = 0; m_packet_index = 0;
m_is_sync = false; m_is_sync = false;
m_first_trace_info = false; m_first_trace_info = false;
@ -255,23 +230,23 @@ void EtmV4IPktProcImpl::InitProcessorState()
m_curr_packet.initStartState(); m_curr_packet.initStartState();
} }
ocsd_datapath_resp_t EtmV4IPktProcImpl::outputPacket() ocsd_datapath_resp_t TrcPktProcEtmV4I::outputPacket()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
resp = m_interface->outputOnAllInterfaces(m_packet_index,&m_curr_packet,&m_curr_packet.type,m_currPacketData); resp = outputOnAllInterfaces(m_packet_index,&m_curr_packet,&m_curr_packet.type,m_currPacketData);
return resp; return resp;
} }
ocsd_datapath_resp_t EtmV4IPktProcImpl::outputUnsyncedRawPacket() ocsd_datapath_resp_t TrcPktProcEtmV4I::outputUnsyncedRawPacket()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
m_interface->outputRawPacketToMonitor(m_packet_index,&m_curr_packet,m_dump_unsynced_bytes,&m_currPacketData[0]); outputRawPacketToMonitor(m_packet_index,&m_curr_packet,m_dump_unsynced_bytes,&m_currPacketData[0]);
if(!m_sent_notsync_packet) if(!m_sent_notsync_packet)
{ {
resp = m_interface->outputDecodedPacket(m_packet_index,&m_curr_packet); resp = outputDecodedPacket(m_packet_index,&m_curr_packet);
m_sent_notsync_packet = true; m_sent_notsync_packet = true;
} }
@ -283,7 +258,7 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::outputUnsyncedRawPacket()
return resp; return resp;
} }
void EtmV4IPktProcImpl::iNotSync(const uint8_t lastByte) void TrcPktProcEtmV4I::iNotSync(const uint8_t lastByte)
{ {
// is it an extension byte? // is it an extension byte?
if (lastByte == 0x00) // TBD : add check for forced sync in here? if (lastByte == 0x00) // TBD : add check for forced sync in here?
@ -309,7 +284,7 @@ void EtmV4IPktProcImpl::iNotSync(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktNoPayload(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktNoPayload(const uint8_t lastByte)
{ {
// some expansion may be required... // some expansion may be required...
switch(m_curr_packet.type) switch(m_curr_packet.type)
@ -338,26 +313,26 @@ void EtmV4IPktProcImpl::iPktNoPayload(const uint8_t lastByte)
m_process_state = SEND_PKT; // now just send it.... m_process_state = SEND_PKT; // now just send it....
} }
void EtmV4IPktProcImpl::iPktReserved(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktReserved(const uint8_t lastByte)
{ {
m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED, lastByte); // swap type for err type m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED, lastByte); // swap type for err type
throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR,m_packet_index,m_config.getTraceID()); throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR,m_packet_index,m_config.getTraceID());
} }
void EtmV4IPktProcImpl::iPktInvalidCfg(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktInvalidCfg(const uint8_t lastByte)
{ {
m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED_CFG, lastByte); // swap type for err type m_curr_packet.updateErrType(ETM4_PKT_I_RESERVED_CFG, lastByte); // swap type for err type
throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR, m_packet_index, m_config.getTraceID()); throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_INVALID_PCKT_HDR, m_packet_index, m_config.getTraceID());
} }
void EtmV4IPktProcImpl::iPktExtension(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktExtension(const uint8_t lastByte)
{ {
if(m_currPacketData.size() == 2) if(m_currPacketData.size() == 2)
{ {
// not sync and not next by 0x00 - not sync sequence // not sync and not next by 0x00 - not sync sequence
if(!m_is_sync && (lastByte != 0x00)) if(!m_is_sync && (lastByte != 0x00))
{ {
m_pIPktFn = &EtmV4IPktProcImpl::iNotSync; m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
m_curr_packet.type = ETM4_PKT_I_NOTSYNC; m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
return; return;
} }
@ -376,7 +351,7 @@ void EtmV4IPktProcImpl::iPktExtension(const uint8_t lastByte)
case 0x00: case 0x00:
m_curr_packet.type = ETM4_PKT_I_ASYNC; m_curr_packet.type = ETM4_PKT_I_ASYNC;
m_pIPktFn = &EtmV4IPktProcImpl::iPktASync; // handle subsequent bytes as async m_pIPktFn = &TrcPktProcEtmV4I::iPktASync; // handle subsequent bytes as async
break; break;
default: default:
@ -388,14 +363,14 @@ void EtmV4IPktProcImpl::iPktExtension(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktASync(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktASync(const uint8_t lastByte)
{ {
if(lastByte != 0x00) if(lastByte != 0x00)
{ {
// not sync and not next by 0x00 - not sync sequence if < 12 // not sync and not next by 0x00 - not sync sequence if < 12
if(!m_is_sync && m_currPacketData.size() != 12) if(!m_is_sync && m_currPacketData.size() != 12)
{ {
m_pIPktFn = &EtmV4IPktProcImpl::iNotSync; m_pIPktFn = &TrcPktProcEtmV4I::iNotSync;
m_curr_packet.type = ETM4_PKT_I_NOTSYNC; m_curr_packet.type = ETM4_PKT_I_NOTSYNC;
return; return;
} }
@ -428,7 +403,7 @@ void EtmV4IPktProcImpl::iPktASync(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktTraceInfo(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktTraceInfo(const uint8_t lastByte)
{ {
if(m_currPacketData.size() == 1) // header if(m_currPacketData.size() == 1) // header
{ {
@ -500,7 +475,7 @@ void EtmV4IPktProcImpl::iPktTraceInfo(const uint8_t lastByte)
} }
void EtmV4IPktProcImpl::iPktTimestamp(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktTimestamp(const uint8_t lastByte)
{ {
// process the header byte // process the header byte
if(m_currPacketData.size() == 1) if(m_currPacketData.size() == 1)
@ -550,7 +525,7 @@ void EtmV4IPktProcImpl::iPktTimestamp(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktException(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktException(const uint8_t lastByte)
{ {
uint16_t excep_type = 0; uint16_t excep_type = 0;
@ -582,7 +557,7 @@ void EtmV4IPktProcImpl::iPktException(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktCycleCntF123(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktCycleCntF123(const uint8_t lastByte)
{ {
ocsd_etmv4_i_pkt_type format = m_curr_packet.type; ocsd_etmv4_i_pkt_type format = m_curr_packet.type;
@ -657,7 +632,7 @@ void EtmV4IPktProcImpl::iPktCycleCntF123(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktSpeclRes(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktSpeclRes(const uint8_t lastByte)
{ {
if(m_currPacketData.size() == 1) if(m_currPacketData.size() == 1)
{ {
@ -671,8 +646,10 @@ void EtmV4IPktProcImpl::iPktSpeclRes(const uint8_t lastByte)
case 0x2: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x3, 2); break; // EE case 0x2: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x3, 2); break; // EE
case 0x3: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x0, 1); break; // N case 0x3: m_curr_packet.setAtomPacket(ATOM_PATTERN, 0x0, 1); break; // N
} }
if(m_curr_packet.getType() == ETM4_PKT_I_CANCEL_F2) if (m_curr_packet.getType() == ETM4_PKT_I_CANCEL_F2)
m_curr_packet.setCancelElements(1); m_curr_packet.setCancelElements(1);
else
m_curr_packet.setCancelElements(0);
m_process_state = SEND_PKT; m_process_state = SEND_PKT;
break; break;
@ -694,13 +671,12 @@ void EtmV4IPktProcImpl::iPktSpeclRes(const uint8_t lastByte)
m_curr_packet.setCommitElements(field_val); m_curr_packet.setCommitElements(field_val);
else else
m_curr_packet.setCancelElements(field_val); m_curr_packet.setCancelElements(field_val);
// TBD: sanity check with max spec depth here?
m_process_state = SEND_PKT; m_process_state = SEND_PKT;
} }
} }
} }
void EtmV4IPktProcImpl::iPktCondInstr(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktCondInstr(const uint8_t lastByte)
{ {
bool bF1Done = false; bool bF1Done = false;
@ -740,7 +716,7 @@ void EtmV4IPktProcImpl::iPktCondInstr(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktCondResult(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktCondResult(const uint8_t lastByte)
{ {
if(m_currPacketData.size() == 1) if(m_currPacketData.size() == 1)
{ {
@ -810,7 +786,7 @@ void EtmV4IPktProcImpl::iPktCondResult(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktContext(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktContext(const uint8_t lastByte)
{ {
bool bSendPacket = false; bool bSendPacket = false;
@ -852,7 +828,7 @@ void EtmV4IPktProcImpl::iPktContext(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::extractAndSetContextInfo(const std::vector<uint8_t> &buffer, const int st_idx) void TrcPktProcEtmV4I::extractAndSetContextInfo(const std::vector<uint8_t> &buffer, const int st_idx)
{ {
// on input, buffer index points at the info byte - always present // on input, buffer index points at the info byte - always present
uint8_t infoByte = m_currPacketData[st_idx]; uint8_t infoByte = m_currPacketData[st_idx];
@ -887,7 +863,7 @@ void EtmV4IPktProcImpl::extractAndSetContextInfo(const std::vector<uint8_t> &buf
} }
} }
void EtmV4IPktProcImpl::iPktAddrCtxt(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktAddrCtxt(const uint8_t lastByte)
{ {
if( m_currPacketData.size() == 1) if( m_currPacketData.size() == 1)
{ {
@ -955,7 +931,7 @@ void EtmV4IPktProcImpl::iPktAddrCtxt(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktShortAddr(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktShortAddr(const uint8_t lastByte)
{ {
if (m_currPacketData.size() == 1) if (m_currPacketData.size() == 1)
{ {
@ -980,7 +956,7 @@ void EtmV4IPktProcImpl::iPktShortAddr(const uint8_t lastByte)
} }
} }
int EtmV4IPktProcImpl::extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits) int TrcPktProcEtmV4I::extractShortAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value, int &bits)
{ {
int IS_shift = (IS == 0) ? 2 : 1; int IS_shift = (IS == 0) ? 2 : 1;
int idx = 0; int idx = 0;
@ -1000,7 +976,7 @@ int EtmV4IPktProcImpl::extractShortAddr(const std::vector<uint8_t> &buffer, cons
return idx; return idx;
} }
void EtmV4IPktProcImpl::iPktLongAddr(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktLongAddr(const uint8_t lastByte)
{ {
if(m_currPacketData.size() == 1) if(m_currPacketData.size() == 1)
{ {
@ -1044,7 +1020,7 @@ void EtmV4IPktProcImpl::iPktLongAddr(const uint8_t lastByte)
} }
} }
void EtmV4IPktProcImpl::iPktQ(const uint8_t lastByte) void TrcPktProcEtmV4I::iPktQ(const uint8_t lastByte)
{ {
if(m_currPacketData.size() == 1) if(m_currPacketData.size() == 1)
{ {
@ -1096,7 +1072,7 @@ void EtmV4IPktProcImpl::iPktQ(const uint8_t lastByte)
default: default:
m_curr_packet.err_type = m_curr_packet.type; m_curr_packet.err_type = m_curr_packet.type;
m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE; m_curr_packet.type = ETM4_PKT_I_BAD_SEQUENCE;
//SendBadIPacket( PKT_BAD_SEQUENCE, "ERROR: Bad Q packet type", PKT_Q ); m_process_state = SEND_PKT;
break; break;
} }
} }
@ -1156,7 +1132,7 @@ void EtmV4IPktProcImpl::iPktQ(const uint8_t lastByte)
} }
void EtmV4IPktProcImpl::iAtom(const uint8_t lastByte) void TrcPktProcEtmV4I::iAtom(const uint8_t lastByte)
{ {
// patterns lsbit = oldest atom, ms bit = newest. // patterns lsbit = oldest atom, ms bit = newest.
static const uint32_t f4_patterns[] = { static const uint32_t f4_patterns[] = {
@ -1228,32 +1204,32 @@ void EtmV4IPktProcImpl::iAtom(const uint8_t lastByte)
} }
// header byte processing is table driven. // header byte processing is table driven.
void EtmV4IPktProcImpl::BuildIPacketTable() void TrcPktProcEtmV4I::BuildIPacketTable()
{ {
// initialise everything as reserved. // initialise everything as reserved.
for(int i = 0; i < 256; i++) for(int i = 0; i < 256; i++)
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_RESERVED; m_i_table[i].pkt_type = ETM4_PKT_I_RESERVED;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iPktReserved; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iPktReserved;
} }
// 0x00 - extension // 0x00 - extension
m_i_table[0x00].pkt_type = ETM4_PKT_I_EXTENSION; m_i_table[0x00].pkt_type = ETM4_PKT_I_EXTENSION;
m_i_table[0x00].pptkFn = &EtmV4IPktProcImpl::iPktExtension; m_i_table[0x00].pptkFn = &TrcPktProcEtmV4I::iPktExtension;
// 0x01 - Trace info // 0x01 - Trace info
m_i_table[0x01].pkt_type = ETM4_PKT_I_TRACE_INFO; m_i_table[0x01].pkt_type = ETM4_PKT_I_TRACE_INFO;
m_i_table[0x01].pptkFn = &EtmV4IPktProcImpl::iPktTraceInfo; m_i_table[0x01].pptkFn = &TrcPktProcEtmV4I::iPktTraceInfo;
// b0000001x - timestamp // b0000001x - timestamp
m_i_table[0x02].pkt_type = ETM4_PKT_I_TIMESTAMP; m_i_table[0x02].pkt_type = ETM4_PKT_I_TIMESTAMP;
m_i_table[0x02].pptkFn = &EtmV4IPktProcImpl::iPktTimestamp; m_i_table[0x02].pptkFn = &TrcPktProcEtmV4I::iPktTimestamp;
m_i_table[0x03].pkt_type = ETM4_PKT_I_TIMESTAMP; m_i_table[0x03].pkt_type = ETM4_PKT_I_TIMESTAMP;
m_i_table[0x03].pptkFn = &EtmV4IPktProcImpl::iPktTimestamp; m_i_table[0x03].pptkFn = &TrcPktProcEtmV4I::iPktTimestamp;
// b0000 0100 - trace on // b0000 0100 - trace on
m_i_table[0x04].pkt_type = ETM4_PKT_I_TRACE_ON; m_i_table[0x04].pkt_type = ETM4_PKT_I_TRACE_ON;
m_i_table[0x04].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x04].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
// b0000 0101 - Funct ret V8M // b0000 0101 - Funct ret V8M
@ -1262,30 +1238,30 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
(OCSD_IS_V8_ARCH(m_config.archVersion())) && (OCSD_IS_V8_ARCH(m_config.archVersion())) &&
(m_config.FullVersion() >= 0x42)) (m_config.FullVersion() >= 0x42))
{ {
m_i_table[0x05].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x05].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
} }
// b0000 0110 - exception // b0000 0110 - exception
m_i_table[0x06].pkt_type = ETM4_PKT_I_EXCEPT; m_i_table[0x06].pkt_type = ETM4_PKT_I_EXCEPT;
m_i_table[0x06].pptkFn = &EtmV4IPktProcImpl::iPktException; m_i_table[0x06].pptkFn = &TrcPktProcEtmV4I::iPktException;
// b0000 0111 - exception return // b0000 0111 - exception return
m_i_table[0x07].pkt_type = ETM4_PKT_I_EXCEPT_RTN; m_i_table[0x07].pkt_type = ETM4_PKT_I_EXCEPT_RTN;
m_i_table[0x07].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x07].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
// b0000 110x - cycle count f2 // b0000 110x - cycle count f2
// b0000 111x - cycle count f1 // b0000 111x - cycle count f1
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
{ {
m_i_table[0x0C+i].pkt_type = (i >= 2) ? ETM4_PKT_I_CCNT_F1 : ETM4_PKT_I_CCNT_F2; m_i_table[0x0C+i].pkt_type = (i >= 2) ? ETM4_PKT_I_CCNT_F1 : ETM4_PKT_I_CCNT_F2;
m_i_table[0x0C+i].pptkFn = &EtmV4IPktProcImpl::iPktCycleCntF123; m_i_table[0x0C+i].pptkFn = &TrcPktProcEtmV4I::iPktCycleCntF123;
} }
// b0001 xxxx - cycle count f3 // b0001 xxxx - cycle count f3
for(int i = 0; i < 16; i++) for(int i = 0; i < 16; i++)
{ {
m_i_table[0x10+i].pkt_type = ETM4_PKT_I_CCNT_F3; m_i_table[0x10+i].pkt_type = ETM4_PKT_I_CCNT_F3;
m_i_table[0x10+i].pptkFn = &EtmV4IPktProcImpl::iPktCycleCntF123; m_i_table[0x10+i].pptkFn = &TrcPktProcEtmV4I::iPktCycleCntF123;
} }
// b0010 0xxx - NDSM // b0010 0xxx - NDSM
@ -1293,9 +1269,9 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
{ {
m_i_table[0x20 + i].pkt_type = ETM4_PKT_I_NUM_DS_MKR; m_i_table[0x20 + i].pkt_type = ETM4_PKT_I_NUM_DS_MKR;
if (m_config.enabledDataTrace()) if (m_config.enabledDataTrace())
m_i_table[0x20+i].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x20+i].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
else else
m_i_table[0x20+i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x20+i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b0010 10xx, b0010 1100 - UDSM // b0010 10xx, b0010 1100 - UDSM
@ -1303,43 +1279,40 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
{ {
m_i_table[0x28+i].pkt_type = ETM4_PKT_I_UNNUM_DS_MKR; m_i_table[0x28+i].pkt_type = ETM4_PKT_I_UNNUM_DS_MKR;
if (m_config.enabledDataTrace()) if (m_config.enabledDataTrace())
m_i_table[0x28+i].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x28+i].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
else else
m_i_table[0x28+i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x28+i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b0010 1101 - commit // b0010 1101 - commit
m_i_table[0x2D].pkt_type = ETM4_PKT_I_COMMIT; m_i_table[0x2D].pkt_type = ETM4_PKT_I_COMMIT;
m_i_table[0x2D].pptkFn = &EtmV4IPktProcImpl::iPktSpeclRes; m_i_table[0x2D].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
// b0010 111x - cancel f1 // b0010 111x - cancel f1 (mis pred)
for(int i = 0; i < 2; i++) m_i_table[0x2E].pkt_type = ETM4_PKT_I_CANCEL_F1;
{ m_i_table[0x2E].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
// G++ doesn't understand [0x2E+i] so... m_i_table[0x2F].pkt_type = ETM4_PKT_I_CANCEL_F1_MISPRED;
int idx = i + 0x2E; m_i_table[0x2F].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
m_i_table[idx].pkt_type = ETM4_PKT_I_CANCEL_F1;
m_i_table[idx].pptkFn = &EtmV4IPktProcImpl::iPktSpeclRes;
}
// b0011 00xx - mis predict // b0011 00xx - mis predict
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
{ {
m_i_table[0x30+i].pkt_type = ETM4_PKT_I_MISPREDICT; m_i_table[0x30+i].pkt_type = ETM4_PKT_I_MISPREDICT;
m_i_table[0x30+i].pptkFn = &EtmV4IPktProcImpl::iPktSpeclRes; m_i_table[0x30+i].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
} }
// b0011 01xx - cancel f2 // b0011 01xx - cancel f2
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
{ {
m_i_table[0x34+i].pkt_type = ETM4_PKT_I_CANCEL_F2; m_i_table[0x34+i].pkt_type = ETM4_PKT_I_CANCEL_F2;
m_i_table[0x34+i].pptkFn = &EtmV4IPktProcImpl::iPktSpeclRes; m_i_table[0x34+i].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
} }
// b0011 1xxx - cancel f3 // b0011 1xxx - cancel f3
for(int i = 0; i < 8; i++) for(int i = 0; i < 8; i++)
{ {
m_i_table[0x38+i].pkt_type = ETM4_PKT_I_CANCEL_F3; m_i_table[0x38+i].pkt_type = ETM4_PKT_I_CANCEL_F3;
m_i_table[0x38+i].pptkFn = &EtmV4IPktProcImpl::iPktSpeclRes; m_i_table[0x38+i].pptkFn = &TrcPktProcEtmV4I::iPktSpeclRes;
} }
bool bCondValid = m_config.hasCondTrace() && m_config.enabledCondITrace(); bool bCondValid = m_config.hasCondTrace() && m_config.enabledCondITrace();
@ -1349,26 +1322,26 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
{ {
m_i_table[0x40 + i].pkt_type = ETM4_PKT_I_COND_I_F2; m_i_table[0x40 + i].pkt_type = ETM4_PKT_I_COND_I_F2;
if (bCondValid) if (bCondValid)
m_i_table[0x40 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondInstr; m_i_table[0x40 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondInstr;
else else
m_i_table[0x40 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x40 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b0100 0011 - cond flush // b0100 0011 - cond flush
m_i_table[0x43].pkt_type = ETM4_PKT_I_COND_FLUSH; m_i_table[0x43].pkt_type = ETM4_PKT_I_COND_FLUSH;
if (bCondValid) if (bCondValid)
m_i_table[0x43].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x43].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
else else
m_i_table[0x43].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x43].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
// b0100 010x, b0100 0110 - cond res f4 // b0100 010x, b0100 0110 - cond res f4
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
m_i_table[0x44 + i].pkt_type = ETM4_PKT_I_COND_RES_F4; m_i_table[0x44 + i].pkt_type = ETM4_PKT_I_COND_RES_F4;
if (bCondValid) if (bCondValid)
m_i_table[0x44 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult; m_i_table[0x44 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
else else
m_i_table[0x44 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x44 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b0100 100x, b0100 0110 - cond res f2 // b0100 100x, b0100 0110 - cond res f2
@ -1377,17 +1350,17 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
{ {
m_i_table[0x48 + i].pkt_type = ETM4_PKT_I_COND_RES_F2; m_i_table[0x48 + i].pkt_type = ETM4_PKT_I_COND_RES_F2;
if (bCondValid) if (bCondValid)
m_i_table[0x48 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult; m_i_table[0x48 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
else else
m_i_table[0x48 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x48 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
m_i_table[0x4C + i].pkt_type = ETM4_PKT_I_COND_RES_F2; m_i_table[0x4C + i].pkt_type = ETM4_PKT_I_COND_RES_F2;
if (bCondValid) if (bCondValid)
m_i_table[0x4C + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult; m_i_table[0x4C + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
else else
m_i_table[0x4C + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x4C + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b0101xxxx - cond res f3 // b0101xxxx - cond res f3
@ -1395,9 +1368,9 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
{ {
m_i_table[0x50 + i].pkt_type = ETM4_PKT_I_COND_RES_F3; m_i_table[0x50 + i].pkt_type = ETM4_PKT_I_COND_RES_F3;
if (bCondValid) if (bCondValid)
m_i_table[0x50 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult; m_i_table[0x50 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
else else
m_i_table[0x50 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x50 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b011010xx - cond res f1 // b011010xx - cond res f1
@ -1405,24 +1378,24 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
{ {
m_i_table[0x68 + i].pkt_type = ETM4_PKT_I_COND_RES_F1; m_i_table[0x68 + i].pkt_type = ETM4_PKT_I_COND_RES_F1;
if (bCondValid) if (bCondValid)
m_i_table[0x68 + i].pptkFn = &EtmV4IPktProcImpl::iPktCondResult; m_i_table[0x68 + i].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
else else
m_i_table[0x68 + i].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x68 + i].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// b0110 1100 - cond instr f1 // b0110 1100 - cond instr f1
m_i_table[0x6C].pkt_type = ETM4_PKT_I_COND_I_F1; m_i_table[0x6C].pkt_type = ETM4_PKT_I_COND_I_F1;
if (bCondValid) if (bCondValid)
m_i_table[0x6C].pptkFn = &EtmV4IPktProcImpl::iPktCondInstr; m_i_table[0x6C].pptkFn = &TrcPktProcEtmV4I::iPktCondInstr;
else else
m_i_table[0x6C].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x6C].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
// b0110 1101 - cond instr f3 // b0110 1101 - cond instr f3
m_i_table[0x6D].pkt_type = ETM4_PKT_I_COND_I_F3; m_i_table[0x6D].pkt_type = ETM4_PKT_I_COND_I_F3;
if (bCondValid) if (bCondValid)
m_i_table[0x6D].pptkFn = &EtmV4IPktProcImpl::iPktCondInstr; m_i_table[0x6D].pptkFn = &TrcPktProcEtmV4I::iPktCondInstr;
else else
m_i_table[0x6D].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[0x6D].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
// b0110111x - cond res f1 // b0110111x - cond res f1
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
@ -1430,30 +1403,30 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
// G++ cannot understand [0x6E+i] so change these round // G++ cannot understand [0x6E+i] so change these round
m_i_table[i + 0x6E].pkt_type = ETM4_PKT_I_COND_RES_F1; m_i_table[i + 0x6E].pkt_type = ETM4_PKT_I_COND_RES_F1;
if (bCondValid) if (bCondValid)
m_i_table[i + 0x6E].pptkFn = &EtmV4IPktProcImpl::iPktCondResult; m_i_table[i + 0x6E].pptkFn = &TrcPktProcEtmV4I::iPktCondResult;
else else
m_i_table[i + 0x6E].pptkFn = &EtmV4IPktProcImpl::iPktInvalidCfg; m_i_table[i + 0x6E].pptkFn = &TrcPktProcEtmV4I::iPktInvalidCfg;
} }
// ETM 4.3 introduces ignore packets // ETM 4.3 introduces ignore packets
if (m_config.FullVersion() >= 0x43) if (m_config.FullVersion() >= 0x43)
{ {
m_i_table[0x70].pkt_type = ETM4_PKT_I_IGNORE; m_i_table[0x70].pkt_type = ETM4_PKT_I_IGNORE;
m_i_table[0x70].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x70].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
} }
// b01110001 - b01111111 - event trace // b01110001 - b01111111 - event trace
for(int i = 0; i < 15; i++) for(int i = 0; i < 15; i++)
{ {
m_i_table[0x71+i].pkt_type = ETM4_PKT_I_EVENT; m_i_table[0x71+i].pkt_type = ETM4_PKT_I_EVENT;
m_i_table[0x71+i].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x71+i].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
} }
// 0b1000 000x - context // 0b1000 000x - context
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
m_i_table[0x80+i].pkt_type = ETM4_PKT_I_CTXT; m_i_table[0x80+i].pkt_type = ETM4_PKT_I_CTXT;
m_i_table[0x80+i].pptkFn = &EtmV4IPktProcImpl::iPktContext; m_i_table[0x80+i].pptkFn = &TrcPktProcEtmV4I::iPktContext;
} }
// 0b1000 0010 to b1000 0011 - addr with ctxt // 0b1000 0010 to b1000 0011 - addr with ctxt
@ -1461,27 +1434,27 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
m_i_table[0x82+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_32IS0 : ETM4_PKT_I_ADDR_CTXT_L_32IS1; m_i_table[0x82+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_32IS0 : ETM4_PKT_I_ADDR_CTXT_L_32IS1;
m_i_table[0x82+i].pptkFn = &EtmV4IPktProcImpl::iPktAddrCtxt; m_i_table[0x82+i].pptkFn = &TrcPktProcEtmV4I::iPktAddrCtxt;
} }
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
m_i_table[0x85+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_64IS0 : ETM4_PKT_I_ADDR_CTXT_L_64IS1; m_i_table[0x85+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_CTXT_L_64IS0 : ETM4_PKT_I_ADDR_CTXT_L_64IS1;
m_i_table[0x85+i].pptkFn = &EtmV4IPktProcImpl::iPktAddrCtxt; m_i_table[0x85+i].pptkFn = &TrcPktProcEtmV4I::iPktAddrCtxt;
} }
// 0b1001 0000 to b1001 0010 - exact match addr // 0b1001 0000 to b1001 0010 - exact match addr
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++)
{ {
m_i_table[0x90+i].pkt_type = ETM4_PKT_I_ADDR_MATCH; m_i_table[0x90+i].pkt_type = ETM4_PKT_I_ADDR_MATCH;
m_i_table[0x90+i].pptkFn = &EtmV4IPktProcImpl::iPktNoPayload; m_i_table[0x90+i].pptkFn = &TrcPktProcEtmV4I::iPktNoPayload;
} }
// b1001 0101 - b1001 0110 - addr short address // b1001 0101 - b1001 0110 - addr short address
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
m_i_table[0x95+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_S_IS0 : ETM4_PKT_I_ADDR_S_IS1; m_i_table[0x95+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_S_IS0 : ETM4_PKT_I_ADDR_S_IS1;
m_i_table[0x95+i].pptkFn = &EtmV4IPktProcImpl::iPktShortAddr; m_i_table[0x95+i].pptkFn = &TrcPktProcEtmV4I::iPktShortAddr;
} }
// b10011010 - b10011011 - addr long address // b10011010 - b10011011 - addr long address
@ -1489,12 +1462,12 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
m_i_table[0x9A+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_L_32IS0 : ETM4_PKT_I_ADDR_L_32IS1; m_i_table[0x9A+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_L_32IS0 : ETM4_PKT_I_ADDR_L_32IS1;
m_i_table[0x9A+i].pptkFn = &EtmV4IPktProcImpl::iPktLongAddr; m_i_table[0x9A+i].pptkFn = &TrcPktProcEtmV4I::iPktLongAddr;
} }
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
{ {
m_i_table[0x9D+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_L_64IS0 : ETM4_PKT_I_ADDR_L_64IS1; m_i_table[0x9D+i].pkt_type = (i == 0) ? ETM4_PKT_I_ADDR_L_64IS0 : ETM4_PKT_I_ADDR_L_64IS1;
m_i_table[0x9D+i].pptkFn = &EtmV4IPktProcImpl::iPktLongAddr; m_i_table[0x9D+i].pptkFn = &TrcPktProcEtmV4I::iPktLongAddr;
} }
// b1010xxxx - Q packet // b1010xxxx - Q packet
@ -1515,7 +1488,7 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
default: default:
// if this config supports Q elem - otherwise reserved again. // if this config supports Q elem - otherwise reserved again.
if (m_config.hasQElem()) if (m_config.hasQElem())
m_i_table[0xA0 + i].pptkFn = &EtmV4IPktProcImpl::iPktQ; m_i_table[0xA0 + i].pptkFn = &TrcPktProcEtmV4I::iPktQ;
} }
} }
@ -1523,46 +1496,46 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
for(int i = 0xC0; i <= 0xD4; i++) // atom f6 for(int i = 0xC0; i <= 0xD4; i++) // atom f6
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
for(int i = 0xD5; i <= 0xD7; i++) // atom f5 for(int i = 0xD5; i <= 0xD7; i++) // atom f5
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F5; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F5;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
for(int i = 0xD8; i <= 0xDB; i++) // atom f2 for(int i = 0xD8; i <= 0xDB; i++) // atom f2
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F2; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F2;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
for(int i = 0xDC; i <= 0xDF; i++) // atom f4 for(int i = 0xDC; i <= 0xDF; i++) // atom f4
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F4; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F4;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
for(int i = 0xE0; i <= 0xF4; i++) // atom f6 for(int i = 0xE0; i <= 0xF4; i++) // atom f6
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F6;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
// atom f5 // atom f5
m_i_table[0xF5].pkt_type = ETM4_PKT_I_ATOM_F5; m_i_table[0xF5].pkt_type = ETM4_PKT_I_ATOM_F5;
m_i_table[0xF5].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[0xF5].pptkFn = &TrcPktProcEtmV4I::iAtom;
for(int i = 0xF6; i <= 0xF7; i++) // atom f1 for(int i = 0xF6; i <= 0xF7; i++) // atom f1
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F1; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F1;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
for(int i = 0xF8; i <= 0xFF; i++) // atom f3 for(int i = 0xF8; i <= 0xFF; i++) // atom f3
{ {
m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F3; m_i_table[i].pkt_type = ETM4_PKT_I_ATOM_F3;
m_i_table[i].pptkFn = &EtmV4IPktProcImpl::iAtom; m_i_table[i].pptkFn = &TrcPktProcEtmV4I::iAtom;
} }
} }
unsigned EtmV4IPktProcImpl::extractContField(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t &value, const unsigned byte_limit /*= 5*/) unsigned TrcPktProcEtmV4I::extractContField(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t &value, const unsigned byte_limit /*= 5*/)
{ {
unsigned idx = 0; unsigned idx = 0;
bool lastByte = false; bool lastByte = false;
@ -1586,7 +1559,7 @@ void EtmV4IPktProcImpl::BuildIPacketTable()
return idx; return idx;
} }
unsigned EtmV4IPktProcImpl::extractContField64(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint64_t &value, const unsigned byte_limit /*= 9*/) unsigned TrcPktProcEtmV4I::extractContField64(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint64_t &value, const unsigned byte_limit /*= 9*/)
{ {
unsigned idx = 0; unsigned idx = 0;
bool lastByte = false; bool lastByte = false;
@ -1610,7 +1583,7 @@ unsigned EtmV4IPktProcImpl::extractContField64(const std::vector<uint8_t> &buffe
return idx; return idx;
} }
unsigned EtmV4IPktProcImpl::extractCondResult(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t& key, uint8_t &result) unsigned TrcPktProcEtmV4I::extractCondResult(const std::vector<uint8_t> &buffer, const unsigned st_idx, uint32_t& key, uint8_t &result)
{ {
unsigned idx = 0; unsigned idx = 0;
bool lastByte = false; bool lastByte = false;
@ -1644,7 +1617,7 @@ unsigned EtmV4IPktProcImpl::extractContField64(const std::vector<uint8_t> &buffe
return idx; return idx;
} }
int EtmV4IPktProcImpl::extract64BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint64_t &value) int TrcPktProcEtmV4I::extract64BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint64_t &value)
{ {
value = 0; value = 0;
if(IS == 0) if(IS == 0)
@ -1666,7 +1639,7 @@ int EtmV4IPktProcImpl::extract64BitLongAddr(const std::vector<uint8_t> &buffer,
return 8; return 8;
} }
int EtmV4IPktProcImpl::extract32BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value) int TrcPktProcEtmV4I::extract32BitLongAddr(const std::vector<uint8_t> &buffer, const int st_idx, const uint8_t IS, uint32_t &value)
{ {
value = 0; value = 0;
if(IS == 0) if(IS == 0)
@ -1684,11 +1657,11 @@ int EtmV4IPktProcImpl::extract32BitLongAddr(const std::vector<uint8_t> &buffer,
return 4; return 4;
} }
void EtmV4IPktProcImpl::throwBadSequenceError(const char *pszExtMsg) void TrcPktProcEtmV4I::throwBadSequenceError(const char *pszExtMsg)
{ {
m_curr_packet.updateErrType(ETM4_PKT_I_BAD_SEQUENCE); // swap type for err type m_curr_packet.updateErrType(ETM4_PKT_I_BAD_SEQUENCE); // swap type for err type
throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_BAD_PACKET_SEQ,m_packet_index,m_config.getTraceID(),pszExtMsg); throw ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_BAD_PACKET_SEQ,m_packet_index,m_config.getTraceID(),pszExtMsg);
} }
/* End of File trc_pkt_proc_etmv4i_impl.cpp */ /* End of File trc_pkt_proc_etmv4i.cpp */

51
decoder/source/i_dec/trc_i_decode.cpp
View File

@ -39,21 +39,23 @@
ocsd_err_t TrcIDecode::DecodeInstruction(ocsd_instr_info *instr_info) ocsd_err_t TrcIDecode::DecodeInstruction(ocsd_instr_info *instr_info)
{ {
ocsd_err_t err = OCSD_OK; ocsd_err_t err = OCSD_OK;
clear_instr_subtype(); struct decode_info info;
SetArchVersion(instr_info);
info.instr_sub_type = OCSD_S_INSTR_NONE;
info.arch_version = (uint16_t)(instr_info->pe_type.arch);
switch(instr_info->isa) switch(instr_info->isa)
{ {
case ocsd_isa_arm: case ocsd_isa_arm:
err = DecodeA32(instr_info); err = DecodeA32(instr_info, &info);
break; break;
case ocsd_isa_thumb2: case ocsd_isa_thumb2:
err = DecodeT32(instr_info); err = DecodeT32(instr_info, &info);
break; break;
case ocsd_isa_aarch64: case ocsd_isa_aarch64:
err = DecodeA64(instr_info); err = DecodeA64(instr_info, &info);
break; break;
case ocsd_isa_tee: case ocsd_isa_tee:
@ -63,27 +65,11 @@ ocsd_err_t TrcIDecode::DecodeInstruction(ocsd_instr_info *instr_info)
err = OCSD_ERR_UNSUPPORTED_ISA; err = OCSD_ERR_UNSUPPORTED_ISA;
break; break;
} }
instr_info->sub_type = get_instr_subtype(); instr_info->sub_type = info.instr_sub_type;
return err; return err;
} }
void TrcIDecode::SetArchVersion(ocsd_instr_info *instr_info) ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info, struct decode_info *info)
{
uint16_t arch = 0x0700;
switch (instr_info->pe_type.arch)
{
case ARCH_V8: arch = 0x0800; break;
case ARCH_V8r3: arch = 0x0803; break;
case ARCH_V7:
default:
break;
}
set_arch_version(arch);
}
ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info)
{ {
uint32_t branchAddr = 0; uint32_t branchAddr = 0;
arm_barrier_t barrier; arm_barrier_t barrier;
@ -93,10 +79,10 @@ ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info)
instr_info->next_isa = instr_info->isa; // assume same ISA instr_info->next_isa = instr_info->isa; // assume same ISA
instr_info->is_link = 0; instr_info->is_link = 0;
if(inst_ARM_is_indirect_branch(instr_info->opcode)) if(inst_ARM_is_indirect_branch(instr_info->opcode, info))
{ {
instr_info->type = OCSD_INSTR_BR_INDIRECT; instr_info->type = OCSD_INSTR_BR_INDIRECT;
instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode); instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode, info);
} }
else if(inst_ARM_is_direct_branch(instr_info->opcode)) else if(inst_ARM_is_direct_branch(instr_info->opcode))
{ {
@ -108,7 +94,7 @@ ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info)
branchAddr &= ~0x1; branchAddr &= ~0x1;
} }
instr_info->branch_addr = (ocsd_vaddr_t)branchAddr; instr_info->branch_addr = (ocsd_vaddr_t)branchAddr;
instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode); instr_info->is_link = inst_ARM_is_branch_and_link(instr_info->opcode, info);
} }
else if((barrier = inst_ARM_barrier(instr_info->opcode)) != ARM_BARRIER_NONE) else if((barrier = inst_ARM_barrier(instr_info->opcode)) != ARM_BARRIER_NONE)
{ {
@ -137,7 +123,7 @@ ocsd_err_t TrcIDecode::DecodeA32(ocsd_instr_info *instr_info)
return OCSD_OK; return OCSD_OK;
} }
ocsd_err_t TrcIDecode::DecodeA64(ocsd_instr_info *instr_info) ocsd_err_t TrcIDecode::DecodeA64(ocsd_instr_info *instr_info, struct decode_info *info)
{ {
uint64_t branchAddr = 0; uint64_t branchAddr = 0;
arm_barrier_t barrier; arm_barrier_t barrier;
@ -147,12 +133,12 @@ ocsd_err_t TrcIDecode::DecodeA64(ocsd_instr_info *instr_info)
instr_info->next_isa = instr_info->isa; // assume same ISA instr_info->next_isa = instr_info->isa; // assume same ISA
instr_info->is_link = 0; instr_info->is_link = 0;
if(inst_A64_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link)) if(inst_A64_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link, info))
{ {
instr_info->type = OCSD_INSTR_BR_INDIRECT; instr_info->type = OCSD_INSTR_BR_INDIRECT;
// instr_info->is_link = inst_A64_is_branch_and_link(instr_info->opcode); // instr_info->is_link = inst_A64_is_branch_and_link(instr_info->opcode);
} }
else if(inst_A64_is_direct_branch_link(instr_info->opcode, &instr_info->is_link)) else if(inst_A64_is_direct_branch_link(instr_info->opcode, &instr_info->is_link, info))
{ {
inst_A64_branch_destination(instr_info->instr_addr,instr_info->opcode,&branchAddr); inst_A64_branch_destination(instr_info->instr_addr,instr_info->opcode,&branchAddr);
instr_info->type = OCSD_INSTR_BR; instr_info->type = OCSD_INSTR_BR;
@ -187,7 +173,7 @@ ocsd_err_t TrcIDecode::DecodeA64(ocsd_instr_info *instr_info)
return OCSD_OK; return OCSD_OK;
} }
ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info) ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info, struct decode_info *info)
{ {
uint32_t branchAddr = 0; uint32_t branchAddr = 0;
arm_barrier_t barrier; arm_barrier_t barrier;
@ -206,7 +192,7 @@ ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info)
instr_info->is_conditional = 0; instr_info->is_conditional = 0;
if(inst_Thumb_is_direct_branch_link(instr_info->opcode,&instr_info->is_link, &instr_info->is_conditional)) if(inst_Thumb_is_direct_branch_link(instr_info->opcode,&instr_info->is_link, &instr_info->is_conditional, info))
{ {
inst_Thumb_branch_destination((uint32_t)instr_info->instr_addr,instr_info->opcode,&branchAddr); inst_Thumb_branch_destination((uint32_t)instr_info->instr_addr,instr_info->opcode,&branchAddr);
instr_info->type = OCSD_INSTR_BR; instr_info->type = OCSD_INSTR_BR;
@ -214,7 +200,7 @@ ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info)
if((branchAddr & 0x1) == 0) if((branchAddr & 0x1) == 0)
instr_info->next_isa = ocsd_isa_arm; instr_info->next_isa = ocsd_isa_arm;
} }
else if (inst_Thumb_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link)) else if (inst_Thumb_is_indirect_branch_link(instr_info->opcode, &instr_info->is_link, info))
{ {
instr_info->type = OCSD_INSTR_BR_INDIRECT; instr_info->type = OCSD_INSTR_BR_INDIRECT;
} }
@ -246,5 +232,4 @@ ocsd_err_t TrcIDecode::DecodeT32(ocsd_instr_info *instr_info)
return OCSD_OK; return OCSD_OK;
} }
/* End of File trc_i_decode.cpp */ /* End of File trc_i_decode.cpp */

137
decoder/source/i_dec/trc_idec_arminst.cpp
View File

@ -42,27 +42,6 @@ block identification and trace decode.
#include <stddef.h> /* for NULL */ #include <stddef.h> /* for NULL */
#include <assert.h> #include <assert.h>
static ocsd_instr_subtype instr_sub_type = OCSD_S_INSTR_NONE;
/* need to spot the architecture version for certain instructions */
static uint16_t arch_version = 0x70;
ocsd_instr_subtype get_instr_subtype()
{
return instr_sub_type;
}
void clear_instr_subtype()
{
instr_sub_type = OCSD_S_INSTR_NONE;
}
void set_arch_version(uint16_t version)
{
arch_version = version;
}
int inst_ARM_is_direct_branch(uint32_t inst) int inst_ARM_is_direct_branch(uint32_t inst)
{ {
int is_direct_branch = 1; int is_direct_branch = 1;
@ -91,7 +70,7 @@ int inst_ARM_wfiwfe(uint32_t inst)
return 0; return 0;
} }
int inst_ARM_is_indirect_branch(uint32_t inst) int inst_ARM_is_indirect_branch(uint32_t inst, struct decode_info *info)
{ {
int is_indirect_branch = 1; int is_indirect_branch = 1;
if ((inst & 0xf0000000) == 0xf0000000) { if ((inst & 0xf0000000) == 0xf0000000) {
@ -104,23 +83,23 @@ int inst_ARM_is_indirect_branch(uint32_t inst)
} else if ((inst & 0x0ff000d0) == 0x01200010) { } else if ((inst & 0x0ff000d0) == 0x01200010) {
/* BLX (register), BX */ /* BLX (register), BX */
if ((inst & 0xFF) == 0x1E) if ((inst & 0xFF) == 0x1E)
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* BX LR */ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* BX LR */
} else if ((inst & 0x0ff000f0) == 0x01200020) { } else if ((inst & 0x0ff000f0) == 0x01200020) {
/* BXJ: in v8 this behaves like BX */ /* BXJ: in v8 this behaves like BX */
} else if ((inst & 0x0e108000) == 0x08108000) { } else if ((inst & 0x0e108000) == 0x08108000) {
/* POP {...,pc} or LDMxx {...,pc} */ /* POP {...,pc} or LDMxx {...,pc} */
if ((inst & 0x0FFFA000) == 0x08BD8000) /* LDMIA SP!,{...,pc} */ if ((inst & 0x0FFFA000) == 0x08BD8000) /* LDMIA SP!,{...,pc} */
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;
} else if ((inst & 0x0e50f000) == 0x0410f000) { } else if ((inst & 0x0e50f000) == 0x0410f000) {
/* LDR PC,imm... inc. POP {PC} */ /* LDR PC,imm... inc. POP {PC} */
if ( (inst & 0x01ff0000) == 0x009D0000) if ( (inst & 0x01ff0000) == 0x009D0000)
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm */ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm */
} else if ((inst & 0x0e50f010) == 0x0610f000) { } else if ((inst & 0x0e50f010) == 0x0610f000) {
/* LDR PC,reg */ /* LDR PC,reg */
} else if ((inst & 0x0fe0f000) == 0x01a0f000) { } else if ((inst & 0x0fe0f000) == 0x01a0f000) {
/* MOV PC,rx */ /* MOV PC,rx */
if ((inst & 0x00100FFF) == 0x00E) /* ensure the S=0, LSL #0 variant - i.e plain MOV */ if ((inst & 0x00100FFF) == 0x00E) /* ensure the S=0, LSL #0 variant - i.e plain MOV */
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC, R14 */ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC, R14 */
} else if ((inst & 0x0f900080) == 0x01000000) { } else if ((inst & 0x0f900080) == 0x01000000) {
/* "Miscellaneous instructions" - in DP space */ /* "Miscellaneous instructions" - in DP space */
is_indirect_branch = 0; is_indirect_branch = 0;
@ -144,13 +123,13 @@ int inst_ARM_is_indirect_branch(uint32_t inst)
return is_indirect_branch; return is_indirect_branch;
} }
int inst_Thumb_is_direct_branch(uint32_t inst) int inst_Thumb_is_direct_branch(uint32_t inst, struct decode_info *info)
{ {
uint8_t link, cond; uint8_t link, cond;
return inst_Thumb_is_direct_branch_link(inst, &link, &cond); return inst_Thumb_is_direct_branch_link(inst, &link, &cond, info);
} }
int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond) int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *is_cond, struct decode_info *info)
{ {
int is_direct_branch = 1; int is_direct_branch = 1;
@ -166,12 +145,12 @@ int inst_Thumb_is_direct_branch_link(uint32_t inst, uint8_t *is_link, uint8_t *i
/* B (encoding T4); BL (encoding T1) */ /* B (encoding T4); BL (encoding T1) */
if (inst & 0x00004000) { if (inst & 0x00004000) {
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} }
} else if ((inst & 0xf800d001) == 0xf000c000) { } else if ((inst & 0xf800d001) == 0xf000c000) {
/* BLX (imm) (encoding T2) */ /* BLX (imm) (encoding T2) */
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} else if ((inst & 0xf5000000) == 0xb1000000) { } else if ((inst & 0xf5000000) == 0xb1000000) {
/* CB(NZ) */ /* CB(NZ) */
*is_cond = 1; *is_cond = 1;
@ -197,13 +176,13 @@ int inst_Thumb_wfiwfe(uint32_t inst)
return is_wfiwfe; return is_wfiwfe;
} }
int inst_Thumb_is_indirect_branch(uint32_t inst) int inst_Thumb_is_indirect_branch(uint32_t inst, struct decode_info *info)
{ {
uint8_t link; uint8_t link;
return inst_Thumb_is_indirect_branch_link(inst, &link); return inst_Thumb_is_indirect_branch_link(inst, &link, info);
} }
int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link) int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info)
{ {
/* See e.g. PFT Table 2-3 and Table 2-5 */ /* See e.g. PFT Table 2-3 and Table 2-5 */
int is_branch = 1; int is_branch = 1;
@ -212,20 +191,20 @@ int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link)
/* BX, BLX (reg) [v8M includes BXNS, BLXNS] */ /* BX, BLX (reg) [v8M includes BXNS, BLXNS] */
if (inst & 0x00800000) { if (inst & 0x00800000) {
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} }
else if ((inst & 0x00780000) == 0x00700000) { else if ((inst & 0x00780000) == 0x00700000) {
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* BX LR */ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* BX LR */
} }
} else if ((inst & 0xfff0d000) == 0xf3c08000) { } else if ((inst & 0xfff0d000) == 0xf3c08000) {
/* BXJ: in v8 this behaves like BX */ /* BXJ: in v8 this behaves like BX */
} else if ((inst & 0xff000000) == 0xbd000000) { } else if ((inst & 0xff000000) == 0xbd000000) {
/* POP {pc} */ /* POP {pc} */
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET;
} else if ((inst & 0xfd870000) == 0x44870000) { } else if ((inst & 0xfd870000) == 0x44870000) {
/* MOV PC,reg or ADD PC,reg */ /* MOV PC,reg or ADD PC,reg */
if ((inst & 0xffff0000) == 0x46f700000) if ((inst & 0xffff0000) == 0x46f70000)
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC,LR */ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* MOV PC,LR */
} else if ((inst & 0xfff0ffe0) == 0xe8d0f000) { } else if ((inst & 0xfff0ffe0) == 0xe8d0f000) {
/* TBB/TBH */ /* TBB/TBH */
} else if ((inst & 0xffd00000) == 0xe8100000) { } else if ((inst & 0xffd00000) == 0xe8100000) {
@ -241,26 +220,26 @@ int inst_Thumb_is_indirect_branch_link(uint32_t inst, uint8_t *is_link)
} else if ((inst & 0xfff0f800) == 0xf850f800) { } else if ((inst & 0xfff0f800) == 0xf850f800) {
/* LDR PC,imm (T4) */ /* LDR PC,imm (T4) */
if((inst & 0x000f0f00) == 0x000d0b00) if((inst & 0x000f0f00) == 0x000d0b00)
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm*/ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* LDR PC, [SP], #imm*/
} else if ((inst & 0xfff0ffc0) == 0xf850f000) { } else if ((inst & 0xfff0ffc0) == 0xf850f000) {
/* LDR PC,reg (T2) */ /* LDR PC,reg (T2) */
} else if ((inst & 0xfe508000) == 0xe8108000) { } else if ((inst & 0xfe508000) == 0xe8108000) {
/* LDM PC */ /* LDM PC */
if ((inst & 0x0FFF0000) == 0x08BD0000) /* LDMIA [SP]!, */ if ((inst & 0x0FFF0000) == 0x08BD0000) /* LDMIA [SP]!, */
instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* POP {...,pc} */ info->instr_sub_type = OCSD_S_INSTR_V7_IMPLIED_RET; /* POP {...,pc} */
} else { } else {
is_branch = 0; is_branch = 0;
} }
return is_branch; return is_branch;
} }
int inst_A64_is_direct_branch(uint32_t inst) int inst_A64_is_direct_branch(uint32_t inst, struct decode_info *info)
{ {
uint8_t link = 0; uint8_t link = 0;
return inst_A64_is_direct_branch_link(inst, &link); return inst_A64_is_direct_branch_link(inst, &link, info);
} }
int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link) int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info)
{ {
int is_direct_branch = 1; int is_direct_branch = 1;
if ((inst & 0x7c000000) == 0x34000000) { if ((inst & 0x7c000000) == 0x34000000) {
@ -271,7 +250,7 @@ int inst_A64_is_direct_branch_link(uint32_t inst, uint8_t *is_link)
/* B, BL imm */ /* B, BL imm */
if (inst & 0x80000000) { if (inst & 0x80000000) {
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} }
} else { } else {
is_direct_branch = 0; is_direct_branch = 0;
@ -287,13 +266,13 @@ int inst_A64_wfiwfe(uint32_t inst)
return 0; return 0;
} }
int inst_A64_is_indirect_branch(uint32_t inst) int inst_A64_is_indirect_branch(uint32_t inst, struct decode_info *info)
{ {
uint8_t link = 0; uint8_t link = 0;
return inst_A64_is_indirect_branch_link(inst, &link); return inst_A64_is_indirect_branch_link(inst, &link, info);
} }
int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link) int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link, struct decode_info *info)
{ {
int is_indirect_branch = 1; int is_indirect_branch = 1;
@ -301,34 +280,34 @@ int inst_A64_is_indirect_branch_link(uint32_t inst, uint8_t *is_link)
/* BR, BLR */ /* BR, BLR */
if (inst & 0x00200000) { if (inst & 0x00200000) {
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} }
} else if ((inst & 0xfffffc1f) == 0xd65f0000) { } else if ((inst & 0xfffffc1f) == 0xd65f0000) {
instr_sub_type = OCSD_S_INSTR_V8_RET; info->instr_sub_type = OCSD_S_INSTR_V8_RET;
/* RET */ /* RET */
} else if ((inst & 0xffffffff) == 0xd69f03e0) { } else if ((inst & 0xffffffff) == 0xd69f03e0) {
/* ERET */ /* ERET */
instr_sub_type = OCSD_S_INSTR_V8_ERET; info->instr_sub_type = OCSD_S_INSTR_V8_ERET;
} else if (arch_version >= 0x0803) { } else if (info->arch_version >= 0x0803) {
/* new pointer auth instr for v8.3 arch */ /* new pointer auth instr for v8.3 arch */
if ((inst & 0xffdff800) == 0xd61f0800) { if ((inst & 0xffdff800) == 0xd71f0800) {
/* BRAA, BRAB, BLRAA, BLRBB */ /* BRAA, BRAB, BLRAA, BLRBB */
if (inst & 0x00200000) { if (inst & 0x00200000) {
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} }
} else if ((inst & 0xffdff81F) == 0xd71f081F) { } else if ((inst & 0xffdff81F) == 0xd61f081F) {
/* BRAAZ, BRABZ, BLRAAZ, BLRBBZ */ /* BRAAZ, BRABZ, BLRAAZ, BLRBBZ */
if (inst & 0x00200000) { if (inst & 0x00200000) {
*is_link = 1; *is_link = 1;
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} }
} else if ((inst & 0xfffffbff) == 0xd69f0bff) { } else if ((inst & 0xfffffbff) == 0xd69f0bff) {
/* ERETAA, ERETAB */ /* ERETAA, ERETAB */
instr_sub_type = OCSD_S_INSTR_V8_ERET; info->instr_sub_type = OCSD_S_INSTR_V8_ERET;
} else if ((inst & 0xfffffbff) == 0xd65f0bff) { } else if ((inst & 0xfffffbff) == 0xd65f0bff) {
/* RETAA, RETAB */ /* RETAA, RETAB */
instr_sub_type = OCSD_S_INSTR_V8_RET; info->instr_sub_type = OCSD_S_INSTR_V8_RET;
} else { } else {
is_indirect_branch = 0; is_indirect_branch = 0;
} }
@ -441,39 +420,39 @@ int inst_A64_branch_destination(uint64_t addr, uint32_t inst, uint64_t *pnpc)
return is_direct_branch; return is_direct_branch;
} }
int inst_ARM_is_branch(uint32_t inst) int inst_ARM_is_branch(uint32_t inst, struct decode_info *info)
{ {
return inst_ARM_is_indirect_branch(inst) || return inst_ARM_is_indirect_branch(inst, info) ||
inst_ARM_is_direct_branch(inst); inst_ARM_is_direct_branch(inst);
} }
int inst_Thumb_is_branch(uint32_t inst) int inst_Thumb_is_branch(uint32_t inst, struct decode_info *info)
{ {
return inst_Thumb_is_indirect_branch(inst) || return inst_Thumb_is_indirect_branch(inst, info) ||
inst_Thumb_is_direct_branch(inst); inst_Thumb_is_direct_branch(inst, info);
} }
int inst_A64_is_branch(uint32_t inst) int inst_A64_is_branch(uint32_t inst, struct decode_info *info)
{ {
return inst_A64_is_indirect_branch(inst) || return inst_A64_is_indirect_branch(inst, info) ||
inst_A64_is_direct_branch(inst); inst_A64_is_direct_branch(inst, info);
} }
int inst_ARM_is_branch_and_link(uint32_t inst) int inst_ARM_is_branch_and_link(uint32_t inst, struct decode_info *info)
{ {
int is_branch = 1; int is_branch = 1;
if ((inst & 0xf0000000) == 0xf0000000) { if ((inst & 0xf0000000) == 0xf0000000) {
if ((inst & 0xfe000000) == 0xfa000000){ if ((inst & 0xfe000000) == 0xfa000000){
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
/* BLX (imm) */ /* BLX (imm) */
} else { } else {
is_branch = 0; is_branch = 0;
} }
} else if ((inst & 0x0f000000) == 0x0b000000) { } else if ((inst & 0x0f000000) == 0x0b000000) {
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
/* BL */ /* BL */
} else if ((inst & 0x0ff000f0) == 0x01200030) { } else if ((inst & 0x0ff000f0) == 0x01200030) {
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
/* BLX (reg) */ /* BLX (reg) */
} else { } else {
is_branch = 0; is_branch = 0;
@ -481,14 +460,14 @@ int inst_ARM_is_branch_and_link(uint32_t inst)
return is_branch; return is_branch;
} }
int inst_Thumb_is_branch_and_link(uint32_t inst) int inst_Thumb_is_branch_and_link(uint32_t inst, struct decode_info *info)
{ {
int is_branch = 1; int is_branch = 1;
if ((inst & 0xff800000) == 0x47800000) { if ((inst & 0xff800000) == 0x47800000) {
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
/* BLX (reg) */ /* BLX (reg) */
} else if ((inst & 0xf800c000) == 0xf000c000) { } else if ((inst & 0xf800c000) == 0xf000c000) {
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
/* BL, BLX (imm) */ /* BL, BLX (imm) */
} else { } else {
is_branch = 0; is_branch = 0;
@ -496,23 +475,23 @@ int inst_Thumb_is_branch_and_link(uint32_t inst)
return is_branch; return is_branch;
} }
int inst_A64_is_branch_and_link(uint32_t inst) int inst_A64_is_branch_and_link(uint32_t inst, struct decode_info *info)
{ {
int is_branch = 1; int is_branch = 1;
if ((inst & 0xfffffc1f) == 0xd63f0000) { if ((inst & 0xfffffc1f) == 0xd63f0000) {
/* BLR */ /* BLR */
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} else if ((inst & 0xfc000000) == 0x94000000) { } else if ((inst & 0xfc000000) == 0x94000000) {
/* BL */ /* BL */
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} else if (arch_version >= 0x0803) { } else if (info->arch_version >= 0x0803) {
/* new pointer auth instr for v8.3 arch */ /* new pointer auth instr for v8.3 arch */
if ((inst & 0xfffff800) == 0xd73f0800) { if ((inst & 0xfffff800) == 0xd73f0800) {
/* BLRAA, BLRBB */ /* BLRAA, BLRBB */
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} else if ((inst & 0xfffff81F) == 0xd63f081F) { } else if ((inst & 0xfffff81F) == 0xd63f081F) {
/* BLRAAZ, BLRBBZ */ /* BLRAAZ, BLRBBZ */
instr_sub_type = OCSD_S_INSTR_BR_LINK; info->instr_sub_type = OCSD_S_INSTR_BR_LINK;
} else { } else {
is_branch = 0; is_branch = 0;
} }

3
decoder/source/mem_acc/trc_mem_acc_bufptr.cpp
View File

@ -37,8 +37,7 @@
TrcMemAccBufPtr::TrcMemAccBufPtr(const ocsd_vaddr_t s_address, const uint8_t *p_buffer, const uint32_t size) : TrcMemAccBufPtr::TrcMemAccBufPtr(const ocsd_vaddr_t s_address, const uint8_t *p_buffer, const uint32_t size) :
TrcMemAccessorBase(MEMACC_BUFPTR, s_address, s_address+size-1), TrcMemAccessorBase(MEMACC_BUFPTR, s_address, s_address+size-1),
m_p_buffer(p_buffer), m_p_buffer(p_buffer)
m_size(size)
{ {
} }

1
decoder/source/ocsd_dcd_tree.cpp
View File

@ -111,6 +111,7 @@ DecodeTree::~DecodeTree()
destroyDecodeElement(i); destroyDecodeElement(i);
} }
PktPrinterFact::destroyAllPrinters(m_printer_list); PktPrinterFact::destroyAllPrinters(m_printer_list);
delete m_frame_deformatter_root;
} }

2
decoder/source/ocsd_error.cpp
View File

@ -207,7 +207,7 @@ const std::string ocsdError::getErrorString(const ocsdError &error)
void ocsdError::appendErrorDetails(std::string &errStr, const ocsdError &error) void ocsdError::appendErrorDetails(std::string &errStr, const ocsdError &error)
{ {
int numerrstr = ((sizeof(s_errorCodeDescs) / sizeof(const char *)) / 2); int numerrstr = sizeof(s_errorCodeDescs) / sizeof(s_errorCodeDescs[0]);
int code = (int)error.getErrorCode(); int code = (int)error.getErrorCode();
ocsd_trc_index_t idx = error.getErrorIndex(); ocsd_trc_index_t idx = error.getErrorIndex();
uint8_t chan_ID = error.getErrorChanID(); uint8_t chan_ID = error.getErrorChanID();

196
decoder/source/ocsd_gen_elem_stack.cpp Normal file
View File

@ -0,0 +1,196 @@
/*
* \file ocsd_gen_elem_stack.cpp
* \brief OpenCSD : List of Generic trace elements for output.
*
* \copyright Copyright (c) 2020, ARM Limited. All Rights Reserved.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "common/ocsd_gen_elem_stack.h"
OcsdGenElemStack::OcsdGenElemStack() :
m_pElemArray(0),
m_elemArraySize(0),
m_elem_to_send(0),
m_curr_elem_idx(0),
m_send_elem_idx(0),
m_CSID(0),
m_is_init(false)
{
}
OcsdGenElemStack::~OcsdGenElemStack()
{
for (int i = 0; i<m_elemArraySize; i++)
{
delete m_pElemArray[i].pElem;
}
delete [] m_pElemArray;
m_pElemArray = 0;
}
ocsd_err_t OcsdGenElemStack::addElem(const ocsd_trc_index_t trc_pkt_idx)
{
ocsd_err_t err = OCSD_OK;
if (((m_curr_elem_idx + 1) == m_elemArraySize) || !m_pElemArray)
{
err = growArray();
if (err)
return err;
}
// if there is a least one element then copy and increment
// otherwise we are at base of stack.
if (m_elem_to_send)
{
copyPersistentData(m_curr_elem_idx, m_curr_elem_idx + 1);
m_curr_elem_idx++;
}
m_pElemArray[m_curr_elem_idx].trc_pkt_idx = trc_pkt_idx;
m_elem_to_send++;
return err;
}
ocsd_err_t OcsdGenElemStack::addElemType(const ocsd_trc_index_t trc_pkt_idx, ocsd_gen_trc_elem_t elem_type)
{
ocsd_err_t err = addElem(trc_pkt_idx);
if (!err)
getCurrElem().setType(elem_type);
return err;
}
ocsd_err_t OcsdGenElemStack::resetElemStack()
{
ocsd_err_t err = OCSD_OK;
if (!m_pElemArray)
{
err = growArray();
if (err)
return err;
}
if (!isInit())
return OCSD_ERR_NOT_INIT;
resetIndexes();
return err;
}
void OcsdGenElemStack::resetIndexes()
{
// last time there was more than one element on stack
if (m_curr_elem_idx > 0)
copyPersistentData(m_curr_elem_idx, 0);
// indexes to bottom of stack, nothing in use at present
m_curr_elem_idx = 0;
m_send_elem_idx = 0;
m_elem_to_send = 0;
}
ocsd_datapath_resp_t OcsdGenElemStack::sendElements()
{
ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
if (!isInit())
return OCSD_RESP_FATAL_NOT_INIT;
while (m_elem_to_send && OCSD_DATA_RESP_IS_CONT(resp))
{
resp = m_sendIf->first()->TraceElemIn(m_pElemArray[m_send_elem_idx].trc_pkt_idx, m_CSID, *(m_pElemArray[m_send_elem_idx].pElem));
m_send_elem_idx++;
m_elem_to_send--;
}
// clear the indexes if we are done.
if (!m_elem_to_send)
resetIndexes();
return resp;
}
ocsd_err_t OcsdGenElemStack::growArray()
{
elemPtr_t *p_new_array = 0;
const int increment = 4;
p_new_array = new (std::nothrow) elemPtr_t[m_elemArraySize + increment];
if (p_new_array != 0)
{
OcsdTraceElement *pElem = 0;
// fill the last increment elements with new objects
for (int i = 0; i < increment; i++)
{
pElem = new (std::nothrow) OcsdTraceElement();
if (!pElem)
return OCSD_ERR_MEM;
pElem->init();
p_new_array[m_elemArraySize + i].pElem = pElem;
}
// copy the existing objects from the old array to the start of the new one
if (m_elemArraySize > 0)
{
for (int i = 0; i < m_elemArraySize; i++)
{
p_new_array[i].pElem = m_pElemArray[i].pElem;
p_new_array[i].trc_pkt_idx = m_pElemArray[i].trc_pkt_idx;
}
}
// delete the old pointer array.
delete[] m_pElemArray;
m_elemArraySize += increment;
m_pElemArray = p_new_array;
}
else
return OCSD_ERR_MEM;
return OCSD_OK;
}
void OcsdGenElemStack::copyPersistentData(int src, int dst)
{
m_pElemArray[dst].pElem->copyPersistentData(*(m_pElemArray[src].pElem));
}
const bool OcsdGenElemStack::isInit()
{
if (!m_is_init) {
if (m_elemArraySize && m_pElemArray && m_sendIf)
m_is_init = true;
}
return m_is_init;
}
/* End of File ocsd_gen_elem_stack.cpp */

12
decoder/source/ptm/trc_pkt_decode_ptm.cpp
View File

@ -67,6 +67,7 @@ ocsd_datapath_resp_t TrcPktDecodePtm::processPacket()
case NO_SYNC: case NO_SYNC:
// no sync - output a no sync packet then transition to wait sync. // no sync - output a no sync packet then transition to wait sync.
m_output_elem.elem_type = OCSD_GEN_TRC_ELEM_NO_SYNC; m_output_elem.elem_type = OCSD_GEN_TRC_ELEM_NO_SYNC;
m_output_elem.unsync_eot_info = m_unsync_info;
resp = outputTraceElement(m_output_elem); resp = outputTraceElement(m_output_elem);
m_curr_state = (m_curr_packet_in->getType() == PTM_PKT_A_SYNC) ? WAIT_ISYNC : WAIT_SYNC; m_curr_state = (m_curr_packet_in->getType() == PTM_PKT_A_SYNC) ? WAIT_ISYNC : WAIT_SYNC;
bPktDone = true; bPktDone = true;
@ -108,6 +109,7 @@ ocsd_datapath_resp_t TrcPktDecodePtm::onEOT()
// shouldn't be any packets left to be processed - flush shoudl have done this. // shouldn't be any packets left to be processed - flush shoudl have done this.
// just output the end of trace marker // just output the end of trace marker
m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE); m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
m_output_elem.setUnSyncEOTReason(UNSYNC_EOT);
resp = outputTraceElement(m_output_elem); resp = outputTraceElement(m_output_elem);
return resp; return resp;
} }
@ -115,6 +117,7 @@ ocsd_datapath_resp_t TrcPktDecodePtm::onEOT()
ocsd_datapath_resp_t TrcPktDecodePtm::onReset() ocsd_datapath_resp_t TrcPktDecodePtm::onReset()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
m_unsync_info = UNSYNC_RESET_DECODER;
resetDecoder(); resetDecoder();
return resp; return resp;
} }
@ -191,6 +194,7 @@ void TrcPktDecodePtm::initDecoder()
m_instr_info.pe_type.profile = profile_Unknown; m_instr_info.pe_type.profile = profile_Unknown;
m_instr_info.pe_type.arch = ARCH_UNKNOWN; m_instr_info.pe_type.arch = ARCH_UNKNOWN;
m_instr_info.dsb_dmb_waypoints = 0; m_instr_info.dsb_dmb_waypoints = 0;
m_unsync_info = UNSYNC_INIT_DECODER;
resetDecoder(); resetDecoder();
} }
@ -504,11 +508,15 @@ ocsd_datapath_resp_t TrcPktDecodePtm::processAtomRange(const ocsd_atm_val A, con
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
bool bWPFound = false; bool bWPFound = false;
std::ostringstream oss; std::ostringstream oss;
ocsd_err_t err = OCSD_OK;
m_instr_info.instr_addr = m_curr_pe_state.instr_addr; m_instr_info.instr_addr = m_curr_pe_state.instr_addr;
m_instr_info.isa = m_curr_pe_state.isa; m_instr_info.isa = m_curr_pe_state.isa;
ocsd_err_t err = traceInstrToWP(bWPFound,traceWPOp,nextAddrMatch); // set type (which resets out-elem) before traceInstrToWP modifies out-elem values
m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
err = traceInstrToWP(bWPFound,traceWPOp,nextAddrMatch);
if(err != OCSD_OK) if(err != OCSD_OK)
{ {
if(err == OCSD_ERR_UNSUPPORTED_ISA) if(err == OCSD_ERR_UNSUPPORTED_ISA)
@ -576,7 +584,6 @@ ocsd_datapath_resp_t TrcPktDecodePtm::processAtomRange(const ocsd_atm_val A, con
break; break;
} }
m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
m_output_elem.setLastInstrInfo((A == ATOM_E),m_instr_info.type, m_instr_info.sub_type,m_instr_info.instr_size); m_output_elem.setLastInstrInfo((A == ATOM_E),m_instr_info.type, m_instr_info.sub_type,m_instr_info.instr_size);
m_output_elem.setISA(m_curr_pe_state.isa); m_output_elem.setISA(m_curr_pe_state.isa);
if(m_curr_packet_in->hasCC()) if(m_curr_packet_in->hasCC())
@ -595,7 +602,6 @@ ocsd_datapath_resp_t TrcPktDecodePtm::processAtomRange(const ocsd_atm_val A, con
if(m_output_elem.st_addr != m_output_elem.en_addr) if(m_output_elem.st_addr != m_output_elem.en_addr)
{ {
// some trace before we were out of memory access range // some trace before we were out of memory access range
m_output_elem.setType(OCSD_GEN_TRC_ELEM_INSTR_RANGE);
m_output_elem.setLastInstrInfo(true,m_instr_info.type, m_instr_info.sub_type,m_instr_info.instr_size); m_output_elem.setLastInstrInfo(true,m_instr_info.type, m_instr_info.sub_type,m_instr_info.instr_size);
m_output_elem.setISA(m_curr_pe_state.isa); m_output_elem.setISA(m_curr_pe_state.isa);
m_output_elem.setLastInstrCond(m_instr_info.is_conditional); m_output_elem.setLastInstrCond(m_instr_info.is_conditional);

6
decoder/source/stm/trc_pkt_decode_stm.cpp
View File

@ -68,6 +68,7 @@ ocsd_datapath_resp_t TrcPktDecodeStm::processPacket()
{ {
case NO_SYNC: case NO_SYNC:
m_output_elem.setType(OCSD_GEN_TRC_ELEM_NO_SYNC); m_output_elem.setType(OCSD_GEN_TRC_ELEM_NO_SYNC);
m_output_elem.setUnSyncEOTReason(m_unsync_info);
resp = outputTraceElement(m_output_elem); resp = outputTraceElement(m_output_elem);
m_curr_state = WAIT_SYNC; m_curr_state = WAIT_SYNC;
break; break;
@ -90,6 +91,7 @@ ocsd_datapath_resp_t TrcPktDecodeStm::onEOT()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE); m_output_elem.setType(OCSD_GEN_TRC_ELEM_EO_TRACE);
m_output_elem.setUnSyncEOTReason(UNSYNC_EOT);
resp = outputTraceElement(m_output_elem); resp = outputTraceElement(m_output_elem);
return resp; return resp;
} }
@ -97,6 +99,7 @@ ocsd_datapath_resp_t TrcPktDecodeStm::onEOT()
ocsd_datapath_resp_t TrcPktDecodeStm::onReset() ocsd_datapath_resp_t TrcPktDecodeStm::onReset()
{ {
ocsd_datapath_resp_t resp = OCSD_RESP_CONT; ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
m_unsync_info = UNSYNC_RESET_DECODER;
resetDecoder(); resetDecoder();
return resp; return resp;
} }
@ -127,7 +130,7 @@ void TrcPktDecodeStm::initDecoder()
// base decoder state - STM requires no memory and instruction decode. // base decoder state - STM requires no memory and instruction decode.
setUsesMemAccess(false); setUsesMemAccess(false);
setUsesIDecode(false); setUsesIDecode(false);
m_unsync_info = UNSYNC_INIT_DECODER;
resetDecoder(); resetDecoder();
} }
@ -166,6 +169,7 @@ ocsd_datapath_resp_t TrcPktDecodeStm::decodePacket(bool &bPktDone)
case STM_PKT_BAD_SEQUENCE: /**< Incorrect protocol sequence */ case STM_PKT_BAD_SEQUENCE: /**< Incorrect protocol sequence */
case STM_PKT_RESERVED: case STM_PKT_RESERVED:
resp = OCSD_RESP_FATAL_INVALID_DATA; resp = OCSD_RESP_FATAL_INVALID_DATA;
m_unsync_info = UNSYNC_BAD_PACKET;
case STM_PKT_NOTSYNC: case STM_PKT_NOTSYNC:
resetDecoder(); resetDecoder();
break; break;

14
decoder/source/trc_component.cpp
View File

@ -41,7 +41,13 @@ class errLogAttachMonitor : public IComponentAttachNotifier
{ {
m_pComp = 0; m_pComp = 0;
}; };
virtual ~ errLogAttachMonitor() {}; virtual ~ errLogAttachMonitor()
{
if (m_pComp)
m_pComp->getErrorLogAttachPt()->set_notifier(0);
m_pComp = 0;
};
virtual void attachNotify(const int num_attached) virtual void attachNotify(const int num_attached)
{ {
if(m_pComp) if(m_pComp)
@ -73,6 +79,8 @@ TraceComponent::TraceComponent(const std::string &name, int instIDNum)
TraceComponent::~TraceComponent() TraceComponent::~TraceComponent()
{ {
if (m_pErrAttachMon)
delete m_pErrAttachMon;
} }
void TraceComponent::Init(const std::string &name) void TraceComponent::Init(const std::string &name)
@ -140,9 +148,7 @@ void TraceComponent::updateErrorLogLevel()
ocsd_err_t TraceComponent::setComponentOpMode(uint32_t op_flags) ocsd_err_t TraceComponent::setComponentOpMode(uint32_t op_flags)
{ {
if( (~m_supported_op_flags & op_flags) != 0) m_op_flags = op_flags & m_supported_op_flags;
return OCSD_ERR_INVALID_PARAM_VAL;
m_op_flags = op_flags;
return OCSD_OK; return OCSD_OK;
} }

24
decoder/source/trc_core_arch_map.cpp
View File

@ -34,10 +34,12 @@
#include "common/trc_core_arch_map.h" #include "common/trc_core_arch_map.h"
static struct _ap_map_elements { typedef struct _ap_map_elements {
const char *name; const char *name;
ocsd_arch_profile_t ap; ocsd_arch_profile_t ap;
} ap_map_array[] = } ap_map_elem_t;
static ap_map_elem_t ap_map_array[] =
{ {
{ "Cortex-A77", { ARCH_V8r3, profile_CortexA } }, { "Cortex-A77", { ARCH_V8r3, profile_CortexA } },
{ "Cortex-A76", { ARCH_V8r3, profile_CortexA } }, { "Cortex-A76", { ARCH_V8r3, profile_CortexA } },
@ -70,12 +72,28 @@ static struct _ap_map_elements {
{ "Cortex-M4", { ARCH_V7, profile_CortexM } } { "Cortex-M4", { ARCH_V7, profile_CortexM } }
}; };
static ap_map_elem_t arch_map_array[] =
{
{ "ARMv7-A", { ARCH_V7, profile_CortexA } },
{ "ARMv7-R", { ARCH_V7, profile_CortexR } },
{ "ARMv7-M", { ARCH_V7, profile_CortexM } },
{ "ARMv8-A", { ARCH_V8, profile_CortexA } },
{ "ARMv8.3-A", { ARCH_V8r3, profile_CortexA } },
{ "ARMv8-R", { ARCH_V8, profile_CortexR } },
{ "ARMv8-M", { ARCH_V8, profile_CortexM } },
};
CoreArchProfileMap::CoreArchProfileMap() CoreArchProfileMap::CoreArchProfileMap()
{ {
for(unsigned i = 0; i < sizeof(ap_map_array)/sizeof(_ap_map_elements); i++) unsigned i;
for (i = 0; i < sizeof(ap_map_array) / sizeof(_ap_map_elements); i++)
{ {
core_profiles[ap_map_array[i].name] = ap_map_array[i].ap; core_profiles[ap_map_array[i].name] = ap_map_array[i].ap;
} }
for (i = 0; i < sizeof(arch_map_array) / sizeof(_ap_map_elements); i++)
{
arch_profiles[arch_map_array[i].name] = arch_map_array[i].ap;
}
} }
/* End of File trc_core_arch_map.cpp */ /* End of File trc_core_arch_map.cpp */

27
decoder/source/trc_gen_elem.cpp
View File

@ -46,6 +46,7 @@ static const char *s_elem_descs[][2] =
{"OCSD_GEN_TRC_ELEM_EO_TRACE","End of the available trace in the buffer."}, {"OCSD_GEN_TRC_ELEM_EO_TRACE","End of the available trace in the buffer."},
{"OCSD_GEN_TRC_ELEM_PE_CONTEXT","PE status update / change (arch, ctxtid, vmid etc)."}, {"OCSD_GEN_TRC_ELEM_PE_CONTEXT","PE status update / change (arch, ctxtid, vmid etc)."},
{"OCSD_GEN_TRC_ELEM_INSTR_RANGE","Traced N consecutive instructions from addr (no intervening events or data elements), may have data assoc key"}, {"OCSD_GEN_TRC_ELEM_INSTR_RANGE","Traced N consecutive instructions from addr (no intervening events or data elements), may have data assoc key"},
{"OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH","Traced N instructions in a range, but incomplete information as to program execution path from start to end of range"},
{"OCSD_GEN_TRC_ELEM_ADDR_NACC","Tracing in inaccessible memory area."}, {"OCSD_GEN_TRC_ELEM_ADDR_NACC","Tracing in inaccessible memory area."},
{"OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN","Tracing unknown address area."}, {"OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN","Tracing unknown address area."},
{"OCSD_GEN_TRC_ELEM_EXCEPTION","Exception"}, {"OCSD_GEN_TRC_ELEM_EXCEPTION","Exception"},
@ -62,7 +63,8 @@ static const char *instr_type[] = {
"BR ", "BR ",
"iBR ", "iBR ",
"ISB ", "ISB ",
"DSB.DMB" "DSB.DMB",
"WFI.WFE"
}; };
#define T_SIZE (sizeof(instr_type) / sizeof(const char *)) #define T_SIZE (sizeof(instr_type) / sizeof(const char *))
@ -94,10 +96,20 @@ static const char *s_isa_str[] = {
"Unk" /**< ISA not yet known */ "Unk" /**< ISA not yet known */
}; };
static const char *s_unsync_reason[] = {
"undefined", // UNSYNC_UNKNOWN - unknown /undefined
"init-decoder", // UNSYNC_INIT_DECODER - decoder intialisation - start of trace.
"reset-decoder", // UNSYNC_RESET_DECODER - decoder reset.
"overflow", // UNSYNC_OVERFLOW - overflow packet - need to re-sync
"discard", // UNSYNC_DISCARD - specl trace discard - need to re-sync
"bad-packet", // UNSYNC_BAD_PACKET - bad packet at input - resync to restart.
"end-of-trace", // UNSYNC_EOT - end of trace info.
};
void OcsdTraceElement::toString(std::string &str) const void OcsdTraceElement::toString(std::string &str) const
{ {
std::ostringstream oss; std::ostringstream oss;
int num_str = ((sizeof(s_elem_descs) / sizeof(const char *)) / 2); int num_str = sizeof(s_elem_descs) / sizeof(s_elem_descs[0]);
int typeIdx = (int)this->elem_type; int typeIdx = (int)this->elem_type;
if(typeIdx < num_str) if(typeIdx < num_str)
{ {
@ -122,6 +134,11 @@ void OcsdTraceElement::toString(std::string &str) const
oss << " 0x" << std::hex << st_addr << " "; oss << " 0x" << std::hex << st_addr << " ";
break; break;
case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH:
oss << "first 0x" << std::hex << st_addr << ":[next 0x" << en_addr << "] ";
oss << "num_i(" << std::dec << num_instr_range << ") ";
break;
case OCSD_GEN_TRC_ELEM_EXCEPTION: case OCSD_GEN_TRC_ELEM_EXCEPTION:
if (excep_ret_addr == 1) if (excep_ret_addr == 1)
{ {
@ -167,6 +184,12 @@ void OcsdTraceElement::toString(std::string &str) const
oss << " Numbered:" << std::dec << trace_event.ev_number << "; "; oss << " Numbered:" << std::dec << trace_event.ev_number << "; ";
break; break;
case OCSD_GEN_TRC_ELEM_EO_TRACE:
case OCSD_GEN_TRC_ELEM_NO_SYNC:
if (unsync_eot_info <= UNSYNC_EOT)
oss << " [" << s_unsync_reason[unsync_eot_info] << "]";
break;
default: break; default: break;
} }
if(has_cc) if(has_cc)

75
decoder/tests/auto-fdo/autofdo.md
View File

@ -99,6 +99,8 @@ You can include these backports in your kernel by either merging the
appropriate branch using git or generating patches (using `git appropriate branch using git or generating patches (using `git
format-patch`). format-patch`).
For 5.x based kernel onwards, the only patch which needs to be applied is the one enabling strobing - etm4x: `Enable strobing of ETM`.
For 4.9 based kernels, use the `coresight-4.9-etr-etm_strobe` branch: For 4.9 based kernels, use the `coresight-4.9-etr-etm_strobe` branch:
``` ```
@ -129,7 +131,7 @@ git am /output/dir/*.patch # or patch -p1 /output/dir/*.patch if not using git
The CoreSight trace drivers must also be enabled in the kernel The CoreSight trace drivers must also be enabled in the kernel
configuration. This can be done using the configuration menu (`make configuration. This can be done using the configuration menu (`make
menuconfig`), selecting `Kernel hacking` / `CoreSight Tracing Support` and menuconfig`), selecting `Kernel hacking` / `arm64 Debugging` /`CoreSight Tracing Support` and
enabling all options, or by setting the following in the configuration enabling all options, or by setting the following in the configuration
file: file:
@ -165,11 +167,15 @@ CoreSight devices, you should find the devices in sysfs:
``` ```
# ls /sys/bus/coresight/devices/ # ls /sys/bus/coresight/devices/
28440000.etm 28540000.etm 28640000.etm 28740000.etm etm0 etm2 etm4 etm6 funnel0 funnel2 funnel4 stm0 tmc_etr0
28c03000.funnel 28c04000.etf 28c05000.replicator 28c06000.etr etm1 etm3 etm5 etm7 funnel1 funnel3 replicator0 tmc_etf0
28c07000.tpiu
``` ```
The naming convention for etm devices can be different according to the kernel version you're using.
For more information about the naming scheme, please check out the [Linux Kernel Documentation](https://www.kernel.org/doc/html/latest/trace/coresight/coresight.html#device-naming-scheme)
If `/sys/bus/coresight/devices/` is empty, you may want to check out your Kernel configuration to make sure your .config file is including CoreSight dependencies, such as the clock.
### Perf tools ### Perf tools
The perf tool is used to capture execution trace, configuring the trace The perf tool is used to capture execution trace, configuring the trace
@ -180,9 +186,12 @@ Arm recommends to use the perf version corresponding to the kernel running
on the target. This can be built from the same kernel sources with on the target. This can be built from the same kernel sources with
``` ```
make -C tools/perf ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make -C tools/perf CORESIGHT=1 VF=1 ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-
``` ```
When specifying CORESIGHT=1, perf will be built using the installed OpenCSD library.
If you are cross compiling, then additional setup is required to ensure the build process links against the correct version of the library.
If the post-processing (`perf inject`) of the captured data is not being If the post-processing (`perf inject`) of the captured data is not being
done on the target, then the OpenCSD library is not required for this build done on the target, then the OpenCSD library is not required for this build
of perf. of perf.
@ -193,13 +202,22 @@ also be restricted to user space or kernel space with 'u' or 'k'
parameters. For example: parameters. For example:
``` ```
perf record -e cs_etm/@28c06000.etr/u --per-thread -- /bin/ls perf record -e cs_etm/@tmc_etr0/u --per-thread -- /bin/ls
``` ```
Will record the userspace execution of '/bin/ls' into the ETR located at Will record the userspace execution of '/bin/ls' using tmc_etr0 as sink.
0x28c06000. Note the `--per-thread` option is required - perf currently
only supports trace of a single thread of execution. CPU wide trace is a ## Capturing modes
work in progresss.
You can trace a single-threaded program in two different ways:
1. By specifying `--per-thread`, and in this case the CoreSight subsystem will
record only a trace relative to the given program.
2. By NOT specifying `--per-thread`, and in this case CPU-wide tracing will
be enabled. In this scenario the trace will contain both the target program trace
and other workloads that were executing on the same CPU
## Processing trace and profiles ## Processing trace and profiles
@ -241,26 +259,42 @@ For example, a typical configuration is to use a window size of 5000 cycles
and a period of 10000 - this will collect 5000 cycles of trace every 50M and a period of 10000 - this will collect 5000 cycles of trace every 50M
cycles. With these proof-of-concept patches, the strobe parameters are cycles. With these proof-of-concept patches, the strobe parameters are
configured via sysfs - each ETM will have `strobe_window` and configured via sysfs - each ETM will have `strobe_window` and
`strobe_period` parameters in `/sys/bus/coresight/devices/NNNNNNNN.etm` and `strobe_period` parameters in `/sys/bus/coresight/devices/<sink>` and
these values will have to be written to each (In a future version, this these values will have to be written to each (In a future version, this
will be integrated into the drivers and perf tool). The `record.sh` will be integrated into the drivers and perf tool).
script in this directory [`<opencsd>/decoder/tests/auto-fdo`] automates this process. The `set_strobing.sh` script in this directory [`<opencsd>/decoder/tests/auto-fdo`] automates this process.
To collect trace from an application using ETM strobing, run: To collect trace from an application using ETM strobing, run:
``` ```
taskset -c 0 ./record.sh --strobe 5000 10000 28c06000.etr ./my_application arg1 arg2 sudo ./set_strobing.sh 5000 10000
perf record -e cs_etm/@tmc_etr0/u --per-thread -- <your app>"
``` ```
The taskset command is used to ensure the process stays on the same CPU
during execution.
The raw trace can be examined using the `perf report` command: The raw trace can be examined using the `perf report` command:
``` ```
perf report -D -i perf.data --stdio perf report -D -i perf.data --stdio
``` ```
Perf needs to be built from your linux kernel version souce code repository against the OpenCSD library in order to be able to properly read ETM-gathered samples and post-process them.
If running `perf report` produces an error like:
```
0x1f8 [0x268]: failed to process type: 70 [Operation not permitted]
Error:
failed to process sample
```
or
```
"file uses a more recent and unsupported ABI (8 bytes extra). incompatible file format".
```
You are probably using a perf version which is not using this library: please make sure to install this project in your system by either compiling it from [Source Code]( <https://github.com/Linaro/OpenCSD>) from v0.9.1 or later and compile perf using this library.
Otherwise, this project is packaged for debian (install the libopencsd0, libopencsd-dev packages).
For example: For example:
``` ```
@ -295,6 +329,8 @@ an embedded target). The `perf inject` command
decodes the execution trace and generates periodic instruction samples, decodes the execution trace and generates periodic instruction samples,
with branch histories: with branch histories:
!! Careful: if you are using a device different than the one used to collect the profiling data,
you'll need to run `perf buildid-cache` as described below.
``` ```
perf inject -i perf.data -o inj.data --itrace=i100000il perf inject -i perf.data -o inj.data --itrace=i100000il
``` ```
@ -393,7 +429,8 @@ clang -O2 -fprofile-sample-use=program.llvmprof -o program program.c
The basic commands to run an application and create a compiler profile are: The basic commands to run an application and create a compiler profile are:
``` ```
taskset -c 0 ./record.sh --strobe 5000 10000 28c06000.etr ./my_application arg1 arg2 sudo ./set_strobing.sh 5000 10000
perf record -e cs_etm/@tmc_etr0/u --per-thread -- <your app>"
perf inject -i perf.data -o inj.data --itrace=i100000il perf inject -i perf.data -o inj.data --itrace=i100000il
create_llvm_prof -binary=/path/to/binary -profile=inj.data -out=program.llvmprof create_llvm_prof -binary=/path/to/binary -profile=inj.data -out=program.llvmprof
``` ```

68
decoder/tests/auto-fdo/record.sh
View File

@ -1,68 +0,0 @@
#!/bin/sh
BUFFER_ETF_A53=ec802000.etf
BUFFER_ETF_A73=ed002000.etf
BUFFER_ETF_SYS=ec036000.etf
BUFFER_ETR=ec033000.etr
OUT_FILE=perf.data
STROBE=
while :; do
case $1 in
--strobe)
STROBE=y
WINDOW=$2
PERIOD=$3
shift 3
;;
*)
break ;;
esac
done
case $1 in
etr)
BUFFER=$BUFFER_ETR
;;
etf-sys)
BUFFER=$BUFFER_ETF_SYS
;;
"")
BUFFER=$BUFFER_ETR
;;
*)
BUFFER=$1
;;
esac
shift 1
case $0 in
/*) F=$0 ;;
*) F=$(pwd)/$0 ;;
esac
SCRIPT_DIR=$(dirname $F)
if [ "$STROBE" ]; then
for e in /sys/bus/coresight/devices/*.etm/; do
printf "%x" $WINDOW | sudo tee $e/strobe_window > /dev/null
printf "%x" $PERIOD | sudo tee $e/strobe_period > /dev/null
done
fi
PERF=$SCRIPT_DIR/perf
export LD_LIBRARY_PATH=$SCRIPT_DIR:$LD_LIBRARY_PATH
sudo LD_LIBRARY_PATH=$SCRIPT_DIR:$LD_LIBRARY_PATH $PERF record $PERF_ARGS -e cs_etm/@$BUFFER/u --per-thread "$@"
sudo chown $(id -u):$(id -g) $OUT_FILE

29
decoder/tests/auto-fdo/set_strobing.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/bash
WINDOW=$1
PERIOD=$2
if [[ -z $WINDOW ]] || [[ -z $PERIOD ]]; then
echo "Window or Period not specified!"
echo "Example usage: ./set_strobing.sh <WINDOW VALUE> <PERIOD VALUE>"
echo "Example usage: ./set_strobing.sh 5000 10000"
exit -1
fi
if [[ $EUID != 0 ]]; then
echo "Please run as root"
exit -1
fi
for e in /sys/bus/coresight/devices/etm*/; do
printf "%x" $WINDOW | tee $e/strobe_window > /dev/null
printf "%x" $PERIOD | tee $e/strobe_period > /dev/null
echo "Strobing period for $e set to $((`cat $e/strobe_period`))"
echo "Strobing window for $e set to $((`cat $e/strobe_window`))"
done
## Shows the user a simple usage example
echo ">> Done! <<"
echo "You can now run perf to trace your application, for example:"
echo "perf record -e cs_etm/@tmc_etr0/u -- <your app>"

6
decoder/tests/auto-fdo/show_strobing.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/bash
for e in /sys/bus/coresight/devices/etm*/; do
echo "Strobing period for $e is $((`cat $e/strobe_period`))"
echo "Strobing window for $e is $((`cat $e/strobe_window`))"
done

29
decoder/tests/perf-test-scripts/perf-setup-env.bash
View File

@ -5,35 +5,44 @@
# #
# to use this script:- # to use this script:-
# #
# 1) for perf exec env only
# source perf-setup-env.bash # source perf-setup-env.bash
# #
# 2) for perf build and exec env
# source perf-setup-env.bash buildenv
#
#------ User Edits Start ------- #------ User Edits Start -------
# Edit as required for user system. # Edit as required for user system.
# Root of the opencsd library project as cloned from github # Root of the opencsd library project as cloned from github
export OPENCSD_ROOT=~/OpenCSD/opencsd-github/opencsd export OPENCSD_ROOT=~/work/opencsd-master
# the opencsd build library directory to use. # the opencsd build library directory to use.
export OCSD_LIB_DIR=lib/linux64/rel export OCSD_LIB_DIR=lib/builddir
# the root of the perf branch / perf dev-tree as checked out # the root of the perf branch / perf dev-tree as checked out
export PERF_ROOT=~/work2/perf-opencsd/mp-4.7-rc4/coresight export PERF_ROOT=~/work/kernel-dev
# the arm x-compiler toolchain path # the arm x-compiler toolchain path
export XTOOLS_PATH=~/work2/toolchain-aarch64/gcc-linaro-4.9-2015.05-1-rc1-x86_64_aarch64-linux-gnu/bin/ export XTOOLS_PATH=~/work/gcc-x-aarch64-6.2/bin
#------ User Edits End ------- #------ User Edits End -------
# path to source/include root dir - used by perf build to # path to source/include root dir - used by perf build to
# include Opencsd decoder. # include Opencsd decoder.
export CSTRACE_PATH=${OPENCSD_ROOT}/decoder
# add library to lib path if [ "$1" == "buildenv" ]; then
if [ "${LD_LIBRARY_PATH}" == "" ]; then export CSTRACE_PATH=${OPENCSD_ROOT}/decoder
export LD_LIBRARY_PATH=${CSTRACE_PATH}/${OCSD_LIB_DIR} export CSLIBS=${CSTRACE_PATH}/${OCSD_LIB_DIR}
else export CSINCLUDES=${CSTRACE_PATH}/include
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CSTRACE_PATH}/${OCSD_LIB_DIR}
# add library to lib path
if [ "${LD_LIBRARY_PATH}" == "" ]; then
export LD_LIBRARY_PATH=${CSLIBS}
else
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CSLIBS}
fi
fi fi
# perf script defines # perf script defines

54
decoder/tests/run_capi_test.bash Executable file
View File

@ -0,0 +1,54 @@
#!/bin/bash
#################################################################################
# Copyright 2018 ARM. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its contributors
# may be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#################################################################################
# OpenCSD library: Test script.
#
# Test script to run packet lister on each of the snapshots retained with the repository.
# No attempt is made to compare output results to previous versions, (output formatting
# may change due to bugfix / enhancements) or assess the validity of the trace output.
#
#################################################################################
OUT_DIR=./results
SNAPSHOT_DIR=./snapshots
BIN_DIR=./bin/linux64/rel
echo "Running trc_pkt_lister on snapshot directories."
mkdir -p ${OUT_DIR}
# === test the decode set ===
export LD_LIBRARY_PATH=${BIN_DIR}/.
# === test the C-API lib ===
echo "Testing C-API"
${BIN_DIR}/c_api_pkt_print_test -ss_path ${SNAPSHOT_DIR} -decode
mv ./c_api_test.log ./${OUT_DIR}/c_api_test.ppl

44
decoder/tests/run_pkt_decode_tests.bash
View File

@ -35,10 +35,20 @@
# may change due to bugfix / enhancements) or assess the validity of the trace output. # may change due to bugfix / enhancements) or assess the validity of the trace output.
# #
################################################################################# #################################################################################
# Usage options:-
# * default: run tests on binary + libs in ./bin/linux64/rel
# run_pkt_decode_tests.bash
#
# * use installed opencsd libraries & program
# run_pkt_decode_tests.bash use-installed
#
# * use supplied path for binary + libs (must have trailing /)
# run_pkt_decode_tests.bash <custom>/<path>/
#
OUT_DIR=./results OUT_DIR=./results
SNAPSHOT_DIR=./snapshots SNAPSHOT_DIR=./snapshots
BIN_DIR=./bin/linux64/rel BIN_DIR=./bin/linux64/rel/
# directories for tests using full decode # directories for tests using full decode
declare -a test_dirs_decode=( "juno-ret-stck" declare -a test_dirs_decode=( "juno-ret-stck"
@ -62,17 +72,41 @@ echo "Running trc_pkt_lister on snapshot directories."
mkdir -p ${OUT_DIR} mkdir -p ${OUT_DIR}
# === test the decode set === if [ "$1" == "use-installed" ]; then
export LD_LIBRARY_PATH=${BIN_DIR}/. BIN_DIR=""
elif [ "$1" != "" ]; then
BIN_DIR=$1
fi
echo "Tests using BIN_DIR = ${BIN_DIR}"
if [ "${BIN_DIR}" != "" ]; then
export LD_LIBRARY_PATH=${BIN_DIR}.
echo "LD_LIBRARY_PATH set to ${BIN_DIR}"
fi
# === test the decode set ===
for test_dir in "${test_dirs_decode[@]}" for test_dir in "${test_dirs_decode[@]}"
do do
echo "Testing $test_dir..." echo "Testing $test_dir..."
${BIN_DIR}/trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/$test_dir" -decode -logfilename "${OUT_DIR}/$test_dir.ppl" ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/$test_dir" -decode -logfilename "${OUT_DIR}/$test_dir.ppl"
echo "Done : Return $?" echo "Done : Return $?"
done done
# === test a packet only example ===
echo "Testing init-short-addr..."
${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/init-short-addr" -pkt_mon -logfilename "${OUT_DIR}/init-short-addr.ppl"
# === test the TPIU deformatter === # === test the TPIU deformatter ===
echo "Testing a55-test-tpiu..." echo "Testing a55-test-tpiu..."
${BIN_DIR}/trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/a55-test-tpiu" -dstream_format -o_raw_packed -o_raw_unpacked -logfilename "${OUT_DIR}/a55-test-tpiu.ppl" ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/a55-test-tpiu" -dstream_format -o_raw_packed -o_raw_unpacked -logfilename "${OUT_DIR}/a55-test-tpiu.ppl"
echo "Done : Return $?" echo "Done : Return $?"
# === test the C-API lib - this test prog is not installed ===
if [ "$1" != "use-installed" ]; then
echo "Testing C-API library"
${BIN_DIR}c_api_pkt_print_test -ss_path ${SNAPSHOT_DIR} -decode > /dev/null
echo "Done : Return $?"
echo "moving result file."
mv ./c_api_test.log ./${OUT_DIR}/c_api_test.ppl
fi

15
decoder/tests/snapshots/Snowball/cpu_0.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_0
class=core
type=Cortex-A9
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

15
decoder/tests/snapshots/Snowball/cpu_1.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_1
class=core
type=Cortex-A9
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

BIN
decoder/tests/snapshots/Snowball/cstrace.bin Normal file
View File

Binary file not shown.

10
decoder/tests/snapshots/Snowball/device_2.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=PTM_0
class=trace_source
type=PTM1.0
[regs]
ETMCR(0x000)=0x10001000
ETMIDR(0x079)=0x411CF301
ETMCCER(0x07A)=0x000008EA
ETMTRACEIDR(0x080)=0x00000010

10
decoder/tests/snapshots/Snowball/device_3.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=PTM_1
class=trace_source
type=PTM1.0
[regs]
ETMCR(0x000)=0x10001000
ETMIDR(0x079)=0x411CF301
ETMCCER(0x07A)=0x000008EA
ETMTRACEIDR(0x080)=0x00000011

BIN
decoder/tests/snapshots/Snowball/kernel_dump.bin Normal file
View File

Binary file not shown.

11
decoder/tests/snapshots/Snowball/snapshot.ini Normal file
View File

@ -0,0 +1,11 @@
[snapshot]
version=1.0
[device_list]
device0=cpu_0.ini
device1=cpu_1.ini
device2=device_2.ini
device3=device_3.ini
[trace]
metadata=trace.ini

16
decoder/tests/snapshots/Snowball/trace.ini Normal file
View File

@ -0,0 +1,16 @@
[trace_buffers]
buffers=buffer0
[buffer0]
name=ETB_0
file=cstrace.bin
format=coresight
[source_buffers]
PTM_0=ETB_0
PTM_1=ETB_0
[core_trace_sources]
cpu_0=PTM_0
cpu_1=PTM_1

15
decoder/tests/snapshots/TC2/cpu_0.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_0
class=core
type=Cortex-A7
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

15
decoder/tests/snapshots/TC2/cpu_1.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_1
class=core
type=Cortex-A7
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

15
decoder/tests/snapshots/TC2/cpu_2.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_2
class=core
type=Cortex-A7
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

15
decoder/tests/snapshots/TC2/cpu_3.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_3
class=core
type=Cortex-A15
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

15
decoder/tests/snapshots/TC2/cpu_4.ini Normal file
View File

@ -0,0 +1,15 @@
[device]
name=cpu_4
class=core
type=Cortex-A15
[regs]
R15=0xC0008000
R13=0
CPSR=0x1D3
[dump]
file=kernel_dump.bin
address=0xC0008000
length=0x00050000

BIN
decoder/tests/snapshots/TC2/cstrace.bin Normal file
View File

Binary file not shown.

7
decoder/tests/snapshots/TC2/device_10.ini Normal file
View File

@ -0,0 +1,7 @@
[device]
name=ITM_0
class=trace_source
type=ITM
[regs]
ITM_CTRL(0x3A0)=0x00200006

10
decoder/tests/snapshots/TC2/device_5.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=ETM_0
class=trace_source
type=ETM3.5
[regs]
ETMCR(0x000)=0x10001860
ETMIDR(0x079)=0x410CF250
ETMCCER(0x07A)=0x344008F2
ETMTRACEIDR(0x080)=0x00000010

10
decoder/tests/snapshots/TC2/device_6.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=ETM_1
class=trace_source
type=ETM3.5
[regs]
ETMCR(0x000)=0x10001860
ETMIDR(0x079)=0x410CF250
ETMCCER(0x07A)=0x344008F2
ETMTRACEIDR(0x080)=0x00000011

10
decoder/tests/snapshots/TC2/device_7.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=ETM_2
class=trace_source
type=ETM3.5
[regs]
ETMCR(0x000)=0x10001860
ETMIDR(0x079)=0x410CF250
ETMCCER(0x07A)=0x344008F2
ETMTRACEIDR(0x080)=0x00000012

10
decoder/tests/snapshots/TC2/device_8.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=PTM_0
class=trace_source
type=PTM1.1
[regs]
ETMCR(0x000)=0x10001000
ETMIDR(0x079)=0x411CF312
ETMCCER(0x07A)=0x34C01AC2
ETMTRACEIDR(0x080)=0x00000013

10
decoder/tests/snapshots/TC2/device_9.ini Normal file
View File

@ -0,0 +1,10 @@
[device]
name=PTM_1
class=trace_source
type=PTM1.1
[regs]
ETMCR(0x000)=0x10001000
ETMIDR(0x079)=0x411CF312
ETMCCER(0x07A)=0x34C01AC2
ETMTRACEIDR(0x080)=0x00000014

7518
decoder/tests/snapshots/TC2/ds5-dumps/etmv3_0x10.txt Normal file
View File

File diff suppressed because it is too large Load Diff

7728
decoder/tests/snapshots/TC2/ds5-dumps/etmv3_0x11.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2001
decoder/tests/snapshots/TC2/ds5-dumps/etmv3_0x12.txt Normal file
View File

File diff suppressed because it is too large Load Diff

9913
decoder/tests/snapshots/TC2/ds5-dumps/ptmv1_0x13.txt Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
decoder/tests/snapshots/TC2/kernel_dump.bin Normal file
View File

Binary file not shown.

3576
decoder/tests/snapshots/TC2/pkt_proc_logs/trc_pkt_lister-dcd-0x13.ppl Normal file
View File

File diff suppressed because it is too large Load Diff

1811
decoder/tests/snapshots/TC2/pkt_proc_logs/trc_pkt_lister_0x13.ppl Normal file
View File

File diff suppressed because it is too large Load Diff

20
decoder/tests/snapshots/TC2/snapshot.ini Normal file
View File

@ -0,0 +1,20 @@
[snapshot]
version=1.0
[device_list]
device0=cpu_0.ini
device1=cpu_1.ini
device2=cpu_2.ini
device3=cpu_3.ini
device4=cpu_4.ini
device5=device_5.ini
device6=device_6.ini
device7=device_7.ini
device8=device_8.ini
device9=device_9.ini
device10=device_10.ini
[trace]
metadata=trace.ini

22
decoder/tests/snapshots/TC2/trace.ini Normal file
View File

@ -0,0 +1,22 @@
[trace_buffers]
buffers=buffer0
[buffer0]
name=ETB_0
file=cstrace.bin
format=coresight
[source_buffers]
ETM_0=ETB_0
ETM_1=ETB_0
ETM_2=ETB_0
PTM_0=ETB_0
PTM_1=ETB_0
ITM_0=ETB_0
[core_trace_sources]
cpu_0=ETM_0
cpu_1=ETM_1
cpu_2=ETM_2
cpu_3=PTM_0
cpu_4=PTM_1

BIN
decoder/tests/snapshots/a55-test-tpiu/DSTREAM_0.bin Normal file
View File

Binary file not shown.

1
decoder/tests/snapshots/a55-test-tpiu/README.txt Normal file
View File

@ -0,0 +1 @@
DS-5 Debugger has generated this trace dump data set. The intention is that in a future release the DS-5 Debugger will be able to directly consume this data set. Until then, this data set must be converted into a Snapshot viewer compatible format before it can be used by DS-5 Debugger.

6
decoder/tests/snapshots/a55-test-tpiu/contents.ini Normal file
View File

@ -0,0 +1,6 @@
; CoreSight trace dump
[trace]
metadata=trace.ini
buffer0=DSTREAM_0.bin

451
decoder/tests/snapshots/a55-test-tpiu/device1.ini Normal file
View File

@ -0,0 +1,451 @@
[device]
name=Cortex-A55_0
class=core
type=Cortex-A55
[regs]
X0(size:64)=0x00000000002971C8
X1(size:64)=0x00000000910163E0
X2(size:64)=0x00000000FFD0C1C4
X3(size:64)=0x0000000000345000
X4(size:64)=0x0000000000000004
X5(size:64)=0x00000000FC01EB50
X6(size:64)=0x00000000FC01EB4C
X7(size:64)=0x0000000000000000
X8(size:64)=0x00000000FC01E9C8
X9(size:64)=0xFFFFFFFFFFFFFFFF
X10(size:64)=0x0000000000000006
X11(size:64)=0x0000000000000000
X12(size:64)=0x00000000407FE0FA
X13(size:64)=0x0000000000000000
X14(size:64)=0x0000000000000000
X15(size:64)=0x0000000000000000
X16(size:64)=0x0000000000000000
X17(size:64)=0x0000000000000000
X18(size:64)=0x0000000000000000
X19(size:64)=0x00000000C2800290
X20(size:64)=0x0000000000000000
X21(size:64)=0x0000000000000000
X22(size:64)=0x0000000000000000
X23(size:64)=0x0000000000000000
X24(size:64)=0x0000000000000000
X25(size:64)=0x0000000000000000
X26(size:64)=0x0000000000000000
X27(size:64)=0x0000000000000000
X28(size:64)=0x0000000000000000
X29(size:64)=0x0000000000000000
LR(size:64)=0x00000000FFFEAF48
PC(size:64)=0x00000000FFFEB44C
SP(size:64)=0x00000000FC01EBA0
W0=0x002971C8
W1=0x910163E0
W2=0xFFD0C1C4
W3=0x00345000
W4=0x00000004
W5=0xFC01EB50
W6=0xFC01EB4C
W7=0x00000000
W8=0xFC01E9C8
W9=0xFFFFFFFF
W10=0x00000006
W11=0x00000000
W12=0x407FE0FA
W13=0x00000000
W14=0x00000000
W15=0x00000000
W16=0x00000000
W17=0x00000000
W18=0x00000000
W19=0xC2800290
W20=0x00000000
W21=0x00000000
W22=0x00000000
W23=0x00000000
W24=0x00000000
W25=0x00000000
W26=0x00000000
W27=0x00000000
W28=0x00000000
W29=0x00000000
W30=0xFFFEAF48
B0=0x00000000
B1=0x00000000
B2=0x00000000
B3=0x00000000
B4=0x00000000
B5=0x00000000
B6=0x00000000
B7=0x00000000
B8=0x00000000
B9=0x00000000
B10=0x00000000
B11=0x00000000
B12=0x00000000
B13=0x00000000
B14=0x00000000
B15=0x00000000
B16=0x00000000
B17=0x00000000
B18=0x00000000
B19=0x00000000
B20=0x00000000
B21=0x00000000
B22=0x00000000
B23=0x00000000
B24=0x00000000
B25=0x00000000
B26=0x00000000
B27=0x00000000
B28=0x00000000
B29=0x00000000
B30=0x00000000
B31=0x00000000
D0(size:64)=0x0000000000000000
D1(size:64)=0x0000000000000000
D2(size:64)=0x0000000000000000
D3(size:64)=0x0000000000000000
D4(size:64)=0x0000000000000000
D5(size:64)=0x0000000000000000
D6(size:64)=0x0000000000000000
D7(size:64)=0x0000000000000000
D8(size:64)=0x0000000000000000
D9(size:64)=0x0000000000000000
D10(size:64)=0x0000000000000000
D11(size:64)=0x0000000000000000
D12(size:64)=0x0000000000000000
D13(size:64)=0x0000000000000000
D14(size:64)=0x0000000000000000
D15(size:64)=0x0000000000000000
D16(size:64)=0x0000000000000000
D17(size:64)=0x0000000000000000
D18(size:64)=0x0000000000000000
D19(size:64)=0x0000000000000000
D20(size:64)=0x0000000000000000
D21(size:64)=0x0000000000000000
D22(size:64)=0x0000000000000000
D23(size:64)=0x0000000000000000
D24(size:64)=0x0000000000000000
D25(size:64)=0x0000000000000000
D26(size:64)=0x0000000000000000
D27(size:64)=0x0000000000000000
D28(size:64)=0x0000000000000000
D29(size:64)=0x0000000000000000
D30(size:64)=0x0000000000000000
D31(size:64)=0x0000000000000000
H0=0x00000000
H1=0x00000000
H2=0x00000000
H3=0x00000000
H4=0x00000000
H5=0x00000000
H6=0x00000000
H7=0x00000000
H8=0x00000000
H9=0x00000000
H10=0x00000000
H11=0x00000000
H12=0x00000000
H13=0x00000000
H14=0x00000000
H15=0x00000000
H16=0x00000000
H17=0x00000000
H18=0x00000000
H19=0x00000000
H20=0x00000000
H21=0x00000000
H22=0x00000000
H23=0x00000000
H24=0x00000000
H25=0x00000000
H26=0x00000000
H27=0x00000000
H28=0x00000000
H29=0x00000000
H30=0x00000000
H31=0x00000000
S0=0x00000000
S1=0x00000000
S2=0x00000000
S3=0x00000000
S4=0x00000000
S5=0x00000000
S6=0x00000000
S7=0x00000000
S8=0x00000000
S9=0x00000000
S10=0x00000000
S11=0x00000000
S12=0x00000000
S13=0x00000000
S14=0x00000000
S15=0x00000000
S16=0x00000000
S17=0x00000000
S18=0x00000000
S19=0x00000000
S20=0x00000000
S21=0x00000000
S22=0x00000000
S23=0x00000000
S24=0x00000000
S25=0x00000000
S26=0x00000000
S27=0x00000000
S28=0x00000000
S29=0x00000000
S30=0x00000000
S31=0x00000000
PAR_EL1(size:64)=0x0000000000000800
DBGAUTHSTATUS_EL1=0x000000FF
DBGBCR0_EL1=0x000001E0
DBGBCR1_EL1=0x000001E0
DBGBCR2_EL1=0x000001E0
DBGBCR3_EL1=0x000001E0
DBGBCR4_EL1=0x000001E0
DBGBCR5_EL1=0x000001E0
DBGBVR0_EL1(size:64)=0x0000000000000000
DBGBVR1_EL1(size:64)=0x0000000000000000
DBGBVR2_EL1(size:64)=0x0000000000000000
DBGBVR3_EL1(size:64)=0x0000000000000000
DBGBVR4_EL1(size:64)=0x0000000000000000
DBGBVR5_EL1(size:64)=0x0000000000000000
DBGCLAIMCLR_EL1=0x00000000
DBGCLAIMSET_EL1=0x000000FF
DBGPRCR_EL1=0x00000001
DBGWCR0_EL1=0x00000000
DBGWCR1_EL1=0x00000000
DBGWCR2_EL1=0x00000000
DBGWCR3_EL1=0x00000000
DBGWVR0_EL1(size:64)=0x0000000000000000
DBGWVR1_EL1(size:64)=0x0000000000000000
DBGWVR2_EL1(size:64)=0x0000000000000000
DBGWVR3_EL1(size:64)=0x0000000000000000
MDCCINT_EL1=0x00000000
MDCCSR_EL0=0x00000000
MDCR_EL2=0x00000006
MDCR_EL3=0x00000000
MDRAR_EL1(size:64)=0x0000000410000003
MDSCR_EL1=0x00004000
OSDLR_EL1=0x00000000
OSDTRRX_EL1=0x00000000
OSDTRTX_EL1=0x00000000
OSECCR_EL1=0x00000000
OSLSR_EL1=0x00000008
AFSR0_EL1=0x00000000
AFSR0_EL2=0x00000000
AFSR0_EL3=0x00000000
AFSR1_EL1=0x00000000
AFSR1_EL2=0x00000000
AFSR1_EL3=0x00000000
ESR_EL1=0x00000000
ESR_EL2=0x00000000
ESR_EL3=0x00000000
FAR_EL1(size:64)=0x0000000000000000
FAR_EL2(size:64)=0x0000000000000000
FAR_EL3(size:64)=0x0000000000000000
HPFAR_EL2(size:64)=0x0000000000000000
ISR_EL1=0x00000000
VBAR_EL1(size:64)=0x0000000000000000
VBAR_EL2(size:64)=0x00000000C0007000
VBAR_EL3(size:64)=0x0000000000000000
FPCR=0x00000000
FPSR=0x00000000
MVFR0_EL1=0x00000000
MVFR1_EL1=0x00000000
MVFR2_EL1=0x00000000
ICC_AP0R0_EL1=0x00000000
ICC_AP1R0_EL1=0x00000000
S_ICC_AP1R0_EL1=0x00000000
N_ICC_AP1R0_EL1=0x00000000
ICC_BPR0_EL1=0x00000002
ICC_BPR1_EL1=0x00000003
S_ICC_BPR1_EL1=0x00000002
N_ICC_BPR1_EL1=0x00000003
ICC_CTLR_EL1=0x00004400
S_ICC_CTLR_EL1=0x00004400
N_ICC_CTLR_EL1=0x00004400
ICC_CTLR_EL3=0x00004400
ICC_HPPIR0_EL1=0x000003FF
ICC_HPPIR1_EL1=0x000003FF
ICC_IAR0_EL1=0x000003FF
ICC_IAR1_EL1=0x000003FF
ICC_IGRPEN0_EL1=0x00000000
ICC_IGRPEN1_EL1=0x00000000
S_ICC_IGRPEN1_EL1=0x00000000
N_ICC_IGRPEN1_EL1=0x00000000
ICC_IGRPEN1_EL3=0x00000000
ICC_PMR_EL1=0x00000000
ICC_RPR_EL1=0x000000FF
ICC_SRE_EL1=0x00000007
S_ICC_SRE_EL1=0x00000007
N_ICC_SRE_EL1=0x00000007
ICC_SRE_EL2=0x0000000F
ICC_SRE_EL3=0x0000000F
ICH_AP0R0_EL2=0x00000000
ICH_AP1R0_EL2=0x00000000
ICH_EISR_EL2=0x00000000
ICH_ELRSR_EL2=0x000000FF
ICH_HCR_EL2=0x00000000
ICH_LR0_EL2(size:64)=0x0000000000000000
ICH_LR1_EL2(size:64)=0x0000000000000000
ICH_LR2_EL2(size:64)=0x0000000000000000
ICH_LR3_EL2(size:64)=0x0000000000000000
ICH_LR4_EL2(size:64)=0x0000000000000000
ICH_LR5_EL2(size:64)=0x0000000000000000
ICH_LR6_EL2(size:64)=0x0000000000000000
ICH_LR7_EL2(size:64)=0x0000000000000000
ICH_MISR_EL2=0x00000000
ICH_VMCR_EL2=0x004C0008
ICH_VTR_EL2=0x90580007
AIDR_EL1=0x00000000
CCSIDR_EL1=0x7007E03A
CLIDR_EL1(size:64)=0x000000000B200123
CSSELR_EL1=0x00000000
CTR_EL0=0x8444C004
DCZID_EL0=0x00000004
ID_AA64AFR0_EL1(size:64)=0x0000000000000000
ID_AA64AFR1_EL1(size:64)=0x0000000000000000
ID_AA64DFR0_EL1(size:64)=0x0000000010305407
ID_AA64DFR1_EL1(size:64)=0x0000000000000000
ID_AA64ISAR0_EL1(size:64)=0x0000000010211120
ID_AA64ISAR1_EL1(size:64)=0x0000000000000000
ID_AA64MMFR0_EL1(size:64)=0x0000000000001124
ID_AA64MMFR1_EL1(size:64)=0x0000000001111120
ID_AA64PFR0_EL1(size:64)=0x0000000011001111
ID_AA64PFR1_EL1(size:64)=0x0000000000000000
ID_AFR0_EL1=0x00000000
ID_DFR0_EL1=0x00000000
ID_ISAR0_EL1=0x00000000
ID_ISAR1_EL1=0x00000000
ID_ISAR2_EL1=0x00000000
ID_ISAR3_EL1=0x00000000
ID_ISAR4_EL1=0x00000000
ID_ISAR5_EL1=0x00000000
ID_MMFR0_EL1=0x00000000
ID_MMFR1_EL1=0x00000000
ID_MMFR2_EL1=0x00000000
ID_MMFR3_EL1=0x00000000
ID_MMFR4_EL1=0x00000000
ID_PFR0_EL1=0x00000000
ID_PFR1_EL1=0x00000000
MIDR_EL1=0x420F5160
MPIDR_EL1(size:64)=0x0000000081000000
REVIDR_EL1=0x00000000
VMPIDR_EL2(size:64)=0x0000000080000000
VPIDR_EL2=0x00000000
ACTLR_EL1(size:64)=0x0000000000000000
ACTLR_EL2(size:64)=0x0000000000000000
ACTLR_EL3(size:64)=0x0000000000000000
AMAIR_EL1(size:64)=0x0000000000000000
AMAIR_EL2(size:64)=0x0000000000000000
AMAIR_EL3(size:64)=0x0000000000000000
HACR_EL2=0x00000000
IL1Data0_EL1=0x00000000
IL1Data1_EL1=0x00000000
IL1Data2_EL1=0x00000000
IL1Data3_EL1=0x00000000
DL1Data0_EL1=0x00000000
DL1Data1_EL1=0x00000000
DL1Data2_EL1=0x00000000
DL1Data3_EL1=0x00000000
DL1Data4_EL1=0x00000000
CONTEXTIDR_EL1=0x00000000
MAIR_EL1(size:64)=0x0000000000000000
MAIR_EL2(size:64)=0x00000000FFBB4400
MAIR_EL3(size:64)=0x0000000000000000
TCR_EL1(size:64)=0x0000000080000000
TCR_EL2=0x8081351D
TCR_EL3=0x80800000
TTBR0_EL1(size:64)=0x0000000000000000
TTBR0_EL2(size:64)=0x00000000FFFFD000
TTBR0_EL3(size:64)=0x0000000000000000
TTBR1_EL1(size:64)=0x0000000000000000
VTCR_EL2=0x80000000
VTTBR_EL2(size:64)=0x0000000000000000
CPACR_EL1=0x00000000
SCTLR_EL1=0x30500980
SCTLR_EL2=0x30401805
SCTLR_EL3=0x30C50830
PMCCFILTR_EL0=0x00000000
PMCCNTR_EL0(size:64)=0x0000000000000000
PMCEID0_EL0=0xFBFFEFFF
PMCEID1_EL0=0x0000A07F
PMCNTENCLR_EL0=0x00000000
PMCNTENSET_EL0=0x00000000
PMCR_EL0=0x42003040
PMEVCNTR0_EL0=0x00000000
PMEVCNTR1_EL0=0x00000000
PMEVCNTR2_EL0=0x00000000
PMEVCNTR3_EL0=0x00000000
PMEVCNTR4_EL0=0x00000000
PMEVCNTR5_EL0=0x00000000
PMEVTYPER0_EL0=0x00000000
PMEVTYPER1_EL0=0x00000000
PMEVTYPER2_EL0=0x00000000
PMEVTYPER3_EL0=0x00000000
PMEVTYPER4_EL0=0x00000000
PMEVTYPER5_EL0=0x00000000
PMINTENCLR_EL1=0x00000000
PMINTENSET_EL1=0x00000000
PMOVSCLR_EL0=0x00000000
PMOVSSET_EL0=0x00000000
PMSELR_EL0=0x00000000
PMUSERENR_EL0=0x00000000
PMXEVCNTR_EL0=0x00000000
PMXEVTYPER_EL0=0x00000000
CurrentEL=0x00000008
DAIF=0x000003C0
NZCV=0x20000000
SPSel=0x00000001
Mode=0x00000009
RVBAR_EL3(size:64)=0x0000000000000000
CPTR_EL3=0x00000000
SCR_EL3=0x00000531
ELR_EL1(size:64)=0x0000000000000000
ELR_EL2(size:64)=0x0000000000000000
ELR_EL3(size:64)=0x0000000000000000
SPSR_EL1=0x00000000
SPSR_EL2=0x00000000
SPSR_EL3=0x00000000
SPSR_ABT=0x00000000
SPSR_FIQ=0x00000000
SPSR_IRQ=0x00000000
SPSR_UND=0x00000000
SP_EL0(size:64)=0x0000000000000000
SP_EL1(size:64)=0x0000000000000000
SP_EL2(size:64)=0x00000000FC01EBA0
SP_EL3(size:64)=0x0000000000000000
TPIDRRO_EL0(size:64)=0x0000000000000000
TPIDR_EL0(size:64)=0x0000000000000000
TPIDR_EL1(size:64)=0x0000000000000000
TPIDR_EL2(size:64)=0x0000000000000000
TPIDR_EL3(size:64)=0x0000000000000000
CNTFRQ_EL0=0x05F5E100
CNTHCTL_EL2=0x00000000
CNTHP_CTL_EL2=0x00000000
CNTHP_CVAL_EL2(size:64)=0x0000000000000000
CNTHP_TVAL_EL2=0xFBDEF81B
CNTKCTL_EL1=0x00000000
CNTPCT_EL0(size:64)=0x00000000042157F5
CNTPS_CTL_EL1=0x00000000
CNTPS_CVAL_EL1(size:64)=0x0000000000000000
CNTPS_TVAL_EL1=0xFBDE0D61
CNTP_CTL_EL0=0x00000000
CNTP_CVAL_EL0(size:64)=0x0000000000000000
CNTP_TVAL_EL0=0xFBDD778C
CNTVCT_EL0(size:64)=0x000000000422AE1E
CNTVOFF_EL2(size:64)=0x0000000000000000
CNTV_CTL_EL0=0x00000000
CNTV_CVAL_EL0(size:64)=0x0000000000000000
CNTV_TVAL_EL0=0xFBDCA814
CPTR_EL2=0x00000000
HCR_EL2(size:64)=0x000000008000003A
HSTR_EL2=0x00000000
CPSR=0x200003C9
[dump1]
space=EL2
address=0xFFFEB448
file=mem_Cortex-A57_0.bin

189
decoder/tests/snapshots/a55-test-tpiu/device2.ini Normal file
View File

@ -0,0 +1,189 @@
[device]
name=CSETM_0
class=trace_source
type=ETM4.2
[regs]
TRCPROCSELR(id:0x2)=0x00000000
TRCCONFIGR(id:0x4)=0x00000001
TRCAUXCTLR(id:0x6)=0x00000000
TRCEVENTCTL0R(id:0x8)=0x00000000
TRCEVENTCTL1R(id:0x9)=0x00000000
TRCSTALLCTLR(id:0xB)=0x00000000
TRCTSCTLR(id:0xC)=0x00000000
TRCSYNCPR(id:0xD)=0x0000000B
TRCCCCTLR(id:0xE)=0x00000000
TRCBBCTLR(id:0xF)=0x00000000
TRCTRACEIDR(id:0x10)=0x00000001
TRCQCTLR(id:0x11)=0x00000000
TRCVICTLR(id:0x20)=0x00000201
TRCVIIECTLR(id:0x21)=0x00000000
TRCVISSCTLR(id:0x22)=0x00000000
TRCVIPCSSCTLR(id:0x23)=0x00000000
TRCVDCTLR(id:0x28)=0x00000000
TRCVDSACCTLR(id:0x29)=0x00000000
TRCVDARCCTLR(id:0x2A)=0x00000000
TRCSEQEVR0(id:0x40)=0x00000000
TRCSEQEVR1(id:0x41)=0x00000000
TRCSEQEVR2(id:0x42)=0x00000000
TRCSEQRSTEVR(id:0x46)=0x00000000
TRCSEQSTR(id:0x47)=0x00000000
TRCEXTINSELR(id:0x48)=0x00000000
TRCCNTRLDVR0(id:0x50)=0x00000000
TRCCNTRLDVR1(id:0x51)=0x00000000
TRCCNTRLDVR2(id:0x52)=0x00000000
TRCCNTRLDVR3(id:0x53)=0x00000000
TRCCNTCTLR0(id:0x54)=0x00000000
TRCCNTCTLR1(id:0x55)=0x00000000
TRCCNTCTLR2(id:0x56)=0x00000000
TRCCNTCTLR3(id:0x57)=0x00000000
TRCCNTVR0(id:0x58)=0x00000000
TRCCNTVR1(id:0x59)=0x00000000
TRCCNTVR2(id:0x5A)=0x00000000
TRCCNTVR3(id:0x5B)=0x00000000
TRCIDR8(id:0x60)=0x00000000
TRCIDR9(id:0x61)=0x00000000
TRCIDR10(id:0x62)=0x00000000
TRCIDR11(id:0x63)=0x00000000
TRCIDR12(id:0x64)=0x00000000
TRCIDR13(id:0x65)=0x00000000
TRCIMSPEC0(id:0x70)=0x00000000
TRCIMSPEC1(id:0x71)=0x00000000
TRCIMSPEC2(id:0x72)=0x00000000
TRCIMSPEC3(id:0x73)=0x00000000
TRCIMSPEC4(id:0x74)=0x00000000
TRCIMSPEC5(id:0x75)=0x00000000
TRCIMSPEC6(id:0x76)=0x00000000
TRCIMSPEC7(id:0x77)=0x00000000
TRCIDR0(id:0x78)=0x08000CA1
TRCIDR1(id:0x79)=0x4200F410
TRCIDR2(id:0x7A)=0x20001088
TRCIDR3(id:0x7B)=0x007B0004
TRCIDR4(id:0x7C)=0x11170004
TRCIDR5(id:0x7D)=0x28070804
TRCIDR6(id:0x7E)=0x00000000
TRCIDR7(id:0x7F)=0x00000000
TRCRSCTLR2(id:0x82)=0x00040000
TRCRSCTLR3(id:0x83)=0x00000000
TRCRSCTLR4(id:0x84)=0x00000000
TRCRSCTLR5(id:0x85)=0x00000000
TRCRSCTLR6(id:0x86)=0x00000000
TRCRSCTLR7(id:0x87)=0x00000000
TRCRSCTLR8(id:0x88)=0x00000000
TRCRSCTLR9(id:0x89)=0x00000000
TRCRSCTLR10(id:0x8A)=0x00000000
TRCRSCTLR11(id:0x8B)=0x00000000
TRCRSCTLR12(id:0x8C)=0x00000000
TRCRSCTLR13(id:0x8D)=0x00000000
TRCRSCTLR14(id:0x8E)=0x00000000
TRCRSCTLR15(id:0x8F)=0x00000000
TRCRSCTLR16(id:0x90)=0x00000000
TRCRSCTLR17(id:0x91)=0x00000000
TRCRSCTLR18(id:0x92)=0x00000000
TRCRSCTLR19(id:0x93)=0x00000000
TRCRSCTLR20(id:0x94)=0x00000000
TRCRSCTLR21(id:0x95)=0x00000000
TRCRSCTLR22(id:0x96)=0x00000000
TRCRSCTLR23(id:0x97)=0x00000000
TRCRSCTLR24(id:0x98)=0x00000000
TRCRSCTLR25(id:0x99)=0x00000000
TRCRSCTLR26(id:0x9A)=0x00000000
TRCRSCTLR27(id:0x9B)=0x00000000
TRCRSCTLR28(id:0x9C)=0x00000000
TRCRSCTLR29(id:0x9D)=0x00000000
TRCRSCTLR30(id:0x9E)=0x00000000
TRCRSCTLR31(id:0x9F)=0x00000000
TRCSSCCR0(id:0xA0)=0x00000000
TRCSSCCR1(id:0xA1)=0x00000000
TRCSSCCR2(id:0xA2)=0x00000000
TRCSSCCR3(id:0xA3)=0x00000000
TRCSSCCR4(id:0xA4)=0x00000000
TRCSSCCR5(id:0xA5)=0x00000000
TRCSSCCR6(id:0xA6)=0x00000000
TRCSSCCR7(id:0xA7)=0x00000000
TRCSSCSR0(id:0xA8)=0x00000001
TRCSSCSR1(id:0xA9)=0x00000000
TRCSSCSR2(id:0xAA)=0x00000000
TRCSSCSR3(id:0xAB)=0x00000000
TRCSSCSR4(id:0xAC)=0x00000000
TRCSSCSR5(id:0xAD)=0x00000000
TRCSSCSR6(id:0xAE)=0x00000000
TRCSSCSR7(id:0xAF)=0x00000000
TRCSSPCICR0(id:0xB0)=0x00000000
TRCSSPCICR1(id:0xB1)=0x00000000
TRCSSPCICR2(id:0xB2)=0x00000000
TRCSSPCICR3(id:0xB3)=0x00000000
TRCSSPCICR4(id:0xB4)=0x00000000
TRCSSPCICR5(id:0xB5)=0x00000000
TRCSSPCICR6(id:0xB6)=0x00000000
TRCSSPCICR7(id:0xB7)=0x00000000
TRCACVR0(id:0x100,size:64)=0x0000000000000000
TRCACVR1(id:0x102,size:64)=0x0000000000000000
TRCACVR2(id:0x104,size:64)=0x0000000000000000
TRCACVR3(id:0x106,size:64)=0x0000000000000000
TRCACVR4(id:0x108,size:64)=0x0000000000000000
TRCACVR5(id:0x10A,size:64)=0x0000000000000000
TRCACVR6(id:0x10C,size:64)=0x0000000000000000
TRCACVR7(id:0x10E,size:64)=0x0000000000000000
TRCACVR8(id:0x110,size:64)=0x0000000000000000
TRCACVR9(id:0x112,size:64)=0x0000000000000000
TRCACVR10(id:0x114,size:64)=0x0000000000000000
TRCACVR11(id:0x116,size:64)=0x0000000000000000
TRCACVR12(id:0x118,size:64)=0x0000000000000000
TRCACVR13(id:0x11A,size:64)=0x0000000000000000
TRCACVR14(id:0x11C,size:64)=0x0000000000000000
TRCACVR15(id:0x11E,size:64)=0x0000000000000000
TRCACATR0(id:0x120,size:64)=0x0000000000000000
TRCACATR1(id:0x122,size:64)=0x0000000000000000
TRCACATR2(id:0x124,size:64)=0x0000000000000000
TRCACATR3(id:0x126,size:64)=0x0000000000000000
TRCACATR4(id:0x128,size:64)=0x0000000000000000
TRCACATR5(id:0x12A,size:64)=0x0000000000000000
TRCACATR6(id:0x12C,size:64)=0x0000000000000000
TRCACATR7(id:0x12E,size:64)=0x0000000000000000
TRCACATR8(id:0x130,size:64)=0x0000000000000000
TRCACATR9(id:0x132,size:64)=0x0000000000000000
TRCACATR10(id:0x134,size:64)=0x0000000000000000
TRCACATR11(id:0x136,size:64)=0x0000000000000000
TRCACATR12(id:0x138,size:64)=0x0000000000000000
TRCACATR13(id:0x13A,size:64)=0x0000000000000000
TRCACATR14(id:0x13C,size:64)=0x0000000000000000
TRCACATR15(id:0x13E,size:64)=0x0000000000000000
TRCDVCVR0(id:0x140,size:64)=0x0000000000000000
TRCDVCVR1(id:0x142,size:64)=0x0000000000000000
TRCDVCVR2(id:0x144,size:64)=0x0000000000000000
TRCDVCVR3(id:0x146,size:64)=0x0000000000000000
TRCDVCVR4(id:0x148,size:64)=0x0000000000000000
TRCDVCVR5(id:0x14A,size:64)=0x0000000000000000
TRCDVCVR6(id:0x14C,size:64)=0x0000000000000000
TRCDVCVR7(id:0x14E,size:64)=0x0000000000000000
TRCDVCMR0(id:0x160,size:64)=0x0000000000000000
TRCDVCMR1(id:0x162,size:64)=0x0000000000000000
TRCDVCMR2(id:0x164,size:64)=0x0000000000000000
TRCDVCMR3(id:0x166,size:64)=0x0000000000000000
TRCDVCMR4(id:0x168,size:64)=0x0000000000000000
TRCDVCMR5(id:0x16A,size:64)=0x0000000000000000
TRCDVCMR6(id:0x16C,size:64)=0x0000000000000000
TRCDVCMR7(id:0x16E,size:64)=0x0000000000000000
TRCCIDCVR0(id:0x180,size:64)=0x0000000000000000
TRCCIDCVR1(id:0x182,size:64)=0x0000000000000000
TRCCIDCVR2(id:0x184,size:64)=0x0000000000000000
TRCCIDCVR3(id:0x186,size:64)=0x0000000000000000
TRCCIDCVR4(id:0x188,size:64)=0x0000000000000000
TRCCIDCVR5(id:0x18A,size:64)=0x0000000000000000
TRCCIDCVR6(id:0x18C,size:64)=0x0000000000000000
TRCCIDCVR7(id:0x18E,size:64)=0x0000000000000000
TRCVMIDCVR0(id:0x190,size:64)=0x0000000000000000
TRCVMIDCVR1(id:0x192,size:64)=0x0000000000000000
TRCVMIDCVR2(id:0x194,size:64)=0x0000000000000000
TRCVMIDCVR3(id:0x196,size:64)=0x0000000000000000
TRCVMIDCVR4(id:0x198,size:64)=0x0000000000000000
TRCVMIDCVR5(id:0x19A,size:64)=0x0000000000000000
TRCVMIDCVR6(id:0x19C,size:64)=0x0000000000000000
TRCVMIDCVR7(id:0x19E,size:64)=0x0000000000000000
TRCCIDCCTLR0(id:0x1A0)=0x00000000
TRCCIDCCTLR1(id:0x1A1)=0x00000000
TRCVMIDCCTLR0(id:0x1A2)=0x00000000
TRCVMIDCCTLR1(id:0x1A3)=0x00000000
TRCAUTHSTATUS(id:0x3EE)=0x000000CC

12
decoder/tests/snapshots/a55-test-tpiu/snapshot.ini Normal file
View File

@ -0,0 +1,12 @@
; DS-5 snapshot
[snapshot]
version=1.0
[device_list]
device1=device1.ini
device2=device2.ini
[trace]
metadata=trace.ini

16
decoder/tests/snapshots/a55-test-tpiu/trace.ini Normal file
View File

@ -0,0 +1,16 @@
; DS-5 trace metadata
[trace_buffers]
buffers=buffer0
[buffer0]
name=DSTREAM_0
file=DSTREAM_0.bin
format=dstream_coresight
[core_trace_sources]
Cortex-A55_0=CSETM_0
[source_buffers]
CSETM_0=DSTREAM_0

BIN
decoder/tests/snapshots/a57_single_step/CSTMC_TRACE_FIFO.bin Normal file
View File

Binary file not shown.

451
decoder/tests/snapshots/a57_single_step/device1.ini Normal file
View File

@ -0,0 +1,451 @@
[device]
name=Cortex-A57_0
class=core
type=Cortex-A57
[regs]
X0(size:64)=0x00000000002971C8
X1(size:64)=0x00000000910163E0
X2(size:64)=0x00000000FFD0C1C4
X3(size:64)=0x0000000000345000
X4(size:64)=0x0000000000000004
X5(size:64)=0x00000000FC01EB50
X6(size:64)=0x00000000FC01EB4C
X7(size:64)=0x0000000000000000
X8(size:64)=0x00000000FC01E9C8
X9(size:64)=0xFFFFFFFFFFFFFFFF
X10(size:64)=0x0000000000000006
X11(size:64)=0x0000000000000000
X12(size:64)=0x00000000407FE0FA
X13(size:64)=0x0000000000000000
X14(size:64)=0x0000000000000000
X15(size:64)=0x0000000000000000
X16(size:64)=0x0000000000000000
X17(size:64)=0x0000000000000000
X18(size:64)=0x0000000000000000
X19(size:64)=0x00000000C2800290
X20(size:64)=0x0000000000000000
X21(size:64)=0x0000000000000000
X22(size:64)=0x0000000000000000
X23(size:64)=0x0000000000000000
X24(size:64)=0x0000000000000000
X25(size:64)=0x0000000000000000
X26(size:64)=0x0000000000000000
X27(size:64)=0x0000000000000000
X28(size:64)=0x0000000000000000
X29(size:64)=0x0000000000000000
LR(size:64)=0x00000000FFFEAF48
PC(size:64)=0x00000000FFFEB44C
SP(size:64)=0x00000000FC01EBA0
W0=0x002971C8
W1=0x910163E0
W2=0xFFD0C1C4
W3=0x00345000
W4=0x00000004
W5=0xFC01EB50
W6=0xFC01EB4C
W7=0x00000000
W8=0xFC01E9C8
W9=0xFFFFFFFF
W10=0x00000006
W11=0x00000000
W12=0x407FE0FA
W13=0x00000000
W14=0x00000000
W15=0x00000000
W16=0x00000000
W17=0x00000000
W18=0x00000000
W19=0xC2800290
W20=0x00000000
W21=0x00000000
W22=0x00000000
W23=0x00000000
W24=0x00000000
W25=0x00000000
W26=0x00000000
W27=0x00000000
W28=0x00000000
W29=0x00000000
W30=0xFFFEAF48
B0=0x00000000
B1=0x00000000
B2=0x00000000
B3=0x00000000
B4=0x00000000
B5=0x00000000
B6=0x00000000
B7=0x00000000
B8=0x00000000
B9=0x00000000
B10=0x00000000
B11=0x00000000
B12=0x00000000
B13=0x00000000
B14=0x00000000
B15=0x00000000
B16=0x00000000
B17=0x00000000
B18=0x00000000
B19=0x00000000
B20=0x00000000
B21=0x00000000
B22=0x00000000
B23=0x00000000
B24=0x00000000
B25=0x00000000
B26=0x00000000
B27=0x00000000
B28=0x00000000
B29=0x00000000
B30=0x00000000
B31=0x00000000
D0(size:64)=0x0000000000000000
D1(size:64)=0x0000000000000000
D2(size:64)=0x0000000000000000
D3(size:64)=0x0000000000000000
D4(size:64)=0x0000000000000000
D5(size:64)=0x0000000000000000
D6(size:64)=0x0000000000000000
D7(size:64)=0x0000000000000000
D8(size:64)=0x0000000000000000
D9(size:64)=0x0000000000000000
D10(size:64)=0x0000000000000000
D11(size:64)=0x0000000000000000
D12(size:64)=0x0000000000000000
D13(size:64)=0x0000000000000000
D14(size:64)=0x0000000000000000
D15(size:64)=0x0000000000000000
D16(size:64)=0x0000000000000000
D17(size:64)=0x0000000000000000
D18(size:64)=0x0000000000000000
D19(size:64)=0x0000000000000000
D20(size:64)=0x0000000000000000
D21(size:64)=0x0000000000000000
D22(size:64)=0x0000000000000000
D23(size:64)=0x0000000000000000
D24(size:64)=0x0000000000000000
D25(size:64)=0x0000000000000000
D26(size:64)=0x0000000000000000
D27(size:64)=0x0000000000000000
D28(size:64)=0x0000000000000000
D29(size:64)=0x0000000000000000
D30(size:64)=0x0000000000000000
D31(size:64)=0x0000000000000000
H0=0x00000000
H1=0x00000000
H2=0x00000000
H3=0x00000000
H4=0x00000000
H5=0x00000000
H6=0x00000000
H7=0x00000000
H8=0x00000000
H9=0x00000000
H10=0x00000000
H11=0x00000000
H12=0x00000000
H13=0x00000000
H14=0x00000000
H15=0x00000000
H16=0x00000000
H17=0x00000000
H18=0x00000000
H19=0x00000000
H20=0x00000000
H21=0x00000000
H22=0x00000000
H23=0x00000000
H24=0x00000000
H25=0x00000000
H26=0x00000000
H27=0x00000000
H28=0x00000000
H29=0x00000000
H30=0x00000000
H31=0x00000000
S0=0x00000000
S1=0x00000000
S2=0x00000000
S3=0x00000000
S4=0x00000000
S5=0x00000000
S6=0x00000000
S7=0x00000000
S8=0x00000000
S9=0x00000000
S10=0x00000000
S11=0x00000000
S12=0x00000000
S13=0x00000000
S14=0x00000000
S15=0x00000000
S16=0x00000000
S17=0x00000000
S18=0x00000000
S19=0x00000000
S20=0x00000000
S21=0x00000000
S22=0x00000000
S23=0x00000000
S24=0x00000000
S25=0x00000000
S26=0x00000000
S27=0x00000000
S28=0x00000000
S29=0x00000000
S30=0x00000000
S31=0x00000000
PAR_EL1(size:64)=0x0000000000000800
DBGAUTHSTATUS_EL1=0x000000FF
DBGBCR0_EL1=0x000001E0
DBGBCR1_EL1=0x000001E0
DBGBCR2_EL1=0x000001E0
DBGBCR3_EL1=0x000001E0
DBGBCR4_EL1=0x000001E0
DBGBCR5_EL1=0x000001E0
DBGBVR0_EL1(size:64)=0x0000000000000000
DBGBVR1_EL1(size:64)=0x0000000000000000
DBGBVR2_EL1(size:64)=0x0000000000000000
DBGBVR3_EL1(size:64)=0x0000000000000000
DBGBVR4_EL1(size:64)=0x0000000000000000
DBGBVR5_EL1(size:64)=0x0000000000000000
DBGCLAIMCLR_EL1=0x00000000
DBGCLAIMSET_EL1=0x000000FF
DBGPRCR_EL1=0x00000001
DBGWCR0_EL1=0x00000000
DBGWCR1_EL1=0x00000000
DBGWCR2_EL1=0x00000000
DBGWCR3_EL1=0x00000000
DBGWVR0_EL1(size:64)=0x0000000000000000
DBGWVR1_EL1(size:64)=0x0000000000000000
DBGWVR2_EL1(size:64)=0x0000000000000000
DBGWVR3_EL1(size:64)=0x0000000000000000
MDCCINT_EL1=0x00000000
MDCCSR_EL0=0x00000000
MDCR_EL2=0x00000006
MDCR_EL3=0x00000000
MDRAR_EL1(size:64)=0x0000000410000003
MDSCR_EL1=0x00004000
OSDLR_EL1=0x00000000
OSDTRRX_EL1=0x00000000
OSDTRTX_EL1=0x00000000
OSECCR_EL1=0x00000000
OSLSR_EL1=0x00000008
AFSR0_EL1=0x00000000
AFSR0_EL2=0x00000000
AFSR0_EL3=0x00000000
AFSR1_EL1=0x00000000
AFSR1_EL2=0x00000000
AFSR1_EL3=0x00000000
ESR_EL1=0x00000000
ESR_EL2=0x00000000
ESR_EL3=0x00000000
FAR_EL1(size:64)=0x0000000000000000
FAR_EL2(size:64)=0x0000000000000000
FAR_EL3(size:64)=0x0000000000000000
HPFAR_EL2(size:64)=0x0000000000000000
ISR_EL1=0x00000000
VBAR_EL1(size:64)=0x0000000000000000
VBAR_EL2(size:64)=0x00000000C0007000
VBAR_EL3(size:64)=0x0000000000000000
FPCR=0x00000000
FPSR=0x00000000
MVFR0_EL1=0x00000000
MVFR1_EL1=0x00000000
MVFR2_EL1=0x00000000
ICC_AP0R0_EL1=0x00000000
ICC_AP1R0_EL1=0x00000000
S_ICC_AP1R0_EL1=0x00000000
N_ICC_AP1R0_EL1=0x00000000
ICC_BPR0_EL1=0x00000002
ICC_BPR1_EL1=0x00000003
S_ICC_BPR1_EL1=0x00000002
N_ICC_BPR1_EL1=0x00000003
ICC_CTLR_EL1=0x00004400
S_ICC_CTLR_EL1=0x00004400
N_ICC_CTLR_EL1=0x00004400
ICC_CTLR_EL3=0x00004400
ICC_HPPIR0_EL1=0x000003FF
ICC_HPPIR1_EL1=0x000003FF
ICC_IAR0_EL1=0x000003FF
ICC_IAR1_EL1=0x000003FF
ICC_IGRPEN0_EL1=0x00000000
ICC_IGRPEN1_EL1=0x00000000
S_ICC_IGRPEN1_EL1=0x00000000
N_ICC_IGRPEN1_EL1=0x00000000
ICC_IGRPEN1_EL3=0x00000000
ICC_PMR_EL1=0x00000000
ICC_RPR_EL1=0x000000FF
ICC_SRE_EL1=0x00000007
S_ICC_SRE_EL1=0x00000007
N_ICC_SRE_EL1=0x00000007
ICC_SRE_EL2=0x0000000F
ICC_SRE_EL3=0x0000000F
ICH_AP0R0_EL2=0x00000000
ICH_AP1R0_EL2=0x00000000
ICH_EISR_EL2=0x00000000
ICH_ELRSR_EL2=0x000000FF
ICH_HCR_EL2=0x00000000
ICH_LR0_EL2(size:64)=0x0000000000000000
ICH_LR1_EL2(size:64)=0x0000000000000000
ICH_LR2_EL2(size:64)=0x0000000000000000
ICH_LR3_EL2(size:64)=0x0000000000000000
ICH_LR4_EL2(size:64)=0x0000000000000000
ICH_LR5_EL2(size:64)=0x0000000000000000
ICH_LR6_EL2(size:64)=0x0000000000000000
ICH_LR7_EL2(size:64)=0x0000000000000000
ICH_MISR_EL2=0x00000000
ICH_VMCR_EL2=0x004C0008
ICH_VTR_EL2=0x90580007
AIDR_EL1=0x00000000
CCSIDR_EL1=0x7007E03A
CLIDR_EL1(size:64)=0x000000000B200123
CSSELR_EL1=0x00000000
CTR_EL0=0x8444C004
DCZID_EL0=0x00000004
ID_AA64AFR0_EL1(size:64)=0x0000000000000000
ID_AA64AFR1_EL1(size:64)=0x0000000000000000
ID_AA64DFR0_EL1(size:64)=0x0000000010305407
ID_AA64DFR1_EL1(size:64)=0x0000000000000000
ID_AA64ISAR0_EL1(size:64)=0x0000000010211120
ID_AA64ISAR1_EL1(size:64)=0x0000000000000000
ID_AA64MMFR0_EL1(size:64)=0x0000000000001124
ID_AA64MMFR1_EL1(size:64)=0x0000000001111120
ID_AA64PFR0_EL1(size:64)=0x0000000011001111
ID_AA64PFR1_EL1(size:64)=0x0000000000000000
ID_AFR0_EL1=0x00000000
ID_DFR0_EL1=0x00000000
ID_ISAR0_EL1=0x00000000
ID_ISAR1_EL1=0x00000000
ID_ISAR2_EL1=0x00000000
ID_ISAR3_EL1=0x00000000
ID_ISAR4_EL1=0x00000000
ID_ISAR5_EL1=0x00000000
ID_MMFR0_EL1=0x00000000
ID_MMFR1_EL1=0x00000000
ID_MMFR2_EL1=0x00000000
ID_MMFR3_EL1=0x00000000
ID_MMFR4_EL1=0x00000000
ID_PFR0_EL1=0x00000000
ID_PFR1_EL1=0x00000000
MIDR_EL1=0x420F5160
MPIDR_EL1(size:64)=0x0000000081000000
REVIDR_EL1=0x00000000
VMPIDR_EL2(size:64)=0x0000000080000000
VPIDR_EL2=0x00000000
ACTLR_EL1(size:64)=0x0000000000000000
ACTLR_EL2(size:64)=0x0000000000000000
ACTLR_EL3(size:64)=0x0000000000000000
AMAIR_EL1(size:64)=0x0000000000000000
AMAIR_EL2(size:64)=0x0000000000000000
AMAIR_EL3(size:64)=0x0000000000000000
HACR_EL2=0x00000000
IL1Data0_EL1=0x00000000
IL1Data1_EL1=0x00000000
IL1Data2_EL1=0x00000000
IL1Data3_EL1=0x00000000
DL1Data0_EL1=0x00000000
DL1Data1_EL1=0x00000000
DL1Data2_EL1=0x00000000
DL1Data3_EL1=0x00000000
DL1Data4_EL1=0x00000000
CONTEXTIDR_EL1=0x00000000
MAIR_EL1(size:64)=0x0000000000000000
MAIR_EL2(size:64)=0x00000000FFBB4400
MAIR_EL3(size:64)=0x0000000000000000
TCR_EL1(size:64)=0x0000000080000000
TCR_EL2=0x8081351D
TCR_EL3=0x80800000
TTBR0_EL1(size:64)=0x0000000000000000
TTBR0_EL2(size:64)=0x00000000FFFFD000
TTBR0_EL3(size:64)=0x0000000000000000
TTBR1_EL1(size:64)=0x0000000000000000
VTCR_EL2=0x80000000
VTTBR_EL2(size:64)=0x0000000000000000
CPACR_EL1=0x00000000
SCTLR_EL1=0x30500980
SCTLR_EL2=0x30401805
SCTLR_EL3=0x30C50830
PMCCFILTR_EL0=0x00000000
PMCCNTR_EL0(size:64)=0x0000000000000000
PMCEID0_EL0=0xFBFFEFFF
PMCEID1_EL0=0x0000A07F
PMCNTENCLR_EL0=0x00000000
PMCNTENSET_EL0=0x00000000
PMCR_EL0=0x42003040
PMEVCNTR0_EL0=0x00000000
PMEVCNTR1_EL0=0x00000000
PMEVCNTR2_EL0=0x00000000
PMEVCNTR3_EL0=0x00000000
PMEVCNTR4_EL0=0x00000000
PMEVCNTR5_EL0=0x00000000
PMEVTYPER0_EL0=0x00000000
PMEVTYPER1_EL0=0x00000000
PMEVTYPER2_EL0=0x00000000
PMEVTYPER3_EL0=0x00000000
PMEVTYPER4_EL0=0x00000000
PMEVTYPER5_EL0=0x00000000
PMINTENCLR_EL1=0x00000000
PMINTENSET_EL1=0x00000000
PMOVSCLR_EL0=0x00000000
PMOVSSET_EL0=0x00000000
PMSELR_EL0=0x00000000
PMUSERENR_EL0=0x00000000
PMXEVCNTR_EL0=0x00000000
PMXEVTYPER_EL0=0x00000000
CurrentEL=0x00000008
DAIF=0x000003C0
NZCV=0x20000000
SPSel=0x00000001
Mode=0x00000009
RVBAR_EL3(size:64)=0x0000000000000000
CPTR_EL3=0x00000000
SCR_EL3=0x00000531
ELR_EL1(size:64)=0x0000000000000000
ELR_EL2(size:64)=0x0000000000000000
ELR_EL3(size:64)=0x0000000000000000
SPSR_EL1=0x00000000
SPSR_EL2=0x00000000
SPSR_EL3=0x00000000
SPSR_ABT=0x00000000
SPSR_FIQ=0x00000000
SPSR_IRQ=0x00000000
SPSR_UND=0x00000000
SP_EL0(size:64)=0x0000000000000000
SP_EL1(size:64)=0x0000000000000000
SP_EL2(size:64)=0x00000000FC01EBA0
SP_EL3(size:64)=0x0000000000000000
TPIDRRO_EL0(size:64)=0x0000000000000000
TPIDR_EL0(size:64)=0x0000000000000000
TPIDR_EL1(size:64)=0x0000000000000000
TPIDR_EL2(size:64)=0x0000000000000000
TPIDR_EL3(size:64)=0x0000000000000000
CNTFRQ_EL0=0x05F5E100
CNTHCTL_EL2=0x00000000
CNTHP_CTL_EL2=0x00000000
CNTHP_CVAL_EL2(size:64)=0x0000000000000000
CNTHP_TVAL_EL2=0xFBDEF81B
CNTKCTL_EL1=0x00000000
CNTPCT_EL0(size:64)=0x00000000042157F5
CNTPS_CTL_EL1=0x00000000
CNTPS_CVAL_EL1(size:64)=0x0000000000000000
CNTPS_TVAL_EL1=0xFBDE0D61
CNTP_CTL_EL0=0x00000000
CNTP_CVAL_EL0(size:64)=0x0000000000000000
CNTP_TVAL_EL0=0xFBDD778C
CNTVCT_EL0(size:64)=0x000000000422AE1E
CNTVOFF_EL2(size:64)=0x0000000000000000
CNTV_CTL_EL0=0x00000000
CNTV_CVAL_EL0(size:64)=0x0000000000000000
CNTV_TVAL_EL0=0xFBDCA814
CPTR_EL2=0x00000000
HCR_EL2(size:64)=0x000000008000003A
HSTR_EL2=0x00000000
CPSR=0x200003C9
[dump1]
space=EL2
address=0xFFFEB448
file=mem_Cortex-A57_0.bin

189
decoder/tests/snapshots/a57_single_step/device2.ini Normal file
View File

@ -0,0 +1,189 @@
[device]
name=CSETM_0
class=trace_source
type=ETM4.1
[regs]
TRCPROCSELR(id:0x2)=0x00000000
TRCCONFIGR(id:0x4)=0x00000001
TRCAUXCTLR(id:0x6)=0x00000000
TRCEVENTCTL0R(id:0x8)=0x00000000
TRCEVENTCTL1R(id:0x9)=0x00000000
TRCSTALLCTLR(id:0xB)=0x00000000
TRCTSCTLR(id:0xC)=0x00000000
TRCSYNCPR(id:0xD)=0x0000000B
TRCCCCTLR(id:0xE)=0x00000000
TRCBBCTLR(id:0xF)=0x00000000
TRCTRACEIDR(id:0x10)=0x00000010
TRCQCTLR(id:0x11)=0x00000000
TRCVICTLR(id:0x20)=0x00000201
TRCVIIECTLR(id:0x21)=0x00000000
TRCVISSCTLR(id:0x22)=0x00000000
TRCVIPCSSCTLR(id:0x23)=0x00000000
TRCVDCTLR(id:0x28)=0x00000000
TRCVDSACCTLR(id:0x29)=0x00000000
TRCVDARCCTLR(id:0x2A)=0x00000000
TRCSEQEVR0(id:0x40)=0x00000000
TRCSEQEVR1(id:0x41)=0x00000000
TRCSEQEVR2(id:0x42)=0x00000000
TRCSEQRSTEVR(id:0x46)=0x00000000
TRCSEQSTR(id:0x47)=0x00000000
TRCEXTINSELR(id:0x48)=0x00000000
TRCCNTRLDVR0(id:0x50)=0x00000000
TRCCNTRLDVR1(id:0x51)=0x00000000
TRCCNTRLDVR2(id:0x52)=0x00000000
TRCCNTRLDVR3(id:0x53)=0x00000000
TRCCNTCTLR0(id:0x54)=0x00000000
TRCCNTCTLR1(id:0x55)=0x00000000
TRCCNTCTLR2(id:0x56)=0x00000000
TRCCNTCTLR3(id:0x57)=0x00000000
TRCCNTVR0(id:0x58)=0x00000000
TRCCNTVR1(id:0x59)=0x00000000
TRCCNTVR2(id:0x5A)=0x00000000
TRCCNTVR3(id:0x5B)=0x00000000
TRCIDR8(id:0x60)=0x00000000
TRCIDR9(id:0x61)=0x00000000
TRCIDR10(id:0x62)=0x00000000
TRCIDR11(id:0x63)=0x00000000
TRCIDR12(id:0x64)=0x00000000
TRCIDR13(id:0x65)=0x00000000
TRCIMSPEC0(id:0x70)=0x00000000
TRCIMSPEC1(id:0x71)=0x00000000
TRCIMSPEC2(id:0x72)=0x00000000
TRCIMSPEC3(id:0x73)=0x00000000
TRCIMSPEC4(id:0x74)=0x00000000
TRCIMSPEC5(id:0x75)=0x00000000
TRCIMSPEC6(id:0x76)=0x00000000
TRCIMSPEC7(id:0x77)=0x00000000
TRCIDR0(id:0x78)=0x08000CA1
TRCIDR1(id:0x79)=0x4200F410
TRCIDR2(id:0x7A)=0x20001088
TRCIDR3(id:0x7B)=0x007B0004
TRCIDR4(id:0x7C)=0x11170004
TRCIDR5(id:0x7D)=0x28070804
TRCIDR6(id:0x7E)=0x00000000
TRCIDR7(id:0x7F)=0x00000000
TRCRSCTLR2(id:0x82)=0x00040000
TRCRSCTLR3(id:0x83)=0x00000000
TRCRSCTLR4(id:0x84)=0x00000000
TRCRSCTLR5(id:0x85)=0x00000000
TRCRSCTLR6(id:0x86)=0x00000000
TRCRSCTLR7(id:0x87)=0x00000000
TRCRSCTLR8(id:0x88)=0x00000000
TRCRSCTLR9(id:0x89)=0x00000000
TRCRSCTLR10(id:0x8A)=0x00000000
TRCRSCTLR11(id:0x8B)=0x00000000
TRCRSCTLR12(id:0x8C)=0x00000000
TRCRSCTLR13(id:0x8D)=0x00000000
TRCRSCTLR14(id:0x8E)=0x00000000
TRCRSCTLR15(id:0x8F)=0x00000000
TRCRSCTLR16(id:0x90)=0x00000000
TRCRSCTLR17(id:0x91)=0x00000000
TRCRSCTLR18(id:0x92)=0x00000000
TRCRSCTLR19(id:0x93)=0x00000000
TRCRSCTLR20(id:0x94)=0x00000000
TRCRSCTLR21(id:0x95)=0x00000000
TRCRSCTLR22(id:0x96)=0x00000000
TRCRSCTLR23(id:0x97)=0x00000000
TRCRSCTLR24(id:0x98)=0x00000000
TRCRSCTLR25(id:0x99)=0x00000000
TRCRSCTLR26(id:0x9A)=0x00000000
TRCRSCTLR27(id:0x9B)=0x00000000
TRCRSCTLR28(id:0x9C)=0x00000000
TRCRSCTLR29(id:0x9D)=0x00000000
TRCRSCTLR30(id:0x9E)=0x00000000
TRCRSCTLR31(id:0x9F)=0x00000000
TRCSSCCR0(id:0xA0)=0x00000000
TRCSSCCR1(id:0xA1)=0x00000000
TRCSSCCR2(id:0xA2)=0x00000000
TRCSSCCR3(id:0xA3)=0x00000000
TRCSSCCR4(id:0xA4)=0x00000000
TRCSSCCR5(id:0xA5)=0x00000000
TRCSSCCR6(id:0xA6)=0x00000000
TRCSSCCR7(id:0xA7)=0x00000000
TRCSSCSR0(id:0xA8)=0x00000001
TRCSSCSR1(id:0xA9)=0x00000000
TRCSSCSR2(id:0xAA)=0x00000000
TRCSSCSR3(id:0xAB)=0x00000000
TRCSSCSR4(id:0xAC)=0x00000000
TRCSSCSR5(id:0xAD)=0x00000000
TRCSSCSR6(id:0xAE)=0x00000000
TRCSSCSR7(id:0xAF)=0x00000000
TRCSSPCICR0(id:0xB0)=0x00000000
TRCSSPCICR1(id:0xB1)=0x00000000
TRCSSPCICR2(id:0xB2)=0x00000000
TRCSSPCICR3(id:0xB3)=0x00000000
TRCSSPCICR4(id:0xB4)=0x00000000
TRCSSPCICR5(id:0xB5)=0x00000000
TRCSSPCICR6(id:0xB6)=0x00000000
TRCSSPCICR7(id:0xB7)=0x00000000
TRCACVR0(id:0x100,size:64)=0x0000000000000000
TRCACVR1(id:0x102,size:64)=0x0000000000000000
TRCACVR2(id:0x104,size:64)=0x0000000000000000
TRCACVR3(id:0x106,size:64)=0x0000000000000000
TRCACVR4(id:0x108,size:64)=0x0000000000000000
TRCACVR5(id:0x10A,size:64)=0x0000000000000000
TRCACVR6(id:0x10C,size:64)=0x0000000000000000
TRCACVR7(id:0x10E,size:64)=0x0000000000000000
TRCACVR8(id:0x110,size:64)=0x0000000000000000
TRCACVR9(id:0x112,size:64)=0x0000000000000000
TRCACVR10(id:0x114,size:64)=0x0000000000000000
TRCACVR11(id:0x116,size:64)=0x0000000000000000
TRCACVR12(id:0x118,size:64)=0x0000000000000000
TRCACVR13(id:0x11A,size:64)=0x0000000000000000
TRCACVR14(id:0x11C,size:64)=0x0000000000000000
TRCACVR15(id:0x11E,size:64)=0x0000000000000000
TRCACATR0(id:0x120,size:64)=0x0000000000000000
TRCACATR1(id:0x122,size:64)=0x0000000000000000
TRCACATR2(id:0x124,size:64)=0x0000000000000000
TRCACATR3(id:0x126,size:64)=0x0000000000000000
TRCACATR4(id:0x128,size:64)=0x0000000000000000
TRCACATR5(id:0x12A,size:64)=0x0000000000000000
TRCACATR6(id:0x12C,size:64)=0x0000000000000000
TRCACATR7(id:0x12E,size:64)=0x0000000000000000
TRCACATR8(id:0x130,size:64)=0x0000000000000000
TRCACATR9(id:0x132,size:64)=0x0000000000000000
TRCACATR10(id:0x134,size:64)=0x0000000000000000
TRCACATR11(id:0x136,size:64)=0x0000000000000000
TRCACATR12(id:0x138,size:64)=0x0000000000000000
TRCACATR13(id:0x13A,size:64)=0x0000000000000000
TRCACATR14(id:0x13C,size:64)=0x0000000000000000
TRCACATR15(id:0x13E,size:64)=0x0000000000000000
TRCDVCVR0(id:0x140,size:64)=0x0000000000000000
TRCDVCVR1(id:0x142,size:64)=0x0000000000000000
TRCDVCVR2(id:0x144,size:64)=0x0000000000000000
TRCDVCVR3(id:0x146,size:64)=0x0000000000000000
TRCDVCVR4(id:0x148,size:64)=0x0000000000000000
TRCDVCVR5(id:0x14A,size:64)=0x0000000000000000
TRCDVCVR6(id:0x14C,size:64)=0x0000000000000000
TRCDVCVR7(id:0x14E,size:64)=0x0000000000000000
TRCDVCMR0(id:0x160,size:64)=0x0000000000000000
TRCDVCMR1(id:0x162,size:64)=0x0000000000000000
TRCDVCMR2(id:0x164,size:64)=0x0000000000000000
TRCDVCMR3(id:0x166,size:64)=0x0000000000000000
TRCDVCMR4(id:0x168,size:64)=0x0000000000000000
TRCDVCMR5(id:0x16A,size:64)=0x0000000000000000
TRCDVCMR6(id:0x16C,size:64)=0x0000000000000000
TRCDVCMR7(id:0x16E,size:64)=0x0000000000000000
TRCCIDCVR0(id:0x180,size:64)=0x0000000000000000
TRCCIDCVR1(id:0x182,size:64)=0x0000000000000000
TRCCIDCVR2(id:0x184,size:64)=0x0000000000000000
TRCCIDCVR3(id:0x186,size:64)=0x0000000000000000
TRCCIDCVR4(id:0x188,size:64)=0x0000000000000000
TRCCIDCVR5(id:0x18A,size:64)=0x0000000000000000
TRCCIDCVR6(id:0x18C,size:64)=0x0000000000000000
TRCCIDCVR7(id:0x18E,size:64)=0x0000000000000000
TRCVMIDCVR0(id:0x190,size:64)=0x0000000000000000
TRCVMIDCVR1(id:0x192,size:64)=0x0000000000000000
TRCVMIDCVR2(id:0x194,size:64)=0x0000000000000000
TRCVMIDCVR3(id:0x196,size:64)=0x0000000000000000
TRCVMIDCVR4(id:0x198,size:64)=0x0000000000000000
TRCVMIDCVR5(id:0x19A,size:64)=0x0000000000000000
TRCVMIDCVR6(id:0x19C,size:64)=0x0000000000000000
TRCVMIDCVR7(id:0x19E,size:64)=0x0000000000000000
TRCCIDCCTLR0(id:0x1A0)=0x00000000
TRCCIDCCTLR1(id:0x1A1)=0x00000000
TRCVMIDCCTLR0(id:0x1A2)=0x00000000
TRCVMIDCCTLR1(id:0x1A3)=0x00000000
TRCAUTHSTATUS(id:0x3EE)=0x000000CC

Some files were not shown because too many files have changed in this diff Show More