From fa370016708149976c748c14eadad1f89cf5a8ea Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 25 Sep 2022 19:55:29 -0600
Subject: Refactor CPSR and uarch.sv

---
 rtl/core/arm810.sv | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/rtl/core/arm810.sv b/rtl/core/arm810.sv
index 9a99168..b37057d 100644
--- a/rtl/core/arm810.sv
+++ b/rtl/core/arm810.sv
@@ -1,4 +1,3 @@
-`include "core/psr.sv"
 `include "core/uarch.sv"
 
 module arm810
@@ -52,7 +51,6 @@ module arm810
 	ptr branch_target;
 	psr_mode reg_mode;
 	alu_op data_op;
-	psr_flags flags, next_flags;
 
 	core_cycles cycles
 	(
@@ -60,6 +58,13 @@ module arm810
 		.*
 	);
 
+	psr_flags flags, next_flags;
+
+	core_psr psr
+	(
+		.*
+	);
+
 	logic wr_pc;
 	word wr_value, rd_value_a, rd_value_b;
 
-- 
cgit v1.2.3