cmd/internal/obj/x86: rename POPCNT to POPCNTQ

Ilya added POPCNT in a CL earlier this month but it's really only POPCNTQ.
The other forms still need to be added.

For #4816.

Change-Id: I1186850d32ad6d5777475c7808e6fc9d9133e118
Reviewed-on: https://go-review.googlesource.com/18848
Reviewed-by: Rob Pike <r@golang.org>

diff --git a/src/cmd/internal/obj/x86/a.out.go b/src/cmd/internal/obj/x86/a.out.go
index b02c7495b8f1377ba375437e1c5e987cb1017c78..d2bc73ea8f894a8764029a74969d98dad1ee73cf 100644 (file)
--- a/src/cmd/internal/obj/x86/a.out.go
+++ b/src/cmd/internal/obj/x86/a.out.go
@@ -181,7 +181,9 @@ const (
        APAUSE
        APOPAL
        APOPAW
-       APOPCNT
+       APOPCNTW
+       APOPCNTL
+       APOPCNTQ
        APOPFL
        APOPFW
        APOPL

diff --git a/src/cmd/internal/obj/x86/anames.go b/src/cmd/internal/obj/x86/anames.go
index 392899cf5f38b4d9df9bd42fb818a7e8c913880e..15e720200660f518f9883c9382b433c3644e442b 100644 (file)
--- a/src/cmd/internal/obj/x86/anames.go
+++ b/src/cmd/internal/obj/x86/anames.go
@@ -149,7 +149,9 @@ var Anames = []string{
        "PAUSE",
        "POPAL",
        "POPAW",
-       "POPCNT",
+       "POPCNTW",
+       "POPCNTL",
+       "POPCNTQ",
        "POPFL",
        "POPFW",
        "POPL",

diff --git a/src/cmd/internal/obj/x86/asm6.go b/src/cmd/internal/obj/x86/asm6.go
index d5d52bb0556d47ae1fb458a6b51c81c2d18949bf..41386ef6e0f804f76e002f9f3b563ef251b90211 100644 (file)
--- a/src/cmd/internal/obj/x86/asm6.go
+++ b/src/cmd/internal/obj/x86/asm6.go
@@ -1208,7 +1208,7 @@ var optab =
        {APMULULQ, ymm, Py1, [23]uint8{0xf4, Pe, 0xf4}},
        {APOPAL, ynone, P32, [23]uint8{0x61}},
        {APOPAW, ynone, Pe, [23]uint8{0x61}},
-       {APOPCNT, yml_rl, Pfw, [23]uint8{0xb8}},
+       {APOPCNTQ, yml_rl, Pfw, [23]uint8{0xb8}},
        {APOPFL, ynone, P32, [23]uint8{0x9d}},
        {APOPFQ, ynone, Py, [23]uint8{0x9d}},
        {APOPFW, ynone, Pe, [23]uint8{0x9d}},