Mercurial > hg > truffle
comparison src/cpu/sparc/vm/cppInterpreter_sparc.cpp @ 3464:be4ca325525a
Merge.
| author | Thomas Wuerthinger <thomas@wuerthinger.net> |
|---|---|
| date | Wed, 27 Jul 2011 17:32:44 -0700 |
| parents | 3d2ab563047a |
| children | 3d42f82cd811 |
comparison
equal
deleted
inserted
replaced
| 3239:7c4b4daac19b | 3464:be4ca325525a |
|---|---|
| 549 return entry; | 549 return entry; |
| 550 } | 550 } |
| 551 return NULL; | 551 return NULL; |
| 552 } | 552 } |
| 553 | 553 |
| 554 address InterpreterGenerator::generate_Reference_get_entry(void) { | |
| 555 #ifndef SERIALGC | |
| 556 if (UseG1GC) { | |
| 557 // We need to generate have a routine that generates code to: | |
| 558 // * load the value in the referent field | |
| 559 // * passes that value to the pre-barrier. | |
| 560 // | |
| 561 // In the case of G1 this will record the value of the | |
| 562 // referent in an SATB buffer if marking is active. | |
| 563 // This will cause concurrent marking to mark the referent | |
| 564 // field as live. | |
| 565 Unimplemented(); | |
| 566 } | |
| 567 #endif // SERIALGC | |
| 568 | |
| 569 // If G1 is not enabled then attempt to go through the accessor entry point | |
| 570 // Reference.get is an accessor | |
| 571 return generate_accessor_entry(); | |
| 572 } | |
| 573 | |
| 554 // | 574 // |
| 555 // Interpreter stub for calling a native method. (C++ interpreter) | 575 // Interpreter stub for calling a native method. (C++ interpreter) |
| 556 // This sets up a somewhat different looking stack for calling the native method | 576 // This sets up a somewhat different looking stack for calling the native method |
| 557 // than the typical interpreter frame setup. | 577 // than the typical interpreter frame setup. |
| 558 // | 578 // |
| 2154 | 2174 |
| 2155 int AbstractInterpreter::layout_activation(methodOop method, | 2175 int AbstractInterpreter::layout_activation(methodOop method, |
| 2156 int tempcount, // Number of slots on java expression stack in use | 2176 int tempcount, // Number of slots on java expression stack in use |
| 2157 int popframe_extra_args, | 2177 int popframe_extra_args, |
| 2158 int moncount, // Number of active monitors | 2178 int moncount, // Number of active monitors |
| 2179 int caller_actual_parameters, | |
| 2159 int callee_param_size, | 2180 int callee_param_size, |
| 2160 int callee_locals_size, | 2181 int callee_locals_size, |
| 2161 frame* caller, | 2182 frame* caller, |
| 2162 frame* interpreter_frame, | 2183 frame* interpreter_frame, |
| 2163 bool is_top_frame) { | 2184 bool is_top_frame) { |