From ed0bd705f94f6aea568ec8405534984a37770f21 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Mon, 25 Sep 2023 19:12:49 -0600 Subject: rtl/core, tb: replace bus_master with a new top-level module --- rtl/core/regs/map.sv | 30 ------------------------------ rtl/core/regs/reg_map.sv | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 rtl/core/regs/map.sv create mode 100644 rtl/core/regs/reg_map.sv (limited to 'rtl/core/regs') diff --git a/rtl/core/regs/map.sv b/rtl/core/regs/map.sv deleted file mode 100644 index 11085d4..0000000 --- a/rtl/core/regs/map.sv +++ /dev/null @@ -1,30 +0,0 @@ -`include "core/uarch.sv" - -module core_reg_map -( - input reg_num r, - input psr_mode mode, - output logic is_pc, - output reg_index index -); - - reg_index usr; - assign usr = {1'b0, r}; - - always_comb begin - index = 5'bxxxxx; - is_pc = r == `R15; - - if(~is_pc) - unique case(mode) - `MODE_USR, `MODE_SYS: index = usr; - `MODE_FIQ: index = r >= 8 ? usr + 7 : usr; - `MODE_IRQ: index = r >= 13 ? usr + 9 : usr; - `MODE_UND: index = r >= 13 ? usr + 11 : usr; - `MODE_ABT: index = r >= 13 ? usr + 13 : usr; - `MODE_SVC: index = r >= 13 ? usr + 15 : usr; - default: ; - endcase - end - -endmodule diff --git a/rtl/core/regs/reg_map.sv b/rtl/core/regs/reg_map.sv new file mode 100644 index 0000000..11085d4 --- /dev/null +++ b/rtl/core/regs/reg_map.sv @@ -0,0 +1,30 @@ +`include "core/uarch.sv" + +module core_reg_map +( + input reg_num r, + input psr_mode mode, + output logic is_pc, + output reg_index index +); + + reg_index usr; + assign usr = {1'b0, r}; + + always_comb begin + index = 5'bxxxxx; + is_pc = r == `R15; + + if(~is_pc) + unique case(mode) + `MODE_USR, `MODE_SYS: index = usr; + `MODE_FIQ: index = r >= 8 ? usr + 7 : usr; + `MODE_IRQ: index = r >= 13 ? usr + 9 : usr; + `MODE_UND: index = r >= 13 ? usr + 11 : usr; + `MODE_ABT: index = r >= 13 ? usr + 13 : usr; + `MODE_SVC: index = r >= 13 ? usr + 15 : usr; + default: ; + endcase + end + +endmodule -- cgit v1.2.3