Skip to content

Commit 24e4d83

Browse files
jeremybrodtjeremybrodt
committed
[MAX326xx] Fixed default handler implementations for ARM and IAR.
1 parent 240d721 commit 24e4d83

File tree

6 files changed

+228
-108
lines changed

6 files changed

+228
-108
lines changed

‎targets/TARGET_Maxim/TARGET_MAX32600/device/TOOLCHAIN_ARM_STD/startup_MAX32600.S

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ __Vectors DCD __initial_sp ; Top of Stack
4747
DCD Reset_Handler ; Reset Handler
4848
DCD NMI_Handler ; NMI Handler
4949
DCD HardFault_Handler ; Hard Fault Handler
50-
DCD DefaultIRQ_Handler ; MPU Fault Handler
51-
DCD DefaultIRQ_Handler ; Bus Fault Handler
52-
DCD DefaultIRQ_Handler ; Usage Fault Handler
50+
DCD MemManage_Handler ; MPU Fault Handler
51+
DCD BusFault_Handler ; Bus Fault Handler
52+
DCD UsageFault_Handler ; Usage Fault Handler
5353
DCD 0 ; Reserved
5454
DCD 0 ; Reserved
5555
DCD 0 ; Reserved
5656
DCD 0 ; Reserved
57-
DCD DefaultIRQ_Handler ; SVCall Handler
57+
DCD SVC_Handler ; SVCall Handler
5858
DCD DebugMon_Handler ; Debug Monitor Handler
5959
DCD 0 ; Reserved
60-
DCD DefaultIRQ_Handler ; PendSV Handler
60+
DCD PendSV_Handler ; PendSV Handler
6161
DCD SysTick_Handler ; SysTick Handler
6262

6363
; Maxim 32600 Externals interrupts
@@ -136,16 +136,36 @@ HardFault_Handler PROC
136136
B HardFault_Handler
137137
ENDP
138138

139-
DefaultIRQ_Handler PROC
140-
EXPORT DefaultIRQ_Handler [WEAK]
141-
B DefaultIRQ_Handler
139+
MemManage_Handler PROC
140+
EXPORT MemManage_Handler [WEAK]
141+
B MemManage_Handler
142+
ENDP
143+
144+
BusFault_Handler PROC
145+
EXPORT BusFault_Handler [WEAK]
146+
B BusFault_Handler
147+
ENDP
148+
149+
UsageFault_Handler PROC
150+
EXPORT UsageFault_Handler [WEAK]
151+
B UsageFault_Handler
152+
ENDP
153+
154+
SVC_Handler PROC
155+
EXPORT SVC_Handler [WEAK]
156+
B SVC_Handler
142157
ENDP
143158

144159
DebugMon_Handler PROC
145160
EXPORT DebugMon_Handler [WEAK]
146161
B DebugMon_Handler
147162
ENDP
148163

164+
PendSV_Handler PROC
165+
EXPORT PendSV_Handler [WEAK]
166+
B PendSV_Handler
167+
ENDP
168+
149169
SysTick_Handler PROC
150170
EXPORT SysTick_Handler [WEAK]
151171
B SysTick_Handler

‎targets/TARGET_Maxim/TARGET_MAX32600/device/TOOLCHAIN_IAR/startup_MAX32600.S

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ __vector_table DCD sfe(CSTACK) /* Top of Stack */
4747
DCD Reset_Handler /* Reset Handler */
4848
DCD NMI_Handler /* NMI Handler */
4949
DCD HardFault_Handler /* Hard Fault Handler */
50-
DCD DefaultIRQ_Handler /* MPU Fault Handler */
51-
DCD DefaultIRQ_Handler /* Bus Fault Handler */
52-
DCD DefaultIRQ_Handler /* Usage Fault Handler */
50+
DCD MemManage_Handler /* MPU Fault Handler */
51+
DCD BusFault_Handler /* Bus Fault Handler */
52+
DCD UsageFault_Handler /* Usage Fault Handler */
5353
DCD 0 /* Reserved */
5454
DCD 0 /* Reserved */
5555
DCD 0 /* Reserved */
5656
DCD 0 /* Reserved */
57-
DCD DefaultIRQ_Handler /* SVCall Handler */
57+
DCD SVC_Handler /* SVCall Handler */
5858
DCD DebugMon_Handler /* Debug Monitor Handler */
5959
DCD 0 /* Reserved */
60-
DCD DefaultIRQ_Handler /* PendSV Handler */
60+
DCD PendSV_Handler /* PendSV Handler */
6161
DCD SysTick_Handler /* SysTick Handler */
6262

