mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts from previous commit

Browse Source 
Any PRs merged after the one that made testing functions return errors
needs to get rebased!
This commit is contained in:
Andrew Kelley 2021-05-08 23:12:34 -07:00
parent b88d381dec
commit 2299e5ff1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen/x86_64.zig
View File

@ -582,7 +582,7 @@ test "x86_64 Encoder helpers" {
Register.edi.low_id(),
);
testing.expectEqualSlices(u8, &[_]u8{ 0x0f, 0xaf, 0xc7 }, code.items);
try testing.expectEqualSlices(u8, &[_]u8{ 0x0f, 0xaf, 0xc7 }, code.items);
}
// simple mov
@ -602,7 +602,7 @@ test "x86_64 Encoder helpers" {
Register.eax.low_id(),
);
testing.expectEqualSlices(u8, &[_]u8{ 0x89, 0xf8 }, code.items);
try testing.expectEqualSlices(u8, &[_]u8{ 0x89, 0xf8 }, code.items);
}
// signed integer addition of 32-bit sign extended immediate to 64 bit register
@ -629,7 +629,7 @@ test "x86_64 Encoder helpers" {
);
encoder.imm32(2147483647);
testing.expectEqualSlices(u8, &[_]u8{ 0x48, 0x81, 0xc1, 0xff, 0xff, 0xff, 0x7f }, code.items);
try testing.expectEqualSlices(u8, &[_]u8{ 0x48, 0x81, 0xc1, 0xff, 0xff, 0xff, 0x7f }, code.items);
}
}