centralize patches for riscv-fesvr, rocket16,18,20,recent working

emulator.mk

@@ -19,6 +19,7 @@ riscv_dir := $(shell pwd)/riscv
 riscv/lib/libfesvr.so:
 	git submodule update --init riscv-fesvr
 	cd riscv-fesvr; git checkout `cat ../fesvr.commit`
+	patch riscv-fesvr/fesvr/dtm.cc ../riscv-fesvr.patch
 	mkdir $(riscv_dir)
 	cd riscv-fesvr; mkdir build; cd build; ../configure --prefix=$(riscv_dir) --target=riscv64-unknown-elf; make install
 

rocket18/riscv-fesvr.patch → riscv-fesvr.patch

@@ -1,12 +1,12 @@
 diff --git a/fesvr/dtm.cc b/fesvr/dtm.cc
-index e1b15b2..c5f02d5 100644
+index e1b15b2..60cdcb9 100644
 --- a/fesvr/dtm.cc
 +++ b/fesvr/dtm.cc
-@@ -1,6 +1,7 @@
- #include "dtm.h"
- #include "debug_defines.h"
- #include "encoding.h"
-+#include <stdexcept>
+@@ -4,6 +4,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
++#include <stdexcept>
+ #include <assert.h>
+ #include <pthread.h>
+

riscv-isa-sim.patch

@@ -0,0 +1,12 @@
+diff --git a/riscv/devices.h b/riscv/devices.h
+index 1bc9618d..5787513a 100644
+--- a/riscv/devices.h
++++ b/riscv/devices.h
+@@ -4,6 +4,7 @@
+ #include "decode.h"
+ #include "mmio_plugin.h"
+ #include <cstdlib>
++#include <stdexcept>
+ #include <string>
+ #include <map>
+ #include <vector>

rocket-recent/Makefile

@@ -21,6 +21,8 @@ riscv_dir := $(shell pwd)/riscv
 riscv/lib/libfesvr.a:
 	git submodule update --init riscv-isa-sim
 	cd riscv-isa-sim; git checkout `cat ../riscv-isa-sim.commit`
+	patch riscv-isa-sim/fesvr/dtm.cc ../riscv-fesvr.patch
+	patch riscv-isa-sim/riscv/devices.h ../riscv-isa-sim.patch
 	mkdir $(riscv_dir)
 	cd riscv-isa-sim; mkdir build; cd build; ../configure --prefix=$(riscv_dir) --target=riscv64-unknown-elf; make install
 

rocket18/Makefile

@@ -1,11 +1,3 @@
 FIR_PATH = $(shell pwd)/freechips.rocketchip.system.DefaultConfig.fir
 
 include ../emulator.mk
-
-# override prior rule to get patch for riscv-fesvr
-riscv/lib/libfesvr.so:
-	git submodule update --init riscv-fesvr
-	cd riscv-fesvr; git checkout `cat ../fesvr.commit`
-	patch riscv-fesvr/fesvr/dtm.cc riscv-fesvr.patch
-	mkdir $(riscv_dir)
-	cd riscv-fesvr; mkdir build; cd build; ../configure --prefix=$(riscv_dir) --target=riscv64-unknown-elf; make install

rocket20/Makefile

@@ -1,11 +1,3 @@
 FIR_PATH = $(shell pwd)/freechips.rocketchip.system.DefaultConfig.fir
 
 include ../emulator.mk
-
-# override prior rule to get patch for riscv-fesvr
-riscv/lib/libfesvr.so:
-	git submodule update --init riscv-fesvr
-	cd riscv-fesvr; git checkout `cat ../fesvr.commit`
-	patch riscv-fesvr/fesvr/dtm.cc riscv-fesvr.patch
-	mkdir $(riscv_dir)
-	cd riscv-fesvr; mkdir build; cd build; ../configure --prefix=$(riscv_dir) --target=riscv64-unknown-elf; make install