Commit c87e73b19f8aca4a5bcea1548924b44377a5eec6 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-10-11 14:17:36+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2023-10-16 19:33:05+02:00
log	c87e73b19f8aca4a5bcea1548924b44377a5eec6
tree	2e38190c0dafb0955b08f09336baa35936ee9eb5
parent	2aa6099ad9dc5c45994101c94888deeab4ec2a06

elf: allocate non-alloc sections using incremental mechanism

1 files changed, 8 insertions(+), 17 deletions(-)

src
- link
  - Elf.zig

src/link/Elf.zig+8-17

 @@ -4623,18 +4623,6 @@ fn allocateAllocSectionsInFile(self: *Elf, base_offset: u64) void {
     }
 }
-fn allocateNonAllocSectionsInFile(self: *Elf, base_offset: u64) void {
-    var offset = base_offset;
-    var i: usize = 0;
-    while (i < self.shdrs.items.len) : (i += 1) {
-        const first = &self.shdrs.items[i];
-        if (shdrIsAlloc(first) or first.sh_type == elf.SHT_NULL) continue;
-        // Non-alloc sections don't need congruency with their allocated virtual memory addresses
-        first.sh_offset = mem.alignForward(u64, offset, first.sh_addralign);
-        offset = first.sh_offset + first.sh_size;
-    }
-}
 fn initAndAllocateSegments(self: *Elf) !void {
     const ehsize: u64 = switch (self.ptr_width) {
         .p32 => @sizeOf(elf.Elf32_Ehdr),
 @@ -4658,13 +4646,16 @@ fn initAndAllocateSegments(self: *Elf) !void {
 }
 fn allocateNonAllocSections(self: *Elf) void {
-    var off: u64 = 0;
+    for (self.shdrs.items) |*shdr| {
-    for (self.shdrs.items) |shdr| {
         if (shdr.sh_type == elf.SHT_NULL) continue;
-        if (shdr.sh_flags & elf.SHF_ALLOC == 0) break;
+        if (shdr.sh_flags & elf.SHF_ALLOC != 0) continue;
-        off = @max(off, shdr.sh_offset + shdr.sh_size);
+        const needed_size = shdr.sh_size;
+        if (needed_size > self.allocatedSize(shdr.sh_offset)) {
+            shdr.sh_size = 0;
+            shdr.sh_offset = self.findFreeSpace(needed_size, shdr.sh_addralign);
+            shdr.sh_size = needed_size;
+        }
     }
-    self.allocateNonAllocSectionsInFile(off);
 }
 fn allocateSpecialPhdrs(self: *Elf) void {