diff options
Diffstat (limited to 'vendor/github.com/bytedance/sonic/internal/encoder/x86')
4 files changed, 15 insertions, 11 deletions
diff --git a/vendor/github.com/bytedance/sonic/internal/encoder/x86/asm_stubs_amd64_go121.go b/vendor/github.com/bytedance/sonic/internal/encoder/x86/asm_stubs_amd64_go121.go index 6956bd9ba..34a2ff321 100644 --- a/vendor/github.com/bytedance/sonic/internal/encoder/x86/asm_stubs_amd64_go121.go +++ b/vendor/github.com/bytedance/sonic/internal/encoder/x86/asm_stubs_amd64_go121.go @@ -1,5 +1,5 @@ -//go:build go1.21 && !go1.25 -// +build go1.21,!go1.25 +//go:build go1.21 && !go1.26 +// +build go1.21,!go1.26 // Copyright 2023 CloudWeGo Authors // diff --git a/vendor/github.com/bytedance/sonic/internal/encoder/x86/assembler_regabi_amd64.go b/vendor/github.com/bytedance/sonic/internal/encoder/x86/assembler_regabi_amd64.go index d6d451329..620c85900 100644 --- a/vendor/github.com/bytedance/sonic/internal/encoder/x86/assembler_regabi_amd64.go +++ b/vendor/github.com/bytedance/sonic/internal/encoder/x86/assembler_regabi_amd64.go @@ -1,5 +1,5 @@ -//go:build go1.17 && !go1.25 -// +build go1.17,!go1.25 +//go:build go1.17 && !go1.26 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. @@ -28,6 +28,7 @@ import ( "github.com/bytedance/sonic/internal/cpu" "github.com/bytedance/sonic/internal/encoder/alg" "github.com/bytedance/sonic/internal/encoder/ir" + "github.com/bytedance/sonic/internal/encoder/prim" "github.com/bytedance/sonic/internal/encoder/vars" "github.com/bytedance/sonic/internal/jit" "github.com/bytedance/sonic/internal/native/types" @@ -662,6 +663,8 @@ var ( func (self *Assembler) go_panic() { self.Link(_LB_panic) self.Emit("MOVQ", _SP_p, _BX) + self.Emit("MOVQ", _RP, _CX) + self.Emit("MOVQ", _RL, _DI) self.call_go(_F_panic) } @@ -764,7 +767,7 @@ var ( var ( _F_memmove = jit.Func(rt.Memmove) _F_error_number = jit.Func(vars.Error_number) - _F_isValidNumber = jit.Func(rt.IsValidNumber) + _F_isValidNumber = jit.Func(alg.IsValidNumber) ) var ( @@ -784,8 +787,8 @@ const ( ) func init() { - _F_encodeJsonMarshaler = jit.Func(alg.EncodeJsonMarshaler) - _F_encodeTextMarshaler = jit.Func(alg.EncodeTextMarshaler) + _F_encodeJsonMarshaler = jit.Func(prim.EncodeJsonMarshaler) + _F_encodeTextMarshaler = jit.Func(prim.EncodeTextMarshaler) _F_encodeTypedPointer = jit.Func(EncodeTypedPointer) } @@ -1100,7 +1103,7 @@ func (self *Assembler) _asm_OP_is_zero_map(p *ir.Instr) { } var ( - _F_is_zero = jit.Func(alg.IsZero) + _F_is_zero = jit.Func(prim.IsZero) _T_reflect_Type = rt.UnpackIface(reflect.Type(nil)) ) diff --git a/vendor/github.com/bytedance/sonic/internal/encoder/x86/debug_go117.go b/vendor/github.com/bytedance/sonic/internal/encoder/x86/debug_go117.go index 1d1338756..6d7659e68 100644 --- a/vendor/github.com/bytedance/sonic/internal/encoder/x86/debug_go117.go +++ b/vendor/github.com/bytedance/sonic/internal/encoder/x86/debug_go117.go @@ -1,5 +1,5 @@ -//go:build go1.17 && !go1.25 -// +build go1.17,!go1.25 +//go:build go1.17 && !go1.26 +// +build go1.17,!go1.26 /* * Copyright 2021 ByteDance Inc. diff --git a/vendor/github.com/bytedance/sonic/internal/encoder/x86/stbus.go b/vendor/github.com/bytedance/sonic/internal/encoder/x86/stbus.go index 7b6b1f96b..45bb97289 100644 --- a/vendor/github.com/bytedance/sonic/internal/encoder/x86/stbus.go +++ b/vendor/github.com/bytedance/sonic/internal/encoder/x86/stbus.go @@ -21,6 +21,7 @@ import ( _ "unsafe" "github.com/bytedance/sonic/internal/encoder/alg" + "github.com/bytedance/sonic/internal/encoder/prim" "github.com/bytedance/sonic/internal/encoder/vars" "github.com/bytedance/sonic/internal/rt" "github.com/bytedance/sonic/loader" @@ -39,7 +40,7 @@ func ptoenc(p loader.Function) vars.Encoder { func EncodeTypedPointer(buf *[]byte, vt *rt.GoType, vp *unsafe.Pointer, sb *vars.Stack, fv uint64) error { if vt == nil { - return alg.EncodeNil(buf) + return prim.EncodeNil(buf) } else if fn, err := vars.FindOrCompile(vt, (fv&(1<<alg.BitPointerValue)) != 0, compiler); err != nil { return err } else if vt.Indirect() { |