admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llgo build/install: a.out generated

Browse Source
This commit is contained in:
xushiwei
2024-04-25 00:14:02 +08:00
parent 81b3add443
commit cbaf9e21b2
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cl/compile.go
View File

@@ -305,7 +305,8 @@ func NewPackage(prog llssa.Program, pkg *ssa.Package, files []*ast.File) (ret ll
}) })
pkgTypes := pkg.Pkg pkgTypes := pkg.Pkg
ret = prog.NewPackage(pkgTypes.Name(), pkgTypes.Path()) pkgName, pkgPath := pkgTypes.Name(), pkgTypes.Path()
ret = prog.NewPackage(pkgName, pkgPath)
ctx := &context{ ctx := &context{
prog: prog, prog: prog,
@@ -316,7 +317,7 @@ func NewPackage(prog llssa.Program, pkg *ssa.Package, files []*ast.File) (ret ll
link: make(map[string]string), link: make(map[string]string),
loaded: make(map[*types.Package]none), loaded: make(map[*types.Package]none),
} }
ctx.initFiles(pkgTypes.Path(), files) ctx.initFiles(pkgPath, files)
for _, m := range members { for _, m := range members {
member := m.val member := m.val
switch member := member.(type) { switch member := member.(type) {

6
cl/import.go
View File

@@ -106,7 +106,11 @@ func (p *context) initLinkname(pkgPath, line string) {
} }
func fullName(pkg *types.Package, name string) string { func fullName(pkg *types.Package, name string) string {
return pkg.Path() + "." + name pkgPath := pkg.Name()
if pkgPath != "main" {
pkgPath = pkg.Path()
}
return pkgPath + "." + name
} }
func funcName(pkg *types.Package, fn *ssa.Function) string { func funcName(pkg *types.Package, fn *ssa.Function) string {

9
internal/build/build_install.go
View File

@@ -50,7 +50,7 @@ const (
func Do(args []string, mode Mode) { func Do(args []string, mode Mode) {
flags, patterns, verbose := parseArgs(args) flags, patterns, verbose := parseArgs(args)
cfg := &packages.Config{ cfg := &packages.Config{
Mode: loadSyntax | packages.NeedExportFile, Mode: loadSyntax | packages.NeedDeps | packages.NeedExportFile,
BuildFlags: flags, BuildFlags: flags,
} }
@@ -61,7 +61,8 @@ func Do(args []string, mode Mode) {
check(err) check(err)
// Create SSA-form program representation. // Create SSA-form program representation.
_, pkgs, errPkgs := allPkgs(initial, ssa.SanityCheckFunctions) ssaProg, pkgs, errPkgs := allPkgs(initial, ssa.SanityCheckFunctions)
ssaProg.Build()
for _, errPkg := range errPkgs { for _, errPkg := range errPkgs {
log.Println("cannot build SSA for package", errPkg) log.Println("cannot build SSA for package", errPkg)
} }
@@ -75,11 +76,11 @@ func Do(args []string, mode Mode) {
prog := llssa.NewProgram(nil) prog := llssa.NewProgram(nil)
llFiles := make([]string, 0, len(pkgs)) llFiles := make([]string, 0, len(pkgs))
for _, pkg := range pkgs { for _, pkg := range pkgs {
pkg.SSA.Build()
llFiles = buildPkg(llFiles, prog, pkg, mode) llFiles = buildPkg(llFiles, prog, pkg, mode)
} }
if mode == ModeInstall { if mode == ModeInstall {
fmt.Fprintln(os.Stderr, "clang", llFiles) // TODO(xsw): show work
// fmt.Fprintln(os.Stderr, "clang", llFiles)
err = clang.New("").Exec(llFiles...) err = clang.New("").Exec(llFiles...)
check(err) check(err)
} }