Mercurial > hg > graal-compiler
changeset 4980:1c7c5be93e84
More diff vs hsx24 clean up.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 21:49:51 +0100 |
parents | 18a5539bf19b |
children | 1b8d02e10ee8 |
files | src/cpu/sparc/vm/stubGenerator_sparc.cpp src/cpu/x86/vm/stubGenerator_x86_32.cpp src/share/vm/interpreter/templateTable.cpp src/share/vm/runtime/vframeArray.cpp |
diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp Mon Feb 27 21:43:51 2012 +0100 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp Mon Feb 27 21:49:51 2012 +0100 @@ -436,7 +436,7 @@ #undef __ #define __ masm-> - address generate_throw_exception(const char* name, address runtime_entry, bool restore_saved_exception_pc, + address generate_throw_exception(const char* name, address runtime_entry, Register arg1 = noreg, Register arg2 = noreg) { #ifdef ASSERT int insts_size = VerifyThread ? 1 * K : 600;
--- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp Mon Feb 27 21:43:51 2012 +0100 +++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp Mon Feb 27 21:49:51 2012 +0100 @@ -2186,7 +2186,7 @@ // either at call sites or otherwise assume that stack unwinding will be initiated, // so caller saved registers were assumed volatile in the compiler. address generate_throw_exception(const char* name, address runtime_entry, - bool restore_saved_exception_pc, Register arg1 = noreg, Register arg2 = noreg) { + Register arg1 = noreg, Register arg2 = noreg) { int insts_size = 256; int locs_size = 32;
--- a/src/share/vm/interpreter/templateTable.cpp Mon Feb 27 21:43:51 2012 +0100 +++ b/src/share/vm/interpreter/templateTable.cpp Mon Feb 27 21:49:51 2012 +0100 @@ -429,8 +429,11 @@ def(Bytecodes::_jsr , ubcp|disp|____|____, vtos, vtos, jsr , _ ); // result is not an oop, so do not transition to atos def(Bytecodes::_ret , ubcp|disp|____|____, vtos, vtos, ret , _ ); def(Bytecodes::_tableswitch , ubcp|disp|____|____, itos, vtos, tableswitch , _ ); -// def(Bytecodes::_lookupswitch , ubcp|disp|____|____, itos, itos, lookupswitch , _ ); +#ifdef GRAAL def(Bytecodes::_lookupswitch , ubcp|disp|____|____, itos, vtos, fast_linearswitch , _ ); +#else + def(Bytecodes::_lookupswitch , ubcp|disp|____|____, itos, itos, lookupswitch , _ ); +#endif def(Bytecodes::_ireturn , ____|disp|clvm|____, itos, itos, _return , itos ); def(Bytecodes::_lreturn , ____|disp|clvm|____, ltos, ltos, _return , ltos ); def(Bytecodes::_freturn , ____|disp|clvm|____, ftos, ftos, _return , ftos );
--- a/src/share/vm/runtime/vframeArray.cpp Mon Feb 27 21:43:51 2012 +0100 +++ b/src/share/vm/runtime/vframeArray.cpp Mon Feb 27 21:49:51 2012 +0100 @@ -127,6 +127,7 @@ // Now the expressions off-stack // Same silliness as above + StackValueCollection *exprs = vf->expressions(); _expressions = new StackValueCollection(exprs->size()); for(index = 0; index < exprs->size(); index++) { @@ -317,7 +318,8 @@ // only unpacks the part of the expression stack not used by callee // as parameters. The callee parameters are unpacked as part of the // callee locals. - for(int i = 0; i < expressions()->size(); i++) { + int i; + for(i = 0; i < expressions()->size(); i++) { StackValue *value = expressions()->at(i); intptr_t* addr = iframe()->interpreter_frame_expression_stack_at(i); switch(value->type()) { @@ -354,7 +356,7 @@ // Unpack the locals - for(int i = 0; i < locals()->size(); i++) { + for(i = 0; i < locals()->size(); i++) { StackValue *value = locals()->at(i); intptr_t* addr = iframe()->interpreter_frame_local_at(i); switch(value->type()) {