diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2022-04-08 15:34:57 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2022-04-08 15:34:57 +0200 |
| commit | c2d78d09c1eca4df0836d0fb41562ac0ae1071d6 (patch) | |
| tree | df15aa90d882bc016f8ed6f3e5f7d770d69ee191 | |
| parent | 13c8cc58bbd829ca4616dea09cb050dc977db9ae (diff) | |
| download | emacs-c2d78d09c1eca4df0836d0fb41562ac0ae1071d6.tar.gz | |
Rename mark_stack to mark_c_stack
This is the function that marks the C stack. Avoid confusion with the
new mark stack, a stack used in the GC mark phase.
* src/alloc.c (SETJMP_WILL_LIKELY_WORK, SETJMP_WILL_NOT_WORK)
(mark_stack, mark_c_stack):
* src/lisp.h:
* src/thread.c (mark_one_thread): Rename mark_stack to mark_c_stack.
| -rw-r--r-- | src/alloc.c | 6 | ||||
| -rw-r--r-- | src/lisp.h | 2 | ||||
| -rw-r--r-- | src/thread.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/alloc.c b/src/alloc.c index 733f7733fa9..8fd981a51f9 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4982,7 +4982,7 @@ marking. Emacs has determined that the method it uses to do the\n\ marking will likely work on your system, but this isn't sure.\n\ \n\ If you are a system-programmer, or can get the help of a local wizard\n\ -who is, please take a look at the function mark_stack in alloc.c, and\n\ +who is, please take a look at the function mark_c_stack in alloc.c, and\n\ verify that the methods used are appropriate for your system.\n\ \n\ Please mail the result to <emacs-devel@gnu.org>.\n\ @@ -4995,7 +4995,7 @@ marking. Emacs has determined that the default method it uses to do the\n\ marking will not work on your system. We will need a system-dependent\n\ solution for your system.\n\ \n\ -Please take a look at the function mark_stack in alloc.c, and\n\ +Please take a look at the function mark_c_stack in alloc.c, and\n\ try to find a way to make it work on your system.\n\ \n\ Note that you may get false negatives, depending on the compiler.\n\ @@ -5137,7 +5137,7 @@ typedef union from the stack start. */ void -mark_stack (char const *bottom, char const *end) +mark_c_stack (char const *bottom, char const *end) { /* This assumes that the stack is a contiguous region in memory. If that's not the case, something has to be done here to iterate diff --git a/src/lisp.h b/src/lisp.h index 9c7dc3bc6fc..f723876634a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4159,7 +4159,7 @@ extern void refill_memory_reserve (void); #endif extern void alloc_unexec_pre (void); extern void alloc_unexec_post (void); -extern void mark_stack (char const *, char const *); +extern void mark_c_stack (char const *, char const *); extern void flush_stack_call_func1 (void (*func) (void *arg), void *arg); extern void mark_memory (void const *start, void const *end); diff --git a/src/thread.c b/src/thread.c index c6742341fb8..626d14aad0a 100644 --- a/src/thread.c +++ b/src/thread.c @@ -655,7 +655,7 @@ mark_one_thread (struct thread_state *thread) mark_specpdl (thread->m_specpdl, thread->m_specpdl_ptr); - mark_stack (thread->m_stack_bottom, stack_top); + mark_c_stack (thread->m_stack_bottom, stack_top); for (struct handler *handler = thread->m_handlerlist; handler; handler = handler->next) |