From 001c39d8eb4ee191411b4d1dd241b02e2fa837b6 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Mon, 20 Dec 2021 21:08:34 -0800
Subject: [PATCH] Fixing paths in wally-setup.sh

---
 wally-pipelined/src/privileged/privdec.sv    |  3 +--
 wally-pipelined/src/privileged/privileged.sv |  6 ++----
 wally-setup.sh                               | 22 +++++++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/wally-pipelined/src/privileged/privdec.sv b/wally-pipelined/src/privileged/privdec.sv
index ec01f4145..5fe6419e8 100644
--- a/wally-pipelined/src/privileged/privdec.sv
+++ b/wally-pipelined/src/privileged/privdec.sv
@@ -49,6 +49,5 @@ module privdec (
   assign IllegalPrivilegedInstrM = PrivilegedM & ~(uretM|sretM|mretM|ecallM|ebreakM|wfiM|sfencevmaM);
   assign IllegalInstrFaultM = (IllegalIEUInstrFaultM & IllegalFPUInstrM) | IllegalPrivilegedInstrM | IllegalCSRAccessM | TrappedSRETM; // *** generalize this for other instructions
 
-  // *** initially, wfi and sfencevma are nop
-  // *** zfenci extension?
+  // *** initially, wfi is nop
 endmodule
diff --git a/wally-pipelined/src/privileged/privileged.sv b/wally-pipelined/src/privileged/privileged.sv
index 5fd80fbe4..bf08ade96 100644
--- a/wally-pipelined/src/privileged/privileged.sv
+++ b/wally-pipelined/src/privileged/privileged.sv
@@ -144,11 +144,9 @@ module privileged (
 
   ///////////////////////////////////////////
   // decode privileged instructions
-
-
   ///////////////////////////////////////////
-  //privdec pmd(.InstrM(InstrM[31:20]),.*);
-  privdec pmd(.InstrM(InstrM[31:20]), 
+
+   privdec pmd(.InstrM(InstrM[31:20]), 
               .PrivilegedM, .IllegalIEUInstrFaultM, .IllegalCSRAccessM, .IllegalFPUInstrM, .TrappedSRETM,
               .PrivilegeModeW, .STATUS_TSR, .IllegalInstrFaultM, 
               .uretM, .sretM, .mretM, .ecallM, .ebreakM, .wfiM, .sfencevmaM);
diff --git a/wally-setup.sh b/wally-setup.sh
index 4dba54959..00e359437 100644
--- a/wally-setup.sh
+++ b/wally-setup.sh
@@ -10,17 +10,23 @@ echo "Executing wally-setup.sh"
 export RISCV=/opt/riscv   # change this if you installed the tools in a different location
 
 # Tools
-export PATH=$RISCV/riscv-gnu-toolchain/bin:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin:$PATH       # GCC tools
-export PATH=~/riscv-wally/bin:$PATH    # exe2memfile; change this if riscv-wally isn't at your home directory
-export PATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin:$PATH    # Change this for your path to Modelsim
-export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verilator
+# GCCZ
 export LD_LIBRARY_PATH=$RISCV/riscv-gnu-toolchain/lib:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/lib:$LD_LIBRARY_PATH
-
-export MGLS_LICENSE_FILE=1717@solidworks.eng.hmc.edu # *** is this the right license server now
+export PATH=$RISCV/riscv-gnu-toolchain/bin:$RISCV/riscv-gnu-toolchain/riscv64-unknown-elf/bin:$PATH       # GCC tools
+# Spike
+export LD_LIBRARY_PATH=$RISCV/lib:$LD_LIBRARY_PATH
+export PATH=$RISCV/bin:$LD_LIBRARY_PATH
+# exe2memfile
+export PATH=~/riscv-wally/bin:$PATH    # exe2memfile; change this if riscv-wally isn't at your home directory
+# Verilator
+export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verilator
+# ModelSim/Questa (vsim)
+export PATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin:$PATH    # Change this for your path to Modelsim
+export MGLS_LICENSE_FILE=1717@solidworks.eng.hmc.edu # Change this to your Siemens license server
 
 # Imperas; *** remove if not using
-PATH=/cad/riscv/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64:/cad/riscv/imperas-riscv-tests/riscv-ovpsim/bin/Liux64:$PATH  # *** maybe take this out based on Imperas
+export PATH=/cad/riscv/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64:/cad/riscv/imperas-riscv-tests/riscv-ovpsim/bin/Liux64:$PATH  # *** maybe take this out based on Imperas
 export LD_LIBRARY_PATH=/cad/imperas/Imperas.20200630/bin/Linux64:$LD_LIBRARY_PATH # remove if no imperas
-IMPERAS_HOME=/cad/imperas/Imperas.20200630
+export IMPERAS_HOME=/cad/imperas/Imperas.20200630
 source $IMPERAS_HOME/bin/setup.sh
 setupImperas $IMPERAS_HOME