Commit c6ea181e75cc6822edbaceccb11bc3a39484d116 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2021-08-17 10:52:36+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2021-08-17 10:54:10+02:00
log	c6ea181e75cc6822edbaceccb11bc3a39484d116
tree	455da6a6cdae72ac5791fa644fbe8d9244298495
parent	52f9b283a77e79f64d3a3b9faf31a07fe350fd8a

macho: dedup setting entry point logic

1 files changed, 22 insertions(+), 35 deletions(-)

src
- link
  - MachO.zig

src/link/MachO.zig+22-35

 @@ -860,46 +860,32 @@ pub fn flush(self: *MachO, comp: *Compilation) !void {
 pub fn flushModule(self: *MachO, comp: *Compilation) !void {
     _ = comp;
     const tracy = trace(@src());
     defer tracy.end();
-    const output_mode = self.base.options.output_mode;
+    try self.setEntryPoint();
+    try self.writeRebaseInfoTable();
+    try self.writeBindInfoTable();
+    try self.writeLazyBindInfoTable();
+    try self.writeExportInfo();
+    try self.writeAllGlobalAndUndefSymbols();
+    try self.writeIndirectSymbolTable();
+    try self.writeStringTable();
+    try self.updateLinkeditSegmentSizes();
-    switch (output_mode) {
+    if (self.d_sym) |*ds| {
-        .Exe => {
+        // Flush debug symbols bundle.
-            if (self.entry_addr) |addr| {
+        try ds.flushModule(self.base.allocator, self.base.options);
-                // Update LC_MAIN with entry offset.
+    }
-                const text_segment = self.load_commands.items[self.text_segment_cmd_index.?].Segment;
-                const main_cmd = &self.load_commands.items[self.main_cmd_index.?].Main;
-                main_cmd.entryoff = addr - text_segment.inner.vmaddr;
-                main_cmd.stacksize = self.base.options.stack_size_override orelse 0;
-                self.load_commands_dirty = true;
-            }
-            try self.writeRebaseInfoTable();
-            try self.writeBindInfoTable();
-            try self.writeLazyBindInfoTable();
-            try self.writeExportInfo();
-            try self.writeAllGlobalAndUndefSymbols();
-            try self.writeIndirectSymbolTable();
-            try self.writeStringTable();
-            try self.updateLinkeditSegmentSizes();
-            if (self.d_sym) |*ds| {
-                // Flush debug symbols bundle.
-                try ds.flushModule(self.base.allocator, self.base.options);
-            }
-            if (self.requires_adhoc_codesig) {
+    if (self.requires_adhoc_codesig) {
-                // Preallocate space for the code signature.
+        // Preallocate space for the code signature.
-                // We need to do this at this stage so that we have the load commands with proper values
+        // We need to do this at this stage so that we have the load commands with proper values
-                // written out to the file.
+        // written out to the file.
-                // The most important here is to have the correct vm and filesize of the __LINKEDIT segment
+        // The most important here is to have the correct vm and filesize of the __LINKEDIT segment
-                // where the code signature goes into.
+        // where the code signature goes into.
-                try self.writeCodeSignaturePadding();
+        try self.writeCodeSignaturePadding();
-            }
-        },
-        .Obj => {},
-        .Lib => return error.TODOImplementWritingLibFiles,
     }
     try self.writeLoadCommands();
 @@ -2704,6 +2690,7 @@ fn setEntryPoint(self: *MachO) !void {
     const ec = &self.load_commands.items[self.main_cmd_index.?].Main;
     ec.entryoff = @intCast(u32, sym.n_value - seg.inner.vmaddr);
     ec.stacksize = self.base.options.stack_size_override orelse 0;
+    self.load_commands_dirty = true;
 }
 fn writeRebaseInfoTableZld(self: *MachO) !void {