diff --git a/src/ikarus.boot b/src/ikarus.boot index 742943a..3b27bc9 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/libaltcogen.ss b/src/libaltcogen.ss index 023667a..6137de8 100644 --- a/src/libaltcogen.ss +++ b/src/libaltcogen.ss @@ -1765,7 +1765,7 @@ [vars (var-var-conf x)]) (let f ([i 1]) (cond - [(frame-conflict? i vars frms) (f (fxadd1 i))] + [(set-member? i frms) (f (fxadd1 i))] [else (let ([fv (mkfvar i)]) (set-var-loc! x fv) @@ -1795,9 +1795,9 @@ (for-each-var (var-var-move x) varvec (lambda (var) (set-var-var-move! var - (rem-var x (var-var-move var))) + (rem-var x (var-var-move var))) (set-var-frm-move! var - (add-frm fv (var-frm-move var))) + (add-frm fv (var-frm-move var))) (let ([loc (var-loc var)]) (when (and loc (not (fvar? loc))) (assign-move var))))) diff --git a/src/libcompile.ss b/src/libcompile.ss index 0623346..7110664 100644 --- a/src/libcompile.ss +++ b/src/libcompile.ss @@ -487,6 +487,8 @@ ,(E body))] [(shortcut body handler) `(shortcut ,(E body) ,(E handler))] + [(ntcall target valuw args mask size) + `(ntcall ,target ,size)] [else (if (symbol? x) x @@ -2230,7 +2232,7 @@ (define (simplify arg lhs* rhs* k) (if (simple? arg) (k arg lhs* rhs*) - (let ([v (unique-var 'tmp)]) + (let ([v (unique-var 'tp)]) (k v (cons v lhs*) (cons (Expr arg) rhs*))))) (define (simplify* arg* lhs* rhs* k) (cond