Changeset 9875 for ps

Timestamp:

07/18/11 17:25:48 (13 years ago)

Author:

Jan Wassenberg

Message:

hopefully fix non-Windows build errors

Location:

ps/trunk/source/lib

Files:

• alignment.h (modified) (2 diffs)
• debug.cpp (modified) (2 diffs)
• debug.h (modified) (1 diff)
• sysdep/os/unix/udbg.cpp (modified) (1 diff)
• sysdep/os/win/tests/test_wdbg_sym.h (modified) (1 diff)
• sysdep/os/win/wposix/waio.cpp (modified) (1 diff)

ps/trunk/source/lib/alignment.h

@@ -17 +17 @@
     return (n + multiple-1) & ~(multiple-1);
 }
+
+
+// bridge the differences between MSC and GCC alignment definitions.
+// example: ALIGNED(int, 8) myAlignedVariable = 0;
+#if MSC_VERSION
+# define ALIGNED(type, multiple) __declspec(align(multiple)) type
+#elif GCC_VERSION
+# define ALIGNED(type, multiple) type __attribute__((aligned(multiple)))
+#else
+# define ALIGNED(type, multiple) type
+#endif
 
 
@@ -38 +49 @@
 
 static const size_t cacheLineSize = 64; // (L2)
+# define CACHE_ALIGNED(type) ALIGNED(type, 64)  // ALIGNED() requires a literal; keep in sync with cacheLineSize
 
-#if MSC_VERSION
-#define CACHE_ALIGNED __declspec(align(64)) // align() requires a literal; keep in sync with cacheLineSize
-#endif
+
 
 

ps/trunk/source/lib/debug.cpp

@@ -533 +533 @@
 ErrorReaction debug_OnError(Status err, atomic_bool* suppress, const wchar_t* file, int line, const char* func)
 {
-    CACHE_ALIGNED u8 context[DEBUG_CONTEXT_SIZE];
+    CACHE_ALIGNED(u8) context[DEBUG_CONTEXT_SIZE];
     (void)debug_CaptureContext(context);
 
@@ -549 +549 @@
 ErrorReaction debug_OnAssertionFailure(const wchar_t* expr, atomic_bool* suppress, const wchar_t* file, int line, const char* func)
 {
-    CACHE_ALIGNED u8 context[DEBUG_CONTEXT_SIZE];
+    CACHE_ALIGNED(u8) context[DEBUG_CONTEXT_SIZE];
     (void)debug_CaptureContext(context);
 

ps/trunk/source/lib/debug.h

@@ -198 +198 @@
     do\
     {\
-        CACHE_ALIGNED u8 context[DEBUG_CONTEXT_SIZE];\
+        CACHE_ALIGNED(u8) context[DEBUG_CONTEXT_SIZE];\
         (void)debug_CaptureContext(context);\
         (void)debug_DisplayError(description, 0, context, L"debug_DisplayError", WIDEN(__FILE__), __LINE__, __func__, 0);\

ps/trunk/source/lib/sysdep/os/unix/udbg.cpp

@@ -38 +38 @@
 #include "lib/debug.h"
 
+
+Status debug_CaptureContext(void* UNUSED(context))
+{
+    // (not needed unless/until we support stack traces)
+    return INFO::SKIPPED;
+}
 
 void debug_break()

ps/trunk/source/lib/sysdep/os/win/tests/test_wdbg_sym.h

@@ -108 +108 @@
         // amount of text (not just "(failed)" error messages) was produced.
         ErrorMessageMem emm = {0};
-        CACHE_ALIGNED u8 context[DEBUG_CONTEXT_SIZE];
+        CACHE_ALIGNED(u8) context[DEBUG_CONTEXT_SIZE];
         (void)debug_CaptureContext(context);
         const wchar_t* text = debug_BuildErrorMessage(L"dummy", 0,0,0, context, L"m_test_array", &emm);

ps/trunk/source/lib/sysdep/os/win/wposix/waio.cpp

@@ -308 +308 @@
 
     FileControlBlock fcbs[maxFiles];
-    CACHE_ALIGNED volatile intptr_t inUse[maxFiles];
+    CACHE_ALIGNED(volatile intptr_t) inUse[maxFiles];
 
     void Init()