mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

Raise an exception upon VM stack overflows (fixes bug #29574).

Browse source 
* libguile/vm-engine.c (VM_NAME)[vm_error_stack_overflow]: Increase
  `vp->stack_limit' when possible.

* libguile/vm.c (VM_STACK_RESERVE_SIZE): New macro.

* test-suite/lib.scm (exception:vm-error): New variable.

* test-suite/tests/eval.test ("stack overflow"): New test prefix.
This commit is contained in:
Ludovic Courtès 2010-05-26 23:00:58 +02:00
parent 01fded8c77
commit f1046e6b78
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libguile/vm-engine.c
View file

@ -188,6 +188,10 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
vm_error_stack_overflow: vm_error_stack_overflow:
err_msg = scm_from_locale_string ("VM: Stack overflow"); err_msg = scm_from_locale_string ("VM: Stack overflow");
finish_args = SCM_EOL; finish_args = SCM_EOL;
if (stack_limit < vp->stack_base + vp->stack_size)
/* There are VM_STACK_RESERVE_SIZE bytes left. Make them available so
that `throw' below can run on this VM. */
vp->stack_limit = vp->stack_base + vp->stack_size;
goto vm_error; goto vm_error;
vm_error_stack_underflow: vm_error_stack_underflow:

9
libguile/vm.c
View file

@ -65,6 +65,10 @@
for a discussion. */ for a discussion. */
#define VM_ENABLE_PRECISE_STACK_GC_SCAN #define VM_ENABLE_PRECISE_STACK_GC_SCAN
/* Size in SCM objects of the stack reserve. The reserve is used to run
exception handling code in case of a VM stack overflow. */
#define VM_STACK_RESERVE_SIZE 512
/* /*
@ -505,7 +509,7 @@ make_vm (void)
#ifdef VM_ENABLE_STACK_NULLING #ifdef VM_ENABLE_STACK_NULLING
memset (vp->stack_base, 0, vp->stack_size * sizeof (SCM)); memset (vp->stack_base, 0, vp->stack_size * sizeof (SCM));
#endif #endif
vp->stack_limit = vp->stack_base + vp->stack_size; vp->stack_limit = vp->stack_base + vp->stack_size - VM_STACK_RESERVE_SIZE;
vp->ip = NULL; vp->ip = NULL;
vp->sp = vp->stack_base - 1; vp->sp = vp->stack_base - 1;
vp->fp = NULL; vp->fp = NULL;
@ -534,8 +538,7 @@ vm_stack_mark (GC_word *addr, struct GC_ms_entry *mark_stack_ptr,
vm = * ((struct scm_vm **) addr); vm = * ((struct scm_vm **) addr);
if (vm == NULL if (vm == NULL
|| (SCM *) addr != vm->stack_base - 1 || (SCM *) addr != vm->stack_base - 1)
|| vm->stack_limit - vm->stack_base != vm->stack_size)
/* ADDR must be a pointer to a free-list element, which we must ignore /* ADDR must be a pointer to a free-list element, which we must ignore
(see warning in <gc/gc_mark.h>). */ (see warning in <gc/gc_mark.h>). */
return mark_stack_ptr; return mark_stack_ptr;

3
test-suite/lib.scm
View file

@ -37,6 +37,7 @@
exception:string-contains-nul exception:string-contains-nul
exception:read-error exception:read-error
exception:null-pointer-error exception:null-pointer-error
exception:vm-error
;; Reporting passes and failures. ;; Reporting passes and failures.
run-test run-test
@ -281,6 +282,8 @@
(cons 'read-error "^.*$")) (cons 'read-error "^.*$"))
(define exception:null-pointer-error (define exception:null-pointer-error
(cons 'null-pointer-error "^.*$")) (cons 'null-pointer-error "^.*$"))
(define exception:vm-error
(cons 'vm-error "^.*$"))
;; as per throw in scm_to_locale_stringn() ;; as per throw in scm_to_locale_stringn()
(define exception:string-contains-nul (define exception:string-contains-nul

13
test-suite/tests/eval.test
View file

@ -18,6 +18,7 @@
(define-module (test-suite test-eval) (define-module (test-suite test-eval)
:use-module (test-suite lib) :use-module (test-suite lib)
:use-module ((srfi srfi-1) :select (unfold count)) :use-module ((srfi srfi-1) :select (unfold count))
:use-module ((system vm vm) :select (make-vm vm-apply))
:use-module (ice-9 documentation)) :use-module (ice-9 documentation))
@ -439,4 +440,16 @@
(pass-if "equal?" (pass-if "equal?"
(equal? (values 1 2 3 4) (values 1 2 3 4)))) (equal? (values 1 2 3 4) (values 1 2 3 4))))
;;;
;;; stack overflow handling
;;;
(with-test-prefix "stack overflow"
(pass-if-exception "exception raised"
exception:vm-error
(let ((vm (make-vm))
(thunk (let loop () (cons 's (loop)))))
(vm-apply vm thunk))))
;;; eval.test ends here ;;; eval.test ends here