projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.29.13: relax CAST-EXTERNALLY-CHECKABLE-P a bit
[sbcl.git]
/
src
/
runtime
/
monitor.c
diff --git
a/src/runtime/monitor.c
b/src/runtime/monitor.c
index
0856db7
..
6920df4
100644
(file)
--- a/
src/runtime/monitor.c
+++ b/
src/runtime/monitor.c
@@
-188,19
+188,26
@@
kill_cmd(char **ptr)
static void
regs_cmd(char **ptr)
{
static void
regs_cmd(char **ptr)
{
- printf("CSP\t=\t0x%08lx\n", (unsigned long)current_control_stack_pointer);
- printf("CFP\t=\t0x%08lx\n", (unsigned long)current_control_frame_pointer);
+ struct thread *thread=arch_os_get_current_thread();
+
+ printf("CSP\t=\t0x%08lx ", (unsigned long)current_control_stack_pointer);
+ printf("CFP\t=\t0x%08lx ", (unsigned long)current_control_frame_pointer);
#ifdef reg_BSP
printf("BSP\t=\t0x%08lx\n", (unsigned long)current_binding_stack_pointer);
#else
/* printf("BSP\t=\t0x%08lx\n",
(unsigned long)SymbolValue(BINDING_STACK_POINTER)); */
#ifdef reg_BSP
printf("BSP\t=\t0x%08lx\n", (unsigned long)current_binding_stack_pointer);
#else
/* printf("BSP\t=\t0x%08lx\n",
(unsigned long)SymbolValue(BINDING_STACK_POINTER)); */
+ printf("\n");
#endif
#ifdef LISP_FEATURE_GENCGC
/* printf("DYNAMIC\t=\t0x%08lx\n", DYNAMIC_SPACE_START); */
#else
#endif
#ifdef LISP_FEATURE_GENCGC
/* printf("DYNAMIC\t=\t0x%08lx\n", DYNAMIC_SPACE_START); */
#else
+ printf("STATIC\t=\t0x%08lx ",
+ (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER, thread));
+ printf("RDONLY\t=\t0x%08lx ",
+ (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER, thread));
printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)current_dynamic_space);
#endif
printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)current_dynamic_space);
#endif
@@
-208,20
+215,12
@@
regs_cmd(char **ptr)
printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer);
#else
printf("ALLOC\t=\t0x%08lx\n",
printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer);
#else
printf("ALLOC\t=\t0x%08lx\n",
- (unsigned long)SymbolValue(ALLOCATION_POINTER,
- arch_os_get_current_thread()));
+ (unsigned long)SymbolValue(ALLOCATION_POINTER, thread));
#endif
#ifndef LISP_FEATURE_GENCGC
printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger);
#endif
#endif
#ifndef LISP_FEATURE_GENCGC
printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger);
#endif
-
-#if 0
- printf("STATIC\t=\t0x%08lx\n",
- (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER));
- printf("RDONLY\t=\t0x%08lx\n",
- (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
-#endif
}
static void
}
static void
@@
-303,9
+302,13
@@
quit_cmd(char **ptr)
printf("Really quit? [y] ");
fflush(stdout);
printf("Really quit? [y] ");
fflush(stdout);
- fgets(buf, sizeof(buf), ldb_in);
- if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n')
+ if (fgets(buf, sizeof(buf), ldb_in)) {
+ if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n')
+ exit(1);
+ } else {
+ printf("\nUnable to read response, assuming y.\n");
exit(1);
exit(1);
+ }
}
static void
}
static void
@@
-451,6
+454,10
@@
sub_monitor(void)
if (!ldb_in) {
#ifndef LISP_FEATURE_WIN32
ldb_in = fopen("/dev/tty","r+");
if (!ldb_in) {
#ifndef LISP_FEATURE_WIN32
ldb_in = fopen("/dev/tty","r+");
+ if (ldb_in == NULL) {
+ perror("Error opening /dev/tty");
+ ldb_in = stdin;
+ }
#else
ldb_in = stdin;
#endif
#else
ldb_in = stdin;
#endif