6363
/* Maxim 32600 Externals interrupts */
@@ -130,16 +130,36 @@ NMI_Handler
130130
HardFault_Handler
131131
B HardFault_Handler
132132

133-
PUBWEAK DefaultIRQ_Handler
133+
PUBWEAK MemManage_Handler
134134
SECTION .text:CODE:REORDER:NOROOT(1)
135-
DefaultIRQ_Handler
136-
B DefaultIRQ_Handler
135+
MemManage_Handler
136+
B MemManage_Handler
137+
138+
PUBWEAK BusFault_Handler
139+
SECTION .text:CODE:REORDER:NOROOT(1)
140+
BusFault_Handler
141+
B BusFault_Handler
142+
143+
PUBWEAK UsageFault_Handler
144+
SECTION .text:CODE:REORDER:NOROOT(1)
145+
UsageFault_Handler
146+
B UsageFault_Handler
147+
148+
PUBWEAK SVC_Handler
149+
SECTION .text:CODE:REORDER:NOROOT(1)
150+
SVC_Handler
151+
B SVC_Handler
137152

138153
PUBWEAK DebugMon_Handler
139154
SECTION .text:CODE:REORDER:NOROOT(1)
140155
DebugMon_Handler
141156
B DebugMon_Handler
142157

158+
PUBWEAK PendSV_Handler
159+
SECTION .text:CODE:REORDER:NOROOT(1)
160+
PendSV_Handler
161+
B PendSV_Handler
162+
143163
PUBWEAK SysTick_Handler
144164
SECTION .text:CODE:REORDER:NOROOT(1)
145165
SysTick_Handler

‎targets/TARGET_Maxim/TARGET_MAX32610/device/TOOLCHAIN_ARM_STD/startup_MAX32610.S

Lines changed: 88 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -43,71 +43,71 @@ __initial_sp EQU 0x20008000 ; Top of RAM
4343
EXPORT __Vectors_End
4444
EXPORT __Vectors_Size
4545

