archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-25 13:54:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6990549: Zero and Shark fixes after 6978355 and 6953144

Browse source 
Reviewed-by: twisti
This commit is contained in:
Gary Benson 2010-10-08 02:42:17 -07:00 • committed by Christian Thalinger
parent 39d16839d3
commit a10ec19a4d
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp
View file

@ -92,15 +92,15 @@ class SignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
public: public:
SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer) SignatureHandlerGenerator(methodHandle method, CodeBuffer* buffer)
: SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->code_end()), : SignatureHandlerGeneratorBase(method, (ffi_cif *) buffer->insts_end()),
_cb(buffer) { _cb(buffer) {
_cb->set_code_end((address) (cif() + 1)); _cb->set_insts_end((address) (cif() + 1));
} }
private: private:
void push(intptr_t value) { void push(intptr_t value) {
intptr_t *dst = (intptr_t *) _cb->code_end(); intptr_t *dst = (intptr_t *) _cb->insts_end();
_cb->set_code_end((address) (dst + 1)); _cb->set_insts_end((address) (dst + 1));
*dst = value; *dst = value;
} }
}; };

2
hotspot/src/share/vm/code/nmethod.cpp
View file

@ -1421,7 +1421,7 @@ void nmethod::flush() {
} }
#ifdef SHARK #ifdef SHARK
((SharkCompiler *) compiler())->free_compiled_method(instructions_begin()); ((SharkCompiler *) compiler())->free_compiled_method(insts_begin());
#endif // SHARK #endif // SHARK
((CodeBlob*)(this))->flush(); ((CodeBlob*)(this))->flush();

2
hotspot/src/share/vm/oops/methodOop.cpp
View file

@ -758,7 +758,7 @@ void methodOopDesc::set_code(methodHandle mh, nmethod *code) {
OrderAccess::storestore(); OrderAccess::storestore();
#ifdef SHARK #ifdef SHARK
mh->_from_interpreted_entry = code->instructions_begin(); mh->_from_interpreted_entry = code->insts_begin();
#else #else
mh->_from_compiled_entry = code->verified_entry_point(); mh->_from_compiled_entry = code->verified_entry_point();
OrderAccess::storestore(); OrderAccess::storestore();

3
hotspot/src/share/vm/shark/sharkCompiler.hpp
View file

@ -103,8 +103,7 @@ class SharkCompiler : public AbstractCompiler {
// Global access // Global access
public: public:
static SharkCompiler* compiler() { static SharkCompiler* compiler() {
AbstractCompiler *compiler = AbstractCompiler *compiler = CompileBroker::compiler(CompLevel_simple);
CompileBroker::compiler(CompLevel_fast_compile);
assert(compiler->is_shark() && compiler->is_initialized(), "should be"); assert(compiler->is_shark() && compiler->is_initialized(), "should be");
return (SharkCompiler *) compiler; return (SharkCompiler *) compiler;
} }