1.1 --- a/src/share/vm/runtime/deoptimization.cpp Mon Sep 08 12:35:01 2014 -0700
1.2 +++ b/src/share/vm/runtime/deoptimization.cpp Tue Aug 08 15:57:29 2017 +0800
1.3 @@ -22,6 +22,12 @@
1.4 *
1.5 */
1.6
1.7 +/*
1.8 + * This file has been modified by Loongson Technology in 2015. These
1.9 + * modifications are Copyright (c) 2015 Loongson Technology, and are made
1.10 + * available on the same license terms set forth above.
1.11 + */
1.12 +
1.13 #include "precompiled.hpp"
1.14 #include "classfile/systemDictionary.hpp"
1.15 #include "code/debugInfoRec.hpp"
1.16 @@ -65,6 +71,9 @@
1.17 #ifdef TARGET_ARCH_ppc
1.18 # include "vmreg_ppc.inline.hpp"
1.19 #endif
1.20 +#ifdef TARGET_ARCH_mips
1.21 +# include "vmreg_mips.inline.hpp"
1.22 +#endif
1.23 #ifdef COMPILER2
1.24 #ifdef TARGET_ARCH_MODEL_x86_32
1.25 # include "adfiles/ad_x86_32.hpp"
1.26 @@ -87,6 +96,9 @@
1.27 #ifdef TARGET_ARCH_MODEL_ppc_64
1.28 # include "adfiles/ad_ppc_64.hpp"
1.29 #endif
1.30 +#ifdef TARGET_ARCH_MODEL_mips_64
1.31 +# include "adfiles/ad_mips_64.hpp"
1.32 +#endif
1.33 #endif // COMPILER2
1.34
1.35 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
1.36 @@ -698,7 +710,7 @@
1.37 (iframe->interpreter_frame_expression_stack_size() == (next_mask_expression_stack_size -
1.38 top_frame_expression_stack_adjustment))) ||
1.39 (is_top_frame && (exec_mode == Unpack_exception) && iframe->interpreter_frame_expression_stack_size() == 0) ||
1.40 - (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute) &&
1.41 + (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute || el->should_reexecute()) &&
1.42 (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + cur_invoke_parameter_size))
1.43 )) {
1.44 ttyLocker ttyl;
