Changeset 054476d in mainline for kernel/arch/arm32/src/exc_handler.S

Timestamp:

2016-04-21T20:04:16Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

27f67f5

Parents:

dc0d8b52 (diff), 73b3ecd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge arm32 switch over to using asmtool.h macros

File:

• kernel/arch/arm32/src/exc_handler.S (modified) (8 diffs)

kernel/arch/arm32/src/exc_handler.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text   
-
-.global irq_exception_entry
-.global fiq_exception_entry
-.global data_abort_exception_entry
-.global prefetch_abort_exception_entry
-.global undef_instr_exception_entry
-.global swi_exception_entry
-.global reset_exception_entry
-
 
 # Switches to kernel stack and saves all registers there.
@@ -156 +149 @@
 .endm
 
-reset_exception_entry:
+SYMBOL(reset_exception_entry)
         SAVE_REGS_TO_STACK
         mov r0, #0
@@ -163 +156 @@
         LOAD_REGS_FROM_STACK
 
-irq_exception_entry:
+SYMBOL(irq_exception_entry)
         sub lr, lr, #4
         SAVE_REGS_TO_STACK
@@ -171 +164 @@
         LOAD_REGS_FROM_STACK
 
-fiq_exception_entry:
+SYMBOL(fiq_exception_entry)
         sub lr, lr, #4
         SAVE_REGS_TO_STACK
@@ -179 +172 @@
         LOAD_REGS_FROM_STACK
 
-undef_instr_exception_entry:
+SYMBOL(undef_instr_exception_entry)
         SAVE_REGS_TO_STACK
         mov r0, #1
@@ -186 +179 @@
         LOAD_REGS_FROM_STACK
 
-prefetch_abort_exception_entry:
+SYMBOL(prefetch_abort_exception_entry)
         sub lr, lr, #4
         SAVE_REGS_TO_STACK
@@ -194 +187 @@
         LOAD_REGS_FROM_STACK
 
-data_abort_exception_entry:
+SYMBOL(data_abort_exception_entry)
         sub lr, lr, #8
         SAVE_REGS_TO_STACK
@@ -202 +195 @@
         LOAD_REGS_FROM_STACK
 
-swi_exception_entry:
+SYMBOL(swi_exception_entry)
         ldr r13, =exc_stack
         SAVE_REGS_TO_STACK