diff --git a/cl/_testgo/strucintf/in.go b/cl/_testgo/strucintf/in.go index 1af4b02d..ae87c15d 100644 --- a/cl/_testgo/strucintf/in.go +++ b/cl/_testgo/strucintf/in.go @@ -1,20 +1,19 @@ package main import ( - "github.com/goplus/llgo/c" "github.com/goplus/llgo/cl/internal/foo" ) func main() { bar := foo.Bar() if x, ok := bar.(struct{ V int }); ok { - c.Printf(c.Str("%d\n"), x.V) + println(x.V) } else { - c.Printf(c.Str("Bar: not ok\n")) + println("Bar: not ok") } if x, ok := foo.F().(struct{ v int }); ok { - c.Printf(c.Str("%d\n"), x.v) + println(x.v) } else { - c.Printf(c.Str("F: not ok\n")) + println("F: not ok") } } diff --git a/cl/_testgo/strucintf/out.ll b/cl/_testgo/strucintf/out.ll index 57492612..6872eb18 100644 --- a/cl/_testgo/strucintf/out.ll +++ b/cl/_testgo/strucintf/out.ll @@ -11,17 +11,15 @@ source_filename = "main" @__llgo_argc = global ptr null @__llgo_argv = global ptr null @"_llgo_struct$K-dZ9QotZfVPz2a0YdRa9vmZUuDXPTqZOlMShKEDJtk" = linkonce global ptr null -@0 = private unnamed_addr constant [4 x i8] c"%d\0A\00", align 1 @"main.struct$MYpsoM99ZwFY087IpUOkIw1zjBA_sgFXVodmn1m-G88" = global ptr null -@1 = private unnamed_addr constant [13 x i8] c"Bar: not ok\0A\00", align 1 -@2 = private unnamed_addr constant [4 x i8] c"%d\0A\00", align 1 -@3 = private unnamed_addr constant [11 x i8] c"F: not ok\0A\00", align 1 -@4 = private unnamed_addr constant [2 x i8] c"V\00", align 1 -@5 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@6 = private unnamed_addr constant [5 x i8] c"main\00", align 1 -@7 = private unnamed_addr constant [2 x i8] c"v\00", align 1 -@8 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@9 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@0 = private unnamed_addr constant [12 x i8] c"Bar: not ok\00", align 1 +@1 = private unnamed_addr constant [10 x i8] c"F: not ok\00", align 1 +@2 = private unnamed_addr constant [2 x i8] c"V\00", align 1 +@3 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@4 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@5 = private unnamed_addr constant [2 x i8] c"v\00", align 1 +@6 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@7 = private unnamed_addr constant [5 x i8] c"main\00", align 1 define void @main.init() { _llgo_0: @@ -77,55 +75,71 @@ _llgo_0: _llgo_1: ; preds = %_llgo_0 %24 = getelementptr inbounds { i64 }, ptr %4, i32 0, i32 0 %25 = load i64, ptr %24, align 4 - %26 = call i32 (ptr, ...) @printf(ptr @0, i64 %25) + call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %25) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) br label %_llgo_2 _llgo_2: ; preds = %_llgo_3, %_llgo_1 - %27 = alloca { i64 }, align 8 - %28 = call ptr @"github.com/goplus/llgo/internal/runtime.Zeroinit"(ptr %27, i64 8) - %29 = call %"github.com/goplus/llgo/internal/runtime.eface" @"github.com/goplus/llgo/cl/internal/foo.F"() - %30 = extractvalue %"github.com/goplus/llgo/internal/runtime.eface" %29, 0 - %31 = load ptr, ptr @"main.struct$MYpsoM99ZwFY087IpUOkIw1zjBA_sgFXVodmn1m-G88", align 8 - %32 = icmp eq ptr %30, %31 - %33 = extractvalue %"github.com/goplus/llgo/internal/runtime.eface" %29, 1 - %34 = ptrtoint ptr %33 to i64 - %35 = alloca { i64 }, align 8 - %36 = getelementptr inbounds { i64 }, ptr %35, i32 0, i32 0 - store i64 %34, ptr %36, align 4 - %37 = load { i64 }, ptr %35, align 4 - %38 = alloca { { i64 }, i1 }, align 8 - %39 = getelementptr inbounds { { i64 }, i1 }, ptr %38, i32 0, i32 0 - store { i64 } %37, ptr %39, align 4 - %40 = getelementptr inbounds { { i64 }, i1 }, ptr %38, i32 0, i32 1 - store i1 true, ptr %40, align 1 - %41 = load { { i64 }, i1 }, ptr %38, align 4 - %42 = alloca { { i64 }, i1 }, align 8 - %43 = getelementptr inbounds { { i64 }, i1 }, ptr %42, i32 0, i32 0 - store { i64 } zeroinitializer, ptr %43, align 4 - %44 = getelementptr inbounds { { i64 }, i1 }, ptr %42, i32 0, i32 1 - store i1 false, ptr %44, align 1 - %45 = load { { i64 }, i1 }, ptr %42, align 4 - %46 = select i1 %32, { { i64 }, i1 } %41, { { i64 }, i1 } %45 - %47 = extractvalue { { i64 }, i1 } %46, 0 - store { i64 } %47, ptr %28, align 4 - %48 = extractvalue { { i64 }, i1 } %46, 1 - br i1 %48, label %_llgo_4, label %_llgo_6 + %26 = alloca { i64 }, align 8 + %27 = call ptr @"github.com/goplus/llgo/internal/runtime.Zeroinit"(ptr %26, i64 8) + %28 = call %"github.com/goplus/llgo/internal/runtime.eface" @"github.com/goplus/llgo/cl/internal/foo.F"() + %29 = extractvalue %"github.com/goplus/llgo/internal/runtime.eface" %28, 0 + %30 = load ptr, ptr @"main.struct$MYpsoM99ZwFY087IpUOkIw1zjBA_sgFXVodmn1m-G88", align 8 + %31 = icmp eq ptr %29, %30 + %32 = extractvalue %"github.com/goplus/llgo/internal/runtime.eface" %28, 1 + %33 = ptrtoint ptr %32 to i64 + %34 = alloca { i64 }, align 8 + %35 = getelementptr inbounds { i64 }, ptr %34, i32 0, i32 0 + store i64 %33, ptr %35, align 4 + %36 = load { i64 }, ptr %34, align 4 + %37 = alloca { { i64 }, i1 }, align 8 + %38 = getelementptr inbounds { { i64 }, i1 }, ptr %37, i32 0, i32 0 + store { i64 } %36, ptr %38, align 4 + %39 = getelementptr inbounds { { i64 }, i1 }, ptr %37, i32 0, i32 1 + store i1 true, ptr %39, align 1 + %40 = load { { i64 }, i1 }, ptr %37, align 4 + %41 = alloca { { i64 }, i1 }, align 8 + %42 = getelementptr inbounds { { i64 }, i1 }, ptr %41, i32 0, i32 0 + store { i64 } zeroinitializer, ptr %42, align 4 + %43 = getelementptr inbounds { { i64 }, i1 }, ptr %41, i32 0, i32 1 + store i1 false, ptr %43, align 1 + %44 = load { { i64 }, i1 }, ptr %41, align 4 + %45 = select i1 %31, { { i64 }, i1 } %40, { { i64 }, i1 } %44 + %46 = extractvalue { { i64 }, i1 } %45, 0 + store { i64 } %46, ptr %27, align 4 + %47 = extractvalue { { i64 }, i1 } %45, 1 + br i1 %47, label %_llgo_4, label %_llgo_6 _llgo_3: ; preds = %_llgo_0 - %49 = call i32 (ptr, ...) @printf(ptr @1) + %48 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %49 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %48, i32 0, i32 0 + store ptr @0, ptr %49, align 8 + %50 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %48, i32 0, i32 1 + store i64 11, ptr %50, align 4 + %51 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %48, align 8 + call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %51) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) br label %_llgo_2 _llgo_4: ; preds = %_llgo_2 - %50 = getelementptr inbounds { i64 }, ptr %28, i32 0, i32 0 - %51 = load i64, ptr %50, align 4 - %52 = call i32 (ptr, ...) @printf(ptr @2, i64 %51) + %52 = getelementptr inbounds { i64 }, ptr %27, i32 0, i32 0 + %53 = load i64, ptr %52, align 4 + call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %53) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) br label %_llgo_5 _llgo_5: ; preds = %_llgo_6, %_llgo_4 ret i32 0 _llgo_6: ; preds = %_llgo_2 - %53 = call i32 (ptr, ...) @printf(ptr @3) + %54 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %55 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %54, i32 0, i32 0 + store ptr @1, ptr %55, align 8 + %56 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %54, i32 0, i32 1 + store i64 9, ptr %56, align 4 + %57 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %54, align 8 + call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %57) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) br label %_llgo_5 } @@ -137,10 +151,14 @@ declare %"github.com/goplus/llgo/internal/runtime.eface" @"github.com/goplus/llg declare ptr @"github.com/goplus/llgo/internal/runtime.Zeroinit"(ptr, i64) -declare i32 @printf(ptr, ...) +declare void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64) + +declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8) declare %"github.com/goplus/llgo/internal/runtime.eface" @"github.com/goplus/llgo/cl/internal/foo.F"() +declare void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String") + define void @"main.init$abi"() { _llgo_0: %0 = load ptr, ptr @"_llgo_struct$K-dZ9QotZfVPz2a0YdRa9vmZUuDXPTqZOlMShKEDJtk", align 8 @@ -150,21 +168,21 @@ _llgo_0: _llgo_1: ; preds = %_llgo_0 %2 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 0 - store ptr @4, ptr %3, align 8 + store ptr @2, ptr %3, align 8 %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 1 store i64 1, ptr %4, align 4 %5 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %2, align 8 %6 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) %7 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %7, i32 0, i32 0 - store ptr @5, ptr %8, align 8 + store ptr @3, ptr %8, align 8 %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %7, i32 0, i32 1 store i64 0, ptr %9, align 4 %10 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %7, align 8 %11 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %5, ptr %6, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %10, i1 true, i1 false) %12 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %13 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %12, i32 0, i32 0 - store ptr @6, ptr %13, align 8 + store ptr @4, ptr %13, align 8 %14 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %12, i32 0, i32 1 store i64 4, ptr %14, align 4 %15 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %12, align 8 @@ -186,21 +204,21 @@ _llgo_1: ; preds = %_llgo_0 _llgo_2: ; preds = %_llgo_1, %_llgo_0 %24 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %25 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %24, i32 0, i32 0 - store ptr @7, ptr %25, align 8 + store ptr @5, ptr %25, align 8 %26 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %24, i32 0, i32 1 store i64 1, ptr %26, align 4 %27 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %24, align 8 %28 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) %29 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %30 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %29, i32 0, i32 0 - store ptr @8, ptr %30, align 8 + store ptr @6, ptr %30, align 8 %31 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %29, i32 0, i32 1 store i64 0, ptr %31, align 4 %32 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %29, align 8 %33 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %27, ptr %28, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %32, i1 false, i1 false) %34 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %35 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %34, i32 0, i32 0 - store ptr @9, ptr %35, align 8 + store ptr @7, ptr %35, align 8 %36 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %34, i32 0, i32 1 store i64 4, ptr %36, align 4 %37 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %34, align 8 diff --git a/cl/_testrt/any/in.go b/cl/_testrt/any/in.go index 4d9300ed..4120c735 100644 --- a/cl/_testrt/any/in.go +++ b/cl/_testrt/any/in.go @@ -4,10 +4,14 @@ import ( "github.com/goplus/llgo/internal/runtime/c" ) +func hi(a any) *c.Char { + return a.(*c.Char) +} + func incVal(a any) int { return a.(int) + 1 } func main() { - c.Printf(c.Str("Hello %d\n"), incVal(100)) + c.Printf(c.Str("%s %d\n"), hi(c.Str("Hello")), incVal(100)) } diff --git a/cl/_testrt/any/out.ll b/cl/_testrt/any/out.ll index 207fc6d3..612c682e 100644 --- a/cl/_testrt/any/out.ll +++ b/cl/_testrt/any/out.ll @@ -5,10 +5,35 @@ source_filename = "main" %"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 } @"main.init$guard" = global ptr null +@"*_llgo_int8" = linkonce global ptr null @0 = private unnamed_addr constant [22 x i8] c"type assertion failed\00", align 1 +@1 = private unnamed_addr constant [22 x i8] c"type assertion failed\00", align 1 @__llgo_argc = global ptr null @__llgo_argv = global ptr null -@1 = private unnamed_addr constant [10 x i8] c"Hello %d\0A\00", align 1 +@2 = private unnamed_addr constant [7 x i8] c"%s %d\0A\00", align 1 +@3 = private unnamed_addr constant [6 x i8] c"Hello\00", align 1 + +define ptr @main.hi(%"github.com/goplus/llgo/internal/runtime.eface" %0) { +_llgo_0: + %1 = extractvalue %"github.com/goplus/llgo/internal/runtime.eface" %0, 0 + %2 = load ptr, ptr @"*_llgo_int8", align 8 + %3 = icmp eq ptr %1, %2 + br i1 %3, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %4 = extractvalue %"github.com/goplus/llgo/internal/runtime.eface" %0, 1 + ret ptr %4 + +_llgo_2: ; preds = %_llgo_0 + %5 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %6 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %5, i32 0, i32 0 + store ptr @0, ptr %6, align 8 + %7 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %5, i32 0, i32 1 + store i64 21, ptr %7, align 4 + %8 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %5, align 8 + call void @"github.com/goplus/llgo/internal/runtime.TracePanic"(%"github.com/goplus/llgo/internal/runtime.String" %8) + unreachable +} define i64 @main.incVal(%"github.com/goplus/llgo/internal/runtime.eface" %0) { _llgo_0: @@ -26,7 +51,7 @@ _llgo_1: ; preds = %_llgo_0 _llgo_2: ; preds = %_llgo_0 %7 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %7, i32 0, i32 0 - store ptr @0, ptr %8, align 8 + store ptr @1, ptr %8, align 8 %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %7, i32 0, i32 1 store i64 21, ptr %9, align 4 %10 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %7, align 8 @@ -41,6 +66,7 @@ _llgo_0: _llgo_1: ; preds = %_llgo_0 store i1 true, ptr @"main.init$guard", align 1 + call void @"main.init$abi"() br label %_llgo_2 _llgo_2: ; preds = %_llgo_1, %_llgo_0 @@ -53,22 +79,48 @@ _llgo_0: store ptr %1, ptr @__llgo_argv, align 8 call void @"github.com/goplus/llgo/internal/runtime.init"() call void @main.init() - %2 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) + %2 = load ptr, ptr @"*_llgo_int8", align 8 %3 = alloca %"github.com/goplus/llgo/internal/runtime.eface", align 8 %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.eface", ptr %3, i32 0, i32 0 store ptr %2, ptr %4, align 8 %5 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.eface", ptr %3, i32 0, i32 1 - store ptr inttoptr (i64 100 to ptr), ptr %5, align 8 + store ptr @3, ptr %5, align 8 %6 = load %"github.com/goplus/llgo/internal/runtime.eface", ptr %3, align 8 - %7 = call i64 @main.incVal(%"github.com/goplus/llgo/internal/runtime.eface" %6) - %8 = call i32 (ptr, ...) @printf(ptr @1, i64 %7) + %7 = call ptr @main.hi(%"github.com/goplus/llgo/internal/runtime.eface" %6) + %8 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) + %9 = alloca %"github.com/goplus/llgo/internal/runtime.eface", align 8 + %10 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.eface", ptr %9, i32 0, i32 0 + store ptr %8, ptr %10, align 8 + %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.eface", ptr %9, i32 0, i32 1 + store ptr inttoptr (i64 100 to ptr), ptr %11, align 8 + %12 = load %"github.com/goplus/llgo/internal/runtime.eface", ptr %9, align 8 + %13 = call i64 @main.incVal(%"github.com/goplus/llgo/internal/runtime.eface" %12) + %14 = call i32 (ptr, ...) @printf(ptr @2, ptr %7, i64 %13) ret i32 0 } -declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64) - declare void @"github.com/goplus/llgo/internal/runtime.TracePanic"(%"github.com/goplus/llgo/internal/runtime.eface") +declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64) + declare void @"github.com/goplus/llgo/internal/runtime.init"() declare i32 @printf(ptr, ...) + +define void @"main.init$abi"() { +_llgo_0: + %0 = load ptr, ptr @"*_llgo_int8", align 8 + %1 = icmp eq ptr %0, null + br i1 %1, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %2 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 3) + %3 = call ptr @"github.com/goplus/llgo/internal/runtime.Pointer"(ptr %2) + store ptr %3, ptr @"*_llgo_int8", align 8 + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_1, %_llgo_0 + ret void +} + +declare ptr @"github.com/goplus/llgo/internal/runtime.Pointer"(ptr) diff --git a/internal/runtime/llgo_autogen.lla b/internal/runtime/llgo_autogen.lla index 92d400d6..06b2a807 100644 Binary files a/internal/runtime/llgo_autogen.lla and b/internal/runtime/llgo_autogen.lla differ diff --git a/internal/runtime/z_type.go b/internal/runtime/z_type.go index a4860621..d5186fe7 100644 --- a/internal/runtime/z_type.go +++ b/internal/runtime/z_type.go @@ -111,4 +111,17 @@ func Struct(size uintptr, pkgPath string, fields ...abi.StructField) *Type { return &ret.Type } +// Pointer returns a pointer type. +func Pointer(elem *Type) *Type { + ret := &abi.PtrType{ + Type: Type{ + Size_: unsafe.Sizeof(uintptr(0)), + Hash: uint32(abi.Pointer), // TODO(xsw): hash + Kind_: uint8(abi.Pointer), + }, + Elem: elem, + } + return &ret.Type +} + // ----------------------------------------------------------------------------- diff --git a/ssa/interface.go b/ssa/interface.go index c1104663..b1d09e53 100644 --- a/ssa/interface.go +++ b/ssa/interface.go @@ -40,43 +40,25 @@ func (b Builder) abiBasic(t *types.Basic) Expr { return b.InlineCall(b.Pkg.rtFunc("Basic"), b.Prog.Val(kind)) } -// abiStruct returns the abi type of the specified struct type. -func (b Builder) abiStruct(t *types.Struct) Expr { - pkg := b.Pkg - name, private := pkg.abi.StructName(t) - g := pkg.VarOf(name) - if g == nil { - prog := b.Prog - g = pkg.doNewVar(name, prog.AbiTypePtrPtr()) - g.Init(prog.Null(g.Type)) - pub := !private - if pub { - g.impl.SetLinkage(llvm.LinkOnceAnyLinkage) - } - pkg.abiini = append(pkg.abiini, func(param unsafe.Pointer) { - b := Builder(param) - expr := g.Expr - var blks []BasicBlock - if pub { - eq := b.BinOp(token.EQL, b.Load(expr), b.Prog.Null(expr.Type)) - blks = b.Func.MakeBlocks(2) - b.If(eq, blks[0], blks[1]) - b.SetBlockEx(blks[0], AtEnd, false) - } - tabi := b.structOf(t) - b.Store(expr, tabi) - if pub { - b.Jump(blks[1]) - b.SetBlockEx(blks[1], AtEnd, false) - b.blk.last = blks[1].last - } - }) +func (b Builder) abiTypeOf(t types.Type) Expr { + switch t := t.(type) { + case *types.Basic: + return b.abiBasic(t) + case *types.Pointer: + return b.abiPointerOf(t) + case *types.Struct: + return b.abiStructOf(t) } - return b.Load(g.Expr) + panic("todo") +} + +func (b Builder) abiPointerOf(t *types.Pointer) Expr { + elem := b.abiTypeOf(t.Elem()) + return b.Call(b.Pkg.rtFunc("Pointer"), elem) } // func Struct(size uintptr, pkgPath string, fields []abi.StructField) *abi.Type -func (b Builder) structOf(t *types.Struct) Expr { +func (b Builder) abiStructOf(t *types.Struct) Expr { pkg := b.Pkg prog := b.Prog n := t.NumFields() @@ -106,14 +88,41 @@ func (b Builder) structField(sfAbi Expr, prog Program, f *types.Var, offset uint } // abiType returns the abi type of the specified type. -func (b Builder) abiType(raw types.Type) Expr { - switch tx := raw.(type) { - case *types.Basic: +func (b Builder) abiType(t types.Type) Expr { + if tx, ok := t.(*types.Basic); ok { return b.abiBasic(tx) - case *types.Struct: - return b.abiStruct(tx) } - panic("todo") + pkg := b.Pkg + name, private := pkg.abi.TypeName(t) + g := pkg.VarOf(name) + if g == nil { + prog := b.Prog + g = pkg.doNewVar(name, prog.AbiTypePtrPtr()) + g.Init(prog.Null(g.Type)) + pub := !private + if pub { + g.impl.SetLinkage(llvm.LinkOnceAnyLinkage) + } + pkg.abiini = append(pkg.abiini, func(param unsafe.Pointer) { + b := Builder(param) + expr := g.Expr + var blks []BasicBlock + if pub { + eq := b.BinOp(token.EQL, b.Load(expr), b.Prog.Null(expr.Type)) + blks = b.Func.MakeBlocks(2) + b.If(eq, blks[0], blks[1]) + b.SetBlockEx(blks[0], AtEnd, false) + } + tabi := b.abiTypeOf(t) + b.Store(expr, tabi) + if pub { + b.Jump(blks[1]) + b.SetBlockEx(blks[1], AtEnd, false) + b.blk.last = blks[1].last + } + }) + } + return b.Load(g.Expr) } // unsafeEface(t *abi.Type, data unsafe.Pointer) Eface diff --git a/ssa/stmt_builder.go b/ssa/stmt_builder.go index 93c462a4..8e2507de 100644 --- a/ssa/stmt_builder.go +++ b/ssa/stmt_builder.go @@ -29,7 +29,7 @@ import ( // ----------------------------------------------------------------------------- type aBasicBlock struct { - first llvm.BasicBlock + first llvm.BasicBlock // a Go SSA basic block may have multiple LLVM basic blocks last llvm.BasicBlock fn Function idx int