]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/build: Clean up arch/x86/tools/relocs.c a bit
authorIngo Molnar <mingo@kernel.org>
Sun, 24 Mar 2024 03:46:10 +0000 (04:46 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 24 Mar 2024 04:01:35 +0000 (05:01 +0100)
So:

 - Follow Documentation/CodingStyle for:
    - curly braces
    - variable definitions
    - return statements
    - etc.
    - Fix unnecessary linebreaks
    - Don't split user-visible error strings over multiple lines ...

 - It's fine to use vertical alignment to make code more readable,
   but it should be internally consistent for definitions visible
   on a single page ...

 - There's 40+ die() statements that are basically asserts and
   never trigger. Make them single-line, to move them out of
   sight as much as possible.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
arch/x86/tools/relocs.c

index e7a44a7f617fbefeba6efda23dac767756c54f15..c101bed6194000004bd84e1679259cce9977d290 100644 (file)
 #define Elf_Shdr               ElfW(Shdr)
 #define Elf_Sym                        ElfW(Sym)
 
-static Elf_Ehdr                ehdr;
-static unsigned long   shnum;
-static unsigned int    shstrndx;
-static unsigned int    shsymtabndx;
-static unsigned int    shxsymtabndx;
+static Elf_Ehdr                        ehdr;
+static unsigned long           shnum;
+static unsigned int            shstrndx;
+static unsigned int            shsymtabndx;
+static unsigned int            shxsymtabndx;
 
 static int sym_index(Elf_Sym *sym);
 
 struct relocs {
-       uint32_t        *offset;
-       unsigned long   count;
-       unsigned long   size;
+                               uint32_t        *offset;
+                               unsigned long   count;
+                               unsigned long   size;
 };
 
-static struct relocs relocs16;
-static struct relocs relocs32;
+static struct relocs           relocs16;
+static struct relocs           relocs32;
+
 #if ELF_BITS == 64
-static struct relocs relocs32neg;
-static struct relocs relocs64;
-#define FMT PRIu64
+static struct relocs           relocs32neg;
+static struct relocs           relocs64;
+# define FMT PRIu64
 #else
-#define FMT PRIu32
+# define FMT PRIu32
 #endif
 
 struct section {
-       Elf_Shdr       shdr;
-       struct section *link;
-       Elf_Sym        *symtab;
-       Elf32_Word     *xsymtab;
-       Elf_Rel        *reltab;
-       char           *strtab;
+                               Elf_Shdr       shdr;
+                               struct section *link;
+                               Elf_Sym        *symtab;
+                               Elf32_Word     *xsymtab;
+                               Elf_Rel        *reltab;
+                               char           *strtab;
 };
-static struct section *secs;
+static struct section          *secs;
 
-static const char * const sym_regex_kernel[S_NSYMTYPES] = {
+static const char * const      sym_regex_kernel[S_NSYMTYPES] = {
 /*
  * Following symbols have been audited. There values are constant and do
  * not change if bzImage is loaded at a different physical address than
@@ -115,13 +116,13 @@ static const char * const sym_regex_realmode[S_NSYMTYPES] = {
        "^pa_",
 };
 
-static const char * const *sym_regex;
+static const char * const      *sym_regex;
+
+static regex_t                 sym_regex_c[S_NSYMTYPES];
 
-static regex_t sym_regex_c[S_NSYMTYPES];
 static int is_reloc(enum symtype type, const char *sym_name)
 {
-       return sym_regex[type] &&
-               !regexec(&sym_regex_c[type], sym_name, 0, NULL, 0);
+       return sym_regex[type] && !regexec(&sym_regex_c[type], sym_name, 0, NULL, 0);
 }
 
 static void regex_init(int use_real_mode)
@@ -139,8 +140,7 @@ static void regex_init(int use_real_mode)
                if (!sym_regex[i])
                        continue;
 
-               err = regcomp(&sym_regex_c[i], sym_regex[i],
-                             REG_EXTENDED|REG_NOSUB);
+               err = regcomp(&sym_regex_c[i], sym_regex[i], REG_EXTENDED|REG_NOSUB);
 
                if (err) {
                        regerror(err, &sym_regex_c[i], errbuf, sizeof(errbuf));
@@ -163,9 +163,10 @@ static const char *sym_type(unsigned type)
 #undef SYM_TYPE
        };
        const char *name = "unknown sym type name";
-       if (type < ARRAY_SIZE(type_name)) {
+
+       if (type < ARRAY_SIZE(type_name))
                name = type_name[type];
-       }
+
        return name;
 }
 
@@ -179,9 +180,10 @@ static const char *sym_bind(unsigned bind)
 #undef SYM_BIND
        };
        const char *name = "unknown sym bind name";
-       if (bind < ARRAY_SIZE(bind_name)) {
+
+       if (bind < ARRAY_SIZE(bind_name))
                name = bind_name[bind];
-       }
+
        return name;
 }
 
@@ -196,9 +198,10 @@ static const char *sym_visibility(unsigned visibility)
 #undef SYM_VISIBILITY
        };
        const char *name = "unknown sym visibility name";
-       if (visibility < ARRAY_SIZE(visibility_name)) {
+
+       if (visibility < ARRAY_SIZE(visibility_name))
                name = visibility_name[visibility];
-       }
+
        return name;
 }
 
@@ -244,9 +247,10 @@ static const char *rel_type(unsigned type)
 #undef REL_TYPE
        };
        const char *name = "unknown type rel type name";
-       if (type < ARRAY_SIZE(type_name) && type_name[type]) {
+
+       if (type < ARRAY_SIZE(type_name) && type_name[type])
                name = type_name[type];
-       }
+
        return name;
 }
 
@@ -256,15 +260,14 @@ static const char *sec_name(unsigned shndx)
        const char *name;
        sec_strtab = secs[shstrndx].strtab;
        name = "<noname>";
-       if (shndx < shnum) {
+
+       if (shndx < shnum)
                name = sec_strtab + secs[shndx].shdr.sh_name;
-       }
-       else if (shndx == SHN_ABS) {
+       else if (shndx == SHN_ABS)
                name = "ABSOLUTE";
-       }
-       else if (shndx == SHN_COMMON) {
+       else if (shndx == SHN_COMMON)
                name = "COMMON";
-       }
+
        return name;
 }
 
@@ -272,18 +275,19 @@ static const char *sym_name(const char *sym_strtab, Elf_Sym *sym)
 {
        const char *name;
        name = "<noname>";
-       if (sym->st_name) {
+
+       if (sym->st_name)
                name = sym_strtab + sym->st_name;
-       }
-       else {
+       else
                name = sec_name(sym_index(sym));
-       }
+
        return name;
 }
 
 static Elf_Sym *sym_lookup(const char *symname)
 {
        int i;
+
        for (i = 0; i < shnum; i++) {
                struct section *sec = &secs[i];
                long nsyms;
@@ -309,14 +313,15 @@ static Elf_Sym *sym_lookup(const char *symname)
 }
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-#define le16_to_cpu(val) (val)
-#define le32_to_cpu(val) (val)
-#define le64_to_cpu(val) (val)
+# define le16_to_cpu(val)      (val)
+# define le32_to_cpu(val)      (val)
+# define le64_to_cpu(val)      (val)
 #endif
+
 #if BYTE_ORDER == BIG_ENDIAN
-#define le16_to_cpu(val) bswap_16(val)
-#define le32_to_cpu(val) bswap_32(val)
-#define le64_to_cpu(val) bswap_64(val)
+# define le16_to_cpu(val)      bswap_16(val)
+# define le32_to_cpu(val)      bswap_32(val)
+# define le64_to_cpu(val)      bswap_64(val)
 #endif
 
 static uint16_t elf16_to_cpu(uint16_t val)
@@ -337,13 +342,13 @@ static uint64_t elf64_to_cpu(uint64_t val)
 {
         return le64_to_cpu(val);
 }
-#define elf_addr_to_cpu(x)     elf64_to_cpu(x)
-#define elf_off_to_cpu(x)      elf64_to_cpu(x)
-#define elf_xword_to_cpu(x)    elf64_to_cpu(x)
+# define elf_addr_to_cpu(x)    elf64_to_cpu(x)
+# define elf_off_to_cpu(x)     elf64_to_cpu(x)
+# define elf_xword_to_cpu(x)   elf64_to_cpu(x)
 #else
-#define elf_addr_to_cpu(x)     elf32_to_cpu(x)
-#define elf_off_to_cpu(x)      elf32_to_cpu(x)
-#define elf_xword_to_cpu(x)    elf32_to_cpu(x)
+# define elf_addr_to_cpu(x)    elf32_to_cpu(x)
+# define elf_off_to_cpu(x)     elf32_to_cpu(x)
+# define elf_xword_to_cpu(x)   elf32_to_cpu(x)
 #endif
 
 static int sym_index(Elf_Sym *sym)
@@ -365,22 +370,17 @@ static int sym_index(Elf_Sym *sym)
 
 static void read_ehdr(FILE *fp)
 {
-       if (fread(&ehdr, sizeof(ehdr), 1, fp) != 1) {
-               die("Cannot read ELF header: %s\n",
-                       strerror(errno));
-       }
-       if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) {
+       if (fread(&ehdr, sizeof(ehdr), 1, fp) != 1)
+               die("Cannot read ELF header: %s\n", strerror(errno));
+       if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
                die("No ELF magic\n");
-       }
-       if (ehdr.e_ident[EI_CLASS] != ELF_CLASS) {
+       if (ehdr.e_ident[EI_CLASS] != ELF_CLASS)
                die("Not a %d bit executable\n", ELF_BITS);
-       }
-       if (ehdr.e_ident[EI_DATA] != ELFDATA2LSB) {
+       if (ehdr.e_ident[EI_DATA] != ELFDATA2LSB)
                die("Not a LSB ELF executable\n");
-       }
-       if (ehdr.e_ident[EI_VERSION] != EV_CURRENT) {
+       if (ehdr.e_ident[EI_VERSION] != EV_CURRENT)
                die("Unknown ELF version\n");
-       }
+
        /* Convert the fields to native endian */
        ehdr.e_type      = elf_half_to_cpu(ehdr.e_type);
        ehdr.e_machine   = elf_half_to_cpu(ehdr.e_machine);
@@ -439,19 +439,18 @@ static void read_shdrs(FILE *fp)
        Elf_Shdr shdr;
 
        secs = calloc(shnum, sizeof(struct section));
-       if (!secs) {
-               die("Unable to allocate %ld section headers\n",
-                   shnum);
-       }
-       if (fseek(fp, ehdr.e_shoff, SEEK_SET) < 0) {
-               die("Seek to %" FMT " failed: %s\n",
-                   ehdr.e_shoff, strerror(errno));
-       }
+       if (!secs)
+               die("Unable to allocate %ld section headers\n", shnum);
+
+       if (fseek(fp, ehdr.e_shoff, SEEK_SET) < 0)
+               die("Seek to %" FMT " failed: %s\n", ehdr.e_shoff, strerror(errno));
+
        for (i = 0; i < shnum; i++) {
                struct section *sec = &secs[i];
+
                if (fread(&shdr, sizeof(shdr), 1, fp) != 1)
-                       die("Cannot read ELF section headers %d/%ld: %s\n",
-                           i, shnum, strerror(errno));
+                       die("Cannot read ELF section headers %d/%ld: %s\n", i, shnum, strerror(errno));
+
                sec->shdr.sh_name      = elf_word_to_cpu(shdr.sh_name);
                sec->shdr.sh_type      = elf_word_to_cpu(shdr.sh_type);
                sec->shdr.sh_flags     = elf_xword_to_cpu(shdr.sh_flags);
@@ -471,31 +470,28 @@ static void read_shdrs(FILE *fp)
 static void read_strtabs(FILE *fp)
 {
        int i;
+
        for (i = 0; i < shnum; i++) {
                struct section *sec = &secs[i];
-               if (sec->shdr.sh_type != SHT_STRTAB) {
+
+               if (sec->shdr.sh_type != SHT_STRTAB)
                        continue;
-               }
+
                sec->strtab = malloc(sec->shdr.sh_size);
-               if (!sec->strtab) {
-                       die("malloc of %" FMT " bytes for strtab failed\n",
-                           sec->shdr.sh_size);
-               }
-               if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
-                       die("Seek to %" FMT " failed: %s\n",
-                           sec->shdr.sh_offset, strerror(errno));
-               }
-               if (fread(sec->strtab, 1, sec->shdr.sh_size, fp)
-                   != sec->shdr.sh_size) {
-                       die("Cannot read symbol table: %s\n",
-                               strerror(errno));
-               }
+               if (!sec->strtab)
+                       die("malloc of %" FMT " bytes for strtab failed\n", sec->shdr.sh_size);
+
+               if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0)
+                       die("Seek to %" FMT " failed: %s\n", sec->shdr.sh_offset, strerror(errno));
+
+               if (fread(sec->strtab, 1, sec->shdr.sh_size, fp) != sec->shdr.sh_size)
+                       die("Cannot read symbol table: %s\n", strerror(errno));
        }
 }
 
 static void read_symtabs(FILE *fp)
 {
-       int i,j;
+       int i, j;
 
        for (i = 0; i < shnum; i++) {
                struct section *sec = &secs[i];
@@ -504,19 +500,15 @@ static void read_symtabs(FILE *fp)
                switch (sec->shdr.sh_type) {
                case SHT_SYMTAB_SHNDX:
                        sec->xsymtab = malloc(sec->shdr.sh_size);
-                       if (!sec->xsymtab) {
-                               die("malloc of %" FMT " bytes for xsymtab failed\n",
-                                   sec->shdr.sh_size);
-                       }
-                       if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
-                               die("Seek to %" FMT " failed: %s\n",
-                                   sec->shdr.sh_offset, strerror(errno));
-                       }
-                       if (fread(sec->xsymtab, 1, sec->shdr.sh_size, fp)
-                           != sec->shdr.sh_size) {
-                               die("Cannot read extended symbol table: %s\n",
-                                   strerror(errno));
-                       }
+                       if (!sec->xsymtab)
+                               die("malloc of %" FMT " bytes for xsymtab failed\n", sec->shdr.sh_size);
+
+                       if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0)
+                               die("Seek to %" FMT " failed: %s\n", sec->shdr.sh_offset, strerror(errno));
+
+                       if (fread(sec->xsymtab, 1, sec->shdr.sh_size, fp) != sec->shdr.sh_size)
+                               die("Cannot read extended symbol table: %s\n", strerror(errno));
+
                        shxsymtabndx = i;
                        continue;
 
@@ -524,19 +516,15 @@ static void read_symtabs(FILE *fp)
                        num_syms = sec->shdr.sh_size / sizeof(Elf_Sym);
 
                        sec->symtab = malloc(sec->shdr.sh_size);
-                       if (!sec->symtab) {
-                               die("malloc of %" FMT " bytes for symtab failed\n",
-                                   sec->shdr.sh_size);
-                       }
-                       if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
-                               die("Seek to %" FMT " failed: %s\n",
-                                   sec->shdr.sh_offset, strerror(errno));
-                       }
-                       if (fread(sec->symtab, 1, sec->shdr.sh_size, fp)
-                           != sec->shdr.sh_size) {
-                               die("Cannot read symbol table: %s\n",
-                                   strerror(errno));
-                       }
+                       if (!sec->symtab)
+                               die("malloc of %" FMT " bytes for symtab failed\n", sec->shdr.sh_size);
+
+                       if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0)
+                               die("Seek to %" FMT " failed: %s\n", sec->shdr.sh_offset, strerror(errno));
+
+                       if (fread(sec->symtab, 1, sec->shdr.sh_size, fp) != sec->shdr.sh_size)
+                               die("Cannot read symbol table: %s\n", strerror(errno));
+
                        for (j = 0; j < num_syms; j++) {
                                Elf_Sym *sym = &sec->symtab[j];
 
@@ -557,28 +545,27 @@ static void read_symtabs(FILE *fp)
 
 static void read_relocs(FILE *fp)
 {
-       int i,j;
+       int i, j;
+
        for (i = 0; i < shnum; i++) {
                struct section *sec = &secs[i];
-               if (sec->shdr.sh_type != SHT_REL_TYPE) {
+
+               if (sec->shdr.sh_type != SHT_REL_TYPE)
                        continue;
-               }
+
                sec->reltab = malloc(sec->shdr.sh_size);
-               if (!sec->reltab) {
-                       die("malloc of %" FMT " bytes for relocs failed\n",
-                           sec->shdr.sh_size);
-               }
-               if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0) {
-                       die("Seek to %" FMT " failed: %s\n",
-                           sec->shdr.sh_offset, strerror(errno));
-               }
-               if (fread(sec->reltab, 1, sec->shdr.sh_size, fp)
-                   != sec->shdr.sh_size) {
-                       die("Cannot read symbol table: %s\n",
-                               strerror(errno));
-               }
+               if (!sec->reltab)
+                       die("malloc of %" FMT " bytes for relocs failed\n", sec->shdr.sh_size);
+
+               if (fseek(fp, sec->shdr.sh_offset, SEEK_SET) < 0)
+                       die("Seek to %" FMT " failed: %s\n", sec->shdr.sh_offset, strerror(errno));
+
+               if (fread(sec->reltab, 1, sec->shdr.sh_size, fp) != sec->shdr.sh_size)
+                       die("Cannot read symbol table: %s\n", strerror(errno));
+
                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
                        Elf_Rel *rel = &sec->reltab[j];
+
                        rel->r_offset = elf_addr_to_cpu(rel->r_offset);
                        rel->r_info   = elf_xword_to_cpu(rel->r_info);
 #if (SHT_REL_TYPE == SHT_RELA)
@@ -601,23 +588,27 @@ static void print_absolute_symbols(void)
 
        printf("Absolute symbols\n");
        printf(" Num:    Value Size  Type       Bind        Visibility  Name\n");
+
        for (i = 0; i < shnum; i++) {
                struct section *sec = &secs[i];
                char *sym_strtab;
                int j;
 
-               if (sec->shdr.sh_type != SHT_SYMTAB) {
+               if (sec->shdr.sh_type != SHT_SYMTAB)
                        continue;
-               }
+
                sym_strtab = sec->link->strtab;
+
                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Sym); j++) {
                        Elf_Sym *sym;
                        const char *name;
+
                        sym = &sec->symtab[j];
                        name = sym_name(sym_strtab, sym);
-                       if (sym->st_shndx != SHN_ABS) {
+
+                       if (sym->st_shndx != SHN_ABS)
                                continue;
-                       }
+
                        printf(format,
                                j, sym->st_value, sym->st_size,
                                sym_type(ELF_ST_TYPE(sym->st_info)),
@@ -645,34 +636,37 @@ static void print_absolute_relocs(void)
                char *sym_strtab;
                Elf_Sym *sh_symtab;
                int j;
-               if (sec->shdr.sh_type != SHT_REL_TYPE) {
+
+               if (sec->shdr.sh_type != SHT_REL_TYPE)
                        continue;
-               }
+
                sec_symtab  = sec->link;
                sec_applies = &secs[sec->shdr.sh_info];
-               if (!(sec_applies->shdr.sh_flags & SHF_ALLOC)) {
+               if (!(sec_applies->shdr.sh_flags & SHF_ALLOC))
                        continue;
-               }
+
                /*
                 * Do not perform relocations in .notes section; any
                 * values there are meant for pre-boot consumption (e.g.
                 * startup_xen).
                 */
-               if (sec_applies->shdr.sh_type == SHT_NOTE) {
+               if (sec_applies->shdr.sh_type == SHT_NOTE)
                        continue;
-               }
+
                sh_symtab  = sec_symtab->symtab;
                sym_strtab = sec_symtab->link->strtab;
+
                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
                        Elf_Rel *rel;
                        Elf_Sym *sym;
                        const char *name;
+
                        rel = &sec->reltab[j];
                        sym = &sh_symtab[ELF_R_SYM(rel->r_info)];
                        name = sym_name(sym_strtab, sym);
-                       if (sym->st_shndx != SHN_ABS) {
+
+                       if (sym->st_shndx != SHN_ABS)
                                continue;
-                       }
 
                        /* Absolute symbols are not relocated if bzImage is
                         * loaded at a non-compiled address. Display a warning
@@ -691,10 +685,8 @@ static void print_absolute_relocs(void)
                                continue;
 
                        if (!printed) {
-                               printf("WARNING: Absolute relocations"
-                                       " present\n");
-                               printf("Offset     Info     Type     Sym.Value "
-                                       "Sym.Name\n");
+                               printf("WARNING: Absolute relocations present\n");
+                               printf("Offset     Info     Type     Sym.Value Sym.Name\n");
                                printed = 1;
                        }
 
@@ -718,8 +710,8 @@ static void add_reloc(struct relocs *r, uint32_t offset)
                void *mem = realloc(r->offset, newsize * sizeof(r->offset[0]));
 
                if (!mem)
-                       die("realloc of %ld entries for relocs failed\n",
-                                newsize);
+                       die("realloc of %ld entries for relocs failed\n", newsize);
+
                r->offset = mem;
                r->size = newsize;
        }
@@ -730,6 +722,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
                        Elf_Sym *sym, const char *symname))
 {
        int i;
+
        /* Walk through the relocations */
        for (i = 0; i < shnum; i++) {
                char *sym_strtab;
@@ -738,14 +731,13 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
                int j;
                struct section *sec = &secs[i];
 
-               if (sec->shdr.sh_type != SHT_REL_TYPE) {
+               if (sec->shdr.sh_type != SHT_REL_TYPE)
                        continue;
-               }
+
                sec_symtab  = sec->link;
                sec_applies = &secs[sec->shdr.sh_info];
-               if (!(sec_applies->shdr.sh_flags & SHF_ALLOC)) {
+               if (!(sec_applies->shdr.sh_flags & SHF_ALLOC))
                        continue;
-               }
 
                /*
                 * Do not perform relocations in .notes sections; any
@@ -757,6 +749,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
 
                sh_symtab = sec_symtab->symtab;
                sym_strtab = sec_symtab->link->strtab;
+
                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
                        Elf_Rel *rel = &sec->reltab[j];
                        Elf_Sym *sym = &sh_symtab[ELF_R_SYM(rel->r_info)];
@@ -790,14 +783,16 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
  * kernel data and does not require special treatment.
  *
  */
-static int per_cpu_shndx       = -1;
+static int per_cpu_shndx = -1;
 static Elf_Addr per_cpu_load_addr;
 
 static void percpu_init(void)
 {
        int i;
+
        for (i = 0; i < shnum; i++) {
                ElfW(Sym) *sym;
+
                if (strcmp(sec_name(i), ".data..percpu"))
                        continue;
 
@@ -810,6 +805,7 @@ static void percpu_init(void)
 
                per_cpu_shndx = i;
                per_cpu_load_addr = sym->st_value;
+
                return;
        }
 }
@@ -880,8 +876,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
                 * Only used by jump labels
                 */
                if (is_percpu_sym(sym, symname))
-                       die("Invalid R_X86_64_PC64 relocation against per-CPU symbol %s\n",
-                           symname);
+                       die("Invalid R_X86_64_PC64 relocation against per-CPU symbol %s\n", symname);
                break;
 
        case R_X86_64_32:
@@ -901,8 +896,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
                        if (is_reloc(S_ABS, symname))
                                break;
 
-                       die("Invalid absolute %s relocation: %s\n",
-                           rel_type(r_type), symname);
+                       die("Invalid absolute %s relocation: %s\n", rel_type(r_type), symname);
                        break;
                }
 
@@ -922,8 +916,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
                break;
 
        default:
-               die("Unsupported relocation type: %s (%d)\n",
-                   rel_type(r_type), r_type);
+               die("Unsupported relocation type: %s (%d)\n", rel_type(r_type), r_type);
                break;
        }
 
@@ -960,8 +953,7 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
                        if (is_reloc(S_ABS, symname))
                                break;
 
-                       die("Invalid absolute %s relocation: %s\n",
-                           rel_type(r_type), symname);
+                       die("Invalid absolute %s relocation: %s\n", rel_type(r_type), symname);
                        break;
                }
 
@@ -969,16 +961,14 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
                break;
 
        default:
-               die("Unsupported relocation type: %s (%d)\n",
-                   rel_type(r_type), r_type);
+               die("Unsupported relocation type: %s (%d)\n", rel_type(r_type), r_type);
                break;
        }
 
        return 0;
 }
 
