diff options
| author | Russ Cox <rsc@golang.org> | 2015-08-18 09:58:24 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-08-18 17:00:59 +0000 |
| commit | 6f0c7df8ed3fe540c3c1030b11dc15837b97512f (patch) | |
| tree | d255c6fe8800cb44847822c4b24ea21b592c655c | |
| parent | 5acde2d5aa2296bc505fb5cffa26a73a5e53716b (diff) | |
| download | go-6f0c7df8ed3fe540c3c1030b11dc15837b97512f.tar.gz go-6f0c7df8ed3fe540c3c1030b11dc15837b97512f.zip | |
cmd/vet: power64 is now ppc64
This was missed when we did the rename months ago
because cmd/vet did not live in the main tree.
Now vet's asmdecl checks will apply to ppc64 assembly too.
Change-Id: I687cba89fef702f29dd118de76a7ca1041c414f6
Reviewed-on: https://go-review.googlesource.com/13677
Reviewed-by: Andrew Gerrand <adg@golang.org>
| -rw-r--r-- | src/cmd/vet/asmdecl.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/cmd/vet/asmdecl.go b/src/cmd/vet/asmdecl.go index 6bdfdbf3be..e4a9871a21 100644 --- a/src/cmd/vet/asmdecl.go +++ b/src/cmd/vet/asmdecl.go @@ -58,13 +58,13 @@ type asmVar struct { } var ( - asmArch386 = asmArch{"386", 4, 4, 4, false, "SP", false} - asmArchArm = asmArch{"arm", 4, 4, 4, false, "R13", true} - asmArchArm64 = asmArch{"arm64", 8, 8, 8, false, "RSP", true} - asmArchAmd64 = asmArch{"amd64", 8, 8, 8, false, "SP", false} - asmArchAmd64p32 = asmArch{"amd64p32", 4, 4, 8, false, "SP", false} - asmArchPower64 = asmArch{"power64", 8, 8, 8, true, "R1", true} - asmArchPower64LE = asmArch{"power64le", 8, 8, 8, false, "R1", true} + asmArch386 = asmArch{"386", 4, 4, 4, false, "SP", false} + asmArchArm = asmArch{"arm", 4, 4, 4, false, "R13", true} + asmArchArm64 = asmArch{"arm64", 8, 8, 8, false, "RSP", true} + asmArchAmd64 = asmArch{"amd64", 8, 8, 8, false, "SP", false} + asmArchAmd64p32 = asmArch{"amd64p32", 4, 4, 8, false, "SP", false} + asmArchPpc64 = asmArch{"ppc64", 8, 8, 8, true, "R1", true} + asmArchPpc64LE = asmArch{"ppc64le", 8, 8, 8, false, "R1", true} arches = []*asmArch{ &asmArch386, @@ -72,8 +72,8 @@ var ( &asmArchArm64, &asmArchAmd64, &asmArchAmd64p32, - &asmArchPower64, - &asmArchPower64LE, + &asmArchPpc64, + &asmArchPpc64LE, } ) @@ -86,7 +86,7 @@ var ( asmUnnamedFP = re(`[^+\-0-9](([0-9]+)\(FP\))`) asmSP = re(`[^+\-0-9](([0-9]+)\(([A-Z0-9]+)\))`) asmOpcode = re(`^\s*(?:[A-Z0-9a-z_]+:)?\s*([A-Z]+)\s*([^,]*)(?:,\s*(.*))?`) - power64Suff = re(`([BHWD])(ZU|Z|U|BR)?$`) + ppc64Suff = re(`([BHWD])(ZU|Z|U|BR)?$`) ) func asmCheck(pkg *Package) { @@ -589,9 +589,9 @@ func asmCheckVar(badf func(string, ...interface{}), fn *asmFunc, line, expr stri case 'D', 'Q': src = 8 } - case "power64", "power64le": + case "ppc64", "ppc64le": // Strip standard suffixes to reveal size letter. - m := power64Suff.FindStringSubmatch(op) + m := ppc64Suff.FindStringSubmatch(op) if m != nil { switch m[1][0] { case 'B': |