llgo install: use clang to link

This commit is contained in:
xushiwei
2024-04-24 11:49:43 +08:00
parent 5b73480540
commit 1567989142
3 changed files with 62 additions and 46 deletions

View File

@@ -28,6 +28,7 @@ import (
"github.com/goplus/llgo/cl"
llssa "github.com/goplus/llgo/ssa"
"github.com/goplus/llgo/x/clang"
)
type Mode int
@@ -60,8 +61,7 @@ func Do(args []string, mode Mode) {
check(err)
// Create SSA-form program representation.
ssaProg, pkgs, errPkgs := allPkgs(initial, ssa.SanityCheckFunctions)
ssaProg.Build()
_, pkgs, errPkgs := allPkgs(initial, ssa.SanityCheckFunctions)
for _, errPkg := range errPkgs {
log.Println("cannot build SSA for package", errPkg)
}
@@ -71,22 +71,32 @@ func Do(args []string, mode Mode) {
// cl.SetDebug(cl.DbgFlagAll)
prog := llssa.NewProgram(nil)
llFiles := make([]string, 0, len(pkgs))
for _, pkg := range pkgs {
buildPkg(prog, pkg, mode)
pkg.SSA.Build()
llFiles = buildPkg(llFiles, prog, pkg, mode)
}
if mode == ModeInstall {
fmt.Fprintln(os.Stderr, "clang", llFiles)
err = clang.New("").Exec(llFiles...)
check(err)
}
}
func buildPkg(prog llssa.Program, pkg aPackage, mode Mode) {
func buildPkg(llFiles []string, prog llssa.Program, pkg aPackage, mode Mode) []string {
pkgPath := pkg.PkgPath
fmt.Fprintln(os.Stderr, pkgPath)
if pkgPath == "unsafe" { // TODO(xsw): remove this special case
return
return llFiles
}
ret, err := cl.NewPackage(prog, pkg.SSA, pkg.Syntax)
check(err)
if mode == ModeInstall {
os.WriteFile(pkg.ExportFile+".ll", []byte(ret.String()), 0644)
file := pkg.ExportFile + ".ll"
os.WriteFile(file, []byte(ret.String()), 0644)
llFiles = append(llFiles, file)
}
return llFiles
}
type aPackage struct {

46
x/clang/clang.go Normal file
View File

@@ -0,0 +1,46 @@
/*
* Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package clang
import (
"os"
"os/exec"
)
// -----------------------------------------------------------------------------
// Cmd represents a nm command.
type Cmd struct {
app string
}
// New creates a new nm command.
func New(app string) *Cmd {
if app == "" {
app = "clang"
}
return &Cmd{app}
}
func (p *Cmd) Exec(args ...string) error {
cmd := exec.Command(p.app, args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
}
// -----------------------------------------------------------------------------

View File

@@ -1,40 +0,0 @@
/*
* Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package llexportdata
import (
"go/token"
"go/types"
"io"
)
// Read reads export data from in, decodes it, and returns type information for the package.
//
// The package path (effectively its linker symbol prefix) is specified by path, since unlike
// the package name, this information may not be recorded in the export data.
//
// File position information is added to fset.
//
// Read may inspect and add to the imports map to ensure that references within the export data
// to other packages are consistent. The caller must ensure that imports[path] does not exist,
// or exists but is incomplete (see types.Package.Complete), and Read inserts the resulting package
// into this map entry.
//
// On return, the state of the reader is undefined.
func Read(in io.Reader, fset *token.FileSet, imports map[string]*types.Package, path string) (*types.Package, error) {
panic("todo")
}