1.1 --- a/src/share/vm/runtime/frame.hpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/share/vm/runtime/frame.hpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -22,6 +22,35 @@ 1.4 * 1.5 */ 1.6 1.7 +#ifndef SHARE_VM_RUNTIME_FRAME_HPP 1.8 +#define SHARE_VM_RUNTIME_FRAME_HPP 1.9 + 1.10 +#include "asm/assembler.hpp" 1.11 +#include "oops/methodOop.hpp" 1.12 +#include "runtime/basicLock.hpp" 1.13 +#include "runtime/monitorChunk.hpp" 1.14 +#include "runtime/registerMap.hpp" 1.15 +#include "utilities/top.hpp" 1.16 +#ifdef COMPILER2 1.17 +#ifdef TARGET_ARCH_MODEL_x86_32 1.18 +# include "adfiles/adGlobals_x86_32.hpp" 1.19 +#endif 1.20 +#ifdef TARGET_ARCH_MODEL_x86_64 1.21 +# include "adfiles/adGlobals_x86_64.hpp" 1.22 +#endif 1.23 +#ifdef TARGET_ARCH_MODEL_sparc 1.24 +# include "adfiles/adGlobals_sparc.hpp" 1.25 +#endif 1.26 +#ifdef TARGET_ARCH_MODEL_zero 1.27 +# include "adfiles/adGlobals_zero.hpp" 1.28 +#endif 1.29 +#endif 1.30 +#ifdef ZERO 1.31 +#ifdef TARGET_ARCH_zero 1.32 +# include "stack_zero.hpp" 1.33 +#endif 1.34 +#endif 1.35 + 1.36 typedef class BytecodeInterpreter* interpreterState; 1.37 1.38 class CodeBlob; 1.39 @@ -419,7 +448,16 @@ 1.40 1.41 int pd_oop_map_offset_adjustment() const; 1.42 1.43 -# include "incls/_frame_pd.hpp.incl" 1.44 +#ifdef TARGET_ARCH_x86 1.45 +# include "frame_x86.hpp" 1.46 +#endif 1.47 +#ifdef TARGET_ARCH_sparc 1.48 +# include "frame_sparc.hpp" 1.49 +#endif 1.50 +#ifdef TARGET_ARCH_zero 1.51 +# include "frame_zero.hpp" 1.52 +#endif 1.53 + 1.54 }; 1.55 1.56 1.57 @@ -451,3 +489,5 @@ 1.58 frame *current() { return &_fr; } 1.59 RegisterMap* register_map() { return &_reg_map; } 1.60 }; 1.61 + 1.62 +#endif // SHARE_VM_RUNTIME_FRAME_HPP