From f46ec583d6632c5c6b84e9b6d587500258e314e8 Mon Sep 17 00:00:00 2001
From: Charles Papon <charles.papon.90@gmail.com>
Date: Wed, 7 Jun 2017 23:02:21 +0200
Subject: [PATCH] Briey is now working with DataCache on FPGA

---
 src/main/scala/SpinalRiscv/demo/Briey.scala | 48 +++++++-------
 src/test/cpp/briey/main.cpp                 | 70 ++++++++++++---------
 2 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/src/main/scala/SpinalRiscv/demo/Briey.scala b/src/main/scala/SpinalRiscv/demo/Briey.scala
index 3d53a48..1f556f5 100644
--- a/src/main/scala/SpinalRiscv/demo/Briey.scala
+++ b/src/main/scala/SpinalRiscv/demo/Briey.scala
@@ -149,31 +149,31 @@ class Briey(config: BrieyConfig) extends Component{
 //              portTlbSize = 4
 //            )
           ),
-          new DBusSimplePlugin(
-            catchAddressMisaligned = false,
-            catchAccessFault = false
+//          new DBusSimplePlugin(
+//            catchAddressMisaligned = false,
+//            catchAccessFault = false
+//          ),
+          new DBusCachedPlugin(
+            config = new DataCacheConfig(
+              cacheSize         = 4096,
+              bytePerLine       = 32,
+              wayCount          = 1,
+              addressWidth      = 32,
+              cpuDataWidth      = 32,
+              memDataWidth      = 32,
+              catchAccessError  = false,
+              catchIllegal      = false,
+              catchUnaligned    = false,
+              catchMemoryTranslationMiss = false
+            ),
+            memoryTranslatorPortConfig = null
+            //            memoryTranslatorPortConfig = MemoryTranslatorPortConfig(
+            //              portTlbSize = 6
+            //            )
+          ),
+          new StaticMemoryTranslatorPlugin(
+            ioRange      = _(31 downto 28) === 0xF
           ),
-//          new DBusCachedPlugin(
-//            config = new DataCacheConfig(
-//              cacheSize         = 4096,
-//              bytePerLine       = 32,
-//              wayCount          = 1,
-//              addressWidth      = 32,
-//              cpuDataWidth      = 32,
-//              memDataWidth      = 32,
-//              catchAccessError  = false,
-//              catchIllegal      = false,
-//              catchUnaligned    = false,
-//              catchMemoryTranslationMiss = false
-//            ),
-//            memoryTranslatorPortConfig = null
-//            //            memoryTranslatorPortConfig = MemoryTranslatorPortConfig(
-//            //              portTlbSize = 6
-//            //            )
-//          ),
-//          new StaticMemoryTranslatorPlugin(
-//            ioRange      = _(31 downto 28) === 0xF
-//          ),
           new DecoderSimplePlugin(
             catchIllegalInstruction = false
           ),
diff --git a/src/test/cpp/briey/main.cpp b/src/test/cpp/briey/main.cpp
index 89161a7..50c8fd8 100644
--- a/src/test/cpp/briey/main.cpp
+++ b/src/test/cpp/briey/main.cpp
@@ -212,38 +212,48 @@ public:
 			usleep(100);
 		}
 	}
+
+	uint32_t selfSleep = 0;
 	virtual void tick(){
-		if(clientHandle == -1){
-			clientHandle = accept(serverSocket, (struct sockaddr *) &serverStorage, &addr_size);
-			if(clientHandle != -1)
-				printf("CONNECTED\n");
-		}
-		if(clientHandle != -1){
-			uint8_t buffer;
-			int n;
+		if(selfSleep)
+			selfSleep--;
+		else{
+			if(clientHandle == -1){
+				clientHandle = accept(serverSocket, (struct sockaddr *) &serverStorage, &addr_size);
+				if(clientHandle != -1)
+					printf("CONNECTED\n");
+				else
+					selfSleep = 1000;
+			}
+			if(clientHandle != -1){
+				uint8_t buffer;
+				int n;
 
-			if(ioctl(clientHandle,FIONREAD,&n) != 0)
-				connectionReset();
-			else if(n >= 1){
-				switch(read(clientHandle,&buffer,1)){
-				case 0: break;
-				case 1:
-					*tms = (buffer & 1) != 0;
-					*tdi = (buffer & 2) != 0;
-					*tck = (buffer & 8) != 0;
-					if(buffer & 4){
-						buffer = (*tdo != 0);
-						//printf("TDO=%d\n",buffer);
-						if(-1 == send(clientHandle,&buffer,1,0))
-							connectionReset();
-					}else {
-
-					//	printf("\n");
-					}
-					break;
-				default:
+				if(ioctl(clientHandle,FIONREAD,&n) != 0)
 					connectionReset();
-					break;
+				else if(n >= 1){
+					switch(read(clientHandle,&buffer,1)){
+					case 0: break;
+					case 1:
+						*tms = (buffer & 1) != 0;
+						*tdi = (buffer & 2) != 0;
+						*tck = (buffer & 8) != 0;
+						if(buffer & 4){
+							buffer = (*tdo != 0);
+							//printf("TDO=%d\n",buffer);
+							if(-1 == send(clientHandle,&buffer,1,0))
+								connectionReset();
+						}else {
+
+						//	printf("\n");
+						}
+						break;
+					default:
+						connectionReset();
+						break;
+					}
+				}else{
+					selfSleep = 10;
 				}
 			}
 		}
@@ -617,7 +627,7 @@ public:
 		ClockDomain *axiClk = new ClockDomain(&top->io_axiClk,NULL,20000,100000);
 		ClockDomain *vgaClk = new ClockDomain(&top->io_vgaClk,NULL,40000,100000);
 		AsyncReset *asyncReset = new AsyncReset(&top->io_asyncReset,50000);
-		Jtag *jtag = new Jtag(&top->io_jtag_tms,&top->io_jtag_tdi,&top->io_jtag_tdo,&top->io_jtag_tck,200000);
+		Jtag *jtag = new Jtag(&top->io_jtag_tms,&top->io_jtag_tdi,&top->io_jtag_tdo,&top->io_jtag_tck,60000);
 		processes.push_back(axiClk);
 		processes.push_back(vgaClk);
 		processes.push_back(asyncReset);