Merge pull request #4 from sderrien/dev

Dev

Author: Steven Derrien

Makefile

@@ -49,7 +49,7 @@ rsync:
 
 
 rdebug: rgdb
-	ssh sderrien@ubuntu18vm $(REMOTE_PATH)/bin/gdb-server-uart 
+	ssh sderrien@ubuntu18vm $(REMOTE_PATH)/bin/gdb-server-uart $(DEVICE)
 	riscv32-unknown-elf-gdb ../riscv-programs/example.elf --ex='target $(REMOTE_HOST):1234'
 
 debug:

readme.md

@@ -32,40 +32,49 @@ Installation
 
 Get the sources from the repo
 
-	git clone 
+	git clone https://github.com/sderrien/riscv-hls.git
 
 Update `PATH` with local folders 
 
-	export PATH=$PATH:#$install_dir/bin
+	cd riscv-hls
+	export PATH=$PATH:`pwd`/bin
 
-Synthesize  RTL for the CPU ISS with Vivado HLS
+Installation
+------------
+
 
-	make -C ./riscv-core hls_ip
+Synthesize RTL for the CPU ISS with Vivado HLS
+
+	make hls
 
 Perform logic sythesis, place & route and geenrate bitstream
 
-	make -C ./vivado bistream
+	make bistream
+
+Program the Nexys4-DDR board through Digilent USB bridge  
 
-Program the Nexys4-DDR board (assume /dev/ttyUSB1)   
+	make program 
 
-	make -C ./vivado program
+Compiling gdb servers for the RISCV  
 
-Compiling RISCV programs 
+	make gdb 
+	
+Compiling RISCV example programs 
 
-	make -C ./riscv-programs 
+	make elf 
 
 
 Usage (from command line) 
 -------------------------
 
-Debugging a progam using the ISS model running on the host CPU
+To debug a program running on the ISS model running on the host CPU
 
 	gdb-server-iss
 	riscv32-unknown-elf-gdb -ex "target remote :1234" ../riscv-programs/example.elf
 
-Debugging a program running on the RISCV core on the FPGA
+To debug a program running on the FPGA using the RISCV hardware IP synthesized from the ISS model
 
-	gdb-server-uart
+	gdb-server-uart 
 	riscv32-unknown-elf-gdb -ex "target remote 1234" ../riscv-programs/example.elf
 
 

riscv-core/.cproject

@@ -10,11 +10,13 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration"/>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.core.pathentry">
 		<pathentry include="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/" kind="inc" path="" system="true"/>
+		<pathentry base-path="riscv-gdbserver" include="" kind="inc" path="" system="true"/>
 		<pathentry kind="src" path=""/>
 		<pathentry kind="out" path="build"/>
 	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cproject>

riscv-core/hls/Makefile

@@ -1,3 +1,4 @@
 hls: 
+	-rm -rf uart_master
 	vivado_hls -f hls.tcl
 

riscv-core/hls/hls.tcl

@@ -6,8 +6,8 @@
 open_project uart_master
 set_top uart_master
 add_files ../src/asm.cpp
-add_files  ../src/miniriscv.cpp
-add_files -cflags -I../../riscv-gdbserver ../src/uart_server.cpp
+add_files -cflags "-I../../riscv-gdbserver -I../src" ../src/riscv-iss.cpp
+add_files -cflags "-I../../riscv-gdbserver -I../src" ../src/uart_server.cpp
 open_solution "solution1"
 set_part {xc7a100tcsg324-1}
 create_clock -period 10 -name default

riscv-core/src/asm.cpp

@@ -38,7 +38,8 @@ struct decode_info decode(unsigned int ir) {
 	}
 }
 
