Changeset 19287 in vbox for trunk

Timestamp:

May 1, 2009 1:07:51 PM (16 years ago)

Author:

vboxsync

Message:

VBox/cdefs.h,REM,CFGM: VMMRZDECL + some cleanup.

Location:

trunk

Files:

• include/VBox/cdefs.h (modified) (3 diffs)
• src/VBox/VMM/CFGM.cpp (modified) (1 diff)
• src/recompiler/target-i386/helper.c (modified) (1 diff)
• src/recompiler_new/target-i386/op_helper.c (modified) (1 diff)

trunk/include/VBox/cdefs.h

@@ -277 +277 @@
  */
 /** @def VMMRCDECL
- * Guest context VMM export or import declaration.
+ * Raw-mode context VMM export or import declaration.
  * @param   type    The return type of the function declaration.
  */
@@ -286 +286 @@
 #endif
 
+/** @def VMMRZDECL
+ * Ring-0 and Raw-mode context VMM export or import declaration.
+ * @param   type    The return type of the function declaration.
+ */
+#if defined(IN_VMM_R0) || defined(IN_VMM_RC)
+# define VMMRZDECL(type)    DECLEXPORT(type) VBOXCALL
+#else
+# define VMMRZDECL(type)    DECLIMPORT(type) VBOXCALL
+#endif
+
 /** @def VMMDECL
  * VMM export or import declaration.
@@ -312 +322 @@
 
 
-
-/** @def NOT_DMIK(expr)
- * Turns the given expression into NOOP when DEBUG_dmik is defined. Evaluates
- * the expression normally otherwise.
- * @param expr  Expression to guard.
- */
-#if defined(DEBUG_dmik)
-# define NOT_DMIK(expr)     do { } while (0)
-#else
-# define NOT_DMIK(expr)     expr
-#endif
-
-
-#endif
-
+#endif
+

trunk/src/VBox/VMM/CFGM.cpp

@@ -141 +141 @@
     }
     else
-        NOT_DMIK(AssertMsgFailed(("Constructor failed with rc=%Rrc pfnCFGMConstructor=%p\n", rc, pfnCFGMConstructor)));
+        AssertMsgFailed(("Constructor failed with rc=%Rrc pfnCFGMConstructor=%p\n", rc, pfnCFGMConstructor));
 
     return rc;

trunk/src/recompiler/target-i386/helper.c

@@ -1410 +1410 @@
 {
 #if defined(VBOX) && defined(DEBUG)
-    NOT_DMIK(Log2(("raise_interrupt: %x %x %x %RGv\n", intno, is_int, error_code, env->eip + next_eip_addend)));
+    Log2(("raise_interrupt: %x %x %x %RGv\n", intno, is_int, error_code, env->eip + next_eip_addend));
 #endif
     env->exception_index = intno;

trunk/src/recompiler_new/target-i386/op_helper.c

@@ -1679 +1679 @@
 {
 #if defined(VBOX) && defined(DEBUG)
-    NOT_DMIK(Log2(("raise_interrupt: %x %x %x %RGv\n", intno, is_int, error_code, env->eip + next_eip_addend)));
+    Log2(("raise_interrupt: %x %x %x %RGv\n", intno, is_int, error_code, env->eip + next_eip_addend));
 #endif
     if (!is_int) {