<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at <a href="https://gitlab.common-lisp.net/cmucl/cmucl">cmucl / cmucl</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.common-lisp.net/cmucl/cmucl/commit/0e258fd926f10b010b0a6d2a423f95ed4bceaac7">0e258fd9</a></strong>
<div>
<span>by Raymond Toy</span>
<i>at 2015-10-04T15:05:08Z</i>
</div>
<pre class='commit-message'>Rename local control_stack_size to current_stack_size to prevent
confusion with the global control_stack_size.</pre>
</li>
<li>
<strong><a href="https://gitlab.common-lisp.net/cmucl/cmucl/commit/1d8db41a003ab622e274078f0e7878bfc04dfa07">1d8db41a</a></strong>
<div>
<span>by Raymond Toy</span>
<i>at 2015-10-04T15:05:22Z</i>
</div>
<pre class='commit-message'>Replace BINDING_STACK_START and CONTROL_STACK_START appropriately.</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
src/lisp/Linux-os.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
src/lisp/gencgc.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.common-lisp.net/cmucl/cmucl/compare/ec4c78fb89c45860344d819de5d16a6b8db8abb1...1d8db41a003ab622e274078f0e7878bfc04dfa07#diff-0'>
<strong>
src/lisp/Linux-os.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/src/lisp/Linux-os.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/src/lisp/Linux-os.c
</span><span style="color: #aaaaaa">@@ -454,17 +454,17 @@ sigsegv_handler(HANDLER_ARGS)
</span> #ifdef i386
interrupt_handle_now(signal, contextstruct);
#else
<span style="color: #000000;background-color: #ffdddd">-#define CONTROL_STACK_TOP (((char*) CONTROL_STACK_START) + control_stack_size)
</span><span style="color: #000000;background-color: #ddffdd">+#define CONTROL_STACK_TOP (((char*) control_stack) + control_stack_size)
</span>
addr = arch_get_bad_addr(signal, code, context);
if (addr != NULL && context->sc_regs[reg_ALLOC] & (1 << 63)) {
context->sc_regs[reg_ALLOC] -= (1 << 63);
interrupt_handle_pending(context);
<span style="color: #000000;background-color: #ffdddd">- } else if (addr > CONTROL_STACK_TOP && addr < BINDING_STACK_START) {
</span><span style="color: #000000;background-color: #ddffdd">+ } else if (addr > CONTROL_STACK_TOP && addr < (os_vm_address_t)binding_stack) {
</span> fprintf(stderr, "Possible stack overflow at 0x%08lX!\n", addr);
/* try to fix control frame pointer */
<span style="color: #000000;background-color: #ffdddd">- while (!(CONTROL_STACK_START <= *current_control_frame_pointer &&
</span><span style="color: #000000;background-color: #ddffdd">+ while (!((lispobj)control_stack <= *current_control_frame_pointer &&
</span> *current_control_frame_pointer <= CONTROL_STACK_TOP))
((char *) current_control_frame_pointer) -= sizeof(lispobj);
ldb_monitor();
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.common-lisp.net/cmucl/cmucl/compare/ec4c78fb89c45860344d819de5d16a6b8db8abb1...1d8db41a003ab622e274078f0e7878bfc04dfa07#diff-1'>
<strong>
src/lisp/gencgc.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/src/lisp/gencgc.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/src/lisp/gencgc.c
</span><span style="color: #aaaaaa">@@ -7501,16 +7501,16 @@ scavenge_interrupt_handlers(void)
</span> static void
scavenge_control_stack(void)
{
<span style="color: #000000;background-color: #ffdddd">- unsigned long control_stack_size;
</span><span style="color: #000000;background-color: #ddffdd">+ unsigned long current_stack_size;
</span>
<span style="color: #000000;background-color: #ffdddd">- control_stack_size = current_control_stack_pointer - control_stack;
</span><span style="color: #000000;background-color: #ddffdd">+ current_stack_size = current_control_stack_pointer - control_stack;
</span>
#ifdef PRINTNOISE
printf("Scavenging the control stack (%d bytes) ...\n",
<span style="color: #000000;background-color: #ffdddd">- control_stack_size * sizeof(lispobj));
</span><span style="color: #000000;background-color: #ddffdd">+ current_stack_size * sizeof(lispobj));
</span> #endif
<span style="color: #000000;background-color: #ffdddd">- scavenge(control_stack, control_stack_size);
</span><span style="color: #000000;background-color: #ddffdd">+ scavenge(control_stack, current_stack_size);
</span>
#ifdef PRINTNOISE
printf("Done scavenging the control stack.\n");
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.common-lisp.net/cmucl/cmucl/compare/ec4c78fb89c45860344d819de5d16a6b8db8abb1...1d8db41a003ab622e274078f0e7878bfc04dfa07">View it on GitLab</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":["merge_requests","issues","commit"],"url":"https://gitlab.common-lisp.net/cmucl/cmucl/compare/ec4c78fb89c45860344d819de5d16a6b8db8abb1...1d8db41a003ab622e274078f0e7878bfc04dfa07"}}</script>
</p>
</div>
</body>
</html>