build: fix link runtime multiple times
This commit is contained in:
@@ -1,14 +1,12 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"unsafe"
|
|
||||||
|
|
||||||
"github.com/goplus/llgo/internal/runtime/c"
|
"github.com/goplus/llgo/internal/runtime/c"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
s := c.Str("Hi\n")
|
s := c.Str("Hi\n")
|
||||||
s2 := c.Alloca(4)
|
s2 := c.Alloca(4)
|
||||||
c.Memcpy(s2, unsafe.Pointer(s), 4)
|
c.Memcpy(s2, c.Pointer(s), 4)
|
||||||
c.Printf(c.Str("%s"), s2)
|
c.Printf(c.Str("%s"), s2)
|
||||||
}
|
}
|
||||||
|
|||||||
38
cl/_testrt/glbarray/in.go
Normal file
38
cl/_testrt/glbarray/in.go
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/goplus/llgo/internal/abi"
|
||||||
|
"github.com/goplus/llgo/internal/runtime/c"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Basic(kind abi.Kind) *abi.Type {
|
||||||
|
ret := 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 (
|
||||||
|
basicTypes = [...]*abi.Type{
|
||||||
|
abi.String: basicType(abi.String),
|
||||||
|
}
|
||||||
|
sizeBasicTypes = [...]uintptr{
|
||||||
|
abi.String: 16,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func basicType(kind abi.Kind) *abi.Type {
|
||||||
|
ret := &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)
|
||||||
|
c.Printf(c.Str("Kind: %d, Size: %d\n"), int(t.Kind_), t.Size_)
|
||||||
|
}
|
||||||
93
cl/_testrt/glbarray/out.ll
Normal file
93
cl/_testrt/glbarray/out.ll
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
; ModuleID = 'main'
|
||||||
|
source_filename = "main"
|
||||||
|
|
||||||
|
%"github.com/goplus/llgo/internal/abi.Type" = type { i64, i64, i32, i8, i8, i8, i8, ptr, ptr, i32, i32 }
|
||||||
|
|
||||||
|
@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
|
||||||
|
@1 = private unnamed_addr constant [31 x i8] c"basicType: %p, %d, %d, %d, %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
|
||||||
|
}
|
||||||
|
|
||||||
|
define ptr @main.basicType(i64 %0) {
|
||||||
|
_llgo_0:
|
||||||
|
%1 = call ptr @"github.com/goplus/llgo/internal/runtime.Alloc"(i64 16)
|
||||||
|
%2 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 0
|
||||||
|
%3 = getelementptr inbounds i64, ptr @main.sizeBasicTypes, i64 %0
|
||||||
|
%4 = load i64, ptr %3, align 4
|
||||||
|
%5 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 2
|
||||||
|
%6 = trunc i64 %0 to i32
|
||||||
|
%7 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %1, i32 0, i32 6
|
||||||
|
%8 = trunc i64 %0 to i8
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
define void @main.init() {
|
||||||
|
_llgo_0:
|
||||||
|
%0 = load i1, ptr @"main.init$guard", align 1
|
||||||
|
br i1 %0, label %_llgo_2, label %_llgo_1
|
||||||
|
|
||||||
|
_llgo_1: ; preds = %_llgo_0
|
||||||
|
store i1 true, ptr @"main.init$guard", align 1
|
||||||
|
call void @"github.com/goplus/llgo/internal/abi.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
|
||||||
|
br label %_llgo_2
|
||||||
|
|
||||||
|
_llgo_2: ; preds = %_llgo_1, %_llgo_0
|
||||||
|
ret void
|
||||||
|
}
|
||||||
|
|
||||||
|
define void @main() {
|
||||||
|
_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
|
||||||
|
%2 = load i8, ptr %1, align 1
|
||||||
|
%3 = sext i8 %2 to i64
|
||||||
|
%4 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 0
|
||||||
|
%5 = load i64, ptr %4, align 4
|
||||||
|
%6 = call i32 (ptr, ...) @printf(ptr @2, i64 %3, i64 %5)
|
||||||
|
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"()
|
||||||
@@ -185,7 +185,7 @@ func linkMainPkg(pkg *packages.Package, runtimeFiles []string, conf *Config, mod
|
|||||||
args[2] = "-Wno-override-module"
|
args[2] = "-Wno-override-module"
|
||||||
needRuntime := false
|
needRuntime := false
|
||||||
packages.Visit([]*packages.Package{pkg}, nil, func(p *packages.Package) {
|
packages.Visit([]*packages.Package{pkg}, nil, func(p *packages.Package) {
|
||||||
if p.ExportFile != "" { // skip packages that only contain declarations
|
if p.ExportFile != "" && !isRuntimePkg(p.PkgPath) { // skip packages that only contain declarations
|
||||||
args = append(args, p.ExportFile+".ll")
|
args = append(args, p.ExportFile+".ll")
|
||||||
if !needRuntime {
|
if !needRuntime {
|
||||||
needRuntime = isNeedRuntime(p)
|
needRuntime = isNeedRuntime(p)
|
||||||
@@ -206,7 +206,9 @@ func linkMainPkg(pkg *packages.Package, runtimeFiles []string, conf *Config, mod
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
// TODO(xsw): show work
|
// TODO(xsw): show work
|
||||||
// fmt.Fprintln(os.Stderr, "clang", args)
|
if verbose {
|
||||||
|
fmt.Fprintln(os.Stderr, "clang", args)
|
||||||
|
}
|
||||||
err := clang.New("").Exec(args...)
|
err := clang.New("").Exec(args...)
|
||||||
check(err)
|
check(err)
|
||||||
|
|
||||||
@@ -328,17 +330,24 @@ func allLinkFiles(rt []*packages.Package) (outFiles []string) {
|
|||||||
outFiles = make([]string, 0, len(rt))
|
outFiles = make([]string, 0, len(rt))
|
||||||
root := rootLLGo(rt[0])
|
root := rootLLGo(rt[0])
|
||||||
packages.Visit(rt, nil, func(p *packages.Package) {
|
packages.Visit(rt, nil, func(p *packages.Package) {
|
||||||
if hasLinkFile(p) {
|
pkgPath := p.PkgPath
|
||||||
outFile := filepath.Join(root+p.PkgPath[len(llgoModPath):], "llgo_autogen.ll")
|
if isRuntimePkg(pkgPath) {
|
||||||
|
outFile := filepath.Join(root+pkgPath[len(llgoModPath):], "llgo_autogen.ll")
|
||||||
outFiles = append(outFiles, outFile)
|
outFiles = append(outFiles, outFile)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func hasLinkFile(pkg *packages.Package) bool {
|
const (
|
||||||
if isPkgInLLGo(pkg.PkgPath) {
|
pkgAbi = llgoModPath + "/internal/abi"
|
||||||
return cl.PkgKindOf(pkg.Types) != cl.PkgDeclOnly
|
pkgRuntime = llgoModPath + "/internal/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
func isRuntimePkg(pkgPath string) bool {
|
||||||
|
switch pkgPath {
|
||||||
|
case pkgRuntime, pkgAbi:
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@@ -352,6 +361,7 @@ const (
|
|||||||
llgoModPath = "github.com/goplus/llgo"
|
llgoModPath = "github.com/goplus/llgo"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
func isPkgInLLGo(pkgPath string) bool {
|
func isPkgInLLGo(pkgPath string) bool {
|
||||||
return isPkgInMod(pkgPath, llgoModPath)
|
return isPkgInMod(pkgPath, llgoModPath)
|
||||||
}
|
}
|
||||||
@@ -363,6 +373,7 @@ func isPkgInMod(pkgPath, modPath string) bool {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
func check(err error) {
|
func check(err error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user