target-xtensa: allow using core configuration in tests

Add path to the core configuration directory to test build command and replace .include asm directive with #include to enable preprocessing. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
12 years ago · a2e67072b7
30 changed files with 37 additions and 32 deletions
--- a/tests/tcg/xtensa/Makefile
+++ b/tests/tcg/xtensa/Makefile
@ -1,10 +1,11 @@
 -include ../../../config-host.mak

-CROSS=xtensa-dc232b-elf-
+CORE=dc232b
+CROSS=xtensa-$(CORE)-elf-

 ifndef XT
 SIM = ../../../xtensa-softmmu/qemu-system-xtensa
-SIMFLAGS = -M sim -cpu dc232b -nographic -semihosting $(EXTFLAGS) -kernel
+SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting $(EXTFLAGS) -kernel
 SIMDEBUG = -s -S
 else
 SIM = xt-run
@ -17,6 +18,8 @@ AS      = $(CROSS)gcc -x assembler-with-cpp
 LD      = $(CROSS)ld

 XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa
+INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target-xtensa/core-$(CORE)
+XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS))

 LDFLAGS = -T$(XTENSA_SRC_PATH)/linker.ld

@ -56,10 +59,10 @@ TESTCASES += test_windowed.tst
 all: build

 %.o: $(XTENSA_SRC_PATH)/%.c
-	$(CC) -I$(XTENSA_SRC_PATH) $(CFLAGS) -c $< -o $@
+	$(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@

 %.o: $(XTENSA_SRC_PATH)/%.S
-	$(AS) -Wa,-I,$(XTENSA_SRC_PATH) $(ASFLAGS) -c $< -o $@
+	$(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@

 %.tst: %.o $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile
 	$(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@
--- a/tests/tcg/xtensa/macros.inc
+++ b/tests/tcg/xtensa/macros.inc
@ -1,3 +1,5 @@
+#include "core-isa.h"
+
 .macro test_suite name
 .data
 status: .word result
--- a/tests/tcg/xtensa/test_b.S
+++ b/tests/tcg/xtensa/test_b.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite b

--- a/tests/tcg/xtensa/test_bi.S
+++ b/tests/tcg/xtensa/test_bi.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite bi

--- a/tests/tcg/xtensa/test_boolean.S
+++ b/tests/tcg/xtensa/test_boolean.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite boolean

--- a/tests/tcg/xtensa/test_break.S
+++ b/tests/tcg/xtensa/test_break.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 #define debug_level 6
 #define debug_vector level6
--- a/tests/tcg/xtensa/test_bz.S
+++ b/tests/tcg/xtensa/test_bz.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite bz

--- a/tests/tcg/xtensa/test_clamps.S
+++ b/tests/tcg/xtensa/test_clamps.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite clamps

--- a/tests/tcg/xtensa/test_extui.S
+++ b/tests/tcg/xtensa/test_extui.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite extui

--- a/tests/tcg/xtensa/test_fail.S
+++ b/tests/tcg/xtensa/test_fail.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite fail

--- a/tests/tcg/xtensa/test_interrupt.S
+++ b/tests/tcg/xtensa/test_interrupt.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite interrupt

--- a/tests/tcg/xtensa/test_loop.S
+++ b/tests/tcg/xtensa/test_loop.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite loop

--- a/tests/tcg/xtensa/test_mac16.S
+++ b/tests/tcg/xtensa/test_mac16.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite mac16

--- a/tests/tcg/xtensa/test_max.S
+++ b/tests/tcg/xtensa/test_max.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite max

--- a/tests/tcg/xtensa/test_min.S
+++ b/tests/tcg/xtensa/test_min.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite min

--- a/tests/tcg/xtensa/test_mmu.S
+++ b/tests/tcg/xtensa/test_mmu.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite mmu

--- a/tests/tcg/xtensa/test_mul16.S
+++ b/tests/tcg/xtensa/test_mul16.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite mul16

--- a/tests/tcg/xtensa/test_mul32.S
+++ b/tests/tcg/xtensa/test_mul32.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite mul32

--- a/tests/tcg/xtensa/test_nsa.S
+++ b/tests/tcg/xtensa/test_nsa.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite nsa

--- a/tests/tcg/xtensa/test_pipeline.S
+++ b/tests/tcg/xtensa/test_pipeline.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 .purgem test
 .macro test name
--- a/tests/tcg/xtensa/test_quo.S
+++ b/tests/tcg/xtensa/test_quo.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite quo

--- a/tests/tcg/xtensa/test_rem.S
+++ b/tests/tcg/xtensa/test_rem.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite rem

--- a/tests/tcg/xtensa/test_rst0.S
+++ b/tests/tcg/xtensa/test_rst0.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite rst0

--- a/tests/tcg/xtensa/test_s32c1i.S
+++ b/tests/tcg/xtensa/test_s32c1i.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite s32c1i

--- a/tests/tcg/xtensa/test_sar.S
+++ b/tests/tcg/xtensa/test_sar.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite sar

--- a/tests/tcg/xtensa/test_sext.S
+++ b/tests/tcg/xtensa/test_sext.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite sext

--- a/tests/tcg/xtensa/test_shift.S
+++ b/tests/tcg/xtensa/test_shift.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite shift

--- a/tests/tcg/xtensa/test_sr.S
+++ b/tests/tcg/xtensa/test_sr.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite sr

--- a/tests/tcg/xtensa/test_timer.S
+++ b/tests/tcg/xtensa/test_timer.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite timer

--- a/tests/tcg/xtensa/test_windowed.S
+++ b/tests/tcg/xtensa/test_windowed.S
@ -1,4 +1,4 @@
-.include "macros.inc"
+#include "macros.inc"

 test_suite windowed