From c10141ffedbbb06f152943e14ad0a5f88d84b847 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 18 Apr 2011 04:48:37 +0000
Subject: [PATCH] Added the "fwait", "wait" and "wbinvd" instructions

---
 src/arch/i386.ins | 6 ++++++
 test/i386.S       | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/arch/i386.ins b/src/arch/i386.ins
index aa15eb3..5b49644 100644
--- a/src/arch/i386.ins
+++ b/src/arch/i386.ins
@@ -416,8 +416,14 @@
 /* FIXME implement */
 /* FNCLEX	0xdbe2		2					*/
 { "fnclex",	0xdbe2,		OP2F, AOT_NONE,   AOT_NONE,  AOT_NONE	},
+/* FWAIT	0x9b		1					*/
+{ "fwait",	0x9b,		OP1F, AOT_NONE,   AOT_NONE,  AOT_NONE	},
 /* NOP		0x90		1					*/
 { "nop",	0x90,		OP1F, AOT_NONE,   AOT_NONE,  AOT_NONE	},
+/* WAIT		0x9b		1					*/
+{ "wait",	0x9b,		OP1F, AOT_NONE,   AOT_NONE,  AOT_NONE	},
+/* WBINVD	0x0f09		2					*/
+{ "wbinvd",	0x0f09,		OP2F, AOT_NONE,   AOT_NONE,  AOT_NONE	},
 /* WRMSR	0x0f30		2					*/
 { "wrmsr",	0x0f30,		OP2F, AOT_NONE,   AOT_NONE,  AOT_NONE	},
 /* XADD		0x0fc0 /r	2     r/m8        r8			*/
diff --git a/test/i386.S b/test/i386.S
index 6c3dcf6..4d870c1 100644
--- a/test/i386.S
+++ b/test/i386.S
@@ -144,7 +144,10 @@
 	fchs
 	fclex
 	fnclex
+	fwait
 	nop					/* 90			*/
+	wait
+	wbinvd
 	wrmsr
 	/* XADD */
 	xadd	%eax, %ecx			/* 0f c1 c8		*/