Changeset 57334 in vbox

Timestamp:

Aug 13, 2015 4:21:10 PM (9 years ago)

Author:

vboxsync

Message:

next try

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• doc/manual/user_ChangeLogImpl.xml (modified) (1 diff)
• src/VBox/VMM/VMMR3/PGMDbg.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -6253 +6253 @@
         $(MAKE) VBOX_QUICK=1
 
+

trunk/doc/manual/user_ChangeLogImpl.xml

@@ -2943 +2943 @@
 
 </chapter>
-

trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp

@@ -103 +103 @@
  * @param   cbNeedle        Size of what we're searching for.
  */
-typedef DECLCALLBACK(uint8_t const *) FNPGMR3DBGFIXEDMEMSCAN(void const *pvHaystack, uint32_t cbHaystack,
-                                                             void const *pvNeedle, size_t cbNeedle);
+
+#if defined(_MSC_VER) || defined(RT_OS_OS2)
+# define DECLASMCALLBACK(type)          type __cdecl
+#elif defined(__GNUC__) && defined(RT_ARCH_X86)
+# define DECLASMCALLBACK(type)          type __attribute__((cdecl,regparm(0)))
+#else
+# define DECLASMCALLBACK(type)          type
+#endif
+typedef DECLASMCALLBACK(uint8_t const *) FNPGMR3DBGFIXEDMEMSCAN(void const *pvHaystack, uint32_t cbHaystack,
+                                                                void const *pvNeedle, size_t cbNeedle);
 /** Pointer to an fixed size and step assembly scanner function. */
 typedef FNPGMR3DBGFIXEDMEMSCAN *PFNPGMR3DBGFIXEDMEMSCAN;