harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r504859 - in /harmony/enhanced/classlib/trunk/modules: luni/src/main/native/luni/unix/hysignal.h portlib/src/main/native/include/unix/hyportpg.h portlib/src/main/native/port/unix/hycpu.c
Date Thu, 08 Feb 2007 11:17:55 GMT
Author: odeakin
Date: Thu Feb  8 03:17:51 2007
New Revision: 504859

URL: http://svn.apache.org/viewvc?view=rev&rev=504859
Log:
Fixup ifdefs for Linux PPC platforms.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/hysignal.h
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hyportpg.h
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hycpu.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/hysignal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/hysignal.h?view=diff&rev=504859&r1=504858&r2=504859
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/hysignal.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/hysignal.h Thu
Feb  8 03:17:51 2007
@@ -152,11 +152,11 @@
 
 
 
-#if defined(LINUXPPC)
+#if defined(LINUX_PPC32) || defined(LINUX_PPC64)
 typedef void(*HySignalHandler)PROTOTYPE((int sig, struct sigcontext *context));
 #endif
 
-#if defined(LINUX) && !defined(LINUXPPC)
+#if defined(LINUX) && !defined(LINUX_PPC32) && !defined(LINUX_PPC64)
 typedef void(*HySignalHandler)PROTOTYPE((int sig));
 #endif
 
@@ -230,12 +230,12 @@
 	- at index <aSig_es>
 	- passing it signal number <aSig_es> */
 
-#if (defined(LINUX) && !defined(LINUXPPC))
+#if (defined(LINUX) && !defined(LINUX_PPC32) && !defined(LINUX_PPC64))
 #define HyInvokePreviousHandlerIn(previousHandlerSet_es,aSig_es)\
 	if ((previousHandlerSet_es)[(aSig_es)] != NULL) (*(previousHandlerSet_es)[(aSig_es)])((aSig_es))
 #endif
 
-#if defined(LINUXPPC)
+#if defined(LINUX_PPC32) || defined(LINUX_PPC64)
 #define HyInvokePreviousHandlerIn(previousHandlerSet_es, aSig_es, aScp_es)\
 	if ((previousHandlerSet_es)[(aSig_es)] != NULL) (*(previousHandlerSet_es)[(aSig_es)])((aSig_es),
(aScp_es))
 #endif

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hyportpg.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hyportpg.h?view=diff&rev=504859&r1=504858&r2=504859
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hyportpg.h
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/hyportpg.h
Thu Feb  8 03:17:51 2007
@@ -24,14 +24,14 @@
 #define HYPORT_VMEM_PAGESIZE_COUNT 3
 typedef struct HyPortPlatformGlobals
 {
-#if defined(LINUXPPC) || defined(PPC)
+#if defined(HYPPC32) || defined(HYPPC64)
   int mem_ppcCacheLineSize;
 #endif
   char *si_osType;
   char *si_osVersion;
   UDATA vmem_pageSize[HYPORT_VMEM_PAGESIZE_COUNT];       /** <0 terminated array of supported
page sizes */
 } HyPortPlatformGlobals;
-#if defined(LINUXPPC) || defined(PPC)
+#if defined(HYPPC32) || defined(HYPPC64)
 #define PPG_mem_ppcCacheLineSize (portLibrary->portGlobals->platformGlobals.mem_ppcCacheLineSize)
 #endif
 #define PPG_si_osType (portLibrary->portGlobals->platformGlobals.si_osType)

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hycpu.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hycpu.c?view=diff&rev=504859&r1=504858&r2=504859
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hycpu.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hycpu.c Thu
Feb  8 03:17:51 2007
@@ -27,13 +27,13 @@
 #undef CDEV_CURRENT_FUNCTION
 
 #include <stdlib.h>
-#if defined(LINUXPPC) || defined(PPC)
+#if defined(HYPPC32) || defined(HYPPC64)
 #include <string.h>
 #endif
 
 
 #include "hyport.h"
-#if defined(LINUXPPC) || defined(PPC)
+#if defined(HYPPC32) || defined(HYPPC64)
 #include "portpriv.h"
 #include "hyportpg.h"
 #endif
@@ -77,7 +77,7 @@
 hycpu_startup (struct HyPortLibrary *portLibrary)
 {
   /* initialize the ppc level 1 cache line size */
-#if defined(LINUXPPC) || defined(PPC)
+#if defined(HYPPC32) || defined(HYPPC64)
   int ppcCacheLineSize;
   int i;
   int input1 = 20;
@@ -141,7 +141,7 @@
 #if defined(LINUX) && defined(ARMGNU)
   privateFlushICache (memoryPointer, byteAmount);
 
-#elif defined (LINUXPPC) || defined (PPC)
+#elif defined(HYPPC32) || defined(HYPPC64)
   int cacheLineSize = PPG_mem_ppcCacheLineSize;
   unsigned char *addr;
   unsigned char *limit;
@@ -181,7 +181,8 @@
 #elif defined(LINUX)
   __asm__ ("isync");
 #endif
-#endif
+
+#endif /* HYPPC32 || HYPPC64 */
 
 
 }



Mime
View raw message