summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Melis <mega@hotpop.com>2009-04-07 13:00:35 +0000
committerGabor Melis <mega@hotpop.com>2009-04-07 13:00:35 +0000
commitae92eeae8842e86eeaae614bab1672804a28c7fd (patch)
tree74e2a3723a5d2238b3ff690cccfd305170a1fc69
parentdecddddf7e581fa1ebee846e5fddcd52229bb9a8 (diff)
1.0.27.3: fix UNWIND-TO-FRAME-AND-CALL
-rw-r--r--NEWS1
-rw-r--r--src/compiler/x86-64/nlx.lisp2
-rw-r--r--src/compiler/x86/nlx.lisp2
-rw-r--r--version.lisp-expr2
4 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index cdc89efa7..fed0849d1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
changes in sbcl-1.0.28 relative to 1.0.27:
* bug fix: timers could go off in the wrong order, be delayed indefinitely
(thanks to Ole Arndt for the patch)
+ * bug fix: RESTART-FRAME and RETURN-FROM-FRAME stack corruption
changes in sbcl-1.0.27 relative to 1.0.26:
* new port: support added for x86-64 OpenBSD. (thanks to Josh Elsasser)
diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp
index 5425b3bd8..6208d5cff 100644
--- a/src/compiler/x86-64/nlx.lisp
+++ b/src/compiler/x86-64/nlx.lisp
@@ -245,7 +245,7 @@
temp)
;; Allocate space for magic UWP block.
- (inst sub rsp-tn unwind-block-size)
+ (inst sub rsp-tn (* unwind-block-size n-word-bytes))
;; Set up magic catch / UWP block.
(move block rsp-tn)
(loadw temp uwp sap-pointer-slot other-pointer-lowtag)
diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp
index 72b13665a..37b752a9c 100644
--- a/src/compiler/x86/nlx.lisp
+++ b/src/compiler/x86/nlx.lisp
@@ -266,7 +266,7 @@
temp)
;; Allocate space for magic UWP block.
- (inst sub esp-tn unwind-block-size)
+ (inst sub esp-tn (* unwind-block-size n-word-bytes))
;; Set up magic catch / UWP block.
(move block esp-tn)
(loadw temp uwp sap-pointer-slot other-pointer-lowtag)
diff --git a/version.lisp-expr b/version.lisp-expr
index 7bf1e0220..3809e5a0a 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
;;; checkins which aren't released. (And occasionally for internal
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.27.2"
+"1.0.27.3"