authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-01-03 00:11:46+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-01-04 01:21:23+01:00
log3f7b09bd35fe99025700659be0a4441e4cc6968e
treea9a4a819ce6b54aa9de283384b60f6dc65688c44
parentf37598c779b921d5fc4f97cdcfab523e3fb5fc69

stage2: re-implement arithmetic ops with SIB


1 files changed, 189 insertions(+), 141 deletions(-)

src/arch/x86_64/Isel.zig+189-141
......@@ -227,8 +227,10 @@ fn mirPushPop(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
227227 16 => .word_ptr,
228228 else => .qword_ptr,
229229 };
230 return lowerToMEnc(tag, RegisterOrMemory.mem(ops.reg1, imm, ptr_size), isel.code) catch |err|
231 isel.failWithLoweringError(err);
230 return lowerToMEnc(tag, RegisterOrMemory.mem(ptr_size, .{
231 .disp = imm,
232 .base = ops.reg1,
233 }), isel.code) catch |err| isel.failWithLoweringError(err);
232234 },
233235 0b10 => {
234236 // PUSH imm32
......@@ -284,7 +286,7 @@ fn mirJmpCall(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
284286 16 => .word_ptr,
285287 else => .qword_ptr,
286288 };
287 return lowerToMEnc(tag, RegisterOrMemory.mem(null, imm, ptr_size), isel.code) catch |err|
289 return lowerToMEnc(tag, RegisterOrMemory.mem(ptr_size, .{ .disp = imm }), isel.code) catch |err|
288290 isel.failWithLoweringError(err);
289291 }
290292 // JMP/CALL reg
......@@ -422,12 +424,10 @@ fn mirArith(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
422424 // RM
423425 const imm = isel.mir.instructions.items(.data)[inst].imm;
424426 const src_reg: ?Register = if (ops.reg2 == .none) null else ops.reg2;
425 return lowerToRmEnc(
426 tag,
427 ops.reg1,
428 RegisterOrMemory.mem(src_reg, imm, Memory.PtrSize.fromBits(ops.reg1.size())),
429 isel.code,
430 ) catch |err| isel.failWithLoweringError(err);
427 return lowerToRmEnc(tag, ops.reg1, RegisterOrMemory.mem(Memory.PtrSize.fromBits(ops.reg1.size()), .{
428 .disp = imm,
429 .base = src_reg,
430 }), isel.code) catch |err| isel.failWithLoweringError(err);
431431 },
432432 0b10 => {
433433 if (ops.reg2 == .none) {
......@@ -436,12 +436,10 @@ fn mirArith(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
436436 // mov [reg1 + imm32], reg2
437437 // MR
438438 const imm = isel.mir.instructions.items(.data)[inst].imm;
439 return lowerToMrEnc(
440 tag,
441 RegisterOrMemory.mem(ops.reg1, imm, Memory.PtrSize.fromBits(ops.reg2.size())),
442 ops.reg2,
443 isel.code,
444 ) catch |err| isel.failWithLoweringError(err);
439 return lowerToMrEnc(tag, RegisterOrMemory.mem(Memory.PtrSize.fromBits(ops.reg2.size()), .{
440 .disp = imm,
441 .base = ops.reg1,
442 }), ops.reg2, isel.code) catch |err| isel.failWithLoweringError(err);
445443 },
446444 0b11 => {
447445 return isel.fail("TODO unused variant: mov reg1, reg2, 0b11", .{});
......@@ -460,12 +458,10 @@ fn mirArithMemImm(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
460458 0b10 => .dword_ptr,
461459 0b11 => .qword_ptr,
462460 };
463 return lowerToMiEnc(
464 tag,
465 RegisterOrMemory.mem(ops.reg1, imm_pair.dest_off, ptr_size),
466 imm_pair.operand,
467 isel.code,
468 ) catch |err| isel.failWithLoweringError(err);
461 return lowerToMiEnc(tag, RegisterOrMemory.mem(ptr_size, .{
462 .disp = imm_pair.dest_off,
463 .base = ops.reg1,
464 }), imm_pair.operand, isel.code) catch |err| isel.failWithLoweringError(err);
469465}
470466
471467inline fn setRexWRegister(reg: Register) bool {
......@@ -492,103 +488,61 @@ inline fn immOpSize(imm: i64) u8 {
492488 return 64;
493489}
494490
495// TODO
496491fn mirArithScaleSrc(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
497492 const ops = Mir.Ops.decode(isel.mir.instructions.items(.ops)[inst]);
498493 const scale = ops.flags;
499 // OP reg1, [reg2 + scale*rcx + imm32]
500 const opc = getOpCode(tag, .rm, ops.reg1.size() == 8).?;
501494 const imm = isel.mir.instructions.items(.data)[inst].imm;
502 const encoder = try Encoder.init(isel.code, 8);
503 encoder.rex(.{
504 .w = ops.reg1.size() == 64,
505 .r = ops.reg1.isExtended(),
506 .b = ops.reg2.isExtended(),
507 });
508 opc.encode(encoder);
509 if (imm <= math.maxInt(i8)) {
510 encoder.modRm_SIBDisp8(ops.reg1.lowId());
511 encoder.sib_scaleIndexBaseDisp8(scale, Register.rcx.lowId(), ops.reg2.lowId());
512 encoder.disp8(@intCast(i8, imm));
513 } else {
514 encoder.modRm_SIBDisp32(ops.reg1.lowId());
515 encoder.sib_scaleIndexBaseDisp32(scale, Register.rcx.lowId(), ops.reg2.lowId());
516 encoder.disp32(imm);
517 }
495 // OP reg1, [reg2 + scale*rcx + imm32]
496 return lowerToRmEnc(tag, ops.reg1, RegisterOrMemory.mem(Memory.PtrSize.fromBits(ops.reg1.size()), .{
497 .disp = imm,
498 .base = ops.reg2,
499 .scale_index = .{
500 .scale = scale,
501 .index = .rcx,
502 },
503 }), isel.code) catch |err| isel.failWithLoweringError(err);
518504}
519505
520// TODO
521506fn mirArithScaleDst(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
522507 const ops = Mir.Ops.decode(isel.mir.instructions.items(.ops)[inst]);
523508 const scale = ops.flags;
524509 const imm = isel.mir.instructions.items(.data)[inst].imm;
525
526510 if (ops.reg2 == .none) {
527 // OP [reg1 + scale*rax + 0], imm32
528 const opc = getOpCode(tag, .mi, ops.reg1.size() == 8).?;
529 const modrm_ext = getModRmExt(tag).?;
530 const encoder = try Encoder.init(isel.code, 8);
531 encoder.rex(.{
532 .w = ops.reg1.size() == 64,
533 .b = ops.reg1.isExtended(),
534 });
535 opc.encode(encoder);
536 encoder.modRm_SIBDisp0(modrm_ext);
537 encoder.sib_scaleIndexBase(scale, Register.rax.lowId(), ops.reg1.lowId());
538 if (imm <= math.maxInt(i8)) {
539 encoder.imm8(@intCast(i8, imm));
540 } else if (imm <= math.maxInt(i16)) {
541 encoder.imm16(@intCast(i16, imm));
542 } else {
543 encoder.imm32(imm);
544 }
545 return;
511 // OP qword ptr [reg1 + scale*rax + 0], imm32
512 return lowerToMiEnc(tag, RegisterOrMemory.mem(.qword_ptr, .{
513 .disp = 0,
514 .base = ops.reg1,
515 .scale_index = .{
516 .scale = scale,
517 .index = .rax,
518 },
519 }), imm, isel.code) catch |err| isel.failWithLoweringError(err);
546520 }
547
548521 // OP [reg1 + scale*rax + imm32], reg2
549 const opc = getOpCode(tag, .mr, ops.reg1.size() == 8).?;
550 const encoder = try Encoder.init(isel.code, 8);
551 encoder.rex(.{
552 .w = ops.reg1.size() == 64,
553 .r = ops.reg2.isExtended(),
554 .b = ops.reg1.isExtended(),
555 });
556 opc.encode(encoder);
557 if (imm <= math.maxInt(i8)) {
558 encoder.modRm_SIBDisp8(ops.reg2.lowId());
559 encoder.sib_scaleIndexBaseDisp8(scale, Register.rax.lowId(), ops.reg1.lowId());
560 encoder.disp8(@intCast(i8, imm));
561 } else {
562 encoder.modRm_SIBDisp32(ops.reg2.lowId());
563 encoder.sib_scaleIndexBaseDisp32(scale, Register.rax.lowId(), ops.reg1.lowId());
564 encoder.disp32(imm);
565 }
522 return lowerToMrEnc(tag, RegisterOrMemory.mem(Memory.PtrSize.fromBits(ops.reg2.size()), .{
523 .disp = imm,
524 .base = ops.reg1,
525 .scale_index = .{
526 .scale = scale,
527 .index = .rax,
528 },
529 }), ops.reg2, isel.code) catch |err| isel.failWithLoweringError(err);
566530}
567531
568// TODO
569532fn mirArithScaleImm(isel: *Isel, tag: Tag, inst: Mir.Inst.Index) InnerError!void {
570533 const ops = Mir.Ops.decode(isel.mir.instructions.items(.ops)[inst]);
571534 const scale = ops.flags;
572535 const payload = isel.mir.instructions.items(.data)[inst].payload;
573536 const imm_pair = isel.mir.extraData(Mir.ImmPair, payload).data;
574 const opc = getOpCode(tag, .mi, ops.reg1.size() == 8).?;
575 const modrm_ext = getModRmExt(tag).?;
576 const encoder = try Encoder.init(isel.code, 2);
577 encoder.rex(.{
578 .w = ops.reg1.size() == 64,
579 .b = ops.reg1.isExtended(),
580 });
581 opc.encode(encoder);
582 if (imm_pair.dest_off <= math.maxInt(i8)) {
583 encoder.modRm_SIBDisp8(modrm_ext);
584 encoder.sib_scaleIndexBaseDisp8(scale, Register.rax.lowId(), ops.reg1.lowId());
585 encoder.disp8(@intCast(i8, imm_pair.dest_off));
586 } else {
587 encoder.modRm_SIBDisp32(modrm_ext);
588 encoder.sib_scaleIndexBaseDisp32(scale, Register.rax.lowId(), ops.reg1.lowId());
589 encoder.disp32(imm_pair.dest_off);
590 }
591 encoder.imm32(imm_pair.operand);
537 // OP qword ptr [reg1 + scale*rax + imm32], imm32
538 return lowerToMiEnc(tag, RegisterOrMemory.mem(.qword_ptr, .{
539 .disp = imm_pair.dest_off,
540 .base = ops.reg1,
541 .scale_index = .{
542 .scale = scale,
543 .index = .rax,
544 },
545 }), imm_pair.operand, isel.code) catch |err| isel.failWithLoweringError(err);
592546}
593547
594548fn mirMovabs(isel: *Isel, inst: Mir.Inst.Index) InnerError!void {
......@@ -646,7 +600,10 @@ fn mirLea(isel: *Isel, inst: Mir.Inst.Index) InnerError!void {
646600 return lowerToRmEnc(
647601 .lea,
648602 ops.reg1,
649 RegisterOrMemory.mem(src_reg, imm, Memory.PtrSize.fromBits(ops.reg1.size())),
603 RegisterOrMemory.mem(Memory.PtrSize.fromBits(ops.reg1.size()), .{
604 .disp = imm,
605 .base = src_reg,
606 }),
650607 isel.code,
651608 ) catch |err| isel.failWithLoweringError(err);
652609 },
......@@ -657,7 +614,7 @@ fn mirLea(isel: *Isel, inst: Mir.Inst.Index) InnerError!void {
657614 lowerToRmEnc(
658615 .lea,
659616 ops.reg1,
660 RegisterOrMemory.rip(0, Memory.PtrSize.fromBits(ops.reg1.size())),
617 RegisterOrMemory.rip(Memory.PtrSize.fromBits(ops.reg1.size()), 0),
661618 isel.code,
662619 ) catch |err| return isel.failWithLoweringError(err);
663620 const end_offset = isel.code.items.len;
......@@ -673,7 +630,7 @@ fn mirLea(isel: *Isel, inst: Mir.Inst.Index) InnerError!void {
673630 lowerToRmEnc(
674631 .lea,
675632 ops.reg1,
676 RegisterOrMemory.rip(0, Memory.PtrSize.fromBits(ops.reg1.size())),
633 RegisterOrMemory.rip(Memory.PtrSize.fromBits(ops.reg1.size()), 0),
677634 isel.code,
678635 ) catch |err| return isel.failWithLoweringError(err);
679636 const end_offset = isel.code.items.len;
......@@ -1273,17 +1230,29 @@ const Memory = struct {
12731230 if (mem_op.base) |base| {
12741231 const dst = base.lowId();
12751232 const src = operand;
1276 if (dst == 4) {
1233 if (dst == 4 or mem_op.scale_index != null) {
12771234 if (mem_op.disp == 0) {
12781235 encoder.modRm_SIBDisp0(src);
1279 encoder.sib_base(dst);
1236 if (mem_op.scale_index) |si| {
1237 encoder.sib_scaleIndexBase(si.scale, si.index.lowId(), dst);
1238 } else {
1239 encoder.sib_base(dst);
1240 }
12801241 } else if (immOpSize(mem_op.disp) == 8) {
12811242 encoder.modRm_SIBDisp8(src);
1282 encoder.sib_baseDisp8(dst);
1243 if (mem_op.scale_index) |si| {
1244 encoder.sib_scaleIndexBaseDisp8(si.scale, si.index.lowId(), dst);
1245 } else {
1246 encoder.sib_baseDisp8(dst);
1247 }
12831248 encoder.disp8(@intCast(i8, mem_op.disp));
12841249 } else {
12851250 encoder.modRm_SIBDisp32(src);
1286 encoder.sib_baseDisp32(dst);
1251 if (mem_op.scale_index) |si| {
1252 encoder.sib_scaleIndexBaseDisp32(si.scale, si.index.lowId(), dst);
1253 } else {
1254 encoder.sib_baseDisp32(dst);
1255 }
12871256 encoder.disp32(mem_op.disp);
12881257 }
12891258 } else {
......@@ -1302,7 +1271,11 @@ const Memory = struct {
13021271 encoder.modRm_RIPDisp32(operand);
13031272 } else {
13041273 encoder.modRm_SIBDisp0(operand);
1305 encoder.sib_disp32();
1274 if (mem_op.scale_index) |si| {
1275 encoder.sib_scaleIndexDisp32(si.scale, si.index.lowId());
1276 } else {
1277 encoder.sib_disp32();
1278 }
13061279 }
13071280 encoder.disp32(mem_op.disp);
13081281 }
......@@ -1326,17 +1299,22 @@ const RegisterOrMemory = union(enum) {
13261299 return .{ .register = register };
13271300 }
13281301
1329 fn mem(base: ?Register, disp: i32, ptr_size: Memory.PtrSize) RegisterOrMemory {
1302 fn mem(ptr_size: Memory.PtrSize, args: struct {
1303 disp: i32,
1304 base: ?Register = null,
1305 scale_index: ?ScaleIndex = null,
1306 }) RegisterOrMemory {
13301307 return .{
13311308 .memory = .{
1332 .base = base,
1333 .disp = disp,
1309 .base = args.base,
1310 .disp = args.disp,
13341311 .ptr_size = ptr_size,
1312 .scale_index = args.scale_index,
13351313 },
13361314 };
13371315 }
13381316
1339 fn rip(disp: i32, ptr_size: Memory.PtrSize) RegisterOrMemory {
1317 fn rip(ptr_size: Memory.PtrSize, disp: i32) RegisterOrMemory {
13401318 return .{
13411319 .memory = .{
13421320 .base = null,
......@@ -1566,6 +1544,10 @@ fn lowerToMiEnc(tag: Tag, reg_or_mem: RegisterOrMemory, imm: i32, code: *std.Arr
15661544 .w = dst_mem.ptr_size == .qword_ptr,
15671545 .b = base.isExtended(),
15681546 });
1547 } else {
1548 encoder.rex(.{
1549 .w = dst_mem.ptr_size == .qword_ptr,
1550 });
15691551 }
15701552 opc.encode(encoder);
15711553 dst_mem.encode(encoder, modrm_ext);
......@@ -1782,44 +1764,62 @@ test "lower MI encoding" {
17821764 defer isel.deinit();
17831765 try lowerToMiEnc(.mov, RegisterOrMemory.reg(.rax), 0x10, isel.code());
17841766 try expectEqualHexStrings("\x48\xc7\xc0\x10\x00\x00\x00", isel.lowered(), "mov rax, 0x10");
1785 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.r11, 0, .dword_ptr), 0x10, isel.code());
1767 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.dword_ptr, .{ .disp = 0, .base = .r11 }), 0x10, isel.code());
17861768 try expectEqualHexStrings("\x41\xc7\x03\x10\x00\x00\x00", isel.lowered(), "mov dword ptr [r11 + 0], 0x10");
1787 try lowerToMiEnc(.add, RegisterOrMemory.mem(.rdx, -8, .dword_ptr), 0x10, isel.code());
1769 try lowerToMiEnc(.add, RegisterOrMemory.mem(.dword_ptr, .{ .disp = -8, .base = .rdx }), 0x10, isel.code());
17881770 try expectEqualHexStrings("\x81\x42\xF8\x10\x00\x00\x00", isel.lowered(), "add dword ptr [rdx - 8], 0x10");
1789 try lowerToMiEnc(.sub, RegisterOrMemory.mem(.r11, 0x10000000, .dword_ptr), 0x10, isel.code());
1771 try lowerToMiEnc(.sub, RegisterOrMemory.mem(.dword_ptr, .{
1772 .disp = 0x10000000,
1773 .base = .r11,
1774 }), 0x10, isel.code());
17901775 try expectEqualHexStrings(
17911776 "\x41\x81\xab\x00\x00\x00\x10\x10\x00\x00\x00",
17921777 isel.lowered(),
17931778 "sub dword ptr [r11 + 0x10000000], 0x10",
17941779 );
1795 try lowerToMiEnc(.@"and", RegisterOrMemory.mem(null, 0x10000000, .dword_ptr), 0x10, isel.code());
1780 try lowerToMiEnc(.@"and", RegisterOrMemory.mem(.dword_ptr, .{ .disp = 0x10000000 }), 0x10, isel.code());
17961781 try expectEqualHexStrings(
17971782 "\x81\x24\x25\x00\x00\x00\x10\x10\x00\x00\x00",
17981783 isel.lowered(),
17991784 "and dword ptr [ds:0x10000000], 0x10",
18001785 );
1801 try lowerToMiEnc(.@"and", RegisterOrMemory.mem(.r12, 0x10000000, .dword_ptr), 0x10, isel.code());
1786 try lowerToMiEnc(.@"and", RegisterOrMemory.mem(.dword_ptr, .{
1787 .disp = 0x10000000,
1788 .base = .r12,
1789 }), 0x10, isel.code());
18021790 try expectEqualHexStrings(
18031791 "\x41\x81\xA4\x24\x00\x00\x00\x10\x10\x00\x00\x00",
18041792 isel.lowered(),
18051793 "and dword ptr [r12 + 0x10000000], 0x10",
18061794 );
1807 try lowerToMiEnc(.mov, RegisterOrMemory.rip(0x10, .qword_ptr), 0x10, isel.code());
1795 try lowerToMiEnc(.mov, RegisterOrMemory.rip(.qword_ptr, 0x10), 0x10, isel.code());
18081796 try expectEqualHexStrings(
1809 "\xC7\x05\x10\x00\x00\x00\x10\x00\x00\x00",
1797 "\x48\xC7\x05\x10\x00\x00\x00\x10\x00\x00\x00",
18101798 isel.lowered(),
18111799 "mov qword ptr [rip + 0x10], 0x10",
18121800 );
1813 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.rbp, -8, .qword_ptr), 0x10, isel.code());
1801 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.qword_ptr, .{ .disp = -8, .base = .rbp }), 0x10, isel.code());
18141802 try expectEqualHexStrings(
18151803 "\x48\xc7\x45\xf8\x10\x00\x00\x00",
18161804 isel.lowered(),
18171805 "mov qword ptr [rbp - 8], 0x10",
18181806 );
1819 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.rbp, -2, .word_ptr), 0x10, isel.code());
1807 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.word_ptr, .{ .disp = -2, .base = .rbp }), 0x10, isel.code());
18201808 try expectEqualHexStrings("\x66\xC7\x45\xFE\x10\x00", isel.lowered(), "mov word ptr [rbp - 2], 0x10");
1821 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.rbp, -1, .byte_ptr), 0x10, isel.code());
1809 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.byte_ptr, .{ .disp = -1, .base = .rbp }), 0x10, isel.code());
18221810 try expectEqualHexStrings("\xC6\x45\xFF\x10", isel.lowered(), "mov byte ptr [rbp - 1], 0x10");
1811 try lowerToMiEnc(.mov, RegisterOrMemory.mem(.qword_ptr, .{
1812 .disp = 0x10000000,
1813 .scale_index = .{
1814 .scale = 1,
1815 .index = .rcx,
1816 },
1817 }), 0x10, isel.code());
1818 try expectEqualHexStrings(
1819 "\x48\xC7\x04\x4D\x00\x00\x00\x10\x10\x00\x00\x00",
1820 isel.lowered(),
1821 "mov qword ptr [rcx*2 + 0x10000000], 0x10",
1822 );
18231823}
18241824
18251825test "lower RM encoding" {
......@@ -1827,36 +1827,69 @@ test "lower RM encoding" {
18271827 defer isel.deinit();
18281828 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.reg(.rbx), isel.code());
18291829 try expectEqualHexStrings("\x48\x8b\xc3", isel.lowered(), "mov rax, rbx");
1830 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.mem(.r11, 0, .qword_ptr), isel.code());
1830 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.mem(.qword_ptr, .{ .disp = 0, .base = .r11 }), isel.code());
18311831 try expectEqualHexStrings("\x49\x8b\x03", isel.lowered(), "mov rax, qword ptr [r11 + 0]");
1832 try lowerToRmEnc(.add, .r11, RegisterOrMemory.mem(null, 0x10000000, .qword_ptr), isel.code());
1832 try lowerToRmEnc(.add, .r11, RegisterOrMemory.mem(.qword_ptr, .{ .disp = 0x10000000 }), isel.code());
18331833 try expectEqualHexStrings(
18341834 "\x4C\x03\x1C\x25\x00\x00\x00\x10",
18351835 isel.lowered(),
18361836 "add r11, qword ptr [ds:0x10000000]",
18371837 );
1838 try lowerToRmEnc(.add, .r12b, RegisterOrMemory.mem(null, 0x10000000, .byte_ptr), isel.code());
1838 try lowerToRmEnc(.add, .r12b, RegisterOrMemory.mem(.byte_ptr, .{ .disp = 0x10000000 }), isel.code());
18391839 try expectEqualHexStrings(
18401840 "\x44\x02\x24\x25\x00\x00\x00\x10",
18411841 isel.lowered(),
18421842 "add r11b, byte ptr [ds:0x10000000]",
18431843 );
1844 try lowerToRmEnc(.sub, .r11, RegisterOrMemory.mem(.r13, 0x10000000, .qword_ptr), isel.code());
1844 try lowerToRmEnc(.sub, .r11, RegisterOrMemory.mem(.qword_ptr, .{
1845 .disp = 0x10000000,
1846 .base = .r13,
1847 }), isel.code());
18451848 try expectEqualHexStrings(
18461849 "\x4D\x2B\x9D\x00\x00\x00\x10",
18471850 isel.lowered(),
18481851 "sub r11, qword ptr [r13 + 0x10000000]",
18491852 );
1850 try lowerToRmEnc(.sub, .r11, RegisterOrMemory.mem(.r12, 0x10000000, .qword_ptr), isel.code());
1853 try lowerToRmEnc(.sub, .r11, RegisterOrMemory.mem(.qword_ptr, .{
1854 .disp = 0x10000000,
1855 .base = .r12,
1856 }), isel.code());
18511857 try expectEqualHexStrings(
18521858 "\x4D\x2B\x9C\x24\x00\x00\x00\x10",
18531859 isel.lowered(),
18541860 "sub r11, qword ptr [r12 + 0x10000000]",
18551861 );
1856 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.mem(.rbp, -4, .qword_ptr), isel.code());
1862 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.mem(.qword_ptr, .{ .disp = -4, .base = .rbp }), isel.code());
18571863 try expectEqualHexStrings("\x48\x8B\x45\xFC", isel.lowered(), "mov rax, qword ptr [rbp - 4]");
1858 try lowerToRmEnc(.lea, .rax, RegisterOrMemory.rip(0x10, .qword_ptr), isel.code());
1864 try lowerToRmEnc(.lea, .rax, RegisterOrMemory.rip(.qword_ptr, 0x10), isel.code());
18591865 try expectEqualHexStrings("\x48\x8D\x05\x10\x00\x00\x00", isel.lowered(), "lea rax, [rip + 0x10]");
1866 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.mem(.qword_ptr, .{
1867 .disp = -8,
1868 .base = .rbp,
1869 .scale_index = .{
1870 .scale = 0,
1871 .index = .rcx,
1872 },
1873 }), isel.code());
1874 try expectEqualHexStrings("\x48\x8B\x44\x0D\xF8", isel.lowered(), "mov rax, qword ptr [rbp + rcx*1 - 8]");
1875 try lowerToRmEnc(.mov, .eax, RegisterOrMemory.mem(.dword_ptr, .{
1876 .disp = -4,
1877 .base = .rbp,
1878 .scale_index = .{
1879 .scale = 2,
1880 .index = .rdx,
1881 },
1882 }), isel.code());
1883 try expectEqualHexStrings("\x8B\x44\x95\xFC", isel.lowered(), "mov eax, dword ptr [rbp + rdx*4 - 4]");
1884 try lowerToRmEnc(.mov, .rax, RegisterOrMemory.mem(.qword_ptr, .{
1885 .disp = -8,
1886 .base = .rbp,
1887 .scale_index = .{
1888 .scale = 3,
1889 .index = .rcx,
1890 },
1891 }), isel.code());
1892 try expectEqualHexStrings("\x48\x8B\x44\xCD\xF8", isel.lowered(), "mov rax, qword ptr [rbp + rcx*8 - 8]");
18601893}
18611894
18621895test "lower MR encoding" {
......@@ -1864,27 +1897,30 @@ test "lower MR encoding" {
18641897 defer isel.deinit();
18651898 try lowerToMrEnc(.mov, RegisterOrMemory.reg(.rax), .rbx, isel.code());
18661899 try expectEqualHexStrings("\x48\x89\xd8", isel.lowered(), "mov rax, rbx");
1867 try lowerToMrEnc(.mov, RegisterOrMemory.mem(.rbp, -4, .qword_ptr), .r11, isel.code());
1900 try lowerToMrEnc(.mov, RegisterOrMemory.mem(.qword_ptr, .{ .disp = -4, .base = .rbp }), .r11, isel.code());
18681901 try expectEqualHexStrings("\x4c\x89\x5d\xfc", isel.lowered(), "mov qword ptr [rbp - 4], r11");
1869 try lowerToMrEnc(.add, RegisterOrMemory.mem(null, 0x10000000, .byte_ptr), .r12b, isel.code());
1902 try lowerToMrEnc(.add, RegisterOrMemory.mem(.byte_ptr, .{ .disp = 0x10000000 }), .r12b, isel.code());
18701903 try expectEqualHexStrings(
18711904 "\x44\x00\x24\x25\x00\x00\x00\x10",
18721905 isel.lowered(),
18731906 "add byte ptr [ds:0x10000000], r12b",
18741907 );
1875 try lowerToMrEnc(.add, RegisterOrMemory.mem(null, 0x10000000, .dword_ptr), .r12d, isel.code());
1908 try lowerToMrEnc(.add, RegisterOrMemory.mem(.dword_ptr, .{ .disp = 0x10000000 }), .r12d, isel.code());
18761909 try expectEqualHexStrings(
18771910 "\x44\x01\x24\x25\x00\x00\x00\x10",
18781911 isel.lowered(),
18791912 "add dword ptr [ds:0x10000000], r12d",
18801913 );
1881 try lowerToMrEnc(.sub, RegisterOrMemory.mem(.r11, 0x10000000, .qword_ptr), .r12, isel.code());
1914 try lowerToMrEnc(.sub, RegisterOrMemory.mem(.qword_ptr, .{
1915 .disp = 0x10000000,
1916 .base = .r11,
1917 }), .r12, isel.code());
18821918 try expectEqualHexStrings(
18831919 "\x4D\x29\xA3\x00\x00\x00\x10",
18841920 isel.lowered(),
18851921 "sub qword ptr [r11 + 0x10000000], r12",
18861922 );
1887 try lowerToMrEnc(.mov, RegisterOrMemory.rip(0x10, .qword_ptr), .r12, isel.code());
1923 try lowerToMrEnc(.mov, RegisterOrMemory.rip(.qword_ptr, 0x10), .r12, isel.code());
18881924 try expectEqualHexStrings("\x4C\x89\x25\x10\x00\x00\x00", isel.lowered(), "mov qword ptr [rip + 0x10], r12");
18891925}
18901926
......@@ -1935,21 +1971,24 @@ test "lower M encoding" {
19351971 try expectEqualHexStrings("\x41\xFF\xE4", isel.lowered(), "jmp r12");
19361972 try lowerToMEnc(.jmp_near, RegisterOrMemory.reg(.r12w), isel.code());
19371973 try expectEqualHexStrings("\x66\x41\xFF\xE4", isel.lowered(), "jmp r12w");
1938 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.r12, 0, .qword_ptr), isel.code());
1974 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.qword_ptr, .{ .disp = 0, .base = .r12 }), isel.code());
19391975 try expectEqualHexStrings("\x41\xFF\x24\x24", isel.lowered(), "jmp qword ptr [r12]");
1940 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.r12, 0, .word_ptr), isel.code());
1976 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.word_ptr, .{ .disp = 0, .base = .r12 }), isel.code());
19411977 try expectEqualHexStrings("\x66\x41\xFF\x24\x24", isel.lowered(), "jmp word ptr [r12]");
1942 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.r12, 0x10, .qword_ptr), isel.code());
1978 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.qword_ptr, .{ .disp = 0x10, .base = .r12 }), isel.code());
19431979 try expectEqualHexStrings("\x41\xFF\x64\x24\x10", isel.lowered(), "jmp qword ptr [r12 + 0x10]");
1944 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.r12, 0x1000, .qword_ptr), isel.code());
1980 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.qword_ptr, .{
1981 .disp = 0x1000,
1982 .base = .r12,
1983 }), isel.code());
19451984 try expectEqualHexStrings(
19461985 "\x41\xFF\xA4\x24\x00\x10\x00\x00",
19471986 isel.lowered(),
19481987 "jmp qword ptr [r12 + 0x1000]",
19491988 );
1950 try lowerToMEnc(.jmp_near, RegisterOrMemory.rip(0x10, .qword_ptr), isel.code());
1989 try lowerToMEnc(.jmp_near, RegisterOrMemory.rip(.qword_ptr, 0x10), isel.code());
19511990 try expectEqualHexStrings("\xFF\x25\x10\x00\x00\x00", isel.lowered(), "jmp qword ptr [rip + 0x10]");
1952 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(null, 0x10, .qword_ptr), isel.code());
1991 try lowerToMEnc(.jmp_near, RegisterOrMemory.mem(.qword_ptr, .{ .disp = 0x10 }), isel.code());
19531992 try expectEqualHexStrings("\xFF\x24\x25\x10\x00\x00\x00", isel.lowered(), "jmp qword ptr [ds:0x10]");
19541993 try lowerToMEnc(.seta, RegisterOrMemory.reg(.r11b), isel.code());
19551994 try expectEqualHexStrings("\x41\x0F\x97\xC3", isel.lowered(), "seta r11b");
......@@ -1967,15 +2006,24 @@ test "lower O encoding" {
19672006test "lower RMI encoding" {
19682007 var isel = TestIsel.init();
19692008 defer isel.deinit();
1970 try lowerToRmiEnc(.imul, .rax, RegisterOrMemory.mem(.rbp, -8, .qword_ptr), 0x10, isel.code());
2009 try lowerToRmiEnc(.imul, .rax, RegisterOrMemory.mem(.qword_ptr, .{
2010 .disp = -8,
2011 .base = .rbp,
2012 }), 0x10, isel.code());
19712013 try expectEqualHexStrings(
19722014 "\x48\x69\x45\xF8\x10\x00\x00\x00",
19732015 isel.lowered(),
19742016 "imul rax, qword ptr [rbp - 8], 0x10",
19752017 );
1976 try lowerToRmiEnc(.imul, .eax, RegisterOrMemory.mem(.rbp, -4, .dword_ptr), 0x10, isel.code());
2018 try lowerToRmiEnc(.imul, .eax, RegisterOrMemory.mem(.dword_ptr, .{
2019 .disp = -4,
2020 .base = .rbp,
2021 }), 0x10, isel.code());
19772022 try expectEqualHexStrings("\x69\x45\xFC\x10\x00\x00\x00", isel.lowered(), "imul eax, dword ptr [rbp - 4], 0x10");
1978 try lowerToRmiEnc(.imul, .ax, RegisterOrMemory.mem(.rbp, -2, .word_ptr), 0x10, isel.code());
2023 try lowerToRmiEnc(.imul, .ax, RegisterOrMemory.mem(.word_ptr, .{
2024 .disp = -2,
2025 .base = .rbp,
2026 }), 0x10, isel.code());
19792027 try expectEqualHexStrings("\x66\x69\x45\xFE\x10\x00", isel.lowered(), "imul ax, word ptr [rbp - 2], 0x10");
19802028 try lowerToRmiEnc(.imul, .r12, RegisterOrMemory.reg(.r12), 0x10, isel.code());
19812029 try expectEqualHexStrings("\x4D\x69\xE4\x10\x00\x00\x00", isel.lowered(), "imul r12, r12, 0x10");