From 21f7f2fb113ee4f9cd011c3cc2d45d43bbdd35fa Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Wed, 15 Mar 2006 18:43:32 +0000 Subject: [PATCH] Enable correct handling of the BTS instruction (opcode 0f ab) The code was there but #ifdefed out. Insead of BTS, BT was executed. This patch enables the BTS function and hooks it up the the correct opcode. (ATI Technologies Inc.) --- ChangeLog | 9 +++++++++ hw/xfree86/x86emu/ops2.c | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44bb1c945..b9c1f6643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-03-15 Felix Kuehling + + * hw/xfree86/x86emu/ops2.c: (x86emuOp2_bts_R): + Enable correct handling of the BTS instruction (opcode 0f ab) + The code was there but #ifdefed out. Insead of BTS, BT was executed. + This patch enables the BTS function and hooks it up the the correct + opcode. + (ATI Technologies Inc.) + 2006-03-15 Felix Kuehling * GL/mesa/shader/slang/Makefile.am: diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c index d99bb412f..4bf95c182 100644 --- a/hw/xfree86/x86emu/ops2.c +++ b/hw/xfree86/x86emu/ops2.c @@ -699,10 +699,9 @@ static void x86emuOp2_pop_GS(u8 X86EMU_UNUSED(op2)) END_OF_INSTR(); } -#if 0 /**************************************************************************** REMARKS: -Handles opcode 0x0f,0xaa +Handles opcode 0x0f,0xab ****************************************************************************/ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2)) { @@ -838,7 +837,6 @@ static void x86emuOp2_bts_R(u8 X86EMU_UNUSED(op2)) DECODE_CLEAR_SEGOVR(); END_OF_INSTR(); } -#endif /**************************************************************************** REMARKS: @@ -2711,7 +2709,7 @@ void (*x86emu_optab2[256])(u8) = /* 0xa8 */ x86emuOp2_push_GS, /* 0xa9 */ x86emuOp2_pop_GS, /* 0xaa */ x86emuOp2_illegal_op, -/* 0xab */ x86emuOp2_bt_R, +/* 0xab */ x86emuOp2_bts_R, /* 0xac */ x86emuOp2_shrd_IMM, /* 0xad */ x86emuOp2_shrd_CL, /* 0xae */ x86emuOp2_illegal_op,