Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/vm_version.cpp @ 1010:354d3184f6b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6890308: integrate zero assembler hotspot changes Reviewed-by: never Contributed-by: gbenson@redhat.com
author never
date Tue, 13 Oct 2009 12:04:21 -0700
parents bd02caa94611
children fb1a39993f69
comparison
equal deleted inserted replaced
1009:03b336640699 1010:354d3184f6b2
91 #ifdef KERNEL 91 #ifdef KERNEL
92 #define VMTYPE "Kernel" 92 #define VMTYPE "Kernel"
93 #else // KERNEL 93 #else // KERNEL
94 #ifdef TIERED 94 #ifdef TIERED
95 #define VMTYPE "Server" 95 #define VMTYPE "Server"
96 #else 96 #else // TIERED
97 #define VMTYPE COMPILER1_PRESENT("Client") \ 97 #ifdef ZERO
98 COMPILER2_PRESENT("Server") 98 #define VMTYPE "Zero"
99 #else // ZERO
100 #define VMTYPE COMPILER1_PRESENT("Client") \
101 COMPILER2_PRESENT("Server")
102 #endif // ZERO
99 #endif // TIERED 103 #endif // TIERED
100 #endif // KERNEL 104 #endif // KERNEL
101 105
102 #ifndef HOTSPOT_VM_DISTRO 106 #ifndef HOTSPOT_VM_DISTRO
103 #error HOTSPOT_VM_DISTRO must be defined 107 #error HOTSPOT_VM_DISTRO must be defined
140 144
141 #define OS LINUX_ONLY("linux") \ 145 #define OS LINUX_ONLY("linux") \
142 WINDOWS_ONLY("windows") \ 146 WINDOWS_ONLY("windows") \
143 SOLARIS_ONLY("solaris") 147 SOLARIS_ONLY("solaris")
144 148
149 #ifdef ZERO
150 #define CPU ZERO_LIBARCH
151 #else
145 #define CPU IA32_ONLY("x86") \ 152 #define CPU IA32_ONLY("x86") \
146 IA64_ONLY("ia64") \ 153 IA64_ONLY("ia64") \
147 AMD64_ONLY("amd64") \ 154 AMD64_ONLY("amd64") \
148 SPARC_ONLY("sparc") 155 SPARC_ONLY("sparc")
156 #endif // ZERO
149 157
150 const char *Abstract_VM_Version::vm_platform_string() { 158 const char *Abstract_VM_Version::vm_platform_string() {
151 return OS "-" CPU; 159 return OS "-" CPU;
152 } 160 }
153 161