cleanup, dont update Prv in DCSR

This commit is contained in:
Matthew 2024-06-15 22:54:10 -05:00
parent 3a2e8ae3cc
commit d6256d1647
4 changed files with 4 additions and 7 deletions

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
######################################################################################### #########################################################################################
# hw_test.py # hw_debug_test.py
# #
# Written: matthew.n.otto@okstate.edu # Written: matthew.n.otto@okstate.edu
# Created: 19 April 2024 # Created: 19 April 2024
@ -45,7 +45,7 @@ def flow_control_test():
cvw.read_data("DCSR") cvw.read_data("DCSR")
for _ in range(50): for _ in range(50):
cvw.step() cvw.step()
cvw.read_data("PCM") print(cvw.read_data("PCM"))
cvw.resume() cvw.resume()

View File

@ -98,7 +98,7 @@ class OpenOCD:
dmstat = int(self.read_dmi("0x10"), 16) dmstat = int(self.read_dmi("0x10"), 16)
if not dmstat & 0x1: if not dmstat & 0x1:
raise Exception("Error: failed to activate debug module") raise Exception("Error: failed to activate debug module")
def reset_dm(self): def reset_dm(self):
self.write_dmi("0x10", "0x0") self.write_dmi("0x10", "0x0")
dmstat = int(self.read_dmi("0x10"), 16) dmstat = int(self.read_dmi("0x10"), 16)

View File

@ -50,7 +50,7 @@ module dmc (
); );
`include "debug.vh" `include "debug.vh"
enum logic [1:0] {RUNNING, FLUSH, HALTED, RESUME} State; enum logic [1:0] {RUNNING, FLUSH, HALTED, RESUME} State;
localparam NOP_CYCLE_DURATION = 0; localparam NOP_CYCLE_DURATION = 0;
logic [$clog2(NOP_CYCLE_DURATION+1)-1:0] Counter; logic [$clog2(NOP_CYCLE_DURATION+1)-1:0] Counter;

View File

@ -82,9 +82,6 @@ module csrd import cvw::*; #(parameter cvw_t P) (
end else if (EnterDebugMode) begin end else if (EnterDebugMode) begin
Prv <= PrivilegeModeW; Prv <= PrivilegeModeW;
Cause <= DebugCause; Cause <= DebugCause;
end else if (WriteDCSRM) begin
Prv <= CSRWriteValM[`PRV]; // TODO: overwrite hart privilege mode
end
end end
flopenr #(4) DCSRreg (clk, reset, WriteDCSRM, flopenr #(4) DCSRreg (clk, reset, WriteDCSRM,