From 5edb9c5c9ffc59c6d2940751ab11528b1c2dfb4b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 18 Apr 2011 06:31:45 +0000 Subject: [PATCH] The "cpuid" instruction was added in i486 --- src/arch/i386.ins | 2 -- src/arch/i486.ins | 2 ++ test/i386.S | 1 - test/i486.S | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/arch/i386.ins b/src/arch/i386.ins index 215af16..1ba9e75 100644 --- a/src/arch/i386.ins +++ b/src/arch/i386.ins @@ -320,8 +320,6 @@ /* FIXME implement */ /* CMP */ /* FIXME implement */ -/* CPUID 0x0fa2 2 */ -{ "cpuid", 0x0fa2, OP2F, AOT_NONE, AOT_NONE, AOT_NONE }, #if defined(ARCH_i386_real) /* CWD 0x99 1 */ { "cwd", 0x99, OP1F, AOT_NONE, AOT_NONE, AOT_NONE }, diff --git a/src/arch/i486.ins b/src/arch/i486.ins index 7c4c94c..3e78139 100644 --- a/src/arch/i486.ins +++ b/src/arch/i486.ins @@ -25,3 +25,5 @@ { "bswap", 0x0fcd, OP2F, OP_ebp, AOT_NONE, AOT_NONE }, { "bswap", 0x0fce, OP2F, OP_esi, AOT_NONE, AOT_NONE }, { "bswap", 0x0fcf, OP2F, OP_edi, AOT_NONE, AOT_NONE }, +/* CPUID 0x0fa2 2 */ +{ "cpuid", 0x0fa2, OP2F, AOT_NONE, AOT_NONE, AOT_NONE }, diff --git a/test/i386.S b/test/i386.S index f47b4ee..69262be 100644 --- a/test/i386.S +++ b/test/i386.S @@ -80,7 +80,6 @@ cli /* fa */ clts /* 0f 06 */ cmc /* f5 */ - cpuid /* 0f a2 */ cdq /* 99 */ daa /* 27 */ das /* 2f */ diff --git a/test/i486.S b/test/i486.S index 0d3eb00..ba641c1 100644 --- a/test/i486.S +++ b/test/i486.S @@ -9,3 +9,4 @@ bswap %ebp bswap %esi bswap %edi + cpuid /* 0f a2 */