46-
__Vectors DCD __initial_sp ; Top of Stack
47-
DCD Reset_Handler ; Reset Handler
48-
DCD NMI_Handler ; NMI Handler
49-
DCD HardFault_Handler ; Hard Fault Handler
50-
DCD DefaultIRQ_Handler ; MPU Fault Handler
51-
DCD DefaultIRQ_Handler ; Bus Fault Handler
52-
DCD DefaultIRQ_Handler ; Usage Fault Handler
53-
DCD 0 ; Reserved
54-
DCD 0 ; Reserved
55-
DCD 0 ; Reserved
56-
DCD 0 ; Reserved
57-
DCD DefaultIRQ_Handler ; SVCall Handler
58-
DCD DebugMon_Handler ; Debug Monitor Handler
59-
DCD 0 ; Reserved
60-
DCD DefaultIRQ_Handler ; PendSV Handler
61-
DCD SysTick_Handler ; SysTick Handler
62-
63-
; Maxim 32610 Externals interrupts
64-
DCD UART0_IRQHandler ; 16: 1 UART0
65-
DCD UART1_IRQHandler ; 17: 2 UART1
66-
DCD I2CM0_IRQHandler ; 18: 3 I2C Master 0
67-
DCD I2CS_IRQHandler ; 19: 4 I2C Slave
68-
DCD USB_IRQHandler ; 20: 5 USB
69-
DCD PMU_IRQHandler ; 21: 6 DMA
70-
DCD AFE_IRQHandler ; 22: 7 AFE
71-
DCD MAA_IRQHandler ; 23: 8 MAA
72-
DCD AES_IRQHandler ; 24: 9 AES
73-
DCD SPI0_IRQHandler ; 25:10 SPI0
74-
DCD SPI1_IRQHandler ; 26:11 SPI1
75-
DCD SPI2_IRQHandler ; 27:12 SPI2
76-
DCD TMR0_IRQHandler ; 28:13 Timer32-0
77-
DCD TMR1_IRQHandler ; 29:14 Timer32-1
78-
DCD TMR2_IRQHandler ; 30:15 Timer32-1
79-
DCD TMR3_IRQHandler ; 31:16 Timer32-2
80-
DCD RSVD0_IRQHandler ; 32:17 RSVD
81-
DCD RSVD1_IRQHandler ; 33:18 RSVD
82-
DCD DAC0_IRQHandler ; 34:19 DAC0 (12-bit DAC)
83-
DCD DAC1_IRQHandler ; 35:20 DAC1 (12-bit DAC)
84-
DCD DAC2_IRQHandler ; 36:21 DAC2 (8-bit DAC)
85-
DCD DAC3_IRQHandler ; 37:22 DAC3 (8-bit DAC)
86-
DCD ADC_IRQHandler ; 38:23 ADC
87-
DCD FLC_IRQHandler ; 39:24 Flash Controller
88-
DCD PWRMAN_IRQHandler ; 40:25 PWRMAN
89-
DCD CLKMAN_IRQHandler ; 41:26 CLKMAN
90-
DCD RTC0_IRQHandler ; 42:27 RTC INT0
91-
DCD RTC1_IRQHandler ; 43:28 RTC INT1
92-
DCD RTC2_IRQHandler ; 44:29 RTC INT2
93-
DCD RTC3_IRQHandler ; 45:30 RTC INT3
94-
DCD WDT0_IRQHandler ; 46:31 WATCHDOG0
95-
DCD WDT0_P_IRQHandler ; 47:32 WATCHDOG0 PRE-WINDOW
96-
DCD WDT1_IRQHandler ; 48:33 WATCHDOG1
97-
DCD WDT1_P_IRQHandler ; 49:34 WATCHDOG1 PRE-WINDOW
98-
DCD GPIO_P0_IRQHandler ; 50:35 GPIO Port 0
99-
DCD GPIO_P1_IRQHandler ; 51:36 GPIO Port 1
100-
DCD GPIO_P2_IRQHandler ; 52:37 GPIO Port 2
101-
DCD GPIO_P3_IRQHandler ; 53:38 GPIO Port 3
102-
DCD GPIO_P4_IRQHandler ; 54:39 GPIO Port 4
103-
DCD GPIO_P5_IRQHandler ; 55:40 GPIO Port 5
104-
DCD GPIO_P6_IRQHandler ; 56:41 GPIO Port 6
105-
DCD GPIO_P7_IRQHandler ; 57:42 GPIO Port 7
106-
DCD TMR16_0_IRQHandler ; 58:43 Timer16-s0
107-
DCD TMR16_1_IRQHandler ; 59:44 Timer16-s1
108-
DCD TMR16_2_IRQHandler ; 60:45 Timer16-s2
109-
DCD TMR16_3_IRQHandler ; 61:46 Timer16-s3
110-
DCD I2CM1_IRQHandler ; 62:47 I2C Master 1
46+
__Vectors DCD __initial_sp ; Top of Stack
47+
DCD Reset_Handler ; Reset Handler
48+
DCD NMI_Handler ; NMI Handler
49+
DCD HardFault_Handler ; Hard Fault Handler
50+
DCD MemManage_Handler ; MPU Fault Handler
51+
DCD BusFault_Handler ; Bus Fault Handler
52+
DCD UsageFault_Handler ; Usage Fault Handler
53+
DCD 0 ; Reserved
54+
DCD 0 ; Reserved
55+
DCD 0 ; Reserved
56+
DCD 0 ; Reserved
57+
DCD SVC_Handler ; SVCall Handler
58+
DCD DebugMon_Handler ; Debug Monitor Handler
59+
DCD 0 ; Reserved
60+
DCD PendSV_Handler ; PendSV Handler
61+
DCD SysTick_Handler ; SysTick Handler
62+
63+
; Maxim 32610 Externals interrupts
64+
DCD UART0_IRQHandler ; 16: 1 UART0
65+
DCD UART1_IRQHandler ; 17: 2 UART1
66+
DCD I2CM0_IRQHandler ; 18: 3 I2C Master 0
67+
DCD I2CS_IRQHandler ; 19: 4 I2C Slave
68+
DCD USB_IRQHandler ; 20: 5 USB
69+
DCD PMU_IRQHandler ; 21: 6 DMA
70+
DCD AFE_IRQHandler ; 22: 7 AFE
71+
DCD MAA_IRQHandler ; 23: 8 MAA
72+
DCD AES_IRQHandler ; 24: 9 AES
73+
DCD SPI0_IRQHandler ; 25:10 SPI0
74+
DCD SPI1_IRQHandler ; 26:11 SPI1
75+
DCD SPI2_IRQHandler ; 27:12 SPI2
76+
DCD TMR0_IRQHandler ; 28:13 Timer32-0
77+
DCD TMR1_IRQHandler ; 29:14 Timer32-1
78+
DCD TMR2_IRQHandler ; 30:15 Timer32-1
79+
DCD TMR3_IRQHandler ; 31:16 Timer32-2
80+
DCD RSVD0_IRQHandler ; 32:17 RSVD
81+
DCD RSVD1_IRQHandler ; 33:18 RSVD
82+
DCD DAC0_IRQHandler ; 34:19 DAC0 (12-bit DAC)
83+
DCD DAC1_IRQHandler ; 35:20 DAC1 (12-bit DAC)
84+
DCD DAC2_IRQHandler ; 36:21 DAC2 (8-bit DAC)
85+
DCD DAC3_IRQHandler ; 37:22 DAC3 (8-bit DAC)
86+
DCD ADC_IRQHandler ; 38:23 ADC
87+
DCD FLC_IRQHandler ; 39:24 Flash Controller
88+
DCD PWRMAN_IRQHandler ; 40:25 PWRMAN
89+
DCD CLKMAN_IRQHandler ; 41:26 CLKMAN
90+
DCD RTC0_IRQHandler ; 42:27 RTC INT0
91+
DCD RTC1_IRQHandler ; 43:28 RTC INT1
92+
DCD RTC2_IRQHandler ; 44:29 RTC INT2
93+
DCD RTC3_IRQHandler ; 45:30 RTC INT3
94+
DCD WDT0_IRQHandler ; 46:31 WATCHDOG0
95+
DCD WDT0_P_IRQHandler ; 47:32 WATCHDOG0 PRE-WINDOW
96+
DCD WDT1_IRQHandler ; 48:33 WATCHDOG1
97+
DCD WDT1_P_IRQHandler ; 49:34 WATCHDOG1 PRE-WINDOW
98+
DCD GPIO_P0_IRQHandler ; 50:35 GPIO Port 0
99+
DCD GPIO_P1_IRQHandler ; 51:36 GPIO Port 1
100+
DCD GPIO_P2_IRQHandler ; 52:37 GPIO Port 2
101+
DCD GPIO_P3_IRQHandler ; 53:38 GPIO Port 3
102+
DCD GPIO_P4_IRQHandler ; 54:39 GPIO Port 4
103+
DCD GPIO_P5_IRQHandler ; 55:40 GPIO Port 5
104+
DCD GPIO_P6_IRQHandler ; 56:41 GPIO Port 6
105+
DCD GPIO_P7_IRQHandler ; 57:42 GPIO Port 7
106+
DCD TMR16_0_IRQHandler ; 58:43 Timer16-s0
107+
DCD TMR16_1_IRQHandler ; 59:44 Timer16-s1
108+
DCD TMR16_2_IRQHandler ; 60:45 Timer16-s2
109+
DCD TMR16_3_IRQHandler ; 61:46 Timer16-s3
110+
DCD I2CM1_IRQHandler ; 62:47 I2C Master 1
111111
__Vectors_End
112112