-#ifndef SYNTHESIS
+#ifndef __SYNTHESIS__
+
 char buffer[256];
 
 char *regnames[32] = { "zero", "ra", "sp", "gp", "tp", "t0", "t1", "t2",

riscv-core/src/riscv-iss.cpp

@@ -104,13 +104,18 @@ int cpu_load(uint32_t addr) {
 }
 
 void cpu_store(uint32_t addr,uint8_t data) {
+	if (addr < (MEMSIZE)) {
+
 	memw[addr]=data;
 	switch (addr%4) {
 		case 0: mem0[addr32(addr)]= data; break;
 		case 1: mem1[addr32(addr)]= data; break;
 		case 2: mem2[addr32(addr)]= data; break;
 		case 3: mem3[addr32(addr)]= data; break;
 	}
+	} else {
+		PRINTF("Out of bound [%08X]\n",addr);
+	}
 //	PRINTF("[%08X]=%02X ; {%02X,%02X,%02X,%02X}\n",addr,data,
 //			mem0[addr32(addr)],
 //			mem1[addr32(addr)],
@@ -184,21 +189,6 @@ int remove_hw_bkpt(uint32_t addr) {
 	return 0;
 }
 
-//int read_csr(uint16_t addr) {
-//	switch (addr) {
-//		case RISCV_CSR_MTVEC:
-//			return mtvec;
-//			break;
-//		default:
-//			break;
-//	}
-//}
-//
-//csr[RISCV_CSR_MEPC] = pc;
-//		next_pc = csr[RISCV_CSR_MTVEC];
-//int write_csr(uint16_t addr,uint32_t data) {
-//}
-
 uint32_t cpu_step(bool irq) {
 
 	char shcpt = -1;
@@ -698,20 +688,6 @@ int cpu_info(uint8_t id) {
 	return 0xDEADBEEF;
 }
 
-//int cpu_run() {
-//	uint32_t pc;
-//	u_int32_t cpt = 0;
-//	bool irq = false;
-//	do {
-//		pc = cpu_step(irq);
-//		if (match_hbkpt(pc)) {
-//			return pc;
-//		}
-//		if (halted) {
-//			return pc;
-//		}
-//	} while (1);
-//}
 
 #pragma toplevel
 int riscv(volatile unsigned int *leds, volatile unsigned int *dbg_pc,
@@ -739,41 +715,4 @@ int riscv(volatile unsigned int *leds, volatile unsigned int *dbg_pc,
 
 }
 
-#ifndef __SYNTHESIS__
-int loadbinary(char *filename) {
-	int i;
-	FILE *f;
-	char buffer[16];
-	f = fopen(filename, "r");
-	i = 0;
-	if (f != NULL) {
-		while (!feof(f) && i < (MEMSIZE)) {
-			fread(buffer, 4, 1, f);
-			mem0[i / 4] = buffer[0];
-			mem1[i / 4] = buffer[1];
-			mem2[i / 4] = buffer[2];
-			mem3[i / 4] = buffer[3];
-			i += 4;
-		}
-		fclose(f);
-		return i;
-	} else {
-		fprintf(stderr, "Could not open %s\n", filename);
-		return -1;
-	}
-}
-#endif
 
-#ifdef MAIN
-int main(int argc, char **argv) {
-	unsigned int leds;
-	unsigned int pc;
-	unsigned int ir;
-
-#ifndef __SYNTHESIS__
-	loadbinary(argv[1]);
-#endif
-	riscv(&leds, &pc,&ir,iomap);
-	return 0;
-}
-#endif

riscv-core/src/uart_server.cpp

@@ -14,16 +14,13 @@
 #include <unistd.h>
 #endif
 
-#include <gdb-target.h>
-#include "rvi32.h"
-
 
 #ifdef __SYNTHESIS__
 
-#define FFLUSH(...) 0
-#define PRINTF(...) 0
-#define FPRINTF(...) 0
-#define EXIT(a) 0
+#define FFLUSH(...)
+#define PRINTF(...)
+#define FPRINTF(...)
+#define EXIT(a)
 
 #else
 
@@ -34,6 +31,10 @@
 
 #endif
 
+
+#include <gdb-target.h>
+#include <rvi32.h>
+
 #ifndef __SYNTHESIS__
 
 FILE *in_trace , *out_trace = NULL;
@@ -101,15 +102,12 @@ int read_byte(volatile unsigned int *uart) {
 #endif
 }
 
-
+#define TX_FULL_MASK 0x8
 
 void write_byte(volatile unsigned int *uart, unsigned char data) {
 #ifdef __SYNTHESIS__
 	int x;
-	for (int k=0;k<0x1000;k++) {
-		x= uart[2];
-	}
-	while ((uart[2] & 0x2)!=0);
+	while ((uart[2] & TX_FULL_MASK)!=0);
 	uart[1] = data;
 	return;
 #else
@@ -207,7 +205,6 @@ uint32_t cpu_step(bool irq);
 int cpu_load(uint32_t addr);
 void cpu_store(uint32_t addr,uint8_t data);
 int cpu_reset();
-int loadbinary(char *filename);
 
 extern bool halted ;
 int cmd_count = 0xAB000000;
@@ -381,10 +378,6 @@ int uart_master(volatile bool *debug, volatile bool *step,
 	write_string(uart, "Helloworld from hls-riscv on nexys4-DDR\r\n");
 	while (1) {
 
-//
-//		if (!halted) {
-//			cpu_step(false);
-//		}
 		if (*step ) {
 			*dbg_ir = 0xABBADEDE;
 		}
@@ -398,38 +391,4 @@ int uart_master(volatile bool *debug, volatile bool *step,
 	}
 }
 
-int main(int argc, char** argv) {
-	unsigned int io[1024];
-	unsigned int pc, ir;
-	bool dbg, step;
-
-#ifndef __SYNTHESIS__
-	// Open FIFO for write only
-	mkfifo("/tmp/c2s",0666);
-	io[0] = open("/tmp/c2s", O_RDONLY|O_NONBLOCK);
-	if (io[0]<0) {
-		FPRINTF(stderr,"error c2s\n");FFLUSH(stderr);
-		return -1;
-	}
-
-	mkfifo("/tmp/s2c",0666);
-	io[1] = open("/tmp/s2c", O_WRONLY);
-	if (io[1]<0) {
-		FPRINTF(stderr,"error s2c\n");FFLUSH(stderr);
-		return -1;
-	}
-
-	if (argc==2) {
-		FPRINTF(stdout,"loading program %s\n",argv[1]); FFLUSH(stdout);
-		loadbinary(argv[1]);
-	}
-
-	FPRINTF(stdout,"opened pipes\n"); FFLUSH(stdout);
-#endif
-
-	uart_master(&dbg, &step, &pc, &ir, io);
-#ifndef __SYNTHESIS__
-	system("/bin/stty -raw");
-#endif
-}
 

riscv-gdbserver/gdb-target-uart.cpp

@@ -77,30 +77,25 @@ bool init_device(char *device) {
 }
 
 
-unsigned int hasbyte = 0;
-
-
-
 bool has_byte() {
 	int bytes;
 	ioctl(tty, FIONREAD, &bytes);
 	return bytes>1;
 }
 
-int cpt = 1;
-
-// int bytes;
-// ioctl(fd, FIONREAD, &bytes);
-
 int read_byte() {
 	unsigned char c;
 	do {
-		hasbyte = (read(tty, &c, sizeof(char))==1) ;
+		int hasbyte = (read(tty, &c, sizeof(char))==1) ;
+		if (hasbyte<0) {
+			fprintf(stderr,"Error tty\n");
+			exit(-1);
+		}
 		trace_in(c);
 		if ((c&0x80)==0) {
 			return c;
 		} else {
-			printf("%c",c);
+			printf("stdout: %c",c);
 		}
 	} while(1);
 }