Mercurial > hg > truffle
changeset 1845:a222fcfba398
6990549: Zero and Shark fixes after 6978355 and 6953144
Reviewed-by: twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
author | twisti |
---|---|
date | Fri, 08 Oct 2010 02:42:17 -0700 |
parents | 75588558f1bf |
children | d55217dc206f |
files | src/cpu/zero/vm/interpreterRT_zero.hpp src/share/vm/code/nmethod.cpp src/share/vm/oops/methodOop.cpp src/share/vm/shark/sharkCompiler.hpp |
diffstat | 4 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/zero/vm/interpreterRT_zero.hpp Thu Oct 07 21:40:55 2010 -0700 +++ b/src/cpu/zero/vm/interpreterRT_zero.hpp Fri Oct 08 02:42:17 2010 -0700 @@ -92,15 +92,15 @@ public: SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer) - : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()), + : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()), _cb(buffer) { - _cb->set_code_end((address) (cif() + 1)); + _cb->set_insts_end((address) (cif() + 1)); } private: void push(intptr_t value) { - intptr_t *dst = (intptr_t *) _cb->code_end(); - _cb->set_code_end((address) (dst + 1)); + intptr_t *dst = (intptr_t *) _cb->insts_end(); + _cb->set_insts_end((address) (dst + 1)); *dst = value; } };
--- a/src/share/vm/code/nmethod.cpp Thu Oct 07 21:40:55 2010 -0700 +++ b/src/share/vm/code/nmethod.cpp Fri Oct 08 02:42:17 2010 -0700 @@ -1421,7 +1421,7 @@ } #ifdef SHARK - ((SharkCompiler *) compiler())->free_compiled_method(instructions_begin()); + ((SharkCompiler *) compiler())->free_compiled_method(insts_begin()); #endif // SHARK ((CodeBlob*)(this))->flush();
--- a/src/share/vm/oops/methodOop.cpp Thu Oct 07 21:40:55 2010 -0700 +++ b/src/share/vm/oops/methodOop.cpp Fri Oct 08 02:42:17 2010 -0700 @@ -758,7 +758,7 @@ OrderAccess::storestore(); #ifdef SHARK - mh->_from_interpreted_entry = code->instructions_begin(); + mh->_from_interpreted_entry = code->insts_begin(); #else mh->_from_compiled_entry = code->verified_entry_point(); OrderAccess::storestore();
--- a/src/share/vm/shark/sharkCompiler.hpp Thu Oct 07 21:40:55 2010 -0700 +++ b/src/share/vm/shark/sharkCompiler.hpp Fri Oct 08 02:42:17 2010 -0700 @@ -103,8 +103,7 @@ // Global access public: static SharkCompiler* compiler() { - AbstractCompiler *compiler = - CompileBroker::compiler(CompLevel_fast_compile); + AbstractCompiler *compiler = CompileBroker::compiler(CompLevel_simple); assert(compiler->is_shark() && compiler->is_initialized(), "should be"); return (SharkCompiler *) compiler; }