# HG changeset patch
# User Thomas Wuerthinger <wuerthinger@ssw.jku.at>
# Date 1294422309 -3600
# Node ID 9c96c873c42b4ed6578d9eec921c59bed26226bd
# Parent  06f017f7daa7f57173aadc8b4e6e8536a4a2593d
Fix includes to match new hotspot mechanism.

diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_CodeInstaller.cpp
--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,8 +22,13 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_c1x_CodeInstaller.cpp.incl"
+#include "precompiled.hpp"
+#include "c1x/c1x_Compiler.hpp"
+#include "c1x/c1x_CodeInstaller.hpp"
+#include "c1x/c1x_TargetMethod.hpp"
+#include "c1x/c1x_VmIds.hpp"
+#include "c1/c1_Runtime1.hpp"
+#include "vmreg_x86.inline.hpp"
 
 
 // TODO this should be handled in a more robust way - not hard coded...
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_Compiler.cpp
--- a/src/share/vm/c1x/c1x_Compiler.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_Compiler.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,8 +22,13 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_c1x_Compiler.cpp.incl"
+#include "precompiled.hpp"
+#include "c1x/c1x_Compiler.hpp"
+#include "c1x/c1x_TargetMethod.hpp"
+#include "c1x/c1x_VMExits.hpp"
+#include "c1x/c1x_VMEntries.hpp"
+#include "c1x/c1x_VmIds.hpp"
+#include "c1/c1_Runtime1.hpp"
 
 C1XCompiler* C1XCompiler::_instance = NULL;
 
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_Compiler.hpp
--- a/src/share/vm/c1x/c1x_Compiler.hpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_Compiler.hpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,6 +22,8 @@
  *
  */
 
+#include "compiler/abstractCompiler.hpp"
+
 class C1XCompiler : public AbstractCompiler {
 
 private:
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_TargetMethod.cpp
--- a/src/share/vm/c1x/c1x_TargetMethod.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_TargetMethod.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,8 +22,8 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_c1x_TargetMethod.cpp.incl"
+#include "precompiled.hpp"
+#include "c1x/c1x_TargetMethod.hpp"
 
 // This function is similar to javaClasses.cpp, it computes the field offset of a (static or instance) field.
 // It looks up the name and signature symbols without creating new ones, all the symbols of these classes need to be already loaded.
@@ -43,7 +43,7 @@
   fieldDescriptor fd;
   if (!ik->find_field(name_symbol, signature_symbol, &fd)) {
     ResourceMark rm;
-    tty->print_cr("Invalid layout of %s at %s", ik->external_name(), name_symbol->as_C_string());
+    tty->print_cr("Invalid layout of %s at %s", name_symbol->as_C_string(), ik->external_name());
     fatal("Invalid layout of preloaded class");
   }
   assert(fd.is_static() == static_field, "static/instance mismatch");
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_VMEntries.cpp
--- a/src/share/vm/c1x/c1x_VMEntries.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_VMEntries.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,8 +22,14 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_c1x_VMEntries.cpp.incl"
+#include "precompiled.hpp"
+#include "c1x/c1x_VMEntries.hpp"
+#include "c1x/c1x_Compiler.hpp"
+#include "c1x/c1x_TargetMethod.hpp"
+#include "c1x/c1x_CodeInstaller.hpp"
+#include "c1x/c1x_VMExits.hpp"
+#include "c1x/c1x_VmIds.hpp"
+#include "c1/c1_Runtime1.hpp"
 
 // public byte[] RiMethod_code(long vmId);
 JNIEXPORT jbyteArray JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiMethod_1code(JNIEnv *env, jobject, jlong vmId) {
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_VMExits.cpp
--- a/src/share/vm/c1x/c1x_VMExits.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_VMExits.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,8 +22,8 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_c1x_VMExits.cpp.incl"
+#include "precompiled.hpp"
+#include "c1x/c1x_VMExits.hpp"
 
 // this is a *global* handle
 jobject VMExits::_vmExitsPermObject;
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/c1x/c1x_VmIds.cpp
--- a/src/share/vm/c1x/c1x_VmIds.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/c1x/c1x_VmIds.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -22,8 +22,8 @@
  *
  */
 
-# include "incls/_precompiled.incl"
-# include "incls/_c1x_VmIds.cpp.incl"
+#include "precompiled.hpp"
+#include "c1x/c1x_VmIds.hpp"
 
 // VmIds implementation
 
diff -r 06f017f7daa7 -r 9c96c873c42b src/share/vm/compiler/compileBroker.cpp
--- a/src/share/vm/compiler/compileBroker.cpp	Fri Jan 07 18:18:08 2011 +0100
+++ b/src/share/vm/compiler/compileBroker.cpp	Fri Jan 07 18:45:09 2011 +0100
@@ -44,6 +44,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/sweeper.hpp"
 #include "utilities/dtrace.hpp"
+#include "c1x/c1x_Compiler.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"
 #endif