Changeset 38ad239 in mainline for uspace

Timestamp:

2016-04-24T08:42:07Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bc41f3a3

Parents:

b66cc97

Message:

sparc32: use asmtool.h macros for defining symbols

Location:

uspace/lib/c/arch/sparc32

Files:

• Makefile.inc (modified) (1 diff)
• src/entry.S (moved) (moved from uspace/lib/c/arch/sparc32/src/entry.s ) (2 diffs)
• src/entryjmp.S (moved) (moved from uspace/lib/c/arch/sparc32/src/entryjmp.s ) (3 diffs)
• src/fibril.S (modified) (3 diffs)
• src/stacktrace_asm.S (modified) (2 diffs)
• src/thread_entry.S (moved) (moved from uspace/lib/c/arch/sparc32/src/thread_entry.s ) (2 diffs)

uspace/lib/c/arch/sparc32/Makefile.inc

@@ -28 +28 @@
 
 ARCH_SOURCES = \
-        arch/$(UARCH)/src/entry.s \
-        arch/$(UARCH)/src/entryjmp.s \
-        arch/$(UARCH)/src/thread_entry.s \
+        arch/$(UARCH)/src/entry.S \
+        arch/$(UARCH)/src/entryjmp.S \
+        arch/$(UARCH)/src/thread_entry.S \
         arch/$(UARCH)/src/fibril.S \
         arch/$(UARCH)/src/tls.c \

uspace/lib/c/arch/sparc32/src/entry.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .section .init, "ax"
 
 .org 0
-
-.globl __entry
 
 ## User-space task entry point
@@ -38 +38 @@
 # %o1 contains pcb_ptr
 #
-__entry:
+SYMBOL(__entry)
         #
         # Create the first stack frame.

uspace/lib/c/arch/sparc32/src/entryjmp.S

@@ -27 +27 @@
 #
 
-.globl entry_point_jmp
+#include <abi/asmtool.h>
 
 ## void entry_point_jmp(void *entry_point, void *pcb);
@@ -35 +35 @@
 #
 # Jump to program entry point
-entry_point_jmp:
+FUNCTION_BEGIN(entry_point_jmp)
         # Pass pcb pointer to entry point in %o1. As it is already
         # there, no action is needed.
@@ -41 +41 @@
         nop
         # FIXME: use branch instead of call
+FUNCTION_END(entry_point_jmp)

uspace/lib/c/arch/sparc32/src/fibril.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <libarch/context_offset.h>
 
 .text
 
-.global flush_windows
-.global context_save
-.global context_restore
-
-context_save:
+FUNCTION_BEGIN(context_save)
         #
         # We rely on the kernel to flush our active register windows to memory
@@ -56 +53 @@
         retl
         mov 1, %o0              ! context_save_arch returns 1
+FUNCTION_END(context_save)
 
-context_restore:
+FUNCTION_BEGIN(context_restore)
         #
         # Flush all active windows.
@@ -84 +82 @@
         retl
         xor %o0, %o0, %o0       ! context_restore_arch returns 0
+FUNCTION_END(context_restore)

uspace/lib/c/arch/sparc32/src/stacktrace_asm.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <libarch/stack.h>
 
 .text
 
-.global stacktrace_prepare
-.global stacktrace_fp_get
-.global stacktrace_pc_get
-
-stacktrace_prepare:
+FUNCTION_BEGIN(stacktrace_prepare)
         save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp
         
@@ -53 +50 @@
         ret
         restore
+FUNCTION_END(stacktrace_prepare)
 
-stacktrace_fp_get:
+FUNCTION_BEGIN(stacktrace_fp_get)
         # Add the stack bias to %sp to get the actual address.
         retl
         mov %sp,  %o0
+FUNCTION_END(stacktrace_fp_get)
 
-stacktrace_pc_get:
+FUNCTION_BEGIN(stacktrace_pc_get)
         retl
         mov %o7, %o0
+FUNCTION_END(stacktrace_pc_get)

uspace/lib/c/arch/sparc32/src/thread_entry.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
-
-.globl __thread_entry
 
 ## User-space thread entry point for all but the first threads.
 #
 #
-__thread_entry:
+SYMBOL(__thread_entry)
         #
         # Create the first stack frame.
@@ -66 +66 @@
         
         ! not reached
-        
-.end __thread_entry