diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen.zig | 9 | ||||
| -rw-r--r-- | src/compile.zig | 25 |
2 files changed, 12 insertions, 22 deletions
diff --git a/src/codegen.zig b/src/codegen.zig index 3fed244..0dbf35e 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -709,7 +709,6 @@ const ProcedureContext = struct { fn genAssignLocal(self: *Self, assign_local: compile.Instr.AssignLocal) !void { const src = self.register_allocator.get(assign_local.val); try self.freeUnusedVRegs(); - std.log.debug("{}", .{self.locals.get(assign_local.local).?.stack_offset}); try self.emit(.sd(.sp, self.locals.get(assign_local.local).?.stack_offset, src)); } @@ -755,16 +754,12 @@ const ProcedureContext = struct { try self.emit(.addi(.sp, .sp, -self.stack_size)); try self.emit(.sd(.sp, 0, .ra)); - if (self.proc.param_reg) |reg| { - const param = try self.register_allocator.allocate(reg); - try self.emit(.addi(param, .a0, 0)); + if (self.proc.param_lvar) |lvar| { + try self.emit(.sd(.sp, self.locals.get(lvar).?.stack_offset, .a0)); } } fn epilogue(self: *Self) !void { - if (self.proc.param_reg) |reg| { - self.register_allocator.free(reg); - } try self.emit(.ld(.ra, .sp, 0)); try self.emit(.addi(.sp, .sp, self.stack_size)); try self.emit(.jalr(.zero, .ra, 0)); diff --git a/src/compile.zig b/src/compile.zig index 636cf01..ded8a45 100644 --- a/src/compile.zig +++ b/src/compile.zig @@ -55,25 +55,24 @@ pub const Module = struct { pub const Procedure = struct { name: []const u8, blocks: []BasicBlock, - param_reg: ?VReg, + param_lvar: ?LVar, locals: std.AutoHashMap(LVar, void), fn init( allocator: Allocator, name: []const u8, blocks: []BasicBlock, - param_reg: ?VReg, + param_lvar: ?LVar, locals: std.AutoHashMap(LVar, void), ) !Procedure { for (blocks) |*block| { try block.finalize(allocator); - if (param_reg) |p| _ = block.vreg_last_use.remove(p); } return .{ .name = name, .blocks = blocks, - .param_reg = param_reg, + .param_lvar = param_lvar, .locals = locals, }; } @@ -81,7 +80,7 @@ pub const Procedure = struct { pub fn format(self: Procedure, comptime fmt: []const u8, options: std.fmt.FormatOptions, writer: anytype) !void { _ = .{ fmt, options }; try writer.print("{s}(", .{self.name}); - if (self.param_reg) |reg| try writer.print("%{}", .{@intFromEnum(reg)}); + if (self.param_lvar) |lvar| try writer.print("%{}", .{@intFromEnum(lvar)}); try writer.print("):\n", .{}); for (self.blocks) |block| { try writer.print("{}", .{block}); @@ -365,15 +364,15 @@ fn compileProcedure( .lvar_ctr = .init, .scope = .{ .locals = .empty, .parent = null }, .locals = .empty, - .param = .{ .name = "", .reg = undefined }, .blocks = try .init(ctx.allocator, &.{first_block}, &.{.{ .ref = first_block }}), .current_block = first_block, }; - const param_reg = if (proc.param) |param| blk: { - const reg = pctx.vreg_ctr.get(); + const param_lvar = if (proc.param) |param| blk: { const param_name = param.getIdent(ctx.source); - pctx.param = .{ .name = param_name, .reg = reg }; - break :blk reg; + const lvar = pctx.lvar_ctr.get(); + try pctx.scope.locals.putNoClobber(ctx.allocator, param_name, lvar); + try pctx.locals.putNoClobber(ctx.allocator, lvar, {}); + break :blk lvar; } else null; try pctx.compileBlock(proc.body); const proc_res = pctx.vreg_ctr.get(); @@ -396,7 +395,7 @@ fn compileProcedure( ctx.allocator, name.getIdent(ctx.source), blocks, - param_reg, + param_lvar, pctx.locals.promote(ctx.allocator), ); } @@ -409,7 +408,6 @@ const ProcedureContext = struct { scope: Scope, locals: std.AutoHashMapUnmanaged(LVar, void), - param: struct { name: []const u8, reg: VReg }, blocks: std.AutoArrayHashMapUnmanaged(BlockRef, BasicBlock), current_block: BlockRef, @@ -540,9 +538,6 @@ const ProcedureContext = struct { }, .identifier => { const ident = expr.loc.getIdent(self.ctx.source); - if (std.mem.eql(u8, ident, self.param.name)) { - return self.param.reg; - } var scope: ?*Scope = &self.scope; const local: LVar = blk: { while (scope) |s| : (scope = s.parent) { |