projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.24.12: adding and fixing the HPUX/HPPA build target
[sbcl.git]
/
src
/
runtime
/
monitor.c
diff --git
a/src/runtime/monitor.c
b/src/runtime/monitor.c
index
0f82724
..
ce0ef79
100644
(file)
--- a/
src/runtime/monitor.c
+++ b/
src/runtime/monitor.c
@@
-9,16
+9,19
@@
* files for more information.
*/
* files for more information.
*/
+#include "sbcl.h"
+
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <setjmp.h>
#include <sys/time.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <setjmp.h>
#include <sys/time.h>
+#ifndef LISP_FEATURE_WIN32
#include <sys/resource.h>
#include <sys/resource.h>
+#endif
#include <signal.h>
#include <unistd.h>
#include <signal.h>
#include <unistd.h>
-#include "sbcl.h"
#include "runtime.h"
#include "parse.h"
#include "vars.h"
#include "runtime.h"
#include "parse.h"
#include "vars.h"
@@
-177,25
+180,34
@@
print_cmd(char **ptr)
static void
kill_cmd(char **ptr)
{
static void
kill_cmd(char **ptr)
{
+#ifndef LISP_FEATURE_WIN32
kill(getpid(), parse_number(ptr));
kill(getpid(), parse_number(ptr));
+#endif
}
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
@@
-203,19
+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));
+ (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
@@
-351,31
+356,31
@@
print_context(os_context_t *context)
static void
print_context_cmd(char **ptr)
{
static void
print_context_cmd(char **ptr)
{
- int free;
+ int free_ici;
struct thread *thread=arch_os_get_current_thread();
struct thread *thread=arch_os_get_current_thread();
- free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
+ free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
if (more_p(ptr)) {
int index;
index = parse_number(ptr);
if (more_p(ptr)) {
int index;
index = parse_number(ptr);
- if ((index >= 0) && (index < free)) {
- printf("There are %d interrupt contexts.\n", free);
+ if ((index >= 0) && (index < free_ici)) {
+ printf("There are %d interrupt contexts.\n", free_ici);
printf("printing context %d\n", index);
print_context(thread->interrupt_contexts[index]);
} else {
printf("There aren't that many/few contexts.\n");
printf("printing context %d\n", index);
print_context(thread->interrupt_contexts[index]);
} else {
printf("There aren't that many/few contexts.\n");
- printf("There are %d interrupt contexts.\n", free);
+ printf("There are %d interrupt contexts.\n", free_ici);
}
} else {
}
} else {
- if (free == 0)
+ if (free_ici == 0)
printf("There are no interrupt contexts!\n");
else {
printf("There are no interrupt contexts!\n");
else {
- printf("There are %d interrupt contexts.\n", free);
- printf("printing context %d\n", free - 1);
- print_context(thread->interrupt_contexts[free - 1]);
+ printf("There are %d interrupt contexts.\n", free_ici);
+ printf("printing context %d\n", free_ici - 1);
+ print_context(thread->interrupt_contexts[free_ici - 1]);
}
}
}
}
}
}
@@
-443,7
+448,11
@@
sub_monitor(void)
int ambig;
if (!ldb_in) {
int ambig;
if (!ldb_in) {
+#ifndef LISP_FEATURE_WIN32
ldb_in = fopen("/dev/tty","r+");
ldb_in = fopen("/dev/tty","r+");
+#else
+ ldb_in = stdin;
+#endif
ldb_in_fd = fileno(ldb_in);
}
ldb_in_fd = fileno(ldb_in);
}
@@
-452,14
+461,7
@@
sub_monitor(void)
fflush(stdout);
line = fgets(buf, sizeof(buf), ldb_in);
if (line == NULL) {
fflush(stdout);
line = fgets(buf, sizeof(buf), ldb_in);
if (line == NULL) {
- if (isatty(ldb_in_fd)) {
- putchar('\n');
- continue;
- }
- else {
- fprintf(stderr, "\nEOF on something other than a tty.\n");
- exit(0);
- }
+ exit(1);
}
ptr = line;
if ((token = parse_token(&ptr)) == NULL)
}
ptr = line;
if ((token = parse_token(&ptr)) == NULL)
@@
-497,7
+499,7
@@
ldb_monitor()
bcopy(curbuf, oldbuf, sizeof(oldbuf));
bcopy(curbuf, oldbuf, sizeof(oldbuf));
- printf("LDB monitor\n");
+ printf("Welcome to LDB, a low-level debugger for the Lisp runtime environment.\n");
setjmp(curbuf);
setjmp(curbuf);