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

build: apply review feedback on main module generation

Browse Source 
- Remove sizeTypeForArch, use prog.Uintptr() directly
- Replace charPtrType with prog.CStr()
- Add back TODO(lijie) comment for syscall patch workaround

Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: cpunion <8459+cpunion@users.noreply.github.com>
This commit is contained in:
xgopilot
2025-11-16 05:28:10 +00:00
parent 9926c4ed6a
commit 9b71b3f2dc
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/build/main_module.go
View File

@@ -36,8 +36,7 @@ func genMainModule(ctx *context, rtPkgPath string, pkg *packages.Package, needRu
argcVar := mainPkg.NewVarEx("__llgo_argc", prog.Pointer(prog.Int32())) argcVar := mainPkg.NewVarEx("__llgo_argc", prog.Pointer(prog.Int32()))
argcVar.Init(prog.Zero(prog.Int32())) argcVar.Init(prog.Zero(prog.Int32()))
charPtrType := prog.Pointer(prog.Byte()) argvValueType := prog.Pointer(prog.CStr())
argvValueType := prog.Pointer(charPtrType)
argvVar := mainPkg.NewVarEx("__llgo_argv", prog.Pointer(argvValueType)) argvVar := mainPkg.NewVarEx("__llgo_argv", prog.Pointer(argvValueType))
argvVar.InitNil() argvVar.InitNil()
@@ -58,6 +57,7 @@ func genMainModule(ctx *context, rtPkgPath string, pkg *packages.Package, needRu
} }
runtimeStub := defineWeakNoArgStub(mainPkg, "runtime.init") runtimeStub := defineWeakNoArgStub(mainPkg, "runtime.init")
// TODO(lijie): workaround for syscall patch
// Define syscall.init as a weak stub to allow linking even when syscall package is not imported // Define syscall.init as a weak stub to allow linking even when syscall package is not imported
defineWeakNoArgStub(mainPkg, "syscall.init") defineWeakNoArgStub(mainPkg, "syscall.init")
@@ -144,9 +144,8 @@ func emitStdioNobuf(b llssa.Builder, pkg llssa.Package, goarch string) {
stderr := declareExternalPtrGlobal(pkg, "stderr", streamType) stderr := declareExternalPtrGlobal(pkg, "stderr", streamType)
stdoutAlt := declareExternalPtrGlobal(pkg, "__stdout", streamType) stdoutAlt := declareExternalPtrGlobal(pkg, "__stdout", streamType)
stderrAlt := declareExternalPtrGlobal(pkg, "__stderr", streamType) stderrAlt := declareExternalPtrGlobal(pkg, "__stderr", streamType)
sizeType := sizeTypeForArch(prog, goarch) sizeType := prog.Uintptr()
charPtrType := prog.Pointer(prog.Byte()) setvbuf := declareSetvbuf(pkg, streamPtrType, prog.CStr(), prog.Int32(), sizeType)
setvbuf := declareSetvbuf(pkg, streamPtrType, charPtrType, prog.Int32(), sizeType)
stdoutSlot := b.AllocaT(streamPtrType) stdoutSlot := b.AllocaT(streamPtrType)
b.Store(stdoutSlot, stdout) b.Store(stdoutSlot, stdout)
@@ -166,7 +165,7 @@ func emitStdioNobuf(b llssa.Builder, pkg llssa.Package, goarch string) {
mode := prog.IntVal(2, prog.Int32()) mode := prog.IntVal(2, prog.Int32())
zeroSize := prog.Zero(sizeType) zeroSize := prog.Zero(sizeType)
nullBuf := prog.Nil(charPtrType) nullBuf := prog.Nil(prog.CStr())
b.Call(setvbuf.Expr, stdoutPtr, nullBuf, mode, zeroSize) b.Call(setvbuf.Expr, stdoutPtr, nullBuf, mode, zeroSize)
b.Call(setvbuf.Expr, stderrPtr, nullBuf, mode, zeroSize) b.Call(setvbuf.Expr, stderrPtr, nullBuf, mode, zeroSize)
@@ -213,7 +212,3 @@ func newEntrySignature(argvType types.Type) *types.Signature {
[]types.Type{types.Typ[types.Int32]}, []types.Type{types.Typ[types.Int32]},
) )
} }
func sizeTypeForArch(prog llssa.Program, arch string) llssa.Type {
return prog.Uintptr()
}