diff options
-rw-r--r-- | test/mppa/Makefile | 161 | ||||
-rw-r--r-- | test/mppa/builtins/clzll.c (renamed from test/mppa/general/clzll.c) | 0 | ||||
-rw-r--r-- | test/mppa/builtins/stsud.c (renamed from test/mppa/general/stsud.c) | 0 | ||||
-rw-r--r-- | test/mppa/check.sh | 32 | ||||
-rw-r--r-- | test/mppa/generate.sh | 17 | ||||
-rw-r--r-- | test/mppa/instr/.gitignore (renamed from test/mppa/general/.gitignore) | 0 | ||||
-rw-r--r-- | test/mppa/instr/addw.c (renamed from test/mppa/general/addw.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/andd.c (renamed from test/mppa/general/andd.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/andw.c (renamed from test/mppa/general/andw.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/branch.c (renamed from test/mppa/general/branch.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/branchz.c (renamed from test/mppa/general/branchz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/branchzu.c (renamed from test/mppa/general/branchzu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/call.c (renamed from test/mppa/general/call.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.deqz.c (renamed from test/mppa/general/cb.deqz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.dgez.c (renamed from test/mppa/general/cb.dgez.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.dgtz.c (renamed from test/mppa/general/cb.dgtz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.dlez.c (renamed from test/mppa/general/cb.dlez.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.dltz.c (renamed from test/mppa/general/cb.dltz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.dnez.c (renamed from test/mppa/general/cb.dnez.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.wgez.c (renamed from test/mppa/general/cb.wgez.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.wgtz.c (renamed from test/mppa/general/cb.wgtz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.wlez.c (renamed from test/mppa/general/cb.wlez.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/cb.wltz.c (renamed from test/mppa/general/cb.wltz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.eq.c (renamed from test/mppa/general/compd.eq.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.geu.c (renamed from test/mppa/general/compd.geu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.gt.c (renamed from test/mppa/general/compd.gt.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.gtu.c (renamed from test/mppa/general/compd.gtu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.le.c (renamed from test/mppa/general/compd.le.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.leu.c (renamed from test/mppa/general/compd.leu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.lt.c (renamed from test/mppa/general/compd.lt.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.ltu.c (renamed from test/mppa/general/compd.ltu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compd.ne.c (renamed from test/mppa/general/compd.ne.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.eq.c (renamed from test/mppa/general/compw.eq.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.geu.c (renamed from test/mppa/general/compw.geu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.gt.c (renamed from test/mppa/general/compw.gt.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.gtu.c (renamed from test/mppa/general/compw.gtu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.le.c (renamed from test/mppa/general/compw.le.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.leu.c (renamed from test/mppa/general/compw.leu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.lt.c (renamed from test/mppa/general/compw.lt.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.ltu.c (renamed from test/mppa/general/compw.ltu.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/compw.ne.c (renamed from test/mppa/general/compw.ne.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/div2.c (renamed from test/mppa/general/div2.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/for.c (renamed from test/mppa/general/for.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/forvar.c (renamed from test/mppa/general/forvar.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/forvarl.c (renamed from test/mppa/general/forvarl.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/framework.h (renamed from test/mppa/general/framework.h) | 2 | ||||
-rw-r--r-- | test/mppa/instr/lbs.c (renamed from test/mppa/general/lbs.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/lbz.c (renamed from test/mppa/general/lbz.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/muld.c (renamed from test/mppa/general/muld.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/mulw.c (renamed from test/mppa/general/mulw.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/negd.c (renamed from test/mppa/general/negd.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/ord.c (renamed from test/mppa/general/ord.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/sbfd.c (renamed from test/mppa/general/sbfd.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/sbfw.c (renamed from test/mppa/general/sbfw.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/simple.c (renamed from test/mppa/general/simple.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/sllw.c (renamed from test/mppa/general/sllw.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/srad.c (renamed from test/mppa/general/srad.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/srld.c (renamed from test/mppa/general/srld.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/udivd.c (renamed from test/mppa/general/udivd.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/umodd.c (renamed from test/mppa/general/umodd.c) | 0 | ||||
-rw-r--r-- | test/mppa/instr/xord.c (renamed from test/mppa/general/xord.c) | 0 |
61 files changed, 102 insertions, 110 deletions
diff --git a/test/mppa/Makefile b/test/mppa/Makefile index 5b312475..148b16b3 100644 --- a/test/mppa/Makefile +++ b/test/mppa/Makefile @@ -1,70 +1,111 @@ -DIR=general -BINDIR=bin -ASMDIR=asm +K1CC ?= k1-mbr-gcc +CC ?= gcc +CCOMP ?= ccomp +CFLAGS ?= -O2 +SIMU ?= k1-cluster +TIMEOUT ?= 10s + +DIR=instr +SRCDIR=$(DIR) +OUTDIR=$(DIR)/out +BINDIR=$(DIR)/bin +ASMDIR=$(DIR)/asm + +## +# Intended flow : .c -> .gcc.s -> .gcc.bin -> .gcc.out +# -> .ccomp.s -> .ccomp.bin -> .ccomp.out +## + +K1CCPATH=$(shell which $(K1CC)) +CCPATH=$(shell which $(CC)) +CCOMPPATH=$(shell which $(CCOMP)) +SIMUPATH=$(shell which $(SIMU)) + TESTNAMES=$(notdir $(subst .c,,$(wildcard $(DIR)/*.c))) +X86_GCC_OUT=$(addprefix $(OUTDIR)/,$(addsuffix .x86-gcc.out,$(TESTNAMES))) +GCC_OUT=$(addprefix $(OUTDIR)/,$(addsuffix .gcc.out,$(TESTNAMES))) +CCOMP_OUT=$(addprefix $(OUTDIR)/,$(addsuffix .ccomp.out,$(TESTNAMES))) -CCOMP=../../ccomp -#TESTS=$(addprefix $(DIR)/,$(TESTNAMES)) -ELF=$(addprefix $(DIR)/$(BINDIR)/,$(addsuffix .bin,$(TESTNAMES))) -TOK=$(addprefix $(DIR)/$(BINDIR)/,$(addsuffix .tok,$(TESTNAMES))) -ASM=$(addprefix $(DIR)/$(ASMDIR)/,$(addsuffix .s,$(TESTNAMES))) -DEBUG:=$(if $(DEBUG),"-dall",) +OUT=$(X86_GCC_OUT) $(GCC_OUT) $(CCOMP_OUT) +BIN=$(addprefix $(BINDIR)/,$(addsuffix .x86-gcc.bin,$(TESTNAMES)))\ + $(addprefix $(BINDIR)/,$(addsuffix .gcc.bin,$(TESTNAMES)))\ + $(addprefix $(BINDIR)/,$(addsuffix .ccomp.bin,$(TESTNAMES))) -.PHONY: all -all: $(ELF) +## +# Targets +## -nobin: $(ASM) +all: $(BIN) -$(DIR)/$(BINDIR)/%.bin: $(DIR)/$(ASMDIR)/%.s - @mkdir -p $(@D) - ccomp $< -o $@ +.PHONY: +test: $(X86_GCC_OUT) $(GCC_OUT) + @echo "Comparing x86 gcc output to k1 gcc.." + @for test in $(TESTNAMES); do\ + x86out=$(OUTDIR)/$$test.x86-gcc.out;\ + gccout=$(OUTDIR)/$$test.gcc.out;\ + if ! diff $$x86out $$gccout; then\ + >&2 echo "ERROR: $$x86out and $$gccout differ";\ + else\ + echo "GOOD: $$x86out and $$gccout concur";\ + fi;\ + done + +.PHONY: +check: $(GCC_OUT) $(CCOMP_OUT) + @echo "Comparing k1 gcc output to ccomp.." + @for test in $(TESTNAMES); do\ + gccout=$(OUTDIR)/$$test.gcc.out;\ + ccompout=$(OUTDIR)/$$test.ccomp.out;\ + if ! diff $$ccompout $$gccout; then\ + >&2 echo "ERROR: $$ccompout and $$gccout differ";\ + else\ + echo "GOOD: $$ccompout and $$gccout concur";\ + fi;\ + done + +## +# Rules +## .SECONDARY: -$(DIR)/$(ASMDIR)/%.s: $(DIR)/%.c $(CCOMP) +# Generating output + +$(OUTDIR)/%.x86-gcc.out: $(BINDIR)/%.x86-gcc.bin + @mkdir -p $(@D) + timeout $(TIMEOUT) ./$< || { ret=$$?; } > $@; echo $$ret >> $@ + +$(OUTDIR)/%.gcc.out: $(BINDIR)/%.gcc.bin $(SIMUPATH) + @mkdir -p $(@D) + timeout $(TIMEOUT) $(SIMU) -- $< || { ret=$$?; } > $@; echo $$ret >> $@ + +$(OUTDIR)/%.ccomp.out: $(BINDIR)/%.ccomp.bin $(SIMUPATH) + @mkdir -p $(@D) + timeout $(TIMEOUT) $(SIMU) -- $< || { ret=$$?; } > $@; echo $$ret >> $@ + +# Assembly to binary + +$(BINDIR)/%.x86-gcc.bin: $(ASMDIR)/%.x86-gcc.s $(CCPATH) + @mkdir -p $(@D) + $(CC) $(CFLAGS) $< -o $@ + +$(BINDIR)/%.gcc.bin: $(ASMDIR)/%.gcc.s $(K1CCPATH) + @mkdir -p $(@D) + $(K1CC) $(CFLAGS) $< -o $@ + +$(BINDIR)/%.ccomp.bin: $(ASMDIR)/%.ccomp.s $(CCOMPPATH) + @mkdir -p $(@D) + $(CCOMP) $(CFLAGS) $< -o $@ + +# Source to assembly + +$(ASMDIR)/%.x86-gcc.s: $(SRCDIR)/%.c $(CCPATH) + @mkdir -p $(@D) + $(CC) $(CFLAGS) -S $< -o $@ + +$(ASMDIR)/%.gcc.s: $(SRCDIR)/%.c $(K1CCPATH) @mkdir -p $(@D) - ccomp $(DEBUG) -O0 -v -S $< -o $@ + $(K1CC) $(CFLAGS) -S $< -o $@ -$(DIR)/$(BINDIR)/%.tok: $(DIR)/$(BINDIR)/%.bin $(DIR)/output/%.bin.exp +$(ASMDIR)/%.ccomp.s: $(SRCDIR)/%.c $(CCOMPPATH) @mkdir -p $(@D) - @bash check.sh $< $@ - -$(DIR)/output/%.bin.exp: $(DIR)/%.c - @bash generate.sh $< $@ - -.PHONY: FORCE -FORCE: - -.PHONY: check -check: $(TOK) sort mmult - -.PHONY: coverage -coverage: $(ASM) - bash coverage.sh $(DIR)/$(ASMDIR) - - -.PHONY: sort -sort: FORCE - (cd sort && make compc-check) - -.PHONY: mmult -mmult: FORCE - (cd mmult && make compc-check) - -.PHONY: clean -clean: - rm -f $(DIR)/*.alloctrace - rm -f $(DIR)/*.cm - rm -f $(DIR)/*.compcert.c - rm -f $(DIR)/*.i - rm -f $(DIR)/*.light.c - rm -f $(DIR)/*.ltl - rm -f $(DIR)/*.mach - rm -f $(DIR)/*.parsed.c - rm -f $(DIR)/*.rtl.? - rm -f $(DIR)/$(ASMDIR)/*.s - rm -f $(DIR)/$(BINDIR)/*.bin - rm -f $(DIR)/$(BINDIR)/*.tok - rm -f $(DIR)/output/*.out - rm -f $(DIR)/output/*.exp - rm -rf $(DIR)/profile/ - rm -f $(ELF) + $(CCOMP) $(CFLAGS) -S $< -o $@ diff --git a/test/mppa/general/clzll.c b/test/mppa/builtins/clzll.c index 13905cba..13905cba 100644 --- a/test/mppa/general/clzll.c +++ b/test/mppa/builtins/clzll.c diff --git a/test/mppa/general/stsud.c b/test/mppa/builtins/stsud.c index 81fb6e6d..81fb6e6d 100644 --- a/test/mppa/general/stsud.c +++ b/test/mppa/builtins/stsud.c diff --git a/test/mppa/check.sh b/test/mppa/check.sh deleted file mode 100644 index dd9691be..00000000 --- a/test/mppa/check.sh +++ /dev/null @@ -1,32 +0,0 @@ -# $1: binary file to check -# $2: output check token - -elffile="$1" -token="$2" - -if [ ! -f $elffile ]; then - >&2 echo "ERROR: $elffile not found" - shift; continue -fi - -dir="$(dirname $elffile)" -elf="$(basename $elffile)" - -exp="$dir/../output/$elf.exp" -out="$dir/../output/$elf.out" -if [ ! -f $exp ]; then - >&2 echo "ERROR: $exp not found" - exit -fi - -k1-cluster -- $elffile > $out -echo $? >> $out - -if ! diff $exp $out; then - >&2 echo "ERROR: $exp and $out differ" - exit -fi - -echo "PASSED: $elf" -touch $token -#shift diff --git a/test/mppa/generate.sh b/test/mppa/generate.sh deleted file mode 100644 index a883b8f5..00000000 --- a/test/mppa/generate.sh +++ /dev/null @@ -1,17 +0,0 @@ -# $1: c file to examine -# $2: write file - -cfile="$1" -writefile="$2" - -if [ ! -f $cfile ]; then - >&2 echo "ERROR: $cfile not found" - shift; continue -fi - -mkdir -p $(dirname $writefile) - -#sed -n "s/^.*\/\*\s*RETURN VALUE:\s*\([0-9]*\)\s*\*\//\1/p" $1 > $2 -tmpbin=/tmp/k1-$(basename $1)-bin -k1-mbr-gcc -O0 $1 -o $tmpbin -(k1-cluster -- $tmpbin; echo $? > $2) diff --git a/test/mppa/general/.gitignore b/test/mppa/instr/.gitignore index ea1472ec..ea1472ec 100644 --- a/test/mppa/general/.gitignore +++ b/test/mppa/instr/.gitignore diff --git a/test/mppa/general/addw.c b/test/mppa/instr/addw.c index be8afc67..be8afc67 100644 --- a/test/mppa/general/addw.c +++ b/test/mppa/instr/addw.c diff --git a/test/mppa/general/andd.c b/test/mppa/instr/andd.c index 4f503764..4f503764 100644 --- a/test/mppa/general/andd.c +++ b/test/mppa/instr/andd.c diff --git a/test/mppa/general/andw.c b/test/mppa/instr/andw.c index 99de0049..99de0049 100644 --- a/test/mppa/general/andw.c +++ b/test/mppa/instr/andw.c diff --git a/test/mppa/general/branch.c b/test/mppa/instr/branch.c index 72e7e20e..72e7e20e 100644 --- a/test/mppa/general/branch.c +++ b/test/mppa/instr/branch.c diff --git a/test/mppa/general/branchz.c b/test/mppa/instr/branchz.c index fb86d357..fb86d357 100644 --- a/test/mppa/general/branchz.c +++ b/test/mppa/instr/branchz.c diff --git a/test/mppa/general/branchzu.c b/test/mppa/instr/branchzu.c index 97adb605..97adb605 100644 --- a/test/mppa/general/branchzu.c +++ b/test/mppa/instr/branchzu.c diff --git a/test/mppa/general/call.c b/test/mppa/instr/call.c index 727cef63..727cef63 100644 --- a/test/mppa/general/call.c +++ b/test/mppa/instr/call.c diff --git a/test/mppa/general/cb.deqz.c b/test/mppa/instr/cb.deqz.c index c56733f0..c56733f0 100644 --- a/test/mppa/general/cb.deqz.c +++ b/test/mppa/instr/cb.deqz.c diff --git a/test/mppa/general/cb.dgez.c b/test/mppa/instr/cb.dgez.c index abb6ec57..abb6ec57 100644 --- a/test/mppa/general/cb.dgez.c +++ b/test/mppa/instr/cb.dgez.c diff --git a/test/mppa/general/cb.dgtz.c b/test/mppa/instr/cb.dgtz.c index d4271845..d4271845 100644 --- a/test/mppa/general/cb.dgtz.c +++ b/test/mppa/instr/cb.dgtz.c diff --git a/test/mppa/general/cb.dlez.c b/test/mppa/instr/cb.dlez.c index 18e67f06..18e67f06 100644 --- a/test/mppa/general/cb.dlez.c +++ b/test/mppa/instr/cb.dlez.c diff --git a/test/mppa/general/cb.dltz.c b/test/mppa/instr/cb.dltz.c index 366aea49..366aea49 100644 --- a/test/mppa/general/cb.dltz.c +++ b/test/mppa/instr/cb.dltz.c diff --git a/test/mppa/general/cb.dnez.c b/test/mppa/instr/cb.dnez.c index 81c2cd29..81c2cd29 100644 --- a/test/mppa/general/cb.dnez.c +++ b/test/mppa/instr/cb.dnez.c diff --git a/test/mppa/general/cb.wgez.c b/test/mppa/instr/cb.wgez.c index 477f4bc6..477f4bc6 100644 --- a/test/mppa/general/cb.wgez.c +++ b/test/mppa/instr/cb.wgez.c diff --git a/test/mppa/general/cb.wgtz.c b/test/mppa/instr/cb.wgtz.c index c9ab9a06..c9ab9a06 100644 --- a/test/mppa/general/cb.wgtz.c +++ b/test/mppa/instr/cb.wgtz.c diff --git a/test/mppa/general/cb.wlez.c b/test/mppa/instr/cb.wlez.c index c3069fda..c3069fda 100644 --- a/test/mppa/general/cb.wlez.c +++ b/test/mppa/instr/cb.wlez.c diff --git a/test/mppa/general/cb.wltz.c b/test/mppa/instr/cb.wltz.c index 6cf5fcf0..6cf5fcf0 100644 --- a/test/mppa/general/cb.wltz.c +++ b/test/mppa/instr/cb.wltz.c diff --git a/test/mppa/general/compd.eq.c b/test/mppa/instr/compd.eq.c index d19a4d20..d19a4d20 100644 --- a/test/mppa/general/compd.eq.c +++ b/test/mppa/instr/compd.eq.c diff --git a/test/mppa/general/compd.geu.c b/test/mppa/instr/compd.geu.c index edc31183..edc31183 100644 --- a/test/mppa/general/compd.geu.c +++ b/test/mppa/instr/compd.geu.c diff --git a/test/mppa/general/compd.gt.c b/test/mppa/instr/compd.gt.c index 24147779..24147779 100644 --- a/test/mppa/general/compd.gt.c +++ b/test/mppa/instr/compd.gt.c diff --git a/test/mppa/general/compd.gtu.c b/test/mppa/instr/compd.gtu.c index 5ce82569..5ce82569 100644 --- a/test/mppa/general/compd.gtu.c +++ b/test/mppa/instr/compd.gtu.c diff --git a/test/mppa/general/compd.le.c b/test/mppa/instr/compd.le.c index a84aad97..a84aad97 100644 --- a/test/mppa/general/compd.le.c +++ b/test/mppa/instr/compd.le.c diff --git a/test/mppa/general/compd.leu.c b/test/mppa/instr/compd.leu.c index e386bc27..e386bc27 100644 --- a/test/mppa/general/compd.leu.c +++ b/test/mppa/instr/compd.leu.c diff --git a/test/mppa/general/compd.lt.c b/test/mppa/instr/compd.lt.c index df07a708..df07a708 100644 --- a/test/mppa/general/compd.lt.c +++ b/test/mppa/instr/compd.lt.c diff --git a/test/mppa/general/compd.ltu.c b/test/mppa/instr/compd.ltu.c index dfaa8921..dfaa8921 100644 --- a/test/mppa/general/compd.ltu.c +++ b/test/mppa/instr/compd.ltu.c diff --git a/test/mppa/general/compd.ne.c b/test/mppa/instr/compd.ne.c index 19ce0a69..19ce0a69 100644 --- a/test/mppa/general/compd.ne.c +++ b/test/mppa/instr/compd.ne.c diff --git a/test/mppa/general/compw.eq.c b/test/mppa/instr/compw.eq.c index dc7a3ab1..dc7a3ab1 100644 --- a/test/mppa/general/compw.eq.c +++ b/test/mppa/instr/compw.eq.c diff --git a/test/mppa/general/compw.geu.c b/test/mppa/instr/compw.geu.c index d72ca56c..d72ca56c 100644 --- a/test/mppa/general/compw.geu.c +++ b/test/mppa/instr/compw.geu.c diff --git a/test/mppa/general/compw.gt.c b/test/mppa/instr/compw.gt.c index 9ad02610..9ad02610 100644 --- a/test/mppa/general/compw.gt.c +++ b/test/mppa/instr/compw.gt.c diff --git a/test/mppa/general/compw.gtu.c b/test/mppa/instr/compw.gtu.c index 77f04989..77f04989 100644 --- a/test/mppa/general/compw.gtu.c +++ b/test/mppa/instr/compw.gtu.c diff --git a/test/mppa/general/compw.le.c b/test/mppa/instr/compw.le.c index b7a7a432..b7a7a432 100644 --- a/test/mppa/general/compw.le.c +++ b/test/mppa/instr/compw.le.c diff --git a/test/mppa/general/compw.leu.c b/test/mppa/instr/compw.leu.c index 4892f06c..4892f06c 100644 --- a/test/mppa/general/compw.leu.c +++ b/test/mppa/instr/compw.leu.c diff --git a/test/mppa/general/compw.lt.c b/test/mppa/instr/compw.lt.c index 2cc151bf..2cc151bf 100644 --- a/test/mppa/general/compw.lt.c +++ b/test/mppa/instr/compw.lt.c diff --git a/test/mppa/general/compw.ltu.c b/test/mppa/instr/compw.ltu.c index b524127f..b524127f 100644 --- a/test/mppa/general/compw.ltu.c +++ b/test/mppa/instr/compw.ltu.c diff --git a/test/mppa/general/compw.ne.c b/test/mppa/instr/compw.ne.c index 433b0b86..433b0b86 100644 --- a/test/mppa/general/compw.ne.c +++ b/test/mppa/instr/compw.ne.c diff --git a/test/mppa/general/div2.c b/test/mppa/instr/div2.c index 01a4b575..01a4b575 100644 --- a/test/mppa/general/div2.c +++ b/test/mppa/instr/div2.c diff --git a/test/mppa/general/for.c b/test/mppa/instr/for.c index d6870afb..d6870afb 100644 --- a/test/mppa/general/for.c +++ b/test/mppa/instr/for.c diff --git a/test/mppa/general/forvar.c b/test/mppa/instr/forvar.c index 57548274..57548274 100644 --- a/test/mppa/general/forvar.c +++ b/test/mppa/instr/forvar.c diff --git a/test/mppa/general/forvarl.c b/test/mppa/instr/forvarl.c index 30717a51..30717a51 100644 --- a/test/mppa/general/forvarl.c +++ b/test/mppa/instr/forvarl.c diff --git a/test/mppa/general/framework.h b/test/mppa/instr/framework.h index 78f2617e..f6077c46 100644 --- a/test/mppa/general/framework.h +++ b/test/mppa/instr/framework.h @@ -1,7 +1,7 @@ #ifndef __FRAMEWORK_H__ #define __FRAMEWORK_H__ -#include "../lib/prng.c" +#include "../prng/prng.c" #define BEGIN_TEST(type)\ int main(void){\ diff --git a/test/mppa/general/lbs.c b/test/mppa/instr/lbs.c index f104d62b..f104d62b 100644 --- a/test/mppa/general/lbs.c +++ b/test/mppa/instr/lbs.c diff --git a/test/mppa/general/lbz.c b/test/mppa/instr/lbz.c index 2deeaebe..2deeaebe 100644 --- a/test/mppa/general/lbz.c +++ b/test/mppa/instr/lbz.c diff --git a/test/mppa/general/muld.c b/test/mppa/instr/muld.c index 9a40f389..9a40f389 100644 --- a/test/mppa/general/muld.c +++ b/test/mppa/instr/muld.c diff --git a/test/mppa/general/mulw.c b/test/mppa/instr/mulw.c index bf517ce8..bf517ce8 100644 --- a/test/mppa/general/mulw.c +++ b/test/mppa/instr/mulw.c diff --git a/test/mppa/general/negd.c b/test/mppa/instr/negd.c index a8e8ff45..a8e8ff45 100644 --- a/test/mppa/general/negd.c +++ b/test/mppa/instr/negd.c diff --git a/test/mppa/general/ord.c b/test/mppa/instr/ord.c index eaedcb28..eaedcb28 100644 --- a/test/mppa/general/ord.c +++ b/test/mppa/instr/ord.c diff --git a/test/mppa/general/sbfd.c b/test/mppa/instr/sbfd.c index 912f1fdb..912f1fdb 100644 --- a/test/mppa/general/sbfd.c +++ b/test/mppa/instr/sbfd.c diff --git a/test/mppa/general/sbfw.c b/test/mppa/instr/sbfw.c index feffd497..feffd497 100644 --- a/test/mppa/general/sbfw.c +++ b/test/mppa/instr/sbfw.c diff --git a/test/mppa/general/simple.c b/test/mppa/instr/simple.c index 89bba27e..89bba27e 100644 --- a/test/mppa/general/simple.c +++ b/test/mppa/instr/simple.c diff --git a/test/mppa/general/sllw.c b/test/mppa/instr/sllw.c index df55c9e8..df55c9e8 100644 --- a/test/mppa/general/sllw.c +++ b/test/mppa/instr/sllw.c diff --git a/test/mppa/general/srad.c b/test/mppa/instr/srad.c index b4047bc7..b4047bc7 100644 --- a/test/mppa/general/srad.c +++ b/test/mppa/instr/srad.c diff --git a/test/mppa/general/srld.c b/test/mppa/instr/srld.c index 71e82b2a..71e82b2a 100644 --- a/test/mppa/general/srld.c +++ b/test/mppa/instr/srld.c diff --git a/test/mppa/general/udivd.c b/test/mppa/instr/udivd.c index 52e0d412..52e0d412 100644 --- a/test/mppa/general/udivd.c +++ b/test/mppa/instr/udivd.c diff --git a/test/mppa/general/umodd.c b/test/mppa/instr/umodd.c index e7dd506f..e7dd506f 100644 --- a/test/mppa/general/umodd.c +++ b/test/mppa/instr/umodd.c diff --git a/test/mppa/general/xord.c b/test/mppa/instr/xord.c index b9d86f06..b9d86f06 100644 --- a/test/mppa/general/xord.c +++ b/test/mppa/instr/xord.c |