-
Notifications
You must be signed in to change notification settings - Fork 53
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added trigger type 2 (mcontrol) #750
Added trigger type 2 (mcontrol) #750
Conversation
Signed-off-by: Oystein Knauserud <[email protected]>
Signed-off-by: Oystein Knauserud <[email protected]>
rtl/cv32e40x_debug_triggers.sv
Outdated
2'b00, // sizelo : hardwired to zero, match any size | ||
4'b0001, // action : enter debug on match | ||
1'b0, // chain : hardwired to zero | ||
mcontrol6_match_resolve(csr_wdata_i[MCONTROL2_6_MATCH_HIGH:MCONTROL2_6_MATCH_LOW]), // match, WARL(0,2,3) 10:7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also rename mcontrol6_match_resolve -> mcontrol2_6_match_resolve
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
rtl/cv32e40x_debug_triggers.sv
Outdated
csr_wdata_i[6], // m : match in machine mode | ||
1'b0, // : hardwired to zero | ||
1'b0, // s : hardwired to zer0 | ||
mcontrol6_u_resolve(csr_wdata_i[MCONTROL2_6_U]), // zero, U 3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also rename mcontrol6_u_resolve -> mcontrol2_6_u_resolve
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
rtl/cv32e40x_debug_triggers.sv
Outdated
@@ -153,11 +174,11 @@ import cv32e40x_pkg::*; | |||
4'b0000, // zero, size (match any size) 19:16 | |||
4'b0001, // action, WARL(1), enter debug 15:12 | |||
1'b0, // zero, chain 11 | |||
mcontrol6_match_resolve(csr_wdata_i[MCONTROL6_MATCH_HIGH:MCONTROL6_MATCH_LOW]), // match, WARL(0,2,3) 10:7 | |||
mcontrol6_match_resolve(csr_wdata_i[MCONTROL2_6_MATCH_HIGH:MCONTROL2_6_MATCH_LOW]), // match, WARL(0,2,3) 10:7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here and other places
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
Signed-off-by: Oystein Knauserud <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment and behavior at line
cv32e40x/rtl/cv32e40x_debug_triggers.sv
Line 192 in 55d4a5b
// Unsupported exception codes enabled, keep value of tdata1 |
…ype 0x5 when unsupported bits are set in tdata2. Defaulting to disabled trigger (type 0xF) instead of keeping tdata1 unchanged. Signed-off-by: Oystein Knauserud <[email protected]>
Adding label do-not-merge as we may need an ISS update due to the changes in tdata1 legal values and reset value.