projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.0.26:
[sbcl.git]
/
src
/
runtime
/
x86-64-arch.c
diff --git
a/src/runtime/x86-64-arch.c
b/src/runtime/x86-64-arch.c
index
5f10060
..
6d7046c
100644
(file)
--- a/
src/runtime/x86-64-arch.c
+++ b/
src/runtime/x86-64-arch.c
@@
-24,7
+24,6
@@
#include "interrupt.h"
#include "interr.h"
#include "breakpoint.h"
#include "interrupt.h"
#include "interr.h"
#include "breakpoint.h"
-#include "monitor.h"
#include "thread.h"
#include "genesis/static-symbols.h"
#include "thread.h"
#include "genesis/static-symbols.h"
@@
-36,6
+35,13
@@
unsigned long fast_random_state = 1;
void arch_init(void)
{}
void arch_init(void)
{}
+
+os_vm_address_t
+arch_get_bad_addr(int sig, siginfo_t *code, os_context_t *context)
+{
+ return (os_vm_address_t)code->si_addr;
+}
+
\f
/*
* hacking signal contexts
\f
/*
* hacking signal contexts
@@
-94,6
+100,8
@@
void arch_skip_instruction(os_context_t *context)
case trap_PendingInterrupt:
case trap_Halt:
case trap_PendingInterrupt:
case trap_Halt:
+ case trap_SingleStepAround:
+ case trap_SingleStepBefore:
/* only needed to skip the Code */
break;
/* only needed to skip the Code */
break;
@@
-116,14
+124,21
@@
arch_internal_error_arguments(os_context_t *context)
boolean
arch_pseudo_atomic_atomic(os_context_t *context)
{
boolean
arch_pseudo_atomic_atomic(os_context_t *context)
{
- return SymbolValue(PSEUDO_ATOMIC_ATOMIC,arch_os_get_current_thread());
+ return get_pseudo_atomic_atomic(arch_os_get_current_thread());
}
void
arch_set_pseudo_atomic_interrupted(os_context_t *context)
{
}
void
arch_set_pseudo_atomic_interrupted(os_context_t *context)
{
- SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1),
- arch_os_get_current_thread());
+ struct thread *thread = arch_os_get_current_thread();
+ set_pseudo_atomic_interrupted(thread);
+}
+
+void
+arch_clear_pseudo_atomic_interrupted(os_context_t *context)
+{
+ struct thread *thread = arch_os_get_current_thread();
+ clear_pseudo_atomic_interrupted(thread);
}
\f
/*
}
\f
/*
@@
-151,11
+166,6
@@
arch_remove_breakpoint(void *pc, unsigned int orig_inst)
/* When single stepping, single_stepping holds the original instruction
* PC location. */
unsigned int *single_stepping = NULL;
/* When single stepping, single_stepping holds the original instruction
* PC location. */
unsigned int *single_stepping = NULL;
-#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
-unsigned long single_step_save1;
-unsigned long single_step_save2;
-unsigned long single_step_save3;
-#endif
void
arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
void
arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
@@
-166,25
+176,11
@@
arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
*((char *)pc) = orig_inst & 0xff;
*((char *)pc + 1) = (orig_inst & 0xff00) >> 8;
*((char *)pc) = orig_inst & 0xff;
*((char *)pc + 1) = (orig_inst & 0xff00) >> 8;
-#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
- /* Install helper instructions for the single step:
- * pushf; or [esp],0x100; popf. */
- single_step_save1 = *(pc-3);
- single_step_save2 = *(pc-2);
- single_step_save3 = *(pc-1);
- *(pc-3) = 0x9c909090;
- *(pc-2) = 0x00240c81;
- *(pc-1) = 0x9d000001;
-#else
*context_eflags_addr(context) |= 0x100;
*context_eflags_addr(context) |= 0x100;
-#endif
single_stepping = pc;
single_stepping = pc;
-
-#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
- *os_context_pc_addr(context) = (char *)pc - 9;
-#endif
}
}
+
\f
void
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
\f
void
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
@@
-195,16
+191,8
@@
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
if (single_stepping && (signal==SIGTRAP))
{
if (single_stepping && (signal==SIGTRAP))
{
- /* fprintf(stderr,"* single step trap %x\n", single_stepping); */
-
-#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
- /* Un-install single step helper instructions. */
- *(single_stepping-3) = single_step_save1;
- *(single_stepping-2) = single_step_save2;
- *(single_stepping-1) = single_step_save3;
-#else
*context_eflags_addr(context) ^= 0x100;
*context_eflags_addr(context) ^= 0x100;
-#endif
+
/* Re-install the breakpoint if possible. */
if (*os_context_pc_addr(context) == (int)single_stepping + 1) {
fprintf(stderr, "warning: couldn't reinstall breakpoint\n");
/* Re-install the breakpoint if possible. */
if (*os_context_pc_addr(context) == (int)single_stepping + 1) {
fprintf(stderr, "warning: couldn't reinstall breakpoint\n");
@@
-251,7
+239,7
@@
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
* seems to be no point in doing that, since we're just
* going to lose(..) anyway. */
fake_foreign_function_call(context);
* seems to be no point in doing that, since we're just
* going to lose(..) anyway. */
fake_foreign_function_call(context);
- lose("%%PRIMITIVE HALT called; the party is over.");
+ lose("%%PRIMITIVE HALT called; the party is over.\n");
case trap_Error:
case trap_Cerror:
case trap_Error:
case trap_Cerror:
@@
-270,6
+258,14
@@
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
(unsigned long)handle_fun_end_breakpoint(signal, info, context);
break;
(unsigned long)handle_fun_end_breakpoint(signal, info, context);
break;
+ case trap_SingleStepAround:
+ case trap_SingleStepBefore:
+ arch_skip_instruction(context);
+ /* On x86-64 the fdefn / function is always in RAX, so we pass
+ * 0 as the register_offset. */
+ handle_single_step_trap(context, trap, 0);
+ break;
+
default:
FSHOW((stderr,"/[C--trap default %d %d %x]\n",
signal, code, context));
default:
FSHOW((stderr,"/[C--trap default %d %d %x]\n",
signal, code, context));
@@
-282,7
+278,7
@@
static void
sigill_handler(int signal, siginfo_t *siginfo, void *void_context) {
os_context_t *context = (os_context_t*)void_context;
fake_foreign_function_call(context);
sigill_handler(int signal, siginfo_t *siginfo, void *void_context) {
os_context_t *context = (os_context_t*)void_context;
fake_foreign_function_call(context);
- monitor_or_something();
+ lose("fake_foreign_function_call fell through");
}
void
}
void