113113
__Vectors_Size EQU __Vectors_End - __Vectors
@@ -136,16 +136,36 @@ HardFault_Handler PROC
136136
B HardFault_Handler
137137
ENDP
138138

139-
DefaultIRQ_Handler PROC
140-
EXPORT DefaultIRQ_Handler [WEAK]
141-
B DefaultIRQ_Handler
139+
MemManage_Handler PROC
140+
EXPORT MemManage_Handler [WEAK]
141+
B MemManage_Handler
142+
ENDP
143+
144+
BusFault_Handler PROC
145+
EXPORT BusFault_Handler [WEAK]
146+
B BusFault_Handler
147+
ENDP
148+
149+
UsageFault_Handler PROC
150+
EXPORT UsageFault_Handler [WEAK]
151+
B UsageFault_Handler
152+
ENDP
153+
154+
SVC_Handler PROC
155+
EXPORT SVC_Handler [WEAK]
156+
B SVC_Handler
142157
ENDP
143158

144159
DebugMon_Handler PROC
145160
EXPORT DebugMon_Handler [WEAK]
146161
B DebugMon_Handler
147162
ENDP
148163

164+
PendSV_Handler PROC
165+
EXPORT PendSV_Handler [WEAK]
166+
B PendSV_Handler
167+
ENDP
168+
149169
SysTick_Handler PROC
150170
EXPORT SysTick_Handler [WEAK]
151171
B SysTick_Handler

