Changes in / [054476d:dc0d8b52] in mainline


Ignore:
Files:
4 added
4 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • abi/include/abi/asmtool.h

    r054476d rdc0d8b52  
    4545
    4646#define OBJECT_BEGIN(obj) \
    47         .type obj STT_OBJECT; \
     47        .type obj, @object; \
    4848        SYMBOL_BEGIN(obj)
    4949#define OBJECT_END(obj) \
    … …  
    5151
    5252#define FUNCTION_BEGIN(func) \
    53         .type func STT_FUNC; \
     53        .type func, @function; \
    5454        SYMBOL_BEGIN(func)     
    5555#define FUNCTION_END(func) \

  • boot/Makefile.build

    r054476d rdc0d8b52  
    3131include Makefile.common
    3232
    33 INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
     33INCLUDES = generic/include
    3434OPTIMIZATION = 3
    3535
    … …  
    3838LFLAGS = --fatal-warnings
    3939
    40 GCC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     40GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    4141        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    4242        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    4545        -pipe
    4646
    47 ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     47ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    4848        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    4949        -Werror-implicit-function-declaration -wd170
    5050
    51 CLANG_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     51CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    5252        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    5353        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \

  • boot/arch/arm32/src/asm.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    3029#include <arch/arch.h>
    3130
    3231.section BOOTSTRAP
    3332
    34 SYMBOL(start)
     33.global start
     34.global boot_pt
     35.global boot_stack
     36.global halt
     37.global jump_to_kernel
     38
     39start:
    3540        ldr sp, =boot_stack
    3641        b bootstrap
    3742
    3843.section BOOTPT
    39 SYMBOL(boot_pt)
     44boot_pt:
    4045        .space PTL0_ENTRIES * PTL0_ENTRY_SIZE
    4146
    4247.section BOOTSTACK
    4348        .space 4096
    44 SYMBOL(boot_stack)
     49boot_stack:
    4550
    4651.text
    4752
    48 FUNCTION_BEGIN(halt)
     53halt:
    4954        b halt
    50 FUNCTION_END(halt)
    5155
    52 FUNCTION_BEGIN(jump_to_kernel)
     56jump_to_kernel:
    5357        #
    5458        # Make sure that the I-cache, D-cache and memory are mutually coherent
    … …  
    104108#endif
    105109        mov pc, r0
    106 FUNCTION_END(jump_to_kernel)
    107 

  • boot/arch/arm32/src/eabi.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(__aeabi_idiv)
     31.global __aeabi_idiv
     32.global __aeabi_uidiv
     33
     34.global __aeabi_idivmod
     35.global __aeabi_uidivmod
     36
     37.global __aeabi_ldivmod
     38.global __aeabi_uldivmod
     39
     40__aeabi_idiv:
    3441        push {lr}
    3542        bl __divsi3
    3643        pop {lr}
    3744        mov pc, lr
    38 FUNCTION_END(__aeabi_idiv)
    3945
    40 FUNCTION_BEGIN(__aeabi_uidiv)
     46__aeabi_uidiv:
    4147        push {lr}
    4248        bl __udivsi3
    4349        pop {lr}
    4450        mov pc, lr
    45 FUNCTION_END(__aeabi_uidiv)
    4651
    47 FUNCTION_BEGIN(__aeabi_idivmod)
     52__aeabi_idivmod:
    4853        push {lr}
    4954        sub sp, sp, #12
    … …  
    5459        pop {lr}
    5560        mov pc, lr
    56 FUNCTION_END(__aeabi_idivmod)
    5761
    58 FUNCTION_BEGIN(__aeabi_uidivmod)
     62__aeabi_uidivmod:
    5963        push {lr}
    6064        sub sp, sp, #12
    … …  
    6569        pop {lr}
    6670        mov pc, lr
    67 FUNCTION_END(__aeabi_uidivmod)
    6871
    69 FUNCTION_BEGIN(__aeabi_ldivmod)
     72__aeabi_ldivmod:
    7073        push {lr}
    7174        sub sp, sp, #24
    … …  
    7780        pop {lr}
    7881        mov pc, lr
    79 FUNCTION_END(__aeabi_ldivmod)
    8082
    81 FUNCTION_BEGIN(__aeabi_uldivmod)
     83__aeabi_uldivmod:
    8284        push {lr}
    8385        sub sp, sp, #24
    … …  
    8991        pop {lr}
    9092        mov pc, lr
    91 FUNCTION_END(__aeabi_uldivmod)
    92 

  • kernel/arch/arm32/Makefile.inc

    r054476d rdc0d8b52  
    3333ATSIGN = %
    3434
    35 GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access -mfpu=vfpv3
     35GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
    3636
    3737ifeq ($(CONFIG_FPU),y)
    … …  
    7070ifeq ($(CONFIG_FPU),y)
    7171        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
    72         ARCH_SOURCES += arch/$(KARCH)/src/fpu.S
     72        ARCH_SOURCES += arch/$(KARCH)/src/fpu.s
    7373endif
    7474

  • kernel/arch/arm32/src/asm.S

    r054476d rdc0d8b52  
    2727 */
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(memcpy_from_uspace)
    34 FUNCTION_BEGIN(memcpy_to_uspace)
     31.global memcpy_from_uspace
     32.global memcpy_to_uspace
     33.global memcpy_from_uspace_failover_address
     34.global memcpy_to_uspace_failover_address
     35.global early_putchar
     36
     37memcpy_from_uspace:
     38memcpy_to_uspace:
    3539        add r3, r1, #3
    3640        bic r3, r3, #3
    … …  
    9094                bne 7b
    9195                b 3b
    92 FUNCTION_END(memcpy_from_uspace)
    93 FUNCTION_END(memcpy_to_uspace)
    9496
    95 SYMBOL(memcpy_from_uspace_failover_address)
    96 SYMBOL(memcpy_to_uspace_failover_address)
     97memcpy_from_uspace_failover_address:
     98memcpy_to_uspace_failover_address:
    9799        mov r0, #0
    98100        ldmia sp!, {r4, r5, pc}
    99101
    100 FUNCTION_BEGIN(early_putchar)
     102early_putchar:
    101103        mov pc, lr
    102 FUNCTION_END(early_putchar)
    103 

  • kernel/arch/arm32/src/context.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text   
    3230
    33 FUNCTION_BEGIN(context_save_arch)
     31.global context_save_arch
     32.global context_restore_arch
     33
     34context_save_arch:
    3435        stmfd sp!, {r1}
    3536        mrs r1, cpsr
    … …  
    4344        mov r0, #1
    4445        mov pc, lr
    45 FUNCTION_END(context_save_arch)
    4646
    47 FUNCTION_BEGIN(context_restore_arch)
     47
     48context_restore_arch:
    4849        ldmia r0!, {r4}
    4950        mrs r5, cpsr
    … …  
    5758        mov r0, #0
    5859        mov pc, lr
    59 FUNCTION_END(context_restore_arch)
    60 

  • kernel/arch/arm32/src/debug/stacktrace_asm.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(frame_pointer_get)
     31.global frame_pointer_get
     32.global program_counter_get
     33
     34frame_pointer_get:
    3435        mov r0, fp
    3536        mov pc, lr
    36 FUNCTION_END(frame_pointer_get)
    3737
    38 FUNCTION_BEGIN(program_counter_get)
     38program_counter_get:
    3939        mov r0, lr
    4040        mov pc, lr
    41 FUNCTION_END(program_counter_get)
    42 

  • kernel/arch/arm32/src/dummy.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(calibrate_delay_loop)
     31.global calibrate_delay_loop
     32.global asm_delay_loop
     33
     34.global sys_tls_set
     35.global dummy
     36
     37calibrate_delay_loop:
    3438        mov     pc, lr
    35 FUNCTION_END(calibrate_delay_loop)
    3639
    37 FUNCTION_BEGIN(asm_delay_loop)
     40asm_delay_loop:
    3841        mov     pc, lr
    39 FUNCTION_END(asm_delay_loop)
    4042
    4143# not used on ARM
    42 FUNCTION_BEGIN(sys_tls_set)
    43 FUNCTION_BEGIN(dummy)
     44sys_tls_set:
     45
     46dummy:
    4447        mov pc, lr
    45 FUNCTION_END(dummy)
    46 FUNCTION_END(sys_tls_set)
    47 

  • kernel/arch/arm32/src/eabi.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(__aeabi_idiv)
     31.global __aeabi_idiv
     32.global __aeabi_uidiv
     33
     34.global __aeabi_idivmod
     35.global __aeabi_uidivmod
     36
     37.global __aeabi_ldivmod
     38.global __aeabi_uldivmod
     39
     40__aeabi_idiv:
    3441        push {lr}
    3542        bl __divsi3
    3643        pop {lr}
    3744        mov pc, lr
    38 FUNCTION_END(__aeabi_idiv)
    3945
    40 FUNCTION_BEGIN(__aeabi_uidiv)
     46__aeabi_uidiv:
    4147        push {lr}
    4248        bl __udivsi3
    4349        pop {lr}
    4450        mov pc, lr
    45 FUNCTION_END(__aeabi_uidiv)
    4651
    47 FUNCTION_BEGIN(__aeabi_idivmod)
     52__aeabi_idivmod:
    4853        push {lr}
    4954        sub sp, sp, #12
    … …  
    5459        pop {lr}
    5560        mov pc, lr
    56 FUNCTION_END(__aeabi_idivmod)
    5761
    58 FUNCTION_BEGIN(__aeabi_uidivmod)
     62__aeabi_uidivmod:
    5963        push {lr}
    6064        sub sp, sp, #12
    … …  
    6569        pop {lr}
    6670        mov pc, lr
    67 FUNCTION_END(__aeabi_uidivmod)
    6871
    69 FUNCTION_BEGIN(__aeabi_ldivmod)
     72__aeabi_ldivmod:
    7073        push {lr}
    7174        sub sp, sp, #24
    … …  
    7780        pop {lr}
    7881        mov pc, lr
    79 FUNCTION_END(__aeabi_ldivmod)
    8082
    81 FUNCTION_BEGIN(__aeabi_uldivmod)
     83__aeabi_uldivmod:
    8284        push {lr}
    8385        sub sp, sp, #24
    … …  
    8991        pop {lr}
    9092        mov pc, lr
    91 FUNCTION_END(__aeabi_uldivmod)
    92 

  • kernel/arch/arm32/src/exc_handler.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text   
     30
     31.global irq_exception_entry
     32.global fiq_exception_entry
     33.global data_abort_exception_entry
     34.global prefetch_abort_exception_entry
     35.global undef_instr_exception_entry
     36.global swi_exception_entry
     37.global reset_exception_entry
     38
    3239
    3340# Switches to kernel stack and saves all registers there.
    … …  
    149156.endm
    150157
    151 SYMBOL(reset_exception_entry)
     158reset_exception_entry:
    152159        SAVE_REGS_TO_STACK
    153160        mov r0, #0
    … …  
    156163        LOAD_REGS_FROM_STACK
    157164
    158 SYMBOL(irq_exception_entry)
     165irq_exception_entry:
    159166        sub lr, lr, #4
    160167        SAVE_REGS_TO_STACK
    … …  
    164171        LOAD_REGS_FROM_STACK
    165172
    166 SYMBOL(fiq_exception_entry)
     173fiq_exception_entry:
    167174        sub lr, lr, #4
    168175        SAVE_REGS_TO_STACK
    … …  
    172179        LOAD_REGS_FROM_STACK
    173180
    174 SYMBOL(undef_instr_exception_entry)
     181undef_instr_exception_entry:
    175182        SAVE_REGS_TO_STACK
    176183        mov r0, #1
    … …  
    179186        LOAD_REGS_FROM_STACK
    180187
    181 SYMBOL(prefetch_abort_exception_entry)
     188prefetch_abort_exception_entry:
    182189        sub lr, lr, #4
    183190        SAVE_REGS_TO_STACK
    … …  
    187194        LOAD_REGS_FROM_STACK
    188195
    189 SYMBOL(data_abort_exception_entry)
     196data_abort_exception_entry:
    190197        sub lr, lr, #8
    191198        SAVE_REGS_TO_STACK
    … …  
    195202        LOAD_REGS_FROM_STACK
    196203
    197 SYMBOL(swi_exception_entry)
     204swi_exception_entry:
    198205        ldr r13, =exc_stack
    199206        SAVE_REGS_TO_STACK

  • kernel/arch/arm32/src/start.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    3029#include <arch/asm/boot.h>
    3130
    3231.text
    3332
    34 SYMBOL(kernel_image_start)
     33.global kernel_image_start
     34.global exc_stack
     35.global supervisor_sp
     36
     37kernel_image_start:
     38
    3539        # initialize Stack pointer for exception modes
    3640        mrs r4, cpsr
    … …  
    7983
    8084        .space 1024
    81 SYMBOL(exc_stack)
     85exc_stack:
    8286
    83 SYMBOL(supervisor_sp)
     87supervisor_sp:
    8488        .space 4

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

    r054476d rdc0d8b52  
    2929
    3030ARCH_SOURCES = \
    31         arch/$(UARCH)/src/entry.S \
    32         arch/$(UARCH)/src/entryjmp.S \
    33         arch/$(UARCH)/src/thread_entry.S \
     31        arch/$(UARCH)/src/entry.s \
     32        arch/$(UARCH)/src/entryjmp.s \
     33        arch/$(UARCH)/src/thread_entry.s \
    3434        arch/$(UARCH)/src/syscall.c \
    3535        arch/$(UARCH)/src/fibril.S \

  • uspace/lib/c/arch/arm32/src/eabi.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(__aeabi_read_tp)
     31.global __aeabi_read_tp
     32
     33.global __aeabi_idiv
     34.global __aeabi_uidiv
     35
     36.global __aeabi_idivmod
     37.global __aeabi_uidivmod
     38
     39.global __aeabi_ldivmod
     40.global __aeabi_uldivmod
     41
     42__aeabi_read_tp:
    3443        mov r0, r9
    3544        mov pc, lr
    36 FUNCTION_END(__aeabi_read_tp)
    3745
    38 FUNCTION_BEGIN(__aeabi_idiv)
     46__aeabi_idiv:
    3947        push {lr}
    4048        bl __divsi3
    4149        pop {lr}
    4250        mov pc, lr
    43 FUNCTION_END(__aeabi_idiv)
    4451
    45 FUNCTION_BEGIN(__aeabi_uidiv)
     52__aeabi_uidiv:
    4653        push {lr}
    4754        bl __udivsi3
    4855        pop {lr}
    4956        mov pc, lr
    50 FUNCTION_END(__aeabi_uidiv)
    5157
    52 FUNCTION_BEGIN(__aeabi_idivmod)
     58__aeabi_idivmod:
    5359        push {lr}
    5460        sub sp, sp, #12
    … …  
    5965        pop {lr}
    6066        mov pc, lr
    61 FUNCTION_END(__aeabi_idivmod)
    6267
    63 FUNCTION_BEGIN(__aeabi_uidivmod)
     68__aeabi_uidivmod:
    6469        push {lr}
    6570        sub sp, sp, #12
    … …  
    7075        pop {lr}
    7176        mov pc, lr
    72 FUNCTION_END(__aeabi_uidivmod)
    7377
    74 FUNCTION_BEGIN(__aeabi_ldivmod)
     78__aeabi_ldivmod:
    7579        push {lr}
    7680        sub sp, sp, #24
    … …  
    8286        pop {lr}
    8387        mov pc, lr
    84 FUNCTION_END(__aeabi_ldivmod)
    8588
    86 FUNCTION_BEGIN(__aeabi_uldivmod)
     89__aeabi_uldivmod:
    8790        push {lr}
    8891        sub sp, sp, #24
    … …  
    9497        pop {lr}
    9598        mov pc, lr
    96 FUNCTION_END(__aeabi_uldivmod)
    97 

  • uspace/lib/c/arch/arm32/src/fibril.S

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(context_save)
     31.global context_save
     32.global context_restore
     33
     34context_save:
    3435        stmia r0!, {sp, lr}
    3536        stmia r0!, {r4-r11}
    … …  
    3839        mov r0, #1
    3940        mov pc, lr
    40 FUNCTION_END(context_save)
    4141
    42 FUNCTION_BEGIN(context_restore)
     42context_restore:
    4343        ldmia r0!, {sp, lr}
    4444        ldmia r0!, {r4-r11}
    … …  
    4747        mov r0, #0
    4848        mov pc, lr
    49 FUNCTION_END(context_restore)
    5049

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

    r054476d rdc0d8b52  
    2727#
    2828
    29 #include <abi/asmtool.h>
    30 
    3129.text
    3230
    33 FUNCTION_BEGIN(stacktrace_prepare)
     31.global stacktrace_prepare
     32.global stacktrace_fp_get
     33.global stacktrace_pc_get
     34
     35stacktrace_prepare:
    3436        mov pc, lr
    35 FUNCTION_END(stacktrace_prepare)
    3637
    37 FUNCTION_BEGIN(stacktrace_fp_get)
     38stacktrace_fp_get:
    3839        mov r0, fp
    3940        mov pc, lr
    40 FUNCTION_END(stacktrace_fp_get)
    4141
    42 FUNCTION_BEGIN(stacktrace_pc_get)
     42stacktrace_pc_get:
    4343        mov r0, lr
    4444        mov pc, lr
    45 FUNCTION_END(stacktrace_pc_get)
    46 
Note: See TracChangeset for help on using the changeset viewer.