Changeset a35b458 in mainline for kernel/generic/src/lib/elf.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/generic/src/lib/elf.c (modified) (9 diffs)

kernel/generic/src/lib/elf.c

@@ -80 +80 @@
             (header->e_ident[EI_MAG3] != ELFMAG3))
                 return EE_INVALID;
-        
+
         /* Identify ELF compatibility */
         if ((header->e_ident[EI_DATA] != ELF_DATA_ENCODING) ||
@@ -88 +88 @@
             (header->e_ident[EI_CLASS] != ELF_CLASS))
                 return EE_INCOMPATIBLE;
-        
+
         if (header->e_phentsize != sizeof(elf_segment_header_t))
                 return EE_INCOMPATIBLE;
-        
+
         if (header->e_shentsize != sizeof(elf_section_header_t))
                 return EE_INCOMPATIBLE;
-        
+
         /* Check if the object type is supported. */
         if (header->e_type != ET_EXEC)
                 return EE_UNSUPPORTED;
-        
+
         /* Check if the ELF image starts on a page boundary */
         if (ALIGN_UP((uintptr_t) header, PAGE_SIZE) != (uintptr_t) header)
                 return EE_UNSUPPORTED;
-        
+
         /* Walk through all segment headers and process them. */
         elf_half i;
@@ -109 +109 @@
                     &((elf_segment_header_t *)(((uint8_t *) header) +
                     header->e_phoff))[i];
-                
+
                 int rc = segment_header(seghdr, header, as, flags);
                 if (rc != EE_OK)
                         return rc;
         }
-        
+
         /* Inspect all section headers and process them. */
         for (i = 0; i < header->e_shnum; i++) {
@@ -120 +120 @@
                     &((elf_section_header_t *)(((uint8_t *) header) +
                     header->e_shoff))[i];
-                
+
                 int rc = section_header(sechdr, header, as);
                 if (rc != EE_OK)
                         return rc;
         }
-        
+
         return EE_OK;
 }
@@ -139 +139 @@
 {
         assert(rc < sizeof(error_codes) / sizeof(char *));
-        
+
         return error_codes[rc];
 }
@@ -199 +199 @@
         backend_data.elf = elf;
         backend_data.segment = entry;
-        
+
         if (entry->p_align > 1) {
                 if ((entry->p_offset % entry->p_align) !=
@@ -205 +205 @@
                         return EE_INVALID;
         }
-        
+
         unsigned int flags = 0;
-        
+
         if (entry->p_flags & PF_X)
                 flags |= AS_AREA_EXEC;
-        
+
         if (entry->p_flags & PF_W)
                 flags |= AS_AREA_WRITE;
-        
+
         if (entry->p_flags & PF_R)
                 flags |= AS_AREA_READ;
-        
+
         flags |= AS_AREA_CACHEABLE;
-        
+
         /*
          * Align vaddr down, inserting a little "gap" at the beginning.
@@ -226 +226 @@
         uintptr_t base = ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE);
         size_t mem_sz = entry->p_memsz + (entry->p_vaddr - base);
-        
+
         as_area_t *area = as_area_create(as, flags, mem_sz,
             AS_AREA_ATTR_NONE, &elf_backend, &backend_data, &base, 0);
         if (!area)
                 return EE_MEMORY;
-        
+
         /*
          * The segment will be mapped on demand by elf_page_fault().
          *
          */
-        
+
         return EE_OK;
 }
@@ -266 +266 @@
                 break;
         }
-        
+
         return EE_OK;
 }