[Xorg-commit] xc/extras/x86emu/src/x86emu ops2.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/x86emu/src/x86emu
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/x86emu/src/x86emu

Modified Files:
      Tag: XORG-CURRENT
	ops2.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: ops2.c
===================================================================
RCS file: /cvs/xorg/xc/extras/x86emu/src/x86emu/ops2.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ops2.c	26 Nov 2003 22:48:29 -0000	1.1.4.1
+++ b/ops2.c	23 Feb 2004 21:33:29 -0000	1.1.4.2
@@ -37,7 +37,7 @@
 *               instructions.
 *
 ****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.6 2003/10/22 20:03:06 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.7 2004/02/06 17:15:28 tsi Exp $ */
 
 #include "x86emu/x86emui.h"
 
@@ -1746,16 +1746,16 @@
     START_OF_INSTR();
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch (rh) {
-    case 3:
+    case 4:
 	DECODE_PRINTF("BT\t");
 	break;
-    case 4:
+    case 5:
 	DECODE_PRINTF("BTS\t");
 	break;
-    case 5:
+    case 6:
 	DECODE_PRINTF("BTR\t");
 	break;
-    case 6:
+    case 7:
 	DECODE_PRINTF("BTC\t");
 	break;
     default:
@@ -1780,13 +1780,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		store_data_long(srcoffset, srcval | mask);
 		break;
-	    case 5:
+	    case 6:
 		store_data_long(srcoffset, srcval & ~mask);
 		break;
-	    case 6:
+	    case 7:
 		store_data_long(srcoffset, srcval ^ mask);
 		break;
 	    default:
@@ -1805,13 +1805,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		store_data_word(srcoffset, srcval | mask);
 		break;
-	    case 5:
+	    case 6:
 		store_data_word(srcoffset, srcval & ~mask);
 		break;
-	    case 6:
+	    case 7:
 		store_data_word(srcoffset, srcval ^ mask);
 		break;
 	    default:
@@ -1833,13 +1833,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		store_data_long(srcoffset, srcval | mask);
 		break;
-	    case 5:
+	    case 6:
 		store_data_long(srcoffset, srcval & ~mask);
 		break;
-	    case 6:
+	    case 7:
 		store_data_long(srcoffset, srcval ^ mask);
 		break;
 	    default:
@@ -1858,13 +1858,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		store_data_word(srcoffset, srcval | mask);
 		break;
-	    case 5:
+	    case 6:
 		store_data_word(srcoffset, srcval & ~mask);
 		break;
-	    case 6:
+	    case 7:
 		store_data_word(srcoffset, srcval ^ mask);
 		break;
 	    default:
@@ -1886,13 +1886,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		store_data_long(srcoffset, srcval | mask);
 		break;
-	    case 5:
+	    case 6:
 		store_data_long(srcoffset, srcval & ~mask);
 		break;
-	    case 6:
+	    case 7:
 		store_data_long(srcoffset, srcval ^ mask);
 		break;
 	    default:
@@ -1911,13 +1911,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(srcval & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		store_data_word(srcoffset, srcval | mask);
 		break;
-	    case 5:
+	    case 6:
 		store_data_word(srcoffset, srcval & ~mask);
 		break;
-	    case 6:
+	    case 7:
 		store_data_word(srcoffset, srcval ^ mask);
 		break;
 	    default:
@@ -1939,13 +1939,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		*srcreg |= mask;
 		break;
-	    case 5:
+	    case 6:
 		*srcreg &= ~mask;
 		break;
-	    case 6:
+	    case 7:
 		*srcreg ^= mask;
 		break;
 	    default:
@@ -1964,13 +1964,13 @@
 	    mask = (0x1 << bit);
             CONDITIONAL_SET_FLAG(*srcreg & mask,F_CF);
 	    switch (rh) {
-	    case 4:
+	    case 5:
 		*srcreg |= mask;
 		break;
-	    case 5:
+	    case 6:
 		*srcreg &= ~mask;
 		break;
-	    case 6:
+	    case 7:
 		*srcreg ^= mask;
 		break;
 	    default: