Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/deoptimization.cpp @ 14460:8a9bb7821e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 19 Feb 2014 12:08:49 -0800
parents 63a4eb8bcd23 abec000618bf
children fdad2932c73f
comparison
equal deleted inserted replaced
14360:e8ef156f0bc9 14460:8a9bb7821e28
79 # include "adfiles/ad_zero.hpp" 79 # include "adfiles/ad_zero.hpp"
80 #endif 80 #endif
81 #ifdef TARGET_ARCH_MODEL_arm 81 #ifdef TARGET_ARCH_MODEL_arm
82 # include "adfiles/ad_arm.hpp" 82 # include "adfiles/ad_arm.hpp"
83 #endif 83 #endif
84 #ifdef TARGET_ARCH_MODEL_ppc 84 #ifdef TARGET_ARCH_MODEL_ppc_32
85 # include "adfiles/ad_ppc.hpp" 85 # include "adfiles/ad_ppc_32.hpp"
86 #endif 86 #endif
87 #endif 87 #ifdef TARGET_ARCH_MODEL_ppc_64
88 # include "adfiles/ad_ppc_64.hpp"
89 #endif
90 #endif // COMPILER2
88 91
89 bool DeoptimizationMarker::_is_active = false; 92 bool DeoptimizationMarker::_is_active = false;
90 93
91 Deoptimization::UnrollBlock::UnrollBlock(int size_of_deoptimized_frame, 94 Deoptimization::UnrollBlock::UnrollBlock(int size_of_deoptimized_frame,
92 int caller_adjustment, 95 int caller_adjustment,