[Bochs-cvs] CVS: bochs/disasm dis_decode.cc, 1.53, 1.54 dis_tables.h, 1.38, 1.39

[Stanislav S. <ssh...@us...>]

Update of /cvsroot/bochs/bochs/disasm
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21828

Modified Files:
	dis_decode.cc dis_tables.h 
Log Message:
disasm fix


Index: dis_decode.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/disasm/dis_decode.cc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- dis_decode.cc	31 Jan 2010 09:45:27 -0000	1.53
+++ dis_decode.cc	31 Jan 2010 10:17:42 -0000	1.54
@@ -225,15 +225,17 @@
          /* SSE opcode group with only prefix 0x66 allowed */
          sse_opcode = 1;
          if (sse_prefix != SSE_PREFIX_66)
-             entry = &(OPCODE_TABLE(entry)[sse_prefix]);
-         break;
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         attr = 0;
+         continue;
 
        case _GRPSSEF2:
          /* SSE opcode group with only prefix 0xF2 allowed */
          sse_opcode = 1;
          if (sse_prefix != SSE_PREFIX_F2)
-             entry = &(OPCODE_TABLE(entry)[sse_prefix]);
-         break;
+             entry = &(BxDisasmGroupSSE_ERR[sse_prefix]);
+         attr = 0;
+         continue;
 
        case _GRPSSE:
          sse_opcode = 1;

Index: dis_tables.h
===================================================================
RCS file: /cvsroot/bochs/bochs/disasm/dis_tables.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dis_tables.h	31 Jan 2010 09:45:27 -0000	1.38
+++ dis_tables.h	31 Jan 2010 10:17:42 -0000	1.39
@@ -36,8 +36,6 @@
 
 /* ************************************************************************ */
 #define GRPSSE(n)       _GRPSSE,   BxDisasmGroupSSE_##n
-#define GRPSSE66(n)     _GRPSSE66, BxDisasmGroupSSE_ERR
-#define GRPSSEF2(n)     _GRPSSEF2, BxDisasmGroupSSE_ERR
 #define GRPN(n)         _GROUPN,   BxDisasmGroup##n
 #define GRPRM(n)        _GRPRM,    BxDisasmGroupRm##n
 #define GRPMOD(n)       _SPLIT11B, BxDisasmGroupMod##n
@@ -47,6 +45,11 @@
 #define GR64BIT(n)      _GRP64B,   BxDisasmGrpOs64B_##n
 /* ************************************************************************ */
 
+/* ************************************************************************ */
+#define GRPSSE66(n)     _GRPSSE66, &n
+#define GRPSSEF2(n)     _GRPSSEF2, &n
+/* ************************************************************************ */
+
 #define Apw &disassembler::Apw
 #define Apd &disassembler::Apd