From dfaa604a1466fd240a15f5ba92abe19ed2124e1a Mon Sep 17 00:00:00 2001 From: "felix.fengmin" Date: Tue, 2 Apr 2024 22:24:11 +0800 Subject: [PATCH] chore: migrate iasm --- fuzz/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/atm/abi/abi_amd64.go | 2 +- internal/atm/abi/abi_legacy_amd64.go | 2 +- internal/atm/abi/abi_regabi_amd64.go | 2 +- internal/atm/pgen/iasm_amd64.go | 2 +- internal/atm/pgen/pgen_abi_amd64.go | 2 +- internal/atm/pgen/pgen_amd64.go | 4 ++-- internal/atm/pgen/pgen_amd64_test.go | 2 +- internal/atm/pgen/pgen_gcwb_go116_120_amd64.go | 2 +- internal/atm/pgen/pgen_gcwb_go121_121_amd64.go | 2 +- internal/atm/pgen/pgen_legacy_amd64.go | 2 +- internal/atm/pgen/pgen_regabi_amd64.go | 2 +- internal/atm/rtx/clobber_amd64.go | 2 +- internal/atm/rtx/memzero_amd64.go | 2 +- internal/atm/ssa/ir_amd64.go | 2 +- internal/atm/ssa/pass_abispec_amd64.go | 2 +- internal/loader/loader_amd64_test.go | 2 +- tests/go.sum | 4 ++-- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fuzz/go.sum b/fuzz/go.sum index 373c390..3084f15 100644 --- a/fuzz/go.sum +++ b/fuzz/go.sum @@ -416,8 +416,6 @@ github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= -github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/choleraehyq/pid v0.0.15/go.mod h1:uhzeFgxJZWQsZulelVQZwdASxQ9TIPZYL4TPkQMtL/U= github.com/choleraehyq/pid v0.0.18 h1:O7LLxPoOyt3YtonlCC8BmNrF9P6Hc8B509UOqlPSVhw= github.com/choleraehyq/pid v0.0.18/go.mod h1:uhzeFgxJZWQsZulelVQZwdASxQ9TIPZYL4TPkQMtL/U= @@ -429,6 +427,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudwego/fastpb v0.0.3/go.mod h1:/V13XFTq2TUkxj2qWReV8MwfPC4NnPcy6FsrojnsSG0= +github.com/cloudwego/iasm v0.0.9 h1:DgNtfPjuz3YAQ0hmmiGg6DkDGj+foARFSwu7vKFPT1o= +github.com/cloudwego/iasm v0.0.9/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cloudwego/kitex v0.4.4 h1:/oInvgh0Nz8OpzXBrXkD3qVBkiQmCCdCVLdIpktj6q0= github.com/cloudwego/kitex v0.4.4/go.mod h1:3FcH5h9Qw+dhRljSzuGSpWuThttA8DvK0BsL7HUYydo= github.com/cloudwego/netpoll v0.3.1 h1:xByoORmCLIyKZ8gS+da06WDo3j+jvmhaqS2KeKejtBk= diff --git a/go.mod b/go.mod index 5faa217..0f51ca3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/cloudwego/frugal go 1.16 require ( - github.com/chenzhuoyu/iasm v0.9.1 + github.com/cloudwego/iasm v0.0.9 github.com/davecgh/go-spew v1.1.1 github.com/klauspost/cpuid/v2 v2.2.4 github.com/oleiade/lane v1.0.1 diff --git a/go.sum b/go.sum index ff6d20f..8fd2336 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= -github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= +github.com/cloudwego/iasm v0.0.9 h1:DgNtfPjuz3YAQ0hmmiGg6DkDGj+foARFSwu7vKFPT1o= +github.com/cloudwego/iasm v0.0.9/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/internal/atm/abi/abi_amd64.go b/internal/atm/abi/abi_amd64.go index a6a860c..86101be 100644 --- a/internal/atm/abi/abi_amd64.go +++ b/internal/atm/abi/abi_amd64.go @@ -24,7 +24,7 @@ import ( `sync` `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/rt` ) diff --git a/internal/atm/abi/abi_legacy_amd64.go b/internal/atm/abi/abi_legacy_amd64.go index a9d34ef..7651642 100644 --- a/internal/atm/abi/abi_legacy_amd64.go +++ b/internal/atm/abi/abi_legacy_amd64.go @@ -21,7 +21,7 @@ package abi import ( `reflect` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` ) func salloc(p []Parameter, sp uintptr, vt reflect.Type) (uintptr, []Parameter) { diff --git a/internal/atm/abi/abi_regabi_amd64.go b/internal/atm/abi/abi_regabi_amd64.go index 10db994..2ccf5a8 100644 --- a/internal/atm/abi/abi_regabi_amd64.go +++ b/internal/atm/abi/abi_regabi_amd64.go @@ -27,7 +27,7 @@ package abi import ( `reflect` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` ) var regOrder = [...]x86_64.Register64 { diff --git a/internal/atm/pgen/iasm_amd64.go b/internal/atm/pgen/iasm_amd64.go index 3c237e4..bf19e48 100644 --- a/internal/atm/pgen/iasm_amd64.go +++ b/internal/atm/pgen/iasm_amd64.go @@ -19,7 +19,7 @@ package pgen import ( `math` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` ) const ( diff --git a/internal/atm/pgen/pgen_abi_amd64.go b/internal/atm/pgen/pgen_abi_amd64.go index f4d1459..9eedd81 100644 --- a/internal/atm/pgen/pgen_abi_amd64.go +++ b/internal/atm/pgen/pgen_abi_amd64.go @@ -21,7 +21,7 @@ import ( `math` `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/abi` `github.com/cloudwego/frugal/internal/atm/hir` `github.com/cloudwego/frugal/internal/atm/rtx` diff --git a/internal/atm/pgen/pgen_amd64.go b/internal/atm/pgen/pgen_amd64.go index f1b9ce9..b91a45e 100644 --- a/internal/atm/pgen/pgen_amd64.go +++ b/internal/atm/pgen/pgen_amd64.go @@ -24,8 +24,8 @@ import ( `sort` `sync/atomic` - `github.com/chenzhuoyu/iasm/expr` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/expr` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/abi` `github.com/cloudwego/frugal/internal/atm/hir` `github.com/cloudwego/frugal/internal/rt` diff --git a/internal/atm/pgen/pgen_amd64_test.go b/internal/atm/pgen/pgen_amd64_test.go index 0cdbf70..9f132bf 100644 --- a/internal/atm/pgen/pgen_amd64_test.go +++ b/internal/atm/pgen/pgen_amd64_test.go @@ -23,7 +23,7 @@ import ( `testing` `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/hir` `github.com/cloudwego/frugal/internal/atm/rtx` `github.com/cloudwego/frugal/internal/loader` diff --git a/internal/atm/pgen/pgen_gcwb_go116_120_amd64.go b/internal/atm/pgen/pgen_gcwb_go116_120_amd64.go index 61d27bd..3a10afd 100644 --- a/internal/atm/pgen/pgen_gcwb_go116_120_amd64.go +++ b/internal/atm/pgen/pgen_gcwb_go116_120_amd64.go @@ -20,7 +20,7 @@ package pgen import ( - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/hir` `github.com/cloudwego/frugal/internal/atm/rtx` ) diff --git a/internal/atm/pgen/pgen_gcwb_go121_121_amd64.go b/internal/atm/pgen/pgen_gcwb_go121_121_amd64.go index af5551c..6c17888 100644 --- a/internal/atm/pgen/pgen_gcwb_go121_121_amd64.go +++ b/internal/atm/pgen/pgen_gcwb_go121_121_amd64.go @@ -20,7 +20,7 @@ package pgen import ( - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/abi` `github.com/cloudwego/frugal/internal/atm/hir` diff --git a/internal/atm/pgen/pgen_legacy_amd64.go b/internal/atm/pgen/pgen_legacy_amd64.go index 8626b2a..21025fb 100644 --- a/internal/atm/pgen/pgen_legacy_amd64.go +++ b/internal/atm/pgen/pgen_legacy_amd64.go @@ -21,7 +21,7 @@ package pgen import ( `runtime` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/hir` `github.com/cloudwego/frugal/internal/atm/rtx` ) diff --git a/internal/atm/pgen/pgen_regabi_amd64.go b/internal/atm/pgen/pgen_regabi_amd64.go index a5fd0bb..04a8de2 100644 --- a/internal/atm/pgen/pgen_regabi_amd64.go +++ b/internal/atm/pgen/pgen_regabi_amd64.go @@ -19,7 +19,7 @@ package pgen import ( - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/hir` `github.com/cloudwego/frugal/internal/atm/rtx` ) diff --git a/internal/atm/rtx/clobber_amd64.go b/internal/atm/rtx/clobber_amd64.go index fd3d7d2..c5c7af2 100644 --- a/internal/atm/rtx/clobber_amd64.go +++ b/internal/atm/rtx/clobber_amd64.go @@ -19,7 +19,7 @@ package rtx import ( `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/rt` `github.com/oleiade/lane` `golang.org/x/arch/x86/x86asm` diff --git a/internal/atm/rtx/memzero_amd64.go b/internal/atm/rtx/memzero_amd64.go index d29cb58..9d951a1 100644 --- a/internal/atm/rtx/memzero_amd64.go +++ b/internal/atm/rtx/memzero_amd64.go @@ -20,7 +20,7 @@ import ( `fmt` `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/loader` `github.com/cloudwego/frugal/internal/rt` ) diff --git a/internal/atm/ssa/ir_amd64.go b/internal/atm/ssa/ir_amd64.go index 6b83b02..717a091 100644 --- a/internal/atm/ssa/ir_amd64.go +++ b/internal/atm/ssa/ir_amd64.go @@ -20,7 +20,7 @@ import ( `fmt` `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/rt` ) diff --git a/internal/atm/ssa/pass_abispec_amd64.go b/internal/atm/ssa/pass_abispec_amd64.go index aa5f5bb..17281f3 100644 --- a/internal/atm/ssa/pass_abispec_amd64.go +++ b/internal/atm/ssa/pass_abispec_amd64.go @@ -17,7 +17,7 @@ package ssa import ( - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/atm/abi` `github.com/cloudwego/frugal/internal/rt` ) diff --git a/internal/loader/loader_amd64_test.go b/internal/loader/loader_amd64_test.go index f2cf9dc..b1101ca 100644 --- a/internal/loader/loader_amd64_test.go +++ b/internal/loader/loader_amd64_test.go @@ -23,7 +23,7 @@ import ( `testing` `unsafe` - `github.com/chenzhuoyu/iasm/x86_64` + `github.com/cloudwego/iasm/x86_64` `github.com/cloudwego/frugal/internal/rt` `github.com/stretchr/testify/assert` `github.com/stretchr/testify/require` diff --git a/tests/go.sum b/tests/go.sum index 7b84e39..7809c04 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -21,8 +21,6 @@ github.com/bytedance/gopkg v0.0.0-20220413063733-65bf48ffb3a7/go.mod h1:2ZlV9BaU github.com/bytedance/gopkg v0.0.0-20220531084716-665b4f21126f h1:2YCF3cgO6XCub0HIsLrA8ZGhmAPGZfOeSaGjT6Kx4Mc= github.com/bytedance/gopkg v0.0.0-20220531084716-665b4f21126f/go.mod h1:2ZlV9BaUH4+NXIBF0aMdKKAnHTzqH+iMU4KUjAbL23Q= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0= -github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/choleraehyq/pid v0.0.16/go.mod h1:uhzeFgxJZWQsZulelVQZwdASxQ9TIPZYL4TPkQMtL/U= github.com/choleraehyq/pid v0.0.18 h1:O7LLxPoOyt3YtonlCC8BmNrF9P6Hc8B509UOqlPSVhw= github.com/choleraehyq/pid v0.0.18/go.mod h1:uhzeFgxJZWQsZulelVQZwdASxQ9TIPZYL4TPkQMtL/U= @@ -31,6 +29,8 @@ github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86c github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudwego/fastpb v0.0.4-0.20230131074846-6fc453d58b96/go.mod h1:/V13XFTq2TUkxj2qWReV8MwfPC4NnPcy6FsrojnsSG0= +github.com/cloudwego/iasm v0.0.9 h1:DgNtfPjuz3YAQ0hmmiGg6DkDGj+foARFSwu7vKFPT1o= +github.com/cloudwego/iasm v0.0.9/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cloudwego/kitex v0.4.5-0.20230213035731-7054d09a7d3a h1:0n7V9Z40GX/Q8YD+/W6jhAn/ztBzTO8g+FK8aS8S8+4= github.com/cloudwego/kitex v0.4.5-0.20230213035731-7054d09a7d3a/go.mod h1:xoF8JsMrwPgSYqjabywDbBDSsUZngl8xESHAAdLovZA= github.com/cloudwego/netpoll v0.3.1 h1:xByoORmCLIyKZ8gS+da06WDo3j+jvmhaqS2KeKejtBk=