Update fesvr version; Fix Makefile

.gitmodules

@@ -28,3 +28,6 @@
 [submodule "rocket-recent/riscv-isa-sim"]
 	path = rocket-recent/riscv-isa-sim
 	url = https://github.com/riscv/riscv-isa-sim.git
+[submodule "boom21/riscv-isa-sim"]
+	path = boom21/riscv-isa-sim
+	url = https://github.com/riscv-software-src/riscv-isa-sim.git

boom21/Makefile

@@ -1,3 +1,31 @@
 FIR_PATH = $(shell pwd)/freechips.rocketchip.system.LargeBoomConfig.fir
 
-include ../emulator.mk
+CXXFLAGS = -O3 -std=c++11
+CLANG_FLAGS = -fno-slp-vectorize -fbracket-depth=1024
+
+UNAME_OS := $(shell uname -s)
+ifeq ($(UNAME_OS),Darwin)
+	CXXFLAGS += $(CLANG_FLAGS)
+endif
+
+ifeq ($(ALL_ON),1)
+	CXXFLAGS += -DALL_ON
+endif
+
+INCLUDES = -Iriscv/include -I../firrtl-sig
+
+LIBS = -Lriscv/lib -Wl,-rpath,riscv/lib -lfesvr -lpthread
+
+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`
+	mkdir $(riscv_dir)
+	cd riscv-isa-sim; mkdir build; cd build; ../configure --prefix=$(riscv_dir) --target=riscv64-unknown-elf; make install
+
+TestHarness.h:
+	cd ../essent; sbt 'run $(FIR_PATH)'
+
+emulator: emulator.cc TestHarness.h riscv/lib/libfesvr.a
+	$(CXX) $(CXXFLAGS) $(INCLUDES) emulator.cc -o emulator $(LIBS)

boom21/riscv-isa-sim.commit

@@ -0,0 +1 @@
+68b3eb9bf1c04c19a66631f717163dd9ba2c923c