Changeset 8565a42 in mainline for uspace/lib/c/arch/arm32


Ignore:
Timestamp:
2018-03-02T20:34:50Z (8 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a1a81f69, d5e5fd1
Parents:
3061bc1 (diff), 34e1206 (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.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
git-committer:
GitHub <noreply@…> (2018-03-02 20:34:50)
Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:
uspace/lib/c/arch/arm32
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/arm32/_link.ld.in

    r3061bc1 r8565a42  
    1818        . = 0x1000 + SIZEOF_HEADERS;
    1919#endif
    20        
     20
    2121        .init : {
    2222                *(.init);
    2323        } :text
    24        
     24
    2525        .text : {
    2626                *(.text .text.*);
    2727                *(.rodata .rodata.*);
    2828        } :text
    29        
     29
    3030#ifdef LOADER
    3131        .interp : {
     
    3333        } :interp :text
    3434#endif
    35        
     35
    3636        . = . + 0x1000;
    37        
     37
    3838        .data : {
    3939                *(.opd);
     
    4141                *(.sdata);
    4242        } :data
    43        
     43
    4444        .tdata : {
    4545                _tdata_start = .;
     
    5050                _tbss_end = .;
    5151        } :data
    52        
     52
    5353        _tls_alignment = ALIGNOF(.tdata);
    54        
     54
    5555        .bss : {
    5656                *(.sbss);
     
    5959                *(.bss);
    6060        } :data
    61        
     61
    6262        /DISCARD/ : {
    6363                *(*);
  • uspace/lib/c/arch/arm32/include/libarch/atomic.h

    r3061bc1 r8565a42  
    4949{
    5050        atomic_count_t ret = 0;
    51        
     51
    5252        /*
    5353         * The following instructions between labels 1 and 2 constitute a
     
    7575                : "memory"
    7676        );
    77        
     77
    7878        ras_page[0] = 0;
    7979        asm volatile (
     
    8181        );
    8282        ras_page[1] = 0xffffffff;
    83        
     83
    8484        return ret != 0;
    8585}
     
    9696{
    9797        atomic_count_t ret = 0;
    98        
     98
    9999        /*
    100100         * The following instructions between labels 1 and 2 constitute a
     
    118118                : [imm] "r" (i)
    119119        );
    120        
     120
    121121        ras_page[0] = 0;
    122122        asm volatile (
     
    124124        );
    125125        ras_page[1] = 0xffffffff;
    126        
     126
    127127        return ret;
    128128}
  • uspace/lib/c/arch/arm32/src/entry.S

    r3061bc1 r8565a42  
    4242        ldr r0, =ras_page
    4343        str r2, [r0]
    44        
     44
    4545        #
    4646        # Create the first stack frame.
     
    5050        push {fp, ip, lr, pc}
    5151        sub fp, ip, #4
    52        
     52
    5353        # Pass pcb_ptr to __main as the first argument (in r0)
    5454        mov r0, r1
  • uspace/lib/c/arch/arm32/src/fibril.S

    r3061bc1 r8565a42  
    3434        stmia r0!, {sp, lr}
    3535        stmia r0!, {r4-r11}
    36        
     36
    3737        # return 1
    3838        mov r0, #1
     
    4343        ldmia r0!, {sp, lr}
    4444        ldmia r0!, {r4-r11}
    45        
     45
    4646        # return 0
    4747        mov r0, #0
  • uspace/lib/c/arch/arm32/src/syscall.c

    r3061bc1 r8565a42  
    6060        register sysarg_t __arm_reg_r5 asm("r5") = p6;
    6161        register sysarg_t __arm_reg_r6 asm("r6") = id;
    62        
     62
    6363        asm volatile (
    6464                "swi 0"
     
    7272                  "r" (__arm_reg_r6)
    7373        );
    74        
     74
    7575        return __arm_reg_r0;
    7676}
  • uspace/lib/c/arch/arm32/src/thread_entry.S

    r3061bc1 r8565a42  
    4242        push {fp, ip, lr, pc}
    4343        sub fp, ip, #4
    44        
     44
    4545        b __thread_main
Note: See TracChangeset for help on using the changeset viewer.