summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2017-03-05 01:02:48 +0000
committerguenther <guenther@openbsd.org>2017-03-05 01:02:48 +0000
commitc6fef8b829e8db34eb755ffd3d80c405abb94f40 (patch)
tree6b47f296751fb5a6358bc371ba128a9276318e86
parentHandle unshared amaps in uvm_coredump_walkmap() such that untouched pages (diff)
downloadwireguard-openbsd-c6fef8b829e8db34eb755ffd3d80c405abb94f40.tar.xz
wireguard-openbsd-c6fef8b829e8db34eb755ffd3d80c405abb94f40.zip
Teach the ddb disassembler about most of the vm* instructions
ok mlarkin@
-rw-r--r--sys/arch/amd64/amd64/db_disasm.c6
-rw-r--r--sys/arch/i386/i386/db_disasm.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/db_disasm.c b/sys/arch/amd64/amd64/db_disasm.c
index 83621f5521c..e11c89ff3ca 100644
--- a/sys/arch/amd64/amd64/db_disasm.c
+++ b/sys/arch/amd64/amd64/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.16 2016/04/03 17:46:26 guenther Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.17 2017/03/05 01:02:48 guenther Exp $ */
/* $NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $ */
/*
@@ -120,9 +120,9 @@ char * db_Grp6[] = {
};
struct inst db_Grp7[] = {
- { "sgdt", FALSE, NONE, op1(E), 0 },
+ { "sgdt", FALSE, NONE, op2(MEx,5), "\0vmcall\0vmlaunch\0vmresume\0vmxoff"},
{ "sidt", FALSE, NONE, op2(MEx,4), "monitor\0mwait\0clac\0stac"},
- { "lgdt", FALSE, NONE, op2(MEx,2), "xgetbv\0xsetbv" },
+ { "lgdt", FALSE, NONE, op2(MEx,7), "xgetbv\0xsetbv\0\0\0vmfunc\0xend\0xtest" },
{ "lidt", FALSE, NONE, op1(E), 0 },
{ "smsw", FALSE, NONE, op1(E), 0 },
{ "", FALSE, NONE, 0, 0 },
diff --git a/sys/arch/i386/i386/db_disasm.c b/sys/arch/i386/i386/db_disasm.c
index 029647241e7..e4fcdf24b5f 100644
--- a/sys/arch/i386/i386/db_disasm.c
+++ b/sys/arch/i386/i386/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.20 2015/06/24 20:50:39 miod Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.21 2017/03/05 01:02:48 guenther Exp $ */
/* $NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $ */
/*
@@ -121,9 +121,9 @@ char * db_Grp6[] = {
};
struct inst db_Grp7[] = {
- { "sgdt", FALSE, NONE, op1(E), 0 },
+ { "sgdt", FALSE, NONE, op2(MEx,5), "\0vmcall\0vmlaunch\0vmresume\0vmxoff"},
{ "sidt", FALSE, NONE, op2(MEx,4), "monitor\0mwait\0clac\0stac"},
- { "lgdt", FALSE, NONE, op2(MEx,2), "xgetbv\0xsetbv" },
+ { "lgdt", FALSE, NONE, op2(MEx,7), "xgetbv\0xsetbv\0\0\0vmfunc\0xend\0xtest" },
{ "lidt", FALSE, NONE, op1(E), 0 },
{ "smsw", FALSE, NONE, op1(E), 0 },
{ "", FALSE, NONE, 0, 0 },