Move control cycles enum to public uarch interface

2 files changed, 12 insertions, 10 deletions

diff --git a/rtl/core/control/control.sv b/rtl/core/control/control.sv
index 7cfb80c..dee234e 100644
--- a/rtl/core/control/control.sv
+++ b/rtl/core/control/control.sv
@@ -43,15 +43,7 @@ module core_control
 	                       mem_write
 );
 
-	enum
-	{
-		ISSUE,
-		RD_INDIRECT_SHIFT,
-		WITH_SHIFT,
-		TRANSFER,
-		BASE_WRITEBACK,
-		EXCEPTION
-	} cycle, next_cycle;
+	ctrl_cycle cycle, next_cycle;
 
 	logic bubble, next_bubble, final_writeback, final_update_flags,
 	      ldst, ldst_pre, ldst_increment, ldst_writeback, pop_valid,
diff --git a/rtl/core/uarch.sv b/rtl/core/uarch.sv
index 3e4a470..0c46dc7 100644
--- a/rtl/core/uarch.sv
+++ b/rtl/core/uarch.sv
@@ -94,7 +94,7 @@ typedef struct packed
 	logic[5:0]  shift_imm;
 } snd_decode;
 
-typedef enum logic[1:0]
+typedef enum
 {
 	LDST_WORD,
 	LDST_BYTE,
@@ -123,6 +123,16 @@ typedef struct packed
 	reg_list    regs;
 } ldst_decode;
 
+typedef enum
+{
+	ISSUE,
+	RD_INDIRECT_SHIFT,
+	WITH_SHIFT,
+	TRANSFER,
+	BASE_WRITEBACK,
+	EXCEPTION
+} ctrl_cycle;
+
 typedef struct packed
 {
 	logic shr,