From 5acc001f9622eb04d23b77aa0bb8d0d1e1089029 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Wed, 14 Feb 2024 09:40:18 +0000
Subject: [PATCH] Remove SPSR patches from CapDL branch

Signed-off-by: Nick Spinale <nick@nickspinale.com>
---
 crates/sel4-capdl-initializer/core/src/arch/mod.rs | 1 -
 crates/sel4-capdl-initializer/types/src/spec.rs    | 1 -
 hacking/nix/scope/sources.nix                      | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/crates/sel4-capdl-initializer/core/src/arch/mod.rs b/crates/sel4-capdl-initializer/core/src/arch/mod.rs
index cdcfac909..a33521bd6 100644
--- a/crates/sel4-capdl-initializer/core/src/arch/mod.rs
+++ b/crates/sel4-capdl-initializer/core/src/arch/mod.rs
@@ -36,7 +36,6 @@ mod imp {
     ) {
         *regs.pc_mut() = extra.ip;
         *regs.sp_mut() = extra.sp;
-        *regs.spsr_mut() = extra.spsr;
         for (i, value) in extra.gprs.iter().enumerate() {
             *regs.gpr_mut(i.try_into().unwrap()) = *value;
         }
diff --git a/crates/sel4-capdl-initializer/types/src/spec.rs b/crates/sel4-capdl-initializer/types/src/spec.rs
index c10e06333..f0bfa01a3 100644
--- a/crates/sel4-capdl-initializer/types/src/spec.rs
+++ b/crates/sel4-capdl-initializer/types/src/spec.rs
@@ -174,7 +174,6 @@ pub mod object {
 
         pub ip: Word,
         pub sp: Word,
-        pub spsr: Word,
         pub gprs: Indirect<'a, [Word]>,
 
         pub master_fault_ep: Option<CPtr>,
diff --git a/hacking/nix/scope/sources.nix b/hacking/nix/scope/sources.nix
index 387a36cf3..df248a94d 100644
--- a/hacking/nix/scope/sources.nix
+++ b/hacking/nix/scope/sources.nix
@@ -28,7 +28,7 @@ let
 
   capdlCommon = {
     url = "https://github.com/coliasgroup/capdl.git";
-    rev = "8274a1ec7424adc1a3e490a7e1acb114ba5159d0"; # branch coliasgroup
+    rev = "1bd2aa7596ba418be33f314f880682e4fb8ef679"; # branch coliasgroup
     local = localRoot + "/capdl";
   };