feat(py): Add Python tuple constructor helper

This commit is contained in:
AN Long
2024-08-14 21:39:20 +08:00
parent 9f1100b967
commit bbeceae42e
5 changed files with 62 additions and 2 deletions

View File

@@ -391,8 +391,9 @@ const (
llgoFuncAddr = llgoInstrBase + 0xd llgoFuncAddr = llgoInstrBase + 0xd
llgoPyList = llgoInstrBase + 0x10 llgoPyList = llgoInstrBase + 0x10
llgoPyStr = llgoInstrBase + 0x11 llgoPyStr = llgoInstrBase + 0x11
llgoPyTuple = llgoInstrBase + 0x12
llgoAtomicLoad = llgoInstrBase + 0x1d llgoAtomicLoad = llgoInstrBase + 0x1d
llgoAtomicStore = llgoInstrBase + 0x1e llgoAtomicStore = llgoInstrBase + 0x1e

View File

@@ -216,6 +216,7 @@ var llgoInstrs = map[string]int{
"funcAddr": llgoFuncAddr, "funcAddr": llgoFuncAddr,
"pystr": llgoPyStr, "pystr": llgoPyStr,
"pyList": llgoPyList, "pyList": llgoPyList,
"pyTuple": llgoPyTuple,
"sigjmpbuf": llgoSigjmpbuf, "sigjmpbuf": llgoSigjmpbuf,
"sigsetjmp": llgoSigsetjmp, "sigsetjmp": llgoSigsetjmp,
"siglongjmp": llgoSiglongjmp, "siglongjmp": llgoSiglongjmp,
@@ -354,6 +355,9 @@ func (p *context) call(b llssa.Builder, act llssa.DoAction, call *ssa.CallCommon
case llgoPyList: case llgoPyList:
args := p.compileValues(b, args, fnHasVArg) args := p.compileValues(b, args, fnHasVArg)
ret = b.PyList(args...) ret = b.PyList(args...)
case llgoPyTuple:
args := p.compileValues(b, args, fnHasVArg)
ret = b.PyTuple(args...)
case llgoPyStr: case llgoPyStr:
ret = pystr(b, args) ret = pystr(b, args)
case llgoCstr: case llgoCstr:

View File

@@ -22,6 +22,9 @@ import (
// https://docs.python.org/3/c-api/tuple.html // https://docs.python.org/3/c-api/tuple.html
//go:linkname Tuple llgo.pyTuple
func Tuple(__llgo_va_list ...any) *Object
// Return a new tuple object of size len, or nil on failure. // Return a new tuple object of size len, or nil on failure.
// //
//go:linkname NewTuple C.PyTuple_New //go:linkname NewTuple C.PyTuple_New

View File

@@ -169,6 +169,8 @@ type aProgram struct {
pyImpTy *types.Signature pyImpTy *types.Signature
pyNewList *types.Signature pyNewList *types.Signature
pyListSetI *types.Signature pyListSetI *types.Signature
pyNewTuple *types.Signature
pyTupleSetI *types.Signature
floatFromDbl *types.Signature floatFromDbl *types.Signature
callNoArgs *types.Signature callNoArgs *types.Signature
callOneArg *types.Signature callOneArg *types.Signature

View File

@@ -162,6 +162,30 @@ func (p Program) tyNewList() *types.Signature {
return p.pyNewList return p.pyNewList
} }
// func(*Object, uintptr, *Object) cint
func (p Program) tyTupleSetItem() *types.Signature {
if p.pyTupleSetI == nil {
paramUintptr := types.NewParam(token.NoPos, nil, "", p.Uintptr().raw.Type)
paramCInt := types.NewParam(token.NoPos, nil, "", p.CInt().raw.Type)
paramObjPtr := p.paramObjPtr()
params := types.NewTuple(paramObjPtr, paramUintptr, paramObjPtr)
results := types.NewTuple(paramCInt)
p.pyTupleSetI = types.NewSignatureType(nil, nil, nil, params, results, false)
}
return p.pyTupleSetI
}
// func(uintptr) *Object
func (p Program) tyNewTuple() *types.Signature {
if p.pyNewTuple == nil {
paramUintptr := types.NewParam(token.NoPos, nil, "", p.Uintptr().raw.Type)
params := types.NewTuple(paramUintptr)
results := types.NewTuple(p.paramObjPtr())
p.pyNewTuple = types.NewSignatureType(nil, nil, nil, params, results, false)
}
return p.pyNewTuple
}
// func(float64) *Object // func(float64) *Object
func (p Program) tyFloatFromDouble() *types.Signature { func (p Program) tyFloatFromDouble() *types.Signature {
if p.floatFromDbl == nil { if p.floatFromDbl == nil {
@@ -316,6 +340,32 @@ func (b Builder) PyList(args ...Expr) (ret Expr) {
return list return list
} }
// PyNewTuple(n int) *Object
func (b Builder) PyNewTuple(n Expr) (ret Expr) {
prog := b.Prog
fn := b.Pkg.pyFunc("PyTuple_New", prog.tyNewTuple())
return b.Call(fn, n)
}
// PyListSetItem(list *Object, index uintptr, item *Object) c.Int
func (b Builder) PyTupleSetItem(list, index, item Expr) (ret Expr) {
prog := b.Prog
fn := b.Pkg.pyFunc("PyTuple_SetItem", prog.tyTupleSetItem())
return b.Call(fn, list, index, item)
}
// PyList(args ...Expr) *Object
func (b Builder) PyTuple(args ...Expr) (ret Expr) {
prog := b.Prog
n := len(args)
uintPtr := prog.Uintptr()
list := b.PyNewTuple(prog.IntVal(uint64(n), uintPtr))
for i, arg := range args {
b.PyTupleSetItem(list, prog.IntVal(uint64(i), uintPtr), b.PyVal(arg))
}
return list
}
// PyVal(v any) *Object // PyVal(v any) *Object
func (b Builder) PyVal(v Expr) (ret Expr) { func (b Builder) PyVal(v Expr) (ret Expr) {
switch t := v.raw.Type.(type) { switch t := v.raw.Type.(type) {