From 78d5c0a7431ebae6ca126638a09144e01057087b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Thu, 23 Jul 2015 10:11:24 +0200 Subject: [PATCH] compiler.cfg.instructions: ##read -> read-insn and ##write -> write-insn --- basis/compiler/cfg/alias-analysis/alias-analysis.factor | 4 ++-- basis/compiler/cfg/instructions/instructions.factor | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis.factor b/basis/compiler/cfg/alias-analysis/alias-analysis.factor index 1cf8f5f83f..1bbe5d69c2 100644 --- a/basis/compiler/cfg/alias-analysis/alias-analysis.factor +++ b/basis/compiler/cfg/alias-analysis/alias-analysis.factor @@ -180,7 +180,7 @@ M: ##box-displaced-alien analyze-aliases [ call-next-method ] [ base>> heap-ac get merge-acs ] bi ; -M: ##read analyze-aliases +M: read-insn analyze-aliases call-next-method dup [ dst>> ] [ insn-slot# ] [ insn-object ] tri 2dup live-slot dup @@ -193,7 +193,7 @@ M: ##read analyze-aliases #! from? live-slot = ; -M:: ##write analyze-aliases ( insn -- insn ) +M:: write-insn analyze-aliases ( insn -- insn ) insn src>> resolve :> src insn insn-slot# :> slot# insn insn-object :> vreg diff --git a/basis/compiler/cfg/instructions/instructions.factor b/basis/compiler/cfg/instructions/instructions.factor index a2eb8ec8f7..4552c010fa 100644 --- a/basis/compiler/cfg/instructions/instructions.factor +++ b/basis/compiler/cfg/instructions/instructions.factor @@ -834,8 +834,8 @@ UNION: conditional-branch-insn ##fixnum-mul ; ! For alias analysis -UNION: ##read ##slot ##slot-imm ##vm-field ##alien-global ; -UNION: ##write ##set-slot ##set-slot-imm ##set-vm-field ; +UNION: read-insn ##slot ##slot-imm ##vm-field ##alien-global ; +UNION: write-insn ##set-slot ##set-slot-imm ##set-vm-field ; UNION: alien-call-insn ##alien-assembly