Mercurial > hg > truffle
comparison src/share/vm/runtime/frame.hpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 4ca6dc0799b6 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
44 # include "adfiles/adGlobals_zero.hpp" | 44 # include "adfiles/adGlobals_zero.hpp" |
45 #endif | 45 #endif |
46 #ifdef TARGET_ARCH_MODEL_arm | 46 #ifdef TARGET_ARCH_MODEL_arm |
47 # include "adfiles/adGlobals_arm.hpp" | 47 # include "adfiles/adGlobals_arm.hpp" |
48 #endif | 48 #endif |
49 #ifdef TARGET_ARCH_MODEL_ppc | 49 #ifdef TARGET_ARCH_MODEL_ppc_32 |
50 # include "adfiles/adGlobals_ppc.hpp" | 50 # include "adfiles/adGlobals_ppc_32.hpp" |
51 #endif | 51 #endif |
52 #endif | 52 #ifdef TARGET_ARCH_MODEL_ppc_64 |
53 # include "adfiles/adGlobals_ppc_64.hpp" | |
54 #endif | |
55 #endif // COMPILER2 | |
53 #ifdef ZERO | 56 #ifdef ZERO |
54 #ifdef TARGET_ARCH_zero | 57 #ifdef TARGET_ARCH_zero |
55 # include "stack_zero.hpp" | 58 # include "stack_zero.hpp" |
56 #endif | 59 #endif |
57 #endif | 60 #endif |
309 // template based interpreter deoptimization support | 312 // template based interpreter deoptimization support |
310 void set_interpreter_frame_sender_sp(intptr_t* sender_sp); | 313 void set_interpreter_frame_sender_sp(intptr_t* sender_sp); |
311 void interpreter_frame_set_monitor_end(BasicObjectLock* value); | 314 void interpreter_frame_set_monitor_end(BasicObjectLock* value); |
312 #endif // CC_INTERP | 315 #endif // CC_INTERP |
313 | 316 |
317 // Address of the temp oop in the frame. Needed as GC root. | |
318 oop* interpreter_frame_temp_oop_addr() const; | |
319 | |
314 // BasicObjectLocks: | 320 // BasicObjectLocks: |
315 // | 321 // |
316 // interpreter_frame_monitor_begin is higher in memory than interpreter_frame_monitor_end | 322 // interpreter_frame_monitor_begin is higher in memory than interpreter_frame_monitor_end |
317 // Interpreter_frame_monitor_begin points to one element beyond the oldest one, | 323 // Interpreter_frame_monitor_begin points to one element beyond the oldest one, |
318 // interpreter_frame_monitor_end points to the youngest one, or if there are none, | 324 // interpreter_frame_monitor_end points to the youngest one, or if there are none, |
345 // Method & constant pool cache | 351 // Method & constant pool cache |
346 Method* interpreter_frame_method() const; | 352 Method* interpreter_frame_method() const; |
347 void interpreter_frame_set_method(Method* method); | 353 void interpreter_frame_set_method(Method* method); |
348 Method** interpreter_frame_method_addr() const; | 354 Method** interpreter_frame_method_addr() const; |
349 ConstantPoolCache** interpreter_frame_cache_addr() const; | 355 ConstantPoolCache** interpreter_frame_cache_addr() const; |
350 #ifdef PPC | |
351 oop* interpreter_frame_mirror_addr() const; | |
352 #endif | |
353 | 356 |
354 public: | 357 public: |
355 // Entry frames | 358 // Entry frames |
356 JavaCallWrapper* entry_frame_call_wrapper() const { return *entry_frame_call_wrapper_addr(); } | 359 JavaCallWrapper* entry_frame_call_wrapper() const { return *entry_frame_call_wrapper_addr(); } |
357 JavaCallWrapper* entry_frame_call_wrapper_if_safe(JavaThread* thread) const; | 360 JavaCallWrapper* entry_frame_call_wrapper_if_safe(JavaThread* thread) const; |