Changeset 5205 in vbox

Timestamp:

Oct 9, 2007 2:07:16 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

25132

Message:

Process indirect calls to catch cpuid instructions in OpenSuse 10.3

File:

• trunk/src/VBox/VMM/PATM/CSAM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -1191 +1191 @@
 
         // For our first attempt, we'll handle only simple relative jumps and calls (immediate offset coded in instruction)
-        if ((cpu.pCurInstr->optype & OPTYPE_CONTROLFLOW) && (OP_PARM_VTYPE(cpu.pCurInstr->param1) == OP_PARM_J))
-        {
-            addr = CSAMResolveBranch(&cpu, pCurInstrGC);
+        if (    ((cpu.pCurInstr->optype & OPTYPE_CONTROLFLOW) && (OP_PARM_VTYPE(cpu.pCurInstr->param1) == OP_PARM_J))
+            ||  (cpu.pCurInstr->opcode == OP_CALL && cpu.param1.flags == USE_DISPLACEMENT32))  /* simple indirect call (call dword ptr [address]) */
+        {
+            /* We need to parse 'call dword ptr [address]' type of calls to catch cpuid instructions in some recent Linux distributions (e.g. OpenSuse 10.3) */
+            if (    cpu.pCurInstr->opcode == OP_CALL 
+                &&  cpu.param1.flags == USE_DISPLACEMENT32)
+            {
+                addr = 0;
+                PGMPhysReadGCPtr(pVM, &addr, cpu.param1.disp32, sizeof(addr));
+            }
+            else
+                addr = CSAMResolveBranch(&cpu, pCurInstrGC);
+
             if (addr == 0)
             {