Mercurial > hg > truffle
comparison src/share/vm/runtime/frame.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | 2b8e28fdf503 |
children | f460c6926af7 78112be27ba0 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
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 |
345 // Method & constant pool cache | 348 // Method & constant pool cache |
346 Method* interpreter_frame_method() const; | 349 Method* interpreter_frame_method() const; |
347 void interpreter_frame_set_method(Method* method); | 350 void interpreter_frame_set_method(Method* method); |
348 Method** interpreter_frame_method_addr() const; | 351 Method** interpreter_frame_method_addr() const; |
349 ConstantPoolCache** interpreter_frame_cache_addr() const; | 352 ConstantPoolCache** interpreter_frame_cache_addr() const; |
350 #ifdef PPC | 353 #ifdef PPC32 |
351 oop* interpreter_frame_mirror_addr() const; | 354 oop* interpreter_frame_mirror_addr() const; |
352 #endif | 355 #endif |
353 | 356 |
354 public: | 357 public: |
355 // Entry frames | 358 // Entry frames |