--- a/src/share/vm/c1/c1_Runtime1.hpp	Wed Jun 08 13:40:25 2011 +0200
+++ b/src/share/vm/c1/c1_Runtime1.hpp	Wed Jun 08 14:01:51 2011 +0200
@@ -70,14 +70,14 @@
   stub(g1_post_barrier_slow)         \
   stub(fpu2long_stub)                \
   stub(counter_overflow)             \
-  stub(c1x_unwind_exception_call)    \
-  stub(c1x_handle_exception)         \
-  stub(c1x_slow_subtype_check)       \
-  stub(c1x_arithmetic_frem)          \
-  stub(c1x_arithmetic_drem)          \
-  stub(c1x_monitorenter)             \
-  stub(c1x_monitorexit)              \
-  stub(c1x_verify_pointer)           \
+  stub(graal_unwind_exception_call)    \
+  stub(graal_handle_exception)         \
+  stub(graal_slow_subtype_check)       \
+  stub(graal_arithmetic_frem)          \
+  stub(graal_arithmetic_drem)          \
+  stub(graal_monitorenter)             \
+  stub(graal_monitorexit)              \
+  stub(graal_verify_pointer)           \
   last_entry(number_of_ids)
 
 #define DECLARE_STUB_ID(x)       x ## _id ,
@@ -133,7 +133,7 @@
   static OopMapSet* generate_exception_throw(StubAssembler* sasm, address target, bool has_argument);
   static OopMapSet* generate_handle_exception(StubID id, StubAssembler* sasm);
   static void       generate_unwind_exception(StubAssembler *sasm);
-  static void       c1x_generate_handle_exception(StubAssembler *sasm, OopMapSet* oop_maps, OopMap* oop_map);
+  static void       graal_generate_handle_exception(StubAssembler *sasm, OopMapSet* oop_maps, OopMap* oop_map);
   static OopMapSet* generate_patching(StubAssembler* sasm, address target);
 
   static OopMapSet* generate_stub_call(StubAssembler* sasm, Register result, address entry,