src/share/vm/utilities/macros.hpp

rev 12048 : 8166560: [s390] Basic enablement of s390 port.

@@ -330,72 +330,58 @@
 #else
 #define WIN64_ONLY(code)
 #define NOT_WIN64(code) code
 #endif
 
-#if defined(ZERO)
-#define ZERO_ONLY(code) code
-#define NOT_ZERO(code)
+// Note: There are three ARM ports. They set the following in the makefiles:
+// 1. Closed 32-bit port:   -DARM -DARM32           -DTARGET_ARCH_arm
+// 2. Closed 64-bit port:   -DARM -DAARCH64 -D_LP64 -DTARGET_ARCH_arm
+// 3. Open   64-bit port:         -DAARCH64 -D_LP64 -DTARGET_ARCH_aaarch64
+#ifdef AARCH64
+#define AARCH64_ONLY(code) code
+#define NOT_AARCH64(code)
 #else
-#define ZERO_ONLY(code)
-#define NOT_ZERO(code) code
+#define AARCH64_ONLY(code)
+#define NOT_AARCH64(code) code
 #endif
 
-#if defined(SHARK)
-#define SHARK_ONLY(code) code
-#define NOT_SHARK(code)
+#ifdef ARM
+#define ARM_ONLY(code) code
+#define NOT_ARM(code)
 #else
-#define SHARK_ONLY(code)
-#define NOT_SHARK(code) code
+#define ARM_ONLY(code)
+#define NOT_ARM(code) code
 #endif
 
-#if defined(IA32) || defined(AMD64)
-#define X86
-#define X86_ONLY(code) code
-#define NOT_X86(code)
+#ifdef ARM32
+#define ARM32_ONLY(code) code
+#define NOT_ARM32(code)
 #else
-#undef X86
-#define X86_ONLY(code)
-#define NOT_X86(code) code
+#define ARM32_ONLY(code)
+#define NOT_ARM32(code) code
 #endif
 
-#ifdef IA32
-#define IA32_ONLY(code) code
-#define NOT_IA32(code)
+#ifdef E500V2
+#define E500V2_ONLY(code) code
+#define NOT_E500V2(code)
 #else
-#define IA32_ONLY(code)
-#define NOT_IA32(code) code
+#define E500V2_ONLY(code)
+#define NOT_E500V2(code) code
 #endif
 
-// This is a REALLY BIG HACK, but on AIX <sys/systemcfg.h> unconditionally defines IA64.
-// At least on AIX 7.1 this is a real problem because 'systemcfg.h' is indirectly included
-// by 'pthread.h' and other common system headers.
-
+// This is a REALLY BIG HACK, but on AIX <sys/systemcfg.h>
+// unconditionally defines IA64. At least on AIX 7.1 this is a real
+// problem because 'systemcfg.h' is indirectly included by 'pthread.h'
+// and other common system headers.
 #if defined(IA64) && !defined(AIX)
 #define IA64_ONLY(code) code
 #define NOT_IA64(code)
 #else
 #define IA64_ONLY(code)
 #define NOT_IA64(code) code
 #endif
 
-#ifdef AMD64
-#define AMD64_ONLY(code) code
-#define NOT_AMD64(code)
-#else
-#define AMD64_ONLY(code)
-#define NOT_AMD64(code) code
-#endif
-
-#ifdef SPARC
-#define SPARC_ONLY(code) code
-#define NOT_SPARC(code)
-#else
-#define SPARC_ONLY(code)
-#define NOT_SPARC(code) code
-#endif
-
 #if defined(PPC32) || defined(PPC64)
 #ifndef PPC
 #define PPC
 #endif
 #define PPC_ONLY(code) code

@@ -420,46 +406,71 @@
 #else
 #define PPC64_ONLY(code)
 #define NOT_PPC64(code) code
 #endif
 
-#ifdef E500V2
-#define E500V2_ONLY(code) code
-#define NOT_E500V2(code)
+#ifdef S390
+#define S390_ONLY(code) code
+#define NOT_S390(code)
 #else
-#define E500V2_ONLY(code)
-#define NOT_E500V2(code) code
+#define S390_ONLY(code)
+#define NOT_S390(code) code
 #endif
 
-// Note: There are three ARM ports. They set the following in the makefiles:
-// 1. Closed 32-bit port:   -DARM -DARM32           -DTARGET_ARCH_arm
-// 2. Closed 64-bit port:   -DARM -DAARCH64 -D_LP64 -DTARGET_ARCH_arm
-// 3. Open   64-bit port:         -DAARCH64 -D_LP64 -DTARGET_ARCH_aaarch64
-#ifdef ARM
-#define ARM_ONLY(code) code
-#define NOT_ARM(code)
+#ifdef SHARK
+#define SHARK_ONLY(code) code
+#define NOT_SHARK(code)
 #else
-#define ARM_ONLY(code)
-#define NOT_ARM(code) code
+#define SHARK_ONLY(code)
+#define NOT_SHARK(code) code
 #endif
 
-#ifdef ARM32
-#define ARM32_ONLY(code) code
-#define NOT_ARM32(code)
+#ifdef SPARC
+#define SPARC_ONLY(code) code
+#define NOT_SPARC(code)
 #else
-#define ARM32_ONLY(code)
-#define NOT_ARM32(code) code
+#define SPARC_ONLY(code)
+#define NOT_SPARC(code) code
 #endif
 
-#ifdef AARCH64
-#define AARCH64_ONLY(code) code
-#define NOT_AARCH64(code)
+#if defined(IA32) || defined(AMD64)
+#define X86
+#define X86_ONLY(code) code
+#define NOT_X86(code)
 #else
-#define AARCH64_ONLY(code)
-#define NOT_AARCH64(code) code
+#undef X86
+#define X86_ONLY(code)
+#define NOT_X86(code) code
+#endif
+
+// Synonym for X86_32.
+#ifdef IA32
+#define IA32_ONLY(code) code
+#define NOT_IA32(code)
+#else
+#define IA32_ONLY(code)
+#define NOT_IA32(code) code
 #endif
 
+// Synonym for X86_64.
+#ifdef AMD64
+#define AMD64_ONLY(code) code
+#define NOT_AMD64(code)
+#else
+#define AMD64_ONLY(code)
+#define NOT_AMD64(code) code
+#endif
+
+#if defined(ZERO)
+#define ZERO_ONLY(code) code
+#define NOT_ZERO(code)
+#else
+#define ZERO_ONLY(code)
+#define NOT_ZERO(code) code
+#endif
+
+
 #define define_pd_global(type, name, value) const type pd_##name = value;
 
 // Helper macros for constructing file names for includes.
 #define CPU_HEADER_STEM(basename) PASTE_TOKENS(basename, INCLUDE_SUFFIX_CPU)
 #define OS_HEADER_STEM(basename) PASTE_TOKENS(basename, INCLUDE_SUFFIX_OS)