From e4553e8ac0bda154575cb4e4a60ae274772d27a5 Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Sun, 4 Oct 2015 12:54:25 -0700
Subject: [PATCH] Replace BINDING_STACK_START and CONTROL_STACK_START
 appropriately.

---
 src/lisp/Darwin-os.c | 4 ++--
 src/lisp/gencgc.c    | 4 ++--
 src/lisp/x86-assem.S | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c
index 53d2db591..fd7425af7 100644
--- a/src/lisp/Darwin-os.c
+++ b/src/lisp/Darwin-os.c
@@ -464,8 +464,8 @@ valid_addr(os_vm_address_t addr)
 #ifndef GENCGC
 	|| in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size)
 #endif
-	|| in_range_p(addr, CONTROL_STACK_START, control_stack_size)
-	|| in_range_p(addr, BINDING_STACK_START, binding_stack_size))
+	|| in_range_p(addr, (lispobj)control_stack, control_stack_size)
+	|| in_range_p(addr, (lispobj)binding_stack, binding_stack_size))
 	return TRUE;
     return FALSE;
 }
diff --git a/src/lisp/gencgc.c b/src/lisp/gencgc.c
index 8650a7de1..d21592164 100644
--- a/src/lisp/gencgc.c
+++ b/src/lisp/gencgc.c
@@ -7329,11 +7329,11 @@ verify_gc(void)
     int static_space_size = (lispobj *) SymbolValue(STATIC_SPACE_FREE_POINTER)
 	- (lispobj *) static_space;
     int binding_stack_size = (lispobj *) get_binding_stack_pointer()
-	- (lispobj *) BINDING_STACK_START;
+	- (lispobj *) binding_stack;
 
     verify_space((lispobj *) READ_ONLY_SPACE_START, read_only_space_size);
     verify_space((lispobj *) static_space, static_space_size);
-    verify_space((lispobj *) BINDING_STACK_START, binding_stack_size);
+    verify_space((lispobj *) binding_stack, binding_stack_size);
     verify_space((lispobj *) (void *) &scavenger_hooks, 1);
 }
 
diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S
index 3ab41d69f..b7aa7f183 100644
--- a/src/lisp/x86-assem.S
+++ b/src/lisp/x86-assem.S
@@ -143,7 +143,8 @@ FUNCDEF(call_into_lisp)
 	movl	%eax, GNAME(foreign_function_call_active)
 
 	movl	%esp,%ebx	# remember current stack
-	cmpl	$CONTROL_STACK_START,%esp
+	cmpl	GNAME(control_stack), %esp
+
 	jbe	ChangeToLispStack
 	cmpl	GNAME(control_stack_end), %esp
 	jbe	OnLispStack
-- 
GitLab