From 0432b17409c7a695591a06f1eaed37c19a586bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Wed, 31 Dec 2014 02:44:48 +0100 Subject: [PATCH] compiler.cfg.*: refactoring away the compute-global-sets word --- basis/compiler/cfg/stacks/global/global.factor | 10 ---------- basis/compiler/cfg/stacks/stacks.factor | 14 ++++++++++---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/basis/compiler/cfg/stacks/global/global.factor b/basis/compiler/cfg/stacks/global/global.factor index 586993300a..d1164f871a 100644 --- a/basis/compiler/cfg/stacks/global/global.factor +++ b/basis/compiler/cfg/stacks/global/global.factor @@ -46,13 +46,3 @@ M: dead-analysis transfer-set drop [ kill-set assoc-union ] [ replace-set assoc-union ] bi ; - -! Main word -: compute-global-sets ( cfg -- ) - { - [ compute-anticip-sets ] - [ compute-live-sets ] - [ compute-pending-sets ] - [ compute-dead-sets ] - [ compute-avail-sets ] - } cleave ; diff --git a/basis/compiler/cfg/stacks/stacks.factor b/basis/compiler/cfg/stacks/stacks.factor index cbc8ff8360..cc43014b77 100644 --- a/basis/compiler/cfg/stacks/stacks.factor +++ b/basis/compiler/cfg/stacks/stacks.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors biassocs compiler.cfg compiler.cfg.registers compiler.cfg.stacks.finalize compiler.cfg.stacks.global -compiler.cfg.stacks.height compiler.cfg.stacks.local kernel math -namespaces sequences ; +compiler.cfg.stacks.height compiler.cfg.stacks.local compiler.cfg.utilities +kernel math namespaces sequences ; IN: compiler.cfg.stacks : begin-stack-analysis ( -- ) @@ -17,8 +17,14 @@ IN: compiler.cfg.stacks : end-stack-analysis ( -- ) cfg get - [ compute-global-sets ] - [ finalize-stack-shuffling ] bi ; + { + compute-anticip-sets + compute-live-sets + compute-pending-sets + compute-dead-sets + compute-avail-sets + finalize-stack-shuffling + } apply-passes ; : ds-drop ( -- ) -1 inc-d ;