From 9d45a2711e29a5cf59b4e37cde7b125349797ab9 Mon Sep 17 00:00:00 2001
From: David Biancolin <david.biancolin@gmail.com>
Date: Fri, 14 Feb 2020 23:41:14 -0800
Subject: [PATCH 1/5] Fix generation of env.sh for ZSH (#435)

---
 scripts/build-toolchains.sh               | 2 +-
 scripts/firesim-setup.sh                  | 2 +-
 scripts/init-submodules-no-riscv-tools.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index 27c87417..b5d767c0 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -141,5 +141,5 @@ cd "$RDIR"
 } > env-$TOOLCHAIN.sh
 
 # create general env.sh
-echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/env-$TOOLCHAIN.sh" >> env.sh
+echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]:-\${\(%\):-%x}}") )/env-$TOOLCHAIN.sh" >> env.sh
 echo "Toolchain Build Complete!"
diff --git a/scripts/firesim-setup.sh b/scripts/firesim-setup.sh
index 0787fd3c..959777d7 100755
--- a/scripts/firesim-setup.sh
+++ b/scripts/firesim-setup.sh
@@ -6,7 +6,7 @@ set -e
 set -o pipefail
 
 RDIR=$(pwd)
-scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd )"
 
 cd "${scripts_dir}/.."
 
diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh
index ef77374e..c4716ce4 100755
--- a/scripts/init-submodules-no-riscv-tools.sh
+++ b/scripts/init-submodules-no-riscv-tools.sh
@@ -60,4 +60,4 @@ git submodule update --init software/firemarshal
 if [ ! -f $RDIR/software/firemarshal/marshal-config.yaml ]; then
   echo "firesim-dir: '../../sims/firesim/'" > $RDIR/software/firemarshal/marshal-config.yaml
 fi
-echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh
+echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]:-\${\(%\):-%x}}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh

From 96fe47ab08856bf952c1e1c0848c55a56ea43280 Mon Sep 17 00:00:00 2001
From: Nathan Pemberton <nathanp@berkeley.edu>
Date: Mon, 17 Feb 2020 16:22:28 -0500
Subject: [PATCH 2/5] bump firemarshal to dev. This picks up bug fixes for
 drivers (firesim/firemarshal#130) and the '--workdir' option
 (firesim/firemarshal#132)

---
 software/firemarshal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/firemarshal b/software/firemarshal
index ef69bde3..d660c45a 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit ef69bde3b3fe7b233ac91e16aca3b955b6eff438
+Subproject commit d660c45ac12df4624d1784c19dab03b92347f878

From 1f85b2316988c02b65b4188952197e5ea4fffc79 Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Thu, 20 Feb 2020 18:32:00 +0000
Subject: [PATCH 3/5] bump firesim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index 52aee63b..dbe1ff19 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 52aee63bc04c3769695a41ba18319e316c2e78d5
+Subproject commit dbe1ff19e8b51374791483104076175b1cff03f7

From 97847b8ef48251b1de25da11314381d8ee343d4d Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Thu, 20 Feb 2020 20:09:21 +0000
Subject: [PATCH 4/5] bump firesim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index dbe1ff19..2b3c64c8 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit dbe1ff19e8b51374791483104076175b1cff03f7
+Subproject commit 2b3c64c8faaeb8b2d3c31cdb66204bd1743b8fd5

From aead38ab0b22d6d77571958f3edc363ff83412cd Mon Sep 17 00:00:00 2001
From: Sagar Karandikar <sagark@eecs.berkeley.edu>
Date: Thu, 20 Feb 2020 22:16:09 +0000
Subject: [PATCH 5/5] bump to firesim dev

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index 2b3c64c8..0eee2174 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 2b3c64c8faaeb8b2d3c31cdb66204bd1743b8fd5
+Subproject commit 0eee217487ba766721a82a442075c52a1bdc2207