projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.12.8: Really this time. Note to self: remeber to save the
[sbcl.git]
/
src
/
runtime
/
breakpoint.c
diff --git
a/src/runtime/breakpoint.c
b/src/runtime/breakpoint.c
index
e45082f
..
439354d
100644
(file)
--- a/
src/runtime/breakpoint.c
+++ b/
src/runtime/breakpoint.c
@@
-12,18
+12,21
@@
#include <stdio.h>
#include <signal.h>
#include <stdio.h>
#include <signal.h>
+#include "sbcl.h"
#include "runtime.h"
#include "os.h"
#include "runtime.h"
#include "os.h"
-#include "sbcl.h"
#include "interrupt.h"
#include "arch.h"
#include "lispregs.h"
#include "globals.h"
#include "alloc.h"
#include "breakpoint.h"
#include "interrupt.h"
#include "arch.h"
#include "lispregs.h"
#include "globals.h"
#include "alloc.h"
#include "breakpoint.h"
+#include "thread.h"
+#include "genesis/code.h"
+#include "genesis/fdefn.h"
#define REAL_LRA_SLOT 0
#define REAL_LRA_SLOT 0
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
#define KNOWN_RETURN_P_SLOT 1
#define BOGUS_LRA_CONSTANTS 2
#else
#define KNOWN_RETURN_P_SLOT 1
#define BOGUS_LRA_CONSTANTS 2
#else
@@
-68,7
+71,7
@@
void breakpoint_do_displaced_inst(os_context_t* context,
arch_do_displaced_inst(context, orig_inst);
}
arch_do_displaced_inst(context, orig_inst);
}
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
static lispobj find_code(os_context_t *context)
{
#ifdef reg_CODE
static lispobj find_code(os_context_t *context)
{
#ifdef reg_CODE
@@
-90,7
+93,7
@@
static lispobj find_code(os_context_t *context)
}
#endif
}
#endif
-#ifdef __i386__
+#ifdef LISP_FEATURE_X86
static lispobj find_code(os_context_t *context)
{
lispobj codeptr =
static lispobj find_code(os_context_t *context)
{
lispobj codeptr =
@@
-134,7
+137,7
@@
static int compute_offset(os_context_t *context, lispobj code)
* tried. The sigprocmask() call would work just as well on alpha as it
* presumably does on x86 -dan 2001.08.10
*/
* tried. The sigprocmask() call would work just as well on alpha as it
* presumably does on x86 -dan 2001.08.10
*/
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
{
lispobj code;
void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
{
lispobj code;
@@
-142,7
+145,8
@@
void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
fake_foreign_function_call(context);
code = find_code(context);
fake_foreign_function_call(context);
code = find_code(context);
-
+ /* FIXME we're calling into Lisp with signals masked here. Is this
+ * the right thing to do? */
funcall3(SymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
funcall3(SymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
@@
-172,7
+176,7
@@
void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
}
#endif
}
#endif
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
os_context_t *context)
{
void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
os_context_t *context)
{
@@
-184,6
+188,8
@@
void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
code = find_code(context);
codeptr = (struct code *)native_pointer(code);
code = find_code(context);
codeptr = (struct code *)native_pointer(code);
+ /* FIXME again, calling into Lisp with signals masked. Is this
+ * sensible? */
funcall3(SymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,
funcall3(SymbolFunction(HANDLE_BREAKPOINT),
compute_offset(context, code),
code,