authorgravatar for eck@40hz.orgEckhart Köppen <eck@40hz.org> 2023-01-11 15:36:54+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2023-01-11 21:15:20+02:00
logc2d37224c843feb84f4522ec35d192968b786e08
tree74ebd39b51b86b67604c76443271a821db5cc153
parent0e66df2094364cf5e09fa67561a038639dfe51e6

zig objcopy: Fix corrupted hex output

Do not return stack local data for hex record payload data.

1 files changed, 11 insertions(+), 1 deletions(-)

src/objcopy.zig+11-1
...@@ -432,7 +432,7 @@ const HexWriter = struct {...@@ -432,7 +432,7 @@ const HexWriter = struct {
432 }432 }
433 }433 }
434434
435 fn getPayloadBytes(self: Record) []const u8 {435 fn getPayloadBytes(self: *const Record) []const u8 {
436 return switch (self.payload) {436 return switch (self.payload) {
437 .Data => |d| d,437 .Data => |d| d,
438 .EOF => @as([]const u8, &.{}),438 .EOF => @as([]const u8, &.{}),
...@@ -518,6 +518,16 @@ fn padFile(f: File, opt_size: ?u64) !void {...@@ -518,6 +518,16 @@ fn padFile(f: File, opt_size: ?u64) !void {
518 try f.setEndPos(size);518 try f.setEndPos(size);
519}519}
520520
521test "HexWriter.Record.Address has correct payload and checksum" {
522 const record = HexWriter.Record.Address(0x0800_0000);
523 const payload = record.getPayloadBytes();
524 const sum = record.checksum();
525 try std.testing.expect(sum == 0xF2);
526 try std.testing.expect(payload.len == 2);
527 try std.testing.expect(payload[0] == 8);
528 try std.testing.expect(payload[1] == 0);
529}
530
521test "containsValidAddressRange" {531test "containsValidAddressRange" {
522 var segment = BinaryElfSegment{532 var segment = BinaryElfSegment{
523 .physicalAddress = 0,533 .physicalAddress = 0,