--- a/memspy/Driver/Kernel/Source/MemSpyDriverStreamWriter.cpp Tue Jul 06 16:05:13 2010 +0300
+++ b/memspy/Driver/Kernel/Source/MemSpyDriverStreamWriter.cpp Thu Jul 22 16:50:07 2010 +0100
@@ -21,7 +21,14 @@
#include "MemSpyDriverUtils.h"
#include "MemSpyDriverXferBuffer.h"
-
+// from kern_priv.h
+#if defined(__GCC32__)
+#define __RETURN_ADDRESS() __builtin_return_address(0)
+#elif defined (__ARMCC__)
+#define __RETURN_ADDRESS() ((TAny*)__return_address())
+#else
+#define __RETURN_ADDRESS() 0 // not supported
+#endif
RMemSpyMemStreamWriter::RMemSpyMemStreamWriter()
: iBuffer( NULL ), iCurrent( NULL ), iMax( 0 ), iMark( NULL ), iCommitted( 0 )
@@ -69,7 +76,7 @@
}
else
{
- //TRACE( Kern::Printf( "RMemSpyMemStreamWriter::WriteInt32() - asked to write: 0x%08x from fn: 0x%08x BUT AM FULL", aValue, __return_address() ) );
+ //TRACE( Kern::Printf( "RMemSpyMemStreamWriter::WriteInt32() - asked to write: 0x%08x from fn: 0x%08x BUT AM FULL", aValue, __RETURN_ADDRESS() ) );
}
//
return ret;
@@ -89,7 +96,7 @@
}
else
{
- //TRACE( Kern::Printf( "RMemSpyMemStreamWriter::WriteUint32() - asked to write: 0x%08x from fn: 0x%08x BUT AM FULL", aValue, __return_address() ) );
+ //TRACE( Kern::Printf( "RMemSpyMemStreamWriter::WriteUint32() - asked to write: 0x%08x from fn: 0x%08x BUT AM FULL", aValue, __RETURN_ADDRESS() ) );
}
//
return ret;
--- a/memspy/Engine/eabi/MemSpyEngineu.def Tue Jul 06 16:05:13 2010 +0300
+++ b/memspy/Engine/eabi/MemSpyEngineu.def Thu Jul 22 16:50:07 2010 +0100
@@ -432,7 +432,7 @@
_ZTI48CMemSpyEngineHelperSysMemTrackerEntryHandlePAndS @ 431 NONAME ; #<TI>#
_ZTI50CMemSpyEngineHelperSysMemTrackerEntryHandleGeneric @ 432 NONAME ; #<TI>#
_ZTI52CMemSpyEngineHelperSysMemTrackerEntryFileServerCache @ 433 NONAME ; #<TI>#
- _ZTIN25CMemSpyThreadInfoItemBase5CItemE @ 434 NONAME ; #<TI>#
+ _ZTIN25CMemSpyThreadInfoItemBase5CItemE @ 434 NONAME ABSENT ; #<TI>#
_ZTV23CMemSpyEngineDriveEntry @ 435 NONAME ; #<VT>#
_ZTV41CMemSpyEngineHelperSysMemTrackerEntryCode @ 436 NONAME ; #<VT>#
_ZTV41CMemSpyEngineHelperSysMemTrackerEntryHeap @ 437 NONAME ; #<VT>#
@@ -447,7 +447,7 @@
_ZTV48CMemSpyEngineHelperSysMemTrackerEntryHandlePAndS @ 446 NONAME ; #<VT>#
_ZTV50CMemSpyEngineHelperSysMemTrackerEntryHandleGeneric @ 447 NONAME ; #<VT>#
_ZTV52CMemSpyEngineHelperSysMemTrackerEntryFileServerCache @ 448 NONAME ; #<VT>#
- _ZTVN25CMemSpyThreadInfoItemBase5CItemE @ 449 NONAME ; #<VT>#
+ _ZTVN25CMemSpyThreadInfoItemBase5CItemE @ 449 NONAME ABSENT ; #<VT>#
_ZThn16_NK14CMemSpyProcess9MdcaCountEv @ 450 NONAME ; #<thunk>#
_ZThn16_NK14CMemSpyProcess9MdcaPointEi @ 451 NONAME ; #<thunk>#
_ZThn16_NK22CMemSpyThreadInfoChunk9MdcaCountEv @ 452 NONAME ; #<thunk>#