From 4660eae8c7173b63110b94b746b8fe16d72ff3d1 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Thu, 4 Jul 2024 18:39:31 +0800 Subject: [PATCH] cl: _testpy/callpy --- cl/_testpy/callpy/in.go | 3 ++- cl/_testpy/callpy/out.ll | 31 +++++++++++++++++++++---------- py/llgo_autogen.lla | Bin 400 -> 533 bytes 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/cl/_testpy/callpy/in.go b/cl/_testpy/callpy/in.go index 12424d62..0d5a734d 100644 --- a/cl/_testpy/callpy/in.go +++ b/cl/_testpy/callpy/in.go @@ -5,11 +5,12 @@ import ( "github.com/goplus/llgo/py" "github.com/goplus/llgo/py/math" "github.com/goplus/llgo/py/os" + "github.com/goplus/llgo/py/std" ) func main() { x := math.Sqrt(py.Float(2)) wd := os.Getcwd() c.Printf(c.Str("sqrt(2) = %f\n"), x.Float64()) - c.Printf(c.Str("cwd = %s\n"), wd.CStr()) + std.Print(py.Str("cwd ="), wd) } diff --git a/cl/_testpy/callpy/out.ll b/cl/_testpy/callpy/out.ll index 6518dace..25ccfebb 100644 --- a/cl/_testpy/callpy/out.ll +++ b/cl/_testpy/callpy/out.ll @@ -7,11 +7,14 @@ source_filename = "main" @__llgo_py.math.sqrt = linkonce global ptr null, align 8 @__llgo_py.os.getcwd = linkonce global ptr null, align 8 @0 = private unnamed_addr constant [14 x i8] c"sqrt(2) = %f\0A\00", align 1 -@1 = private unnamed_addr constant [10 x i8] c"cwd = %s\0A\00", align 1 +@1 = private unnamed_addr constant [6 x i8] c"cwd =\00", align 1 +@__llgo_py.builtins.print = linkonce global ptr null, align 8 +@__llgo_py.builtins = external global ptr, align 8 +@2 = private unnamed_addr constant [6 x i8] c"print\00", align 1 @__llgo_py.math = external global ptr, align 8 -@2 = private unnamed_addr constant [5 x i8] c"sqrt\00", align 1 +@3 = private unnamed_addr constant [5 x i8] c"sqrt\00", align 1 @__llgo_py.os = external global ptr, align 8 -@3 = private unnamed_addr constant [7 x i8] c"getcwd\00", align 1 +@4 = private unnamed_addr constant [7 x i8] c"getcwd\00", align 1 define void @main.init() { _llgo_0: @@ -22,10 +25,13 @@ _llgo_1: ; preds = %_llgo_0 store i1 true, ptr @"main.init$guard", align 1 call void @"github.com/goplus/llgo/py/math.init"() call void @"github.com/goplus/llgo/py/os.init"() - %1 = load ptr, ptr @__llgo_py.math, align 8 - call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @2, ptr @__llgo_py.math.sqrt, ptr null) - %2 = load ptr, ptr @__llgo_py.os, align 8 - call void (ptr, ...) @llgoLoadPyModSyms(ptr %2, ptr @3, ptr @__llgo_py.os.getcwd, ptr null) + call void @"github.com/goplus/llgo/py/std.init"() + %1 = load ptr, ptr @__llgo_py.builtins, align 8 + call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @2, ptr @__llgo_py.builtins.print, ptr null) + %2 = load ptr, ptr @__llgo_py.math, align 8 + call void (ptr, ...) @llgoLoadPyModSyms(ptr %2, ptr @3, ptr @__llgo_py.math.sqrt, ptr null) + %3 = load ptr, ptr @__llgo_py.os, align 8 + call void (ptr, ...) @llgoLoadPyModSyms(ptr %3, ptr @4, ptr @__llgo_py.os.getcwd, ptr null) br label %_llgo_2 _llgo_2: ; preds = %_llgo_1, %_llgo_0 @@ -46,8 +52,9 @@ _llgo_0: %6 = call ptr @PyObject_CallNoArgs(ptr %5) %7 = call double @PyFloat_AsDouble(ptr %4) %8 = call i32 (ptr, ...) @printf(ptr @0, double %7) - %9 = call ptr @PyUnicode_AsUTF8(ptr %6) - %10 = call i32 (ptr, ...) @printf(ptr @1, ptr %9) + %9 = call ptr @PyUnicode_FromString(ptr @1) + %10 = load ptr, ptr @__llgo_py.builtins.print, align 8 + %11 = call ptr (ptr, ...) @PyObject_CallFunctionObjArgs(ptr %10, ptr %9, ptr %6, ptr null) ret i32 0 } @@ -55,6 +62,8 @@ declare void @"github.com/goplus/llgo/py/math.init"() declare void @"github.com/goplus/llgo/py/os.init"() +declare void @"github.com/goplus/llgo/py/std.init"() + declare void @"github.com/goplus/llgo/internal/runtime.init"() declare ptr @PyFloat_FromDouble(double) @@ -67,7 +76,9 @@ declare double @PyFloat_AsDouble(ptr) declare i32 @printf(ptr, ...) -declare ptr @PyUnicode_AsUTF8(ptr) +declare ptr @PyUnicode_FromString(ptr) + +declare ptr @PyObject_CallFunctionObjArgs(ptr, ...) declare void @llgoLoadPyModSyms(ptr, ...) diff --git a/py/llgo_autogen.lla b/py/llgo_autogen.lla index 0bbf8a002158164eb4a3ede78fd4a7526b3e6c22..1ac2b598a790aeeb8e5986ffcecd01fa33aaaf55 100644 GIT binary patch delta 479 zcmbQhJe8$Bz?+#xgn@y9gJIK@ClND_TG=KtGB8N7Ffi~l$S~yOr02&cmX_qFr{?M9 z?x1|*VacKoN10%~bei*Y7*e4m*Vx zuFTGwJ!8d{!o6=cx@})};AV`FR@}m1cJ`}`$qyH<4~jJD3eJg2O>I5A(llslqw$v0 zQi-fvO$ASM7e^SEl~$Y#(8@f2YMS)JcJE7;>Jv22Sei;Osz+*hND5m_=h~|)vw64a zu3eXJoBW+$|D1m^!y!G3tsMIedlf#$-TYs%^j`LpJzRcQ zLO<=O3EFglDScm~U(MPhA^VcZO_9e=}cSQ9WU;f5-sk(XydH~ z_cMLF>pTCNzOUZ*M*n9_ueGPGmj5#5PyzD_p^v=p7^|5BycwC~n6X9IWP3&pP|Qru NVpL#T1&k901^|i~&0PQh literal 400 zcmWIWW@Zs#U|`^2sP(%T(J((n^A3>b!oq>B+5Dw#i4M>U2YRQXRh9qDy#pyN}9XN%`)@5dN%6JP1_+_b+%C}qpa+Jm!|VxX^!`g zc=SGY{bsLORhG5&tQ%wM&oPzaOLTKbn61$MGw{Hh+441>FzuW@M6M#uZEw ozyM=l0EPp@l12~