Merge pull request #100 from kubkon/macho-fixes-2

macho+test: misc fixes
kubkon · Jan 8, 2024 · 6d722e8 · 6d722e8
2 parents b8efe50 + 977726e
commit 6d722e8
Show file tree

Hide file tree

Showing 5 changed files with 959 additions and 1,017 deletions.
diff --git a/src/MachO/InternalObject.zig b/src/MachO/InternalObject.zig
@@ -25,7 +25,8 @@ pub fn addSymbol(self: *InternalObject, name: [:0]const u8, macho_file: *MachO)
     const off = try macho_file.string_intern.insert(gpa, name);
     const gop = try macho_file.getOrCreateGlobal(off);
     self.symbols.addOneAssumeCapacity().* = gop.index;
-    macho_file.getSymbol(gop.index).file = self.index;
+    const sym = macho_file.getSymbol(gop.index);
+    sym.* = .{ .name = off, .file = self.index };
     return gop.index;
 }
 

diff --git a/src/MachO/uuid.zig b/src/MachO/uuid.zig
@@ -14,9 +14,9 @@ pub fn calcUuid(
     const tracy = trace(@src());
     defer tracy.end();
 
-    const num_chunks = thread_pool.threads.len * 0x10;
-    const chunk_size = @divTrunc(file_size, num_chunks);
-    const actual_num_chunks = if (@rem(file_size, num_chunks) > 0) num_chunks + 1 else num_chunks;
+    const chunk_size: usize = 1024 * 1024;
+    const num_chunks: usize = std.math.cast(usize, @divTrunc(file_size, chunk_size)) orelse return error.Overflow;
+    const actual_num_chunks = if (@rem(file_size, chunk_size) > 0) num_chunks + 1 else num_chunks;
 
     const hashes = try allocator.alloc([Md5.digest_length]u8, actual_num_chunks);
     defer allocator.free(hashes);