From 261592abd5910c6006c1d39431f791fa6162ba82 Mon Sep 17 00:00:00 2001
From: z <ruben.teixeira@tecnico.ulisboa.pt>
Date: Tue, 30 Jul 2024 11:55:23 +0100
Subject: [PATCH 1/2] Fix workflow to also run after merging with origin

---
 .github/workflows/ci.yml |  2 +-
 Makefile                 | 10 ++++++++--
 submodules/VERSAT        |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a03d0c22..15b52cb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ concurrency:
 
 on:
   push:
-    branches: [ master ]
+    branches: '*'
   # Don't forget to require approval for all outside collaborators
   pull_request:
     branches: '*'
diff --git a/Makefile b/Makefile
index 9a5e252a..3085c58e 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,12 @@ ifeq ($(DEBUG),1)
 VERSAT_CALL := gdb -ex run --args ./versat
 endif
 
+VERSAT_ARGUMENTS:=$(CUR_DIR)/$(VERSAT_SPEC) -s -b32 -t $(TEST) -u $(CUR_DIR)/submodules/VERSAT/hardware/src/units 
+VERSAT_ARGUMENTS+=-I $(CUR_DIR)/submodules/VERSAT/hardware/include -I $(CUR_DIR)/submodules/VERSAT/hardware/src  
+VERSAT_ARGUMENTS+=-I $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -O $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/software 
+VERSAT_ARGUMENTS+=-o $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -g $(CUR_DIR)/../debug -u $(CUR_DIR)/hardware/src/units -x64
+
+
 # Single test rules
 setup:
 	+nix-shell --run 'make build-setup SETUP_ARGS="$(SETUP_ARGS) TEST=$(TEST)"'
@@ -79,7 +85,7 @@ fpga-run-only:
 versat-only:
 	mkdir -p ../$(CORE)_V0.70_$(TEST)
 	cd ./submodules/VERSAT ; $(MAKE) -j 8 versat
-	cd ./submodules/VERSAT ; $(VERSAT_CALL) $(CUR_DIR)/$(VERSAT_SPEC) -s -b=32 -T $(TEST) -O $(CUR_DIR)/submodules/VERSAT/hardware/src/units -I $(CUR_DIR)/submodules/VERSAT/hardware/include -I $(CUR_DIR)/submodules/VERSAT/hardware/src  -I $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -H $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/software -o $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -A $(CUR_DIR)/../debug -O $(CUR_DIR)/hardware/src/units -x64
+	cd ./submodules/VERSAT ; $(VERSAT_CALL) $(VERSAT_ARGUMENTS)
 
 # Multi test rules
 
@@ -108,7 +114,7 @@ fast:
 	mkdir -p ../$(CORE)_V0.70_$(TEST) ; \
 	cd ./submodules/VERSAT ; \
 	$(MAKE) -s -j 8 versat ; \
-	$(VERSAT_CALL) $(CUR_DIR)/$(VERSAT_SPEC) -s -b=32 -T $(TEST) -O $(CUR_DIR)/submodules/VERSAT/hardware/src/units -I $(CUR_DIR)/submodules/VERSAT/hardware/include -I $(CUR_DIR)/submodules/VERSAT/hardware/src  -I $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -H $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/software -o $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -A $(CUR_DIR)/../debug -O $(CUR_DIR)/hardware/src/units -x64
+	$(VERSAT_CALL) $(VERSAT_ARGUMENTS)
 
 fast-pc-emul:
 	nix-shell --run "make fast TEST=$(TEST); make -C ../$(CORE)_V0.70_$(TEST) pc-emul-test"
diff --git a/submodules/VERSAT b/submodules/VERSAT
index b3fc7925..2a8704ad 160000
--- a/submodules/VERSAT
+++ b/submodules/VERSAT
@@ -1 +1 @@
-Subproject commit b3fc7925000a25a8fcf9acbb804bc8d04dde3052
+Subproject commit 2a8704adc02c82d8dc2c90fd34c1dfddfffe9585

From 8b52474e6230f01cdb9eadfdb2dac8249c961ca2 Mon Sep 17 00:00:00 2001
From: z <ruben.teixeira@tecnico.ulisboa.pt>
Date: Tue, 30 Jul 2024 12:14:38 +0100
Subject: [PATCH 2/2] Small fix on versat

---
 Makefile          | 1 -
 submodules/VERSAT | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3085c58e..c9da5c46 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,6 @@ VERSAT_ARGUMENTS+=-I $(CUR_DIR)/submodules/VERSAT/hardware/include -I $(CUR_DIR)
 VERSAT_ARGUMENTS+=-I $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -O $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/software 
 VERSAT_ARGUMENTS+=-o $(CUR_DIR)/../iob_soc_versat_V0.70_$(TEST)/hardware/src -g $(CUR_DIR)/../debug -u $(CUR_DIR)/hardware/src/units -x64
 
-
 # Single test rules
 setup:
 	+nix-shell --run 'make build-setup SETUP_ARGS="$(SETUP_ARGS) TEST=$(TEST)"'
diff --git a/submodules/VERSAT b/submodules/VERSAT
index 2a8704ad..77a56ddb 160000
--- a/submodules/VERSAT
+++ b/submodules/VERSAT
@@ -1 +1 @@
-Subproject commit 2a8704adc02c82d8dc2c90fd34c1dfddfffe9585
+Subproject commit 77a56ddb76ec819408141e245469d36993642fff