Skip to content

Commit e235772

Browse files
author
Deepika
committed
Replaced older version of assembly file with 2016-2017 version from RTX
1 parent eea29d3 commit e235772

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

rtos/TARGET_CORTEX/rtx5/TARGET_M23/TOOLCHAIN_ARM/irq_armv8mbl.S

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;/*
2-
; * Copyright (c) 2016 ARM Limited. All rights reserved.
2+
; * Copyright (c) 2016-2017 ARM Limited. All rights reserved.
33
; *
44
; * SPDX-License-Identifier: Apache-2.0
55
; *
@@ -27,25 +27,25 @@ I_T_RUN_OFS EQU 28 ; osInfo.thread.run offset
2727
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset
2828
TCB_SP_OFS EQU 56 ; TCB.SP offset
2929
TCB_SF_OFS EQU 34 ; TCB.stack_frame offset
30-
TCB_TZM_OFS EQU 60 ; TCB.tz_memory offset
30+
TCB_TZM_OFS EQU 64 ; TCB.tz_memory offset
3131

3232

3333
PRESERVE8
3434
THUMB
3535

3636

3737
AREA |.constdata|, DATA, READONLY
38-
EXPORT os_irq_cm
39-
os_irq_cm DCB 0 ; Non weak library reference
38+
EXPORT irqRtxLib
39+
irqRtxLib DCB 0 ; Non weak library reference
4040

4141

4242
AREA |.text|, CODE, READONLY
4343

4444

4545
SVC_Handler PROC
4646
EXPORT SVC_Handler
47-
IMPORT os_UserSVC_Table
48-
IMPORT os_Info
47+
IMPORT osRtxUserSVC
48+
IMPORT osRtxInfo
4949
#ifdef __DOMAIN_NS
5050
IMPORT TZ_LoadContext_S
5151
IMPORT TZ_StoreContext_S
@@ -66,8 +66,8 @@ SVC_Handler PROC
6666
MOV LR,R3 ; Set EXC_RETURN
6767

6868
SVC_Context
69-
LDR R3,=os_Info+I_T_RUN_OFS; Load address of os_Info.run
70-
LDMIA R3!,{R1,R2} ; Load os_Info.thread.run: curr & next
69+
LDR R3,=osRtxInfo+I_T_RUN_OFS; Load address of osRtxInfo.run
70+
LDMIA R3!,{R1,R2} ; Load osRtxInfo.thread.run: curr & next
7171
CMP R1,R2 ; Check if thread switch is required
7272
BEQ SVC_Exit ; Branch when threads are the same
7373

@@ -102,7 +102,7 @@ SVC_ContextSave2
102102

103103
SVC_ContextSwitch
104104
SUBS R3,R3,#8 ; Adjust address
105-
STR R2,[R3] ; os_Info.thread.run: curr = next
105+
STR R2,[R3] ; osRtxInfo.thread.run: curr = next
106106

107107
SVC_ContextRestore
108108
#ifdef __DOMAIN_NS
@@ -150,7 +150,7 @@ SVC_Exit
150150

151151
SVC_User
152152
PUSH {R4,LR} ; Save registers
153-
LDR R2,=os_UserSVC_Table ; Load address of SVC table
153+
LDR R2,=osRtxUserSVC ; Load address of SVC table
154154
LDR R3,[R2] ; Load SVC maximum number
155155
CMP R1,R3 ; Check SVC number range
156156
BHI SVC_Done ; Branch if out of range
@@ -172,10 +172,10 @@ SVC_Done
172172

173173
PendSV_Handler PROC
174174
EXPORT PendSV_Handler
175-
IMPORT os_PendSV_Handler
175+
IMPORT osRtxPendSV_Handler
176176

177177
PUSH {R0,LR} ; Save EXC_RETURN
178-
BL os_PendSV_Handler ; Call os_PendSV_Handler
178+
BL osRtxPendSV_Handler ; Call osRtxPendSV_Handler
179179
POP {R0,R1} ; Restore EXC_RETURN
180180
MOV LR,R1 ; Set EXC_RETURN
181181
B Sys_Context
@@ -186,10 +186,10 @@ PendSV_Handler PROC
186186

187187
SysTick_Handler PROC
188188
EXPORT SysTick_Handler
189-
IMPORT os_Tick_Handler
189+
IMPORT osRtxTick_Handler
190190

191191
PUSH {R0,LR} ; Save EXC_RETURN
192-
BL os_Tick_Handler ; Call os_Tick_Handler
192+
BL osRtxTick_Handler ; Call osRtxTick_Handler
193193
POP {R0,R1} ; Restore EXC_RETURN
194194
MOV LR,R1 ; Set EXC_RETURN
195195
B Sys_Context
@@ -200,14 +200,14 @@ SysTick_Handler PROC
200200

201201
Sys_Context PROC
202202
EXPORT Sys_Context
203-
IMPORT os_Info
203+
IMPORT osRtxInfo
204204
#ifdef __DOMAIN_NS
205205
IMPORT TZ_LoadContext_S
206206
IMPORT TZ_StoreContext_S
207207
#endif
208208

209-
LDR R3,=os_Info+I_T_RUN_OFS; Load address of os_Info.run
210-
LDM R3!,{R1,R2} ; Load os_Info.thread.run: curr & next
209+
LDR R3,=osRtxInfo+I_T_RUN_OFS; Load address of osRtxInfo.run
210+
LDM R3!,{R1,R2} ; Load osRtxInfo.thread.run: curr & next
211211
CMP R1,R2 ; Check if thread switch is required
212212
BEQ Sys_ContextExit ; Branch when threads are the same
213213

@@ -245,7 +245,7 @@ Sys_ContextSave2
245245

246246
Sys_ContextSwitch
247247
SUBS R3,R3,#8 ; Adjust address
248-
STR R2,[R3] ; os_Info.run: curr = next
248+
STR R2,[R3] ; osRtxInfo.run: curr = next
249249

250250
Sys_ContextRestore
251251
#ifdef __DOMAIN_NS

0 commit comments

Comments
 (0)