Mercurial > hg > truffle
changeset 1970:b675ff1ca7a3
7002129: Zero and Shark fixes, 3rd
Summary: 6970683 and 6953144 introduced changes that need to be implemented for Zero and Shark.
Reviewed-by: twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
| author | twisti |
|---|---|
| date | Tue, 23 Nov 2010 04:33:42 -0800 |
| parents | 4110c3e0c50d |
| children | e33f46fc48ed |
| files | src/os_cpu/linux_zero/vm/os_linux_zero.cpp src/share/vm/compiler/compileBroker.cpp |
| diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Nov 19 17:01:34 2010 -0800 +++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Tue Nov 23 04:33:42 2010 -0800 @@ -370,6 +370,10 @@ ShouldNotCallThis(); } +void os::print_register_info(outputStream *st, void *context) { + ShouldNotCallThis(); +} + ///////////////////////////////////////////////////////////////////////////// // Stubs for things that would be in linux_zero.s if it existed. // You probably want to disassemble these monkeys to check they're ok.
--- a/src/share/vm/compiler/compileBroker.cpp Fri Nov 19 17:01:34 2010 -0800 +++ b/src/share/vm/compiler/compileBroker.cpp Tue Nov 23 04:33:42 2010 -0800 @@ -522,6 +522,7 @@ void CompileBroker::compilation_init() { _last_method_compiled[0] = '\0'; +#ifndef SHARK // Set the interface to the current compiler(s). int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple); int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization); @@ -537,13 +538,12 @@ } #endif // COMPILER2 -#ifdef SHARK -#if defined(COMPILER1) || defined(COMPILER2) -#error "Can't use COMPILER1 or COMPILER2 with shark" -#endif - _compilers[0] = new SharkCompiler(); - _compilers[1] = _compilers[0]; -#endif +#else // SHARK + int c1_count = 0; + int c2_count = 1; + + _compilers[1] = new SharkCompiler(); +#endif // SHARK // Initialize the CompileTask free list _task_free_list = NULL;