From a43ad0e70691f6a39df04312493f0cd32cb6b6f3 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Sat, 28 Aug 2021 09:37:07 -0400 Subject: [PATCH] LibELF: Reindent .S files to be consistent with other .S files Most .S files don't indent directives, so don't indent them here either. Also, one file had tabs instead of spaces, `:retab` that file. --- Userland/Libraries/LibELF/Arch/i386/entry.S | 8 ++-- .../LibELF/Arch/i386/plt_trampoline.S | 40 +++++++++---------- Userland/Libraries/LibELF/Arch/x86_64/entry.S | 8 ++-- .../LibELF/Arch/x86_64/plt_trampoline.S | 8 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Userland/Libraries/LibELF/Arch/i386/entry.S b/Userland/Libraries/LibELF/Arch/i386/entry.S index 8fc185398c..11d844c3bf 100644 --- a/Userland/Libraries/LibELF/Arch/i386/entry.S +++ b/Userland/Libraries/LibELF/Arch/i386/entry.S @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ - .align 4 - .globl _invoke_entry - .hidden _invoke_entry - .type _invoke_entry,@function +.align 4 +.globl _invoke_entry +.hidden _invoke_entry +.type _invoke_entry,@function _invoke_entry: # (argc, argv, envp, entry) addl $4, %esp # return address popl %edi # argc diff --git a/Userland/Libraries/LibELF/Arch/i386/plt_trampoline.S b/Userland/Libraries/LibELF/Arch/i386/plt_trampoline.S index c2c563c8a4..6ea7eae44a 100644 --- a/Userland/Libraries/LibELF/Arch/i386/plt_trampoline.S +++ b/Userland/Libraries/LibELF/Arch/i386/plt_trampoline.S @@ -33,26 +33,26 @@ * _rtld_bind_start from libexec/ld.elf_so/arch/i386/rtld_start.S */ -.align 4 - .globl _plt_trampoline - .hidden _plt_trampoline - .type _plt_trampoline,@function -_plt_trampoline: # (obj, reloff) - pushf # save registers - pushl %eax - pushl %ecx - pushl %edx +.align 4 +.globl _plt_trampoline +.hidden _plt_trampoline +.type _plt_trampoline,@function +_plt_trampoline: # (obj, reloff) + pushf # save registers + pushl %eax + pushl %ecx + pushl %edx - pushl 20(%esp) # Copy of reloff - pushl 20(%esp) # Copy of obj - call _fixup_plt_entry@PLT # Call the binder - addl $8,%esp # pop binder args - movl %eax,20(%esp) # Store function to be called in obj + pushl 20(%esp) # Copy of reloff + pushl 20(%esp) # Copy of obj + call _fixup_plt_entry@PLT # Call the binder + addl $8,%esp # pop binder args + movl %eax,20(%esp) # Store function to be called in obj - popl %edx - popl %ecx - popl %eax - popf + popl %edx + popl %ecx + popl %eax + popf - leal 4(%esp),%esp # Discard reloff, do not change eflags - ret + leal 4(%esp),%esp # Discard reloff, do not change eflags + ret diff --git a/Userland/Libraries/LibELF/Arch/x86_64/entry.S b/Userland/Libraries/LibELF/Arch/x86_64/entry.S index 1195cfded8..b4721a31ca 100644 --- a/Userland/Libraries/LibELF/Arch/x86_64/entry.S +++ b/Userland/Libraries/LibELF/Arch/x86_64/entry.S @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ - .align 4 - .globl _invoke_entry - .hidden _invoke_entry - .type _invoke_entry,@function +.align 4 +.globl _invoke_entry +.hidden _invoke_entry +.type _invoke_entry,@function _invoke_entry: # (argc, argv, envp, entry) // The System V ABI for x86 and x86_64 prescribes that the stack pointer is 16-byte aligned andq $~15, %rsp diff --git a/Userland/Libraries/LibELF/Arch/x86_64/plt_trampoline.S b/Userland/Libraries/LibELF/Arch/x86_64/plt_trampoline.S index 6af4407156..311bc8fc43 100644 --- a/Userland/Libraries/LibELF/Arch/x86_64/plt_trampoline.S +++ b/Userland/Libraries/LibELF/Arch/x86_64/plt_trampoline.S @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ - .align 4 - .globl _plt_trampoline - .hidden _plt_trampoline - .type _plt_trampoline,@function +.align 4 +.globl _plt_trampoline +.hidden _plt_trampoline +.type _plt_trampoline,@function _plt_trampoline: # (object, relocation_index) # save flags/registers (https://stackoverflow.com/questions/18024672/what-registers-are-preserved-through-a-linux-x86-64-function-call) pushfq