Changeset 8565a42 in mainline for uspace/lib/c/arch/ia32/src


Ignore:
Timestamp:
2018-03-02T20:34:50Z (7 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/ia32/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r3061bc1 r8565a42  
    4646        mov %ax, %fs
    4747        # Do not set %gs, it contains descriptor that can see TLS
    48        
     48
    4949#ifndef PROCESSOR_i486
    5050        # Detect the mechanism used for making syscalls
    … …  
    5757        0:
    5858#endif
    59        
     59
    6060        #
    6161        # Create the first stack frame.
    … …  
    6464        pushl $0
    6565        movl %esp, %ebp
    66        
     66
    6767        # Pass the PCB pointer to __main as the first argument
    6868        pushl %edi

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

    r3061bc1 r8565a42  
    3636        push %ebp
    3737        movl %esp, %ebp
    38        
     38
    3939        # %eax := entry_point
    4040        movl 0x8(%ebp), %eax
    41        
     41
    4242        # %edi := pcb
    4343        # pcb is passed to the entry point in %edi
    4444        mov 0xc(%ebp), %edi
    45        
     45
    4646        # Save a tiny bit of stack space
    4747        pop %ebp
    48        
     48
    4949        jmp *%eax

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

    r3061bc1 r8565a42  
    4040        movl 0(%esp), %eax  # the caller's return %eip
    4141        movl 4(%esp), %edx  # address of the context variable to save context to
    42        
     42
    4343        # save registers to the context structure
    4444        movl %esp, CONTEXT_OFFSET_SP(%edx)      # %esp -> ctx->sp
    … …  
    4848        movl %edi, CONTEXT_OFFSET_EDI(%edx)     # %edi -> ctx->edi
    4949        movl %ebp, CONTEXT_OFFSET_EBP(%edx)     # %ebp -> ctx->ebp
    50        
     50
    5151        # save TLS
    5252        movl %gs:0, %eax
    5353        movl %eax, CONTEXT_OFFSET_TLS(%edx)     # tls -> ctx->tls
    54        
     54
    5555        xorl %eax, %eax         # context_save returns 1
    5656        incl %eax
    … …  
    6565FUNCTION_BEGIN(context_restore)
    6666        movl 4(%esp), %eax  # address of the context variable to restore context from
    67        
     67
    6868        # restore registers from the context structure
    6969        movl CONTEXT_OFFSET_SP(%eax),%esp       # ctx->sp -> %esp
    … …  
    7373        movl CONTEXT_OFFSET_EDI(%eax),%edi      # ctx->edi -> %edi
    7474        movl CONTEXT_OFFSET_EBP(%eax),%ebp      # ctx->ebp -> %ebp
    75        
     75
    7676        movl %edx, 0(%esp)  # ctx->pc -> saver's return %eip
    77        
     77
    7878        # set thread local storage
    7979        movl CONTEXT_OFFSET_TLS(%eax), %edx     # Set arg1 to TLS addr
    8080        movl %edx, %gs:0
    81        
     81
    8282        xorl %eax, %eax         # context_restore returns 0
    8383        ret

  • uspace/lib/c/arch/ia32/src/rtld/reloc.c

    r3061bc1 r8565a42  
    6565        elf_word sym_idx;
    6666        uint32_t sym_addr;
    67        
     67
    6868        elf_symbol_t *sym_table;
    6969        elf_symbol_t *sym;
    … …  
    7171        uint32_t sym_size;
    7272        char *str_tab;
    73        
     73
    7474        elf_symbol_t *sym_def;
    7575        module_t *dest;
    … …  
    8282
    8383        DPRINTF("address: 0x%" PRIxPTR ", entries: %zd\n", (uintptr_t)rt, rt_entries);
    84        
     84
    8585        for (i = 0; i < rt_entries; ++i) {
    8686//              DPRINTF("symbol %d: ", i);
    … …  
    173173                        memcpy(r_ptr, (const void *)sym_addr, sym_size);
    174174                        break;
    175                        
     175
    176176                case R_386_RELATIVE:
    177177                        DPRINTF("fixup R_386_RELATIVE (b+a)\n");

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

    r3061bc1 r8565a42  
    4040        mov %dx, %fs
    4141        # Do not set %gs, it contains descriptor that can see TLS
    42        
     42
    4343        #
    4444        # Create the first stack frame.
    … …  
    4747        pushl $0
    4848        mov %esp, %ebp
    49        
     49
    5050        #
    5151        # EAX contains address of uarg.
    … …  
    5353        pushl %eax
    5454        call __thread_main
    55        
     55
    5656        #
    5757        # Not reached.
Note: See TracChangeset for help on using the changeset viewer.