---

yaml
---
r: 6857
b: refs/heads/master
c: edf6e1e
h: refs/heads/master
i:
  6855: 5cd52c6
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 586281e2d6d7f63e2b2d2b09c7f310f3b1d35355
+refs/heads/master: edf6e1ec0e038b805a36a7e3689b37fc3cea7387

trunk/src/rt/arch/i386/context.cpp

@@ -31,10 +31,14 @@ void context::call(void *f, void *arg, void *stack) {
   // Shift the stack pointer so the alignment works out right.
   sp = align_down(sp) - 3;
   *--sp = (uint32_t)arg;
-  *--sp = 0xdeadbeef;
+  // The final return address. 0 indicates the bottom of the stack
+  *--sp = 0;
 
   regs.esp = (uint32_t)sp;
   regs.eip = (uint32_t)f;
+
+  // Last base pointer on the stack should be 0
+  regs.ebp = 0;
 }
 
 #if 0

trunk/src/rt/arch/x86_64/context.cpp

@@ -28,9 +28,13 @@ void context::call(void *f, void *arg, void *stack) {
   // set up the stack
   uint64_t *sp = (uint64_t *)stack;
   sp = align_down(sp);
-  *--sp = 0xdeadbeef; // takes place of ret. addr.
+  // The final return address. 0 indicates the bottom of the stack
+  *--sp = 0;
 
   regs.data[RUSTRT_ARG0] = (uint64_t)arg;
   regs.data[RUSTRT_RSP] = (uint64_t)sp;
   regs.data[RUSTRT_IP] = (uint64_t)f;
+
+  // Last base pointer on the stack should be 0
+  regs.data[RUSTRT_RBP] = 0;
 }