‎targets/TARGET_Maxim/TARGET_MAX32610/device/TOOLCHAIN_IAR/startup_MAX32610.S

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ __vector_table DCD sfe(CSTACK) /* Top of Stack */
4747
DCD Reset_Handler /* Reset Handler */
4848
DCD NMI_Handler /* NMI Handler */
4949
DCD HardFault_Handler /* Hard Fault Handler */
50-
DCD DefaultIRQ_Handler /* MPU Fault Handler */
51-
DCD DefaultIRQ_Handler /* Bus Fault Handler */
52-
DCD DefaultIRQ_Handler /* Usage Fault Handler */
50+
DCD MemManage_Handler /* MPU Fault Handler */
51+
DCD BusFault_Handler /* Bus Fault Handler */
52+
DCD UsageFault_Handler /* Usage Fault Handler */
5353
DCD 0 /* Reserved */
5454
DCD 0 /* Reserved */
5555
DCD 0 /* Reserved */
5656
DCD 0 /* Reserved */
57-
DCD DefaultIRQ_Handler /* SVCall Handler */
57+
DCD SVC_Handler /* SVCall Handler */
5858
DCD DebugMon_Handler /* Debug Monitor Handler */
5959
DCD 0 /* Reserved */
60-
DCD DefaultIRQ_Handler /* PendSV Handler */
60+
DCD PendSV_Handler /* PendSV Handler */
6161
DCD SysTick_Handler /* SysTick Handler */
6262

6363
/* Maxim 32610 Externals interrupts */
@@ -130,16 +130,36 @@ NMI_Handler
130130
HardFault_Handler
131131
B HardFault_Handler
132132

133-
PUBWEAK DefaultIRQ_Handler
133+
PUBWEAK MemManage_Handler
134134
SECTION .text:CODE:REORDER:NOROOT(1)
135-
DefaultIRQ_Handler
136-
B DefaultIRQ_Handler
135+
MemManage_Handler
136+
B MemManage_Handler
137+
138+
PUBWEAK BusFault_Handler
139+
SECTION .text:CODE:REORDER:NOROOT(1)
140+
BusFault_Handler
141+
B BusFault_Handler
142+
143+
PUBWEAK UsageFault_Handler
144+
SECTION .text:CODE:REORDER:NOROOT(1)
145+
UsageFault_Handler
146+
B UsageFault_Handler
147+
148+
PUBWEAK SVC_Handler
149+
SECTION .text:CODE:REORDER:NOROOT(1)
150+
SVC_Handler
151+
B SVC_Handler
137152

138153
PUBWEAK DebugMon_Handler
139154
SECTION .text:CODE:REORDER:NOROOT(1)
140155
DebugMon_Handler
141156
B DebugMon_Handler
142157

158+
PUBWEAK PendSV_Handler
159+
SECTION .text:CODE:REORDER:NOROOT(1)
160+
PendSV_Handler
161+
B PendSV_Handler
162+
143163
PUBWEAK SysTick_Handler
144164
SECTION .text:CODE:REORDER:NOROOT(1)
145165
SysTick_Handler

0 commit comments

Comments
 (0)