projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.6.12.3:
[sbcl.git]
/
src
/
runtime
/
x86-arch.c
diff --git
a/src/runtime/x86-arch.c
b/src/runtime/x86-arch.c
index
5e307e3
..
c467115
100644
(file)
--- a/
src/runtime/x86-arch.c
+++ b/
src/runtime/x86-arch.c
@@
-9,10
+9,6
@@
* files for more information.
*/
* files for more information.
*/
-/*
- * $Header$
- */
-
#include <stdio.h>
#include "runtime.h"
#include <stdio.h>
#include "runtime.h"
@@
-83,7
+79,7
@@
void arch_skip_instruction(os_context_t *context)
vlen = *(char*)(*os_context_pc_addr(context))++;
/* Skip Lisp error arg data bytes. */
while (vlen-- > 0) {
vlen = *(char*)(*os_context_pc_addr(context))++;
/* Skip Lisp error arg data bytes. */
while (vlen-- > 0) {
- (char*)(*os_context_pc_addr(context))++;
+ ( (char*)(*os_context_pc_addr(context)) )++;
}
break;
}
break;
@@
-148,15
+144,15
@@
arch_remove_breakpoint(void *pc, unsigned long orig_inst)
\f
/* When single stepping, single_stepping holds the original instruction
* PC location. */
\f
/* When single stepping, single_stepping holds the original instruction
* PC location. */
-unsigned int *single_stepping=NULL;
-#ifndef __linux__
+unsigned int *single_stepping = NULL;
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
unsigned int single_step_save1;
unsigned int single_step_save2;
unsigned int single_step_save3;
#endif
void
unsigned int single_step_save1;
unsigned int single_step_save2;
unsigned int single_step_save3;
#endif
void
-arch_do_displaced_inst(os_context_t *context, unsigned long orig_inst)
+arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
{
unsigned int *pc = (unsigned int*)(*os_context_pc_addr(context));
{
unsigned int *pc = (unsigned int*)(*os_context_pc_addr(context));
@@
-164,9
+160,7
@@
arch_do_displaced_inst(os_context_t *context, unsigned long 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 __linux__
- *context_eflags_addr(context) |= 0x100;
-#else
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
/* Install helper instructions for the single step:
* pushf; or [esp],0x100; popf. */
single_step_save1 = *(pc-3);
/* Install helper instructions for the single step:
* pushf; or [esp],0x100; popf. */
single_step_save1 = *(pc-3);
@@
-175,11
+169,13
@@
arch_do_displaced_inst(os_context_t *context, unsigned long orig_inst)
*(pc-3) = 0x9c909090;
*(pc-2) = 0x00240c81;
*(pc-1) = 0x9d000001;
*(pc-3) = 0x9c909090;
*(pc-2) = 0x00240c81;
*(pc-1) = 0x9d000001;
+#else
+ *context_eflags_addr(context) |= 0x100;
#endif
single_stepping = (unsigned int*)pc;
#endif
single_stepping = (unsigned int*)pc;
-#ifndef __linux__
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
*os_context_pc_addr(context) = (char *)pc - 9;
#endif
}
*os_context_pc_addr(context) = (char *)pc - 9;
#endif
}
@@
-195,7
+191,7
@@
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
{
/* fprintf(stderr,"* single step trap %x\n", single_stepping); */
{
/* fprintf(stderr,"* single step trap %x\n", single_stepping); */
-#ifndef __linux__
+#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;
/* Un-install single step helper instructions. */
*(single_stepping-3) = single_step_save1;
*(single_stepping-2) = single_step_save2;
@@
-207,7
+203,6
@@
sigtrap_handler(int signal, siginfo_t *info, void *void_context)
if (*os_context_pc_addr(context) == (int)single_stepping + 1) {
fprintf(stderr, "warning: couldn't reinstall breakpoint\n");
} else {
if (*os_context_pc_addr(context) == (int)single_stepping + 1) {
fprintf(stderr, "warning: couldn't reinstall breakpoint\n");
} else {
- char *ptr = (char*)single_stepping;
*((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */
*((char *)single_stepping+1) = trap_Breakpoint;
}
*((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */
*((char *)single_stepping+1) = trap_Breakpoint;
}
@@
-240,7
+235,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.");
case trap_Error:
case trap_Cerror:
case trap_Error:
case trap_Cerror: