[Guile-commits] GNU Guile branch, wip-cps-bis, updated. v2.1.0-177-g8240e5f

[Mark H Weaver]

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=8240e5fd13b3288ff40c67f9b4f0f396678e18ec

The branch, wip-cps-bis has been updated
       via  8240e5fd13b3288ff40c67f9b4f0f396678e18ec (commit)
      from  7e298699bfb8a9f96d2acda17c59d2cb9c8b9ca6 (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 8240e5fd13b3288ff40c67f9b4f0f396678e18ec
Author: Mark H Weaver <address@hidden>
Date:   Thu Aug 15 06:12:31 2013 -0400

    RTL Compiler: Fixes toward working sequences.
    
    * module/language/cps/compile-rtl.scm (emit-rtl-sequence): Fix $ktrunc
      pattern.
    
    * module/language/cps/dfg.scm (lookup-bound-syms): Fix $kargs pattern.
      'lookup-cont*' returns what's inside the $cont, not the $cont itself.
    
    * module/language/cps/slot-allocation.scm (allocate-slots): Pass the
      correct continuation to 'lookup-call-proc-slot'.

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

Summary of changes:
 module/language/cps/compile-rtl.scm     |    2 +-
 module/language/cps/dfg.scm             |    2 +-
 module/language/cps/slot-allocation.scm |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/language/cps/compile-rtl.scm 
b/module/language/cps/compile-rtl.scm
index d14cf1c..0ef3914 100644
--- a/module/language/cps/compile-rtl.scm
+++ b/module/language/cps/compile-rtl.scm
@@ -301,7 +301,7 @@
         (($ $kargs names syms) (emit-vals syms))
         (($ $kargs (name) (sym)) (emit-val sym))
         (($ $kif kt kf) (emit-test kt kf))
-        (($ $ktrunc ($ $arity req () rest () #f) arity k)
+        (($ $ktrunc ($ $arity req () rest () #f) k)
          (emit-trunc (length req) (and rest #t) k))))
 
     (define (collect-exps k src cont tail)
diff --git a/module/language/cps/dfg.scm b/module/language/cps/dfg.scm
index 83b44de..6a86f97 100644
--- a/module/language/cps/dfg.scm
+++ b/module/language/cps/dfg.scm
@@ -315,5 +315,5 @@
   (match dfg
     (($ $dfg conts use-maps uplinks)
      (match (lookup-cont* k conts)
-       (($ $cont src k ($ $kargs names syms body))
+       (($ $kargs names syms body)
         syms)))))
diff --git a/module/language/cps/slot-allocation.scm 
b/module/language/cps/slot-allocation.scm
index 91e0430..34311e9 100644
--- a/module/language/cps/slot-allocation.scm
+++ b/module/language/cps/slot-allocation.scm
@@ -328,7 +328,7 @@ are comparable with eqv?.  A tmp slot may be used."
                         args)))
              (match (lookup-cont k dfg)
                (($ $ktrunc arity kargs)
-                (let* ((proc-slot (lookup-call-proc-slot k allocation))
+                (let* ((proc-slot (lookup-call-proc-slot exp-k allocation))
                        (dst-syms (lookup-bound-syms kargs dfg))
                        (nvals (length dst-syms))
                        (src-slots (map (cut + proc-slot 1 <>) (iota nvals)))


hooks/post-receive
-- 
GNU Guile