Merge pull request buserror#512 from gatk555/dwarf

Use libwarf to show additional symbols and line numbers in tracing.

Author: buserror

Makefile

@@ -14,7 +14,7 @@ PREFIX = ${DESTDIR}
 
 all:	build-simavr build-tests build-examples build-parts
 
-build-simavr:
+build-simavr: Libs.mk
 	$(MAKE) -C simavr RELEASE=$(RELEASE)
 
 build-tests: build-simavr
@@ -34,6 +34,28 @@ install-simavr:
 install-parts:
 	$(MAKE) -C examples/parts install RELEASE=$(RELEASE) DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 
+
+# Find whether libelf and libdwarf are available.
+
+Libs.mk:
+	@echo CONF $@
+	@echo "# Autogenerated: do not edit." > $@
+	@if \
+	  echo  "#include <libelf.h>" > testit.c && \
+	  $(CC) -E $(CFLAGS) ${AVR_CPPFLAGS} testit.c  > /dev/null 2>&1 ; \
+	then  \
+	  echo CFLAGS += -DHAVE_LIBELF >> $@ ; \
+	  echo LDFLAGS += -lelf >> $@ ; \
+	  if \
+	    echo  "#include <dwarf.h>" > testit.c && \
+	    $(CC) -E $(CFLAGS) ${AVR_CPPFLAGS} testit.c > /dev/null 2>&1 ; \
+	  then  \
+	    echo CFLAGS += -DHAVE_LIBDWARF >> $@ ; \
+	    echo LDFLAGS += -ldwarf >> $@ ; \
+	  fi \
+	fi
+	@rm -f testit.c
+
 doc:
 	$(MAKE) -C doc RELEASE=$(RELEASE)
 
@@ -43,4 +65,5 @@ clean:
 	$(MAKE) -C examples clean
 	$(MAKE) -C examples/parts clean
 	$(MAKE) -C doc clean
+	rm -f Libs.mk
 

Makefile.common

@@ -114,7 +114,13 @@ OBJ 		:= obj-${shell $(CC) -dumpmachine}
 LIBDIR		:= ${shell pwd}/${SIMAVR}/${OBJ}
 LDFLAGS 	+= -L${LIBDIR} -lsimavr -lm
 
-LDFLAGS 	+= -lelf
+# Are libelf and/or libdwarf installed?
+# The included file is created when running "make" at the top level.
+
+ifeq ($(shell test -f $(SIMAVR)/../Libs.mk || echo Exists), Exists)
+$(warning Missing library configuration file.  Make from top level to create it.)
+endif
+-include $(SIMAVR)/../Libs.mk
 
 ifeq (${WIN}, Msys)
 LDFLAGS      += -lws2_32

simavr/sim/sim_avr.c

@@ -105,7 +105,9 @@ avr_init(
 	memset(avr->data, 0, avr->ramend + 1);
 #ifdef CONFIG_SIMAVR_TRACE
 	avr->trace_data = calloc(1, sizeof(struct avr_trace_data_t));
+        avr->trace_data->data_names_size = avr->ioend + 1;
 #endif
+        avr->data_names = calloc(avr->ioend + 1, sizeof (char *));
 
 	AVR_LOG(avr, LOG_TRACE, "%s init\n", avr->mmcu);
 

simavr/sim/sim_avr.h

@@ -106,15 +106,17 @@ enum {
 
 	cpu_Sleeping,	// we're now sleeping until an interrupt
 
-	cpu_Step,		// run ONE instruction, then...
+	cpu_Step,	// run ONE instruction, then...
 	cpu_StepDone,	// tell gdb it's all OK, and give it registers
 	cpu_Done,       // avr software stopped gracefully
 	cpu_Crashed,    // avr software crashed (watchdog fired)
 };
 
 // this is only ever used if CONFIG_SIMAVR_TRACE is defined
 struct avr_trace_data_t {
-	struct avr_symbol_t ** codeline;
+	const char **   codeline;       // Text for each Flash address
+	uint32_t        codeline_size;  // Size of codeline table.
+	uint32_t        data_names_size;// Size of data_names table.
 
 	/* DEBUG ONLY
 	 * this keeps track of "jumps" ie, call,jmp,ret,reti and so on
@@ -152,14 +154,12 @@ typedef void (*avr_run_t)(
 #define AVR_FUSE_HIGH	1
 #define AVR_FUSE_EXT	2
 
-#define REG_NAME_COUNT (256 + 32)       // Size of reg_names table.
-
 /*
  * Main AVR instance. Some of these fields are set by the AVR "Core" definition files
  * the rest is runtime data (as little as possible)
  */
 typedef struct avr_t {
-	const char * 		mmcu;	// name of the AVR
+	const char *	 		mmcu;	// name of the AVR
 	// these are filled by sim_core_declare from constants in /usr/lib/avr/include/avr/io*.h
 	uint16_t			ioend;
 	uint16_t 			ramend;
@@ -348,6 +348,10 @@ typedef struct avr_t {
 		uint32_t size;
 		uint32_t len;
 	} io_console_buffer;
+
+	// Table of register names used by gdb and tracing.
+
+	const char ** data_names;
 } avr_t;