Changeset 21824 for branches/gcc-kmk/include

Timestamp:

Nov 25, 2011, 10:19:52 PM (14 years ago)

Author:

dmik

Message:

Make the debug version of ported DLLs build.

Location:

branches/gcc-kmk/include

Files:

• dbglog.h (modified) (2 diffs)
• heapshared.h (modified) (1 diff)
• odinwrap.h (modified) (3 diffs)

branches/gcc-kmk/include/dbglog.h

@@ -99 +99 @@
 
 /* enable support for the _interrupt() statement */
-#if (defined(__IBMCPP__) || defined(__IBMC__))
+#if defined(__IBMCPP__) || defined(__IBMC__) || defined(__GNUC__)
+
+#ifndef __GNUC__
 #  include <builtin.h>
+#endif
+
 #ifdef DEBUG
+
 #ifdef __cplusplus
 
-#define DebugInt3() BreakPoint(__FILE__, __FUNCTION__, __LINE__)
+#ifdef PRIVATE_LOGGING
+#define DebugInt3() do { \
+    dprintf((LOG, "BREAKPOINT %s %s %d", __FILE__, __FUNCTION__, __LINE__)); \
+    _interrupt(3); \
+} while (0)
+#else
+#define DebugInt3() do { \
+    dprintf(("BREAKPOINT %s %s %d", __FILE__, __FUNCTION__, __LINE__)); \
+    _interrupt(3); \
+} while (0)
+#endif
 
-void inline BreakPoint(const char *szFile, const char *szFunction, int iLine)
-{
-    dprintf(("BREAKPOINT %s %s %d", szFile, szFunction, iLine));
-    _interrupt(3);
-}
-
-#else
+#else /* __cplusplus */
   #define DebugInt3()   _interrupt(3)
 #endif
-#else
+
+#else /* DEBUG */
   #define DebugInt3()
 #endif
 
-#else
+#else /* defined(__IBMCPP__) || defined(__IBMC__) || defined(__GNUC__) */
+
 #ifdef DEBUG
   #define DebugInt3()   _asm int 3;
@@ -126 +137 @@
 #endif
 
-#endif
+#endif /* defined(__IBMCPP__) || defined(__IBMC__) || defined(__GNUC__) */
 
 #ifdef __cplusplus

branches/gcc-kmk/include/heapshared.h

@@ -18 +18 @@
 
 #ifdef DEBUG
-    void * _System _debug_smalloc(int size, char *pszFile, int linenr);
-    void * _System _debug_smallocfill(int size, int filler, char *pszFile, int linenr);
-    void   _System _debug_sfree(void *chunk, char *pszFile, int linenr);
+    void * _System _debug_smalloc(int size, const char *pszFile, int linenr);
+    void * _System _debug_smallocfill(int size, int filler, const char *pszFile, int linenr);
+    void   _System _debug_sfree(void *chunk, const char *pszFile, int linenr);
 
     #define _smalloc(a)         _debug_smalloc((a),__FILE__,__LINE__)

branches/gcc-kmk/include/odinwrap.h

@@ -37 +37 @@
 
 #ifdef DEBUG
-#  define ODINDEBUGCHANNEL(a) static char* pszOdinDebugChannel=#a;
-#  define ODINDEBUGCHANNEL1(a) static char* pszOdinDebugChannel1=#a;
+#  define ODINDEBUGCHANNEL(a) static const char *pszOdinDebugChannel = #a;
+#  define ODINDEBUGCHANNEL1(a) static const char *pszOdinDebugChannel1 = #a;
 #else
 #  define ODINDEBUGCHANNEL(a)
@@ -61 +61 @@
 #include <odin.h>
 
-//#ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-//#endif
+#endif
 
 // ---------------------------------------------------------------------------
@@ -75 +75 @@
 extern void              WIN32API dbg_IncThreadCallDepth(void); // kernel32
 extern void              WIN32API dbg_DecThreadCallDepth(void); // kernel32
-extern void              WIN32API dbg_ThreadPushCall(char *pszCaller);
+extern void              WIN32API dbg_ThreadPushCall(const char *pszCaller);
 extern void              WIN32API dbg_ThreadPopCall();
 extern char*             WIN32API dbg_GetLastCallerName();
 
-//#ifdef __cplusplus
+#ifdef __cplusplus
 } // extern "C"
-//#endif
+#endif
 
 // ---------------------------------------------------------------------------