Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 7154:5d0bb7d52783
changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 12 Dec 2012 21:36:40 +0100 |
| parents | e522a00b91aa |
| children | 291ffc492eb6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Dec 12 15:46:11 2012 +0100 +++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Dec 12 21:36:40 2012 +0100 @@ -1996,7 +1996,7 @@ int vep_offset = ((intptr_t)__ pc()) - start; -#ifdef GRAAL +#ifdef GRAALVM if (InlineObjectHash && (method->intrinsic_id() == vmIntrinsics::_hashCode || method->intrinsic_id() == vmIntrinsics::_identityHashCode)) { // Object.hashCode can pull the hashCode from the header word // instead of doing a full VM transition once it's been computed. @@ -2038,7 +2038,7 @@ __ bind (slowCase); } -#endif // GRAAL +#endif // GRAALVM // The instruction at the verified entry point must be 5 bytes or longer // because it can be patched on the fly by make_non_entrant. The stack bang @@ -3420,7 +3420,7 @@ __ push(0); // Save everything in sight. - RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words); + map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words); // Now it is safe to overwrite any register