diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-12-16 23:36:05 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-12-16 23:36:05 -0600 |
| commit | ca8b6e6696e279f56faacad39501019c3762a1b7 (patch) | |
| tree | 3622fc8bd082deeeec74b6db1869159ce3d17323 /rtl/core/control/exception.sv | |
| parent | 9ebb4b712e1d6c97a999652d0b9105847eabd134 (diff) | |
Fix privilege escalation while in user mode
Diffstat (limited to 'rtl/core/control/exception.sv')
| -rw-r--r-- | rtl/core/control/exception.sv | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/rtl/core/control/exception.sv b/rtl/core/control/exception.sv index ed7893e..387e9c1 100644 --- a/rtl/core/control/exception.sv +++ b/rtl/core/control/exception.sv @@ -2,10 +2,11 @@ module core_control_exception ( - input logic clk, - rst_n, + input logic clk, + rst_n, - input ctrl_cycle next_cycle, + input ctrl_cycle cycle, + next_cycle, input insn_decode dec, input psr_intmask intmask, input logic issue, @@ -15,10 +16,11 @@ module core_control_exception prefetch_abort, mem_fault, - output logic exception, - exception_offset_pc, - output psr_mode exception_mode, - output word exception_vector + output logic escalating, + exception, + exception_offset_pc, + output psr_mode exception_mode, + output word exception_vector ); logic pending_irq, syscall; @@ -27,6 +29,7 @@ module core_control_exception //TODO: fiq assign exception = undefined || syscall || prefetch_abort || mem_fault || pending_irq; + assign escalating = cycle.escalate; assign exception_vector = {{16{high_vectors}}, 11'b0, vector_offset, 2'b00}; always @(posedge clk or negedge rst_n) |
