Mercurial > hg > truffle
comparison src/share/vm/interpreter/templateInterpreter.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | 6b0fd0964b87 |
children | 096c224171c4 |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
178 #ifndef PRODUCT | 178 #ifndef PRODUCT |
179 EntryPoint TemplateInterpreter::_trace_code; | 179 EntryPoint TemplateInterpreter::_trace_code; |
180 #endif // !PRODUCT | 180 #endif // !PRODUCT |
181 EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_return_entries]; | 181 EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_return_entries]; |
182 EntryPoint TemplateInterpreter::_earlyret_entry; | 182 EntryPoint TemplateInterpreter::_earlyret_entry; |
183 EntryPoint TemplateInterpreter::_deopt_entry[TemplateInterpreter::number_of_deopt_entries ]; | 183 EntryPoint TemplateInterpreter::_deopt_entry [TemplateInterpreter::number_of_deopt_entries ]; |
184 EntryPoint TemplateInterpreter::_continuation_entry; | 184 EntryPoint TemplateInterpreter::_continuation_entry; |
185 EntryPoint TemplateInterpreter::_safept_entry; | 185 EntryPoint TemplateInterpreter::_safept_entry; |
186 | 186 |
187 address TemplateInterpreter::_return_3_addrs_by_index[TemplateInterpreter::number_of_return_addrs]; | 187 address TemplateInterpreter::_return_3_addrs_by_index[TemplateInterpreter::number_of_return_addrs]; |
188 address TemplateInterpreter::_return_5_addrs_by_index[TemplateInterpreter::number_of_return_addrs]; | 188 address TemplateInterpreter::_return_5_addrs_by_index[TemplateInterpreter::number_of_return_addrs]; |