authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-08 23:12:34-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-08 23:12:34-07:00
log2299e5ff1dc924a2dca0c0c2def6f1e7b71a668f
treef725a2508a71c9ed55c1aca55ab3eb7d4748d61d
parentb88d381dec9d73c66462a54bfbdd9f01f311266c

fix merge conflicts from previous commit

Any PRs merged after the one that made testing functions return errors needs to get rebased!

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

src/codegen/x86_64.zig+3-3
...@@ -582,7 +582,7 @@ test "x86_64 Encoder helpers" {...@@ -582,7 +582,7 @@ test "x86_64 Encoder helpers" {
582 Register.edi.low_id(),582 Register.edi.low_id(),
583 );583 );
584584
585 testing.expectEqualSlices(u8, &[_]u8{ 0x0f, 0xaf, 0xc7 }, code.items);585 try testing.expectEqualSlices(u8, &[_]u8{ 0x0f, 0xaf, 0xc7 }, code.items);
586 }586 }
587587
588 // simple mov588 // simple mov
...@@ -602,7 +602,7 @@ test "x86_64 Encoder helpers" {...@@ -602,7 +602,7 @@ test "x86_64 Encoder helpers" {
602 Register.eax.low_id(),602 Register.eax.low_id(),
603 );603 );
604604
605 testing.expectEqualSlices(u8, &[_]u8{ 0x89, 0xf8 }, code.items);605 try testing.expectEqualSlices(u8, &[_]u8{ 0x89, 0xf8 }, code.items);
606 }606 }
607607
608 // signed integer addition of 32-bit sign extended immediate to 64 bit register608 // signed integer addition of 32-bit sign extended immediate to 64 bit register
...@@ -629,7 +629,7 @@ test "x86_64 Encoder helpers" {...@@ -629,7 +629,7 @@ test "x86_64 Encoder helpers" {
629 );629 );
630 encoder.imm32(2147483647);630 encoder.imm32(2147483647);
631631
632 testing.expectEqualSlices(u8, &[_]u8{ 0x48, 0x81, 0xc1, 0xff, 0xff, 0xff, 0x7f }, code.items);632 try testing.expectEqualSlices(u8, &[_]u8{ 0x48, 0x81, 0xc1, 0xff, 0xff, 0xff, 0x7f }, code.items);
633 }633 }
634}634}
635635