-static int do_reloc_real(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
-                        const char *symname)
+static int do_reloc_real(struct section *sec, Elf_Rel *rel, Elf_Sym *sym, const char *symname)
 {
        unsigned r_type = ELF32_R_TYPE(rel->r_info);
        int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
@@ -1013,9 +1003,7 @@ static int do_reloc_real(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
                        if (!is_reloc(S_LIN, symname))
                                break;
                }
-               die("Invalid %s %s relocation: %s\n",
-                   shn_abs ? "absolute" : "relative",
-                   rel_type(r_type), symname);
+               die("Invalid %s %s relocation: %s\n", shn_abs ? "absolute" : "relative", rel_type(r_type), symname);
                break;
 
        case R_386_32:
@@ -1036,14 +1024,11 @@ static int do_reloc_real(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
                                add_reloc(&relocs32, rel->r_offset);
                        break;
                }
-               die("Invalid %s %s relocation: %s\n",
-                   shn_abs ? "absolute" : "relative",
-                   rel_type(r_type), symname);
+               die("Invalid %s %s relocation: %s\n", shn_abs ? "absolute" : "relative", rel_type(r_type), symname);
                break;
 
        default:
-               die("Unsupported relocation type: %s (%d)\n",
-                   rel_type(r_type), r_type);
+               die("Unsupported relocation type: %s (%d)\n", rel_type(r_type), r_type);
                break;
        }
 
