Changeset 36812 in vbox

Timestamp:

Apr 22, 2011 12:31:21 PM (14 years ago)

Author:

vboxsync

Message:

IEM: hlt

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (4 diffs)
• IEMAllInstructions.cpp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -45 +45 @@
 *   Header Files                                                               *
 *******************************************************************************/
-//#define RT_STRICT
+#define RT_STRICT
+#define LOG_ENABLED
 #define LOG_GROUP   LOG_GROUP_EM /** @todo add log group */
 #include <VBox/vmm/iem.h>
@@ -191 +192 @@
 /** Temporary hack to disable the double execution.  Will be removed in favor
  * of a dedicated execution mode in EM. */
-//#define IEM_VERIFICATION_MODE_NO_REM
+#define IEM_VERIFICATION_MODE_NO_REM
 
 /** Used to shut up GCC warnings about variables that 'may be used uninitialized'
@@ -5407 +5408 @@
     EMSetInhibitInterruptsPC(IEMCPU_TO_VMCPU(pIemCpu), pCtx->rip);
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Implements 'HLT'.
+ */
+IEM_CIMPL_DEF_0(iemCImpl_hlt)
+{
+    if (pIemCpu->uCpl != 0)
+        return iemRaiseGeneralProtectionFault0(pIemCpu);
+    iemRegAddToRip(pIemCpu, cbInstr);
+    return VINF_EM_HALT;
 }
 
@@ -6756 +6769 @@
     iemExecVerificationModeSetup(pIemCpu);
 #endif
-#ifdef DEBUG
+#ifdef LOG_ENABLED
     PCPUMCTX pCtx = pIemCpu->CTX_SUFF(pCtx);
     char     szInstr[256];

trunk/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h

@@ -7385 +7385 @@
 
 /** Opcode 0xf4. */
-FNIEMOP_STUB(iemOp_hlt);
+FNIEMOP_DEF(iemOp_hlt)
+{
+    IEMOP_HLP_NO_LOCK_PREFIX();
+    return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_hlt);
+}
+
+
 /** Opcode 0xf5. */
 FNIEMOP_STUB(iemOp_cmc);