# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1354616063 -3600
# Node ID 5a95c784febfe91e2fb1a6dc233ffad0dce48efd
# Parent  7c5f7e7cf2c20d48299125eac762e3a82e194722
fixed windows make files and VS2012-specific compilation issues

diff -r 7c5f7e7cf2c2 -r 5a95c784febf make/windows/makefiles/projectcreator.make
--- a/make/windows/makefiles/projectcreator.make	Tue Dec 04 10:10:02 2012 +0100
+++ b/make/windows/makefiles/projectcreator.make	Tue Dec 04 11:14:23 2012 +0100
@@ -144,6 +144,9 @@
  -ignorePath_TARGET tiered \
  -ignorePath_TARGET c1_
 
+ProjectCreatorIDEOptionsIgnoreGraal=\
+ -ignorePath_TARGET graal
+ 
 ProjectCreatorIDEOptionsIgnoreCompiler2=\
  -ignorePath_TARGET compiler2 \
  -ignorePath_TARGET tiered \
@@ -230,15 +233,18 @@
  -define_compiler1 COMPILER1 \
  -ignorePath_compiler1 core \
  -ignorePath_compiler1 src/share/vm/graal \
-$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
+ $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler1) \
+ $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
 
 ##################################################
 # Graal compiler specific options
 ##################################################
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
- -define_graal COMPILER1 \
  -define_graal GRAAL \
-$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal)
+ -ignorePath_graal core \
+ -ignorePath_graal src/share/vm/c1 \
+ $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \
+ $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal)
 
 ##################################################
 # Server(C2) compiler specific options
@@ -260,6 +266,7 @@
  -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \
  -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \
  -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \
+ $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler2) \
  $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2)
 
 # Add in the jvmti (JSR-163) options
diff -r 7c5f7e7cf2c2 -r 5a95c784febf make/windows/makefiles/vm.make
--- a/make/windows/makefiles/vm.make	Tue Dec 04 10:10:02 2012 +0100
+++ b/make/windows/makefiles/vm.make	Tue Dec 04 11:14:23 2012 +0100
@@ -61,7 +61,7 @@
 !endif
 
 !if "$(Variant)" == "graal"
-CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "GRAAL"
+CPP_FLAGS=$(CPP_FLAGS) /D "GRAAL"
 !endif
 
 !if "$(BUILDARCH)" == "i486"
diff -r 7c5f7e7cf2c2 -r 5a95c784febf src/cpu/x86/vm/c1_globals_x86.hpp
--- a/src/cpu/x86/vm/c1_globals_x86.hpp	Tue Dec 04 10:10:02 2012 +0100
+++ b/src/cpu/x86/vm/c1_globals_x86.hpp	Tue Dec 04 11:14:23 2012 +0100
@@ -57,6 +57,7 @@
 define_pd_global(bool, CICompileOSR,                 true );
 #endif // !TIERED
 define_pd_global(bool, UseTypeProfile,               false);
+define_pd_global(intx, TypeProfileWidth,             0);
 define_pd_global(bool, RoundFPResults,               true );
 
 define_pd_global(bool, LIRFillDelaySlots,            false);
diff -r 7c5f7e7cf2c2 -r 5a95c784febf src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Tue Dec 04 10:10:02 2012 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Tue Dec 04 11:14:23 2012 +0100
@@ -49,8 +49,8 @@
   JavaThread* THREAD = JavaThread::current();
   TRACE_graal_1("GraalCompiler::initialize");
 
-  unsigned long heap_end = (long) Universe::heap()->reserved_region().end();
-  unsigned long allocation_end = heap_end + 16l * 1024 * 1024 * 1024;
+  uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end();
+  uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024;
   guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)");
   NOT_LP64(error("check TLAB allocation code for address space conflicts"));
 
diff -r 7c5f7e7cf2c2 -r 5a95c784febf src/share/vm/graal/graalRuntime.cpp
--- a/src/share/vm/graal/graalRuntime.cpp	Tue Dec 04 10:10:02 2012 +0100
+++ b/src/share/vm/graal/graalRuntime.cpp	Tue Dec 04 11:14:23 2012 +0100
@@ -229,6 +229,9 @@
   FUNCTION_CASE(entry, TRACE_TIME_METHOD);
 #endif
 
+  ShouldNotReachHere();
+  return NULL;
+
 #undef FUNCTION_CASE
 }