From 21dcb3e65dc88d30e8c7d03f2a5a065f06e143e8 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sat, 28 Sep 2019 13:30:05 -0300
Subject: [PATCH] codegen: emit load instruction for (now-stack) params

 - comp_ctx: make ParameterMap use ptrs to Parameter
---
 hello            | Bin 0 -> 18840 bytes
 src/codegen.zig  |  13 +++++++++----
 src/comp_ctx.zig |   9 ++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100755 hello

diff --git a/hello b/hello
new file mode 100755
index 0000000000000000000000000000000000000000..4825f6802137e0db6e64b3eae72f16f4e604b49b
GIT binary patch
literal 18840
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
H#fpCeHhs+t

literal 0
HcmV?d00001

diff --git a/src/codegen.zig b/src/codegen.zig
index 0466d58..38eafdd 100644
--- a/src/codegen.zig
+++ b/src/codegen.zig
@@ -236,11 +236,16 @@ pub const Codegen = struct {
                 return switch (metadata.using) {
                     .Function => blk: {
                         var param = metadata.from_function.?.parameters.get(vari.lexeme).?.value;
-                        // var llvm_func = self.llvm_table.get(self.current_function_name.?).?.value;
-                        // break :blk llvm.LLVMGetParam(llvm_func, @intCast(c_uint, param.idx));
 
-                        std.debug.warn("fn param alloca {} {}\n", param.name, param.llvm_alloca);
-                        break :blk param.llvm_alloca.?;
+                        var buf = try self.allocator.alloc(u8, 512);
+                        errdefer self.allocator.free(buf);
+
+                        var load_str = try std.fmt.bufPrint(buf, "{}_loaded", param.name);
+
+                        var load_cstr = try std.cstr.addNullByte(self.allocator, load_str);
+                        errdefer self.allocator.free(load_cstr);
+
+                        break :blk llvm.LLVMBuildLoad(builder, param.llvm_alloca.?, load_cstr.ptr);
                     },
 
                     .Scope => @panic("TODO local variables"),
diff --git a/src/comp_ctx.zig b/src/comp_ctx.zig
index a786770..afbe5e4 100644
--- a/src/comp_ctx.zig
+++ b/src/comp_ctx.zig
@@ -85,7 +85,7 @@ pub const Parameter = struct {
     llvm_alloca: llvm.LLVMValueRef = null,
 };
 
-pub const ParameterMap = std.StringHashMap(Parameter);
+pub const ParameterMap = std.StringHashMap(*Parameter);
 
 // functions, for our purposes, other than symbols, have:
 //  - a return type
@@ -274,11 +274,14 @@ pub const CompilationContext = struct {
         var param_map = ParameterMap.init(self.allocator);
 
         for (decl.params.toSlice()) |param, idx| {
-            _ = try param_map.put(param.name.lexeme, Parameter{
+            var param_sym = try self.allocator.create(Parameter);
+
+            param_sym.* = Parameter{
                 .name = param.name.lexeme,
                 .idx = idx,
                 .typ = param_types.at(idx),
-            });
+            };
+            _ = try param_map.put(param.name.lexeme, param_sym);
         }
 
         const lex = decl.func_name.lexeme;