Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add RP2350 specific values to the exception_number enum #1988

Merged
merged 6 commits into from
Oct 17, 2024
Merged

Add RP2350 specific values to the exception_number enum #1988

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
798274f
Add RP2350 specific values to the exception_number enum
davexroth Oct 16, 2024
3a706b7
Rename exceptions to match table B1-4 of the Arm v7-M reference manual
davexroth Oct 16, 2024
1b5d796
Remove SECUREFAULT_EXCEPTION as that is only available in Arm-v8
davexroth Oct 16, 2024
b5e9854
Tweak formatting
davexroth Oct 16, 2024
509bf99
Revert "Tweak formatting"
davexroth Oct 16, 2024
1044731
Revert "Remove SECUREFAULT_EXCEPTION as that is only available in Arm…
davexroth Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions src/rp2_common/hardware_exception/include/hardware/exception.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@ extern "C" {
*
* On Arm these are vector table indices:
*
* Name | Value | Exception
* ---------------------|-------|-----------------------
* NMI_EXCEPTION | 2 | Non Maskable Interrupt
* HARDFAULT_EXCEPTION | 3 | HardFault
* SVCALL_EXCEPTION | 11 | SV Call
* PENDSV_EXCEPTION | 14 | Pend SV
* SYSTICK_EXCEPTION | 15 | System Tick
* Name | Value | Exception
* ----------------------|-------|-----------------------
* NMI_EXCEPTION | 2 | Non Maskable Interrupt
* HARDFAULT_EXCEPTION | 3 | HardFault
* \if rp2350_specific
* MEMMANAGE_EXCEPTION | 4 | MemManage
* BUSFAULT_EXCEPTION | 5 | BusFault
* USAGEFAULT_EXCEPTION | 6 | UsageFault
* SECUREFAULT_EXCEPTION | 7 | SecureFault
* \endif
* SVCALL_EXCEPTION | 11 | SV Call
* PENDSV_EXCEPTION | 14 | Pend SV
* SYSTICK_EXCEPTION | 15 | System Tick
*
* \if rp2350_specific
* On RISC-V these are exception cause numbers:
Expand Down Expand Up @@ -88,11 +94,17 @@ enum exception_number {
enum exception_number {
// Assigned to VTOR indices
MIN_EXCEPTION_NUM = 2,
NMI_EXCEPTION = 2, ///< Non Maskable Interrupt
HARDFAULT_EXCEPTION = 3, ///< HardFault Interrupt
SVCALL_EXCEPTION = 11, ///< SV Call Interrupt
PENDSV_EXCEPTION = 14, ///< Pend SV Interrupt
SYSTICK_EXCEPTION = 15, ///< System Tick Interrupt
NMI_EXCEPTION = 2, ///< Non Maskable Interrupt
HARDFAULT_EXCEPTION = 3, ///< HardFault Interrupt
#if PICO_RP2350
MEMMANAGE_EXCEPTION = 4, ///< MemManage Interrupt
BUSFAULT_EXCEPTION = 5, ///< BusFault Interrupt
USAGEFAULT_EXCEPTION = 6, ///< UsageFault Interrupt
SECUREFAULT_EXCEPTION = 7, ///< SecureFault Interrupt
#endif
SVCALL_EXCEPTION = 11, ///< SV Call Interrupt
PENDSV_EXCEPTION = 14, ///< Pend SV Interrupt
SYSTICK_EXCEPTION = 15, ///< System Tick Interrupt
MAX_EXCEPTION_NUM = 15
};
#endif
Expand Down
Loading