Use word/ptr instead of logic[..]

2 files changed, 18 insertions, 16 deletions

diff --git a/rtl/core/decode/branch.sv b/rtl/core/decode/branch.sv
index 97e62b5..9916374 100644
--- a/rtl/core/decode/branch.sv
+++ b/rtl/core/decode/branch.sv
@@ -1,10 +1,12 @@
 `include "core/isa.sv"
+`include "core/uarch.sv"
 
 module core_decode_branch
 (
-	input  logic[31:0] insn,
-	output logic       link,
-	output logic[29:0] offset
+	input  word  insn,
+
+	output logic link,
+	output ptr   offset
 );
 
 	logic[23:0] immediate;
diff --git a/rtl/core/decode/data.sv b/rtl/core/decode/data.sv
index 7958631..67c118c 100644
--- a/rtl/core/decode/data.sv
+++ b/rtl/core/decode/data.sv
@@ -4,19 +4,19 @@
 
 module core_decode_data
 (
-	input  logic[31:0] insn,
-	input  psr_flags   flags,
-
-	output alu_op      op,
-	output reg_num     rn,
-	                   rd,
-	output logic       writeback,
-	                   update_flags,
-	                   restore_spsr,
-	                   zero_fst,
-	                   negate_fst,
-	                   negate_snd,
-	                   carry_in
+	input  word      insn,
+	input  psr_flags flags,
+
+	output alu_op    op,
+	output reg_num   rn,
+	                 rd,
+	output logic     writeback,
+	                 update_flags,
+	                 restore_spsr,
+	                 zero_fst,
+	                 negate_fst,
+	                 negate_snd,
+	                 carry_in
 );
 
 	assign rn = insn `FIELD_DATA_RN;