projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.43.46: Simplify some type tests to EQL comparisons
[sbcl.git]
/
src
/
runtime
/
gc-common.c
diff --git
a/src/runtime/gc-common.c
b/src/runtime/gc-common.c
index
97e227c
..
95b5c3b
100644
(file)
--- a/
src/runtime/gc-common.c
+++ b/
src/runtime/gc-common.c
@@
-2514,7
+2514,7
@@
scrub_control_stack(void)
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
sp = (lispobj *)&sp - 1;
#else
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
sp = (lispobj *)&sp - 1;
#else
- sp = current_control_stack_pointer;
+ sp = access_control_stack_pointer(th);
#endif
scrub:
if ((((os_vm_address_t)sp < (hard_guard_page_address + os_vm_page_size)) &&
#endif
scrub:
if ((((os_vm_address_t)sp < (hard_guard_page_address + os_vm_page_size)) &&
@@
-2576,6
+2576,8
@@
static int boxed_registers[] = BOXED_REGISTERS;
*os_context_lr_addr(context)
#define ACCESS_INTERIOR_POINTER_npc \
*os_context_npc_addr(context)
*os_context_lr_addr(context)
#define ACCESS_INTERIOR_POINTER_npc \
*os_context_npc_addr(context)
+#define ACCESS_INTERIOR_POINTER_ctr \
+ *os_context_ctr_addr(context)
#define INTERIOR_POINTER_VARS(name) \
unsigned long name##_offset; \
#define INTERIOR_POINTER_VARS(name) \
unsigned long name##_offset; \
@@
-2673,6
+2675,9
@@
scavenge_interrupt_context(os_context_t * context)
#ifdef ARCH_HAS_NPC_REGISTER
INTERIOR_POINTER_VARS(npc);
#endif
#ifdef ARCH_HAS_NPC_REGISTER
INTERIOR_POINTER_VARS(npc);
#endif
+#ifdef LISP_FEATURE_PPC
+ INTERIOR_POINTER_VARS(ctr);
+#endif
PAIR_INTERIOR_POINTER(pc);
#ifdef reg_LIP
PAIR_INTERIOR_POINTER(pc);
#ifdef reg_LIP
@@
-2684,6
+2689,9
@@
scavenge_interrupt_context(os_context_t * context)
#ifdef ARCH_HAS_NPC_REGISTER
PAIR_INTERIOR_POINTER(npc);
#endif
#ifdef ARCH_HAS_NPC_REGISTER
PAIR_INTERIOR_POINTER(npc);
#endif
+#ifdef LISP_FEATURE_PPC
+ PAIR_INTERIOR_POINTER(ctr);
+#endif
/* Scavenge all boxed registers in the context. */
for (i = 0; i < (sizeof(boxed_registers) / sizeof(int)); i++) {
/* Scavenge all boxed registers in the context. */
for (i = 0; i < (sizeof(boxed_registers) / sizeof(int)); i++) {
@@
-2713,6
+2721,9
@@
scavenge_interrupt_context(os_context_t * context)
#ifdef ARCH_HAS_NPC_REGISTER
FIXUP_INTERIOR_POINTER(npc);
#endif
#ifdef ARCH_HAS_NPC_REGISTER
FIXUP_INTERIOR_POINTER(npc);
#endif
+#ifdef LISP_FEATURE_PPC
+ FIXUP_INTERIOR_POINTER(ctr);
+#endif
}
void
}
void