Mercurial > hg > graal-compiler
comparison src/cpu/sparc/vm/cppInterpreter_sparc.cpp @ 13086:096c224171c4
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 20 Nov 2013 00:10:38 +0100 |
parents | bd3237e0e18d |
children | d3f14809b051 2100bf712e2a |
comparison
equal
deleted
inserted
replaced
12782:92b7ec34ddfa | 13086:096c224171c4 |
---|---|
363 __ retl(); | 363 __ retl(); |
364 __ delayed()->nop(); | 364 __ delayed()->nop(); |
365 return entry; | 365 return entry; |
366 } | 366 } |
367 | 367 |
368 address CppInterpreter::return_entry(TosState state, int length) { | 368 address CppInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) { |
369 // make it look good in the debugger | 369 // make it look good in the debugger |
370 return CAST_FROM_FN_PTR(address, RecursiveInterpreterActivation) + frame::pc_return_offset; | 370 return CAST_FROM_FN_PTR(address, RecursiveInterpreterActivation) + frame::pc_return_offset; |
371 } | 371 } |
372 | 372 |
373 address CppInterpreter::deopt_entry(TosState state, int length) { | 373 address CppInterpreter::deopt_entry(TosState state, int length) { |