Changeset 12768

Timestamp:

Sep 6, 2009, 10:43:06 AM (15 years ago)

Author:

Gary Palter

Message:

Flush buffers before asking for input in kernel debugger to keep Windows happy.
Also, make sure streams are setup before trying to display register contents
when called from an exception on the foreign stack.

File:

• trunk/source/lisp-kernel/lisp-debug.c (modified) (5 diffs)

trunk/source/lisp-kernel/lisp-debug.c

@@ -111 +111 @@
   stdIn = GetStdHandle(STD_INPUT_HANDLE);
   return (stdIn == NULL);
+}
+#endif
+
+
+#ifdef WINDOWS
+Boolean first_debugger_call = TRUE;
+
+void
+setup_debugger_streams()
+{
+  HANDLE h;
+  int fd;
+  FILE *f;
+
+  if (first_debugger_call) {
+    first_debugger_call = FALSE;
+    if (stdin_is_dev_null())
+      AllocConsole();
+    // Reassociate C's stdin with Windows' stdin
+    h = GetStdHandle(STD_INPUT_HANDLE);
+    fd = _open_osfhandle((intptr_t)h, _O_TEXT);
+    if (fd >= 0) {
+      f = _fdopen(fd, "r");
+      *stdin = *f;
+    }
+    // Reassociate C's stdout with Windows' stdout
+    h = GetStdHandle(STD_OUTPUT_HANDLE);
+    fd = _open_osfhandle((intptr_t)h, _O_TEXT);
+    if (fd >= 0) {
+      f = _fdopen(fd, "w");
+      *stdout = *f;
+    }
+    // Reassociate C's stderr with Windows' stderr
+    h = GetStdHandle(STD_ERROR_HANDLE);
+    fd = _open_osfhandle((intptr_t)h, _O_TEXT);
+    if (fd >= 0) {
+      f = _fdopen(fd, "w");
+      *stderr = *f;
+    }
+    dbgout = stderr;
+  }
+  return;
 }
 #endif
@@ -708 +750 @@
 {
 
+#ifdef WINDOWS
+  setup_debugger_streams();
+#endif
+
 #ifdef PPC
 #ifdef PPC64
@@ -1122 +1168 @@
 #endif
 
-#ifdef WINDOWS
-Boolean first_debugger_call = TRUE;
-#endif
-
 
 OSStatus
@@ -1139 +1181 @@
 
 #ifdef WINDOWS
-  HANDLE h;
-  int fd;
-  FILE *f;
-
-  if (first_debugger_call) {
-    first_debugger_call = FALSE;
-    if (stdin_is_dev_null())
-      AllocConsole();
-    // Reassociate C's stdin with Windows' stdin
-    h = GetStdHandle(STD_INPUT_HANDLE);
-    fd = _open_osfhandle((intptr_t)h, _O_TEXT);
-    if (fd >= 0) {
-      f = _fdopen(fd, "r");
-      *stdin = *f;
-    }
-    // Reassociate C's stdout with Windows' stdout
-    h = GetStdHandle(STD_OUTPUT_HANDLE);
-    fd = _open_osfhandle((intptr_t)h, _O_TEXT);
-    if (fd >= 0) {
-      f = _fdopen(fd, "w");
-      *stdout = *f;
-    }
-    // Reassociate C's stderr with Windows' stderr
-    h = GetStdHandle(STD_ERROR_HANDLE);
-    fd = _open_osfhandle((intptr_t)h, _O_TEXT);
-    if (fd >= 0) {
-      f = _fdopen(fd, "w");
-      *stderr = *f;
-    }
-    dbgout = stderr;
-  }
+  setup_debugger_streams();
 #endif
 
@@ -1225 +1237 @@
     fprintf(dbgout, "[%d] Clozure CL kernel debugger: ", main_thread_pid);
 #endif
+    fflush(dbgout);
     state = apply_debug_command(xp, readc(), info, why);
   }