diff options
Diffstat (limited to 'rtl/core/decode')
| -rw-r--r-- | rtl/core/decode/decode.sv | 3 | ||||
| -rw-r--r-- | rtl/core/decode/mux.sv | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/rtl/core/decode/decode.sv b/rtl/core/decode/decode.sv index c4ffd52..b00e06f 100644 --- a/rtl/core/decode/decode.sv +++ b/rtl/core/decode/decode.sv @@ -28,6 +28,7 @@ module core_decode assign dec_ctrl.nop = 0; assign dec_ctrl.mul = mul; + assign dec_ctrl.swi = swi; assign dec_ctrl.psr = psr; assign dec_ctrl.ldst = ldst; assign dec_ctrl.bkpt = bkpt; @@ -46,7 +47,7 @@ module core_decode assign dec_psr.restore_spsr = restore_spsr; logic execute, undefined, conditional, writeback, update_flags, - restore_spsr, branch, ldst, mul, psr, coproc, bkpt, + restore_spsr, branch, ldst, mul, swi, psr, coproc, bkpt, psr_saved, psr_write, psr_wr_flags, psr_wr_control; core_decode_mux mux diff --git a/rtl/core/decode/mux.sv b/rtl/core/decode/mux.sv index 25e390b..297ad33 100644 --- a/rtl/core/decode/mux.sv +++ b/rtl/core/decode/mux.sv @@ -56,6 +56,7 @@ module core_decode_mux ldst, mul, psr, + swi, coproc, bkpt, psr_saved, @@ -71,6 +72,8 @@ module core_decode_mux always_comb begin mul = 0; + swi = 0; + psr = 0; ldst = 0; bkpt = 0; branch = 0; @@ -81,7 +84,6 @@ module core_decode_mux conditional = 0; restore_spsr = 0; - psr = 0; psr_saved = 0; psr_write = 0; update_flags = 0; @@ -215,8 +217,13 @@ module core_decode_mux psr_wr_control = msr_fields.c; end - /*`GROUP_SWP: ; - `INSN_SWI: ;*/ + // WONTFIX: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=9757> + //`GROUP_SWP: ; + + `INSN_SWI: begin + swi = 1; + dec_data.uses_rn = 0; + end /* No es parte de ARMv4 pero U-Boot lo necesita. esto se * decodifica igual que `mov pc, lr` ya que no tenemos Thumb. |