summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2019-01-11 06:34:00 +0000
committerRobert Mustacchi <rm@joyent.com>2019-01-15 19:00:21 +0000
commit161294fe5eab242f42189b33b59ebbe6ac9558f4 (patch)
treeaf18b80f8d4344ed989d97c88ab021f9aa9ba037
parentc653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff)
downloadillumos-joyent-161294fe5eab242f42189b33b59ebbe6ac9558f4.tar.gz
10217 mdb: r9w isn't r8w
10218 CONV_CAP_VAL_HW2_BUFSIZE wasn't updated 10219 AV_386_2_AVX512VPOPCDQ elfcap name should be consistent Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Rob Johnston <rob.johnston@joyent.com> Reviewed by: Patrick Mooney <patrick.mooney@joyent.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c8
-rw-r--r--usr/src/cmd/sgs/include/conv.h3
-rw-r--r--usr/src/common/elfcap/elfcap.c6
3 files changed, 9 insertions, 8 deletions
diff --git a/usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c b/usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c
index c11e08ba0d..d86c1b79f8 100644
--- a/usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c
+++ b/usr/src/cmd/mdb/intel/mdb/proc_amd64dep.c
@@ -24,7 +24,7 @@
* Use is subject to license terms.
*/
/*
- * Copyright 2015 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
*/
/*
@@ -74,9 +74,9 @@ const mdb_tgt_regdesc_t pt_regdesc[] = {
{ "r10w", REG_R10, MDB_TGT_R_EXPORT | MDB_TGT_R_16 },
{ "r10l", REG_R10, MDB_TGT_R_EXPORT | MDB_TGT_R_8L },
{ "r9", REG_R9, MDB_TGT_R_EXPORT },
- { "r9d", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_32 },
- { "r9w", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_16 },
- { "r9l", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_8L },
+ { "r9d", REG_R9, MDB_TGT_R_EXPORT | MDB_TGT_R_32 },
+ { "r9w", REG_R9, MDB_TGT_R_EXPORT | MDB_TGT_R_16 },
+ { "r9l", REG_R9, MDB_TGT_R_EXPORT | MDB_TGT_R_8L },
{ "r8", REG_R8, MDB_TGT_R_EXPORT },
{ "r8d", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_32 },
{ "r8w", REG_R8, MDB_TGT_R_EXPORT | MDB_TGT_R_16 },
diff --git a/usr/src/cmd/sgs/include/conv.h b/usr/src/cmd/sgs/include/conv.h
index 547e0697cf..066e215bc4 100644
--- a/usr/src/cmd/sgs/include/conv.h
+++ b/usr/src/cmd/sgs/include/conv.h
@@ -25,6 +25,7 @@
*
* Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012 DEY Storage Systems, Inc. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
* Copyright 2016 RackTop Systems.
*/
@@ -170,7 +171,7 @@ typedef union {
char buf[CONV_CAP_VAL_HW1_BUFSIZE];
} Conv_cap_val_hw1_buf_t;
-#define CONV_CAP_VAL_HW2_BUFSIZE CONV_INV_BUFSIZE /* for now */
+#define CONV_CAP_VAL_HW2_BUFSIZE 350
typedef union {
Conv_inv_buf_t inv_buf;
char buf[CONV_CAP_VAL_HW2_BUFSIZE];
diff --git a/usr/src/common/elfcap/elfcap.c b/usr/src/common/elfcap/elfcap.c
index e905e256ed..54aca25364 100644
--- a/usr/src/common/elfcap/elfcap.c
+++ b/usr/src/common/elfcap/elfcap.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
*/
/* LINTLIBRARY */
@@ -377,8 +377,8 @@ static const elfcap_desc_t hw2_386[ELFCAP_NUM_HW2_386] = {
STRDESC("AVX512VBMI"), STRDESC("avx512vbmi"),
},
{ /* 0x00020000 */
- AV_386_2_AVX512VPOPCDQ, STRDESC("AV_386_2_AVX512VPOPCDQ"),
- STRDESC("AVX512VPOPCDQ"), STRDESC("avx512_vpopcntdq"),
+ AV_386_2_AVX512VPOPCDQ, STRDESC("AV_386_2_AVX512_VPOPCDQ"),
+ STRDESC("AVX512_VPOPCDQ"), STRDESC("avx512_vpopcntdq"),
},
{ /* 0x00040000 */
AV_386_2_AVX512_4NNIW, STRDESC("AV_386_2_AVX512_4NNIW"),