comparison src/share/vm/adlc/main.cpp @ 14456:abec000618bf

Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents d16be2b85802 ad6695638a35
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14269:2a8891e0a082 14456:abec000618bf
240 #endif 240 #endif
241 #ifdef TARGET_ARCH_arm 241 #ifdef TARGET_ARCH_arm
242 AD.addInclude(AD._CPP_file, "nativeInst_arm.hpp"); 242 AD.addInclude(AD._CPP_file, "nativeInst_arm.hpp");
243 AD.addInclude(AD._CPP_file, "vmreg_arm.inline.hpp"); 243 AD.addInclude(AD._CPP_file, "vmreg_arm.inline.hpp");
244 #endif 244 #endif
245 #ifdef TARGET_ARCH_ppc
246 AD.addInclude(AD._CPP_file, "assembler_ppc.inline.hpp");
247 AD.addInclude(AD._CPP_file, "nativeInst_ppc.hpp");
248 AD.addInclude(AD._CPP_file, "vmreg_ppc.inline.hpp");
249 #endif
245 AD.addInclude(AD._HPP_file, "memory/allocation.hpp"); 250 AD.addInclude(AD._HPP_file, "memory/allocation.hpp");
246 AD.addInclude(AD._HPP_file, "opto/machnode.hpp"); 251 AD.addInclude(AD._HPP_file, "opto/machnode.hpp");
247 AD.addInclude(AD._HPP_file, "opto/node.hpp"); 252 AD.addInclude(AD._HPP_file, "opto/node.hpp");
248 AD.addInclude(AD._HPP_file, "opto/regalloc.hpp"); 253 AD.addInclude(AD._HPP_file, "opto/regalloc.hpp");
249 AD.addInclude(AD._HPP_file, "opto/subnode.hpp"); 254 AD.addInclude(AD._HPP_file, "opto/subnode.hpp");
264 AD.addInclude(AD._CPP_PEEPHOLE_file, "adfiles", get_basename(AD._HPP_file._name)); 269 AD.addInclude(AD._CPP_PEEPHOLE_file, "adfiles", get_basename(AD._HPP_file._name));
265 AD.addInclude(AD._CPP_PIPELINE_file, "precompiled.hpp"); 270 AD.addInclude(AD._CPP_PIPELINE_file, "precompiled.hpp");
266 AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name)); 271 AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name));
267 AD.addInclude(AD._DFA_file, "precompiled.hpp"); 272 AD.addInclude(AD._DFA_file, "precompiled.hpp");
268 AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name)); 273 AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name));
274 AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp"); // Use PROB_MAX in predicate.
269 AD.addInclude(AD._DFA_file, "opto/matcher.hpp"); 275 AD.addInclude(AD._DFA_file, "opto/matcher.hpp");
270 AD.addInclude(AD._DFA_file, "opto/opcodes.hpp"); 276 AD.addInclude(AD._DFA_file, "opto/opcodes.hpp");
271 // Make sure each .cpp file starts with include lines: 277 // Make sure each .cpp file starts with include lines:
272 // files declaring and defining generators for Mach* Objects (hpp,cpp) 278 // files declaring and defining generators for Mach* Objects (hpp,cpp)
273 // Generate the result files: 279 // Generate the result files:
297 AD.buildMachNodeGenerator(AD._CPP_GEN_file._fp);// .cpp 303 AD.buildMachNodeGenerator(AD._CPP_GEN_file._fp);// .cpp
298 // define methods for machine dependent instruction matching 304 // define methods for machine dependent instruction matching
299 AD.buildInstructMatchCheck(AD._CPP_file._fp); // .cpp 305 AD.buildInstructMatchCheck(AD._CPP_file._fp); // .cpp
300 // define methods for machine dependent frame management 306 // define methods for machine dependent frame management
301 AD.buildFrameMethods(AD._CPP_file._fp); // .cpp 307 AD.buildFrameMethods(AD._CPP_file._fp); // .cpp
308 AD.generate_needs_clone_jvms(AD._CPP_file._fp);
302 309
303 // do this last: 310 // do this last:
304 AD.addPreprocessorChecks(AD._CPP_file._fp); // .cpp 311 AD.addPreprocessorChecks(AD._CPP_file._fp); // .cpp
305 AD.addPreprocessorChecks(AD._CPP_CLONE_file._fp); // .cpp 312 AD.addPreprocessorChecks(AD._CPP_CLONE_file._fp); // .cpp
306 AD.addPreprocessorChecks(AD._CPP_EXPAND_file._fp); // .cpp 313 AD.addPreprocessorChecks(AD._CPP_EXPAND_file._fp); // .cpp