mirror of
https://github.com/golang/go
synced 2024-10-14 11:53:56 +00:00
cmd/vendor/golang.org/x/arch: revendor at commit 98fd8d9
Pick up CL 85476 to fix #23237. Updates #23237. Change-Id: I31a48ef39ce90bc1424334762452281ae706d273 Reviewed-on: https://go-review.googlesource.com/85495 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
parent
46c5856f6d
commit
acce8268b6
8
src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdumpext_test.go
generated
vendored
8
src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdumpext_test.go
generated
vendored
|
@ -172,6 +172,7 @@ func objdump(ext *ExtDis) error {
|
|||
var (
|
||||
undefined = []byte("undefined")
|
||||
unpredictable = []byte("unpredictable")
|
||||
slashslash = []byte("//")
|
||||
)
|
||||
|
||||
func parseLine(line []byte, encstart []byte) (addr uint64, enc []byte, text string) {
|
||||
|
@ -204,9 +205,16 @@ func parseLine(line []byte, encstart []byte) (addr uint64, enc []byte, text stri
|
|||
text = "unpredictable"
|
||||
return
|
||||
}
|
||||
// Strip trailing comment starting with ';'
|
||||
// e.g: "csinv x23, x2, x19, cc ; xxx"
|
||||
if i := bytes.IndexByte(line, ';'); i >= 0 {
|
||||
line = bytes.TrimSpace(line[:i])
|
||||
}
|
||||
// Strip trailing comment starting with "//"
|
||||
// e.g: "fccmpe s2, s9, #0x7, ne // xxx"
|
||||
if i := bytes.Index(line, slashslash); i >= 0 {
|
||||
line = bytes.TrimSpace(line[:i])
|
||||
}
|
||||
text = string(fixSpace(line))
|
||||
return
|
||||
}
|
||||
|
|
18
src/cmd/vendor/vendor.json
vendored
18
src/cmd/vendor/vendor.json
vendored
|
@ -15,20 +15,26 @@
|
|||
{
|
||||
"canonical": "golang.org/x/arch/x86/x86asm",
|
||||
"local": "golang.org/x/arch/x86/x86asm",
|
||||
"revision": "58ea1a195b1a354bcd572b7ef6bbbd264dc63732",
|
||||
"revisionTime": "2017-02-16T08:17:04Z"
|
||||
"revision": "98fd8d9907002617e6000a77c0740a72947ca1c2"
|
||||
"revisionTime": "2017-12-26T02:13:20Z"
|
||||
},
|
||||
{
|
||||
"canonical": "golang.org/x/arch/arm/armasm",
|
||||
"local": "golang.org/x/arch/arm/armasm",
|
||||
"revision": "ad6a463afcf9bd5b38c81fa9ba612dae11859d40",
|
||||
"revisionTime": "2015-08-28T15:42:14Z"
|
||||
"revision": "98fd8d9907002617e6000a77c0740a72947ca1c2"
|
||||
"revisionTime": "2017-12-26T02:13:20Z"
|
||||
},
|
||||
{
|
||||
"canonical": "golang.org/x/arch/ppc64/ppc64asm",
|
||||
"local": "golang.org/x/arch/ppc64/ppc64asm",
|
||||
"revision": "4831b0a617f7a819d4bf3c877d8e827d0283542c",
|
||||
"revisionTime": "2016-10-12T18:28:04Z"
|
||||
"revision": "98fd8d9907002617e6000a77c0740a72947ca1c2"
|
||||
"revisionTime": "2017-12-26T02:13:20Z"
|
||||
},
|
||||
{
|
||||
"canonical": "golang.org/x/arch/arm64/arm6464asm",
|
||||
"local": "golang.org/x/arch/arm64/arm64asm",
|
||||
"revision": "98fd8d9907002617e6000a77c0740a72947ca1c2"
|
||||
"revisionTime": "2017-12-26T02:13:20Z"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue