Changes in kernel/arch/sparc32/src/trap_table.S [38ad239:208b5f5] in mainline

File:

• kernel/arch/sparc32/src/trap_table.S (modified) (11 diffs)

kernel/arch/sparc32/src/trap_table.S

@@ -27 +27 @@
 #
 
-#include <abi/asmtool.h>
 #include <arch/trap.h>
 #include <arch/regwin.h>
 
 .text
+
+.global trap_table
+.global reset_trap
+.global preemptible_trap
+.global interrupt_trap
+.global syscall_trap
+.global window_overflow_trap
+.global window_underflow_trap
+.global write_to_invalid
+.global read_from_invalid
+.global flush_windows
 
 .macro get_wim_number reg
@@ -208 +218 @@
 .endm
 
-FUNCTION_BEGIN(write_to_invalid)
+write_to_invalid:
         ! Write value 1
         mov %o0, %g7
@@ -226 +236 @@
         retl
         nop
-FUNCTION_END(write_to_invalid)
-
-FUNCTION_BEGIN(read_from_invalid)
+
+read_from_invalid:
         ! Read value 1
         mov %o0, %g7
@@ -246 +255 @@
         retl
         nop
-FUNCTION_END(read_from_invalid)
-
-SYMBOL(reset_trap)
+
+reset_trap:
         set 0x80000100, %l0
         set 'r', %l1
@@ -254 +262 @@
         rett
 
-SYMBOL(window_overflow_trap)
+window_overflow_trap:
         mov %g7, %l0
         
@@ -385 +393 @@
                 rett %l2
 
-SYMBOL(window_underflow_trap)
+window_underflow_trap:
         mov %g7, %l0
         
@@ -471 +479 @@
                 rett %l2
 
-FUNCTION_BEGIN(flush_windows)
+flush_windows:
         mov 7, %g1
         1:
@@ -486 +494 @@
         retl
         nop
-FUNCTION_END(flush_windows)
-
-SYMBOL(preemptible_trap)
+
+preemptible_trap:
         /* Save %g7 */
         mov %g7, %l0
@@ -663 +670 @@
                 rett %l2
 
-SYMBOL(interrupt_trap)
+interrupt_trap:
         /* Save %g7 */
         mov %g7, %l0
@@ -837 +844 @@
                 rett %l2
 
-SYMBOL(syscall_trap)
+syscall_trap:
         /* Save %g7 */
         mov %g7, %l0
@@ -1044 +1051 @@
 
 .align TRAP_TABLE_SIZE
-SYMBOL(trap_table)
+trap_table:
         STRAP(0x0, reset_trap)
         TRAP(0x1, instruction_access_exception)