Mercurial > hg > truffle
comparison src/share/vm/runtime/vm_version.cpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:36:48 +0200 |
parents | 52b4284cb496 |
children |
comparison
equal
deleted
inserted
replaced
21558:d563baeca9df | 21559:be896a1983c0 |
---|---|
110 #define VMLP "" | 110 #define VMLP "" |
111 #endif | 111 #endif |
112 | 112 |
113 #ifndef VMTYPE | 113 #ifndef VMTYPE |
114 #ifdef TIERED | 114 #ifdef TIERED |
115 #ifdef COMPILERGRAAL | 115 #ifdef COMPILERJVMCI |
116 #define VMTYPE "Graal" | 116 #define VMTYPE "JVMCI" |
117 #else // COMPILERGRAAL | 117 #else // COMPILERJVMCI |
118 #define VMTYPE "Server" | 118 #define VMTYPE "Server" |
119 #endif // COMPILERGRAAL | 119 #endif // COMPILERJVMCI |
120 #else // TIERED | 120 #else // TIERED |
121 #ifdef ZERO | 121 #ifdef ZERO |
122 #ifdef SHARK | 122 #ifdef SHARK |
123 #define VMTYPE "Shark" | 123 #define VMTYPE "Shark" |
124 #else // SHARK | 124 #else // SHARK |
125 #define VMTYPE "Zero" | 125 #define VMTYPE "Zero" |
126 #endif // SHARK | 126 #endif // SHARK |
127 #else // ZERO | 127 #else // ZERO |
128 #define VMTYPE COMPILER1_PRESENT("Client") \ | 128 #define VMTYPE COMPILER1_PRESENT("Client") \ |
129 COMPILER2_PRESENT("Server") \ | 129 COMPILER2_PRESENT("Server") \ |
130 COMPILERGRAAL_PRESENT("Graal") | 130 COMPILERJVMCI_PRESENT("JVMCI") |
131 #endif // ZERO | 131 #endif // ZERO |
132 #endif // TIERED | 132 #endif // TIERED |
133 #endif | 133 #endif |
134 | 134 |
135 #ifndef HOTSPOT_VM_DISTRO | 135 #ifndef HOTSPOT_VM_DISTRO |