Commit 5b03d55c5ecf697086db7c454e0f3982fec42408 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-05-15 10:03:38+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2022-05-15 19:52:43+02:00
log	5b03d55c5ecf697086db7c454e0f3982fec42408
tree	4a6b5dd9d81afd7364c9fa2feba25681e070f50d
parent	5f97652da8881773b823a0730e5791816668528a

x64: rename brk to int3, and MIR to interrupt

3 files changed, 18 insertions(+), 9 deletions(-)

src
- arch
  - x86_64
    CodeGen.zig
    Emit.zig
    Mir.zig

src/arch/x86_64/CodeGen.zig+4-2

 @@ -3755,8 +3755,10 @@ fn airArg(self: *Self, inst: Air.Inst.Index) !void {
 fn airBreakpoint(self: *Self) !void {
     _ = try self.addInst(.{
-        .tag = .brk,
+        .tag = .interrupt,
-        .ops = undefined,
+        .ops = (Mir.Ops{
+            .flags = 0b00,
+        }).encode(),
         .data = undefined,
     });
     return self.finishAirBookkeeping();

src/arch/x86_64/Emit.zig+11-5

...	@@ -178,7 +178,7 @@ pub fn lowerMir(emit: *Emit) InnerError!void {	...	@@ -178,7 +178,7 @@ pub fn lowerMir(emit: *Emit) InnerError!void {
178		178
179	.@"test" => try emit.mirTest(inst),	179	.@"test" => try emit.mirTest(inst),
180		180
181	.brk => try emit.mirBrk(),	181	.interrupt => try emit.mirInterrupt(inst),
182	.nop => try emit.mirNop(),	182	.nop => try emit.mirNop(),
183		183
184	.call_extern => try emit.mirCallExtern(inst),	184	.call_extern => try emit.mirCallExtern(inst),
...	@@ -225,8 +225,14 @@ fn fixupRelocs(emit: *Emit) InnerError!void {	...	@@ -225,8 +225,14 @@ fn fixupRelocs(emit: *Emit) InnerError!void {
225	}	225	}
226	}	226	}
227		227
228	fn mirBrk(emit: *Emit) InnerError!void {	228	fn mirInterrupt(emit: *Emit, inst: Mir.Inst.Index) InnerError!void {
229	return lowerToZoEnc(.brk, emit.code);	229	const tag = emit.mir.instructions.items(.tag)[inst];
		230	assert(tag == .interrupt);
		231	const ops = Mir.Ops.decode(emit.mir.instructions.items(.ops)[inst]);
		232	switch (ops.flags) {
		233	0b00 => return lowerToZoEnc(.int3, emit.code),
		234	else => return emit.fail("TODO handle variant 0b{b} of interrupt instruction", .{ops.flags}),
		235	}
230	}	236	}
231		237
232	fn mirNop(emit: *Emit) InnerError!void {	238	fn mirNop(emit: *Emit) InnerError!void {
...	@@ -1074,7 +1080,7 @@ const Tag = enum {	...	@@ -1074,7 +1080,7 @@ const Tag = enum {
1074	push,	1080	push,
1075	pop,	1081	pop,
1076	@"test",	1082	@"test",
1077	brk,	1083	int3,
1078	nop,	1084	nop,
1079	imul,	1085	imul,
1080	mul,	1086	mul,
...	@@ -1278,7 +1284,7 @@ inline fn getOpCode(tag: Tag, enc: Encoding, is_one_byte: bool) ?OpCode {	...	@@ -1278,7 +1284,7 @@ inline fn getOpCode(tag: Tag, enc: Encoding, is_one_byte: bool) ?OpCode {
1278	.zo => return switch (tag) {	1284	.zo => return switch (tag) {
1279	.ret_near => OpCode.oneByte(0xc3),	1285	.ret_near => OpCode.oneByte(0xc3),
1280	.ret_far => OpCode.oneByte(0xcb),	1286	.ret_far => OpCode.oneByte(0xcb),
1281	.brk => OpCode.oneByte(0xcc),	1287	.int3 => OpCode.oneByte(0xcc),
1282	.nop => OpCode.oneByte(0x90),	1288	.nop => OpCode.oneByte(0x90),
1283	.syscall => OpCode.twoByte(0x0f, 0x05),	1289	.syscall => OpCode.twoByte(0x0f, 0x05),
1284	.cbw => OpCode.oneByte(0x98),	1290	.cbw => OpCode.oneByte(0x98),

src/arch/x86_64/Mir.zig+3-2

 @@ -342,8 +342,9 @@ pub const Inst = struct {
         /// TODO handle more cases
         @"test",
-        /// Breakpoint
+        /// Breakpoint  form:
-        brk,
+        ///       0b00  int3
+        interrupt,
         /// Nop
         nop,