[Openmcl-cvs-notifications] r15056 - in /release/1.7/source: ./ level-0/l0-cfm-support.lisp lisp-kernel/area.h lisp-kernel/x86-exceptions.c

[rme at clozure.com]

Author: rme
Date: Wed Nov  2 14:38:32 2011
New Revision: 15056

Log:
Merge r15055 from trunk.

Modified:
    release/1.7/source/   (props changed)
    release/1.7/source/level-0/l0-cfm-support.lisp   (props changed)
    release/1.7/source/lisp-kernel/area.h
    release/1.7/source/lisp-kernel/x86-exceptions.c

Propchange: release/1.7/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  2 14:38:32 2011
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:14853-14889,14892-14897,14899-14905,14907-14910,14918,14920,=
14968,14975,14977,14990-14991,15000,15003,15009
+/trunk/source:14853-14889,14892-14897,14899-14905,14907-14910,14918,14920,=
14968,14975,14977,14990-14991,15000,15003,15009,15055

Propchange: release/1.7/source/level-0/l0-cfm-support.lisp
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  2 14:38:32 2011
@@ -4,4 +4,4 @@
 /branches/rme-logops/level-0/l0-cfm-support.lisp:13875-13886
 /branches/working-0711/ccl/level-0/l0-cfm-support.lisp:7970-13192,13197-13=
198,13202,13208,13214,13235-13236,13239,13263,13277-13278,13290,13293-13294=
,13302-13306,13331-13332,13339,13361-13364,13379,13383,13386,13388,13409,13=
435-13436,13438,13440-13442,13460-13461,13465,13467,13476,13487,13490,13492=
-13493,13502-13528,13545-13547,13549,13557-13558
 /release/1.5/source/level-0/l0-cfm-support.lisp:13667
-/trunk/source/level-0/l0-cfm-support.lisp:14853-14889,14892-14897,14899-14=
905,14907-14910,14918,14920,14929,14968,14975,14977,14990-14991,15000,15003=
,15009
+/trunk/source/level-0/l0-cfm-support.lisp:14853-14889,14892-14897,14899-14=
905,14907-14910,14918,14920,14929,14968,14975,14977,14990-14991,15000,15003=
,15009,15055

Modified: release/1.7/source/lisp-kernel/area.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.7/source/lisp-kernel/area.h (original)
+++ release/1.7/source/lisp-kernel/area.h Wed Nov  2 14:38:32 2011
@@ -134,8 +134,8 @@
 #endif
 =

 #define MIN_TSTACK_SIZE (1<<18)
-#define TSTACK_HARDPROT 0
-#define TSTACK_SOFTPROT (1<<16)
+#define TSTACK_HARDPROT ((1<<16)+(1<<12))
+#define TSTACK_SOFTPROT ((1<<16)+(1<<12))
 =

 #ifdef PPC
 #define CS_OVERFLOW_FORCE_LIMIT ((natural)(-(sizeof(lisp_frame))))

Modified: release/1.7/source/lisp-kernel/x86-exceptions.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.7/source/lisp-kernel/x86-exceptions.c (original)
+++ release/1.7/source/lisp-kernel/x86-exceptions.c Wed Nov  2 14:38:32 2011
@@ -756,7 +756,8 @@
 Boolean
 do_hard_stack_overflow(ExceptionInformation *xp, protected_area_ptr area, =
BytePtr addr)
 {
-  reset_lisp_process(xp);
+  /*  reset_lisp_process(xp); */
+  Bug(xp, "Unrecoverable stack overflow.");
   return false;
 }
 =