Commit 372acb83500e9f910f48b78eaca4bf35a6e4f9d8 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-09-16 13:49:13+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2022-09-18 10:00:04+02:00
log	372acb83500e9f910f48b78eaca4bf35a6e4f9d8
tree	856173cf6df55fca9097bc114bcb9072ea8d5166
parent	275abf7c5712e572c96db825cc4a0e46a4890250

macho: ensure we extend section size when updating last atom

2 files changed, 14 insertions(+), 11 deletions(-)

src
- link
  - MachO.zig
  - MachO
    Atom.zig

src/link/MachO.zig+13-10

 @@ -3121,6 +3121,11 @@ fn updateDeclCode(self: *MachO, decl_index: Module.Decl.Index, code: []const u8)
             }
         } else if (code_len < atom.size) {
             self.shrinkAtom(atom, code_len);
+        } else if (atom.next == null) {
+            const header = &self.sections.items(.header)[sect_id];
+            const segment = self.getSegment(sect_id);
+            const needed_size = (sym.n_value + code_len) - segment.vmaddr;
+            header.size = needed_size;
         }
         atom.size = code_len;
     } else {
 @@ -4688,12 +4693,11 @@ fn detectAllocCollision(self: *MachO, start: u64, size: u64) ?u64 {
     const end = start + padToIdeal(size);
-    for (self.sections.items(.segment_index)) |segment_index| {
+    for (self.sections.items(.header)) |header| {
-        const segment = self.segments.items[segment_index];
+        const tight_size = header.size;
-        const tight_size = segment.filesize;
         const increased_size = padToIdeal(tight_size);
-        const test_end = segment.fileoff + increased_size;
+        const test_end = header.offset + increased_size;
-        if (end > segment.fileoff and start < test_end) {
+        if (end > header.offset and start < test_end) {
             return test_end;
         }
     }
 @@ -4705,10 +4709,9 @@ fn allocatedSize(self: *MachO, start: u64) u64 {
     if (start == 0)
         return 0;
     var min_pos: u64 = std.math.maxInt(u64);
-    for (self.sections.items(.segment_index)) |segment_index| {
+    for (self.sections.items(.header)) |header| {
-        const segment = self.segments.items[segment_index];
+        if (header.offset <= start) continue;
-        if (segment.fileoff <= start) continue;
+        if (header.offset < min_pos) min_pos = header.offset;
-        if (segment.fileoff < min_pos) min_pos = segment.fileoff;
     }
     return min_pos - start;
 }
 @@ -4721,7 +4724,7 @@ fn findFreeSpace(self: *MachO, object_size: u64, min_alignment: u32) u64 {
     return start;
 }
-fn allocatedVirtualSize(self: *MachO, start: u64) u64 {
+pub fn allocatedVirtualSize(self: *MachO, start: u64) u64 {
     if (start == 0)
         return 0;
     var min_pos: u64 = std.math.maxInt(u64);

src/link/MachO/Atom.zig+1-1

...	@@ -195,7 +195,7 @@ pub fn capacity(self: Atom, macho_file: *MachO) u64 {	...	@@ -195,7 +195,7 @@ pub fn capacity(self: Atom, macho_file: *MachO) u64 {
195	} else {	195	} else {
196	// We are the last atom.	196	// We are the last atom.
197	// The capacity is limited only by virtual address space.	197	// The capacity is limited only by virtual address space.
198	return std.math.maxInt(u64) - self_sym.n_value;	198	return macho_file.allocatedVirtualSize(self_sym.n_value);
199	}	199	}
200	}	200	}
201		201