src/share/vm/c1/c1_MacroAssembler.hpp

@@ -20,10 +20,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  *
  */
 
+#ifndef SHARE_VM_C1_C1_MACROASSEMBLER_HPP
+#define SHARE_VM_C1_C1_MACROASSEMBLER_HPP
+
+#include "asm/assembler.hpp"
+#ifdef TARGET_ARCH_x86
+# include "assembler_x86.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_sparc
+# include "assembler_sparc.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_zero
+# include "assembler_zero.inline.hpp"
+#endif
+
 class CodeEmitInfo;
 
 class C1_MacroAssembler: public MacroAssembler {
  public:
   // creation

@@ -39,11 +53,17 @@
   void unverified_entry(Register receiver, Register ic_klass);
   void verified_entry();
   void verify_stack_oop(int offset) PRODUCT_RETURN;
   void verify_not_null_oop(Register r)  PRODUCT_RETURN;
 
-#include "incls/_c1_MacroAssembler_pd.hpp.incl"
+#ifdef TARGET_ARCH_x86
+# include "c1_MacroAssembler_x86.hpp"
+#endif
+#ifdef TARGET_ARCH_sparc
+# include "c1_MacroAssembler_sparc.hpp"
+#endif
+
 };
 
 
 
 // A StubAssembler is a MacroAssembler w/ extra functionality for runtime

@@ -78,5 +98,7 @@
   int call_RT(Register oop_result1, Register oop_result2, address entry, int args_size = 0);
   int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1);
   int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2);
   int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2, Register arg3);
 };
+
+#endif // SHARE_VM_C1_C1_MACROASSEMBLER_HPP