fpga_synthesis merge

runtime/tests/nlTest/Makefile

@@ -0,0 +1,44 @@
+
+RISCV_TOOL_PATH ?= $(wildcard ../../../../riscv-gnu-toolchain/drops)
+
+COMP = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-gcc
+# CC_FLAGS = -march=rv32im -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib
+CC_FLAGS = -march=rv32im -mabi=ilp32 -O0 -Wl,-Bstatic,-T,../../startup/vx_link.ld -ffreestanding -nostartfiles -nostdlib
+
+DMP  = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objdump
+CPY  = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objcopy
+
+
+<<<<<<< HEAD:runtime/mains/nlTest/Makefile
+NEWLIB  = ../../newlib/newlib.c
+VX_STR  = ../../startup/vx_start.s
+VX_INT  = ../../intrinsics/vx_intrinsics.s
+VX_IO   = ../../io/vx_io.s ../../io/vx_io.c
+=======
+NEWLIB  = ../../newlib/newlib.c ../../newlib/newlib_notimp.c ../../newlib/newlib.s
+VX_STR  = ../../startup/vx_start.S
+VX_INT  = ../../intrinsics/vx_intrinsics.S
+VX_IO   = ../../io/vx_io.S ../../io/vx_io.c
+>>>>>>> fpga_synthesis:runtime/tests/nlTest/Makefile
+VX_API  = ../../vx_api/vx_api.c
+VX_FIO  = ../../fileio/fileio.S
+
+VX_MAIN = ./vx_nl_main.c
+
+all: HEX DUMP ELF
+
+DUMP: ELF
+	$(DMP) -D vx_nl_main.elf > vx_nl_main.dump
+
+HEX: ELF
+	$(CPY) -O ihex vx_nl_main.elf vx_nl_main.hex
+
+ELF: 
+<<<<<<< HEAD:runtime/mains/nlTest/Makefile
+	$(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN) $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libc.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc -o vx_nl_main.elf
+
+clean:
+	rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug
+=======
+	$(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN) /opt/riscv/riscv32-unknown-elf/lib/libc.a /opt/riscv/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc -o vx_nl_main.elf
+>>>>>>> fpga_synthesis:runtime/tests/nlTest/Makefile

runtime/tests/nlTest/vx_nl_main.c

@@ -0,0 +1,33 @@
+
+#include "../../intrinsics/vx_intrinsics.h"
+#include "../../io/vx_io.h"
+#include "../common/tests.h"
+#include "../../vx_api/vx_api.h"
+#include "../../fileio/fileio.h"
+
+// #include <utlist.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+
+// Newlib
+#include <stdio.h>
+
+int main()
+{
+	// Main is called with all threads active of warp 0
+	vx_tmc(1);
+
+
+	printf("printf: Newlib Main %d\n", 456);
+
+	return 0;
+}
+
+
+
+
+