#include "globals.h"
#include "lispregs.h"
#include "interrupt.h"
+#include "thread.h"
+#include "genesis/static-symbols.h"
+#include "genesis/primitive-objects.h"
+
+
/* When we need to do command input, we use this stream, which is not
* in general stdin, so that things will "work" (as well as being
#if !defined(__i386__)
printf("BSP\t=\t0x%08X\n", (unsigned long)current_binding_stack_pointer);
#endif
+#if 0
#ifdef __i386__
printf("BSP\t=\t0x%08lx\n",
(unsigned long)SymbolValue(BINDING_STACK_POINTER));
(unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER));
printf("RDONLY\t=\t0x%08lx\n",
(unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
-
+#endif /* 0 */
#ifdef MIPS
printf("FLAGS\t=\t0x%08x\n", current_flags_register);
#endif
fflush(stdout);
fgets(buf, sizeof(buf), ldb_in);
if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n')
- exit(0);
+ exit(1);
}
static void
static void
print_context(os_context_t *context)
{
- int i;
+ int i;
- for (i = 0; i < NREGS; i++) {
- printf("%s:\t", lisp_register_names[i]);
+ for (i = 0; i < NREGS; i++) {
+ printf("%s:\t", lisp_register_names[i]);
#ifdef __i386__
- brief_print((lispobj)(*os_context_register_addr(context,
- i*2)));
+ brief_print((lispobj)(*os_context_register_addr(context,
+ i*2)));
#else
- brief_print((lispobj)(*os_context_register_addr(context,i)));
+ brief_print((lispobj)(*os_context_register_addr(context,i)));
#endif
- }
- printf("PC:\t\t 0x%08lx\n",
- (unsigned long)(*os_context_pc_addr(context)));
+ }
+ printf("PC:\t\t 0x%08lx\n",
+ (unsigned long)(*os_context_pc_addr(context)));
}
static void
print_context_cmd(char **ptr)
{
- int free;
+ int free;
+ struct thread *thread=arch_os_get_current_thread();
- free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX)>>2;
+ free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
- if (more_p(ptr)) {
- int index;
-
- index = parse_number(ptr);
-
- if ((index >= 0) && (index < free)) {
- printf("There are %d interrupt contexts.\n", free);
- printf("printing context %d\n", index);
- print_context(lisp_interrupt_contexts[index]);
- } else {
- printf("There aren't that many/few contexts.\n");
- printf("There are %d interrupt contexts.\n", free);
- }
+ if (more_p(ptr)) {
+ int index;
+
+ index = parse_number(ptr);
+
+ if ((index >= 0) && (index < free)) {
+ printf("There are %d interrupt contexts.\n", free);
+ printf("printing context %d\n", index);
+ print_context(thread->interrupt_contexts[index]);
} else {
- if (free == 0)
- 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(lisp_interrupt_contexts[free - 1]);
- }
+ printf("There aren't that many/few contexts.\n");
+ printf("There are %d interrupt contexts.\n", free);
}
+ } else {
+ if (free == 0)
+ 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]);
+ }
+ }
}
static void
catchers_cmd(char **ptr)
{
struct catch_block *catch;
+ struct thread *thread=arch_os_get_current_thread();
- catch = (struct catch_block *)SymbolValue(CURRENT_CATCH_BLOCK);
+ catch = (struct catch_block *)SymbolValue(CURRENT_CATCH_BLOCK,thread);
if (catch == NULL)
printf("There are no active catchers!\n");