From 8315f5f3ea43150d250aa16575ab274913f93d2a Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 6 Nov 2022 19:55:54 -0600
Subject: Add PSR control signal set

---
 rtl/core/decode/decode.sv | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'rtl/core/decode/decode.sv')

diff --git a/rtl/core/decode/decode.sv b/rtl/core/decode/decode.sv
index b6c6cbd..bf870b5 100644
--- a/rtl/core/decode/decode.sv
+++ b/rtl/core/decode/decode.sv
@@ -7,6 +7,7 @@ module core_decode
 	input  psr_flags       flags,
 
 	output datapath_decode ctrl,
+	output psr_decode      psr_ctrl,
 	output branch_decode   branch_ctrl,
 	output snd_decode      snd_ctrl,
 	output data_decode     data_ctrl,
@@ -15,19 +16,22 @@ module core_decode
 	output coproc_decode   coproc_ctrl
 );
 
-	logic execute, undefined, conditional, writeback,
-	      update_flags, branch, ldst, mul, coproc;
+	logic execute, undefined, explicit_cond, conditional, writeback,
+	      update_flags, branch, ldst, mul, coproc, spsr, psr_write;
 
 	assign ctrl.execute = execute;
 	assign ctrl.undefined = undefined;
 	assign ctrl.conditional = conditional;
 	assign ctrl.writeback = writeback;
-	assign ctrl.update_flags = update_flags;
 	assign ctrl.branch = branch;
 	assign ctrl.coproc = coproc;
 	assign ctrl.ldst = ldst;
 	assign ctrl.mul = mul;
 
+	assign psr_ctrl.saved = spsr;
+	assign psr_ctrl.write = psr_write;
+	assign psr_ctrl.update_flags = update_flags;
+
 	//TODO
 	logic restore_spsr;
 
@@ -38,6 +42,7 @@ module core_decode
 		.cond(insn `FIELD_COND),
 		.execute(cond_execute),
 		.undefined(cond_undefined),
+		.conditional(explicit_cond),
 		.*
 	);
 
@@ -174,10 +179,13 @@ module core_decode
 		ldst = 0;
 		branch = 0;
 		coproc = 0;
-
 		execute = cond_execute;
 		undefined = cond_undefined;
 		writeback = 0;
+		conditional = explicit_cond;
+
+		spsr = 0;
+		psr_write = 0;
 		update_flags = 0;
 
 		data_ctrl = {($bits(data_ctrl)){1'bx}};
-- 
cgit v1.2.3