--- a/callcc.patch Thu Apr 17 00:38:41 2008 -0700
+++ b/callcc.patch Thu Apr 17 00:39:29 2008 -0700
@@ -63,7 +63,7 @@ diff --git a/src/share/vm/prims/unsafe.c
diff --git a/src/share/vm/prims/unsafe.cpp b/src/share/vm/prims/unsafe.cpp
--- a/src/share/vm/prims/unsafe.cpp
+++ b/src/share/vm/prims/unsafe.cpp
-@@ -1024,6 +1024,360 @@ UNSAFE_END
+@@ -1024,6 +1024,368 @@ UNSAFE_END
UNSAFE_END
@@ -327,14 +327,22 @@ diff --git a/src/share/vm/prims/unsafe.c
+ for (; vf; vf = vf->sender()) {
+ if (sser.is_losing()) break;
+ if (vf->is_java_frame()) {
-+ tty->print("copyStack: adding "); vf->print(); //@@
++ if (PrintMiscellaneous && (Verbose || WizardMode)) {
++ tty->print_cr("copyStack: adding frame");
++ NOT_PRODUCT(vf->print());
++ }
+ sser.write_frame(javaVFrame::cast(vf));
+ } else {
-+ tty->print("copyStack: stopping at "); vf->print(); //@@
++ if (PrintMiscellaneous && (Verbose || WizardMode)) {
++ tty->print_cr("copyStack: stopping at frame");
++ NOT_PRODUCT(vf->print());
++ }
+ break;
+ }
+ if (context != NULL && frame_matches_context(vf, context)) {
-+ tty->print("copyStack: stopping at context frame"); //@@
++ if (PrintMiscellaneous && (Verbose || WizardMode)) {
++ tty->print_cr("copyStack: stopping at context frame");
++ }
+ break;
+ }
+ }
@@ -424,7 +432,7 @@ diff --git a/src/share/vm/prims/unsafe.c
/// JVM_RegisterUnsafeMethods
#define ADR "J"
-@@ -1293,6 +1647,16 @@ static JNINativeMethod methods[] = {
+@@ -1293,6 +1655,16 @@ static JNINativeMethod methods[] = {
};
@@ -441,7 +449,7 @@ diff --git a/src/share/vm/prims/unsafe.c
JNINativeMethod loadavg_method[] = {
{CC"getLoadAverage", CC"([DI)I", FN_PTR(Unsafe_Loadavg)}
};
-@@ -1388,6 +1752,15 @@ JVM_ENTRY(void, JVM_RegisterUnsafeMethod
+@@ -1388,6 +1760,15 @@ JVM_ENTRY(void, JVM_RegisterUnsafeMethod
env->ExceptionClear();
}
}