@@ -1055,7 +1040,10 @@ static int do_reloc_real(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
 static int cmp_relocs(const void *va, const void *vb)
 {
        const uint32_t *a, *b;
-       a = va; b = vb;
+
+       a = va;
+       b = vb;
+
        return (*a == *b)? 0 : (*a > *b)? 1 : -1;
 }
 
@@ -1069,6 +1057,7 @@ static int write32(uint32_t v, FILE *f)
        unsigned char buf[4];
 
        put_unaligned_le32(v, buf);
+
        return fwrite(buf, 1, 4, f) == 4 ? 0 : -1;
 }
 
@@ -1081,8 +1070,7 @@ static void emit_relocs(int as_text, int use_real_mode)
 {
        int i;
        int (*write_reloc)(uint32_t, FILE *) = write32;
-       int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
-                       const char *symname);
+       int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym, const char *symname);
 
 #if ELF_BITS == 64
        if (!use_real_mode)
@@ -1169,6 +1157,7 @@ static int do_reloc_info(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
                rel_type(ELF_R_TYPE(rel->r_info)),
                symname,
                sec_name(sym_index(sym)));
+
        return 0;
 }
 
@@ -1194,19 +1183,24 @@ void process(FILE *fp, int use_real_mode, int as_text,
        read_strtabs(fp);
        read_symtabs(fp);
        read_relocs(fp);
+
        if (ELF_BITS == 64)
                percpu_init();
+
        if (show_absolute_syms) {
                print_absolute_symbols();
                return;
        }
+
        if (show_absolute_relocs) {
                print_absolute_relocs();
                return;
        }
+
        if (show_reloc_info) {
                print_reloc_info();
                return;
        }
+
        emit_relocs(as_text, use_real_mode);
 }