cl: _testrt/gblarray

cl/_testrt/gblarray/in.go

@@ -2,14 +2,12 @@ package main
 
 import (
 	"github.com/goplus/llgo/internal/abi"
+	"github.com/goplus/llgo/internal/runtime"
 	"github.com/goplus/llgo/internal/runtime/c"
 )
 
 func Basic(kind abi.Kind) *abi.Type {
-	ret := basicTypes[kind]
+	return basicTypes[kind]
-	c.Printf(c.Str("Basic: %p, %d, %d, %d, %d\n"),
-		ret, c.Int(ret.Hash), c.Int(ret.Kind_), c.Int(kind), c.Int(ret.Size_))
-	return ret
 }
 
 var (
@@ -22,17 +20,16 @@ var (
 )
 
 func basicType(kind abi.Kind) *abi.Type {
-	ret := &abi.Type{
+	return &abi.Type{
 		Size_: sizeBasicTypes[kind],
 		Hash:  uint32(kind),
 		Kind_: uint8(kind),
 	}
-	c.Printf(c.Str("basicType: %p, %d, %d, %d, %d\n"),
-		ret, c.Int(ret.Hash), c.Int(ret.Kind_), c.Int(kind), c.Int(ret.Size_))
-	return ret
 }
 
 func main() {
 	t := Basic(abi.String)
+	t2 := runtime.Basic(abi.String)
 	c.Printf(c.Str("Kind: %d, Size: %d\n"), int(t.Kind_), t.Size_)
+	c.Printf(c.Str("Kind: %d, Size: %d\n"), int(t2.Kind_), t2.Size_)
 }

cl/_testrt/gblarray/out.ll

@@ -6,24 +6,13 @@ source_filename = "main"
 @main.basicTypes = global ptr null
 @"main.init$guard" = global ptr null
 @main.sizeBasicTypes = global ptr null
-@0 = private unnamed_addr constant [27 x i8] c"Basic: %p, %d, %d, %d, %d\0A\00", align 1
+@0 = private unnamed_addr constant [20 x i8] c"Kind: %d, Size: %d\0A\00", align 1
-@1 = private unnamed_addr constant [31 x i8] c"basicType: %p, %d, %d, %d, %d\0A\00", align 1
+@1 = private unnamed_addr constant [20 x i8] c"Kind: %d, Size: %d\0A\00", align 1
-@2 = private unnamed_addr constant [20 x i8] c"Kind: %d, Size: %d\0A\00", align 1
 
 define ptr @main.Basic(i64 %0) {
 _llgo_0:
   %1 = getelementptr inbounds ptr, ptr @main.basicTypes, i64 %0
   %2 = load ptr, ptr %1, align 8
-  %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %2, i32 0, i32 2
-  %4 = load i32, ptr %3, align 4
-  %5 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %2, i32 0, i32 6
-  %6 = load i8, ptr %5, align 1
-  %7 = sext i8 %6 to i32
-  %8 = trunc i64 %0 to i32
-  %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %2, i32 0, i32 0
-  %10 = load i64, ptr %9, align 4
-  %11 = trunc i64 %10 to i32
-  %12 = call i32 (ptr, ...) @printf(ptr @0, ptr %2, i32 %4, i32 %7, i32 %8, i32 %11)
   ret ptr %2
 }
 
@@ -40,16 +29,6 @@ _llgo_0:
   store i64 %4, ptr %2, align 4
   store i32 %6, ptr %5, align 4
   store i8 %8, ptr %7, align 1
-  %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 2
-  %10 = load i32, ptr %9, align 4
-  %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 6
-  %12 = load i8, ptr %11, align 1
-  %13 = sext i8 %12 to i32
-  %14 = trunc i64 %0 to i32
-  %15 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 0
-  %16 = load i64, ptr %15, align 4
-  %17 = trunc i64 %16 to i32
-  %18 = call i32 (ptr, ...) @printf(ptr @1, ptr %1, i32 %10, i32 %13, i32 %14, i32 %17)
   ret ptr %1
 }
 
@@ -61,6 +40,7 @@ _llgo_0:
 _llgo_1:                                          ; preds = %_llgo_0
   store i1 true, ptr @"main.init$guard", align 1
   call void @"github.com/goplus/llgo/internal/abi.init"()
+  call void @"github.com/goplus/llgo/internal/runtime.init"()
   store i64 16, ptr getelementptr inbounds (i64, ptr @main.sizeBasicTypes, i64 24), align 4
   %1 = call ptr @main.basicType(i64 24)
   store ptr %1, ptr getelementptr inbounds (ptr, ptr @main.basicTypes, i64 24), align 8
@@ -75,19 +55,28 @@ _llgo_0:
   call void @"github.com/goplus/llgo/internal/runtime.init"()
   call void @main.init()
   %0 = call ptr @main.Basic(i64 24)
-  %1 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 6
+  %1 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 24)
-  %2 = load i8, ptr %1, align 1
+  %2 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 6
-  %3 = sext i8 %2 to i64
+  %3 = load i8, ptr %2, align 1
-  %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 0
+  %4 = sext i8 %3 to i64
-  %5 = load i64, ptr %4, align 4
+  %5 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 0
-  %6 = call i32 (ptr, ...) @printf(ptr @2, i64 %3, i64 %5)
+  %6 = load i64, ptr %5, align 4
+  %7 = call i32 (ptr, ...) @printf(ptr @0, i64 %4, i64 %6)
+  %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 6
+  %9 = load i8, ptr %8, align 1
+  %10 = sext i8 %9 to i64
+  %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 0
+  %12 = load i64, ptr %11, align 4
+  %13 = call i32 (ptr, ...) @printf(ptr @1, i64 %10, i64 %12)
   ret void
 }
 
-declare i32 @printf(ptr, ...)
-
 declare ptr @"github.com/goplus/llgo/internal/runtime.Alloc"(i64)
 
 declare void @"github.com/goplus/llgo/internal/abi.init"()
 
 declare void @"github.com/goplus/llgo/internal/runtime.init"()
+
+declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64)
+
+declare i32 @printf(ptr, ...)