diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-11-27 22:03:58 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-11-27 22:03:58 +0100 |
| commit | f689dd6982697f592b0dd5e63dc87e516657fb25 (patch) | |
| tree | db0b5079c1b0e5a1eaf6762b53bb3bd163beffab /module/system/vm/traps.scm | |
| parent | 36cc0b901c57947b62118d50ab3152b65d0652f9 (diff) | |
| download | guile-f689dd6982697f592b0dd5e63dc87e516657fb25.tar.gz | |
Remove the restore-continuation-hook.
* libguile/vm.h:
* libguile/vm.c:
* libguile/vm-engine.c:
* module/system/vm/traps.scm:
* module/system/vm/vm.scm: Remove the unused and redundant
restore-continuation-hook.
Diffstat (limited to 'module/system/vm/traps.scm')
| -rw-r--r-- | module/system/vm/traps.scm | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/module/system/vm/traps.scm b/module/system/vm/traps.scm index 7fab208aa..aa13b6ab8 100644 --- a/module/system/vm/traps.scm +++ b/module/system/vm/traps.scm @@ -199,12 +199,6 @@ (if (our-frame? frame) (enter-proc frame))) - (define (restore-hook frame) - (if in-proc? - (exit-proc frame)) - (if (our-frame? frame) - (enter-proc frame))) - (new-enabled-trap current-frame (lambda (frame) @@ -212,7 +206,6 @@ (add-hook! (vm-push-continuation-hook) push-cont-hook) (add-hook! (vm-pop-continuation-hook) pop-cont-hook) (add-hook! (vm-abort-continuation-hook) abort-hook) - (add-hook! (vm-restore-continuation-hook) restore-hook) (if (and frame (our-frame? frame)) (enter-proc frame))) (lambda (frame) @@ -221,8 +214,7 @@ (remove-hook! (vm-apply-hook) apply-hook) (remove-hook! (vm-push-continuation-hook) push-cont-hook) (remove-hook! (vm-pop-continuation-hook) pop-cont-hook) - (remove-hook! (vm-abort-continuation-hook) abort-hook) - (remove-hook! (vm-restore-continuation-hook) restore-hook))))) + (remove-hook! (vm-abort-continuation-hook) abort-hook))))) ;; Building on trap-in-procedure, we have trap-instructions-in-procedure ;; @@ -425,13 +417,11 @@ (if (not fp) (error "return-or-abort traps may only be enabled once")) (add-hook! (vm-pop-continuation-hook) pop-cont-hook) - (add-hook! (vm-abort-continuation-hook) abort-hook) - (add-hook! (vm-restore-continuation-hook) abort-hook)) + (add-hook! (vm-abort-continuation-hook) abort-hook)) (lambda (frame) (set! fp #f) (remove-hook! (vm-pop-continuation-hook) pop-cont-hook) - (remove-hook! (vm-abort-continuation-hook) abort-hook) - (remove-hook! (vm-restore-continuation-hook) abort-hook))))) + (remove-hook! (vm-abort-continuation-hook) abort-hook))))) ;; A more traditional dynamic-wind trap. Perhaps this should not be ;; based on the above trap-frame-finish? |