[Guile-commits] GNU Guile branch, master, updated. v2.1.0-466-gf689dd6

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=f689dd6982697f592b0dd5e63dc87e516657fb25

The branch, master has been updated
       via  f689dd6982697f592b0dd5e63dc87e516657fb25 (commit)
       via  36cc0b901c57947b62118d50ab3152b65d0652f9 (commit)
      from  fe8935d432989aa2a71db5bdf6522abee08f09d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f689dd6982697f592b0dd5e63dc87e516657fb25
Author: Andy Wingo <address@hidden>
Date:   Wed Nov 27 22:03:58 2013 +0100

    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.

commit 36cc0b901c57947b62118d50ab3152b65d0652f9
Author: Andy Wingo <address@hidden>
Date:   Wed Nov 27 21:13:20 2013 +0100

    Declare r6rs-ports functions
    
    * libguile/r6rs-ports.h:
    * libguile/r6rs-ports.c: Declare scm_unget_bytevector and
      scm_i_make_transcoded_port.

-----------------------------------------------------------------------

Summary of changes:
 libguile/r6rs-ports.c      |    2 ++
 libguile/r6rs-ports.h      |    3 ++-
 libguile/vm-engine.c       |    3 ---
 libguile/vm.c              |   14 --------------
 libguile/vm.h              |    2 --
 module/system/vm/traps.scm |   16 +++-------------
 module/system/vm/vm.scm    |    2 +-
 7 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index c6ad90a..3f936e7 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -1181,6 +1181,8 @@ initialize_transcoded_ports (void)
   scm_set_port_close (transcoded_port_type, tp_close);
 }
 
+SCM_INTERNAL SCM scm_i_make_transcoded_port (SCM);
+
 SCM_DEFINE (scm_i_make_transcoded_port,
            "%make-transcoded-port", 1, 0, 0,
            (SCM port),
diff --git a/libguile/r6rs-ports.h b/libguile/r6rs-ports.h
index 2ae3e76..3dde4d5 100644
--- a/libguile/r6rs-ports.h
+++ b/libguile/r6rs-ports.h
@@ -1,7 +1,7 @@
 #ifndef SCM_R6RS_PORTS_H
 #define SCM_R6RS_PORTS_H
 
-/* Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -34,6 +34,7 @@ SCM_API SCM scm_get_bytevector_n (SCM, SCM);
 SCM_API SCM scm_get_bytevector_n_x (SCM, SCM, SCM, SCM);
 SCM_API SCM scm_get_bytevector_some (SCM);
 SCM_API SCM scm_get_bytevector_all (SCM);
+SCM_API SCM scm_unget_bytevector (SCM, SCM, SCM, SCM);
 SCM_API SCM scm_put_u8 (SCM, SCM);
 SCM_API SCM scm_put_bytevector (SCM, SCM, SCM, SCM);
 SCM_API SCM scm_open_bytevector_output_port (SCM);
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 4ae2aa7..68a8b12 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -125,8 +125,6 @@
   RUN_HOOK0 (next)
 #define ABORT_CONTINUATION_HOOK()               \
   RUN_HOOK0 (abort)
-#define RESTORE_CONTINUATION_HOOK()             \
-  RUN_HOOK0 (restore_continuation)
 
 #define VM_HANDLE_INTERRUPTS                     \
   SCM_ASYNC_TICK_WITH_GUARD_CODE (current_thread, SYNC_IP (), CACHE_FP ())
@@ -3228,7 +3226,6 @@ VM_NAME (scm_i_thread *current_thread, struct scm_vm *vp,
 #undef NEXT_JUMP
 #undef POP_CONTINUATION_HOOK
 #undef PUSH_CONTINUATION_HOOK
-#undef RESTORE_CONTINUATION_HOOK
 #undef RETURN
 #undef RETURN_ONE_VALUE
 #undef RETURN_VALUE_LIST
diff --git a/libguile/vm.c b/libguile/vm.c
index 0ccc9f1..f9441ad 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -167,7 +167,6 @@ static void vm_dispatch_push_continuation_hook (struct 
scm_vm *vp) SCM_NOINLINE;
 static void vm_dispatch_pop_continuation_hook (struct scm_vm *vp, SCM *old_fp) 
SCM_NOINLINE;
 static void vm_dispatch_next_hook (struct scm_vm *vp) SCM_NOINLINE;
 static void vm_dispatch_abort_hook (struct scm_vm *vp) SCM_NOINLINE;
-static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp) 
SCM_NOINLINE;
 
 static void
 vm_dispatch_hook (struct scm_vm *vp, int hook_num, SCM *argv, int n)
@@ -258,10 +257,6 @@ static void vm_dispatch_abort_hook (struct scm_vm *vp)
                            &SCM_FRAME_LOCAL (vp->fp, 1),
                            SCM_FRAME_NUM_LOCALS (vp->fp, vp->sp) - 1);
 }
-static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp)
-{
-  return vm_dispatch_hook (vp, SCM_VM_RESTORE_CONTINUATION_HOOK, NULL, 0);
-}
 
 static void
 vm_abort (struct scm_vm *vp, SCM tag,
@@ -1025,15 +1020,6 @@ SCM_DEFINE (scm_vm_abort_continuation_hook, 
"vm-abort-continuation-hook", 0, 0,
 }
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_vm_restore_continuation_hook, "vm-restore-continuation-hook", 
0, 0, 0,
-           (void),
-           "")
-#define FUNC_NAME s_scm_vm_restore_continuation_hook
-{
-  VM_DEFINE_HOOK (SCM_VM_RESTORE_CONTINUATION_HOOK);
-}
-#undef FUNC_NAME
-
 SCM_DEFINE (scm_vm_trace_level, "vm-trace-level", 0, 0, 0,
            (void),
            "")
diff --git a/libguile/vm.h b/libguile/vm.h
index 387e0b8..6a25732 100644
--- a/libguile/vm.h
+++ b/libguile/vm.h
@@ -28,7 +28,6 @@ enum {
   SCM_VM_POP_CONTINUATION_HOOK,
   SCM_VM_NEXT_HOOK,
   SCM_VM_ABORT_CONTINUATION_HOOK,
-  SCM_VM_RESTORE_CONTINUATION_HOOK,
   SCM_VM_NUM_HOOKS,
 };
 
@@ -56,7 +55,6 @@ SCM_API SCM scm_vm_apply_hook (void);
 SCM_API SCM scm_vm_push_continuation_hook (void);
 SCM_API SCM scm_vm_pop_continuation_hook (void);
 SCM_API SCM scm_vm_abort_continuation_hook (void);
-SCM_API SCM scm_vm_restore_continuation_hook (void);
 SCM_API SCM scm_vm_next_hook (void);
 SCM_API SCM scm_vm_trace_level (void);
 SCM_API SCM scm_set_vm_trace_level_x (SCM level);
diff --git a/module/system/vm/traps.scm b/module/system/vm/traps.scm
index 7fab208..aa13b6a 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?
diff --git a/module/system/vm/vm.scm b/module/system/vm/vm.scm
index ffed907..33bcbf1 100644
--- a/module/system/vm/vm.scm
+++ b/module/system/vm/vm.scm
@@ -25,7 +25,7 @@
             vm-push-continuation-hook vm-pop-continuation-hook
             vm-apply-hook
             vm-next-hook
-            vm-abort-continuation-hook vm-restore-continuation-hook))
+            vm-abort-continuation-hook))
 
 (load-extension (string-append "libguile-" (effective-version))
                 "scm_init_vm")


hooks/post-receive
-- 
GNU Guile