Commit a2e67072 authored by Max Filippov's avatar Max Filippov
Browse files

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: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent d0fa1f0d

tests/tcg/xtensa/Makefile

+7 −4
Original line number Diff line number Diff line 
-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 $@

tests/tcg/xtensa/macros.inc

+2 −0
Original line number Diff line number Diff line 
#include "core-isa.h"



.macro test_suite name

.data

status: .word result

tests/tcg/xtensa/test_b.S

+1 −1
Original line number Diff line number Diff line 
.include "macros.inc"

#include "macros.inc"



test_suite b

tests/tcg/xtensa/test_bi.S

+1 −1
Original line number Diff line number Diff line 
.include "macros.inc"

#include "macros.inc"



test_suite bi

tests/tcg/xtensa/test_boolean.S

+1 −1
Original line number Diff line number Diff line 
.include "macros.inc"

#include "macros.inc"



test_suite boolean