[Cegcc-svn] SF.net SVN: cegcc:[1397] trunk/cegcc/src/w32api

[<dan...@us...>]

Revision: 1397
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1397&view=rev
Author:   dannybackx
Date:     2009-10-22 19:40:20 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Define DebugBreak for x86 too, and move it to kfuncs.h as suggested by Ivan.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/kfuncs.h
    trunk/cegcc/src/w32api/include/winbase.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2009-10-20 18:35:04 UTC (rev 1396)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2009-10-22 19:40:20 UTC (rev 1397)
@@ -1,3 +1,9 @@
+2009-10-22  Danny Backx  <dan...@us...>,
+            Ivan Maidanski <iv...@ma...>
+
+	* include/winbase.h, include/kfuncs.h (DebugBreak): Define a function
+	only when not CE. If CE, define as macros in kfuncs.h for arm and x86.
+
 2009-09-07  Danny Backx  <dan...@us...>
 
 	* include/shlobj.h (IShellExecuteHookA): Replace UNDER_CE guard by

Modified: trunk/cegcc/src/w32api/include/kfuncs.h
===================================================================
--- trunk/cegcc/src/w32api/include/kfuncs.h	2009-10-20 18:35:04 UTC (rev 1396)
+++ trunk/cegcc/src/w32api/include/kfuncs.h	2009-10-22 19:40:20 UTC (rev 1397)
@@ -97,4 +97,15 @@
   return (TlsCall(TLS_FUNCFREE, x));
 }
 
+/*
+ * Take the special cases out of winbase.h
+ */
+#if defined (__arm__)
+# define DebugBreak() __asm__( ".word 0xe6000010" )
+#elif defined (__i386__) || defined (__x86_64__)
+# define DebugBreak() __asm__( ".byte 0xcc" )
+#else
+  /* externally supplied for an unsupported architecture */
+  extern void DebugBreak(void);
 #endif
+#endif

Modified: trunk/cegcc/src/w32api/include/winbase.h
===================================================================
--- trunk/cegcc/src/w32api/include/winbase.h	2009-10-20 18:35:04 UTC (rev 1396)
+++ trunk/cegcc/src/w32api/include/winbase.h	2009-10-22 19:40:20 UTC (rev 1397)
@@ -1359,8 +1359,8 @@
 #if (_WIN32_WINNT >= 0x0501)
 WINBASEAPI BOOL WINAPI DebugActiveProcessStop(DWORD);
 #endif
-#if defined (_WIN32_WCE) && defined (__arm__)
-# define DebugBreak() __asm__( ".word 0xe6000010" )
+#if defined (_WIN32_WCE)
+/* defined as macro in kfuncs.h */
 #else
 WINBASEAPI void WINAPI DebugBreak(void);
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.