Changeset 8844e70 in mainline for uspace


Ignore:
Timestamp:
2016-04-11T17:03:47Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3b0f1b9a
Parents:
3a34852
Message:

ia32: use asmtool.h macros for defining symbols

Location:
uspace/lib/c/arch/ia32
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/arch/ia32/Makefile.inc

    r3a34852 r8844e70  
    2929ARCH_SOURCES = \
    3030        arch/$(UARCH)/src/entry.S \
    31         arch/$(UARCH)/src/entryjmp.s \
    32         arch/$(UARCH)/src/thread_entry.s \
     31        arch/$(UARCH)/src/entryjmp.S \
     32        arch/$(UARCH)/src/thread_entry.S \
    3333        arch/$(UARCH)/src/syscall.S \
    3434        arch/$(UARCH)/src/fibril.S \

  • uspace/lib/c/arch/ia32/src/entry.S

    r3a34852 r8844e70  
    2727#
    2828
     29#include <abi/asmtool.h>
     30
    2931INTEL_CPUID_STANDARD = 1
    3032INTEL_SEP = 11
    … …  
    3436.org 0
    3537
    36 .globl __entry
    37 
    3838## User-space task entry point
    3939#
    4040# %edi contains the PCB pointer
    4141#
    42 __entry:
     42SYMBOL(__entry)
    4343        mov %ss, %ax
    4444        mov %ax, %ds

  • uspace/lib/c/arch/ia32/src/entryjmp.S

    r3a34852 r8844e70  
    2727#
    2828
    29 .globl entry_point_jmp
     29#include <abi/asmtool.h>
    3030
    3131## void entry_point_jmp(void *entry_point, void *pcb);
    3232#
    3333# Jump to program entry point
    34 entry_point_jmp:
     34SYMBOL(entry_point_jmp)
    3535        # Use standard ia32 prologue not to confuse anybody
    3636        push %ebp

  • uspace/lib/c/arch/ia32/src/stacktrace_asm.S

    r3a34852 r8844e70  
    2727#
    2828
     29#include <abi/asmtool.h>
     30
    2931.text
    3032
    31 .global stacktrace_prepare
    32 .global stacktrace_fp_get
    33 .global stacktrace_pc_get
     33FUNCTION_BEGIN(stacktrace_prepare)
     34        ret
     35FUNCTION_END(stacktrace_prepare)
    3436
    35 stacktrace_prepare:
    36         ret
    37 
    38 stacktrace_fp_get:
     37FUNCTION_BEGIN(stacktrace_fp_get)
    3938        movl %ebp, %eax
    4039        ret
     40FUNCTION_END(stacktrace_fp_get)
    4141
    42 stacktrace_pc_get:
     42FUNCTION_BEGIN(stacktrace_pc_get)
    4343        movl (%esp), %eax
    4444        ret
     45FUNCTION_END(stacktrace_pc_get)

  • uspace/lib/c/arch/ia32/src/syscall.S

    r3a34852 r8844e70  
    2727#
    2828
     29#include <abi/asmtool.h>
     30
    2931.data
    3032
    31 .global __syscall_fast_func
    32 __syscall_fast_func:
     33OBJECT_BEGIN(__syscall_fast_func)
    3334        .long __syscall_slow
    34         .size __syscall_fast_func, . - __syscall_fast_func
     35OBJECT_END(__syscall_fast_func)
    3536
    3637.text
    … …  
    4243 * could benefit from this and not save unused registers on the stack.
    4344 */
    44 .global __syscall_slow
    45 __syscall_slow:
     45FUNCTION_BEGIN(__syscall_slow)
    4646        pushl %ebx
    4747        pushl %esi
    … …  
    6161        popl %ebx
    6262        ret
     63FUNCTION_END(__syscall_slow)
    6364
    6465
    … …  
    7172 * segment, otherwise the SYSENTER wouldn't work in the first place).
    7273 */
    73 .global __syscall_fast
    74         .type __syscall_fast, @function
    75 
    76 __syscall_fast:
     74FUNCTION_BEGIN(__syscall_fast)
    7775        pushl %ebx
    7876        pushl %esi
    … …  
    9896        popl %ebx
    9997        ret
    100 
    101         .size __syscall_fast, . - __syscall_fast
     98FUNCTION_END(__syscall_fast)

  • uspace/lib/c/arch/ia32/src/thread_entry.S

    r3a34852 r8844e70  
    2727#
    2828
     29#include <abi/asmtool.h>
     30
    2931.text
    30 
    31 .globl __thread_entry
    3232
    3333## User-space thread entry point for all but the first threads.
    3434#
    3535#
    36 __thread_entry:
     36SYMBOL_BEGIN(__thread_entry)
    3737        mov %ss, %dx
    3838        mov %dx, %ds
    … …  
    5757        # Not reached.
    5858        #
    59        
    60 .end __thread_entry
     59SYMBOL_END(__thread_entry)
Note: See TracChangeset for help on using the changeset viewer.