comparison src/share/vm/adlc/main.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
241 #endif 241 #endif
242 #ifdef TARGET_ARCH_arm 242 #ifdef TARGET_ARCH_arm
243 AD.addInclude(AD._CPP_file, "nativeInst_arm.hpp"); 243 AD.addInclude(AD._CPP_file, "nativeInst_arm.hpp");
244 AD.addInclude(AD._CPP_file, "vmreg_arm.inline.hpp"); 244 AD.addInclude(AD._CPP_file, "vmreg_arm.inline.hpp");
245 #endif 245 #endif
246 #ifdef TARGET_ARCH_ppc
247 AD.addInclude(AD._CPP_file, "assembler_ppc.inline.hpp");
248 AD.addInclude(AD._CPP_file, "nativeInst_ppc.hpp");
249 AD.addInclude(AD._CPP_file, "vmreg_ppc.inline.hpp");
250 #endif
246 AD.addInclude(AD._HPP_file, "memory/allocation.hpp"); 251 AD.addInclude(AD._HPP_file, "memory/allocation.hpp");
247 AD.addInclude(AD._HPP_file, "opto/machnode.hpp"); 252 AD.addInclude(AD._HPP_file, "opto/machnode.hpp");
248 AD.addInclude(AD._HPP_file, "opto/node.hpp"); 253 AD.addInclude(AD._HPP_file, "opto/node.hpp");
249 AD.addInclude(AD._HPP_file, "opto/regalloc.hpp"); 254 AD.addInclude(AD._HPP_file, "opto/regalloc.hpp");
250 AD.addInclude(AD._HPP_file, "opto/subnode.hpp"); 255 AD.addInclude(AD._HPP_file, "opto/subnode.hpp");
265 AD.addInclude(AD._CPP_PEEPHOLE_file, "adfiles", get_basename(AD._HPP_file._name)); 270 AD.addInclude(AD._CPP_PEEPHOLE_file, "adfiles", get_basename(AD._HPP_file._name));
266 AD.addInclude(AD._CPP_PIPELINE_file, "precompiled.hpp"); 271 AD.addInclude(AD._CPP_PIPELINE_file, "precompiled.hpp");
267 AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name)); 272 AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name));
268 AD.addInclude(AD._DFA_file, "precompiled.hpp"); 273 AD.addInclude(AD._DFA_file, "precompiled.hpp");
269 AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name)); 274 AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name));
275 AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp"); // Use PROB_MAX in predicate.
270 AD.addInclude(AD._DFA_file, "opto/matcher.hpp"); 276 AD.addInclude(AD._DFA_file, "opto/matcher.hpp");
271 AD.addInclude(AD._DFA_file, "opto/opcodes.hpp"); 277 AD.addInclude(AD._DFA_file, "opto/opcodes.hpp");
272 // Make sure each .cpp file starts with include lines: 278 // Make sure each .cpp file starts with include lines:
273 // files declaring and defining generators for Mach* Objects (hpp,cpp) 279 // files declaring and defining generators for Mach* Objects (hpp,cpp)
274 // Generate the result files: 280 // Generate the result files:
298 AD.buildMachNodeGenerator(AD._CPP_GEN_file._fp);// .cpp 304 AD.buildMachNodeGenerator(AD._CPP_GEN_file._fp);// .cpp
299 // define methods for machine dependent instruction matching 305 // define methods for machine dependent instruction matching
300 AD.buildInstructMatchCheck(AD._CPP_file._fp); // .cpp 306 AD.buildInstructMatchCheck(AD._CPP_file._fp); // .cpp
301 // define methods for machine dependent frame management 307 // define methods for machine dependent frame management
302 AD.buildFrameMethods(AD._CPP_file._fp); // .cpp 308 AD.buildFrameMethods(AD._CPP_file._fp); // .cpp
309 AD.generate_needs_clone_jvms(AD._CPP_file._fp);
303 310
304 // do this last: 311 // do this last:
305 AD.addPreprocessorChecks(AD._CPP_file._fp); // .cpp 312 AD.addPreprocessorChecks(AD._CPP_file._fp); // .cpp
306 AD.addPreprocessorChecks(AD._CPP_CLONE_file._fp); // .cpp 313 AD.addPreprocessorChecks(AD._CPP_CLONE_file._fp); // .cpp
307 AD.addPreprocessorChecks(AD._CPP_EXPAND_file._fp); // .cpp 314 AD.addPreprocessorChecks(AD._CPP_EXPAND_file._fp); // .cpp