From cba1c2a510d02f028dbf25c8f1ae21f59b30d561 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <stettberger@dokucode.de>
Date: Tue, 17 Aug 2021 12:41:27 +0200
Subject: [PATCH] trace: use full-trace when possible

If the fail-client was compiled with our modified, register-tracing,
sail compiler, the full trace will also record register R/W events.
Therefore, we also try to import the memory-type 'register'.
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6c775e4..23e4828 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all: help
 BUILD_DIR    := build-${ARCH}
 FAIL_BIN     ?= ${BUILD_DIR}/bin
 FAIL_SERVER  ?= ${FAIL_BIN}/generic-experiment-server
-FAIL_TRACE   ?= ${FAIL_BIN}/fail-generic-tracing
+FAIL_TRACE   ?= ${FAIL_BIN}/fail-generic-tracing -Wf,--full-trace
 FAIL_INJECT  ?= ${FAIL_BIN}/fail-generic-experiment
 FAIL_IMPORT  ?= ${FAIL_BIN}/import-trace --enable-sanitychecks 
 FAIL_PRUNE   ?= ${FAIL_BIN}/prune-trace
@@ -87,7 +87,8 @@ ${HOME}/.my.cnf:
 	@echo "port=3306" >> $@
 
 import-%: ${BUILD_DIR}/%/trace.pb ${HOME}/.my.cnf
-	${FAIL_IMPORT} -v ${ARCH}/$(patsubst import-%,%,$@) -b mem  -t $< -e $(shell dirname $<)/system.elf -i mem
+	${FAIL_IMPORT} -v ${ARCH}/$(patsubst import-%,%,$@) -b mem  -t $< -e $(shell dirname $<)/system.elf -i mem --memory-type ram
+	${FAIL_IMPORT} -v ${ARCH}/$(patsubst import-%,%,$@) -b regs-trace  -t $< -e $(shell dirname $<)/system.elf -i mem --memory-type register
 	${FAIL_IMPORT} -v ${ARCH}/$(patsubst import-%,%,$@) -b regs -t $< -e $(shell dirname $<)/system.elf -i regs 
 	${FAIL_IMPORT} -v ${ARCH}/$(patsubst import-%,%,$@) -b ip   -t $< -e $(shell dirname $<)/system.elf -i regs --no-gp --ip
 	${FAIL_PRUNE}  -v ${ARCH}/$(patsubst import-%,%,$@) -b %% --overwrite