From 19c860221fb2fc129e6d2c1a41a77a8e8010f6c3 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Mon, 7 Nov 2022 21:03:49 -0600
Subject: Fix flags hazard in ADC, SBC, RSC

---
 rtl/core/decode/mux.sv | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/rtl/core/decode/mux.sv b/rtl/core/decode/mux.sv
index 9d86f9e..65af9c6 100644
--- a/rtl/core/decode/mux.sv
+++ b/rtl/core/decode/mux.sv
@@ -16,6 +16,7 @@ module core_decode_mux
 
 	input  data_decode   data,
 	input  logic         data_writeback,
+	                     data_conditional,
 	                     data_update_flags,
 	                     data_restore_spsr,
 	                     data_is_imm,
@@ -137,7 +138,9 @@ module core_decode_mux
 				writeback = data_writeback;
 				update_flags = data_update_flags;
 				restore_spsr = data_restore_spsr;
+
 				undefined = undefined | snd_undefined;
+				conditional = conditional | data_conditional;
 			end
 
 			`GROUP_LDST_SINGLE_IMM, `GROUP_LDST_SINGLE_REG: begin
-- 
cgit v1.2.3