From d1079537f48ad5e40b00245e8b185821feee123c Mon Sep 17 00:00:00 2001
From: Scott Beamer <sbeamer@ucsc.edu>
Date: Mon, 2 Jan 2023 21:58:24 -0800
Subject: [PATCH] centralize patches for riscv-fesvr, rocket16,18,20,recent
 working

---
 emulator.mk                                     |  1 +
 rocket18/riscv-fesvr.patch => riscv-fesvr.patch | 12 ++++++------
 riscv-isa-sim.patch                             | 12 ++++++++++++
 rocket-recent/Makefile                          |  2 ++
 rocket18/Makefile                               |  8 --------
 rocket20/Makefile                               |  8 --------
 rocket20/riscv-fesvr.patch                      | 12 ------------
 7 files changed, 21 insertions(+), 34 deletions(-)
 rename rocket18/riscv-fesvr.patch => riscv-fesvr.patch (58%)
 create mode 100644 riscv-isa-sim.patch
 delete mode 100644 rocket20/riscv-fesvr.patch

diff --git a/emulator.mk b/emulator.mk
index 02b1f4b..59854ce 100644
--- a/emulator.mk
+++ b/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
 
diff --git a/rocket18/riscv-fesvr.patch b/riscv-fesvr.patch
similarity index 58%
rename from rocket18/riscv-fesvr.patch
rename to riscv-fesvr.patch
index 4f4788b..1f645ee 100644
--- a/rocket18/riscv-fesvr.patch
+++ b/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>
+ 
diff --git a/riscv-isa-sim.patch b/riscv-isa-sim.patch
new file mode 100644
index 0000000..f0d6457
--- /dev/null
+++ b/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>
diff --git a/rocket-recent/Makefile b/rocket-recent/Makefile
index 73fcdd0..8075136 100644
--- a/rocket-recent/Makefile
+++ b/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
 
diff --git a/rocket18/Makefile b/rocket18/Makefile
index 8cfff18..9a36e24 100644
--- a/rocket18/Makefile
+++ b/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
diff --git a/rocket20/Makefile b/rocket20/Makefile
index 8cfff18..9a36e24 100644
--- a/rocket20/Makefile
+++ b/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
diff --git a/rocket20/riscv-fesvr.patch b/rocket20/riscv-fesvr.patch
deleted file mode 100644
index 4f4788b..0000000
--- a/rocket20/riscv-fesvr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/fesvr/dtm.cc b/fesvr/dtm.cc
-index e1b15b2..c5f02d5 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>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>