Commit ac5fd47e2ee7c43a3ad7e5d0275d4e745152a9a3 | zig

author	Luuk de Gram <luuk@degram.dev> 2021-05-16 16:15:11+02:00
committer	Luuk de Gram <luuk@degram.dev> 2021-05-19 10:37:44+02:00
log	ac5fd47e2ee7c43a3ad7e5d0275d4e745152a9a3
tree	b1b9f2d0f88d29b5b8ac4d12c6ffce84645a9a8c
parent	141a0cbb5a1ffd9e6c47bf859064139143ed8c51
signature	Commit is signed but in an unrecognized format.

Initial support for structs in wasm backend

- Creates a 'local' for the struct itself and each field
- The index of the local is calculated from the struct's local index + field index

1 files changed, 31 insertions(+), 4 deletions(-)

src
- codegen
  - wasm.zig

src/codegen/wasm.zig+31-4

 @@ -556,7 +556,7 @@ pub const Context = struct {
                 if (info.bits > 32 and info.bits <= 64) break :blk wasm.Valtype.i64;
                 return self.fail(src, "Integer bit size not supported by wasm: '{d}'", .{info.bits});
             },
-            .Bool, .Pointer => wasm.Valtype.i32,
+            .Bool, .Pointer, .Struct => wasm.Valtype.i32,
             .Enum => switch (ty.tag()) {
                 .enum_simple => wasm.Valtype.i32,
                 else => self.typeToValtype(
 @@ -714,8 +714,8 @@ pub const Context = struct {
             .add => self.genBinOp(inst.castTag(.add).?, .add),
             .alloc => self.genAlloc(inst.castTag(.alloc).?),
             .arg => self.genArg(inst.castTag(.arg).?),
-            .bitcast => self.genBitcast(inst.castTag(.bitcast).?),
             .bit_and => self.genBinOp(inst.castTag(.bit_and).?, .@"and"),
+            .bitcast => self.genBitcast(inst.castTag(.bitcast).?),
             .bit_or => self.genBinOp(inst.castTag(.bit_or).?, .@"or"),
             .block => self.genBlock(inst.castTag(.block).?),
             .bool_and => self.genBinOp(inst.castTag(.bool_and).?, .@"and"),
 @@ -740,6 +740,7 @@ pub const Context = struct {
             .ret => self.genRet(inst.castTag(.ret).?),
             .retvoid => WValue.none,
             .store => self.genStore(inst.castTag(.store).?),
+            .struct_field_ptr => self.genStructFieldPtr(inst.castTag(.struct_field_ptr).?),
             .sub => self.genBinOp(inst.castTag(.sub).?, .sub),
             .unreach => self.genUnreachable(inst.castTag(.unreach).?),
             .xor => self.genBinOp(inst.castTag(.xor).?, .xor),
 @@ -797,8 +798,28 @@ pub const Context = struct {
         const valtype = try self.genValtype(inst.base.src, elem_type);
         try self.locals.append(self.gpa, valtype);
-        defer self.local_index += 1;
+        const local_value = WValue{ .local = self.local_index };
-        return WValue{ .local = self.local_index };
+        self.local_index += 1;
+        switch (elem_type.zigTypeTag()) {
+            .Struct => {
+                // for each struct field, generate a local
+                const struct_data: *Module.Struct = elem_type.castTag(.@"struct").?.data;
+                try self.locals.ensureCapacity(self.gpa, self.locals.items.len + struct_data.fields.count());
+                for (struct_data.fields.items()) |entry| {
+                    const val_type = try self.genValtype(
+                        .{ .node_offset = struct_data.node_offset },
+                        entry.value.ty,
+                    );
+                    self.locals.appendAssumeCapacity(val_type);
+                    self.local_index += 1;
+                }
+            },
+            // TODO: Add more types that require extra locals such as optionals
+            else => {},
+        }
+        return local_value;
     }
     fn genStore(self: *Context, inst: *Inst.BinOp) InnerError!WValue {
 @@ -1090,4 +1111,10 @@ pub const Context = struct {
     fn genBitcast(self: *Context, bitcast: *Inst.UnOp) InnerError!WValue {
         return self.resolveInst(bitcast.operand);
     }
+    fn genStructFieldPtr(self: *Context, inst: *Inst.StructFieldPtr) InnerError!WValue {
+        const struct_ptr = self.resolveInst(inst.struct_ptr);
+        return WValue{ .local = struct_ptr.local + @intCast(u32, inst.field_index) + 1 };
+    }
 };