steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: callstack errors were flipped

release
Slava Pestov 2010-03-29 01:53:20 -04:00
parent 0a9d1b03a1
commit 8ab0d12e8d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/kernel/kernel-tests.factor
View File

@ -49,8 +49,11 @@ IN: kernel.tests
: overflow-c ( -- ) overflow-c overflow-c ; : overflow-c ( -- ) overflow-c overflow-c ;
! The VM cannot recover from callstack overflow on Windows or
! OpenBSD, because no facility exists to run memory protection
! fault handlers on an alternate callstack.
os [ windows? ] [ openbsd? ] bi or [ os [ windows? ] [ openbsd? ] bi or [
[ overflow-c ] [ { "kernel-error" 14 f f } = ] must-fail-with [ overflow-c ] [ { "kernel-error" 15 f f } = ] must-fail-with
] unless ] unless
[ -7 <byte-array> ] must-fail [ -7 <byte-array> ] must-fail

4
vm/errors.cpp
View File

@ -98,9 +98,9 @@ void factor_vm::memory_protection_error(cell addr, stack_frame *stack)
else if(ctx->retainstack_seg->overflow_p(addr)) else if(ctx->retainstack_seg->overflow_p(addr))
general_error(ERROR_RETAINSTACK_OVERFLOW,false_object,false_object,stack); general_error(ERROR_RETAINSTACK_OVERFLOW,false_object,false_object,stack);
else if(ctx->callstack_seg->underflow_p(addr)) else if(ctx->callstack_seg->underflow_p(addr))
general_error(ERROR_CALLSTACK_UNDERFLOW,false_object,false_object,stack);
else if(ctx->callstack_seg->overflow_p(addr))
general_error(ERROR_CALLSTACK_OVERFLOW,false_object,false_object,stack); general_error(ERROR_CALLSTACK_OVERFLOW,false_object,false_object,stack);
else if(ctx->callstack_seg->overflow_p(addr))
general_error(ERROR_CALLSTACK_UNDERFLOW,false_object,false_object,stack);
else else
general_error(ERROR_MEMORY,allot_cell(addr),false_object,stack); general_error(ERROR_MEMORY,allot_cell(addr),false_object,stack);
} }