diff --git a/src/main/fragment/mos6502-common/call_phi_close_cx16_ram.asm b/src/main/fragment/mos6502-common/call_phi_close_cx16_ram.asm
index 40053e0b4..fda09c03e 100644
--- a/src/main/fragment/mos6502-common/call_phi_close_cx16_ram.asm
+++ b/src/main/fragment/mos6502-common/call_phi_close_cx16_ram.asm
@@ -4,4 +4,4 @@ lda #{c1}
sta $0
jsr {la1}
pla
-sta $0
+sta $0
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/call_phi_close_cx16_rom.asm b/src/main/fragment/mos6502-common/call_phi_close_cx16_rom.asm
index 29641e03d..6d0c8e9c2 100644
--- a/src/main/fragment/mos6502-common/call_phi_close_cx16_rom.asm
+++ b/src/main/fragment/mos6502-common/call_phi_close_cx16_rom.asm
@@ -4,5 +4,4 @@ lda #{c1}
sta $1
jsr {la1}
pla
-sta $1
-
+sta $1
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/call_phi_far_cx16_ram.asm b/src/main/fragment/mos6502-common/call_phi_far_cx16_ram.asm
index 667444f52..6be1d836e 100644
--- a/src/main/fragment/mos6502-common/call_phi_far_cx16_ram.asm
+++ b/src/main/fragment/mos6502-common/call_phi_far_cx16_ram.asm
@@ -1,4 +1,4 @@
jsr $FF6E
.byte <{la1}
.byte >{la1}
-.byte {c1}
+.byte {c1}
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/call_phi_far_cx16_rom.asm b/src/main/fragment/mos6502-common/call_phi_far_cx16_rom.asm
index 667444f52..6be1d836e 100644
--- a/src/main/fragment/mos6502-common/call_phi_far_cx16_rom.asm
+++ b/src/main/fragment/mos6502-common/call_phi_far_cx16_rom.asm
@@ -1,4 +1,4 @@
jsr $FF6E
.byte <{la1}
.byte >{la1}
-.byte {c1}
+.byte {c1}
\ No newline at end of file
diff --git a/src/main/fragment/mos6502-common/call_phi_near.asm b/src/main/fragment/mos6502-common/call_phi_near.asm
index 71fb96bc2..443c46caa 100644
--- a/src/main/fragment/mos6502-common/call_phi_near.asm
+++ b/src/main/fragment/mos6502-common/call_phi_near.asm
@@ -1 +1 @@
-jsr {la1}
+jsr {la1}
\ No newline at end of file
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecBuilder.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecBuilder.java
index 91669533e..a3ca5bddc 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecBuilder.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecBuilder.java
@@ -55,7 +55,7 @@ final public class AsmFragmentInstanceSpecBuilder {
AsmFragmentBindings bindings = new AsmFragmentBindings(program);
AsmFragmentSignature signature = new AsmFragmentSignature.CallBanked(callingDistance, callingConvention);
ScopeRef codeScope = program.getScope().getRef();
- bindings.bind("c1", new ConstantInteger(callingDistance.getBank()));
+ bindings.bind("c1", new ConstantInteger(callingDistance.getBankNumber()));
bindings.bind("la1", new LabelRef(procedureName));
return new AsmFragmentInstanceSpec(program, signature, bindings, codeScope);
}
diff --git a/src/main/java/dk/camelot64/kickc/model/Directive.java b/src/main/java/dk/camelot64/kickc/model/Directive.java
index 4b43f7d4b..850933e44 100644
--- a/src/main/java/dk/camelot64/kickc/model/Directive.java
+++ b/src/main/java/dk/camelot64/kickc/model/Directive.java
@@ -52,20 +52,20 @@ public class Directive {
static public class Bank extends Directive {
private String bankArea; // A bank area is a memory range that is banked on a target platform.
- private Long bank; // A bank is a number that defines a bank configuration in a bank area.
+ private Long bankNumber; // A bank is a number that defines a bank configuration in a bank area.
- public Bank(String bankArea, Long bank) {
+ public Bank(String bankArea, Long bankNumber) {
super("bank" );
this.bankArea = bankArea;
- this.bank = bank;
+ this.bankNumber = bankNumber;
}
public String getBankArea() {
return bankArea;
}
- public Long getBank() {
- return bank;
+ public Long getBankNumber() {
+ return bankNumber;
}
}
diff --git a/src/main/java/dk/camelot64/kickc/model/Program.java b/src/main/java/dk/camelot64/kickc/model/Program.java
index c42debf3d..bcd720852 100644
--- a/src/main/java/dk/camelot64/kickc/model/Program.java
+++ b/src/main/java/dk/camelot64/kickc/model/Program.java
@@ -8,11 +8,13 @@ import dk.camelot64.kickc.model.statements.Statement;
import dk.camelot64.kickc.model.symbols.ProgramScope;
import dk.camelot64.kickc.model.values.LabelRef;
import dk.camelot64.kickc.model.values.ProcedureRef;
-import dk.camelot64.kickc.parser.KickCParser;
import dk.camelot64.kickc.passes.calcs.*;
import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
/** A KickC Intermediate Compiler Language (ICL) Program */
public class Program {
@@ -105,7 +107,6 @@ public class Program {
private NaturalLoopSet loopSet;
/** The register weight of all variables describing how much the variable would theoretically gain from being in a register. PASS 3-5 (CACHED ON-DEMAND) */
private VariableRegisterWeights variableRegisterWeights;
- /** All #pragma code segments. Collected during parsing. These are used by the bank() pragmas to validate if the code segment exists during compilation.*/
public Program() {
this.outputFileManager = new OutputFileManager();
@@ -537,4 +538,5 @@ public class Program {
sizeInfo.append(getAsm().getSizeInfo());
return sizeInfo.toString();
}
+
}
diff --git a/src/main/java/dk/camelot64/kickc/model/Bank.java b/src/main/java/dk/camelot64/kickc/model/symbols/Bank.java
similarity index 89%
rename from src/main/java/dk/camelot64/kickc/model/Bank.java
rename to src/main/java/dk/camelot64/kickc/model/symbols/Bank.java
index b080bc0e4..ce1ace201 100644
--- a/src/main/java/dk/camelot64/kickc/model/Bank.java
+++ b/src/main/java/dk/camelot64/kickc/model/symbols/Bank.java
@@ -1,9 +1,6 @@
-package dk.camelot64.kickc.model;
-
-
+package dk.camelot64.kickc.model.symbols;
/**
- *
*
* Specific target computer platforms implement a memory layout that can be banked either in ram or rom.
* This class models the capability to calculate which function call implementations are banked and which not.
@@ -99,44 +96,28 @@ package dk.camelot64.kickc.model;
* __bank( method, number ) directive to calculate the function call implementation
* at the function calling locations!
*
- *
+ *
* The KickC compiler contains several test cases and examples which demonstrate the usage of the banking system.
*
+ * @param bankArea The bankable area name.
+ * @param bankNumber The bank number.
*/
-public class Bank extends Object {
-
- private final String bankArea; // The bank method to apply.
- private Long bank; // The bank number.
+public record Bank(String bankArea, Long bankNumber) {
/**
* Creates a new Bank which collects the necessary data to handle banking.
* For example, on the Commander X16, RAM is banked from address 0xA000 till 0xBFFF.
* Zeropage 0x00 configures this banked RAM, with a number from 0x00 till 0xff.
- * So banked RAM is is a bankArea, and the bank is a configurable bank number in the bankArea.
+ * So "Banked RAM" is is a bankArea, and the bank is a configurable bank number in the bankArea.
+ *
* @param bankArea A bank area is a memory range that is banked on a target platform.
- * @param bank A bank is a number that defines a bank configuration in a bank area.
+ * @param bankNumber A bank is a number that defines a bank configuration in a bank area.
*/
- public Bank(String bankArea, Long bank) {
- this.bankArea = bankArea;
- this.bank = bank;
- }
-
- public String getBankArea() {
- return bankArea;
- }
-
- public Long getBank() {
- return bank;
- }
-
- public void setBank(Long bank) {
- this.bank = bank;
+ public Bank {
}
@Override
public String toString() {
- return "banked : " +
- "bank area='" + bankArea + '\'' +
- ", bank=" + bank;
+ return "__bank(" + this.bankArea() + ", " + this.bankNumber() + ") ";
}
}
diff --git a/src/main/java/dk/camelot64/kickc/model/symbols/Procedure.java b/src/main/java/dk/camelot64/kickc/model/symbols/Procedure.java
index d59dd6419..40da8c1d2 100644
--- a/src/main/java/dk/camelot64/kickc/model/symbols/Procedure.java
+++ b/src/main/java/dk/camelot64/kickc/model/symbols/Procedure.java
@@ -1,7 +1,6 @@
package dk.camelot64.kickc.model.symbols;
import dk.camelot64.kickc.model.Comment;
-import dk.camelot64.kickc.model.Bank;
import dk.camelot64.kickc.model.Program;
import dk.camelot64.kickc.model.statements.StatementSource;
import dk.camelot64.kickc.model.types.SymbolType;
@@ -42,10 +41,12 @@ public class Procedure extends Scope {
private boolean isConstructor;
/** The source of the procedure definition. */
private StatementSource definitionSource;
- /** The bank segment information. Collected during parsing. These are used to compare with the current currentBank to decide a near or a far call, and to keep inline calling routines.
- * When this value is null, the procedure is not allocated to a bank.
+ /**
+ * The bank that the procedure code is placed in.
+ * Used to decide whether to produce near, close or far call when generating code.
+ * If null, the procedure is in a common bank (always visible) and all calls will be near.
*/
- private Bank bankLocation;
+ private Bank bank;
/** The names of all legal intrinsic procedures. */
@@ -56,12 +57,12 @@ public class Procedure extends Scope {
Pass1ByteXIntrinsicRewrite.INTRINSIC_MAKELONG4
);
- public Bank getBankLocation() {
- return bankLocation;
+ public Bank getBank() {
+ return bank;
}
- public void setBankLocation(Bank bankLocation) {
- this.bankLocation = bankLocation;
+ public void setBank(Bank bank) {
+ this.bank = bank;
}
public enum CallingProximity {
@@ -109,16 +110,16 @@ public class Procedure extends Scope {
return bankArea;
}
- public Long getBank() {
+ public Long getBankNumber() {
return bank;
}
public CallingDistance(Procedure from, Procedure to) {
- if (((!from.isDeclaredBanked() && !to.isDeclaredBanked())) ||
- ((from.isDeclaredBanked() && !to.isDeclaredBanked())) ||
- ((from.isDeclaredBanked() && to.isDeclaredBanked()) &&
- (from.getBank() == to.getBank()) &&
+ if (((!from.isBanked() && !to.isBanked())) ||
+ ((from.isBanked() && !to.isBanked())) ||
+ ((from.isBanked() && to.isBanked()) &&
+ (from.getBankNumber() == to.getBankNumber()) &&
(from.getBankArea().contentEquals(to.getBankArea()))
)
) {
@@ -127,18 +128,18 @@ public class Procedure extends Scope {
this.bankArea = "";
this.bank = 0L;
} else {
- if ((!from.isDeclaredBanked() && to.isDeclaredBanked()) ||
- ((from.isDeclaredBanked() && to.isDeclaredBanked()) && (!from.getBankArea().contentEquals(to.getBankArea())))
+ if ((!from.isBanked() && to.isBanked()) ||
+ ((from.isBanked() && to.isBanked()) && (!from.getBankArea().contentEquals(to.getBankArea())))
) {
// close call - case #2, #6
this.proximity = CallingProximity.CLOSE;
this.bankArea = to.getBankArea();
- this.bank = to.getBank();
+ this.bank = to.getBankNumber();
} else {
// far call - case #5
this.proximity = CallingProximity.FAR;
this.bankArea = to.getBankArea();
- this.bank = to.getBank();
+ this.bank = to.getBankNumber();
}
}
}
@@ -183,11 +184,11 @@ public class Procedure extends Scope {
/** The calling convention used for this procedure. */
private CallingConvention callingConvention;
- public Procedure(String name, SymbolTypeProcedure procedureType, Scope parentScope, String segmentCode, String segmentData, CallingConvention callingConvention, Bank bankLocation) {
+ public Procedure(String name, SymbolTypeProcedure procedureType, Scope parentScope, String segmentCode, String segmentData, CallingConvention callingConvention, Bank bank) {
super(name, parentScope, segmentData);
this.procedureType = procedureType;
this.declaredInline = false;
- this.bankLocation = bankLocation;
+ this.bank = bank;
this.interruptType = null;
this.comments = new ArrayList<>();
this.segmentCode = segmentCode;
@@ -301,20 +302,20 @@ public class Procedure extends Scope {
this.declaredInline = declaredInline;
}
- public boolean isDeclaredBanked() {
- return bankLocation != null;
+ public boolean isBanked() {
+ return bank != null;
}
- public Long getBank() {
- if(bankLocation != null)
- return bankLocation.getBank();
+ public Long getBankNumber() {
+ if(bank != null)
+ return bank.bankNumber();
else
return 0L;
}
public String getBankArea() {
- if(bankLocation != null)
- return bankLocation.getBankArea();
+ if(bank != null)
+ return bank.bankArea();
else
return "";
}
@@ -379,8 +380,8 @@ public class Procedure extends Scope {
if(declaredIntrinsic) {
res.append("__intrinsic ");
}
- if(isDeclaredBanked()) {
- res.append("__bank(").append(this.getBankArea()).append(", ").append(this.getBank()).append(") ");
+ if(isBanked()) {
+ res.append("__bank(").append(this.getBankArea()).append(", ").append(this.getBankNumber()).append(") ");
}
if(!callingConvention.equals(CallingConvention.PHI_CALL)) {
res.append(getCallingConvention().getName()).append(" ");
@@ -418,23 +419,11 @@ public class Procedure extends Scope {
if(o == null || getClass() != o.getClass()) return false;
if(!super.equals(o)) return false;
Procedure procedure = (Procedure) o;
- return variableLengthParameterList == procedure.variableLengthParameterList &&
- declaredInline == procedure.declaredInline &&
- Objects.equals(bankLocation, procedure.bankLocation) &&
- declaredIntrinsic == procedure.declaredIntrinsic &&
- isConstructor == procedure.isConstructor &&
- Objects.equals(procedureType, procedure.procedureType) &&
- Objects.equals(parameterNames, procedure.parameterNames) &&
- Objects.equals(interruptType, procedure.interruptType) &&
- Objects.equals(comments, procedure.comments) &&
- Objects.equals(reservedZps, procedure.reservedZps) &&
- Objects.equals(segmentCode, procedure.segmentCode) &&
- Objects.equals(constructorRefs, procedure.constructorRefs) &&
- callingConvention == procedure.callingConvention;
+ return variableLengthParameterList == procedure.variableLengthParameterList && declaredInline == procedure.declaredInline && declaredIntrinsic == procedure.declaredIntrinsic && isConstructor == procedure.isConstructor && Objects.equals(procedureType, procedure.procedureType) && Objects.equals(parameterNames, procedure.parameterNames) && Objects.equals(interruptType, procedure.interruptType) && Objects.equals(comments, procedure.comments) && Objects.equals(reservedZps, procedure.reservedZps) && Objects.equals(segmentCode, procedure.segmentCode) && Objects.equals(constructorRefs, procedure.constructorRefs) && Objects.equals(definitionSource, procedure.definitionSource) && Objects.equals(bank, procedure.bank) && callingConvention == procedure.callingConvention;
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), procedureType, parameterNames, variableLengthParameterList, declaredInline, declaredIntrinsic, interruptType, comments, reservedZps, segmentCode, constructorRefs, isConstructor, callingConvention);
+ return Objects.hash(super.hashCode(), procedureType, parameterNames, variableLengthParameterList, declaredInline, declaredIntrinsic, interruptType, comments, reservedZps, segmentCode, constructorRefs, isConstructor, definitionSource, bank, callingConvention);
}
}
diff --git a/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java b/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java
index 0ef0c0345..b73ae4353 100644
--- a/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java
+++ b/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java
@@ -16,8 +16,6 @@ public abstract class Scope implements Symbol {
public static final String SEGMENT_CODE_DEFAULT = "Code";
/** The default data segment. */
public static final String SEGMENT_DATA_DEFAULT = "Data";
- /** The default bank segment. */
- public static final Long SEGMENT_BANK_DEFAULT = -1L;
private String name;
private HashMap symbols;
diff --git a/src/main/java/dk/camelot64/kickc/parser/CParser.java b/src/main/java/dk/camelot64/kickc/parser/CParser.java
index 84832cf36..d15b8d800 100644
--- a/src/main/java/dk/camelot64/kickc/parser/CParser.java
+++ b/src/main/java/dk/camelot64/kickc/parser/CParser.java
@@ -107,11 +107,11 @@ public class CParser {
*/
public static final String PRAGMA_RESOURCE = "resource";
/**
- * #pragma bank(...) changes the current bank. Functionsand variables will be placed in the specified bank.
+ * #pragma bank(...) changes the current bank. Functions and variables will be placed in the specified bank.
*/
public static final String PRAGMA_BANK = "bank";
/**
- * #pragma nobank Changes the current bank to the default bank.
+ * #pragma nobank Changes the current bank to the default/common bank.
*/
public static final String PRAGMA_NOBANK = "nobank";
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
index b1a939feb..9d4cf7357 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
@@ -16,7 +16,6 @@ import dk.camelot64.kickc.parser.KickCParserBaseVisitor;
import dk.camelot64.kickc.passes.utils.SizeOfConstants;
import org.antlr.v4.runtime.BufferedTokenStream;
import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.RuleContext;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.TerminalNode;
@@ -295,12 +294,14 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor 0) {
asm.addComment(signature.toString(), false);
}
- // Banking information of the procedure.
- Bank bank = procedure.getBankLocation();
- if(bank != null) {
- StringBuilder signatureBank = new StringBuilder();
- signatureBank.append(" " + bank.toString()); // This procedure is in a bank and in a banking area.
- asm.addComment(signatureBank.toString(), false);
+ if(procedure.getBank() != null) {
+ asm.addComment(" " + procedure.getBank(), false);
}
}
@@ -896,6 +891,7 @@ public class Pass4CodeGeneration {
}
} else if (Procedure.CallingConvention.PHI_CALL.equals(toProcedure.getCallingConvention())) {
// Generate PHI transition
+ boolean generatedPhis = false;
if (genCallPhiEntry) {
ControlFlowBlock callSuccessor = getGraph().getCallSuccessor(block);
if (callSuccessor != null && callSuccessor.hasPhiBlock()) {
@@ -904,17 +900,21 @@ public class Pass4CodeGeneration {
throw new InternalError("Error! JSR transition already generated. Must modify PhiTransitions code to ensure this does not happen.");
}
genBlockPhiTransition(asm, block, callSuccessor, block.getScope());
+ generatedPhis = true;
}
}
- AsmFragmentCodeGenerator.generateAsm(asm, AsmFragmentInstanceSpecBuilder.callBanked(new Procedure.CallingDistance(fromProcedure, toProcedure),"phi", call.getProcedure().getFullName(), program), program);
- } else if (Procedure.CallingConvention.STACK_CALL.equals(toProcedure.getCallingConvention())) {
- Boolean toIsBanked = toProcedure.isDeclaredBanked();
- Long fromBank = fromProcedure.getBank();
- Long toBank = toProcedure.getBank();
- if(toIsBanked && fromBank != toBank) {
- throw new CompileError("Stack Call procedure not supported in banked mode " + toProcedure.toString(program));
- } else {
+ final Procedure.CallingDistance callingDistance = new Procedure.CallingDistance(fromProcedure, toProcedure);
+ if(Procedure.CallingProximity.NEAR.equals(callingDistance.getProximity())) {
asm.addInstruction("jsr", CpuAddressingMode.ABS, call.getProcedure().getFullName(), false);
+ } else {
+ AsmFragmentCodeGenerator.generateAsm(asm, AsmFragmentInstanceSpecBuilder.callBanked(callingDistance,"phi", call.getProcedure().getFullName(), program), program);
+ }
+ } else if (Procedure.CallingConvention.STACK_CALL.equals(toProcedure.getCallingConvention())) {
+ final Procedure.CallingDistance callingDistance = new Procedure.CallingDistance(fromProcedure, toProcedure);
+ if(Procedure.CallingProximity.NEAR.equals(callingDistance.getProximity())) {
+ asm.addInstruction("jsr", CpuAddressingMode.ABS, call.getProcedure().getFullName(), false);
+ } else {
+ throw new CompileError("Stack Call procedure not supported in banked mode " + toProcedure.toString(program));
}
}
} else if (statement instanceof StatementCallExecute) {
@@ -923,14 +923,14 @@ public class Pass4CodeGeneration {
if(procedureRef != null) {
ProgramScope scope = getScope();
Procedure toProcedure = scope.getProcedure(procedureRef);
- Procedure fromProcedure = block.getProcedure(this.program); // We obtain from where the procedure is called, to validate the bank equality.
- RValue procedureRVal = call.getProcedureRVal();
- // Same as PHI
- if (toProcedure.isDeclaredBanked() && fromProcedure.getBank() != toProcedure.getBank()) {
- throw new CompileError("Stack Call procedure not supported in banked mode " + toProcedure.toString(program));
- } else {
+ Procedure fromProcedure = block.getProcedure(this.program);
+ final Procedure.CallingDistance callingDistance = new Procedure.CallingDistance(fromProcedure, toProcedure);
+ if(Procedure.CallingProximity.NEAR.equals(callingDistance.getProximity())) {
AsmFragmentCodeGenerator.generateAsm(asm, AsmFragmentInstanceSpecBuilder.call(call, indirectCallCount++, program), program);
+ } else {
+ throw new CompileError("Stack Call procedure not supported in banked mode " + toProcedure.toString(program));
}
+ RValue procedureRVal = call.getProcedureRVal();
if (!(procedureRVal instanceof ProcedureRef)) {
asm.getCurrentChunk().setClobberOverwrite(CpuClobber.CLOBBER_ALL);
}
diff --git a/src/test/ref/address-0.log b/src/test/ref/address-0.log
index d0c3f50bd..46f28583e 100644
--- a/src/test/ref/address-0.log
+++ b/src/test/ref/address-0.log
@@ -152,7 +152,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -241,7 +241,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/address-2.log b/src/test/ref/address-2.log
index 850a4e045..635b2d637 100644
--- a/src/test/ref/address-2.log
+++ b/src/test/ref/address-2.log
@@ -152,7 +152,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -241,7 +241,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/address-5.log b/src/test/ref/address-5.log
index 89039d32b..ec12d868c 100644
--- a/src/test/ref/address-5.log
+++ b/src/test/ref/address-5.log
@@ -181,7 +181,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -194,7 +194,7 @@ main: {
// [5] print::ch = 'c' -- vbuz1=vbuc1
lda #'c'
sta.z print.ch
- // [6] call print -- call_phi_near
+ // [6] call print
jsr print
jmp __b1
// main::@1
@@ -202,7 +202,7 @@ main: {
// [7] print::ch = 'm' -- vbuz1=vbuc1
lda #'m'
sta.z print.ch
- // [8] call print -- call_phi_near
+ // [8] call print
jsr print
jmp __b2
// main::@2
@@ -210,7 +210,7 @@ main: {
// [9] print::ch = 'l' -- vbuz1=vbuc1
lda #'l'
sta.z print.ch
- // [10] call print -- call_phi_near
+ // [10] call print
jsr print
jmp __breturn
// main::@return
@@ -295,7 +295,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
@@ -307,21 +307,21 @@ main: {
// [5] print::ch = 'c' -- vbuz1=vbuc1
lda #'c'
sta.z print.ch
- // [6] call print -- call_phi_near
+ // [6] call print
jsr print
// main::@1
// print('m')
// [7] print::ch = 'm' -- vbuz1=vbuc1
lda #'m'
sta.z print.ch
- // [8] call print -- call_phi_near
+ // [8] call print
jsr print
// main::@2
// print('l')
// [9] print::ch = 'l' -- vbuz1=vbuc1
lda #'l'
sta.z print.ch
- // [10] call print -- call_phi_near
+ // [10] call print
jsr print
// main::@return
// }
diff --git a/src/test/ref/address-6.log b/src/test/ref/address-6.log
index 7b69f56e2..40634ffb4 100644
--- a/src/test/ref/address-6.log
+++ b/src/test/ref/address-6.log
@@ -181,7 +181,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -194,7 +194,7 @@ main: {
// [5] print::ch = 'c' -- vbuz1=vbuc1
lda #'c'
sta.z print.ch
- // [6] call print -- call_phi_near
+ // [6] call print
jsr print
jmp __b1
// main::@1
@@ -202,7 +202,7 @@ main: {
// [7] print::ch = 'm' -- vbuz1=vbuc1
lda #'m'
sta.z print.ch
- // [8] call print -- call_phi_near
+ // [8] call print
jsr print
jmp __b2
// main::@2
@@ -210,7 +210,7 @@ main: {
// [9] print::ch = 'l' -- vbuz1=vbuc1
lda #'l'
sta.z print.ch
- // [10] call print -- call_phi_near
+ // [10] call print
jsr print
jmp __breturn
// main::@return
@@ -295,7 +295,7 @@ __start: {
sta idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
@@ -307,21 +307,21 @@ main: {
// [5] print::ch = 'c' -- vbuz1=vbuc1
lda #'c'
sta.z print.ch
- // [6] call print -- call_phi_near
+ // [6] call print
jsr print
// main::@1
// print('m')
// [7] print::ch = 'm' -- vbuz1=vbuc1
lda #'m'
sta.z print.ch
- // [8] call print -- call_phi_near
+ // [8] call print
jsr print
// main::@2
// print('l')
// [9] print::ch = 'l' -- vbuz1=vbuc1
lda #'l'
sta.z print.ch
- // [10] call print -- call_phi_near
+ // [10] call print
jsr print
// main::@return
// }
diff --git a/src/test/ref/address-of-1.log b/src/test/ref/address-of-1.log
index d3c427e55..9ccbe545a 100644
--- a/src/test/ref/address-of-1.log
+++ b/src/test/ref/address-of-1.log
@@ -259,7 +259,7 @@ main: {
sta.z setByte.ptr
lda #>b1
sta.z setByte.ptr+1
- // [12] phi setByte::b#3 = 'c' [phi:main->setByte#1] -- call_phi_near
+ // [12] phi setByte::b#3 = 'c' [phi:main->setByte#1] -- vbuxx=vbuc1
ldx #'c'
jsr setByte
// [4] phi from main to main::@1 [phi:main->main::@1]
@@ -275,7 +275,7 @@ main: {
sta.z setByte.ptr
lda #>b2
sta.z setByte.ptr+1
- // [12] phi setByte::b#3 = 'm' [phi:main::@1->setByte#1] -- call_phi_near
+ // [12] phi setByte::b#3 = 'm' [phi:main::@1->setByte#1] -- vbuxx=vbuc1
ldx #'m'
jsr setByte
// [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -291,7 +291,7 @@ main: {
sta.z setByte.ptr
lda #>b3
sta.z setByte.ptr+1
- // [12] phi setByte::b#3 = 'l' [phi:main::@2->setByte#1] -- call_phi_near
+ // [12] phi setByte::b#3 = 'l' [phi:main::@2->setByte#1] -- vbuxx=vbuc1
ldx #'l'
jsr setByte
jmp __b3
@@ -410,7 +410,7 @@ main: {
sta.z setByte.ptr
lda #>b1
sta.z setByte.ptr+1
- // [12] phi setByte::b#3 = 'c' [phi:main->setByte#1] -- call_phi_near
+ // [12] phi setByte::b#3 = 'c' [phi:main->setByte#1] -- vbuxx=vbuc1
ldx #'c'
jsr setByte
// [4] phi from main to main::@1 [phi:main->main::@1]
@@ -423,7 +423,7 @@ main: {
sta.z setByte.ptr
lda #>b2
sta.z setByte.ptr+1
- // [12] phi setByte::b#3 = 'm' [phi:main::@1->setByte#1] -- call_phi_near
+ // [12] phi setByte::b#3 = 'm' [phi:main::@1->setByte#1] -- vbuxx=vbuc1
ldx #'m'
jsr setByte
// [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -436,7 +436,7 @@ main: {
sta.z setByte.ptr
lda #>b3
sta.z setByte.ptr+1
- // [12] phi setByte::b#3 = 'l' [phi:main::@2->setByte#1] -- call_phi_near
+ // [12] phi setByte::b#3 = 'l' [phi:main::@2->setByte#1] -- vbuxx=vbuc1
ldx #'l'
jsr setByte
// main::@3
diff --git a/src/test/ref/address-of-2.log b/src/test/ref/address-of-2.log
index deb4adb98..badb057de 100644
--- a/src/test/ref/address-of-2.log
+++ b/src/test/ref/address-of-2.log
@@ -367,7 +367,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -417,7 +417,7 @@ main: {
// [15] *(main::SCREEN2+3) = *main::ptr -- _deref_pbuc1=_deref_pbuc2
lda.z ptr
sta SCREEN2+3
- // [16] call setv -- call_phi_near
+ // [16] call setv
// Set value directly in a call
jsr setv
jmp __b1
@@ -429,7 +429,7 @@ main: {
// [18] *(main::SCREEN2+4) = *main::ptr -- _deref_pbuc1=_deref_pbuc2
lda.z ptr
sta SCREEN2+4
- // [19] call setp -- call_phi_near
+ // [19] call setp
// Set value through pointer in a call
jsr setp
jmp __b2
@@ -545,7 +545,7 @@ __start: {
sta.z val
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
@@ -603,7 +603,7 @@ main: {
lda.z ptr
sta SCREEN2+3
// setv(4)
- // [16] call setv -- call_phi_near
+ // [16] call setv
// Set value directly in a call
jsr setv
// main::@1
@@ -616,7 +616,7 @@ main: {
lda.z ptr
sta SCREEN2+4
// setp(ptr, 5)
- // [19] call setp -- call_phi_near
+ // [19] call setp
// Set value through pointer in a call
jsr setp
// main::@2
diff --git a/src/test/ref/address-of-3.log b/src/test/ref/address-of-3.log
index 5452e93f9..f06b24e72 100644
--- a/src/test/ref/address-of-3.log
+++ b/src/test/ref/address-of-3.log
@@ -332,7 +332,7 @@ main: {
sta.z print.p
lda #>VALS
sta.z print.p+1
- // [11] phi idx#13 = 0 [phi:main->print#1] -- call_phi_near
+ // [11] phi idx#13 = 0 [phi:main->print#1] -- vbuz1=vbuc1
lda #0
sta.z idx
jsr print
@@ -349,7 +349,7 @@ main: {
sta.z print.p
lda #>VALS+1*SIZEOF_INT
sta.z print.p+1
- // [11] phi idx#13 = idx#14 [phi:main::@2->print#1] -- call_phi_near
+ // [11] phi idx#13 = idx#14 [phi:main::@2->print#1] -- register_copy
jsr print
// [4] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
__b1_from___b2:
@@ -377,7 +377,7 @@ main: {
// [11] phi from main::@1 to print [phi:main::@1->print]
print_from___b1:
// [11] phi print::p#3 = print::p#2 [phi:main::@1->print#0] -- register_copy
- // [11] phi idx#13 = idx#14 [phi:main::@1->print#1] -- call_phi_near
+ // [11] phi idx#13 = idx#14 [phi:main::@1->print#1] -- register_copy
jsr print
jmp __b3
// main::@3
@@ -499,7 +499,7 @@ main: {
sta.z print.p
lda #>VALS
sta.z print.p+1
- // [11] phi idx#13 = 0 [phi:main->print#1] -- call_phi_near
+ // [11] phi idx#13 = 0 [phi:main->print#1] -- vbuz1=vbuc1
lda #0
sta.z idx
jsr print
@@ -513,7 +513,7 @@ main: {
sta.z print.p
lda #>VALS+1*SIZEOF_INT
sta.z print.p+1
- // [11] phi idx#13 = idx#14 [phi:main::@2->print#1] -- call_phi_near
+ // [11] phi idx#13 = idx#14 [phi:main::@2->print#1] -- register_copy
jsr print
// [4] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
// [4] phi main::i#2 = 2 [phi:main::@2->main::@1#0] -- vbuz1=vbuc1
@@ -538,7 +538,7 @@ main: {
// [7] call print
// [11] phi from main::@1 to print [phi:main::@1->print]
// [11] phi print::p#3 = print::p#2 [phi:main::@1->print#0] -- register_copy
- // [11] phi idx#13 = idx#14 [phi:main::@1->print#1] -- call_phi_near
+ // [11] phi idx#13 = idx#14 [phi:main::@1->print#1] -- register_copy
jsr print
// main::@3
// for(char i:2..3)
diff --git a/src/test/ref/array-16bit-lookup.log b/src/test/ref/array-16bit-lookup.log
index 9c1c39308..4425fa5ea 100644
--- a/src/test/ref/array-16bit-lookup.log
+++ b/src/test/ref/array-16bit-lookup.log
@@ -313,7 +313,7 @@ main: {
sta.z getValue.index
lda #0
sta.z getValue.index+1
- // [3] call getValue -- call_phi_near
+ // [3] call getValue
jsr getValue
// [4] getValue::return#0 = getValue::return#1
jmp __b2
@@ -451,7 +451,7 @@ main: {
sta.z getValue.index
lda #0
sta.z getValue.index+1
- // [3] call getValue -- call_phi_near
+ // [3] call getValue
jsr getValue
// [4] getValue::return#0 = getValue::return#1
// main::@2
diff --git a/src/test/ref/asm-mnemonic-names.log b/src/test/ref/asm-mnemonic-names.log
index 7c776fad2..e2456e540 100644
--- a/src/test/ref/asm-mnemonic-names.log
+++ b/src/test/ref/asm-mnemonic-names.log
@@ -135,7 +135,7 @@ main: {
// [0] *lda = main::jmp -- _deref_pbuc1=vbuc2
lda #jmp
sta lda
- // [1] call bne -- call_phi_near
+ // [1] call bne
jsr bne
jmp __b1
// main::@1
@@ -215,7 +215,7 @@ main: {
lda #jmp
sta lda
// bne(jmp)
- // [1] call bne -- call_phi_near
+ // [1] call bne
jsr bne
// main::@1
// asm
diff --git a/src/test/ref/assignment-compound.log b/src/test/ref/assignment-compound.log
index 9c2927c8f..fea93d4d2 100644
--- a/src/test/ref/assignment-compound.log
+++ b/src/test/ref/assignment-compound.log
@@ -726,7 +726,7 @@ main: {
test_from_main:
// [23] phi test::i#11 = 0 [phi:main->test#0] -- vbuxx=vbuc1
ldx #0
- // [23] phi test::a#11 = 3 [phi:main->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3 [phi:main->test#1] -- vbuz1=vbuc1
lda #3
sta.z test.a
jsr test
@@ -741,7 +741,7 @@ main: {
test_from___b1:
// [23] phi test::i#11 = 1 [phi:main::@1->test#0] -- vbuxx=vbuc1
ldx #1
- // [23] phi test::a#11 = 3+1 [phi:main::@1->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1 [phi:main::@1->test#1] -- vbuz1=vbuc1
lda #3+1
sta.z test.a
jsr test
@@ -756,7 +756,7 @@ main: {
test_from___b2:
// [23] phi test::i#11 = 2 [phi:main::@2->test#0] -- vbuxx=vbuc1
ldx #2
- // [23] phi test::a#11 = 3+1-1 [phi:main::@2->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1 [phi:main::@2->test#1] -- vbuz1=vbuc1
lda #3+1-1
sta.z test.a
jsr test
@@ -771,7 +771,7 @@ main: {
test_from___b3:
// [23] phi test::i#11 = 3 [phi:main::@3->test#0] -- vbuxx=vbuc1
ldx #3
- // [23] phi test::a#11 = 3+1-1*6 [phi:main::@3->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6 [phi:main::@3->test#1] -- vbuz1=vbuc1
lda #(3+1-1)*6
sta.z test.a
jsr test
@@ -786,7 +786,7 @@ main: {
test_from___b4:
// [23] phi test::i#11 = 4 [phi:main::@4->test#0] -- vbuxx=vbuc1
ldx #4
- // [23] phi test::a#11 = 3+1-1*6/2 [phi:main::@4->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2 [phi:main::@4->test#1] -- vbuz1=vbuc1
lda #(3+1-1)*6/2
sta.z test.a
jsr test
@@ -801,7 +801,7 @@ main: {
test_from___b5:
// [23] phi test::i#11 = 5 [phi:main::@5->test#0] -- vbuxx=vbuc1
ldx #5
- // [23] phi test::a#11 = 3+1-1*6/2&2-1 [phi:main::@5->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1 [phi:main::@5->test#1] -- vbuz1=vbuc1
lda #(3+1-1)*6/2&2-1
sta.z test.a
jsr test
@@ -816,7 +816,7 @@ main: {
test_from___b6:
// [23] phi test::i#11 = 6 [phi:main::@6->test#0] -- vbuxx=vbuc1
ldx #6
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2 [phi:main::@6->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2 [phi:main::@6->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2
sta.z test.a
jsr test
@@ -831,7 +831,7 @@ main: {
test_from___b7:
// [23] phi test::i#11 = 7 [phi:main::@7->test#0] -- vbuxx=vbuc1
ldx #7
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1 [phi:main::@7->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1 [phi:main::@7->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2>>1
sta.z test.a
jsr test
@@ -846,7 +846,7 @@ main: {
test_from___b8:
// [23] phi test::i#11 = 8 [phi:main::@8->test#0] -- vbuxx=vbuc1
ldx #8
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6 [phi:main::@8->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6 [phi:main::@8->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2>>1^6
sta.z test.a
jsr test
@@ -861,7 +861,7 @@ main: {
test_from___b9:
// [23] phi test::i#11 = 9 [phi:main::@9->test#0] -- vbuxx=vbuc1
ldx #9
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1 [phi:main::@9->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1 [phi:main::@9->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2>>1^6|1
sta.z test.a
jsr test
@@ -876,7 +876,7 @@ main: {
test_from___b10:
// [23] phi test::i#11 = $a [phi:main::@10->test#0] -- vbuxx=vbuc1
ldx #$a
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1&1 [phi:main::@10->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1&1 [phi:main::@10->test#1] -- vbuz1=vbuc1
lda #(((3+1-1)*6/2&2-1)<<2>>1^6|1)&1
sta.z test.a
jsr test
@@ -1027,7 +1027,7 @@ main: {
// [23] phi from main to test [phi:main->test]
// [23] phi test::i#11 = 0 [phi:main->test#0] -- vbuxx=vbuc1
ldx #0
- // [23] phi test::a#11 = 3 [phi:main->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3 [phi:main->test#1] -- vbuz1=vbuc1
lda #3
sta.z test.a
jsr test
@@ -1039,7 +1039,7 @@ main: {
// [23] phi from main::@1 to test [phi:main::@1->test]
// [23] phi test::i#11 = 1 [phi:main::@1->test#0] -- vbuxx=vbuc1
ldx #1
- // [23] phi test::a#11 = 3+1 [phi:main::@1->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1 [phi:main::@1->test#1] -- vbuz1=vbuc1
lda #3+1
sta.z test.a
jsr test
@@ -1051,7 +1051,7 @@ main: {
// [23] phi from main::@2 to test [phi:main::@2->test]
// [23] phi test::i#11 = 2 [phi:main::@2->test#0] -- vbuxx=vbuc1
ldx #2
- // [23] phi test::a#11 = 3+1-1 [phi:main::@2->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1 [phi:main::@2->test#1] -- vbuz1=vbuc1
lda #3+1-1
sta.z test.a
jsr test
@@ -1063,7 +1063,7 @@ main: {
// [23] phi from main::@3 to test [phi:main::@3->test]
// [23] phi test::i#11 = 3 [phi:main::@3->test#0] -- vbuxx=vbuc1
ldx #3
- // [23] phi test::a#11 = 3+1-1*6 [phi:main::@3->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6 [phi:main::@3->test#1] -- vbuz1=vbuc1
lda #(3+1-1)*6
sta.z test.a
jsr test
@@ -1075,7 +1075,7 @@ main: {
// [23] phi from main::@4 to test [phi:main::@4->test]
// [23] phi test::i#11 = 4 [phi:main::@4->test#0] -- vbuxx=vbuc1
ldx #4
- // [23] phi test::a#11 = 3+1-1*6/2 [phi:main::@4->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2 [phi:main::@4->test#1] -- vbuz1=vbuc1
lda #(3+1-1)*6/2
sta.z test.a
jsr test
@@ -1087,7 +1087,7 @@ main: {
// [23] phi from main::@5 to test [phi:main::@5->test]
// [23] phi test::i#11 = 5 [phi:main::@5->test#0] -- vbuxx=vbuc1
ldx #5
- // [23] phi test::a#11 = 3+1-1*6/2&2-1 [phi:main::@5->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1 [phi:main::@5->test#1] -- vbuz1=vbuc1
lda #(3+1-1)*6/2&2-1
sta.z test.a
jsr test
@@ -1099,7 +1099,7 @@ main: {
// [23] phi from main::@6 to test [phi:main::@6->test]
// [23] phi test::i#11 = 6 [phi:main::@6->test#0] -- vbuxx=vbuc1
ldx #6
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2 [phi:main::@6->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2 [phi:main::@6->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2
sta.z test.a
jsr test
@@ -1111,7 +1111,7 @@ main: {
// [23] phi from main::@7 to test [phi:main::@7->test]
// [23] phi test::i#11 = 7 [phi:main::@7->test#0] -- vbuxx=vbuc1
ldx #7
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1 [phi:main::@7->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1 [phi:main::@7->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2>>1
sta.z test.a
jsr test
@@ -1123,7 +1123,7 @@ main: {
// [23] phi from main::@8 to test [phi:main::@8->test]
// [23] phi test::i#11 = 8 [phi:main::@8->test#0] -- vbuxx=vbuc1
ldx #8
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6 [phi:main::@8->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6 [phi:main::@8->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2>>1^6
sta.z test.a
jsr test
@@ -1135,7 +1135,7 @@ main: {
// [23] phi from main::@9 to test [phi:main::@9->test]
// [23] phi test::i#11 = 9 [phi:main::@9->test#0] -- vbuxx=vbuc1
ldx #9
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1 [phi:main::@9->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1 [phi:main::@9->test#1] -- vbuz1=vbuc1
lda #((3+1-1)*6/2&2-1)<<2>>1^6|1
sta.z test.a
jsr test
@@ -1147,7 +1147,7 @@ main: {
// [23] phi from main::@10 to test [phi:main::@10->test]
// [23] phi test::i#11 = $a [phi:main::@10->test#0] -- vbuxx=vbuc1
ldx #$a
- // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1&1 [phi:main::@10->test#1] -- call_phi_near
+ // [23] phi test::a#11 = 3+1-1*6/2&2-1<<2>>1^6|1&1 [phi:main::@10->test#1] -- vbuz1=vbuc1
lda #(((3+1-1)*6/2&2-1)<<2>>1^6|1)&1
sta.z test.a
jsr test
diff --git a/src/test/ref/atarixl-md5b.log b/src/test/ref/atarixl-md5b.log
index 281f695b8..f8b947650 100644
--- a/src/test/ref/atarixl-md5b.log
+++ b/src/test/ref/atarixl-md5b.log
@@ -903,7 +903,7 @@ __start: {
// __start::@1
__b1:
// [4] call main
- // [6] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [6] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -940,7 +940,7 @@ main: {
// main::@3
__b3:
// [10] call md5
- // [14] phi from main::@3 to md5 [phi:main::@3->md5] -- call_phi_near
+ // [14] phi from main::@3 to md5 [phi:main::@3->md5]
md5_from___b3:
jsr md5
// [11] phi from main::@3 main::@4 to main::@4 [phi:main::@3/main::@4->main::@4]
@@ -1012,7 +1012,7 @@ md5: {
// [36] phi print::c#2 = print::c#0 [phi:md5::@2->print#0] -- register_copy
// [36] phi print::b#2 = print::b#0 [phi:md5::@2->print#1] -- register_copy
// [36] phi print::a#2 = print::a#0 [phi:md5::@2->print#2] -- register_copy
- // [36] phi print::print321_l#0 = print::i#0 [phi:md5::@2->print#3] -- call_phi_near
+ // [36] phi print::print321_l#0 = print::i#0 [phi:md5::@2->print#3] -- register_copy
jsr print
jmp __b5
// md5::@5
@@ -1049,7 +1049,7 @@ md5: {
// [36] phi print::c#2 = print::c#1 [phi:md5::@3->print#0] -- register_copy
// [36] phi print::b#2 = print::b#1 [phi:md5::@3->print#1] -- register_copy
// [36] phi print::a#2 = print::a#1 [phi:md5::@3->print#2] -- register_copy
- // [36] phi print::print321_l#0 = print::i#1 [phi:md5::@3->print#3] -- call_phi_near
+ // [36] phi print::print321_l#0 = print::i#1 [phi:md5::@3->print#3] -- register_copy
jsr print
jmp __b6
// md5::@6
@@ -1400,7 +1400,7 @@ __start: {
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [4] call main
- // [6] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [6] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [5] return
@@ -1431,7 +1431,7 @@ main: {
// main::@3
// md5()
// [10] call md5
- // [14] phi from main::@3 to md5 [phi:main::@3->md5] -- call_phi_near
+ // [14] phi from main::@3 to md5 [phi:main::@3->md5]
jsr md5
// [11] phi from main::@3 main::@4 to main::@4 [phi:main::@3/main::@4->main::@4]
// main::@4
@@ -1498,7 +1498,7 @@ md5: {
// [36] phi print::c#2 = print::c#0 [phi:md5::@2->print#0] -- register_copy
// [36] phi print::b#2 = print::b#0 [phi:md5::@2->print#1] -- register_copy
// [36] phi print::a#2 = print::a#0 [phi:md5::@2->print#2] -- register_copy
- // [36] phi print::print321_l#0 = print::i#0 [phi:md5::@2->print#3] -- call_phi_near
+ // [36] phi print::print321_l#0 = print::i#0 [phi:md5::@2->print#3] -- register_copy
jsr print
// md5::@5
// i&1
@@ -1530,7 +1530,7 @@ md5: {
// [36] phi print::c#2 = print::c#1 [phi:md5::@3->print#0] -- register_copy
// [36] phi print::b#2 = print::b#1 [phi:md5::@3->print#1] -- register_copy
// [36] phi print::a#2 = print::a#1 [phi:md5::@3->print#2] -- register_copy
- // [36] phi print::print321_l#0 = print::i#1 [phi:md5::@3->print#3] -- call_phi_near
+ // [36] phi print::print321_l#0 = print::i#1 [phi:md5::@3->print#3] -- register_copy
jsr print
// md5::@6
// for(char i = 0; i<4; i++)
diff --git a/src/test/ref/bitmap-circle-2.log b/src/test/ref/bitmap-circle-2.log
index 9cda2ff11..68efa05eb 100644
--- a/src/test/ref/bitmap-circle-2.log
+++ b/src/test/ref/bitmap-circle-2.log
@@ -1318,7 +1318,7 @@ main: {
sta.z fill.size
lda #>$28*$19*8
sta.z fill.size+1
- // [13] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- call_phi_near
+ // [13] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- pbuz1=pbuc1
lda #BITMAP
@@ -1339,7 +1339,7 @@ main: {
sta.z fill.size
lda #>$28*$19
sta.z fill.size+1
- // [13] phi fill::addr#0 = SCREEN [phi:main::@4->fill#2] -- call_phi_near
+ // [13] phi fill::addr#0 = SCREEN [phi:main::@4->fill#2] -- pbuz1=pbuc1
lda #SCREEN
@@ -1390,7 +1390,7 @@ main: {
sta.z circle.r
lda.z i+1
sta.z circle.r+1
- // [11] call circle -- call_phi_near
+ // [11] call circle
jsr circle
jmp __b6
// main::@6
@@ -1584,7 +1584,7 @@ circle: {
// [60] phi from circle::@4 to plot [phi:circle::@4->plot]
plot_from___b4:
// [60] phi plot::y#8 = plot::y#0 [phi:circle::@4->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- register_copy
jsr plot
jmp __b6
// circle::@6
@@ -1609,7 +1609,7 @@ circle: {
// [60] phi from circle::@6 to plot [phi:circle::@6->plot]
plot_from___b6:
// [60] phi plot::y#8 = plot::y#1 [phi:circle::@6->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- register_copy
jsr plot
jmp __b7
// circle::@7
@@ -1634,7 +1634,7 @@ circle: {
// [60] phi from circle::@7 to plot [phi:circle::@7->plot]
plot_from___b7:
// [60] phi plot::y#8 = plot::y#2 [phi:circle::@7->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- register_copy
jsr plot
jmp __b8
// circle::@8
@@ -1659,7 +1659,7 @@ circle: {
// [60] phi from circle::@8 to plot [phi:circle::@8->plot]
plot_from___b8:
// [60] phi plot::y#8 = plot::y#3 [phi:circle::@8->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- register_copy
jsr plot
jmp __b9
// circle::@9
@@ -1684,7 +1684,7 @@ circle: {
// [60] phi from circle::@9 to plot [phi:circle::@9->plot]
plot_from___b9:
// [60] phi plot::y#8 = plot::y#4 [phi:circle::@9->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- register_copy
jsr plot
jmp __b10
// circle::@10
@@ -1709,7 +1709,7 @@ circle: {
// [60] phi from circle::@10 to plot [phi:circle::@10->plot]
plot_from___b10:
// [60] phi plot::y#8 = plot::y#5 [phi:circle::@10->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- register_copy
jsr plot
jmp __b11
// circle::@11
@@ -1734,7 +1734,7 @@ circle: {
// [60] phi from circle::@11 to plot [phi:circle::@11->plot]
plot_from___b11:
// [60] phi plot::y#8 = plot::y#6 [phi:circle::@11->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- register_copy
jsr plot
jmp __b12
// circle::@12
@@ -1759,7 +1759,7 @@ circle: {
// [60] phi from circle::@12 to plot [phi:circle::@12->plot]
plot_from___b12:
// [60] phi plot::y#8 = plot::y#7 [phi:circle::@12->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- register_copy
jsr plot
jmp __b13
// circle::@13
@@ -2189,7 +2189,7 @@ main: {
sta.z fill.size
lda #>$28*$19*8
sta.z fill.size+1
- // [13] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- call_phi_near
+ // [13] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- pbuz1=pbuc1
lda #BITMAP
@@ -2207,7 +2207,7 @@ main: {
sta.z fill.size
lda #>$28*$19
sta.z fill.size+1
- // [13] phi fill::addr#0 = SCREEN [phi:main::@4->fill#2] -- call_phi_near
+ // [13] phi fill::addr#0 = SCREEN [phi:main::@4->fill#2] -- pbuz1=pbuc1
lda #SCREEN
@@ -2256,7 +2256,7 @@ main: {
sta.z circle.r
lda.z i+1
sta.z circle.r+1
- // [11] call circle -- call_phi_near
+ // [11] call circle
jsr circle
// main::@6
// i += 5
@@ -2450,7 +2450,7 @@ circle: {
// [34] call plot
// [60] phi from circle::@4 to plot [phi:circle::@4->plot]
// [60] phi plot::y#8 = plot::y#0 [phi:circle::@4->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- register_copy
jsr plot
// circle::@6
// plot(xc-x,yc-y)
@@ -2473,7 +2473,7 @@ circle: {
// [37] call plot
// [60] phi from circle::@6 to plot [phi:circle::@6->plot]
// [60] phi plot::y#8 = plot::y#1 [phi:circle::@6->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- register_copy
jsr plot
// circle::@7
// plot(xc+x,yc+y)
@@ -2496,7 +2496,7 @@ circle: {
// [40] call plot
// [60] phi from circle::@7 to plot [phi:circle::@7->plot]
// [60] phi plot::y#8 = plot::y#2 [phi:circle::@7->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- register_copy
jsr plot
// circle::@8
// plot(xc-x,yc+y)
@@ -2519,7 +2519,7 @@ circle: {
// [43] call plot
// [60] phi from circle::@8 to plot [phi:circle::@8->plot]
// [60] phi plot::y#8 = plot::y#3 [phi:circle::@8->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- register_copy
jsr plot
// circle::@9
// plot(xc+y,yc-x)
@@ -2542,7 +2542,7 @@ circle: {
// [46] call plot
// [60] phi from circle::@9 to plot [phi:circle::@9->plot]
// [60] phi plot::y#8 = plot::y#4 [phi:circle::@9->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- register_copy
jsr plot
// circle::@10
// plot(xc-y,yc-x)
@@ -2565,7 +2565,7 @@ circle: {
// [49] call plot
// [60] phi from circle::@10 to plot [phi:circle::@10->plot]
// [60] phi plot::y#8 = plot::y#5 [phi:circle::@10->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- register_copy
jsr plot
// circle::@11
// plot(xc+y,yc+x)
@@ -2588,7 +2588,7 @@ circle: {
// [52] call plot
// [60] phi from circle::@11 to plot [phi:circle::@11->plot]
// [60] phi plot::y#8 = plot::y#6 [phi:circle::@11->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- register_copy
jsr plot
// circle::@12
// plot(xc-y,yc+x)
@@ -2611,7 +2611,7 @@ circle: {
// [55] call plot
// [60] phi from circle::@12 to plot [phi:circle::@12->plot]
// [60] phi plot::y#8 = plot::y#7 [phi:circle::@12->plot#0] -- register_copy
- // [60] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- call_phi_near
+ // [60] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- register_copy
jsr plot
// circle::@13
// for(int x = 0; x <= y; x ++)
diff --git a/src/test/ref/bitmap-circle.log b/src/test/ref/bitmap-circle.log
index ce278821e..0e5befc1a 100644
--- a/src/test/ref/bitmap-circle.log
+++ b/src/test/ref/bitmap-circle.log
@@ -1192,7 +1192,7 @@ main: {
sta.z fill.size
lda #>$28*$19*8
sta.z fill.size+1
- // [9] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- call_phi_near
+ // [9] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- pbuz1=pbuc1
lda #BITMAP
@@ -1213,7 +1213,7 @@ main: {
sta.z fill.size
lda #>$28*$19
sta.z fill.size+1
- // [9] phi fill::addr#0 = SCREEN [phi:main::@2->fill#2] -- call_phi_near
+ // [9] phi fill::addr#0 = SCREEN [phi:main::@2->fill#2] -- pbuz1=pbuc1
lda #SCREEN
@@ -1232,7 +1232,7 @@ main: {
lda #(SCREEN&$3fff)/$40|(BITMAP&$3fff)/$400
sta VICII_MEMORY
// [7] call circle
- // [16] phi from main::@3 to circle [phi:main::@3->circle] -- call_phi_near
+ // [16] phi from main::@3 to circle [phi:main::@3->circle]
circle_from___b3:
jsr circle
// [8] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
@@ -1411,7 +1411,7 @@ circle: {
// [55] phi from circle::@4 to plot [phi:circle::@4->plot]
plot_from___b4:
// [55] phi plot::y#8 = plot::y#0 [phi:circle::@4->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- register_copy
jsr plot
jmp __b6
// circle::@6
@@ -1436,7 +1436,7 @@ circle: {
// [55] phi from circle::@6 to plot [phi:circle::@6->plot]
plot_from___b6:
// [55] phi plot::y#8 = plot::y#1 [phi:circle::@6->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- register_copy
jsr plot
jmp __b7
// circle::@7
@@ -1461,7 +1461,7 @@ circle: {
// [55] phi from circle::@7 to plot [phi:circle::@7->plot]
plot_from___b7:
// [55] phi plot::y#8 = plot::y#2 [phi:circle::@7->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- register_copy
jsr plot
jmp __b8
// circle::@8
@@ -1486,7 +1486,7 @@ circle: {
// [55] phi from circle::@8 to plot [phi:circle::@8->plot]
plot_from___b8:
// [55] phi plot::y#8 = plot::y#3 [phi:circle::@8->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- register_copy
jsr plot
jmp __b9
// circle::@9
@@ -1511,7 +1511,7 @@ circle: {
// [55] phi from circle::@9 to plot [phi:circle::@9->plot]
plot_from___b9:
// [55] phi plot::y#8 = plot::y#4 [phi:circle::@9->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- register_copy
jsr plot
jmp __b10
// circle::@10
@@ -1536,7 +1536,7 @@ circle: {
// [55] phi from circle::@10 to plot [phi:circle::@10->plot]
plot_from___b10:
// [55] phi plot::y#8 = plot::y#5 [phi:circle::@10->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- register_copy
jsr plot
jmp __b11
// circle::@11
@@ -1561,7 +1561,7 @@ circle: {
// [55] phi from circle::@11 to plot [phi:circle::@11->plot]
plot_from___b11:
// [55] phi plot::y#8 = plot::y#6 [phi:circle::@11->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- register_copy
jsr plot
jmp __b12
// circle::@12
@@ -1586,7 +1586,7 @@ circle: {
// [55] phi from circle::@12 to plot [phi:circle::@12->plot]
plot_from___b12:
// [55] phi plot::y#8 = plot::y#7 [phi:circle::@12->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- register_copy
jsr plot
jmp __b13
// circle::@13
@@ -1955,7 +1955,7 @@ main: {
sta.z fill.size
lda #>$28*$19*8
sta.z fill.size+1
- // [9] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- call_phi_near
+ // [9] phi fill::addr#0 = BITMAP [phi:main->fill#2] -- pbuz1=pbuc1
lda #BITMAP
@@ -1973,7 +1973,7 @@ main: {
sta.z fill.size
lda #>$28*$19
sta.z fill.size+1
- // [9] phi fill::addr#0 = SCREEN [phi:main::@2->fill#2] -- call_phi_near
+ // [9] phi fill::addr#0 = SCREEN [phi:main::@2->fill#2] -- pbuz1=pbuc1
lda #SCREEN
@@ -1994,7 +1994,7 @@ main: {
sta VICII_MEMORY
// circle(100,100,50)
// [7] call circle
- // [16] phi from main::@3 to circle [phi:main::@3->circle] -- call_phi_near
+ // [16] phi from main::@3 to circle [phi:main::@3->circle]
jsr circle
// [8] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
// main::@1
@@ -2169,7 +2169,7 @@ circle: {
// [29] call plot
// [55] phi from circle::@4 to plot [phi:circle::@4->plot]
// [55] phi plot::y#8 = plot::y#0 [phi:circle::@4->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#0 [phi:circle::@4->plot#1] -- register_copy
jsr plot
// circle::@6
// plot(xc-x,yc-y)
@@ -2192,7 +2192,7 @@ circle: {
// [32] call plot
// [55] phi from circle::@6 to plot [phi:circle::@6->plot]
// [55] phi plot::y#8 = plot::y#1 [phi:circle::@6->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#1 [phi:circle::@6->plot#1] -- register_copy
jsr plot
// circle::@7
// plot(xc+x,yc+y)
@@ -2215,7 +2215,7 @@ circle: {
// [35] call plot
// [55] phi from circle::@7 to plot [phi:circle::@7->plot]
// [55] phi plot::y#8 = plot::y#2 [phi:circle::@7->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#2 [phi:circle::@7->plot#1] -- register_copy
jsr plot
// circle::@8
// plot(xc-x,yc+y)
@@ -2238,7 +2238,7 @@ circle: {
// [38] call plot
// [55] phi from circle::@8 to plot [phi:circle::@8->plot]
// [55] phi plot::y#8 = plot::y#3 [phi:circle::@8->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#3 [phi:circle::@8->plot#1] -- register_copy
jsr plot
// circle::@9
// plot(xc+y,yc-x)
@@ -2261,7 +2261,7 @@ circle: {
// [41] call plot
// [55] phi from circle::@9 to plot [phi:circle::@9->plot]
// [55] phi plot::y#8 = plot::y#4 [phi:circle::@9->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#4 [phi:circle::@9->plot#1] -- register_copy
jsr plot
// circle::@10
// plot(xc-y,yc-x)
@@ -2284,7 +2284,7 @@ circle: {
// [44] call plot
// [55] phi from circle::@10 to plot [phi:circle::@10->plot]
// [55] phi plot::y#8 = plot::y#5 [phi:circle::@10->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#5 [phi:circle::@10->plot#1] -- register_copy
jsr plot
// circle::@11
// plot(xc+y,yc+x)
@@ -2307,7 +2307,7 @@ circle: {
// [47] call plot
// [55] phi from circle::@11 to plot [phi:circle::@11->plot]
// [55] phi plot::y#8 = plot::y#6 [phi:circle::@11->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#6 [phi:circle::@11->plot#1] -- register_copy
jsr plot
// circle::@12
// plot(xc-y,yc+x)
@@ -2330,7 +2330,7 @@ circle: {
// [50] call plot
// [55] phi from circle::@12 to plot [phi:circle::@12->plot]
// [55] phi plot::y#8 = plot::y#7 [phi:circle::@12->plot#0] -- register_copy
- // [55] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- call_phi_near
+ // [55] phi plot::x#8 = plot::x#7 [phi:circle::@12->plot#1] -- register_copy
jsr plot
// circle::@13
// for(int x = 0; x <= y; x ++)
diff --git a/src/test/ref/bitmap-line-anim-1.log b/src/test/ref/bitmap-line-anim-1.log
index ec14390c3..a9ee08268 100644
--- a/src/test/ref/bitmap-line-anim-1.log
+++ b/src/test/ref/bitmap-line-anim-1.log
@@ -2327,7 +2327,7 @@ main: {
lda #(SCREEN&$3fff)/$40|(BITMAP&$3fff)/$400
sta VICII_MEMORY
// [4] call bitmap_init
- // [13] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [13] phi from main to bitmap_init [phi:main->bitmap_init]
bitmap_init_from_main:
jsr bitmap_init
// [5] phi from main to main::@2 [phi:main->main::@2]
@@ -2336,7 +2336,7 @@ main: {
// main::@2
__b2:
// [6] call bitmap_clear
- // [35] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear] -- call_phi_near
+ // [35] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear]
bitmap_clear_from___b2:
jsr bitmap_clear
// [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
@@ -2345,7 +2345,7 @@ main: {
// main::@3
__b3:
// [8] call init_screen
- // [40] phi from main::@3 to init_screen [phi:main::@3->init_screen] -- call_phi_near
+ // [40] phi from main::@3 to init_screen [phi:main::@3->init_screen]
init_screen_from___b3:
jsr init_screen
// [9] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
@@ -2361,7 +2361,7 @@ main: {
sta.z bitmap_line.x2
lda #0
sta.z bitmap_line.x2+1
- // [11] call bitmap_line -- call_phi_near
+ // [11] call bitmap_line
jsr bitmap_line
jmp __b4
// main::@4
@@ -2501,7 +2501,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [94] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [94] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -2522,7 +2522,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [94] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [94] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -2599,7 +2599,7 @@ bitmap_line: {
// [47] call abs_u16
// [103] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
abs_u16_from_bitmap_line:
- // [103] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [103] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// [48] abs_u16::return#0 = abs_u16::return#4
jmp __b12
@@ -2613,7 +2613,7 @@ bitmap_line: {
// [50] call abs_u16
// [103] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
abs_u16_from___b12:
- // [103] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [103] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -2646,7 +2646,7 @@ bitmap_line: {
// [56] call sgn_u16
// [110] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
sgn_u16_from___b1:
- // [110] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [110] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// [57] sgn_u16::return#0 = sgn_u16::return#4
jmp __b14
@@ -2660,7 +2660,7 @@ bitmap_line: {
// [59] call sgn_u16
// [110] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
sgn_u16_from___b14:
- // [110] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [110] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -2720,7 +2720,7 @@ bitmap_line: {
// [117] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
bitmap_plot_from___b6:
// [117] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [117] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b16
// bitmap_line::@16
@@ -2799,7 +2799,7 @@ bitmap_line: {
// [117] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
bitmap_plot_from___b3:
// [117] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [117] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __breturn
// bitmap_line::@return
@@ -2845,7 +2845,7 @@ bitmap_line: {
// [117] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
bitmap_plot_from___b9:
// [117] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [117] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b17
// bitmap_line::@17
@@ -2923,7 +2923,7 @@ bitmap_line: {
sta.z bitmap_plot.x
lda #>x1
sta.z bitmap_plot.x+1
- // [117] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- vbuxx=vbuc1
ldx #0
jsr bitmap_plot
jmp __breturn
@@ -3494,19 +3494,19 @@ main: {
sta VICII_MEMORY
// bitmap_init(BITMAP, SCREEN)
// [4] call bitmap_init
- // [13] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [13] phi from main to bitmap_init [phi:main->bitmap_init]
jsr bitmap_init
// [5] phi from main to main::@2 [phi:main->main::@2]
// main::@2
// bitmap_clear(BLACK, WHITE)
// [6] call bitmap_clear
- // [35] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear] -- call_phi_near
+ // [35] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear]
jsr bitmap_clear
// [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// init_screen()
// [8] call init_screen
- // [40] phi from main::@3 to init_screen [phi:main::@3->init_screen] -- call_phi_near
+ // [40] phi from main::@3 to init_screen [phi:main::@3->init_screen]
jsr init_screen
// [9] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
// [9] phi next#5 = 0 [phi:main::@3->main::@1#0] -- vbuz1=vbuc1
@@ -3520,7 +3520,7 @@ main: {
sta.z bitmap_line.x2
lda #0
sta.z bitmap_line.x2+1
- // [11] call bitmap_line -- call_phi_near
+ // [11] call bitmap_line
jsr bitmap_line
// main::@4
// next++;
@@ -3650,7 +3650,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [94] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [94] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -3668,7 +3668,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [94] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [94] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -3743,7 +3743,7 @@ bitmap_line: {
sta.z abs_u16.w+1
// [47] call abs_u16
// [103] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
- // [103] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [103] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// unsigned int dx = abs_u16(x2-x1)
// [48] abs_u16::return#0 = abs_u16::return#4
@@ -3756,7 +3756,7 @@ bitmap_line: {
// unsigned int dy = abs_u16(y2-y1)
// [50] call abs_u16
// [103] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
- // [103] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [103] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -3788,7 +3788,7 @@ bitmap_line: {
sta.z sgn_u16.w+1
// [56] call sgn_u16
// [110] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
- // [110] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [110] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// unsigned int sx = sgn_u16(x2-x1)
// [57] sgn_u16::return#0 = sgn_u16::return#4
@@ -3801,7 +3801,7 @@ bitmap_line: {
// unsigned int sy = sgn_u16(y2-y1)
// [59] call sgn_u16
// [110] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
- // [110] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [110] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -3856,7 +3856,7 @@ bitmap_line: {
// [67] call bitmap_plot
// [117] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
// [117] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [117] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@16
// y += sy
@@ -3930,7 +3930,7 @@ bitmap_line: {
// [78] call bitmap_plot
// [117] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
// [117] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [117] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@return
// }
@@ -3972,7 +3972,7 @@ bitmap_line: {
// [84] call bitmap_plot
// [117] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
// [117] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [117] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@17
// x += sx
@@ -4046,7 +4046,7 @@ bitmap_line: {
sta.z bitmap_plot.x
lda #>x1
sta.z bitmap_plot.x+1
- // [117] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [117] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- vbuxx=vbuc1
ldx #0
jsr bitmap_plot
rts
diff --git a/src/test/ref/bitmap-line-anim-2.log b/src/test/ref/bitmap-line-anim-2.log
index cbb073377..4a8593ac2 100644
--- a/src/test/ref/bitmap-line-anim-2.log
+++ b/src/test/ref/bitmap-line-anim-2.log
@@ -2293,7 +2293,7 @@ main: {
lda #(SCREEN&$3fff)/$40|(BITMAP&$3fff)/$400
sta VICII_MEMORY
// [4] call bitmap_init
- // [14] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [14] phi from main to bitmap_init [phi:main->bitmap_init]
bitmap_init_from_main:
jsr bitmap_init
// [5] phi from main to main::@3 [phi:main->main::@3]
@@ -2302,7 +2302,7 @@ main: {
// main::@3
__b3:
// [6] call bitmap_clear
- // [36] phi from main::@3 to bitmap_clear [phi:main::@3->bitmap_clear] -- call_phi_near
+ // [36] phi from main::@3 to bitmap_clear [phi:main::@3->bitmap_clear]
bitmap_clear_from___b3:
jsr bitmap_clear
// [7] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
@@ -2316,7 +2316,7 @@ main: {
// main::@1
__b1:
// [8] bitmap_line::x2#0 = next#6
- // [9] call bitmap_line -- call_phi_near
+ // [9] call bitmap_line
jsr bitmap_line
jmp __b4
// main::@4
@@ -2485,7 +2485,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [89] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [89] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -2506,7 +2506,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [89] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [89] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -2542,7 +2542,7 @@ bitmap_line: {
// [42] call abs_u16
// [98] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
abs_u16_from_bitmap_line:
- // [98] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [98] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// [43] abs_u16::return#0 = abs_u16::return#4
jmp __b12
@@ -2556,7 +2556,7 @@ bitmap_line: {
// [45] call abs_u16
// [98] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
abs_u16_from___b12:
- // [98] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [98] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -2589,7 +2589,7 @@ bitmap_line: {
// [51] call sgn_u16
// [105] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
sgn_u16_from___b1:
- // [105] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [105] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// [52] sgn_u16::return#0 = sgn_u16::return#4
jmp __b14
@@ -2603,7 +2603,7 @@ bitmap_line: {
// [54] call sgn_u16
// [105] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
sgn_u16_from___b14:
- // [105] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [105] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -2663,7 +2663,7 @@ bitmap_line: {
// [112] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
bitmap_plot_from___b6:
// [112] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [112] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b16
// bitmap_line::@16
@@ -2742,7 +2742,7 @@ bitmap_line: {
// [112] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
bitmap_plot_from___b3:
// [112] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [112] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __breturn
// bitmap_line::@return
@@ -2788,7 +2788,7 @@ bitmap_line: {
// [112] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
bitmap_plot_from___b9:
// [112] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [112] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b17
// bitmap_line::@17
@@ -2866,7 +2866,7 @@ bitmap_line: {
sta.z bitmap_plot.x
lda #>x1
sta.z bitmap_plot.x+1
- // [112] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- vbuxx=vbuc1
ldx #0
jsr bitmap_plot
jmp __breturn
@@ -3443,13 +3443,13 @@ main: {
sta VICII_MEMORY
// bitmap_init(BITMAP, SCREEN)
// [4] call bitmap_init
- // [14] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [14] phi from main to bitmap_init [phi:main->bitmap_init]
jsr bitmap_init
// [5] phi from main to main::@3 [phi:main->main::@3]
// main::@3
// bitmap_clear(PURPLE, WHITE)
// [6] call bitmap_clear
- // [36] phi from main::@3 to bitmap_clear [phi:main::@3->bitmap_clear] -- call_phi_near
+ // [36] phi from main::@3 to bitmap_clear [phi:main::@3->bitmap_clear]
jsr bitmap_clear
// [7] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
// [7] phi next#6 = 0 [phi:main::@3->main::@1#0] -- vwuz1=vwuc1
@@ -3460,7 +3460,7 @@ main: {
__b1:
// bitmap_line(0,0,next,100)
// [8] bitmap_line::x2#0 = next#6
- // [9] call bitmap_line -- call_phi_near
+ // [9] call bitmap_line
jsr bitmap_line
// main::@4
// next++;
@@ -3611,7 +3611,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [89] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [89] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -3629,7 +3629,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [89] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [89] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -3664,7 +3664,7 @@ bitmap_line: {
sta.z abs_u16.w+1
// [42] call abs_u16
// [98] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
- // [98] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [98] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// unsigned int dx = abs_u16(x2-x1)
// [43] abs_u16::return#0 = abs_u16::return#4
@@ -3677,7 +3677,7 @@ bitmap_line: {
// unsigned int dy = abs_u16(y2-y1)
// [45] call abs_u16
// [98] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
- // [98] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [98] phi abs_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@12->abs_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -3709,7 +3709,7 @@ bitmap_line: {
sta.z sgn_u16.w+1
// [51] call sgn_u16
// [105] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
- // [105] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [105] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// unsigned int sx = sgn_u16(x2-x1)
// [52] sgn_u16::return#0 = sgn_u16::return#4
@@ -3722,7 +3722,7 @@ bitmap_line: {
// unsigned int sy = sgn_u16(y2-y1)
// [54] call sgn_u16
// [105] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
- // [105] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [105] phi sgn_u16::w#2 = bitmap_line::y2#0 [phi:bitmap_line::@14->sgn_u16#0] -- vwuz1=vwuc1
lda #y2
@@ -3777,7 +3777,7 @@ bitmap_line: {
// [62] call bitmap_plot
// [112] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
// [112] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [112] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@16
// y += sy
@@ -3851,7 +3851,7 @@ bitmap_line: {
// [73] call bitmap_plot
// [112] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
// [112] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [112] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@return
// }
@@ -3893,7 +3893,7 @@ bitmap_line: {
// [79] call bitmap_plot
// [112] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
// [112] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [112] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@17
// x += sx
@@ -3967,7 +3967,7 @@ bitmap_line: {
sta.z bitmap_plot.x
lda #>x1
sta.z bitmap_plot.x+1
- // [112] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [112] phi bitmap_plot::y#4 = 0 [phi:bitmap_line::@4->bitmap_plot#1] -- vbuxx=vbuc1
ldx #0
jsr bitmap_plot
rts
diff --git a/src/test/ref/bitmap-plot-0.log b/src/test/ref/bitmap-plot-0.log
index 6436ef53c..656e0bd4e 100644
--- a/src/test/ref/bitmap-plot-0.log
+++ b/src/test/ref/bitmap-plot-0.log
@@ -1730,7 +1730,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [11] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [11] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -1782,7 +1782,7 @@ main: {
.label vx = $a
.label vy = 9
// [12] call bitmap_init
- // [34] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [34] phi from main to bitmap_init [phi:main->bitmap_init]
bitmap_init_from_main:
jsr bitmap_init
// [13] phi from main to main::@8 [phi:main->main::@8]
@@ -1791,7 +1791,7 @@ main: {
// main::@8
__b8:
// [14] call bitmap_clear
- // [56] phi from main::@8 to bitmap_clear [phi:main::@8->bitmap_clear] -- call_phi_near
+ // [56] phi from main::@8 to bitmap_clear [phi:main::@8->bitmap_clear]
bitmap_clear_from___b8:
jsr bitmap_clear
jmp __b9
@@ -1811,7 +1811,7 @@ main: {
// [17] *D018 = main::toD0181_return#0 -- _deref_pbuc1=vbuc2
lda #toD0181_return
sta D018
- // [18] call init_irq -- call_phi_near
+ // [18] call init_irq
jsr init_irq
// [19] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
__b1_from___b7:
@@ -1840,7 +1840,7 @@ main: {
// [20] bitmap_plot::x#0 = main::x#2
// [21] bitmap_plot::y#0 = main::y#2 -- vbuxx=vbuz1
ldx.z y
- // [22] call bitmap_plot -- call_phi_near
+ // [22] call bitmap_plot
jsr bitmap_plot
jmp __b10
// main::@10
@@ -2056,7 +2056,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [77] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [77] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -2077,7 +2077,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [77] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [77] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -2562,7 +2562,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [11] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [11] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
@@ -2613,13 +2613,13 @@ main: {
.label vy = 9
// bitmap_init(BITMAP, SCREEN)
// [12] call bitmap_init
- // [34] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [34] phi from main to bitmap_init [phi:main->bitmap_init]
jsr bitmap_init
// [13] phi from main to main::@8 [phi:main->main::@8]
// main::@8
// bitmap_clear(BLACK, WHITE)
// [14] call bitmap_clear
- // [56] phi from main::@8 to bitmap_clear [phi:main::@8->bitmap_clear] -- call_phi_near
+ // [56] phi from main::@8 to bitmap_clear [phi:main::@8->bitmap_clear]
jsr bitmap_clear
// main::@9
// *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3
@@ -2634,7 +2634,7 @@ main: {
lda #toD0181_return
sta D018
// init_irq()
- // [18] call init_irq -- call_phi_near
+ // [18] call init_irq
jsr init_irq
// [19] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
// [19] phi main::vy#2 = 1 [phi:main::@7->main::@1#0] -- vbuz1=vbuc1
@@ -2656,7 +2656,7 @@ main: {
// [20] bitmap_plot::x#0 = main::x#2
// [21] bitmap_plot::y#0 = main::y#2 -- vbuxx=vbuz1
ldx.z y
- // [22] call bitmap_plot -- call_phi_near
+ // [22] call bitmap_plot
jsr bitmap_plot
// main::@10
// x += vx
@@ -2856,7 +2856,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [77] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [77] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -2874,7 +2874,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [77] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [77] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
diff --git a/src/test/ref/bitmap-plot-3.log b/src/test/ref/bitmap-plot-3.log
index 4b3924927..fbdff3656 100644
--- a/src/test/ref/bitmap-plot-3.log
+++ b/src/test/ref/bitmap-plot-3.log
@@ -2524,7 +2524,7 @@ main: {
.label a = $1c
.label i = $1b
// [1] call bitmap_init
- // [19] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [19] phi from main to bitmap_init [phi:main->bitmap_init]
bitmap_init_from_main:
jsr bitmap_init
// [2] phi from main to main::@5 [phi:main->main::@5]
@@ -2533,7 +2533,7 @@ main: {
// main::@5
__b5:
// [3] call bitmap_clear
- // [41] phi from main::@5 to bitmap_clear [phi:main::@5->bitmap_clear] -- call_phi_near
+ // [41] phi from main::@5 to bitmap_clear [phi:main::@5->bitmap_clear]
bitmap_clear_from___b5:
jsr bitmap_clear
jmp __b6
@@ -2616,7 +2616,7 @@ main: {
sta.z bitmap_line.y2
lda #0
sta.z bitmap_line.y2+1
- // [16] call bitmap_line -- call_phi_near
+ // [16] call bitmap_line
jsr bitmap_line
jmp __b7
// main::@7
@@ -2761,7 +2761,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [97] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [97] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -2782,7 +2782,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [97] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [97] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -2821,7 +2821,7 @@ bitmap_line: {
// [47] call abs_u16
// [106] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
abs_u16_from_bitmap_line:
- // [106] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [106] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// [48] abs_u16::return#0 = abs_u16::return#4
jmp __b12
@@ -2843,7 +2843,7 @@ bitmap_line: {
// [51] call abs_u16
// [106] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
abs_u16_from___b12:
- // [106] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [106] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- register_copy
jsr abs_u16
// [52] abs_u16::return#1 = abs_u16::return#4
jmp __b13
@@ -2875,7 +2875,7 @@ bitmap_line: {
// [57] call sgn_u16
// [113] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
sgn_u16_from___b1:
- // [113] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [113] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// [58] sgn_u16::return#0 = sgn_u16::return#4
jmp __b14
@@ -2897,7 +2897,7 @@ bitmap_line: {
// [61] call sgn_u16
// [113] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
sgn_u16_from___b14:
- // [113] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [113] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- register_copy
jsr sgn_u16
// [62] sgn_u16::return#1 = sgn_u16::return#4
jmp __b15
@@ -2940,7 +2940,7 @@ bitmap_line: {
// [120] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
bitmap_plot_from___b6:
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b16
// bitmap_line::@16
@@ -3019,7 +3019,7 @@ bitmap_line: {
// [120] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
bitmap_plot_from___b3:
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __breturn
// bitmap_line::@return
@@ -3052,7 +3052,7 @@ bitmap_line: {
// [120] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
bitmap_plot_from___b9:
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b17
// bitmap_line::@17
@@ -3126,7 +3126,7 @@ bitmap_line: {
// [120] phi from bitmap_line::@4 to bitmap_plot [phi:bitmap_line::@4->bitmap_plot]
bitmap_plot_from___b4:
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#0 [phi:bitmap_line::@4->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __breturn
}
@@ -3699,13 +3699,13 @@ main: {
.label i = $1b
// bitmap_init(BITMAP, SCREEN)
// [1] call bitmap_init
- // [19] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [19] phi from main to bitmap_init [phi:main->bitmap_init]
jsr bitmap_init
// [2] phi from main to main::@5 [phi:main->main::@5]
// main::@5
// bitmap_clear(BLACK, WHITE)
// [3] call bitmap_clear
- // [41] phi from main::@5 to bitmap_clear [phi:main::@5->bitmap_clear] -- call_phi_near
+ // [41] phi from main::@5 to bitmap_clear [phi:main::@5->bitmap_clear]
jsr bitmap_clear
// main::@6
// *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3
@@ -3783,7 +3783,7 @@ main: {
sta.z bitmap_line.y2
lda #0
sta.z bitmap_line.y2+1
- // [16] call bitmap_line -- call_phi_near
+ // [16] call bitmap_line
jsr bitmap_line
// main::@7
// a+=32
@@ -3919,7 +3919,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [97] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [97] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -3937,7 +3937,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [97] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [97] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -3975,7 +3975,7 @@ bitmap_line: {
sta.z abs_u16.w+1
// [47] call abs_u16
// [106] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
- // [106] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [106] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// unsigned int dx = abs_u16(x2-x1)
// [48] abs_u16::return#0 = abs_u16::return#4
@@ -3996,7 +3996,7 @@ bitmap_line: {
sta.z abs_u16.w+1
// [51] call abs_u16
// [106] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
- // [106] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [106] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- register_copy
jsr abs_u16
// unsigned int dy = abs_u16(y2-y1)
// [52] abs_u16::return#1 = abs_u16::return#4
@@ -4027,7 +4027,7 @@ bitmap_line: {
sta.z sgn_u16.w+1
// [57] call sgn_u16
// [113] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
- // [113] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [113] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// unsigned int sx = sgn_u16(x2-x1)
// [58] sgn_u16::return#0 = sgn_u16::return#4
@@ -4048,7 +4048,7 @@ bitmap_line: {
sta.z sgn_u16.w+1
// [61] call sgn_u16
// [113] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
- // [113] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [113] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- register_copy
jsr sgn_u16
// unsigned int sy = sgn_u16(y2-y1)
// [62] sgn_u16::return#1 = sgn_u16::return#4
@@ -4087,7 +4087,7 @@ bitmap_line: {
// [69] call bitmap_plot
// [120] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@16
// y += sy
@@ -4161,7 +4161,7 @@ bitmap_line: {
// [80] call bitmap_plot
// [120] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@return
// }
@@ -4191,7 +4191,7 @@ bitmap_line: {
// [86] call bitmap_plot
// [120] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@17
// x += sx
@@ -4263,7 +4263,7 @@ bitmap_line: {
// [96] call bitmap_plot
// [120] phi from bitmap_line::@4 to bitmap_plot [phi:bitmap_line::@4->bitmap_plot]
// [120] phi bitmap_plot::x#4 = bitmap_plot::x#0 [phi:bitmap_line::@4->bitmap_plot#0] -- register_copy
- // [120] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [120] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- register_copy
jsr bitmap_plot
rts
}
diff --git a/src/test/ref/bitmap-plotter.log b/src/test/ref/bitmap-plotter.log
index dafc94580..ba502c020 100644
--- a/src/test/ref/bitmap-plotter.log
+++ b/src/test/ref/bitmap-plotter.log
@@ -980,7 +980,7 @@ main: {
lda #SCREEN/$40|BITMAP/$400
sta D018
// [4] call init_screen
- // [11] phi from main to init_screen [phi:main->init_screen] -- call_phi_near
+ // [11] phi from main to init_screen [phi:main->init_screen]
init_screen_from_main:
jsr init_screen
// [5] phi from main to main::@3 [phi:main->main::@3]
@@ -989,7 +989,7 @@ main: {
// main::@3
__b3:
// [6] call init_plot_tables
- // [21] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables] -- call_phi_near
+ // [21] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables]
init_plot_tables_from___b3:
jsr init_plot_tables
jmp __b1
@@ -1005,7 +1005,7 @@ main: {
// [8] *BG_COLOR = ++ *BG_COLOR -- _deref_pbuc1=_inc__deref_pbuc1
inc BG_COLOR
// [9] call plots
- // [46] phi from main::@2 to plots [phi:main::@2->plots] -- call_phi_near
+ // [46] phi from main::@2 to plots [phi:main::@2->plots]
plots_from___b2:
jsr plots
jmp __b4
@@ -1234,7 +1234,7 @@ plots: {
// [51] plot::y#0 = plots_y[plots::i#2] -- vbuz1=pbuc1_derefidx_vbuxx
lda plots_y,x
sta.z plot.y
- // [52] call plot -- call_phi_near
+ // [52] call plot
jsr plot
jmp __b3
// plots::@3
@@ -1511,13 +1511,13 @@ main: {
sta D018
// init_screen()
// [4] call init_screen
- // [11] phi from main to init_screen [phi:main->init_screen] -- call_phi_near
+ // [11] phi from main to init_screen [phi:main->init_screen]
jsr init_screen
// [5] phi from main to main::@3 [phi:main->main::@3]
// main::@3
// init_plot_tables()
// [6] call init_plot_tables
- // [21] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables] -- call_phi_near
+ // [21] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables]
jsr init_plot_tables
// main::@1
__b1:
@@ -1532,7 +1532,7 @@ main: {
inc BG_COLOR
// plots()
// [9] call plots
- // [46] phi from main::@2 to plots [phi:main::@2->plots] -- call_phi_near
+ // [46] phi from main::@2 to plots [phi:main::@2->plots]
jsr plots
// main::@4
// (*BG_COLOR)--;
@@ -1751,7 +1751,7 @@ plots: {
// [51] plot::y#0 = plots_y[plots::i#2] -- vbuz1=pbuc1_derefidx_vbuxx
lda plots_y,x
sta.z plot.y
- // [52] call plot -- call_phi_near
+ // [52] call plot
jsr plot
// plots::@3
// for(byte i=0; ibool_const_if] -- call_phi_near
+ // [7] phi from main to bool_const_if [phi:main->bool_const_if]
bool_const_if_from_main:
jsr bool_const_if
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -377,7 +377,7 @@ main: {
// main::@1
__b1:
// [3] call bool_const_vars
- // [10] phi from main::@1 to bool_const_vars [phi:main::@1->bool_const_vars] -- call_phi_near
+ // [10] phi from main::@1 to bool_const_vars [phi:main::@1->bool_const_vars]
bool_const_vars_from___b1:
jsr bool_const_vars
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -386,7 +386,7 @@ main: {
// main::@2
__b2:
// [5] call bool_const_inline
- // [13] phi from main::@2 to bool_const_inline [phi:main::@2->bool_const_inline] -- call_phi_near
+ // [13] phi from main::@2 to bool_const_inline [phi:main::@2->bool_const_inline]
bool_const_inline_from___b2:
jsr bool_const_inline
jmp __breturn
@@ -503,19 +503,19 @@ Score: 60
main: {
// bool_const_if()
// [1] call bool_const_if
- // [7] phi from main to bool_const_if [phi:main->bool_const_if] -- call_phi_near
+ // [7] phi from main to bool_const_if [phi:main->bool_const_if]
jsr bool_const_if
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// bool_const_vars()
// [3] call bool_const_vars
- // [10] phi from main::@1 to bool_const_vars [phi:main::@1->bool_const_vars] -- call_phi_near
+ // [10] phi from main::@1 to bool_const_vars [phi:main::@1->bool_const_vars]
jsr bool_const_vars
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// bool_const_inline()
// [5] call bool_const_inline
- // [13] phi from main::@2 to bool_const_inline [phi:main::@2->bool_const_inline] -- call_phi_near
+ // [13] phi from main::@2 to bool_const_inline [phi:main::@2->bool_const_inline]
jsr bool_const_inline
// main::@return
// }
diff --git a/src/test/ref/bool-function.log b/src/test/ref/bool-function.log
index 4e2a534ae..9eefa4f55 100644
--- a/src/test/ref/bool-function.log
+++ b/src/test/ref/bool-function.log
@@ -325,7 +325,7 @@ main: {
tay
// [4] isSet::i#0 = main::i#2 -- vbuaa=vbuxx
txa
- // [5] call isSet -- call_phi_near
+ // [5] call isSet
jsr isSet
// [6] isSet::return#0 = isSet::return#1
jmp __b5
@@ -474,7 +474,7 @@ main: {
tay
// [4] isSet::i#0 = main::i#2 -- vbuaa=vbuxx
txa
- // [5] call isSet -- call_phi_near
+ // [5] call isSet
jsr isSet
// [6] isSet::return#0 = isSet::return#1
// main::@5
diff --git a/src/test/ref/bool-ifs.log b/src/test/ref/bool-ifs.log
index 85068d2b7..93674d607 100644
--- a/src/test/ref/bool-ifs.log
+++ b/src/test/ref/bool-ifs.log
@@ -655,7 +655,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call bool_and
- // [9] phi from main to bool_and [phi:main->bool_and] -- call_phi_near
+ // [9] phi from main to bool_and [phi:main->bool_and]
bool_and_from_main:
jsr bool_and
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -664,7 +664,7 @@ main: {
// main::@1
__b1:
// [3] call bool_or
- // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or] -- call_phi_near
+ // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or]
bool_or_from___b1:
jsr bool_or
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -673,7 +673,7 @@ main: {
// main::@2
__b2:
// [5] call bool_not
- // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not] -- call_phi_near
+ // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not]
bool_not_from___b2:
jsr bool_not
// [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
@@ -682,7 +682,7 @@ main: {
// main::@3
__b3:
// [7] call bool_complex
- // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex] -- call_phi_near
+ // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex]
bool_complex_from___b3:
jsr bool_complex
jmp __breturn
@@ -1040,25 +1040,25 @@ Score: 1684
main: {
// bool_and()
// [1] call bool_and
- // [9] phi from main to bool_and [phi:main->bool_and] -- call_phi_near
+ // [9] phi from main to bool_and [phi:main->bool_and]
jsr bool_and
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// bool_or()
// [3] call bool_or
- // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or] -- call_phi_near
+ // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or]
jsr bool_or
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// bool_not()
// [5] call bool_not
- // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not] -- call_phi_near
+ // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not]
jsr bool_not
// [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// bool_complex()
// [7] call bool_complex
- // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex] -- call_phi_near
+ // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex]
jsr bool_complex
// main::@return
// }
diff --git a/src/test/ref/bool-vars.log b/src/test/ref/bool-vars.log
index df8e0e9a3..afc8566b2 100644
--- a/src/test/ref/bool-vars.log
+++ b/src/test/ref/bool-vars.log
@@ -689,7 +689,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call bool_and
- // [9] phi from main to bool_and [phi:main->bool_and] -- call_phi_near
+ // [9] phi from main to bool_and [phi:main->bool_and]
bool_and_from_main:
jsr bool_and
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -698,7 +698,7 @@ main: {
// main::@1
__b1:
// [3] call bool_or
- // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or] -- call_phi_near
+ // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or]
bool_or_from___b1:
jsr bool_or
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -707,7 +707,7 @@ main: {
// main::@2
__b2:
// [5] call bool_not
- // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not] -- call_phi_near
+ // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not]
bool_not_from___b2:
jsr bool_not
// [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
@@ -716,7 +716,7 @@ main: {
// main::@3
__b3:
// [7] call bool_complex
- // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex] -- call_phi_near
+ // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex]
bool_complex_from___b3:
jsr bool_complex
jmp __breturn
@@ -1102,25 +1102,25 @@ Score: 1899
main: {
// bool_and()
// [1] call bool_and
- // [9] phi from main to bool_and [phi:main->bool_and] -- call_phi_near
+ // [9] phi from main to bool_and [phi:main->bool_and]
jsr bool_and
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// bool_or()
// [3] call bool_or
- // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or] -- call_phi_near
+ // [19] phi from main::@1 to bool_or [phi:main::@1->bool_or]
jsr bool_or
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// bool_not()
// [5] call bool_not
- // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not] -- call_phi_near
+ // [29] phi from main::@2 to bool_not [phi:main::@2->bool_not]
jsr bool_not
// [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// bool_complex()
// [7] call bool_complex
- // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex] -- call_phi_near
+ // [39] phi from main::@3 to bool_complex [phi:main::@3->bool_complex]
jsr bool_complex
// main::@return
// }
diff --git a/src/test/ref/c-types.log b/src/test/ref/c-types.log
index aae73a3d4..cdea0bfb0 100644
--- a/src/test/ref/c-types.log
+++ b/src/test/ref/c-types.log
@@ -2212,7 +2212,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call print_cls
- // [11] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [11] phi from main to print_cls [phi:main->print_cls]
print_cls_from_main:
jsr print_cls
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -2221,7 +2221,7 @@ main: {
// main::@1
__b1:
// [3] call testChar
- // [14] phi from main::@1 to testChar [phi:main::@1->testChar] -- call_phi_near
+ // [14] phi from main::@1 to testChar [phi:main::@1->testChar]
testChar_from___b1:
jsr testChar
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -2229,21 +2229,21 @@ main: {
jmp __b2
// main::@2
__b2:
- // [5] call testShort -- call_phi_near
+ // [5] call testShort
jsr testShort
// [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
__b3_from___b2:
jmp __b3
// main::@3
__b3:
- // [7] call testInt -- call_phi_near
+ // [7] call testInt
jsr testInt
// [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
__b4_from___b3:
jmp __b4
// main::@4
__b4:
- // [9] call testLong -- call_phi_near
+ // [9] call testLong
jsr testLong
jmp __breturn
// main::@return
@@ -2255,7 +2255,7 @@ main: {
// Clear the screen. Also resets current line/char cursor.
print_cls: {
// [12] call memset
- // [74] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [74] phi from print_cls to memset [phi:print_cls->memset]
memset_from_print_cls:
jsr memset
jmp __breturn
@@ -2277,7 +2277,7 @@ testChar: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [80] phi print_str::str#8 = testChar::str [phi:testChar->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testChar::str [phi:testChar->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2292,7 +2292,7 @@ testChar: {
// [87] phi from testChar::@1 to print_uchar [phi:testChar::@1->print_uchar]
print_uchar_from___b1:
// [87] phi print_char_cursor#152 = print_char_cursor#1 [phi:testChar::@1->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = testChar::u [phi:testChar::@1->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = testChar::u [phi:testChar::@1->print_uchar#1] -- vbuxx=vbuc1
ldx #u
jsr print_uchar
// [18] phi from testChar::@1 to testChar::@2 [phi:testChar::@1->testChar::@2]
@@ -2304,7 +2304,7 @@ testChar: {
// [95] phi from testChar::@2 to print_char [phi:testChar::@2->print_char]
print_char_from___b2:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testChar::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testChar::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testChar::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [20] phi from testChar::@2 to testChar::@3 [phi:testChar::@2->testChar::@3]
@@ -2316,7 +2316,7 @@ testChar: {
// [87] phi from testChar::@3 to print_uchar [phi:testChar::@3->print_uchar]
print_uchar_from___b3:
// [87] phi print_char_cursor#152 = print_char_cursor#25 [phi:testChar::@3->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = testChar::n [phi:testChar::@3->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = testChar::n [phi:testChar::@3->print_uchar#1] -- vbuxx=vbuc1
ldx #n
jsr print_uchar
// [22] phi from testChar::@3 to testChar::@4 [phi:testChar::@3->testChar::@4]
@@ -2328,7 +2328,7 @@ testChar: {
// [95] phi from testChar::@4 to print_char [phi:testChar::@4->print_char]
print_char_from___b4:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testChar::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testChar::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testChar::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [24] phi from testChar::@4 to testChar::@5 [phi:testChar::@4->testChar::@5]
@@ -2337,7 +2337,7 @@ testChar: {
// testChar::@5
__b5:
// [25] call print_schar
- // [99] phi from testChar::@5 to print_schar [phi:testChar::@5->print_schar] -- call_phi_near
+ // [99] phi from testChar::@5 to print_schar [phi:testChar::@5->print_schar]
print_schar_from___b5:
jsr print_schar
// [26] phi from testChar::@5 to testChar::@6 [phi:testChar::@5->testChar::@6]
@@ -2348,7 +2348,7 @@ testChar: {
// [27] call print_ln
// [105] phi from testChar::@6 to print_ln [phi:testChar::@6->print_ln]
print_ln_from___b6:
- // [105] phi print_line_cursor#41 = print_screen#0 [phi:testChar::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_screen#0 [phi:testChar::@6->print_ln#0] -- pbuz1=pbuc1
lda #print_screen
@@ -2378,7 +2378,7 @@ testShort: {
// [80] phi from testShort to print_str [phi:testShort->print_str]
print_str_from_testShort:
// [80] phi print_char_cursor#159 = print_char_cursor#165 [phi:testShort->print_str#0] -- register_copy
- // [80] phi print_str::str#8 = testShort::str [phi:testShort->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testShort::str [phi:testShort->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2393,7 +2393,7 @@ testShort: {
// [110] phi from testShort::@1 to print_uint [phi:testShort::@1->print_uint]
print_uint_from___b1:
// [110] phi print_char_cursor#147 = print_char_cursor#1 [phi:testShort::@1->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = testShort::u [phi:testShort::@1->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = testShort::u [phi:testShort::@1->print_uint#1] -- vwuz1=vwuc1
lda #u
@@ -2408,7 +2408,7 @@ testShort: {
// [95] phi from testShort::@2 to print_char [phi:testShort::@2->print_char]
print_char_from___b2:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testShort::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testShort::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testShort::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [35] phi from testShort::@2 to testShort::@3 [phi:testShort::@2->testShort::@3]
@@ -2419,7 +2419,7 @@ testShort: {
// [36] call print_sint
// [116] phi from testShort::@3 to print_sint [phi:testShort::@3->print_sint]
print_sint_from___b3:
- // [116] phi print_sint::w#10 = testShort::n [phi:testShort::@3->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testShort::n [phi:testShort::@3->print_sint#0] -- vwsz1=vwsc1
lda #n
@@ -2434,7 +2434,7 @@ testShort: {
// [95] phi from testShort::@4 to print_char [phi:testShort::@4->print_char]
print_char_from___b4:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testShort::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testShort::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testShort::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [39] phi from testShort::@4 to testShort::@5 [phi:testShort::@4->testShort::@5]
@@ -2445,7 +2445,7 @@ testShort: {
// [40] call print_sint
// [116] phi from testShort::@5 to print_sint [phi:testShort::@5->print_sint]
print_sint_from___b5:
- // [116] phi print_sint::w#10 = testShort::s [phi:testShort::@5->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testShort::s [phi:testShort::@5->print_sint#0] -- vwsz1=vwsc1
lda #s
@@ -2459,7 +2459,7 @@ testShort: {
// [42] call print_ln
// [105] phi from testShort::@6 to print_ln [phi:testShort::@6->print_ln]
print_ln_from___b6:
- // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testShort::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testShort::@6->print_ln#0] -- register_copy
jsr print_ln
jmp __breturn
// testShort::@return
@@ -2485,7 +2485,7 @@ testInt: {
// [80] phi from testInt to print_str [phi:testInt->print_str]
print_str_from_testInt:
// [80] phi print_char_cursor#159 = print_char_cursor#163 [phi:testInt->print_str#0] -- register_copy
- // [80] phi print_str::str#8 = testInt::str [phi:testInt->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testInt::str [phi:testInt->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2500,7 +2500,7 @@ testInt: {
// [110] phi from testInt::@1 to print_uint [phi:testInt::@1->print_uint]
print_uint_from___b1:
// [110] phi print_char_cursor#147 = print_char_cursor#1 [phi:testInt::@1->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = testInt::u [phi:testInt::@1->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = testInt::u [phi:testInt::@1->print_uint#1] -- vwuz1=vwuc1
lda #u
@@ -2515,7 +2515,7 @@ testInt: {
// [95] phi from testInt::@2 to print_char [phi:testInt::@2->print_char]
print_char_from___b2:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testInt::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testInt::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testInt::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [50] phi from testInt::@2 to testInt::@3 [phi:testInt::@2->testInt::@3]
@@ -2526,7 +2526,7 @@ testInt: {
// [51] call print_sint
// [116] phi from testInt::@3 to print_sint [phi:testInt::@3->print_sint]
print_sint_from___b3:
- // [116] phi print_sint::w#10 = testInt::n [phi:testInt::@3->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testInt::n [phi:testInt::@3->print_sint#0] -- vwsz1=vwsc1
lda #n
@@ -2541,7 +2541,7 @@ testInt: {
// [95] phi from testInt::@4 to print_char [phi:testInt::@4->print_char]
print_char_from___b4:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testInt::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testInt::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testInt::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [54] phi from testInt::@4 to testInt::@5 [phi:testInt::@4->testInt::@5]
@@ -2552,7 +2552,7 @@ testInt: {
// [55] call print_sint
// [116] phi from testInt::@5 to print_sint [phi:testInt::@5->print_sint]
print_sint_from___b5:
- // [116] phi print_sint::w#10 = testInt::s [phi:testInt::@5->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testInt::s [phi:testInt::@5->print_sint#0] -- vwsz1=vwsc1
lda #s
@@ -2566,7 +2566,7 @@ testInt: {
// [57] call print_ln
// [105] phi from testInt::@6 to print_ln [phi:testInt::@6->print_ln]
print_ln_from___b6:
- // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testInt::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testInt::@6->print_ln#0] -- register_copy
jsr print_ln
jmp __breturn
// testInt::@return
@@ -2592,7 +2592,7 @@ testLong: {
// [80] phi from testLong to print_str [phi:testLong->print_str]
print_str_from_testLong:
// [80] phi print_char_cursor#159 = print_char_cursor#164 [phi:testLong->print_str#0] -- register_copy
- // [80] phi print_str::str#8 = testLong::str [phi:testLong->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testLong::str [phi:testLong->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2607,7 +2607,7 @@ testLong: {
// [127] phi from testLong::@1 to print_ulong [phi:testLong::@1->print_ulong]
print_ulong_from___b1:
// [127] phi print_char_cursor#148 = print_char_cursor#1 [phi:testLong::@1->print_ulong#0] -- register_copy
- // [127] phi print_ulong::dw#2 = testLong::u [phi:testLong::@1->print_ulong#1] -- call_phi_near
+ // [127] phi print_ulong::dw#2 = testLong::u [phi:testLong::@1->print_ulong#1] -- vduz1=vduc1
lda #u
@@ -2626,7 +2626,7 @@ testLong: {
// [95] phi from testLong::@2 to print_char [phi:testLong::@2->print_char]
print_char_from___b2:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testLong::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testLong::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testLong::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [65] phi from testLong::@2 to testLong::@3 [phi:testLong::@2->testLong::@3]
@@ -2637,7 +2637,7 @@ testLong: {
// [66] call print_slong
// [133] phi from testLong::@3 to print_slong [phi:testLong::@3->print_slong]
print_slong_from___b3:
- // [133] phi print_slong::dw#3 = testLong::n [phi:testLong::@3->print_slong#0] -- call_phi_near
+ // [133] phi print_slong::dw#3 = testLong::n [phi:testLong::@3->print_slong#0] -- vdsz1=vdsc1
lda #n
@@ -2656,7 +2656,7 @@ testLong: {
// [95] phi from testLong::@4 to print_char [phi:testLong::@4->print_char]
print_char_from___b4:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testLong::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testLong::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testLong::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [69] phi from testLong::@4 to testLong::@5 [phi:testLong::@4->testLong::@5]
@@ -2667,7 +2667,7 @@ testLong: {
// [70] call print_slong
// [133] phi from testLong::@5 to print_slong [phi:testLong::@5->print_slong]
print_slong_from___b5:
- // [133] phi print_slong::dw#3 = testLong::s [phi:testLong::@5->print_slong#0] -- call_phi_near
+ // [133] phi print_slong::dw#3 = testLong::s [phi:testLong::@5->print_slong#0] -- vdsz1=vdsc1
lda #s
@@ -2685,7 +2685,7 @@ testLong: {
// [72] call print_ln
// [105] phi from testLong::@6 to print_ln [phi:testLong::@6->print_ln]
print_ln_from___b6:
- // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testLong::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testLong::@6->print_ln#0] -- register_copy
jsr print_ln
jmp __breturn
// testLong::@return
@@ -2776,7 +2776,7 @@ print_str: {
// [95] phi from print_str::@2 to print_char [phi:print_str::@2->print_char]
print_char_from___b2:
// [95] phi print_char_cursor#95 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy
jsr print_char
jmp __b3
// print_str::@3
@@ -2806,7 +2806,7 @@ print_uchar: {
// [95] phi from print_uchar to print_char [phi:print_uchar->print_char]
print_char_from_print_uchar:
// [95] phi print_char_cursor#95 = print_char_cursor#152 [phi:print_uchar->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = print_char::ch#7 [phi:print_uchar->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = print_char::ch#7 [phi:print_uchar->print_char#1] -- register_copy
jsr print_char
jmp __b1
// print_uchar::@1
@@ -2820,7 +2820,7 @@ print_uchar: {
// [95] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char]
print_char_from___b1:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_uchar::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = print_char::ch#8 [phi:print_uchar::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = print_char::ch#8 [phi:print_uchar::@1->print_char#1] -- register_copy
jsr print_char
jmp __breturn
// print_uchar::@return
@@ -2860,7 +2860,7 @@ print_schar: {
// [95] phi from print_schar::@1 to print_char [phi:print_schar::@1->print_char]
print_char_from___b1:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_schar::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = '-' [phi:print_schar::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = '-' [phi:print_schar::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
// [102] phi from print_schar::@1 to print_schar::@2 [phi:print_schar::@1->print_schar::@2]
@@ -2872,7 +2872,7 @@ print_schar: {
// [87] phi from print_schar::@2 to print_uchar [phi:print_schar::@2->print_uchar]
print_uchar_from___b2:
// [87] phi print_char_cursor#152 = print_char_cursor#25 [phi:print_schar::@2->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = (char)print_schar::b#0 [phi:print_schar::@2->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = (char)print_schar::b#0 [phi:print_schar::@2->print_uchar#1] -- vbuxx=vbuc1
ldx #b
jsr print_uchar
jmp __breturn
@@ -2925,7 +2925,7 @@ print_uint: {
// [87] phi from print_uint to print_uchar [phi:print_uint->print_uchar]
print_uchar_from_print_uint:
// [87] phi print_char_cursor#152 = print_char_cursor#147 [phi:print_uint->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = print_uchar::b#1 [phi:print_uint->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = print_uchar::b#1 [phi:print_uint->print_uchar#1] -- register_copy
jsr print_uchar
jmp __b1
// print_uint::@1
@@ -2936,7 +2936,7 @@ print_uint: {
// [87] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar]
print_uchar_from___b1:
// [87] phi print_char_cursor#152 = print_char_cursor#25 [phi:print_uint::@1->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = print_uchar::b#2 [phi:print_uint::@1->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = print_uchar::b#2 [phi:print_uint::@1->print_uchar#1] -- register_copy
jsr print_uchar
jmp __breturn
// print_uint::@return
@@ -2961,7 +2961,7 @@ print_sint: {
// [95] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char]
print_char_from___b3:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_sint::@3->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [120] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2]
@@ -2976,7 +2976,7 @@ print_sint: {
// [110] phi from print_sint::@2 to print_uint [phi:print_sint::@2->print_uint]
print_uint_from___b2:
// [110] phi print_char_cursor#147 = print_char_cursor#25 [phi:print_sint::@2->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = print_uint::w#0 [phi:print_sint::@2->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = print_uint::w#0 [phi:print_sint::@2->print_uint#1] -- register_copy
jsr print_uint
jmp __breturn
// print_sint::@return
@@ -2992,7 +2992,7 @@ print_sint: {
// [95] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char]
print_char_from___b1:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_sint::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
jmp __b4
@@ -3022,7 +3022,7 @@ print_ulong: {
// [110] phi from print_ulong to print_uint [phi:print_ulong->print_uint]
print_uint_from_print_ulong:
// [110] phi print_char_cursor#147 = print_char_cursor#148 [phi:print_ulong->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = print_uint::w#1 [phi:print_ulong->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = print_uint::w#1 [phi:print_ulong->print_uint#1] -- register_copy
jsr print_uint
jmp __b1
// print_ulong::@1
@@ -3036,7 +3036,7 @@ print_ulong: {
// [110] phi from print_ulong::@1 to print_uint [phi:print_ulong::@1->print_uint]
print_uint_from___b1:
// [110] phi print_char_cursor#147 = print_char_cursor#25 [phi:print_ulong::@1->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = print_uint::w#2 [phi:print_ulong::@1->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = print_uint::w#2 [phi:print_ulong::@1->print_uint#1] -- register_copy
jsr print_uint
jmp __breturn
// print_ulong::@return
@@ -3061,7 +3061,7 @@ print_slong: {
// [95] phi from print_slong::@3 to print_char [phi:print_slong::@3->print_char]
print_char_from___b3:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_slong::@3->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:print_slong::@3->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:print_slong::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [137] phi from print_slong::@3 print_slong::@4 to print_slong::@2 [phi:print_slong::@3/print_slong::@4->print_slong::@2]
@@ -3076,7 +3076,7 @@ print_slong: {
// [127] phi from print_slong::@2 to print_ulong [phi:print_slong::@2->print_ulong]
print_ulong_from___b2:
// [127] phi print_char_cursor#148 = print_char_cursor#25 [phi:print_slong::@2->print_ulong#0] -- register_copy
- // [127] phi print_ulong::dw#2 = print_ulong::dw#0 [phi:print_slong::@2->print_ulong#1] -- call_phi_near
+ // [127] phi print_ulong::dw#2 = print_ulong::dw#0 [phi:print_slong::@2->print_ulong#1] -- register_copy
jsr print_ulong
jmp __breturn
// print_slong::@return
@@ -3092,7 +3092,7 @@ print_slong: {
// [95] phi from print_slong::@1 to print_char [phi:print_slong::@1->print_char]
print_char_from___b1:
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_slong::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = '-' [phi:print_slong::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = '-' [phi:print_slong::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
jmp __b4
@@ -3473,28 +3473,28 @@ Score: 2013
main: {
// print_cls()
// [1] call print_cls
- // [11] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [11] phi from main to print_cls [phi:main->print_cls]
jsr print_cls
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// testChar()
// [3] call testChar
- // [14] phi from main::@1 to testChar [phi:main::@1->testChar] -- call_phi_near
+ // [14] phi from main::@1 to testChar [phi:main::@1->testChar]
jsr testChar
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// testShort()
- // [5] call testShort -- call_phi_near
+ // [5] call testShort
jsr testShort
// [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// testInt()
- // [7] call testInt -- call_phi_near
+ // [7] call testInt
jsr testInt
// [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
// main::@4
// testLong()
- // [9] call testLong -- call_phi_near
+ // [9] call testLong
jsr testLong
// main::@return
// }
@@ -3506,7 +3506,7 @@ main: {
print_cls: {
// memset(print_screen, ' ', 1000)
// [12] call memset
- // [74] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [74] phi from print_cls to memset [phi:print_cls->memset]
jsr memset
// print_cls::@return
// }
@@ -3526,7 +3526,7 @@ testChar: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [80] phi print_str::str#8 = testChar::str [phi:testChar->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testChar::str [phi:testChar->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -3538,7 +3538,7 @@ testChar: {
// [17] call print_uchar
// [87] phi from testChar::@1 to print_uchar [phi:testChar::@1->print_uchar]
// [87] phi print_char_cursor#152 = print_char_cursor#1 [phi:testChar::@1->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = testChar::u [phi:testChar::@1->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = testChar::u [phi:testChar::@1->print_uchar#1] -- vbuxx=vbuc1
ldx #u
jsr print_uchar
// [18] phi from testChar::@1 to testChar::@2 [phi:testChar::@1->testChar::@2]
@@ -3547,7 +3547,7 @@ testChar: {
// [19] call print_char
// [95] phi from testChar::@2 to print_char [phi:testChar::@2->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testChar::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testChar::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testChar::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [20] phi from testChar::@2 to testChar::@3 [phi:testChar::@2->testChar::@3]
@@ -3556,7 +3556,7 @@ testChar: {
// [21] call print_uchar
// [87] phi from testChar::@3 to print_uchar [phi:testChar::@3->print_uchar]
// [87] phi print_char_cursor#152 = print_char_cursor#25 [phi:testChar::@3->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = testChar::n [phi:testChar::@3->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = testChar::n [phi:testChar::@3->print_uchar#1] -- vbuxx=vbuc1
ldx #n
jsr print_uchar
// [22] phi from testChar::@3 to testChar::@4 [phi:testChar::@3->testChar::@4]
@@ -3565,21 +3565,21 @@ testChar: {
// [23] call print_char
// [95] phi from testChar::@4 to print_char [phi:testChar::@4->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testChar::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testChar::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testChar::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [24] phi from testChar::@4 to testChar::@5 [phi:testChar::@4->testChar::@5]
// testChar::@5
// print_schar(s)
// [25] call print_schar
- // [99] phi from testChar::@5 to print_schar [phi:testChar::@5->print_schar] -- call_phi_near
+ // [99] phi from testChar::@5 to print_schar [phi:testChar::@5->print_schar]
jsr print_schar
// [26] phi from testChar::@5 to testChar::@6 [phi:testChar::@5->testChar::@6]
// testChar::@6
// print_ln()
// [27] call print_ln
// [105] phi from testChar::@6 to print_ln [phi:testChar::@6->print_ln]
- // [105] phi print_line_cursor#41 = print_screen#0 [phi:testChar::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_screen#0 [phi:testChar::@6->print_ln#0] -- pbuz1=pbuc1
lda #print_screen
@@ -3608,7 +3608,7 @@ testShort: {
// [30] call print_str
// [80] phi from testShort to print_str [phi:testShort->print_str]
// [80] phi print_char_cursor#159 = print_char_cursor#165 [phi:testShort->print_str#0] -- register_copy
- // [80] phi print_str::str#8 = testShort::str [phi:testShort->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testShort::str [phi:testShort->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -3620,7 +3620,7 @@ testShort: {
// [32] call print_uint
// [110] phi from testShort::@1 to print_uint [phi:testShort::@1->print_uint]
// [110] phi print_char_cursor#147 = print_char_cursor#1 [phi:testShort::@1->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = testShort::u [phi:testShort::@1->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = testShort::u [phi:testShort::@1->print_uint#1] -- vwuz1=vwuc1
lda #u
@@ -3632,7 +3632,7 @@ testShort: {
// [34] call print_char
// [95] phi from testShort::@2 to print_char [phi:testShort::@2->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testShort::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testShort::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testShort::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [35] phi from testShort::@2 to testShort::@3 [phi:testShort::@2->testShort::@3]
@@ -3640,7 +3640,7 @@ testShort: {
// print_sint(n)
// [36] call print_sint
// [116] phi from testShort::@3 to print_sint [phi:testShort::@3->print_sint]
- // [116] phi print_sint::w#10 = testShort::n [phi:testShort::@3->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testShort::n [phi:testShort::@3->print_sint#0] -- vwsz1=vwsc1
lda #n
@@ -3652,7 +3652,7 @@ testShort: {
// [38] call print_char
// [95] phi from testShort::@4 to print_char [phi:testShort::@4->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testShort::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testShort::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testShort::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [39] phi from testShort::@4 to testShort::@5 [phi:testShort::@4->testShort::@5]
@@ -3660,7 +3660,7 @@ testShort: {
// print_sint(s)
// [40] call print_sint
// [116] phi from testShort::@5 to print_sint [phi:testShort::@5->print_sint]
- // [116] phi print_sint::w#10 = testShort::s [phi:testShort::@5->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testShort::s [phi:testShort::@5->print_sint#0] -- vwsz1=vwsc1
lda #s
@@ -3671,7 +3671,7 @@ testShort: {
// print_ln()
// [42] call print_ln
// [105] phi from testShort::@6 to print_ln [phi:testShort::@6->print_ln]
- // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testShort::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testShort::@6->print_ln#0] -- register_copy
jsr print_ln
// testShort::@return
// }
@@ -3696,7 +3696,7 @@ testInt: {
// [45] call print_str
// [80] phi from testInt to print_str [phi:testInt->print_str]
// [80] phi print_char_cursor#159 = print_char_cursor#163 [phi:testInt->print_str#0] -- register_copy
- // [80] phi print_str::str#8 = testInt::str [phi:testInt->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testInt::str [phi:testInt->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -3708,7 +3708,7 @@ testInt: {
// [47] call print_uint
// [110] phi from testInt::@1 to print_uint [phi:testInt::@1->print_uint]
// [110] phi print_char_cursor#147 = print_char_cursor#1 [phi:testInt::@1->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = testInt::u [phi:testInt::@1->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = testInt::u [phi:testInt::@1->print_uint#1] -- vwuz1=vwuc1
lda #u
@@ -3720,7 +3720,7 @@ testInt: {
// [49] call print_char
// [95] phi from testInt::@2 to print_char [phi:testInt::@2->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testInt::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testInt::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testInt::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [50] phi from testInt::@2 to testInt::@3 [phi:testInt::@2->testInt::@3]
@@ -3728,7 +3728,7 @@ testInt: {
// print_sint(n)
// [51] call print_sint
// [116] phi from testInt::@3 to print_sint [phi:testInt::@3->print_sint]
- // [116] phi print_sint::w#10 = testInt::n [phi:testInt::@3->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testInt::n [phi:testInt::@3->print_sint#0] -- vwsz1=vwsc1
lda #n
@@ -3740,7 +3740,7 @@ testInt: {
// [53] call print_char
// [95] phi from testInt::@4 to print_char [phi:testInt::@4->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testInt::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testInt::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testInt::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [54] phi from testInt::@4 to testInt::@5 [phi:testInt::@4->testInt::@5]
@@ -3748,7 +3748,7 @@ testInt: {
// print_sint(s)
// [55] call print_sint
// [116] phi from testInt::@5 to print_sint [phi:testInt::@5->print_sint]
- // [116] phi print_sint::w#10 = testInt::s [phi:testInt::@5->print_sint#0] -- call_phi_near
+ // [116] phi print_sint::w#10 = testInt::s [phi:testInt::@5->print_sint#0] -- vwsz1=vwsc1
lda #s
@@ -3759,7 +3759,7 @@ testInt: {
// print_ln()
// [57] call print_ln
// [105] phi from testInt::@6 to print_ln [phi:testInt::@6->print_ln]
- // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testInt::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testInt::@6->print_ln#0] -- register_copy
jsr print_ln
// testInt::@return
// }
@@ -3784,7 +3784,7 @@ testLong: {
// [60] call print_str
// [80] phi from testLong to print_str [phi:testLong->print_str]
// [80] phi print_char_cursor#159 = print_char_cursor#164 [phi:testLong->print_str#0] -- register_copy
- // [80] phi print_str::str#8 = testLong::str [phi:testLong->print_str#1] -- call_phi_near
+ // [80] phi print_str::str#8 = testLong::str [phi:testLong->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -3796,7 +3796,7 @@ testLong: {
// [62] call print_ulong
// [127] phi from testLong::@1 to print_ulong [phi:testLong::@1->print_ulong]
// [127] phi print_char_cursor#148 = print_char_cursor#1 [phi:testLong::@1->print_ulong#0] -- register_copy
- // [127] phi print_ulong::dw#2 = testLong::u [phi:testLong::@1->print_ulong#1] -- call_phi_near
+ // [127] phi print_ulong::dw#2 = testLong::u [phi:testLong::@1->print_ulong#1] -- vduz1=vduc1
lda #u
@@ -3812,7 +3812,7 @@ testLong: {
// [64] call print_char
// [95] phi from testLong::@2 to print_char [phi:testLong::@2->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testLong::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testLong::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testLong::@2->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [65] phi from testLong::@2 to testLong::@3 [phi:testLong::@2->testLong::@3]
@@ -3820,7 +3820,7 @@ testLong: {
// print_slong(n)
// [66] call print_slong
// [133] phi from testLong::@3 to print_slong [phi:testLong::@3->print_slong]
- // [133] phi print_slong::dw#3 = testLong::n [phi:testLong::@3->print_slong#0] -- call_phi_near
+ // [133] phi print_slong::dw#3 = testLong::n [phi:testLong::@3->print_slong#0] -- vdsz1=vdsc1
lda #n
@@ -3836,7 +3836,7 @@ testLong: {
// [68] call print_char
// [95] phi from testLong::@4 to print_char [phi:testLong::@4->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:testLong::@4->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:testLong::@4->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:testLong::@4->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [69] phi from testLong::@4 to testLong::@5 [phi:testLong::@4->testLong::@5]
@@ -3844,7 +3844,7 @@ testLong: {
// print_slong(s)
// [70] call print_slong
// [133] phi from testLong::@5 to print_slong [phi:testLong::@5->print_slong]
- // [133] phi print_slong::dw#3 = testLong::s [phi:testLong::@5->print_slong#0] -- call_phi_near
+ // [133] phi print_slong::dw#3 = testLong::s [phi:testLong::@5->print_slong#0] -- vdsz1=vdsc1
lda #s
@@ -3859,7 +3859,7 @@ testLong: {
// print_ln()
// [72] call print_ln
// [105] phi from testLong::@6 to print_ln [phi:testLong::@6->print_ln]
- // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testLong::@6->print_ln#0] -- call_phi_near
+ // [105] phi print_line_cursor#41 = print_line_cursor#0 [phi:testLong::@6->print_ln#0] -- register_copy
jsr print_ln
// testLong::@return
// }
@@ -3945,7 +3945,7 @@ print_str: {
// [85] call print_char
// [95] phi from print_str::@2 to print_char [phi:print_str::@2->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy
jsr print_char
// print_str::@3
// print_char(*(str++));
@@ -3975,7 +3975,7 @@ print_uchar: {
// Table of hexadecimal digits
// [95] phi from print_uchar to print_char [phi:print_uchar->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#152 [phi:print_uchar->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = print_char::ch#7 [phi:print_uchar->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = print_char::ch#7 [phi:print_uchar->print_char#1] -- register_copy
jsr print_char
// print_uchar::@1
// b&$f
@@ -3988,7 +3988,7 @@ print_uchar: {
// [93] call print_char
// [95] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_uchar::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = print_char::ch#8 [phi:print_uchar::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = print_char::ch#8 [phi:print_uchar::@1->print_char#1] -- register_copy
jsr print_char
// print_uchar::@return
// }
@@ -4025,7 +4025,7 @@ print_schar: {
// [101] call print_char
// [95] phi from print_schar::@1 to print_char [phi:print_schar::@1->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_schar::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = '-' [phi:print_schar::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = '-' [phi:print_schar::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
// [102] phi from print_schar::@1 to print_schar::@2 [phi:print_schar::@1->print_schar::@2]
@@ -4034,7 +4034,7 @@ print_schar: {
// [103] call print_uchar
// [87] phi from print_schar::@2 to print_uchar [phi:print_schar::@2->print_uchar]
// [87] phi print_char_cursor#152 = print_char_cursor#25 [phi:print_schar::@2->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = (char)print_schar::b#0 [phi:print_schar::@2->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = (char)print_schar::b#0 [phi:print_schar::@2->print_uchar#1] -- vbuxx=vbuc1
ldx #b
jsr print_uchar
// print_schar::@return
@@ -4084,7 +4084,7 @@ print_uint: {
// [112] call print_uchar
// [87] phi from print_uint to print_uchar [phi:print_uint->print_uchar]
// [87] phi print_char_cursor#152 = print_char_cursor#147 [phi:print_uint->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = print_uchar::b#1 [phi:print_uint->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = print_uchar::b#1 [phi:print_uint->print_uchar#1] -- register_copy
jsr print_uchar
// print_uint::@1
// print_uchar(BYTE0(w))
@@ -4093,7 +4093,7 @@ print_uint: {
// [114] call print_uchar
// [87] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar]
// [87] phi print_char_cursor#152 = print_char_cursor#25 [phi:print_uint::@1->print_uchar#0] -- register_copy
- // [87] phi print_uchar::b#5 = print_uchar::b#2 [phi:print_uint::@1->print_uchar#1] -- call_phi_near
+ // [87] phi print_uchar::b#5 = print_uchar::b#2 [phi:print_uint::@1->print_uchar#1] -- register_copy
jsr print_uchar
// print_uint::@return
// }
@@ -4115,7 +4115,7 @@ print_sint: {
// [119] call print_char
// [95] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_sint::@3->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [120] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2]
@@ -4127,7 +4127,7 @@ print_sint: {
// [122] call print_uint
// [110] phi from print_sint::@2 to print_uint [phi:print_sint::@2->print_uint]
// [110] phi print_char_cursor#147 = print_char_cursor#25 [phi:print_sint::@2->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = print_uint::w#0 [phi:print_sint::@2->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = print_uint::w#0 [phi:print_sint::@2->print_uint#1] -- register_copy
jsr print_uint
// print_sint::@return
// }
@@ -4140,7 +4140,7 @@ print_sint: {
// [125] call print_char
// [95] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_sint::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
// print_sint::@4
@@ -4169,7 +4169,7 @@ print_ulong: {
// [129] call print_uint
// [110] phi from print_ulong to print_uint [phi:print_ulong->print_uint]
// [110] phi print_char_cursor#147 = print_char_cursor#148 [phi:print_ulong->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = print_uint::w#1 [phi:print_ulong->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = print_uint::w#1 [phi:print_ulong->print_uint#1] -- register_copy
jsr print_uint
// print_ulong::@1
// print_uint(WORD0(dw))
@@ -4181,7 +4181,7 @@ print_ulong: {
// [131] call print_uint
// [110] phi from print_ulong::@1 to print_uint [phi:print_ulong::@1->print_uint]
// [110] phi print_char_cursor#147 = print_char_cursor#25 [phi:print_ulong::@1->print_uint#0] -- register_copy
- // [110] phi print_uint::w#5 = print_uint::w#2 [phi:print_ulong::@1->print_uint#1] -- call_phi_near
+ // [110] phi print_uint::w#5 = print_uint::w#2 [phi:print_ulong::@1->print_uint#1] -- register_copy
jsr print_uint
// print_ulong::@return
// }
@@ -4203,7 +4203,7 @@ print_slong: {
// [136] call print_char
// [95] phi from print_slong::@3 to print_char [phi:print_slong::@3->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_slong::@3->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = ' ' [phi:print_slong::@3->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = ' ' [phi:print_slong::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [137] phi from print_slong::@3 print_slong::@4 to print_slong::@2 [phi:print_slong::@3/print_slong::@4->print_slong::@2]
@@ -4215,7 +4215,7 @@ print_slong: {
// [139] call print_ulong
// [127] phi from print_slong::@2 to print_ulong [phi:print_slong::@2->print_ulong]
// [127] phi print_char_cursor#148 = print_char_cursor#25 [phi:print_slong::@2->print_ulong#0] -- register_copy
- // [127] phi print_ulong::dw#2 = print_ulong::dw#0 [phi:print_slong::@2->print_ulong#1] -- call_phi_near
+ // [127] phi print_ulong::dw#2 = print_ulong::dw#0 [phi:print_slong::@2->print_ulong#1] -- register_copy
jsr print_ulong
// print_slong::@return
// }
@@ -4228,7 +4228,7 @@ print_slong: {
// [142] call print_char
// [95] phi from print_slong::@1 to print_char [phi:print_slong::@1->print_char]
// [95] phi print_char_cursor#95 = print_char_cursor#25 [phi:print_slong::@1->print_char#0] -- register_copy
- // [95] phi print_char::ch#17 = '-' [phi:print_slong::@1->print_char#1] -- call_phi_near
+ // [95] phi print_char::ch#17 = '-' [phi:print_slong::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
// print_slong::@4
diff --git a/src/test/ref/c64dtv-8bppcharstretch.log b/src/test/ref/c64dtv-8bppcharstretch.log
index f7b3c6de1..9e674183c 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.log
+++ b/src/test/ref/c64dtv-8bppcharstretch.log
@@ -1380,7 +1380,7 @@ main: {
lda #PROCPORT_RAM_IO
sta.z PROCPORT
// [3] call gfx_init
- // [40] phi from main to gfx_init [phi:main->gfx_init] -- call_phi_near
+ // [40] phi from main to gfx_init [phi:main->gfx_init]
gfx_init_from_main:
jsr gfx_init
jmp __b6
@@ -1592,7 +1592,7 @@ main: {
// Initialize the different graphics in the memory
gfx_init: {
// [41] call gfx_init_screen0
- // [45] phi from gfx_init to gfx_init_screen0 [phi:gfx_init->gfx_init_screen0] -- call_phi_near
+ // [45] phi from gfx_init to gfx_init_screen0 [phi:gfx_init->gfx_init_screen0]
gfx_init_screen0_from_gfx_init:
jsr gfx_init_screen0
// [42] phi from gfx_init to gfx_init::@1 [phi:gfx_init->gfx_init::@1]
@@ -1601,7 +1601,7 @@ gfx_init: {
// gfx_init::@1
__b1:
// [43] call gfx_init_plane_charset8
- // [59] phi from gfx_init::@1 to gfx_init_plane_charset8 [phi:gfx_init::@1->gfx_init_plane_charset8] -- call_phi_near
+ // [59] phi from gfx_init::@1 to gfx_init_plane_charset8 [phi:gfx_init::@1->gfx_init_plane_charset8]
gfx_init_plane_charset8_from___b1:
jsr gfx_init_plane_charset8
jmp __breturn
@@ -1703,7 +1703,7 @@ gfx_init_plane_charset8: {
// [60] call dtvSetCpuBankSegment1
// [84] phi from gfx_init_plane_charset8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_charset8->dtvSetCpuBankSegment1]
dtvSetCpuBankSegment1_from_gfx_init_plane_charset8:
- // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = gfx_init_plane_charset8::gfxbCpuBank#0 [phi:gfx_init_plane_charset8->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = gfx_init_plane_charset8::gfxbCpuBank#0 [phi:gfx_init_plane_charset8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #gfxbCpuBank
jsr dtvSetCpuBankSegment1
jmp __b9
@@ -1850,7 +1850,7 @@ gfx_init_plane_charset8: {
// Reset CPU BANK segment to $4000
// [84] phi from gfx_init_plane_charset8::@8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_charset8::@8->dtvSetCpuBankSegment1]
dtvSetCpuBankSegment1_from___b8:
- // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = (char)$4000/$4000 [phi:gfx_init_plane_charset8::@8->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = (char)$4000/$4000 [phi:gfx_init_plane_charset8::@8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #$4000/$4000
jsr dtvSetCpuBankSegment1
jmp __breturn
@@ -2224,7 +2224,7 @@ main: {
sta.z PROCPORT
// gfx_init()
// [3] call gfx_init
- // [40] phi from main to gfx_init [phi:main->gfx_init] -- call_phi_near
+ // [40] phi from main to gfx_init [phi:main->gfx_init]
jsr gfx_init
// main::@6
// *DTV_FEATURE = DTV_FEATURE_ENABLE
@@ -2454,13 +2454,13 @@ main: {
gfx_init: {
// gfx_init_screen0()
// [41] call gfx_init_screen0
- // [45] phi from gfx_init to gfx_init_screen0 [phi:gfx_init->gfx_init_screen0] -- call_phi_near
+ // [45] phi from gfx_init to gfx_init_screen0 [phi:gfx_init->gfx_init_screen0]
jsr gfx_init_screen0
// [42] phi from gfx_init to gfx_init::@1 [phi:gfx_init->gfx_init::@1]
// gfx_init::@1
// gfx_init_plane_charset8()
// [43] call gfx_init_plane_charset8
- // [59] phi from gfx_init::@1 to gfx_init_plane_charset8 [phi:gfx_init::@1->gfx_init_plane_charset8] -- call_phi_near
+ // [59] phi from gfx_init::@1 to gfx_init_plane_charset8 [phi:gfx_init::@1->gfx_init_plane_charset8]
jsr gfx_init_plane_charset8
// gfx_init::@return
// }
@@ -2557,7 +2557,7 @@ gfx_init_plane_charset8: {
// dtvSetCpuBankSegment1(gfxbCpuBank++)
// [60] call dtvSetCpuBankSegment1
// [84] phi from gfx_init_plane_charset8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_charset8->dtvSetCpuBankSegment1]
- // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = gfx_init_plane_charset8::gfxbCpuBank#0 [phi:gfx_init_plane_charset8->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = gfx_init_plane_charset8::gfxbCpuBank#0 [phi:gfx_init_plane_charset8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #gfxbCpuBank
jsr dtvSetCpuBankSegment1
// gfx_init_plane_charset8::@9
@@ -2691,7 +2691,7 @@ gfx_init_plane_charset8: {
// [82] call dtvSetCpuBankSegment1
// Reset CPU BANK segment to $4000
// [84] phi from gfx_init_plane_charset8::@8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_charset8::@8->dtvSetCpuBankSegment1]
- // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = (char)$4000/$4000 [phi:gfx_init_plane_charset8::@8->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [84] phi dtvSetCpuBankSegment1::cpuBankIdx#2 = (char)$4000/$4000 [phi:gfx_init_plane_charset8::@8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #$4000/$4000
jsr dtvSetCpuBankSegment1
// gfx_init_plane_charset8::@return
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.log b/src/test/ref/c64dtv-8bppchunkystretch.log
index 5f14475bb..932a1908c 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.log
+++ b/src/test/ref/c64dtv-8bppchunkystretch.log
@@ -911,7 +911,7 @@ main: {
lda #PROCPORT_RAM_IO
sta.z PROCPORT
// [3] call gfx_init_chunky
- // [34] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky] -- call_phi_near
+ // [34] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky]
gfx_init_chunky_from_main:
jsr gfx_init_chunky
jmp __b6
@@ -1110,7 +1110,7 @@ gfx_init_chunky: {
// [35] call dtvSetCpuBankSegment1
// [54] phi from gfx_init_chunky to dtvSetCpuBankSegment1 [phi:gfx_init_chunky->dtvSetCpuBankSegment1]
dtvSetCpuBankSegment1_from_gfx_init_chunky:
- // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)CHUNKY/$4000 [phi:gfx_init_chunky->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)CHUNKY/$4000 [phi:gfx_init_chunky->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #CHUNKY/$4000
jsr dtvSetCpuBankSegment1
// [36] phi from gfx_init_chunky to gfx_init_chunky::@1 [phi:gfx_init_chunky->gfx_init_chunky::@1]
@@ -1167,7 +1167,7 @@ gfx_init_chunky: {
// [40] call dtvSetCpuBankSegment1
// [54] phi from gfx_init_chunky::@4 to dtvSetCpuBankSegment1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1]
dtvSetCpuBankSegment1_from___b4:
- // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- register_copy
jsr dtvSetCpuBankSegment1
jmp __b7
// gfx_init_chunky::@7
@@ -1238,7 +1238,7 @@ gfx_init_chunky: {
// Reset CPU BANK segment to $4000
// [54] phi from gfx_init_chunky::@6 to dtvSetCpuBankSegment1 [phi:gfx_init_chunky::@6->dtvSetCpuBankSegment1]
dtvSetCpuBankSegment1_from___b6:
- // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)$4000/$4000 [phi:gfx_init_chunky::@6->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)$4000/$4000 [phi:gfx_init_chunky::@6->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #$4000/$4000
jsr dtvSetCpuBankSegment1
jmp __breturn
@@ -1530,7 +1530,7 @@ main: {
sta.z PROCPORT
// gfx_init_chunky()
// [3] call gfx_init_chunky
- // [34] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky] -- call_phi_near
+ // [34] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky]
jsr gfx_init_chunky
// main::@6
// *DTV_FEATURE = DTV_FEATURE_ENABLE
@@ -1744,7 +1744,7 @@ gfx_init_chunky: {
// dtvSetCpuBankSegment1(gfxbCpuBank++)
// [35] call dtvSetCpuBankSegment1
// [54] phi from gfx_init_chunky to dtvSetCpuBankSegment1 [phi:gfx_init_chunky->dtvSetCpuBankSegment1]
- // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)CHUNKY/$4000 [phi:gfx_init_chunky->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)CHUNKY/$4000 [phi:gfx_init_chunky->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #CHUNKY/$4000
jsr dtvSetCpuBankSegment1
// [36] phi from gfx_init_chunky to gfx_init_chunky::@1 [phi:gfx_init_chunky->gfx_init_chunky::@1]
@@ -1791,7 +1791,7 @@ gfx_init_chunky: {
txa
// [40] call dtvSetCpuBankSegment1
// [54] phi from gfx_init_chunky::@4 to dtvSetCpuBankSegment1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1]
- // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- register_copy
jsr dtvSetCpuBankSegment1
// gfx_init_chunky::@7
// dtvSetCpuBankSegment1(gfxbCpuBank++);
@@ -1858,7 +1858,7 @@ gfx_init_chunky: {
// [52] call dtvSetCpuBankSegment1
// Reset CPU BANK segment to $4000
// [54] phi from gfx_init_chunky::@6 to dtvSetCpuBankSegment1 [phi:gfx_init_chunky::@6->dtvSetCpuBankSegment1]
- // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)$4000/$4000 [phi:gfx_init_chunky::@6->dtvSetCpuBankSegment1#0] -- call_phi_near
+ // [54] phi dtvSetCpuBankSegment1::cpuBankIdx#3 = (char)$4000/$4000 [phi:gfx_init_chunky::@6->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1
lda #$4000/$4000
jsr dtvSetCpuBankSegment1
// gfx_init_chunky::@return
diff --git a/src/test/ref/call-banked-phi-case-1-near-0.log b/src/test/ref/call-banked-phi-case-1-near-0.log
index 32bf16c0b..6cc252f0c 100644
--- a/src/test/ref/call-banked-phi-case-1-near-0.log
+++ b/src/test/ref/call-banked-phi-case-1-near-0.log
@@ -204,7 +204,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call plus
- // [4] phi from main to plus [phi:main->plus] -- call_phi_near
+ // [4] phi from main to plus [phi:main->plus]
plus_from_main:
jsr plus
jmp __b1
@@ -309,7 +309,7 @@ Score: 24
main: {
// plus('0', 7)
// [1] call plus
- // [4] phi from main to plus [phi:main->plus] -- call_phi_near
+ // [4] phi from main to plus [phi:main->plus]
jsr plus
// main::@1
// SCREEN[0] = plus('0', 7)
diff --git a/src/test/ref/call-banked-phi-case-1-near-1.log b/src/test/ref/call-banked-phi-case-1-near-1.log
index ff7923bbf..6d479c599 100644
--- a/src/test/ref/call-banked-phi-case-1-near-1.log
+++ b/src/test/ref/call-banked-phi-case-1-near-1.log
@@ -273,7 +273,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call plus
- // [4] phi from main to plus [phi:main->plus] -- call_phi_near
+ // [4] phi from main to plus [phi:main->plus]
plus_from_main:
jsr plus
jmp __b1
@@ -294,7 +294,7 @@ plus: {
.label a = '0'
.label b = 7
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
min_from_plus:
jsr min
jmp __breturn
@@ -398,7 +398,7 @@ Score: 36
main: {
// plus('0', 7)
// [1] call plus
- // [4] phi from main to plus [phi:main->plus] -- call_phi_near
+ // [4] phi from main to plus [phi:main->plus]
jsr plus
// main::@1
// SCREEN[0] = plus('0', 7)
@@ -417,7 +417,7 @@ plus: {
.label b = 7
// min(a, b)
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
jsr min
// plus::@return
// }
diff --git a/src/test/ref/call-banked-phi-case-2-close-0.asm b/src/test/ref/call-banked-phi-case-2-close-0.asm
index f867223cc..992a24726 100644
--- a/src/test/ref/call-banked-phi-case-2-close-0.asm
+++ b/src/test/ref/call-banked-phi-case-2-close-0.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.const a = '0'
.const b = 7
diff --git a/src/test/ref/call-banked-phi-case-2-close-0.log b/src/test/ref/call-banked-phi-case-2-close-0.log
index 8d78e1673..2fb184a72 100644
--- a/src/test/ref/call-banked-phi-case-2-close-0.log
+++ b/src/test/ref/call-banked-phi-case-2-close-0.log
@@ -230,7 +230,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.const a = '0'
.const b = 7
@@ -341,7 +341,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.const a = '0'
.const b = 7
diff --git a/src/test/ref/call-banked-phi-case-2-close-1.asm b/src/test/ref/call-banked-phi-case-2-close-1.asm
index 3074c08e3..937d2243f 100644
--- a/src/test/ref/call-banked-phi-case-2-close-1.asm
+++ b/src/test/ref/call-banked-phi-case-2-close-1.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.const a = '0'
.const b = 7
diff --git a/src/test/ref/call-banked-phi-case-2-close-1.log b/src/test/ref/call-banked-phi-case-2-close-1.log
index 3ac501458..3738f423b 100644
--- a/src/test/ref/call-banked-phi-case-2-close-1.log
+++ b/src/test/ref/call-banked-phi-case-2-close-1.log
@@ -230,7 +230,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.const a = '0'
.const b = 7
@@ -341,7 +341,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.const a = '0'
.const b = 7
diff --git a/src/test/ref/call-banked-phi-case-3-near-0.asm b/src/test/ref/call-banked-phi-case-3-near-0.asm
index 135a22afc..36effde7d 100644
--- a/src/test/ref/call-banked-phi-case-3-near-0.asm
+++ b/src/test/ref/call-banked-phi-case-3-near-0.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
diff --git a/src/test/ref/call-banked-phi-case-3-near-0.log b/src/test/ref/call-banked-phi-case-3-near-0.log
index e5e80a97d..7b0249d61 100644
--- a/src/test/ref/call-banked-phi-case-3-near-0.log
+++ b/src/test/ref/call-banked-phi-case-3-near-0.log
@@ -299,12 +299,12 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
min_from_plus:
jsr min
jmp __breturn
@@ -431,13 +431,13 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// min(a, b)
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
jsr min
// plus::@return
// }
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.asm b/src/test/ref/call-banked-phi-case-3-near-1.asm
index 39b32a2d9..dc45fa7ff 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.asm
+++ b/src/test/ref/call-banked-phi-case-3-near-1.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -69,7 +69,6 @@ plus: {
}
.segment Code
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.cfg b/src/test/ref/call-banked-phi-case-3-near-1.cfg
index 3a2aea220..4a0b60f9d 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.cfg
+++ b/src/test/ref/call-banked-phi-case-3-near-1.cfg
@@ -20,7 +20,7 @@ plus::@return: scope:[plus] from plus
[6] return
to:@return
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
min: scope:[min] from plus
[7] phi()
to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.log b/src/test/ref/call-banked-phi-case-3-near-1.log
index ee40560bd..6409550db 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.log
+++ b/src/test/ref/call-banked-phi-case-3-near-1.log
@@ -38,7 +38,7 @@ plus::@return: scope:[plus] from plus::@1
return
to:@return
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
min: scope:[min] from plus
min::b#1 = phi( plus/min::b#0 )
min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
void __start()
void main()
char main::$0
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
char min::$0
char min::a
char min::a#0
@@ -188,7 +188,7 @@ plus::@return: scope:[plus] from plus
[6] return
to:@return
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
min: scope:[min] from plus
[7] phi()
to:min::@return
@@ -199,7 +199,7 @@ min::@return: scope:[min] from min
VARIABLE REGISTER WEIGHTS
void main()
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
char min::a
char min::b
char min::return
@@ -299,12 +299,12 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
min_from_plus:
jsr min
jmp __breturn
@@ -316,7 +316,6 @@ plus: {
.segment Code
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -344,7 +343,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
FINAL SYMBOL TABLE
__constant char * const SCREEN = (char *) 1024
void main()
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
char min::a
char min::b
char min::return
@@ -432,13 +431,13 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// min(a, b)
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
jsr min
// plus::@return
// }
@@ -448,7 +447,6 @@ plus: {
.segment Code
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.sym b/src/test/ref/call-banked-phi-case-3-near-1.sym
index 09b563343..9e4219f22 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.sym
+++ b/src/test/ref/call-banked-phi-case-3-near-1.sym
@@ -1,6 +1,6 @@
__constant char * const SCREEN = (char *) 1024
void main()
-__bank(cx16_ram, 1) char min(char a , char b)
+char min(char a , char b)
char min::a
char min::b
char min::return
diff --git a/src/test/ref/call-banked-phi-case-4-near-0.asm b/src/test/ref/call-banked-phi-case-4-near-0.asm
index 9eda4af17..d9e6ece5d 100644
--- a/src/test/ref/call-banked-phi-case-4-near-0.asm
+++ b/src/test/ref/call-banked-phi-case-4-near-0.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -68,7 +68,7 @@ plus: {
rts
}
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-4-near-0.log b/src/test/ref/call-banked-phi-case-4-near-0.log
index 8fff4dd12..c5c7e65c3 100644
--- a/src/test/ref/call-banked-phi-case-4-near-0.log
+++ b/src/test/ref/call-banked-phi-case-4-near-0.log
@@ -299,12 +299,12 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
min_from_plus:
jsr min
jmp __breturn
@@ -315,7 +315,7 @@ plus: {
}
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -431,13 +431,13 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// min(a, b)
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
jsr min
// plus::@return
// }
@@ -446,7 +446,7 @@ plus: {
}
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-banked-phi-case-4-near-1.asm b/src/test/ref/call-banked-phi-case-4-near-1.asm
index 7a009fb12..961e21569 100644
--- a/src/test/ref/call-banked-phi-case-4-near-1.asm
+++ b/src/test/ref/call-banked-phi-case-4-near-1.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -68,7 +68,7 @@ plus: {
rts
}
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-4-near-1.log b/src/test/ref/call-banked-phi-case-4-near-1.log
index 355d2d82c..fd0d233ce 100644
--- a/src/test/ref/call-banked-phi-case-4-near-1.log
+++ b/src/test/ref/call-banked-phi-case-4-near-1.log
@@ -299,12 +299,12 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
min_from_plus:
jsr min
jmp __breturn
@@ -315,7 +315,7 @@ plus: {
}
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -431,13 +431,13 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
// min(a, b)
// [5] call min
- // [7] phi from plus to min [phi:plus->min] -- call_phi_near
+ // [7] phi from plus to min [phi:plus->min]
jsr min
// plus::@return
// }
@@ -446,7 +446,7 @@ plus: {
}
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-banked-phi-case-5-far-0.asm b/src/test/ref/call-banked-phi-case-5-far-0.asm
index f492f49fe..d4144fb7c 100644
--- a/src/test/ref/call-banked-phi-case-5-far-0.asm
+++ b/src/test/ref/call-banked-phi-case-5-far-0.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -72,7 +72,7 @@ plus: {
}
.segment RAM_Bank2
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=2
+// __bank(cx16_ram, 2)
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-5-far-0.log b/src/test/ref/call-banked-phi-case-5-far-0.log
index c7fde5e3d..b4699672c 100644
--- a/src/test/ref/call-banked-phi-case-5-far-0.log
+++ b/src/test/ref/call-banked-phi-case-5-far-0.log
@@ -299,7 +299,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -319,7 +319,7 @@ plus: {
.segment RAM_Bank2
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=2
+// __bank(cx16_ram, 2)
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -435,7 +435,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -454,7 +454,7 @@ plus: {
.segment RAM_Bank2
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=2
+// __bank(cx16_ram, 2)
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-banked-phi-case-5-far-1.asm b/src/test/ref/call-banked-phi-case-5-far-1.asm
index 002273c5d..3f168055b 100644
--- a/src/test/ref/call-banked-phi-case-5-far-1.asm
+++ b/src/test/ref/call-banked-phi-case-5-far-1.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -72,7 +72,7 @@ plus: {
}
.segment RAM_Bank2
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=2
+// __bank(cx16_ram, 2)
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-5-far-1.log b/src/test/ref/call-banked-phi-case-5-far-1.log
index d8beab3fb..0be8f5ff7 100644
--- a/src/test/ref/call-banked-phi-case-5-far-1.log
+++ b/src/test/ref/call-banked-phi-case-5-far-1.log
@@ -299,7 +299,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -319,7 +319,7 @@ plus: {
.segment RAM_Bank2
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=2
+// __bank(cx16_ram, 2)
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -435,7 +435,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -454,7 +454,7 @@ plus: {
.segment RAM_Bank2
// min
// char min(char a, char b)
-// banked : bank area='cx16_ram', bank=2
+// __bank(cx16_ram, 2)
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-banked-phi-case-6-close-0.asm b/src/test/ref/call-banked-phi-case-6-close-0.asm
index bed31d08c..32a709284 100644
--- a/src/test/ref/call-banked-phi-case-6-close-0.asm
+++ b/src/test/ref/call-banked-phi-case-6-close-0.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -75,7 +75,7 @@ plus: {
}
.segment ROM_Bank1
// char min(char a, char b)
-// banked : bank area='cx16_rom', bank=1
+// __bank(cx16_rom, 1)
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-6-close-0.log b/src/test/ref/call-banked-phi-case-6-close-0.log
index 8dd9b182a..d18801d0d 100644
--- a/src/test/ref/call-banked-phi-case-6-close-0.log
+++ b/src/test/ref/call-banked-phi-case-6-close-0.log
@@ -300,7 +300,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -323,7 +323,7 @@ plus: {
.segment ROM_Bank1
// min
// char min(char a, char b)
-// banked : bank area='cx16_rom', bank=1
+// __bank(cx16_rom, 1)
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -439,7 +439,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -461,7 +461,7 @@ plus: {
.segment ROM_Bank1
// min
// char min(char a, char b)
-// banked : bank area='cx16_rom', bank=1
+// __bank(cx16_rom, 1)
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-banked-phi-case-6-close-1.asm b/src/test/ref/call-banked-phi-case-6-close-1.asm
index b924a7a81..15769f0b8 100644
--- a/src/test/ref/call-banked-phi-case-6-close-1.asm
+++ b/src/test/ref/call-banked-phi-case-6-close-1.asm
@@ -58,7 +58,7 @@ main: {
}
.segment RAM_Bank1
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -75,7 +75,7 @@ plus: {
}
.segment ROM_Bank1
// char min(char a, char b)
-// banked : bank area='cx16_rom', bank=1
+// __bank(cx16_rom, 1)
min: {
.label return = plus.a+plus.b
rts
diff --git a/src/test/ref/call-banked-phi-case-6-close-1.log b/src/test/ref/call-banked-phi-case-6-close-1.log
index 4228f15f1..ffe2cc66e 100644
--- a/src/test/ref/call-banked-phi-case-6-close-1.log
+++ b/src/test/ref/call-banked-phi-case-6-close-1.log
@@ -300,7 +300,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -323,7 +323,7 @@ plus: {
.segment ROM_Bank1
// min
// char min(char a, char b)
-// banked : bank area='cx16_rom', bank=1
+// __bank(cx16_rom, 1)
min: {
.label return = plus.a+plus.b
jmp __breturn
@@ -439,7 +439,7 @@ main: {
.segment RAM_Bank1
// plus
// char plus(char a, char b)
-// banked : bank area='cx16_ram', bank=1
+// __bank(cx16_ram, 1)
plus: {
.label a = '0'
.label b = 7
@@ -461,7 +461,7 @@ plus: {
.segment ROM_Bank1
// min
// char min(char a, char b)
-// banked : bank area='cx16_rom', bank=1
+// __bank(cx16_rom, 1)
min: {
.label return = plus.a+plus.b
// min::@return
diff --git a/src/test/ref/call-parameter-autocast.log b/src/test/ref/call-parameter-autocast.log
index 51c9246e2..c86f830af 100644
--- a/src/test/ref/call-parameter-autocast.log
+++ b/src/test/ref/call-parameter-autocast.log
@@ -261,7 +261,7 @@ main: {
sta.z print.w
lda #>$1234
sta.z print.w+1
- // [7] phi idx#13 = 0 [phi:main->print#1] -- call_phi_near
+ // [7] phi idx#13 = 0 [phi:main->print#1] -- vbuxx=vbuc1
ldx #0
jsr print
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -277,7 +277,7 @@ main: {
sta.z print.w
lda #>w
sta.z print.w+1
- // [7] phi idx#13 = idx#14 [phi:main::@1->print#1] -- call_phi_near
+ // [7] phi idx#13 = idx#14 [phi:main::@1->print#1] -- register_copy
jsr print
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
__b2_from___b1:
@@ -292,7 +292,7 @@ main: {
sta.z print.w
lda #>$12*$100+$34
sta.z print.w+1
- // [7] phi idx#13 = idx#14 [phi:main::@2->print#1] -- call_phi_near
+ // [7] phi idx#13 = idx#14 [phi:main::@2->print#1] -- register_copy
jsr print
jmp __breturn
// main::@return
@@ -386,7 +386,7 @@ main: {
sta.z print.w
lda #>$1234
sta.z print.w+1
- // [7] phi idx#13 = 0 [phi:main->print#1] -- call_phi_near
+ // [7] phi idx#13 = 0 [phi:main->print#1] -- vbuxx=vbuc1
ldx #0
jsr print
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -399,7 +399,7 @@ main: {
sta.z print.w
lda #>w
sta.z print.w+1
- // [7] phi idx#13 = idx#14 [phi:main::@1->print#1] -- call_phi_near
+ // [7] phi idx#13 = idx#14 [phi:main::@1->print#1] -- register_copy
jsr print
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
@@ -411,7 +411,7 @@ main: {
sta.z print.w
lda #>$12*$100+$34
sta.z print.w+1
- // [7] phi idx#13 = idx#14 [phi:main::@2->print#1] -- call_phi_near
+ // [7] phi idx#13 = idx#14 [phi:main::@2->print#1] -- register_copy
jsr print
// main::@return
// }
diff --git a/src/test/ref/callconstparam.log b/src/test/ref/callconstparam.log
index ae33a22d0..f93f9d39a 100644
--- a/src/test/ref/callconstparam.log
+++ b/src/test/ref/callconstparam.log
@@ -307,7 +307,7 @@ main: {
// [5] phi line::x1#3 = 2 [phi:main->line#1] -- vbuz1=vbuc1
lda #2
sta.z line.x1
- // [5] phi line::x#0 = 1 [phi:main->line#2] -- call_phi_near
+ // [5] phi line::x#0 = 1 [phi:main->line#2] -- vbuxx=vbuc1
ldx #1
jsr line
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -322,7 +322,7 @@ main: {
// [5] phi line::x1#3 = 5 [phi:main::@1->line#1] -- vbuz1=vbuc1
lda #5
sta.z line.x1
- // [5] phi line::x#0 = 3 [phi:main::@1->line#2] -- call_phi_near
+ // [5] phi line::x#0 = 3 [phi:main::@1->line#2] -- vbuxx=vbuc1
ldx #3
jsr line
jmp __breturn
@@ -438,7 +438,7 @@ main: {
// [5] phi line::x1#3 = 2 [phi:main->line#1] -- vbuz1=vbuc1
lda #2
sta.z line.x1
- // [5] phi line::x#0 = 1 [phi:main->line#2] -- call_phi_near
+ // [5] phi line::x#0 = 1 [phi:main->line#2] -- vbuxx=vbuc1
ldx #1
jsr line
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -450,7 +450,7 @@ main: {
// [5] phi line::x1#3 = 5 [phi:main::@1->line#1] -- vbuz1=vbuc1
lda #5
sta.z line.x1
- // [5] phi line::x#0 = 3 [phi:main::@1->line#2] -- call_phi_near
+ // [5] phi line::x#0 = 3 [phi:main::@1->line#2] -- vbuxx=vbuc1
ldx #3
jsr line
// main::@return
diff --git a/src/test/ref/casting-negative.log b/src/test/ref/casting-negative.log
index 1ec60bd76..cfa761d3c 100644
--- a/src/test/ref/casting-negative.log
+++ b/src/test/ref/casting-negative.log
@@ -3802,7 +3802,7 @@ __start: {
sta.z conio_line_color
lda #>COLORRAM
sta.z conio_line_color+1
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
@@ -3810,7 +3810,7 @@ __start: {
// __start::@1
__b1:
// [7] call main
- // [27] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [27] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -3846,7 +3846,7 @@ conio_c64_init: {
// conio_c64_init::@1
__b1:
// [13] gotoxy::y#2 = conio_c64_init::line#2
- // [14] call gotoxy -- call_phi_near
+ // [14] call gotoxy
jsr gotoxy
jmp __breturn
// conio_c64_init::@return
@@ -3887,7 +3887,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
- // [23] call cputln -- call_phi_near
+ // [23] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@@ -3899,7 +3899,7 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
- // [26] call cputln -- call_phi_near
+ // [26] call cputln
jsr cputln
jmp __breturn
}
@@ -3907,7 +3907,7 @@ cputc: {
main: {
.label signed_char_value = $17
// [28] call clrscr
- // [55] phi from main to clrscr [phi:main->clrscr] -- call_phi_near
+ // [55] phi from main to clrscr [phi:main->clrscr]
clrscr_from_main:
jsr clrscr
// [29] phi from main to main::@1 [phi:main->main::@1]
@@ -3939,7 +3939,7 @@ main: {
lda #$ff
!:
sta.z test_casting.signed_short_value+1
- // [34] call test_casting -- call_phi_near
+ // [34] call test_casting
jsr test_casting
// [29] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
__b1_from___b2:
@@ -4069,7 +4069,7 @@ cputln: {
sta.z conio_cursor_x
// [52] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
- // [53] call cscroll -- call_phi_near
+ // [53] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@@ -4183,7 +4183,7 @@ clrscr: {
test_casting: {
.label signed_short_value = 4
// [71] printf_sint::value#1 = test_casting::signed_short_value#0
- // [72] call printf_sint -- call_phi_near
+ // [72] call printf_sint
jsr printf_sint
// [73] phi from test_casting to test_casting::@1 [phi:test_casting->test_casting::@1]
__b1_from_test_casting:
@@ -4198,7 +4198,7 @@ test_casting: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [99] phi printf_str::s#4 = test_casting::s [phi:test_casting::@1->printf_str#1] -- call_phi_near
+ // [99] phi printf_str::s#4 = test_casting::s [phi:test_casting::@1->printf_str#1] -- pbuz1=pbuc1
lda #s
@@ -4234,7 +4234,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [108] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [108] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -4253,7 +4253,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [108] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [108] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -4269,7 +4269,7 @@ cscroll: {
memset_from___b3:
// [118] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [118] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [118] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -4285,7 +4285,7 @@ cscroll: {
memset_from___b4:
// [118] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [118] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [118] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -4354,7 +4354,7 @@ printf_sint: {
__b2:
// [94] utoa::value#1 = (unsigned int)printf_sint::value#4
// [95] call utoa
- // [126] phi from printf_sint::@2 to utoa [phi:printf_sint::@2->utoa] -- call_phi_near
+ // [126] phi from printf_sint::@2 to utoa [phi:printf_sint::@2->utoa]
utoa_from___b2:
jsr utoa
jmp __b3
@@ -4364,7 +4364,7 @@ printf_sint: {
lda printf_buffer
// [97] call printf_number_buffer
// Print using format
- // [147] phi from printf_sint::@3 to printf_number_buffer [phi:printf_sint::@3->printf_number_buffer] -- call_phi_near
+ // [147] phi from printf_sint::@3 to printf_number_buffer [phi:printf_sint::@3->printf_number_buffer]
printf_number_buffer_from___b3:
jsr printf_number_buffer
jmp __breturn
@@ -4630,7 +4630,7 @@ utoa: {
// [141] utoa_append::value#0 = utoa::value#2
// [142] utoa_append::sub#0 = utoa::digit_value#0
// [143] call utoa_append
- // [155] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near
+ // [155] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append]
utoa_append_from___b5:
jsr utoa_append
// [144] utoa_append::return#0 = utoa_append::value#2
@@ -4686,7 +4686,7 @@ printf_number_buffer: {
sta.z printf_str.putc
lda #>printf_sint.putc
sta.z printf_str.putc+1
- // [99] phi printf_str::s#4 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near
+ // [99] phi printf_str::s#4 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- pbuz1=pbuc1
lda #buffer_digits
@@ -5199,12 +5199,12 @@ __start: {
lda #>COLORRAM
sta.z conio_line_color+1
// #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll)
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [7] call main
- // [27] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [27] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [8] return
@@ -5233,7 +5233,7 @@ conio_c64_init: {
__b1:
// gotoxy(0, line)
// [13] gotoxy::y#2 = conio_c64_init::line#2
- // [14] call gotoxy -- call_phi_near
+ // [14] call gotoxy
jsr gotoxy
// conio_c64_init::@return
// }
@@ -5272,7 +5272,7 @@ cputc: {
// [22] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
- // [23] call cputln -- call_phi_near
+ // [23] call cputln
jsr cputln
// cputc::@return
__breturn:
@@ -5283,7 +5283,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
- // [26] call cputln -- call_phi_near
+ // [26] call cputln
jsr cputln
rts
}
@@ -5292,7 +5292,7 @@ main: {
.label signed_char_value = $17
// clrscr()
// [28] call clrscr
- // [55] phi from main to clrscr [phi:main->clrscr] -- call_phi_near
+ // [55] phi from main to clrscr [phi:main->clrscr]
jsr clrscr
// [29] phi from main to main::@1 [phi:main->main::@1]
// [29] phi main::signed_char_value#2 = -5 [phi:main->main::@1#0] -- vbsz1=vbsc1
@@ -5323,7 +5323,7 @@ main: {
lda #$ff
!:
sta.z test_casting.signed_short_value+1
- // [34] call test_casting -- call_phi_near
+ // [34] call test_casting
jsr test_casting
// [29] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
// [29] phi main::signed_char_value#2 = main::signed_char_value#1 [phi:main::@2->main::@1#0] -- register_copy
@@ -5455,7 +5455,7 @@ cputln: {
// [52] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
- // [53] call cscroll -- call_phi_near
+ // [53] call cscroll
jsr cscroll
// cputln::@return
// }
@@ -5570,7 +5570,7 @@ test_casting: {
.label signed_short_value = 4
// printf("%d\n", signed_short_value)
// [71] printf_sint::value#1 = test_casting::signed_short_value#0
- // [72] call printf_sint -- call_phi_near
+ // [72] call printf_sint
jsr printf_sint
// [73] phi from test_casting to test_casting::@1 [phi:test_casting->test_casting::@1]
// test_casting::@1
@@ -5582,7 +5582,7 @@ test_casting: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [99] phi printf_str::s#4 = test_casting::s [phi:test_casting::@1->printf_str#1] -- call_phi_near
+ // [99] phi printf_str::s#4 = test_casting::s [phi:test_casting::@1->printf_str#1] -- pbuz1=pbuc1
lda #s
@@ -5615,7 +5615,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [108] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [108] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -5631,7 +5631,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [108] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [108] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -5644,7 +5644,7 @@ cscroll: {
// [118] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
// [118] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [118] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [118] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -5657,7 +5657,7 @@ cscroll: {
// [118] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [118] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [118] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [118] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -5729,7 +5729,7 @@ printf_sint: {
// utoa(uvalue, printf_buffer.digits, format.radix)
// [94] utoa::value#1 = (unsigned int)printf_sint::value#4
// [95] call utoa
- // [126] phi from printf_sint::@2 to utoa [phi:printf_sint::@2->utoa] -- call_phi_near
+ // [126] phi from printf_sint::@2 to utoa [phi:printf_sint::@2->utoa]
jsr utoa
// printf_sint::@3
// printf_number_buffer(putc, printf_buffer, format)
@@ -5737,7 +5737,7 @@ printf_sint: {
lda printf_buffer
// [97] call printf_number_buffer
// Print using format
- // [147] phi from printf_sint::@3 to printf_number_buffer [phi:printf_sint::@3->printf_number_buffer] -- call_phi_near
+ // [147] phi from printf_sint::@3 to printf_number_buffer [phi:printf_sint::@3->printf_number_buffer]
jsr printf_number_buffer
// printf_sint::@return
// }
@@ -5993,7 +5993,7 @@ utoa: {
// [141] utoa_append::value#0 = utoa::value#2
// [142] utoa_append::sub#0 = utoa::digit_value#0
// [143] call utoa_append
- // [155] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near
+ // [155] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append]
jsr utoa_append
// utoa_append(buffer++, value, digit_value)
// [144] utoa_append::return#0 = utoa_append::value#2
@@ -6043,7 +6043,7 @@ printf_number_buffer: {
sta.z printf_str.putc
lda #>printf_sint.putc
sta.z printf_str.putc+1
- // [99] phi printf_str::s#4 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near
+ // [99] phi printf_str::s#4 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- pbuz1=pbuc1
lda #buffer_digits
diff --git a/src/test/ref/casting.log b/src/test/ref/casting.log
index 0e79411dd..83d5fabb2 100644
--- a/src/test/ref/casting.log
+++ b/src/test/ref/casting.log
@@ -413,7 +413,7 @@ main: {
// main::@2
__b2:
// [9] call w
- // [11] phi from main::@2 to w [phi:main::@2->w] -- call_phi_near
+ // [11] phi from main::@2 to w [phi:main::@2->w]
w_from___b2:
jsr w
jmp __breturn
@@ -577,7 +577,7 @@ main: {
// main::@2
// w()
// [9] call w
- // [11] phi from main::@2 to w [phi:main::@2->w] -- call_phi_near
+ // [11] phi from main::@2 to w [phi:main::@2->w]
jsr w
// main::@return
// }
diff --git a/src/test/ref/cbm-keyboard.log b/src/test/ref/cbm-keyboard.log
index 07b7d51e5..0ffec3780 100644
--- a/src/test/ref/cbm-keyboard.log
+++ b/src/test/ref/cbm-keyboard.log
@@ -4473,7 +4473,7 @@ __start: {
sta.z conio_line_color
lda #>COLORRAM
sta.z conio_line_color+1
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
@@ -4481,7 +4481,7 @@ __start: {
// __start::@1
__b1:
// [7] call main
- // [27] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [27] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -4517,7 +4517,7 @@ conio_c64_init: {
// conio_c64_init::@1
__b1:
// [13] gotoxy::y#2 = conio_c64_init::line#2
- // [14] call gotoxy -- call_phi_near
+ // [14] call gotoxy
jsr gotoxy
jmp __breturn
// conio_c64_init::@return
@@ -4558,7 +4558,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
- // [23] call cputln -- call_phi_near
+ // [23] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@@ -4570,7 +4570,7 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
- // [26] call cputln -- call_phi_near
+ // [26] call cputln
jsr cputln
jmp __breturn
}
@@ -4593,7 +4593,7 @@ main: {
lda #toD0181_return
sta VICII+OFFSET_STRUCT_MOS6569_VICII_MEMORY
// [30] call clrscr
- // [71] phi from main::@3 to clrscr [phi:main::@3->clrscr] -- call_phi_near
+ // [71] phi from main::@3 to clrscr [phi:main::@3->clrscr]
clrscr_from___b3:
jsr clrscr
// [31] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
@@ -4609,7 +4609,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [32] call GETIN -- call_phi_near
+ // [32] call GETIN
jsr GETIN
// [33] GETIN::return#0 = GETIN::return#1
jmp __b4
@@ -4634,7 +4634,7 @@ main: {
__b2:
// [37] petscii_to_screencode::petscii#0 = main::ch#0 -- vbuaa=vbuz1
lda.z ch
- // [38] call petscii_to_screencode -- call_phi_near
+ // [38] call petscii_to_screencode
jsr petscii_to_screencode
// [39] petscii_to_screencode::return#0 = petscii_to_screencode::return#10
jmp __b5
@@ -4650,7 +4650,7 @@ main: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = main::s [phi:main::@5->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = main::s [phi:main::@5->printf_str#1] -- pbuz1=pbuc1
lda #s
@@ -4674,7 +4674,7 @@ main: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = main::s1 [phi:main::@6->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = main::s1 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1
lda #s1
@@ -4686,7 +4686,7 @@ main: {
// [46] printf_uchar::uvalue#0 = main::ch#0 -- vbuxx=vbuz1
ldx.z ch
// [47] call printf_uchar
- // [112] phi from main::@7 to printf_uchar [phi:main::@7->printf_uchar] -- call_phi_near
+ // [112] phi from main::@7 to printf_uchar [phi:main::@7->printf_uchar]
printf_uchar_from___b7:
jsr printf_uchar
// [48] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
@@ -4702,7 +4702,7 @@ main: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = main::s2 [phi:main::@8->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = main::s2 [phi:main::@8->printf_str#1] -- pbuz1=pbuc1
lda #s2
@@ -4847,7 +4847,7 @@ cputln: {
sta.z conio_cursor_x
// [68] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
- // [69] call cscroll -- call_phi_near
+ // [69] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@@ -5115,7 +5115,7 @@ printf_uchar: {
// [114] uctoa::value#1 = printf_uchar::uvalue#0
// [115] call uctoa
// Format number into buffer
- // [132] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] -- call_phi_near
+ // [132] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa]
uctoa_from___b1:
jsr uctoa
jmp __b2
@@ -5126,7 +5126,7 @@ printf_uchar: {
sta.z printf_number_buffer.buffer_sign
// [117] call printf_number_buffer
// Print using format
- // [151] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] -- call_phi_near
+ // [151] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer]
printf_number_buffer_from___b2:
jsr printf_number_buffer
jmp __breturn
@@ -5155,7 +5155,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [174] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [174] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -5174,7 +5174,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [174] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [174] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -5190,7 +5190,7 @@ cscroll: {
memset_from___b3:
// [184] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [184] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [184] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -5206,7 +5206,7 @@ cscroll: {
memset_from___b4:
// [184] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [184] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [184] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -5332,7 +5332,7 @@ uctoa: {
// [145] uctoa_append::value#0 = uctoa::value#2
// [146] uctoa_append::sub#0 = uctoa::digit_value#0
// [147] call uctoa_append
- // [192] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near
+ // [192] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append]
uctoa_append_from___b5:
jsr uctoa_append
// [148] uctoa_append::return#0 = uctoa_append::value#2
@@ -5368,7 +5368,7 @@ printf_number_buffer: {
// printf_number_buffer::@4
__b4:
// [153] call strlen
- // [199] phi from printf_number_buffer::@4 to strlen [phi:printf_number_buffer::@4->strlen] -- call_phi_near
+ // [199] phi from printf_number_buffer::@4 to strlen [phi:printf_number_buffer::@4->strlen]
strlen_from___b4:
jsr strlen
// [154] strlen::return#2 = strlen::len#2
@@ -5430,7 +5430,7 @@ printf_number_buffer: {
// [165] printf_padding::length#0 = (char)printf_number_buffer::padding#10 -- vbuz1=vbuaa
sta.z printf_padding.length
// [166] call printf_padding
- // [205] phi from printf_number_buffer::@6 to printf_padding [phi:printf_number_buffer::@6->printf_padding] -- call_phi_near
+ // [205] phi from printf_number_buffer::@6 to printf_padding [phi:printf_number_buffer::@6->printf_padding]
printf_padding_from___b6:
jsr printf_padding
jmp __b2
@@ -5463,7 +5463,7 @@ printf_number_buffer: {
sta.z printf_str.putc
lda #>printf_uchar.putc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@3->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@3->printf_str#1] -- pbuz1=pbuc1
lda #buffer_digits
@@ -6310,12 +6310,12 @@ __start: {
lda #>COLORRAM
sta.z conio_line_color+1
// #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll)
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [7] call main
- // [27] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [27] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [8] return
@@ -6344,7 +6344,7 @@ conio_c64_init: {
__b1:
// gotoxy(0, line)
// [13] gotoxy::y#2 = conio_c64_init::line#2
- // [14] call gotoxy -- call_phi_near
+ // [14] call gotoxy
jsr gotoxy
// conio_c64_init::@return
// }
@@ -6383,7 +6383,7 @@ cputc: {
// [22] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
- // [23] call cputln -- call_phi_near
+ // [23] call cputln
jsr cputln
// cputc::@return
__breturn:
@@ -6394,7 +6394,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
- // [26] call cputln -- call_phi_near
+ // [26] call cputln
jsr cputln
rts
}
@@ -6414,7 +6414,7 @@ main: {
sta VICII+OFFSET_STRUCT_MOS6569_VICII_MEMORY
// clrscr()
// [30] call clrscr
- // [71] phi from main::@3 to clrscr [phi:main::@3->clrscr] -- call_phi_near
+ // [71] phi from main::@3 to clrscr [phi:main::@3->clrscr]
jsr clrscr
// [31] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
// [31] phi main::current#2 = 0 [phi:main::@3->main::@1#0] -- vbuz1=vbuc1
@@ -6425,7 +6425,7 @@ main: {
// main::@1
__b1:
// char ch = GETIN()
- // [32] call GETIN -- call_phi_near
+ // [32] call GETIN
jsr GETIN
// [33] GETIN::return#0 = GETIN::return#1
// main::@4
@@ -6445,7 +6445,7 @@ main: {
// petscii_to_screencode(ch)
// [37] petscii_to_screencode::petscii#0 = main::ch#0 -- vbuaa=vbuz1
lda.z ch
- // [38] call petscii_to_screencode -- call_phi_near
+ // [38] call petscii_to_screencode
jsr petscii_to_screencode
// [39] petscii_to_screencode::return#0 = petscii_to_screencode::return#10
// main::@5
@@ -6459,7 +6459,7 @@ main: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = main::s [phi:main::@5->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = main::s [phi:main::@5->printf_str#1] -- pbuz1=pbuc1
lda #s
@@ -6481,7 +6481,7 @@ main: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = main::s1 [phi:main::@6->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = main::s1 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1
lda #s1
@@ -6492,7 +6492,7 @@ main: {
// [46] printf_uchar::uvalue#0 = main::ch#0 -- vbuxx=vbuz1
ldx.z ch
// [47] call printf_uchar
- // [112] phi from main::@7 to printf_uchar [phi:main::@7->printf_uchar] -- call_phi_near
+ // [112] phi from main::@7 to printf_uchar [phi:main::@7->printf_uchar]
jsr printf_uchar
// [48] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
// main::@8
@@ -6504,7 +6504,7 @@ main: {
sta.z printf_str.putc
lda #>cputc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = main::s2 [phi:main::@8->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = main::s2 [phi:main::@8->printf_str#1] -- pbuz1=pbuc1
lda #s2
@@ -6650,7 +6650,7 @@ cputln: {
// [68] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
- // [69] call cscroll -- call_phi_near
+ // [69] call cscroll
jsr cscroll
// cputln::@return
// }
@@ -6910,7 +6910,7 @@ printf_uchar: {
// [114] uctoa::value#1 = printf_uchar::uvalue#0
// [115] call uctoa
// Format number into buffer
- // [132] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] -- call_phi_near
+ // [132] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa]
jsr uctoa
// printf_uchar::@2
// printf_number_buffer(putc, printf_buffer, format)
@@ -6919,7 +6919,7 @@ printf_uchar: {
sta.z printf_number_buffer.buffer_sign
// [117] call printf_number_buffer
// Print using format
- // [151] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] -- call_phi_near
+ // [151] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer]
jsr printf_number_buffer
// printf_uchar::@return
// }
@@ -6944,7 +6944,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [174] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [174] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -6960,7 +6960,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [174] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [174] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -6973,7 +6973,7 @@ cscroll: {
// [184] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
// [184] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [184] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [184] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -6986,7 +6986,7 @@ cscroll: {
// [184] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [184] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [184] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [184] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -7110,7 +7110,7 @@ uctoa: {
// [145] uctoa_append::value#0 = uctoa::value#2
// [146] uctoa_append::sub#0 = uctoa::digit_value#0
// [147] call uctoa_append
- // [192] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near
+ // [192] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append]
jsr uctoa_append
// uctoa_append(buffer++, value, digit_value)
// [148] uctoa_append::return#0 = uctoa_append::value#2
@@ -7143,7 +7143,7 @@ printf_number_buffer: {
// printf_number_buffer::@4
// strlen(buffer.digits)
// [153] call strlen
- // [199] phi from printf_number_buffer::@4 to strlen [phi:printf_number_buffer::@4->strlen] -- call_phi_near
+ // [199] phi from printf_number_buffer::@4 to strlen [phi:printf_number_buffer::@4->strlen]
jsr strlen
// strlen(buffer.digits)
// [154] strlen::return#2 = strlen::len#2
@@ -7196,7 +7196,7 @@ printf_number_buffer: {
// [165] printf_padding::length#0 = (char)printf_number_buffer::padding#10 -- vbuz1=vbuaa
sta.z printf_padding.length
// [166] call printf_padding
- // [205] phi from printf_number_buffer::@6 to printf_padding [phi:printf_number_buffer::@6->printf_padding] -- call_phi_near
+ // [205] phi from printf_number_buffer::@6 to printf_padding [phi:printf_number_buffer::@6->printf_padding]
jsr printf_padding
// printf_number_buffer::@2
__b2:
@@ -7223,7 +7223,7 @@ printf_number_buffer: {
sta.z printf_str.putc
lda #>printf_uchar.putc
sta.z printf_str.putc+1
- // [103] phi printf_str::s#6 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@3->printf_str#1] -- call_phi_near
+ // [103] phi printf_str::s#6 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@3->printf_str#1] -- pbuz1=pbuc1
lda #buffer_digits
diff --git a/src/test/ref/cia-timer-cyclecount.log b/src/test/ref/cia-timer-cyclecount.log
index 825e359ca..d0f1acec5 100644
--- a/src/test/ref/cia-timer-cyclecount.log
+++ b/src/test/ref/cia-timer-cyclecount.log
@@ -694,7 +694,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [2] call clock_start -- call_phi_near
+ // [2] call clock_start
// Reset & start the CIA#2 timer A+B
jsr clock_start
jmp __b2
@@ -702,7 +702,7 @@ main: {
__b2:
// asm { nop }
nop
- // [4] call clock -- call_phi_near
+ // [4] call clock
jsr clock
// [5] clock::return#2 = clock::return#0
jmp __b3
@@ -725,7 +725,7 @@ main: {
sbc #>CLOCKS_PER_INIT>>$10
sta.z cyclecount+3
// [8] print_ulong_at::dw#0 = main::cyclecount#0
- // [9] call print_ulong_at -- call_phi_near
+ // [9] call print_ulong_at
// Print cycle count
jsr print_ulong_at
jmp __b1_from___b3
@@ -813,7 +813,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN
sta.z print_uint_at.at+1
- // [25] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- call_phi_near
+ // [25] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- register_copy
jsr print_uint_at
jmp __b1
// print_ulong_at::@1
@@ -831,7 +831,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN+4
sta.z print_uint_at.at+1
- // [25] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- call_phi_near
+ // [25] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- register_copy
jsr print_uint_at
jmp __breturn
// print_ulong_at::@return
@@ -853,7 +853,7 @@ print_uint_at: {
// [33] phi from print_uint_at to print_uchar_at [phi:print_uint_at->print_uchar_at]
print_uchar_at_from_print_uint_at:
// [33] phi print_uchar_at::at#2 = print_uchar_at::at#0 [phi:print_uint_at->print_uchar_at#0] -- register_copy
- // [33] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- call_phi_near
+ // [33] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- register_copy
jsr print_uchar_at
jmp __b1
// print_uint_at::@1
@@ -873,7 +873,7 @@ print_uint_at: {
// [33] phi from print_uint_at::@1 to print_uchar_at [phi:print_uint_at::@1->print_uchar_at]
print_uchar_at_from___b1:
// [33] phi print_uchar_at::at#2 = print_uchar_at::at#1 [phi:print_uint_at::@1->print_uchar_at#0] -- register_copy
- // [33] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- call_phi_near
+ // [33] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- register_copy
jsr print_uchar_at
jmp __breturn
// print_uint_at::@return
@@ -906,7 +906,7 @@ print_uchar_at: {
// [43] phi from print_uchar_at to print_char_at [phi:print_uchar_at->print_char_at]
print_char_at_from_print_uchar_at:
// [43] phi print_char_at::at#2 = print_char_at::at#0 [phi:print_uchar_at->print_char_at#0] -- register_copy
- // [43] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- call_phi_near
+ // [43] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- register_copy
jsr print_char_at
jmp __b1
// print_uchar_at::@1
@@ -929,7 +929,7 @@ print_uchar_at: {
// [43] phi from print_uchar_at::@1 to print_char_at [phi:print_uchar_at::@1->print_char_at]
print_char_at_from___b1:
// [43] phi print_char_at::at#2 = print_char_at::at#1 [phi:print_uchar_at::@1->print_char_at#0] -- register_copy
- // [43] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- call_phi_near
+ // [43] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- register_copy
jsr print_char_at
jmp __breturn
// print_uchar_at::@return
@@ -1097,7 +1097,7 @@ main: {
// main::@1
__b1:
// clock_start()
- // [2] call clock_start -- call_phi_near
+ // [2] call clock_start
// Reset & start the CIA#2 timer A+B
jsr clock_start
// main::@2
@@ -1105,7 +1105,7 @@ main: {
// asm { nop }
nop
// clock()
- // [4] call clock -- call_phi_near
+ // [4] call clock
jsr clock
// [5] clock::return#2 = clock::return#0
// main::@3
@@ -1128,7 +1128,7 @@ main: {
sta.z cyclecount+3
// print_ulong_at(cyclecount, SCREEN)
// [8] print_ulong_at::dw#0 = main::cyclecount#0
- // [9] call print_ulong_at -- call_phi_near
+ // [9] call print_ulong_at
// Print cycle count
jsr print_ulong_at
jmp __b1
@@ -1222,7 +1222,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN
sta.z print_uint_at.at+1
- // [25] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- call_phi_near
+ // [25] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- register_copy
jsr print_uint_at
// print_ulong_at::@1
// print_uint_at(WORD0(dw), at+4)
@@ -1238,7 +1238,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN+4
sta.z print_uint_at.at+1
- // [25] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- call_phi_near
+ // [25] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- register_copy
jsr print_uint_at
// print_ulong_at::@return
// }
@@ -1259,7 +1259,7 @@ print_uint_at: {
// [28] call print_uchar_at
// [33] phi from print_uint_at to print_uchar_at [phi:print_uint_at->print_uchar_at]
// [33] phi print_uchar_at::at#2 = print_uchar_at::at#0 [phi:print_uint_at->print_uchar_at#0] -- register_copy
- // [33] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- call_phi_near
+ // [33] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- register_copy
jsr print_uchar_at
// print_uint_at::@1
// print_uchar_at(BYTE0(w), at+2)
@@ -1277,7 +1277,7 @@ print_uint_at: {
// [31] call print_uchar_at
// [33] phi from print_uint_at::@1 to print_uchar_at [phi:print_uint_at::@1->print_uchar_at]
// [33] phi print_uchar_at::at#2 = print_uchar_at::at#1 [phi:print_uint_at::@1->print_uchar_at#0] -- register_copy
- // [33] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- call_phi_near
+ // [33] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- register_copy
jsr print_uchar_at
// print_uint_at::@return
// }
@@ -1310,7 +1310,7 @@ print_uchar_at: {
// Table of hexadecimal digits
// [43] phi from print_uchar_at to print_char_at [phi:print_uchar_at->print_char_at]
// [43] phi print_char_at::at#2 = print_char_at::at#0 [phi:print_uchar_at->print_char_at#0] -- register_copy
- // [43] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- call_phi_near
+ // [43] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- register_copy
jsr print_char_at
// print_uchar_at::@1
// b&$f
@@ -1332,7 +1332,7 @@ print_uchar_at: {
// [41] call print_char_at
// [43] phi from print_uchar_at::@1 to print_char_at [phi:print_uchar_at::@1->print_char_at]
// [43] phi print_char_at::at#2 = print_char_at::at#1 [phi:print_uchar_at::@1->print_char_at#0] -- register_copy
- // [43] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- call_phi_near
+ // [43] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- register_copy
jsr print_char_at
// print_uchar_at::@return
// }
diff --git a/src/test/ref/cia-timer-simple.log b/src/test/ref/cia-timer-simple.log
index cc00daf4c..eff475044 100644
--- a/src/test/ref/cia-timer-simple.log
+++ b/src/test/ref/cia-timer-simple.log
@@ -657,7 +657,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call clock_start -- call_phi_near
+ // [1] call clock_start
// Reset & start the CIA#2 timer A+B
jsr clock_start
// [2] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1]
@@ -666,14 +666,14 @@ main: {
jmp __b1
// main::@1
__b1:
- // [3] call clock -- call_phi_near
+ // [3] call clock
jsr clock
// [4] clock::return#2 = clock::return#0
jmp __b2
// main::@2
__b2:
// [5] print_ulong_at::dw#0 = clock::return#2
- // [6] call print_ulong_at -- call_phi_near
+ // [6] call print_ulong_at
jsr print_ulong_at
jmp __b1_from___b2
}
@@ -760,7 +760,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN
sta.z print_uint_at.at+1
- // [22] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- call_phi_near
+ // [22] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- register_copy
jsr print_uint_at
jmp __b1
// print_ulong_at::@1
@@ -778,7 +778,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN+4
sta.z print_uint_at.at+1
- // [22] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- call_phi_near
+ // [22] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- register_copy
jsr print_uint_at
jmp __breturn
// print_ulong_at::@return
@@ -800,7 +800,7 @@ print_uint_at: {
// [30] phi from print_uint_at to print_uchar_at [phi:print_uint_at->print_uchar_at]
print_uchar_at_from_print_uint_at:
// [30] phi print_uchar_at::at#2 = print_uchar_at::at#0 [phi:print_uint_at->print_uchar_at#0] -- register_copy
- // [30] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- call_phi_near
+ // [30] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- register_copy
jsr print_uchar_at
jmp __b1
// print_uint_at::@1
@@ -820,7 +820,7 @@ print_uint_at: {
// [30] phi from print_uint_at::@1 to print_uchar_at [phi:print_uint_at::@1->print_uchar_at]
print_uchar_at_from___b1:
// [30] phi print_uchar_at::at#2 = print_uchar_at::at#1 [phi:print_uint_at::@1->print_uchar_at#0] -- register_copy
- // [30] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- call_phi_near
+ // [30] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- register_copy
jsr print_uchar_at
jmp __breturn
// print_uint_at::@return
@@ -853,7 +853,7 @@ print_uchar_at: {
// [40] phi from print_uchar_at to print_char_at [phi:print_uchar_at->print_char_at]
print_char_at_from_print_uchar_at:
// [40] phi print_char_at::at#2 = print_char_at::at#0 [phi:print_uchar_at->print_char_at#0] -- register_copy
- // [40] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- call_phi_near
+ // [40] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- register_copy
jsr print_char_at
jmp __b1
// print_uchar_at::@1
@@ -876,7 +876,7 @@ print_uchar_at: {
// [40] phi from print_uchar_at::@1 to print_char_at [phi:print_uchar_at::@1->print_char_at]
print_char_at_from___b1:
// [40] phi print_char_at::at#2 = print_char_at::at#1 [phi:print_uchar_at::@1->print_char_at#0] -- register_copy
- // [40] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- call_phi_near
+ // [40] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- register_copy
jsr print_char_at
jmp __breturn
// print_uchar_at::@return
@@ -1030,20 +1030,20 @@ Score: 467
// main
main: {
// clock_start()
- // [1] call clock_start -- call_phi_near
+ // [1] call clock_start
// Reset & start the CIA#2 timer A+B
jsr clock_start
// [2] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1]
// main::@1
__b1:
// clock()
- // [3] call clock -- call_phi_near
+ // [3] call clock
jsr clock
// [4] clock::return#2 = clock::return#0
// main::@2
// print_ulong_at(clock(), SCREEN)
// [5] print_ulong_at::dw#0 = clock::return#2
- // [6] call print_ulong_at -- call_phi_near
+ // [6] call print_ulong_at
jsr print_ulong_at
jmp __b1
}
@@ -1136,7 +1136,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN
sta.z print_uint_at.at+1
- // [22] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- call_phi_near
+ // [22] phi print_uint_at::w#2 = print_uint_at::w#0 [phi:print_ulong_at->print_uint_at#1] -- register_copy
jsr print_uint_at
// print_ulong_at::@1
// print_uint_at(WORD0(dw), at+4)
@@ -1152,7 +1152,7 @@ print_ulong_at: {
sta.z print_uint_at.at
lda #>SCREEN+4
sta.z print_uint_at.at+1
- // [22] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- call_phi_near
+ // [22] phi print_uint_at::w#2 = print_uint_at::w#1 [phi:print_ulong_at::@1->print_uint_at#1] -- register_copy
jsr print_uint_at
// print_ulong_at::@return
// }
@@ -1173,7 +1173,7 @@ print_uint_at: {
// [25] call print_uchar_at
// [30] phi from print_uint_at to print_uchar_at [phi:print_uint_at->print_uchar_at]
// [30] phi print_uchar_at::at#2 = print_uchar_at::at#0 [phi:print_uint_at->print_uchar_at#0] -- register_copy
- // [30] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- call_phi_near
+ // [30] phi print_uchar_at::b#2 = print_uchar_at::b#0 [phi:print_uint_at->print_uchar_at#1] -- register_copy
jsr print_uchar_at
// print_uint_at::@1
// print_uchar_at(BYTE0(w), at+2)
@@ -1191,7 +1191,7 @@ print_uint_at: {
// [28] call print_uchar_at
// [30] phi from print_uint_at::@1 to print_uchar_at [phi:print_uint_at::@1->print_uchar_at]
// [30] phi print_uchar_at::at#2 = print_uchar_at::at#1 [phi:print_uint_at::@1->print_uchar_at#0] -- register_copy
- // [30] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- call_phi_near
+ // [30] phi print_uchar_at::b#2 = print_uchar_at::b#1 [phi:print_uint_at::@1->print_uchar_at#1] -- register_copy
jsr print_uchar_at
// print_uint_at::@return
// }
@@ -1224,7 +1224,7 @@ print_uchar_at: {
// Table of hexadecimal digits
// [40] phi from print_uchar_at to print_char_at [phi:print_uchar_at->print_char_at]
// [40] phi print_char_at::at#2 = print_char_at::at#0 [phi:print_uchar_at->print_char_at#0] -- register_copy
- // [40] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- call_phi_near
+ // [40] phi print_char_at::ch#2 = print_char_at::ch#0 [phi:print_uchar_at->print_char_at#1] -- register_copy
jsr print_char_at
// print_uchar_at::@1
// b&$f
@@ -1246,7 +1246,7 @@ print_uchar_at: {
// [38] call print_char_at
// [40] phi from print_uchar_at::@1 to print_char_at [phi:print_uchar_at::@1->print_char_at]
// [40] phi print_char_at::at#2 = print_char_at::at#1 [phi:print_uchar_at::@1->print_char_at#0] -- register_copy
- // [40] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- call_phi_near
+ // [40] phi print_char_at::ch#2 = print_char_at::ch#1 [phi:print_uchar_at::@1->print_char_at#1] -- register_copy
jsr print_char_at
// print_uchar_at::@return
// }
diff --git a/src/test/ref/clobber-a-problem.log b/src/test/ref/clobber-a-problem.log
index d30d271a5..e5d4baccd 100644
--- a/src/test/ref/clobber-a-problem.log
+++ b/src/test/ref/clobber-a-problem.log
@@ -236,7 +236,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -383,7 +383,7 @@ __start: {
sta.z irq_raster_next
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/complex/includes/includes-1.log b/src/test/ref/complex/includes/includes-1.log
index e9853d55d..f9b16c089 100644
--- a/src/test/ref/complex/includes/includes-1.log
+++ b/src/test/ref/complex/includes/includes-1.log
@@ -235,7 +235,7 @@ ASSEMBLER BEFORE OPTIMIZATION
main: {
.label __0 = 4
// [1] call strlen
- // [6] phi from main to strlen [phi:main->strlen] -- call_phi_near
+ // [6] phi from main to strlen [phi:main->strlen]
strlen_from_main:
jsr strlen
// [2] strlen::return#2 = strlen::len#2
@@ -364,7 +364,7 @@ main: {
.label __0 = 4
// strlen(STR)
// [1] call strlen
- // [6] phi from main to strlen [phi:main->strlen] -- call_phi_near
+ // [6] phi from main to strlen [phi:main->strlen]
jsr strlen
// strlen(STR)
// [2] strlen::return#2 = strlen::len#2
diff --git a/src/test/ref/complex/includes/includes-2.log b/src/test/ref/complex/includes/includes-2.log
index 51cbad9f1..ba9264981 100644
--- a/src/test/ref/complex/includes/includes-2.log
+++ b/src/test/ref/complex/includes/includes-2.log
@@ -164,7 +164,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call strlen
- // [4] phi from main to strlen [phi:main->strlen] -- call_phi_near
+ // [4] phi from main to strlen [phi:main->strlen]
strlen_from_main:
jsr strlen
jmp __b1
@@ -234,7 +234,7 @@ Score: 24
main: {
// strlen(STR)
// [1] call strlen
- // [4] phi from main to strlen [phi:main->strlen] -- call_phi_near
+ // [4] phi from main to strlen [phi:main->strlen]
jsr strlen
// main::@1
// SCREEN [0] = (char) strlen(STR)
diff --git a/src/test/ref/complex/xmega65/xmega65.log b/src/test/ref/complex/xmega65/xmega65.log
index 82f78053f..0610788ff 100644
--- a/src/test/ref/complex/xmega65/xmega65.log
+++ b/src/test/ref/complex/xmega65/xmega65.log
@@ -569,7 +569,7 @@ main: {
memset_from_main:
// [17] phi memset::c#4 = ' ' [phi:main->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [17] phi memset::str#3 = (void *)SCREEN [phi:main->memset#1] -- call_phi_near
+ // [17] phi memset::str#3 = (void *)SCREEN [phi:main->memset#1] -- pvoz1=pvoc1
lda #SCREEN
@@ -585,7 +585,7 @@ main: {
memset_from___b6:
// [17] phi memset::c#4 = WHITE [phi:main::@6->memset#0] -- vbuxx=vbuc1
ldx #WHITE
- // [17] phi memset::str#3 = (void *)COLS [phi:main::@6->memset#1] -- call_phi_near
+ // [17] phi memset::str#3 = (void *)COLS [phi:main::@6->memset#1] -- pvoz1=pvoc1
lda #COLS
@@ -866,7 +866,7 @@ main: {
// [17] phi from main to memset [phi:main->memset]
// [17] phi memset::c#4 = ' ' [phi:main->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [17] phi memset::str#3 = (void *)SCREEN [phi:main->memset#1] -- call_phi_near
+ // [17] phi memset::str#3 = (void *)SCREEN [phi:main->memset#1] -- pvoz1=pvoc1
lda #SCREEN
@@ -879,7 +879,7 @@ main: {
// [17] phi from main::@6 to memset [phi:main::@6->memset]
// [17] phi memset::c#4 = WHITE [phi:main::@6->memset#0] -- vbuxx=vbuc1
ldx #WHITE
- // [17] phi memset::str#3 = (void *)COLS [phi:main::@6->memset#1] -- call_phi_near
+ // [17] phi memset::str#3 = (void *)COLS [phi:main::@6->memset#1] -- pvoz1=pvoc1
lda #COLS
diff --git a/src/test/ref/const-bool-return-problem.log b/src/test/ref/const-bool-return-problem.log
index 8825ee589..0c1be65c9 100644
--- a/src/test/ref/const-bool-return-problem.log
+++ b/src/test/ref/const-bool-return-problem.log
@@ -420,7 +420,7 @@ main: {
__b3:
// [7] OBJ_is_solid::oy#0 = main::oy#2 -- vbuaa=vbuz1
lda.z oy
- // [8] call OBJ_is_solid -- call_phi_near
+ // [8] call OBJ_is_solid
jsr OBJ_is_solid
// [9] OBJ_is_solid::return#0 = OBJ_is_solid::return#3
jmp __b7
@@ -467,7 +467,7 @@ OBJ_is_solid: {
// OBJ_is_solid::@1
__b1:
// [16] call tile_flag_at
- // [19] phi from OBJ_is_solid::@1 to tile_flag_at [phi:OBJ_is_solid::@1->tile_flag_at] -- call_phi_near
+ // [19] phi from OBJ_is_solid::@1 to tile_flag_at [phi:OBJ_is_solid::@1->tile_flag_at]
tile_flag_at_from___b1:
jsr tile_flag_at
// [17] phi from OBJ_is_solid::@1 to OBJ_is_solid::@return [phi:OBJ_is_solid::@1->OBJ_is_solid::@return]
@@ -612,7 +612,7 @@ main: {
// OBJ_is_solid(ox,oy)
// [7] OBJ_is_solid::oy#0 = main::oy#2 -- vbuaa=vbuz1
lda.z oy
- // [8] call OBJ_is_solid -- call_phi_near
+ // [8] call OBJ_is_solid
jsr OBJ_is_solid
// [9] OBJ_is_solid::return#0 = OBJ_is_solid::return#3
// main::@7
@@ -657,7 +657,7 @@ OBJ_is_solid: {
__b1:
// tile_flag_at()
// [16] call tile_flag_at
- // [19] phi from OBJ_is_solid::@1 to tile_flag_at [phi:OBJ_is_solid::@1->tile_flag_at] -- call_phi_near
+ // [19] phi from OBJ_is_solid::@1 to tile_flag_at [phi:OBJ_is_solid::@1->tile_flag_at]
jsr tile_flag_at
// [17] phi from OBJ_is_solid::@1 to OBJ_is_solid::@return [phi:OBJ_is_solid::@1->OBJ_is_solid::@return]
// [17] phi OBJ_is_solid::return#3 = tile_flag_at::return#1 [phi:OBJ_is_solid::@1->OBJ_is_solid::@return#0] -- vboaa=vboc1
diff --git a/src/test/ref/const-early-identification.log b/src/test/ref/const-early-identification.log
index 3a12e4591..267852183 100644
--- a/src/test/ref/const-early-identification.log
+++ b/src/test/ref/const-early-identification.log
@@ -206,7 +206,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -227,7 +227,7 @@ main: {
// [7] *(SCREEN+2) = *main::addrA -- _deref_pbuc1=_deref_pbuc2
lda.z addrA
sta SCREEN+2
- // [8] call sub -- call_phi_near
+ // [8] call sub
jsr sub
jmp __breturn
// main::@return
@@ -315,7 +315,7 @@ __start: {
sta.z A
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
@@ -338,7 +338,7 @@ main: {
lda.z addrA
sta SCREEN+2
// sub()
- // [8] call sub -- call_phi_near
+ // [8] call sub
jsr sub
// main::@return
// }
diff --git a/src/test/ref/const-identification.log b/src/test/ref/const-identification.log
index bcf87ce92..c27bca22e 100644
--- a/src/test/ref/const-identification.log
+++ b/src/test/ref/const-identification.log
@@ -377,7 +377,7 @@ main: {
// main::@2
__b2:
// [7] call line
- // [8] phi from main::@2 to line [phi:main::@2->line] -- call_phi_near
+ // [8] phi from main::@2 to line [phi:main::@2->line]
line_from___b2:
jsr line
jmp __b2_from___b2
@@ -405,7 +405,7 @@ line: {
// line::@2
__b2:
// [12] plot::x#1 = line::x#2
- // [13] call plot -- call_phi_near
+ // [13] call plot
jsr plot
jmp __b3
// line::@3
@@ -535,7 +535,7 @@ main: {
__b2:
// line(0, 10)
// [7] call line
- // [8] phi from main::@2 to line [phi:main::@2->line] -- call_phi_near
+ // [8] phi from main::@2 to line [phi:main::@2->line]
jsr line
jmp __b2
}
@@ -561,7 +561,7 @@ line: {
__b2:
// plot(x)
// [12] plot::x#1 = line::x#2
- // [13] call plot -- call_phi_near
+ // [13] call plot
jsr plot
// line::@3
// for(byte x = x0; x<=x1; x++)
diff --git a/src/test/ref/const-param.log b/src/test/ref/const-param.log
index f950c9ac6..d169c1ccf 100644
--- a/src/test/ref/const-param.log
+++ b/src/test/ref/const-param.log
@@ -269,7 +269,7 @@ main: {
// [1] call sum
// [14] phi from main to sum [phi:main->sum]
sum_from_main:
- // [14] phi sum::b#3 = 'c' [phi:main->sum#0] -- call_phi_near
+ // [14] phi sum::b#3 = 'c' [phi:main->sum#0] -- vbuaa=vbuc1
lda #'c'
jsr sum
// [2] sum::return#0 = sum::return#3
@@ -282,7 +282,7 @@ main: {
// [5] call sum
// [14] phi from main::@1 to sum [phi:main::@1->sum]
sum_from___b1:
- // [14] phi sum::b#3 = 'm' [phi:main::@1->sum#0] -- call_phi_near
+ // [14] phi sum::b#3 = 'm' [phi:main::@1->sum#0] -- vbuaa=vbuc1
lda #'m'
jsr sum
// [6] sum::return#1 = sum::return#3
@@ -295,7 +295,7 @@ main: {
// [9] call sum
// [14] phi from main::@2 to sum [phi:main::@2->sum]
sum_from___b2:
- // [14] phi sum::b#3 = 'l' [phi:main::@2->sum#0] -- call_phi_near
+ // [14] phi sum::b#3 = 'l' [phi:main::@2->sum#0] -- vbuaa=vbuc1
lda #'l'
jsr sum
// [10] sum::return#2 = sum::return#3
@@ -392,7 +392,7 @@ main: {
// sum(reverse, 'c')
// [1] call sum
// [14] phi from main to sum [phi:main->sum]
- // [14] phi sum::b#3 = 'c' [phi:main->sum#0] -- call_phi_near
+ // [14] phi sum::b#3 = 'c' [phi:main->sum#0] -- vbuaa=vbuc1
lda #'c'
jsr sum
// sum(reverse, 'c')
@@ -405,7 +405,7 @@ main: {
// sum(reverse, 'm')
// [5] call sum
// [14] phi from main::@1 to sum [phi:main::@1->sum]
- // [14] phi sum::b#3 = 'm' [phi:main::@1->sum#0] -- call_phi_near
+ // [14] phi sum::b#3 = 'm' [phi:main::@1->sum#0] -- vbuaa=vbuc1
lda #'m'
jsr sum
// sum(reverse, 'm')
@@ -418,7 +418,7 @@ main: {
// sum(reverse, 'l')
// [9] call sum
// [14] phi from main::@2 to sum [phi:main::@2->sum]
- // [14] phi sum::b#3 = 'l' [phi:main::@2->sum#0] -- call_phi_near
+ // [14] phi sum::b#3 = 'l' [phi:main::@2->sum#0] -- vbuaa=vbuc1
lda #'l'
jsr sum
// sum(reverse, 'l')
diff --git a/src/test/ref/const-volatile-problem.log b/src/test/ref/const-volatile-problem.log
index d40481e85..19557408a 100644
--- a/src/test/ref/const-volatile-problem.log
+++ b/src/test/ref/const-volatile-problem.log
@@ -204,7 +204,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -313,7 +313,7 @@ __start: {
sta.z idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log
index d5b216b61..b1c1bb33f 100644
--- a/src/test/ref/constants.log
+++ b/src/test/ref/constants.log
@@ -1647,7 +1647,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call print_cls
- // [7] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [7] phi from main to print_cls [phi:main->print_cls]
print_cls_from_main:
jsr print_cls
jmp __b1
@@ -1657,7 +1657,7 @@ main: {
lda #GREEN
sta BG_COLOR
// [3] call test_bytes
- // [10] phi from main::@1 to test_bytes [phi:main::@1->test_bytes] -- call_phi_near
+ // [10] phi from main::@1 to test_bytes [phi:main::@1->test_bytes]
test_bytes_from___b1:
jsr test_bytes
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -1666,7 +1666,7 @@ main: {
// main::@2
__b2:
// [5] call test_sbytes
- // [17] phi from main::@2 to test_sbytes [phi:main::@2->test_sbytes] -- call_phi_near
+ // [17] phi from main::@2 to test_sbytes [phi:main::@2->test_sbytes]
test_sbytes_from___b2:
jsr test_sbytes
jmp __breturn
@@ -1679,7 +1679,7 @@ main: {
// Clear the screen. Also resets current line/char cursor.
print_cls: {
// [8] call memset
- // [28] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [28] phi from print_cls to memset [phi:print_cls->memset]
memset_from_print_cls:
jsr memset
jmp __breturn
@@ -1712,7 +1712,7 @@ test_bytes: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [34] phi assert_byte::msg#3 = msg [phi:test_bytes->assert_byte#4] -- call_phi_near
+ // [34] phi assert_byte::msg#3 = msg [phi:test_bytes->assert_byte#4] -- pbuz1=pbuc1
lda #msg
@@ -1736,7 +1736,7 @@ test_bytes: {
// [34] phi assert_byte::b#3 = test_bytes::bc#0 [phi:test_bytes::@1->assert_byte#2] -- vbuxx=vbuc1
ldx #bc
// [34] phi print_char_cursor#77 = print_char_cursor#98 [phi:test_bytes::@1->assert_byte#3] -- register_copy
- // [34] phi assert_byte::msg#3 = msg1 [phi:test_bytes::@1->assert_byte#4] -- call_phi_near
+ // [34] phi assert_byte::msg#3 = msg1 [phi:test_bytes::@1->assert_byte#4] -- pbuz1=pbuc1
lda #msg1
@@ -1760,7 +1760,7 @@ test_bytes: {
// [34] phi assert_byte::b#3 = test_bytes::bd#0 [phi:test_bytes::@2->assert_byte#2] -- vbuxx=vbuc1
ldx #bd
// [34] phi print_char_cursor#77 = print_char_cursor#99 [phi:test_bytes::@2->assert_byte#3] -- register_copy
- // [34] phi assert_byte::msg#3 = test_bytes::msg2 [phi:test_bytes::@2->assert_byte#4] -- call_phi_near
+ // [34] phi assert_byte::msg#3 = test_bytes::msg2 [phi:test_bytes::@2->assert_byte#4] -- pbuz1=pbuc1
lda #msg2
@@ -1792,7 +1792,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bb [phi:test_sbytes->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bb
- // [47] phi assert_sbyte::msg#5 = msg [phi:test_sbytes->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = msg [phi:test_sbytes->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg
@@ -1811,7 +1811,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bc#0 [phi:test_sbytes::@1->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bc
- // [47] phi assert_sbyte::msg#5 = msg1 [phi:test_sbytes::@1->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = msg1 [phi:test_sbytes::@1->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg1
@@ -1830,7 +1830,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bd#0 [phi:test_sbytes::@2->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bd
- // [47] phi assert_sbyte::msg#5 = test_sbytes::msg2 [phi:test_sbytes::@2->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = test_sbytes::msg2 [phi:test_sbytes::@2->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg2
@@ -1849,7 +1849,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::be#0 [phi:test_sbytes::@3->assert_sbyte#1] -- vbsxx=vbsc1
ldx #be
- // [47] phi assert_sbyte::msg#5 = test_sbytes::msg3 [phi:test_sbytes::@3->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = test_sbytes::msg3 [phi:test_sbytes::@3->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg3
@@ -1868,7 +1868,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bf [phi:test_sbytes::@4->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bf
- // [47] phi assert_sbyte::msg#5 = test_sbytes::msg4 [phi:test_sbytes::@4->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = test_sbytes::msg4 [phi:test_sbytes::@4->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg4
@@ -1945,7 +1945,7 @@ assert_byte: {
// [61] phi from assert_byte to print_str [phi:assert_byte->print_str]
print_str_from_assert_byte:
// [61] phi print_char_cursor#87 = print_char_cursor#77 [phi:assert_byte->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = print_str::str#1 [phi:assert_byte->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = print_str::str#1 [phi:assert_byte->print_str#1] -- register_copy
jsr print_str
// [37] phi from assert_byte to assert_byte::@4 [phi:assert_byte->assert_byte::@4]
__b4_from_assert_byte:
@@ -1956,7 +1956,7 @@ assert_byte: {
// [61] phi from assert_byte::@4 to print_str [phi:assert_byte::@4->print_str]
print_str_from___b4:
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_byte::@4->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str [phi:assert_byte::@4->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str [phi:assert_byte::@4->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -1977,7 +1977,7 @@ assert_byte: {
// [61] phi from assert_byte::@3 to print_str [phi:assert_byte::@3->print_str]
print_str_from___b3:
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_byte::@3->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str2 [phi:assert_byte::@3->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str2 [phi:assert_byte::@3->print_str#1] -- pbuz1=pbuc1
lda #str2
@@ -1992,7 +1992,7 @@ assert_byte: {
// [43] call print_ln
// [68] phi from assert_byte::@2 to print_ln [phi:assert_byte::@2->print_ln]
print_ln_from___b2:
- // [68] phi print_line_cursor#49 = print_line_cursor#52 [phi:assert_byte::@2->print_ln#0] -- call_phi_near
+ // [68] phi print_line_cursor#49 = print_line_cursor#52 [phi:assert_byte::@2->print_ln#0] -- register_copy
jsr print_ln
jmp __breturn
// assert_byte::@return
@@ -2008,7 +2008,7 @@ assert_byte: {
// [61] phi from assert_byte::@1 to print_str [phi:assert_byte::@1->print_str]
print_str_from___b1:
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_byte::@1->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str1 [phi:assert_byte::@1->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str1 [phi:assert_byte::@1->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2031,7 +2031,7 @@ assert_sbyte: {
// [61] phi from assert_sbyte to print_str [phi:assert_sbyte->print_str]
print_str_from_assert_sbyte:
// [61] phi print_char_cursor#87 = print_char_cursor#92 [phi:assert_sbyte->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = print_str::str#5 [phi:assert_sbyte->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = print_str::str#5 [phi:assert_sbyte->print_str#1] -- register_copy
jsr print_str
// [51] phi from assert_sbyte to assert_sbyte::@4 [phi:assert_sbyte->assert_sbyte::@4]
__b4_from_assert_sbyte:
@@ -2042,7 +2042,7 @@ assert_sbyte: {
// [61] phi from assert_sbyte::@4 to print_str [phi:assert_sbyte::@4->print_str]
print_str_from___b4:
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_sbyte::@4->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str [phi:assert_sbyte::@4->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str [phi:assert_sbyte::@4->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2063,7 +2063,7 @@ assert_sbyte: {
// [61] phi from assert_sbyte::@3 to print_str [phi:assert_sbyte::@3->print_str]
print_str_from___b3:
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_sbyte::@3->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str2 [phi:assert_sbyte::@3->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str2 [phi:assert_sbyte::@3->print_str#1] -- pbuz1=pbuc1
lda #str2
@@ -2078,7 +2078,7 @@ assert_sbyte: {
// [57] call print_ln
// [68] phi from assert_sbyte::@2 to print_ln [phi:assert_sbyte::@2->print_ln]
print_ln_from___b2:
- // [68] phi print_line_cursor#49 = print_line_cursor#0 [phi:assert_sbyte::@2->print_ln#0] -- call_phi_near
+ // [68] phi print_line_cursor#49 = print_line_cursor#0 [phi:assert_sbyte::@2->print_ln#0] -- register_copy
jsr print_ln
jmp __breturn
// assert_sbyte::@return
@@ -2094,7 +2094,7 @@ assert_sbyte: {
// [61] phi from assert_sbyte::@1 to print_str [phi:assert_sbyte::@1->print_str]
print_str_from___b1:
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_sbyte::@1->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str1 [phi:assert_sbyte::@1->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str1 [phi:assert_sbyte::@1->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2130,7 +2130,7 @@ print_str: {
// [65] print_char::ch#0 = *print_str::str#10 -- vbuaa=_deref_pbuz1
ldy #0
lda (str),y
- // [66] call print_char -- call_phi_near
+ // [66] call print_char
jsr print_char
jmp __b3
// print_str::@3
@@ -2438,7 +2438,7 @@ Score: 1783
main: {
// print_cls()
// [1] call print_cls
- // [7] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [7] phi from main to print_cls [phi:main->print_cls]
jsr print_cls
// main::@1
// *BG_COLOR = GREEN
@@ -2447,13 +2447,13 @@ main: {
sta BG_COLOR
// test_bytes()
// [3] call test_bytes
- // [10] phi from main::@1 to test_bytes [phi:main::@1->test_bytes] -- call_phi_near
+ // [10] phi from main::@1 to test_bytes [phi:main::@1->test_bytes]
jsr test_bytes
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// test_sbytes()
// [5] call test_sbytes
- // [17] phi from main::@2 to test_sbytes [phi:main::@2->test_sbytes] -- call_phi_near
+ // [17] phi from main::@2 to test_sbytes [phi:main::@2->test_sbytes]
jsr test_sbytes
// main::@return
// }
@@ -2465,7 +2465,7 @@ main: {
print_cls: {
// memset(print_screen, ' ', 1000)
// [8] call memset
- // [28] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [28] phi from print_cls to memset [phi:print_cls->memset]
jsr memset
// print_cls::@return
// }
@@ -2496,7 +2496,7 @@ test_bytes: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [34] phi assert_byte::msg#3 = msg [phi:test_bytes->assert_byte#4] -- call_phi_near
+ // [34] phi assert_byte::msg#3 = msg [phi:test_bytes->assert_byte#4] -- pbuz1=pbuc1
lda #msg
@@ -2518,7 +2518,7 @@ test_bytes: {
// [34] phi assert_byte::b#3 = test_bytes::bc#0 [phi:test_bytes::@1->assert_byte#2] -- vbuxx=vbuc1
ldx #bc
// [34] phi print_char_cursor#77 = print_char_cursor#98 [phi:test_bytes::@1->assert_byte#3] -- register_copy
- // [34] phi assert_byte::msg#3 = msg1 [phi:test_bytes::@1->assert_byte#4] -- call_phi_near
+ // [34] phi assert_byte::msg#3 = msg1 [phi:test_bytes::@1->assert_byte#4] -- pbuz1=pbuc1
lda #msg1
@@ -2540,7 +2540,7 @@ test_bytes: {
// [34] phi assert_byte::b#3 = test_bytes::bd#0 [phi:test_bytes::@2->assert_byte#2] -- vbuxx=vbuc1
ldx #bd
// [34] phi print_char_cursor#77 = print_char_cursor#99 [phi:test_bytes::@2->assert_byte#3] -- register_copy
- // [34] phi assert_byte::msg#3 = test_bytes::msg2 [phi:test_bytes::@2->assert_byte#4] -- call_phi_near
+ // [34] phi assert_byte::msg#3 = test_bytes::msg2 [phi:test_bytes::@2->assert_byte#4] -- pbuz1=pbuc1
lda #msg2
@@ -2571,7 +2571,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bb [phi:test_sbytes->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bb
- // [47] phi assert_sbyte::msg#5 = msg [phi:test_sbytes->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = msg [phi:test_sbytes->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg
@@ -2587,7 +2587,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bc#0 [phi:test_sbytes::@1->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bc
- // [47] phi assert_sbyte::msg#5 = msg1 [phi:test_sbytes::@1->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = msg1 [phi:test_sbytes::@1->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg1
@@ -2603,7 +2603,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bd#0 [phi:test_sbytes::@2->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bd
- // [47] phi assert_sbyte::msg#5 = test_sbytes::msg2 [phi:test_sbytes::@2->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = test_sbytes::msg2 [phi:test_sbytes::@2->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg2
@@ -2619,7 +2619,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::be#0 [phi:test_sbytes::@3->assert_sbyte#1] -- vbsxx=vbsc1
ldx #be
- // [47] phi assert_sbyte::msg#5 = test_sbytes::msg3 [phi:test_sbytes::@3->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = test_sbytes::msg3 [phi:test_sbytes::@3->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg3
@@ -2635,7 +2635,7 @@ test_sbytes: {
sta.z assert_sbyte.c
// [47] phi assert_sbyte::b#5 = test_sbytes::bf [phi:test_sbytes::@4->assert_sbyte#1] -- vbsxx=vbsc1
ldx #bf
- // [47] phi assert_sbyte::msg#5 = test_sbytes::msg4 [phi:test_sbytes::@4->assert_sbyte#2] -- call_phi_near
+ // [47] phi assert_sbyte::msg#5 = test_sbytes::msg4 [phi:test_sbytes::@4->assert_sbyte#2] -- pbuz1=pbuc1
lda #msg4
@@ -2710,7 +2710,7 @@ assert_byte: {
// [36] call print_str
// [61] phi from assert_byte to print_str [phi:assert_byte->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#77 [phi:assert_byte->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = print_str::str#1 [phi:assert_byte->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = print_str::str#1 [phi:assert_byte->print_str#1] -- register_copy
jsr print_str
// [37] phi from assert_byte to assert_byte::@4 [phi:assert_byte->assert_byte::@4]
// assert_byte::@4
@@ -2718,7 +2718,7 @@ assert_byte: {
// [38] call print_str
// [61] phi from assert_byte::@4 to print_str [phi:assert_byte::@4->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_byte::@4->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str [phi:assert_byte::@4->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str [phi:assert_byte::@4->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2735,7 +2735,7 @@ assert_byte: {
// [41] call print_str
// [61] phi from assert_byte::@3 to print_str [phi:assert_byte::@3->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_byte::@3->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str2 [phi:assert_byte::@3->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str2 [phi:assert_byte::@3->print_str#1] -- pbuz1=pbuc1
lda #str2
@@ -2747,7 +2747,7 @@ assert_byte: {
// print_ln()
// [43] call print_ln
// [68] phi from assert_byte::@2 to print_ln [phi:assert_byte::@2->print_ln]
- // [68] phi print_line_cursor#49 = print_line_cursor#52 [phi:assert_byte::@2->print_ln#0] -- call_phi_near
+ // [68] phi print_line_cursor#49 = print_line_cursor#52 [phi:assert_byte::@2->print_ln#0] -- register_copy
jsr print_ln
// assert_byte::@return
// }
@@ -2763,7 +2763,7 @@ assert_byte: {
// [46] call print_str
// [61] phi from assert_byte::@1 to print_str [phi:assert_byte::@1->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_byte::@1->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str1 [phi:assert_byte::@1->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str1 [phi:assert_byte::@1->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2787,7 +2787,7 @@ assert_sbyte: {
// [50] call print_str
// [61] phi from assert_sbyte to print_str [phi:assert_sbyte->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#92 [phi:assert_sbyte->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = print_str::str#5 [phi:assert_sbyte->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = print_str::str#5 [phi:assert_sbyte->print_str#1] -- register_copy
jsr print_str
// [51] phi from assert_sbyte to assert_sbyte::@4 [phi:assert_sbyte->assert_sbyte::@4]
// assert_sbyte::@4
@@ -2795,7 +2795,7 @@ assert_sbyte: {
// [52] call print_str
// [61] phi from assert_sbyte::@4 to print_str [phi:assert_sbyte::@4->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_sbyte::@4->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str [phi:assert_sbyte::@4->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str [phi:assert_sbyte::@4->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2812,7 +2812,7 @@ assert_sbyte: {
// [55] call print_str
// [61] phi from assert_sbyte::@3 to print_str [phi:assert_sbyte::@3->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_sbyte::@3->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str2 [phi:assert_sbyte::@3->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str2 [phi:assert_sbyte::@3->print_str#1] -- pbuz1=pbuc1
lda #str2
@@ -2824,7 +2824,7 @@ assert_sbyte: {
// print_ln()
// [57] call print_ln
// [68] phi from assert_sbyte::@2 to print_ln [phi:assert_sbyte::@2->print_ln]
- // [68] phi print_line_cursor#49 = print_line_cursor#0 [phi:assert_sbyte::@2->print_ln#0] -- call_phi_near
+ // [68] phi print_line_cursor#49 = print_line_cursor#0 [phi:assert_sbyte::@2->print_ln#0] -- register_copy
jsr print_ln
// assert_sbyte::@return
// }
@@ -2840,7 +2840,7 @@ assert_sbyte: {
// [60] call print_str
// [61] phi from assert_sbyte::@1 to print_str [phi:assert_sbyte::@1->print_str]
// [61] phi print_char_cursor#87 = print_char_cursor#1 [phi:assert_sbyte::@1->print_str#0] -- register_copy
- // [61] phi print_str::str#12 = str1 [phi:assert_sbyte::@1->print_str#1] -- call_phi_near
+ // [61] phi print_str::str#12 = str1 [phi:assert_sbyte::@1->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2874,7 +2874,7 @@ print_str: {
// [65] print_char::ch#0 = *print_str::str#10 -- vbuaa=_deref_pbuz1
ldy #0
lda (str),y
- // [66] call print_char -- call_phi_near
+ // [66] call print_char
jsr print_char
// print_str::@3
// print_char(*(str++));
diff --git a/src/test/ref/constref-not-literal-problem.log b/src/test/ref/constref-not-literal-problem.log
index 5e11f1540..4068dc7e4 100644
--- a/src/test/ref/constref-not-literal-problem.log
+++ b/src/test/ref/constref-not-literal-problem.log
@@ -180,7 +180,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call copy -- call_phi_near
+ // [1] call copy
jsr copy
jmp __breturn
// main::@return
@@ -267,7 +267,7 @@ Score: 41
// main
main: {
// copy(B, A)
- // [1] call copy -- call_phi_near
+ // [1] call copy
jsr copy
// main::@return
// }
diff --git a/src/test/ref/cordic-atan2-16.log b/src/test/ref/cordic-atan2-16.log
index 42ef0d493..02d896823 100644
--- a/src/test/ref/cordic-atan2-16.log
+++ b/src/test/ref/cordic-atan2-16.log
@@ -1758,7 +1758,7 @@ main: {
.label x = $f
.label y = $17
// [1] call init_font_hex
- // [22] phi from main to init_font_hex [phi:main->init_font_hex] -- call_phi_near
+ // [22] phi from main to init_font_hex [phi:main->init_font_hex]
init_font_hex_from_main:
jsr init_font_hex
// [2] phi from main to main::toD0181 [phi:main->main::toD0181]
@@ -1816,7 +1816,7 @@ main: {
sta.z yw
// [8] atan2_16::x#0 = (int)main::xw#0
// [9] atan2_16::y#0 = (int)main::yw#0
- // [10] call atan2_16 -- call_phi_near
+ // [10] call atan2_16
jsr atan2_16
// [11] atan2_16::return#2 = atan2_16::return#0
jmp __b6
@@ -2636,7 +2636,7 @@ main: {
.label y = $17
// init_font_hex(CHARSET)
// [1] call init_font_hex
- // [22] phi from main to init_font_hex [phi:main->init_font_hex] -- call_phi_near
+ // [22] phi from main to init_font_hex [phi:main->init_font_hex]
jsr init_font_hex
// [2] phi from main to main::toD0181 [phi:main->main::toD0181]
// main::toD0181
@@ -2683,7 +2683,7 @@ main: {
// word angle_w = atan2_16(xw, yw)
// [8] atan2_16::x#0 = (int)main::xw#0
// [9] atan2_16::y#0 = (int)main::yw#0
- // [10] call atan2_16 -- call_phi_near
+ // [10] call atan2_16
jsr atan2_16
// [11] atan2_16::return#2 = atan2_16::return#0
// main::@6
diff --git a/src/test/ref/cordic-atan2-clear.log b/src/test/ref/cordic-atan2-clear.log
index 827cd2778..9f4227d9a 100644
--- a/src/test/ref/cordic-atan2-clear.log
+++ b/src/test/ref/cordic-atan2-clear.log
@@ -2027,7 +2027,7 @@ main: {
// Clear the screen by modifying the charset
.label clear_char = $18
// [1] call init_font_hex
- // [10] phi from main to init_font_hex [phi:main->init_font_hex] -- call_phi_near
+ // [10] phi from main to init_font_hex [phi:main->init_font_hex]
init_font_hex_from_main:
jsr init_font_hex
// [2] phi from main to main::toD0181 [phi:main->main::toD0181]
@@ -2042,7 +2042,7 @@ main: {
lda #toD0181_return
sta D018
// [4] call init_angle_screen
- // [33] phi from main::@5 to init_angle_screen [phi:main::@5->init_angle_screen] -- call_phi_near
+ // [33] phi from main::@5 to init_angle_screen [phi:main::@5->init_angle_screen]
init_angle_screen_from___b5:
jsr init_angle_screen
// [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
@@ -2357,7 +2357,7 @@ init_angle_screen: {
sty.z yw
// [47] atan2_16::x#0 = (int)init_angle_screen::xw#0
// [48] atan2_16::y#0 = (int)init_angle_screen::yw#0
- // [49] call atan2_16 -- call_phi_near
+ // [49] call atan2_16
jsr atan2_16
// [50] atan2_16::return#2 = atan2_16::return#0
jmp __b5
@@ -3059,7 +3059,7 @@ main: {
.label clear_char = $18
// init_font_hex(CHARSET)
// [1] call init_font_hex
- // [10] phi from main to init_font_hex [phi:main->init_font_hex] -- call_phi_near
+ // [10] phi from main to init_font_hex [phi:main->init_font_hex]
jsr init_font_hex
// [2] phi from main to main::toD0181 [phi:main->main::toD0181]
// main::toD0181
@@ -3070,7 +3070,7 @@ main: {
sta D018
// init_angle_screen(SCREEN)
// [4] call init_angle_screen
- // [33] phi from main::@5 to init_angle_screen [phi:main::@5->init_angle_screen] -- call_phi_near
+ // [33] phi from main::@5 to init_angle_screen [phi:main::@5->init_angle_screen]
jsr init_angle_screen
// [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
// [5] phi main::clear_char#5 = CHARSET [phi:main::@5->main::@1#0] -- pbuz1=pbuc1
@@ -3373,7 +3373,7 @@ init_angle_screen: {
// word angle_w = atan2_16(xw, yw)
// [47] atan2_16::x#0 = (int)init_angle_screen::xw#0
// [48] atan2_16::y#0 = (int)init_angle_screen::yw#0
- // [49] call atan2_16 -- call_phi_near
+ // [49] call atan2_16
jsr atan2_16
// [50] atan2_16::return#2 = atan2_16::return#0
// init_angle_screen::@5
diff --git a/src/test/ref/cordic-atan2.log b/src/test/ref/cordic-atan2.log
index c4712c1a2..2e53e0d27 100644
--- a/src/test/ref/cordic-atan2.log
+++ b/src/test/ref/cordic-atan2.log
@@ -1440,7 +1440,7 @@ main: {
.label x = $c
.label y = $d
// [1] call init_font_hex
- // [18] phi from main to init_font_hex [phi:main->init_font_hex] -- call_phi_near
+ // [18] phi from main to init_font_hex [phi:main->init_font_hex]
init_font_hex_from_main:
jsr init_font_hex
// [2] phi from main to main::toD0181 [phi:main->main::toD0181]
@@ -1488,7 +1488,7 @@ main: {
__b2:
// [6] atan2_8::x#0 = main::x#2
// [7] atan2_8::y#0 = main::y#4
- // [8] call atan2_8 -- call_phi_near
+ // [8] call atan2_8
jsr atan2_8
// [9] atan2_8::return#2 = atan2_8::return#0 -- vbuaa=vbuxx
txa
@@ -2171,7 +2171,7 @@ main: {
.label y = $d
// init_font_hex(CHARSET)
// [1] call init_font_hex
- // [18] phi from main to init_font_hex [phi:main->init_font_hex] -- call_phi_near
+ // [18] phi from main to init_font_hex [phi:main->init_font_hex]
jsr init_font_hex
// [2] phi from main to main::toD0181 [phi:main->main::toD0181]
// main::toD0181
@@ -2207,7 +2207,7 @@ main: {
// byte angle = atan2_8(x, y)
// [6] atan2_8::x#0 = main::x#2
// [7] atan2_8::y#0 = main::y#4
- // [8] call atan2_8 -- call_phi_near
+ // [8] call atan2_8
jsr atan2_8
// [9] atan2_8::return#2 = atan2_8::return#0 -- vbuaa=vbuxx
txa
diff --git a/src/test/ref/cstyle-decl-function.log b/src/test/ref/cstyle-decl-function.log
index beb959f12..85b67ab57 100644
--- a/src/test/ref/cstyle-decl-function.log
+++ b/src/test/ref/cstyle-decl-function.log
@@ -243,7 +243,7 @@ main: {
sum_from_main:
// [10] phi sum::b#2 = 2 [phi:main->sum#0] -- vbuaa=vbuc1
lda #2
- // [10] phi sum::a#2 = 'a' [phi:main->sum#1] -- call_phi_near
+ // [10] phi sum::a#2 = 'a' [phi:main->sum#1] -- vbuxx=vbuc1
ldx #'a'
jsr sum
// [2] sum::return#0 = sum::return#2
@@ -258,7 +258,7 @@ main: {
sum_from___b1:
// [10] phi sum::b#2 = $c [phi:main::@1->sum#0] -- vbuaa=vbuc1
lda #$c
- // [10] phi sum::a#2 = 'a' [phi:main::@1->sum#1] -- call_phi_near
+ // [10] phi sum::a#2 = 'a' [phi:main::@1->sum#1] -- vbuxx=vbuc1
ldx #'a'
jsr sum
// [6] sum::return#1 = sum::return#2
@@ -353,7 +353,7 @@ main: {
// [10] phi from main to sum [phi:main->sum]
// [10] phi sum::b#2 = 2 [phi:main->sum#0] -- vbuaa=vbuc1
lda #2
- // [10] phi sum::a#2 = 'a' [phi:main->sum#1] -- call_phi_near
+ // [10] phi sum::a#2 = 'a' [phi:main->sum#1] -- vbuxx=vbuc1
ldx #'a'
jsr sum
// sum('a', 2)
@@ -368,7 +368,7 @@ main: {
// [10] phi from main::@1 to sum [phi:main::@1->sum]
// [10] phi sum::b#2 = $c [phi:main::@1->sum#0] -- vbuaa=vbuc1
lda #$c
- // [10] phi sum::a#2 = 'a' [phi:main::@1->sum#1] -- call_phi_near
+ // [10] phi sum::a#2 = 'a' [phi:main::@1->sum#1] -- vbuxx=vbuc1
ldx #'a'
jsr sum
// sum('a', 12)
diff --git a/src/test/ref/declared-memory-var-6.log b/src/test/ref/declared-memory-var-6.log
index b629987ff..5a8d4a8da 100644
--- a/src/test/ref/declared-memory-var-6.log
+++ b/src/test/ref/declared-memory-var-6.log
@@ -438,7 +438,7 @@ main: {
out_from_main:
// [24] phi i#27 = 0 [phi:main->out#0] -- vbuyy=vbuc1
ldy #0
- // [24] phi out::c#10 = main::reg_zp_flex [phi:main->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::reg_zp_flex [phi:main->out#1] -- vbuxx=vbuc1
ldx #reg_zp_flex
jsr out
jmp __b1
@@ -450,7 +450,7 @@ main: {
// [24] phi from main::@1 to out [phi:main::@1->out]
out_from___b1:
// [24] phi i#27 = i#11 [phi:main::@1->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#1 [phi:main::@1->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#1 [phi:main::@1->out#1] -- register_copy
jsr out
// [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
__b2_from___b1:
@@ -461,7 +461,7 @@ main: {
// [24] phi from main::@2 to out [phi:main::@2->out]
out_from___b2:
// [24] phi i#27 = i#11 [phi:main::@2->out#0] -- register_copy
- // [24] phi out::c#10 = main::reg_mem_flex [phi:main::@2->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::reg_mem_flex [phi:main::@2->out#1] -- vbuxx=vbuc1
ldx #reg_mem_flex
jsr out
jmp __b3
@@ -473,7 +473,7 @@ main: {
// [24] phi from main::@3 to out [phi:main::@3->out]
out_from___b3:
// [24] phi i#27 = i#11 [phi:main::@3->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#3 [phi:main::@3->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#3 [phi:main::@3->out#1] -- register_copy
jsr out
// [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
__b4_from___b3:
@@ -484,7 +484,7 @@ main: {
// [24] phi from main::@4 to out [phi:main::@4->out]
out_from___b4:
// [24] phi i#27 = i#11 [phi:main::@4->out#0] -- register_copy
- // [24] phi out::c#10 = main::default_default [phi:main::@4->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::default_default [phi:main::@4->out#1] -- vbuxx=vbuc1
ldx #default_default
jsr out
// [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
@@ -496,7 +496,7 @@ main: {
// [24] phi from main::@5 to out [phi:main::@5->out]
out_from___b5:
// [24] phi i#27 = i#11 [phi:main::@5->out#0] -- register_copy
- // [24] phi out::c#10 = main::reg_default [phi:main::@5->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::reg_default [phi:main::@5->out#1] -- vbuxx=vbuc1
ldx #reg_default
jsr out
// [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
@@ -508,7 +508,7 @@ main: {
// [24] phi from main::@6 to out [phi:main::@6->out]
out_from___b6:
// [24] phi i#27 = i#11 [phi:main::@6->out#0] -- register_copy
- // [24] phi out::c#10 = main::default_zp_flex [phi:main::@6->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::default_zp_flex [phi:main::@6->out#1] -- vbuxx=vbuc1
ldx #default_zp_flex
jsr out
jmp __b7
@@ -520,7 +520,7 @@ main: {
// [24] phi from main::@7 to out [phi:main::@7->out]
out_from___b7:
// [24] phi i#27 = i#11 [phi:main::@7->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#7 [phi:main::@7->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#7 [phi:main::@7->out#1] -- register_copy
jsr out
// [19] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
__b8_from___b7:
@@ -531,7 +531,7 @@ main: {
// [24] phi from main::@8 to out [phi:main::@8->out]
out_from___b8:
// [24] phi i#27 = i#11 [phi:main::@8->out#0] -- register_copy
- // [24] phi out::c#10 = main::default_mem_flex [phi:main::@8->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::default_mem_flex [phi:main::@8->out#1] -- vbuxx=vbuc1
ldx #default_mem_flex
jsr out
jmp __b9
@@ -543,7 +543,7 @@ main: {
// [24] phi from main::@9 to out [phi:main::@9->out]
out_from___b9:
// [24] phi i#27 = i#11 [phi:main::@9->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#9 [phi:main::@9->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#9 [phi:main::@9->out#1] -- register_copy
jsr out
jmp __breturn
// main::@return
@@ -694,7 +694,7 @@ main: {
// [24] phi from main to out [phi:main->out]
// [24] phi i#27 = 0 [phi:main->out#0] -- vbuyy=vbuc1
ldy #0
- // [24] phi out::c#10 = main::reg_zp_flex [phi:main->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::reg_zp_flex [phi:main->out#1] -- vbuxx=vbuc1
ldx #reg_zp_flex
jsr out
// main::@1
@@ -704,7 +704,7 @@ main: {
// [6] call out
// [24] phi from main::@1 to out [phi:main::@1->out]
// [24] phi i#27 = i#11 [phi:main::@1->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#1 [phi:main::@1->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#1 [phi:main::@1->out#1] -- register_copy
jsr out
// [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
@@ -712,7 +712,7 @@ main: {
// [8] call out
// [24] phi from main::@2 to out [phi:main::@2->out]
// [24] phi i#27 = i#11 [phi:main::@2->out#0] -- register_copy
- // [24] phi out::c#10 = main::reg_mem_flex [phi:main::@2->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::reg_mem_flex [phi:main::@2->out#1] -- vbuxx=vbuc1
ldx #reg_mem_flex
jsr out
// main::@3
@@ -722,7 +722,7 @@ main: {
// [10] call out
// [24] phi from main::@3 to out [phi:main::@3->out]
// [24] phi i#27 = i#11 [phi:main::@3->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#3 [phi:main::@3->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#3 [phi:main::@3->out#1] -- register_copy
jsr out
// [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
// main::@4
@@ -730,7 +730,7 @@ main: {
// [12] call out
// [24] phi from main::@4 to out [phi:main::@4->out]
// [24] phi i#27 = i#11 [phi:main::@4->out#0] -- register_copy
- // [24] phi out::c#10 = main::default_default [phi:main::@4->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::default_default [phi:main::@4->out#1] -- vbuxx=vbuc1
ldx #default_default
jsr out
// [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
@@ -739,7 +739,7 @@ main: {
// [14] call out
// [24] phi from main::@5 to out [phi:main::@5->out]
// [24] phi i#27 = i#11 [phi:main::@5->out#0] -- register_copy
- // [24] phi out::c#10 = main::reg_default [phi:main::@5->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::reg_default [phi:main::@5->out#1] -- vbuxx=vbuc1
ldx #reg_default
jsr out
// [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
@@ -748,7 +748,7 @@ main: {
// [16] call out
// [24] phi from main::@6 to out [phi:main::@6->out]
// [24] phi i#27 = i#11 [phi:main::@6->out#0] -- register_copy
- // [24] phi out::c#10 = main::default_zp_flex [phi:main::@6->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::default_zp_flex [phi:main::@6->out#1] -- vbuxx=vbuc1
ldx #default_zp_flex
jsr out
// main::@7
@@ -758,7 +758,7 @@ main: {
// [18] call out
// [24] phi from main::@7 to out [phi:main::@7->out]
// [24] phi i#27 = i#11 [phi:main::@7->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#7 [phi:main::@7->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#7 [phi:main::@7->out#1] -- register_copy
jsr out
// [19] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
// main::@8
@@ -766,7 +766,7 @@ main: {
// [20] call out
// [24] phi from main::@8 to out [phi:main::@8->out]
// [24] phi i#27 = i#11 [phi:main::@8->out#0] -- register_copy
- // [24] phi out::c#10 = main::default_mem_flex [phi:main::@8->out#1] -- call_phi_near
+ // [24] phi out::c#10 = main::default_mem_flex [phi:main::@8->out#1] -- vbuxx=vbuc1
ldx #default_mem_flex
jsr out
// main::@9
@@ -776,7 +776,7 @@ main: {
// [22] call out
// [24] phi from main::@9 to out [phi:main::@9->out]
// [24] phi i#27 = i#11 [phi:main::@9->out#0] -- register_copy
- // [24] phi out::c#10 = out::c#9 [phi:main::@9->out#1] -- call_phi_near
+ // [24] phi out::c#10 = out::c#9 [phi:main::@9->out#1] -- register_copy
jsr out
// main::@return
// }
diff --git a/src/test/ref/declared-memory-var-7.log b/src/test/ref/declared-memory-var-7.log
index 7718eb181..943be5261 100644
--- a/src/test/ref/declared-memory-var-7.log
+++ b/src/test/ref/declared-memory-var-7.log
@@ -181,7 +181,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -287,7 +287,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/declared-memory-var-8.log b/src/test/ref/declared-memory-var-8.log
index 76c66804b..f5d839898 100644
--- a/src/test/ref/declared-memory-var-8.log
+++ b/src/test/ref/declared-memory-var-8.log
@@ -179,7 +179,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -285,7 +285,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/declared-ssa-var-0.log b/src/test/ref/declared-ssa-var-0.log
index 2f7d9e2f8..77a968616 100644
--- a/src/test/ref/declared-ssa-var-0.log
+++ b/src/test/ref/declared-ssa-var-0.log
@@ -518,7 +518,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -791,7 +791,7 @@ __start: {
sta.z idx_nssa_g
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/default-font.log b/src/test/ref/default-font.log
index ce1a6dbd9..099802ad4 100644
--- a/src/test/ref/default-font.log
+++ b/src/test/ref/default-font.log
@@ -469,7 +469,7 @@ main: {
.label ch = 6
.label x = 7
// [1] call memset
- // [13] phi from main to memset [phi:main->memset] -- call_phi_near
+ // [13] phi from main to memset [phi:main->memset]
memset_from_main:
jsr memset
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -686,7 +686,7 @@ main: {
.label x = 7
// memset(SCREEN, ' ', 1000)
// [1] call memset
- // [13] phi from main to memset [phi:main->memset] -- call_phi_near
+ // [13] phi from main to memset [phi:main->memset]
jsr memset
// [2] phi from main to main::@1 [phi:main->main::@1]
// [2] phi main::x#4 = 0 [phi:main->main::@1#0] -- vbuz1=vbuc1
diff --git a/src/test/ref/deref-to-derefidx-2.log b/src/test/ref/deref-to-derefidx-2.log
index 7996b0807..4d3b92685 100644
--- a/src/test/ref/deref-to-derefidx-2.log
+++ b/src/test/ref/deref-to-derefidx-2.log
@@ -245,7 +245,7 @@ main: {
// [5] phi screen_idx#11 = 0 [phi:main->print#0] -- vbuz1=vbuc1
lda #0
sta.z screen_idx
- // [5] phi print::m#2 = msg1 [phi:main->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg1 [phi:main->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -260,7 +260,7 @@ main: {
// [5] phi from main::@1 to print [phi:main::@1->print]
print_from___b1:
// [5] phi screen_idx#11 = screen_idx#12 [phi:main::@1->print#0] -- register_copy
- // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg2
@@ -358,7 +358,7 @@ main: {
// [5] phi screen_idx#11 = 0 [phi:main->print#0] -- vbuz1=vbuc1
lda #0
sta.z screen_idx
- // [5] phi print::m#2 = msg1 [phi:main->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg1 [phi:main->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -370,7 +370,7 @@ main: {
// [3] call print
// [5] phi from main::@1 to print [phi:main::@1->print]
// [5] phi screen_idx#11 = screen_idx#12 [phi:main::@1->print#0] -- register_copy
- // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg2
diff --git a/src/test/ref/deref-to-derefidx.log b/src/test/ref/deref-to-derefidx.log
index c68e6aed2..272e2ec42 100644
--- a/src/test/ref/deref-to-derefidx.log
+++ b/src/test/ref/deref-to-derefidx.log
@@ -225,7 +225,7 @@ main: {
print_from_main:
// [5] phi idx#11 = 0 [phi:main->print#0] -- vbuxx=vbuc1
ldx #0
- // [5] phi print::m#2 = msg1 [phi:main->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg1 [phi:main->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -240,7 +240,7 @@ main: {
// [5] phi from main::@1 to print [phi:main::@1->print]
print_from___b1:
// [5] phi idx#11 = idx#12 [phi:main::@1->print#0] -- register_copy
- // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg2
@@ -327,7 +327,7 @@ main: {
// [5] phi from main to print [phi:main->print]
// [5] phi idx#11 = 0 [phi:main->print#0] -- vbuxx=vbuc1
ldx #0
- // [5] phi print::m#2 = msg1 [phi:main->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg1 [phi:main->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -339,7 +339,7 @@ main: {
// [3] call print
// [5] phi from main::@1 to print [phi:main::@1->print]
// [5] phi idx#11 = idx#12 [phi:main::@1->print#0] -- register_copy
- // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- call_phi_near
+ // [5] phi print::m#2 = msg2 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg2
diff --git a/src/test/ref/ducks-array.log b/src/test/ref/ducks-array.log
index 246dd736f..52b0efcee 100644
--- a/src/test/ref/ducks-array.log
+++ b/src/test/ref/ducks-array.log
@@ -360,7 +360,7 @@ main: {
// [0] chrout::petscii = $95 -- vbuz1=vbuc1
lda #$95
sta.z chrout.petscii
- // [1] call chrout -- call_phi_near
+ // [1] call chrout
jsr chrout
jmp __b1
// main::@1
@@ -368,7 +368,7 @@ main: {
// [2] chrout::petscii = *points -- vbuz1=_deref_pbuc1
lda points
sta.z chrout.petscii
- // [3] call chrout -- call_phi_near
+ // [3] call chrout
jsr chrout
jmp __b2
// main::@2
@@ -376,7 +376,7 @@ main: {
// [4] chrout::petscii = *(points+1) -- vbuz1=_deref_pbuc1
lda points+1
sta.z chrout.petscii
- // [5] call chrout -- call_phi_near
+ // [5] call chrout
jsr chrout
jmp __b3
// main::@3
@@ -384,7 +384,7 @@ main: {
// [6] chrout::petscii = *(points+2) -- vbuz1=_deref_pbuc1
lda points+2
sta.z chrout.petscii
- // [7] call chrout -- call_phi_near
+ // [7] call chrout
jsr chrout
jmp __b4
// main::@4
@@ -392,7 +392,7 @@ main: {
// [8] chrout::petscii = *(points+3) -- vbuz1=_deref_pbuc1
lda points+3
sta.z chrout.petscii
- // [9] call chrout -- call_phi_near
+ // [9] call chrout
jsr chrout
jmp __breturn
// main::@return
@@ -468,35 +468,35 @@ main: {
// [0] chrout::petscii = $95 -- vbuz1=vbuc1
lda #$95
sta.z chrout.petscii
- // [1] call chrout -- call_phi_near
+ // [1] call chrout
jsr chrout
// main::@1
// chrout(points[0])
// [2] chrout::petscii = *points -- vbuz1=_deref_pbuc1
lda points
sta.z chrout.petscii
- // [3] call chrout -- call_phi_near
+ // [3] call chrout
jsr chrout
// main::@2
// chrout(points[1])
// [4] chrout::petscii = *(points+1) -- vbuz1=_deref_pbuc1
lda points+1
sta.z chrout.petscii
- // [5] call chrout -- call_phi_near
+ // [5] call chrout
jsr chrout
// main::@3
// chrout(points[2])
// [6] chrout::petscii = *(points+2) -- vbuz1=_deref_pbuc1
lda points+2
sta.z chrout.petscii
- // [7] call chrout -- call_phi_near
+ // [7] call chrout
jsr chrout
// main::@4
// chrout(points[3])
// [8] chrout::petscii = *(points+3) -- vbuz1=_deref_pbuc1
lda points+3
sta.z chrout.petscii
- // [9] call chrout -- call_phi_near
+ // [9] call chrout
jsr chrout
// main::@return
// }
diff --git a/src/test/ref/ducks-loop211.log b/src/test/ref/ducks-loop211.log
index 2cfcc151f..66f3d5dd8 100644
--- a/src/test/ref/ducks-loop211.log
+++ b/src/test/ref/ducks-loop211.log
@@ -214,7 +214,7 @@ main: {
// [4] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [5] call chrout -- call_phi_near
+ // [5] call chrout
jsr chrout
jmp __b2
// main::@2
@@ -320,7 +320,7 @@ main: {
// [4] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [5] call chrout -- call_phi_near
+ // [5] call chrout
jsr chrout
// main::@2
// ++k;
diff --git a/src/test/ref/ducks-total.log b/src/test/ref/ducks-total.log
index 731814936..b2ef90b84 100644
--- a/src/test/ref/ducks-total.log
+++ b/src/test/ref/ducks-total.log
@@ -9588,14 +9588,14 @@ __start: {
// [7] m = 0 -- vbuz1=vbuc1
lda #0
sta.z m
- // [8] call conio_c64_init -- call_phi_near
+ // [8] call conio_c64_init
jsr conio_c64_init
// [9] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
jmp __b1
// __start::@1
__b1:
- // [10] call main -- call_phi_near
+ // [10] call main
jsr main
jmp __breturn
// __start::@return
@@ -9637,7 +9637,7 @@ conio_c64_init: {
// [17] call gotoxy
// [304] phi from conio_c64_init::@1 to gotoxy [phi:conio_c64_init::@1->gotoxy]
gotoxy_from___b1:
- // [304] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- call_phi_near
+ // [304] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- register_copy
jsr gotoxy
jmp __breturn
// conio_c64_init::@return
@@ -9700,7 +9700,7 @@ main: {
// [20] chrout::petscii = lock -- vbuz1=vbuc1
lda #lock
sta.z chrout.petscii
- // [21] call chrout -- call_phi_near
+ // [21] call chrout
// border and black paper
jsr chrout
jmp __b50
@@ -9709,7 +9709,7 @@ main: {
// [22] chrout::petscii = lower -- vbuz1=vbuc1
lda #lower
sta.z chrout.petscii
- // [23] call chrout -- call_phi_near
+ // [23] call chrout
//Lock UpperCase to Lowercase key
jsr chrout
jmp __b51
@@ -9751,7 +9751,7 @@ main: {
// [27] call clear_screen
// [321] phi from main::@3 to clear_screen [phi:main::@3->clear_screen]
clear_screen_from___b3:
- // [321] phi clear_screen::n#5 = $20 [phi:main::@3->clear_screen#0] -- call_phi_near
+ // [321] phi clear_screen::n#5 = $20 [phi:main::@3->clear_screen#0] -- vbuz1=vbuc1
lda #$20
sta.z clear_screen.n
jsr clear_screen
@@ -9764,7 +9764,7 @@ main: {
// Clear Screen with spaces & black ink
// [334] phi from main::@52 to textcolor [phi:main::@52->textcolor]
textcolor_from___b52:
- // [334] phi textcolor::color#7 = 7 [phi:main::@52->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 7 [phi:main::@52->textcolor#0] -- vbuz1=vbuc1
lda #7
sta.z textcolor.color
jsr textcolor
@@ -9776,7 +9776,7 @@ main: {
// [31] call cputs
// [337] phi from main::@53 to cputs [phi:main::@53->cputs]
cputs_from___b53:
- // [337] phi cputs::s#11 = intro [phi:main::@53->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = intro [phi:main::@53->cputs#0] -- pbuz1=pbuc1
lda #intro
@@ -9791,7 +9791,7 @@ main: {
// Yellow ink
// [334] phi from main::@54 to textcolor [phi:main::@54->textcolor]
textcolor_from___b54:
- // [334] phi textcolor::color#7 = 1 [phi:main::@54->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 1 [phi:main::@54->textcolor#0] -- vbuz1=vbuc1
lda #1
sta.z textcolor.color
jsr textcolor
@@ -9803,7 +9803,7 @@ main: {
// [35] call cputs
// [337] phi from main::@55 to cputs [phi:main::@55->cputs]
cputs_from___b55:
- // [337] phi cputs::s#11 = levels [phi:main::@55->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = levels [phi:main::@55->cputs#0] -- pbuz1=pbuc1
lda #levels
@@ -9818,7 +9818,7 @@ main: {
// White
// [334] phi from main::@56 to textcolor [phi:main::@56->textcolor]
textcolor_from___b56:
- // [334] phi textcolor::color#7 = 2 [phi:main::@56->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 2 [phi:main::@56->textcolor#0] -- vbuz1=vbuc1
lda #2
sta.z textcolor.color
jsr textcolor
@@ -9830,7 +9830,7 @@ main: {
// [39] call cputs
// [337] phi from main::@57 to cputs [phi:main::@57->cputs]
cputs_from___b57:
- // [337] phi cputs::s#11 = foot [phi:main::@57->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = foot [phi:main::@57->cputs#0] -- pbuz1=pbuc1
lda #foot
@@ -9858,7 +9858,7 @@ main: {
// wait for 1-3-5-7-9 keys only
// [321] phi from main::@5 to clear_screen [phi:main::@5->clear_screen]
clear_screen_from___b5:
- // [321] phi clear_screen::n#5 = 4 [phi:main::@5->clear_screen#0] -- call_phi_near
+ // [321] phi clear_screen::n#5 = 4 [phi:main::@5->clear_screen#0] -- vbuz1=vbuc1
lda #4
sta.z clear_screen.n
jsr clear_screen
@@ -9871,7 +9871,7 @@ main: {
// [46] chrout::petscii = reverse_on -- vbuz1=vbuc1
lda #reverse_on
sta.z chrout.petscii
- // [47] call chrout -- call_phi_near
+ // [47] call chrout
// Graphic mode
jsr chrout
jmp __b59
@@ -9880,7 +9880,7 @@ main: {
// [48] chrout::petscii = red -- vbuz1=vbuc1
lda #red
sta.z chrout.petscii
- // [49] call chrout -- call_phi_near
+ // [49] call chrout
jsr chrout
jmp __b60
// main::@60
@@ -9888,7 +9888,7 @@ main: {
// [50] chrout::petscii = down -- vbuz1=vbuc1
lda #down
sta.z chrout.petscii
- // [51] call chrout -- call_phi_near
+ // [51] call chrout
jsr chrout
// [52] phi from main::@60 to main::@6 [phi:main::@60->main::@6]
__b6_from___b60:
@@ -9912,7 +9912,7 @@ main: {
// [54] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [55] call chrout -- call_phi_near
+ // [55] call chrout
// 23 rows * 22 columns (7680 to 8185). 506 positions.
jsr chrout
jmp __b61
@@ -9927,7 +9927,7 @@ main: {
// [58] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [59] call chrout -- call_phi_near
+ // [59] call chrout
//last brick from last line (#23) to avoid scrolling
jsr chrout
jmp __b62
@@ -9975,7 +9975,7 @@ main: {
// [345] phi from main::@13 to random [phi:main::@13->random]
random_from___b13:
// [345] phi random::n#4 = random::n#0 [phi:main::@13->random#0] -- register_copy
- // [345] phi random::k#4 = random::k#0 [phi:main::@13->random#1] -- call_phi_near
+ // [345] phi random::k#4 = random::k#0 [phi:main::@13->random#1] -- register_copy
jsr random
jmp __b71
// main::@71
@@ -10018,7 +10018,7 @@ main: {
// [71] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [72] call chrout -- call_phi_near
+ // [72] call chrout
// Duck #1
jsr chrout
jmp __b65
@@ -10027,7 +10027,7 @@ main: {
// [73] chrout::petscii = yellow -- vbuz1=vbuc1
lda #yellow
sta.z chrout.petscii
- // [74] call chrout -- call_phi_near
+ // [74] call chrout
jsr chrout
jmp __b66
// main::@66
@@ -10035,7 +10035,7 @@ main: {
// [75] chrout::petscii = $50 -- vbuz1=vbuc1
lda #$50
sta.z chrout.petscii
- // [76] call chrout -- call_phi_near
+ // [76] call chrout
jsr chrout
jmp __b67
// main::@67
@@ -10043,7 +10043,7 @@ main: {
// [77] chrout::petscii = $54 -- vbuz1=vbuc1
lda #$54
sta.z chrout.petscii
- // [78] call chrout -- call_phi_near
+ // [78] call chrout
jsr chrout
jmp __b68
// main::@68
@@ -10051,7 +10051,7 @@ main: {
// [79] chrout::petscii = $53 -- vbuz1=vbuc1
lda #$53
sta.z chrout.petscii
- // [80] call chrout -- call_phi_near
+ // [80] call chrout
jsr chrout
jmp __b69
// main::@69
@@ -10059,7 +10059,7 @@ main: {
// [81] chrout::petscii = $3a -- vbuz1=vbuc1
lda #$3a
sta.z chrout.petscii
- // [82] call chrout -- call_phi_near
+ // [82] call chrout
jsr chrout
jmp __b70
// main::@70
@@ -10089,7 +10089,7 @@ main: {
// Write 'TM:9', yellow
// [351] phi from main::@19 to write_score [phi:main::@19->write_score]
write_score_from___b19:
- // [351] phi score#13 = 0 [phi:main::@19->write_score#0] -- call_phi_near
+ // [351] phi score#13 = 0 [phi:main::@19->write_score#0] -- vwuz1=vbuc1
lda #<0
sta.z score
lda #>0
@@ -10101,7 +10101,7 @@ main: {
// [88] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [89] call chrout -- call_phi_near
+ // [89] call chrout
// Write Score (yellow)
jsr chrout
jmp __b76
@@ -10110,7 +10110,7 @@ main: {
// [90] chrout::petscii = green -- vbuz1=vbuc1
lda #green
sta.z chrout.petscii
- // [91] call chrout -- call_phi_near
+ // [91] call chrout
jsr chrout
jmp __b77
// main::@77
@@ -10163,7 +10163,7 @@ main: {
// [96] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [97] call chrout -- call_phi_near
+ // [97] call chrout
jsr chrout
jmp __b79
// main::@79
@@ -10171,7 +10171,7 @@ main: {
// [98] chrout::petscii = green -- vbuz1=vbuc1
lda #green
sta.z chrout.petscii
- // [99] call chrout -- call_phi_near
+ // [99] call chrout
jsr chrout
jmp __b80
// main::@80
@@ -10179,7 +10179,7 @@ main: {
// [100] chrout::petscii = reverse_on -- vbuz1=vbuc1
lda #reverse_on
sta.z chrout.petscii
- // [101] call chrout -- call_phi_near
+ // [101] call chrout
jsr chrout
jmp __b81
// main::@81
@@ -10201,7 +10201,7 @@ main: {
// [104] chrout::petscii = $31 -- vbuz1=vbuc1
lda #$31
sta.z chrout.petscii
- // [105] call chrout -- call_phi_near
+ // [105] call chrout
jsr chrout
jmp __b82
// main::@82
@@ -10209,7 +10209,7 @@ main: {
// [106] chrout::petscii = $30 -- vbuz1=vbuc1
lda #$30
sta.z chrout.petscii
- // [107] call chrout -- call_phi_near
+ // [107] call chrout
jsr chrout
// [108] phi from main::@103 main::@104 main::@105 main::@106 main::@23 main::@82 main::@84 to main::@24 [phi:main::@103/main::@104/main::@105/main::@106/main::@23/main::@82/main::@84->main::@24]
__b24_from___b103:
@@ -10229,7 +10229,7 @@ main: {
// [345] phi random::n#4 = $ff [phi:main::@24->random#0] -- vbuz1=vbuc1
lda #$ff
sta.z random.n
- // [345] phi random::k#4 = 0 [phi:main::@24->random#1] -- call_phi_near
+ // [345] phi random::k#4 = 0 [phi:main::@24->random#1] -- vbuz1=vbuc1
lda #0
sta.z random.k
jsr random
@@ -10247,7 +10247,7 @@ main: {
// [345] phi random::n#4 = $ff [phi:main::@83->random#0] -- vbuz1=vbuc1
lda #$ff
sta.z random.n
- // [345] phi random::k#4 = 0 [phi:main::@83->random#1] -- call_phi_near
+ // [345] phi random::k#4 = 0 [phi:main::@83->random#1] -- vbuz1=vbuc1
lda #0
sta.z random.k
jsr random
@@ -10340,7 +10340,7 @@ main: {
jmp __b25
// main::@25
__b25:
- // [123] call chrono_restart -- call_phi_near
+ // [123] call chrono_restart
jsr chrono_restart
// [124] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
__b26_from___b25:
@@ -10384,7 +10384,7 @@ main: {
// [128] call write_score
// [351] phi from main::@28 to write_score [phi:main::@28->write_score]
write_score_from___b28:
- // [351] phi score#13 = score#4 [phi:main::@28->write_score#0] -- call_phi_near
+ // [351] phi score#13 = score#4 [phi:main::@28->write_score#0] -- register_copy
jsr write_score
jmp __b86
// main::@86
@@ -10396,7 +10396,7 @@ main: {
// [381] phi from main::@86 to wait [phi:main::@86->wait]
wait_from___b86:
// [381] phi z#53 = z#100 [phi:main::@86->wait#0] -- register_copy
- // [381] phi wait::n#6 = $14 [phi:main::@86->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = $14 [phi:main::@86->wait#1] -- vbuz1=vbuc1
lda #$14
sta.z wait.n
jsr wait
@@ -10485,7 +10485,7 @@ main: {
// 10 ducks
// [321] phi from main::@44 to clear_screen [phi:main::@44->clear_screen]
clear_screen_from___b44:
- // [321] phi clear_screen::n#5 = 4 [phi:main::@44->clear_screen#0] -- call_phi_near
+ // [321] phi clear_screen::n#5 = 4 [phi:main::@44->clear_screen#0] -- vbuz1=vbuc1
lda #4
sta.z clear_screen.n
jsr clear_screen
@@ -10498,7 +10498,7 @@ main: {
// [147] chrout::petscii = lower -- vbuz1=vbuc1
lda #lower
sta.z chrout.petscii
- // [148] call chrout -- call_phi_near
+ // [148] call chrout
jsr chrout
// [149] phi from main::@91 to main::@92 [phi:main::@91->main::@92]
__b92_from___b91:
@@ -10509,7 +10509,7 @@ main: {
// Return to text mode, lowcase
// [334] phi from main::@92 to textcolor [phi:main::@92->textcolor]
textcolor_from___b92:
- // [334] phi textcolor::color#7 = 7 [phi:main::@92->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 7 [phi:main::@92->textcolor#0] -- vbuz1=vbuc1
lda #7
sta.z textcolor.color
jsr textcolor
@@ -10521,7 +10521,7 @@ main: {
// [152] call cputs
// [337] phi from main::@93 to cputs [phi:main::@93->cputs]
cputs_from___b93:
- // [337] phi cputs::s#11 = game_over [phi:main::@93->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = game_over [phi:main::@93->cputs#0] -- pbuz1=pbuc1
lda #game_over
@@ -10536,7 +10536,7 @@ main: {
// Yellow
// [334] phi from main::@94 to textcolor [phi:main::@94->textcolor]
textcolor_from___b94:
- // [334] phi textcolor::color#7 = 2 [phi:main::@94->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 2 [phi:main::@94->textcolor#0] -- vbuz1=vbuc1
lda #2
sta.z textcolor.color
jsr textcolor
@@ -10548,7 +10548,7 @@ main: {
// [156] call cputs
// [337] phi from main::@95 to cputs [phi:main::@95->cputs]
cputs_from___b95:
- // [337] phi cputs::s#11 = your_score [phi:main::@95->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = your_score [phi:main::@95->cputs#0] -- pbuz1=pbuc1
lda #your_score
@@ -10562,7 +10562,7 @@ main: {
// [158] call cputs
// [337] phi from main::@96 to cputs [phi:main::@96->cputs]
cputs_from___b96:
- // [337] phi cputs::s#11 = buffer [phi:main::@96->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = buffer [phi:main::@96->cputs#0] -- pbuz1=pbuc1
lda #buffer
@@ -10577,7 +10577,7 @@ main: {
// Red
// [334] phi from main::@97 to textcolor [phi:main::@97->textcolor]
textcolor_from___b97:
- // [334] phi textcolor::color#7 = 3 [phi:main::@97->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 3 [phi:main::@97->textcolor#0] -- vbuz1=vbuc1
lda #3
sta.z textcolor.color
jsr textcolor
@@ -10589,7 +10589,7 @@ main: {
// [162] call cputs
// [337] phi from main::@98 to cputs [phi:main::@98->cputs]
cputs_from___b98:
- // [337] phi cputs::s#11 = high_score [phi:main::@98->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = high_score [phi:main::@98->cputs#0] -- pbuz1=pbuc1
lda #high_score
@@ -10630,7 +10630,7 @@ main: {
// [167] call utoa
// [390] phi from main::@46 to utoa [phi:main::@46->utoa]
utoa_from___b46:
- // [390] phi utoa::value#10 = utoa::value#2 [phi:main::@46->utoa#0] -- call_phi_near
+ // [390] phi utoa::value#10 = utoa::value#2 [phi:main::@46->utoa#0] -- register_copy
jsr utoa
// [168] phi from main::@46 to main::@100 [phi:main::@46->main::@100]
__b100_from___b46:
@@ -10640,7 +10640,7 @@ main: {
// [169] call cputs
// [337] phi from main::@100 to cputs [phi:main::@100->cputs]
cputs_from___b100:
- // [337] phi cputs::s#11 = buffer [phi:main::@100->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = buffer [phi:main::@100->cputs#0] -- pbuz1=pbuc1
lda #buffer
@@ -10655,7 +10655,7 @@ main: {
// Cyan
// [334] phi from main::@101 to textcolor [phi:main::@101->textcolor]
textcolor_from___b101:
- // [334] phi textcolor::color#7 = 1 [phi:main::@101->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 1 [phi:main::@101->textcolor#0] -- vbuz1=vbuc1
lda #1
sta.z textcolor.color
jsr textcolor
@@ -10667,7 +10667,7 @@ main: {
// [173] call cputs
// [337] phi from main::@102 to cputs [phi:main::@102->cputs]
cputs_from___b102:
- // [337] phi cputs::s#11 = play_again [phi:main::@102->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = play_again [phi:main::@102->cputs#0] -- pbuz1=pbuc1
lda #play_again
@@ -10728,7 +10728,7 @@ main: {
jmp __b27
// main::@27
__b27:
- // [182] call read_chrono -- call_phi_near
+ // [182] call read_chrono
jsr read_chrono
jmp __b85
// main::@85
@@ -10904,7 +10904,7 @@ main: {
// [381] phi from main::@42 to wait [phi:main::@42->wait]
wait_from___b42:
// [381] phi z#53 = z#100 [phi:main::@42->wait#0] -- register_copy
- // [381] phi wait::n#6 = $a [phi:main::@42->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = $a [phi:main::@42->wait#1] -- vbuz1=vbuc1
lda #$a
sta.z wait.n
jsr wait
@@ -11083,7 +11083,7 @@ main: {
// [381] phi from main::@36 to wait [phi:main::@36->wait]
wait_from___b36:
// [381] phi z#53 = z#48 [phi:main::@36->wait#0] -- register_copy
- // [381] phi wait::n#6 = 5 [phi:main::@36->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = 5 [phi:main::@36->wait#1] -- vbuz1=vbuc1
lda #5
sta.z wait.n
jsr wait
@@ -11182,7 +11182,7 @@ main: {
// [381] phi from main::@89 to wait [phi:main::@89->wait]
wait_from___b89:
// [381] phi z#53 = z#25 [phi:main::@89->wait#0] -- register_copy
- // [381] phi wait::n#6 = 5 [phi:main::@89->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = 5 [phi:main::@89->wait#1] -- vbuz1=vbuc1
lda #5
sta.z wait.n
jsr wait
@@ -11305,7 +11305,7 @@ main: {
// [269] call write_score
// [351] phi from main::@34 to write_score [phi:main::@34->write_score]
write_score_from___b34:
- // [351] phi score#13 = score#6 [phi:main::@34->write_score#0] -- call_phi_near
+ // [351] phi score#13 = score#6 [phi:main::@34->write_score#0] -- register_copy
jsr write_score
// [270] phi from main::@34 to main::@88 [phi:main::@34->main::@88]
__b88_from___b34:
@@ -11316,7 +11316,7 @@ main: {
// [381] phi from main::@88 to wait [phi:main::@88->wait]
wait_from___b88:
// [381] phi z#53 = z#100 [phi:main::@88->wait#0] -- register_copy
- // [381] phi wait::n#6 = $a [phi:main::@88->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = $a [phi:main::@88->wait#1] -- vbuz1=vbuc1
lda #$a
sta.z wait.n
jsr wait
@@ -11338,7 +11338,7 @@ main: {
// [273] chrout::petscii = main::$57 -- vbuz1=vwuz2
lda.z __57
sta.z chrout.petscii
- // [274] call chrout -- call_phi_near
+ // [274] call chrout
jsr chrout
jmp __b24_from___b23
// main::@21
@@ -11347,7 +11347,7 @@ main: {
ldy.z j_2
lda ducknumber,y
sta.z chrout.petscii
- // [276] call chrout -- call_phi_near
+ // [276] call chrout
jsr chrout
jmp __b78
// main::@78
@@ -11364,7 +11364,7 @@ main: {
ldy.z j_1
lda chrono,y
sta.z chrout.petscii
- // [279] call chrout -- call_phi_near
+ // [279] call chrout
jsr chrout
jmp __b74
// main::@74
@@ -11393,7 +11393,7 @@ main: {
// [283] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [284] call chrout -- call_phi_near
+ // [284] call chrout
jsr chrout
jmp __b73
// main::@73
@@ -11429,7 +11429,7 @@ main: {
// [288] chrout::petscii = right -- vbuz1=vbuc1
lda #right
sta.z chrout.petscii
- // [289] call chrout -- call_phi_near
+ // [289] call chrout
jsr chrout
jmp __b72
// main::@72
@@ -11445,7 +11445,7 @@ main: {
// [291] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [292] call chrout -- call_phi_near
+ // [292] call chrout
jsr chrout
// [293] phi from main::@7 to main::@9 [phi:main::@7->main::@9]
__b9_from___b7:
@@ -11465,7 +11465,7 @@ main: {
// [295] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [296] call chrout -- call_phi_near
+ // [296] call chrout
jsr chrout
jmp __b64
// main::@64
@@ -11482,7 +11482,7 @@ main: {
// [298] chrout::petscii = right -- vbuz1=vbuc1
lda #right
sta.z chrout.petscii
- // [299] call chrout -- call_phi_near
+ // [299] call chrout
jsr chrout
jmp __b63
// main::@63
@@ -11661,7 +11661,7 @@ clear_screen: {
// From 0-->505 (506 bytes). ClearScreen with byte 'n' with color 'm'
// [304] phi from clear_screen::@3 to gotoxy [phi:clear_screen::@3->gotoxy]
gotoxy_from___b3:
- // [304] phi gotoxy::y#4 = 0 [phi:clear_screen::@3->gotoxy#0] -- call_phi_near
+ // [304] phi gotoxy::y#4 = 0 [phi:clear_screen::@3->gotoxy#0] -- vbuz1=vbuc1
lda #0
sta.z gotoxy.y
jsr gotoxy
@@ -11671,7 +11671,7 @@ clear_screen: {
// [326] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [327] call chrout -- call_phi_near
+ // [327] call chrout
jsr chrout
jmp __breturn
// clear_screen::@return
@@ -11761,7 +11761,7 @@ cputs: {
// cputs::@2
__b2:
// [343] cputc::c#0 = cputs::c#1
- // [344] call cputc -- call_phi_near
+ // [344] call cputc
jsr cputc
jmp __b1_from___b2
}
@@ -11850,7 +11850,7 @@ write_score: {
// (!!) Needed. Possibly a bug
// [390] phi from write_score::@7 to utoa [phi:write_score::@7->utoa]
utoa_from___b7:
- // [390] phi utoa::value#10 = utoa::value#1 [phi:write_score::@7->utoa#0] -- call_phi_near
+ // [390] phi utoa::value#10 = utoa::value#1 [phi:write_score::@7->utoa#0] -- register_copy
jsr utoa
jmp __b11
// write_score::@11
@@ -11899,7 +11899,7 @@ write_score: {
// [366] chrout::petscii = yellow -- vbuz1=vbuc1
lda #yellow
sta.z chrout.petscii
- // [367] call chrout -- call_phi_near
+ // [367] call chrout
jsr chrout
jmp __b12
// write_score::@12
@@ -11907,7 +11907,7 @@ write_score: {
// [368] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [369] call chrout -- call_phi_near
+ // [369] call chrout
jsr chrout
jmp __b13
// write_score::@13
@@ -11936,7 +11936,7 @@ write_score: {
ldy.z m
lda points,y
sta.z chrout.petscii
- // [375] call chrout -- call_phi_near
+ // [375] call chrout
jsr chrout
jmp __b14
// write_score::@14
@@ -12138,7 +12138,7 @@ utoa: {
// [405] utoa_append::value#0 = utoa::value#3
// [406] utoa_append::sub#0 = utoa::digit_value#0
// [407] call utoa_append
- // [432] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near
+ // [432] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append]
utoa_append_from___b5:
jsr utoa_append
// [408] utoa_append::return#0 = utoa_append::value#2
@@ -12181,7 +12181,7 @@ read_chrono: {
bcc !+
inc.z div16u8u.dividend+1
!:
- // [414] call div16u8u -- call_phi_near
+ // [414] call div16u8u
jsr div16u8u
// [415] div16u8u::return#2 = div16u8u::return#0 -- vwuz1=vwuz2
lda.z div16u8u.return
@@ -12256,7 +12256,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
- // [428] call cputln -- call_phi_near
+ // [428] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@@ -12268,7 +12268,7 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
- // [431] call cputln -- call_phi_near
+ // [431] call cputln
jsr cputln
jmp __breturn
}
@@ -12355,7 +12355,7 @@ div16u8u: {
// [456] phi from div16u8u to divr8u [phi:div16u8u->divr8u]
divr8u_from_div16u8u:
// [456] phi divr8u::dividend#5 = divr8u::dividend#1 [phi:div16u8u->divr8u#0] -- register_copy
- // [456] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#1] -- call_phi_near
+ // [456] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#1] -- vbuz1=vbuc1
lda #0
sta.z divr8u.rem
jsr divr8u
@@ -12374,7 +12374,7 @@ div16u8u: {
// [456] phi from div16u8u::@1 to divr8u [phi:div16u8u::@1->divr8u]
divr8u_from___b1:
// [456] phi divr8u::dividend#5 = divr8u::dividend#2 [phi:div16u8u::@1->divr8u#0] -- register_copy
- // [456] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#1] -- call_phi_near
+ // [456] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#1] -- register_copy
jsr divr8u
// [446] divr8u::return#3 = divr8u::return#0
jmp __b2
@@ -12416,7 +12416,7 @@ cputln: {
sta.z conio_cursor_x
// [453] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
- // [454] call cscroll -- call_phi_near
+ // [454] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@@ -12537,7 +12537,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [485] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [485] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -12556,7 +12556,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [485] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [485] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -12573,7 +12573,7 @@ cscroll: {
// [495] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuz1=vbuc1
lda #' '
sta.z memset.c
- // [495] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [495] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -12589,7 +12589,7 @@ cscroll: {
// [495] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
memset_from___b4:
// [495] phi memset::c#4 = memset::c#1 [phi:cscroll::@4->memset#0] -- register_copy
- // [495] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [495] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -13931,11 +13931,11 @@ __start: {
// [7] m = 0 -- vbuz1=vbuc1
sta.z m
// #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll)
- // [8] call conio_c64_init -- call_phi_near
+ // [8] call conio_c64_init
jsr conio_c64_init
// [9] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [10] call main -- call_phi_near
+ // [10] call main
jsr main
// __start::@return
// [11] return
@@ -13969,7 +13969,7 @@ conio_c64_init: {
// [16] gotoxy::y#2 = conio_c64_init::line#2
// [17] call gotoxy
// [304] phi from conio_c64_init::@1 to gotoxy [phi:conio_c64_init::@1->gotoxy]
- // [304] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- call_phi_near
+ // [304] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- register_copy
jsr gotoxy
// conio_c64_init::@return
// }
@@ -14033,7 +14033,7 @@ main: {
// [20] chrout::petscii = lock -- vbuz1=vbuc1
lda #lock
sta.z chrout.petscii
- // [21] call chrout -- call_phi_near
+ // [21] call chrout
// border and black paper
jsr chrout
// main::@50
@@ -14041,7 +14041,7 @@ main: {
// [22] chrout::petscii = lower -- vbuz1=vbuc1
lda #lower
sta.z chrout.petscii
- // [23] call chrout -- call_phi_near
+ // [23] call chrout
//Lock UpperCase to Lowercase key
jsr chrout
// main::@51
@@ -14077,7 +14077,7 @@ main: {
// clear_screen(32,0)
// [27] call clear_screen
// [321] phi from main::@3 to clear_screen [phi:main::@3->clear_screen]
- // [321] phi clear_screen::n#5 = $20 [phi:main::@3->clear_screen#0] -- call_phi_near
+ // [321] phi clear_screen::n#5 = $20 [phi:main::@3->clear_screen#0] -- vbuz1=vbuc1
lda #$20
sta.z clear_screen.n
jsr clear_screen
@@ -14087,7 +14087,7 @@ main: {
// [29] call textcolor
// Clear Screen with spaces & black ink
// [334] phi from main::@52 to textcolor [phi:main::@52->textcolor]
- // [334] phi textcolor::color#7 = 7 [phi:main::@52->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 7 [phi:main::@52->textcolor#0] -- vbuz1=vbuc1
lda #7
sta.z textcolor.color
jsr textcolor
@@ -14096,7 +14096,7 @@ main: {
// cputs(intro)
// [31] call cputs
// [337] phi from main::@53 to cputs [phi:main::@53->cputs]
- // [337] phi cputs::s#11 = intro [phi:main::@53->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = intro [phi:main::@53->cputs#0] -- pbuz1=pbuc1
lda #intro
@@ -14108,7 +14108,7 @@ main: {
// [33] call textcolor
// Yellow ink
// [334] phi from main::@54 to textcolor [phi:main::@54->textcolor]
- // [334] phi textcolor::color#7 = 1 [phi:main::@54->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 1 [phi:main::@54->textcolor#0] -- vbuz1=vbuc1
lda #1
sta.z textcolor.color
jsr textcolor
@@ -14117,7 +14117,7 @@ main: {
// cputs(levels)
// [35] call cputs
// [337] phi from main::@55 to cputs [phi:main::@55->cputs]
- // [337] phi cputs::s#11 = levels [phi:main::@55->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = levels [phi:main::@55->cputs#0] -- pbuz1=pbuc1
lda #levels
@@ -14129,7 +14129,7 @@ main: {
// [37] call textcolor
// White
// [334] phi from main::@56 to textcolor [phi:main::@56->textcolor]
- // [334] phi textcolor::color#7 = 2 [phi:main::@56->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 2 [phi:main::@56->textcolor#0] -- vbuz1=vbuc1
lda #2
sta.z textcolor.color
jsr textcolor
@@ -14138,7 +14138,7 @@ main: {
// cputs(foot)
// [39] call cputs
// [337] phi from main::@57 to cputs [phi:main::@57->cputs]
- // [337] phi cputs::s#11 = foot [phi:main::@57->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = foot [phi:main::@57->cputs#0] -- pbuz1=pbuc1
lda #foot
@@ -14165,7 +14165,7 @@ main: {
// [44] call clear_screen
// wait for 1-3-5-7-9 keys only
// [321] phi from main::@5 to clear_screen [phi:main::@5->clear_screen]
- // [321] phi clear_screen::n#5 = 4 [phi:main::@5->clear_screen#0] -- call_phi_near
+ // [321] phi clear_screen::n#5 = 4 [phi:main::@5->clear_screen#0] -- vbuz1=vbuc1
lda #4
sta.z clear_screen.n
jsr clear_screen
@@ -14178,7 +14178,7 @@ main: {
// [46] chrout::petscii = reverse_on -- vbuz1=vbuc1
lda #reverse_on
sta.z chrout.petscii
- // [47] call chrout -- call_phi_near
+ // [47] call chrout
// Graphic mode
jsr chrout
// main::@59
@@ -14186,14 +14186,14 @@ main: {
// [48] chrout::petscii = red -- vbuz1=vbuc1
lda #red
sta.z chrout.petscii
- // [49] call chrout -- call_phi_near
+ // [49] call chrout
jsr chrout
// main::@60
// chrout(down)
// [50] chrout::petscii = down -- vbuz1=vbuc1
lda #down
sta.z chrout.petscii
- // [51] call chrout -- call_phi_near
+ // [51] call chrout
jsr chrout
// [52] phi from main::@60 to main::@6 [phi:main::@60->main::@6]
// [52] phi n#89 = n#109 [phi:main::@60->main::@6#0] -- register_copy
@@ -14217,7 +14217,7 @@ main: {
// [54] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [55] call chrout -- call_phi_near
+ // [55] call chrout
// 23 rows * 22 columns (7680 to 8185). 506 positions.
jsr chrout
// main::@61
@@ -14232,7 +14232,7 @@ main: {
// [58] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [59] call chrout -- call_phi_near
+ // [59] call chrout
//last brick from last line (#23) to avoid scrolling
jsr chrout
// main::@62
@@ -14277,7 +14277,7 @@ main: {
// Write differential random bricks depending on 'l' level choosen
// [345] phi from main::@13 to random [phi:main::@13->random]
// [345] phi random::n#4 = random::n#0 [phi:main::@13->random#0] -- register_copy
- // [345] phi random::k#4 = random::k#0 [phi:main::@13->random#1] -- call_phi_near
+ // [345] phi random::k#4 = random::k#0 [phi:main::@13->random#1] -- register_copy
jsr random
// main::@71
// z+m
@@ -14322,7 +14322,7 @@ main: {
// [71] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [72] call chrout -- call_phi_near
+ // [72] call chrout
// Duck #1
jsr chrout
// main::@65
@@ -14330,35 +14330,35 @@ main: {
// [73] chrout::petscii = yellow -- vbuz1=vbuc1
lda #yellow
sta.z chrout.petscii
- // [74] call chrout -- call_phi_near
+ // [74] call chrout
jsr chrout
// main::@66
// chrout(80)
// [75] chrout::petscii = $50 -- vbuz1=vbuc1
lda #$50
sta.z chrout.petscii
- // [76] call chrout -- call_phi_near
+ // [76] call chrout
jsr chrout
// main::@67
// chrout(84)
// [77] chrout::petscii = $54 -- vbuz1=vbuc1
lda #$54
sta.z chrout.petscii
- // [78] call chrout -- call_phi_near
+ // [78] call chrout
jsr chrout
// main::@68
// chrout(83)
// [79] chrout::petscii = $53 -- vbuz1=vbuc1
lda #$53
sta.z chrout.petscii
- // [80] call chrout -- call_phi_near
+ // [80] call chrout
jsr chrout
// main::@69
// chrout(58)
// [81] chrout::petscii = $3a -- vbuz1=vbuc1
lda #$3a
sta.z chrout.petscii
- // [82] call chrout -- call_phi_near
+ // [82] call chrout
jsr chrout
// main::@70
// POKE
@@ -14385,7 +14385,7 @@ main: {
// [87] call write_score
// Write 'TM:9', yellow
// [351] phi from main::@19 to write_score [phi:main::@19->write_score]
- // [351] phi score#13 = 0 [phi:main::@19->write_score#0] -- call_phi_near
+ // [351] phi score#13 = 0 [phi:main::@19->write_score#0] -- vwuz1=vbuc1
lda #<0
sta.z score
sta.z score+1
@@ -14395,7 +14395,7 @@ main: {
// [88] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [89] call chrout -- call_phi_near
+ // [89] call chrout
// Write Score (yellow)
jsr chrout
// main::@76
@@ -14403,7 +14403,7 @@ main: {
// [90] chrout::petscii = green -- vbuz1=vbuc1
lda #green
sta.z chrout.petscii
- // [91] call chrout -- call_phi_near
+ // [91] call chrout
jsr chrout
// main::@77
// POKE
@@ -14453,21 +14453,21 @@ main: {
// [96] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [97] call chrout -- call_phi_near
+ // [97] call chrout
jsr chrout
// main::@79
// chrout(green)
// [98] chrout::petscii = green -- vbuz1=vbuc1
lda #green
sta.z chrout.petscii
- // [99] call chrout -- call_phi_near
+ // [99] call chrout
jsr chrout
// main::@80
// chrout(reverse_on)
// [100] chrout::petscii = reverse_on -- vbuz1=vbuc1
lda #reverse_on
sta.z chrout.petscii
- // [101] call chrout -- call_phi_near
+ // [101] call chrout
jsr chrout
// main::@81
// POKE
@@ -14490,14 +14490,14 @@ main: {
// [104] chrout::petscii = $31 -- vbuz1=vbuc1
lda #$31
sta.z chrout.petscii
- // [105] call chrout -- call_phi_near
+ // [105] call chrout
jsr chrout
// main::@82
// chrout(48)
// [106] chrout::petscii = $30 -- vbuz1=vbuc1
lda #$30
sta.z chrout.petscii
- // [107] call chrout -- call_phi_near
+ // [107] call chrout
jsr chrout
// [108] phi from main::@103 main::@104 main::@105 main::@106 main::@23 main::@82 main::@84 to main::@24 [phi:main::@103/main::@104/main::@105/main::@106/main::@23/main::@82/main::@84->main::@24]
__b11:
@@ -14509,7 +14509,7 @@ main: {
// [345] phi random::n#4 = $ff [phi:main::@24->random#0] -- vbuz1=vbuc1
lda #$ff
sta.z random.n
- // [345] phi random::k#4 = 0 [phi:main::@24->random#1] -- call_phi_near
+ // [345] phi random::k#4 = 0 [phi:main::@24->random#1] -- vbuz1=vbuc1
lda #0
sta.z random.k
jsr random
@@ -14526,7 +14526,7 @@ main: {
// [345] phi random::n#4 = $ff [phi:main::@83->random#0] -- vbuz1=vbuc1
lda #$ff
sta.z random.n
- // [345] phi random::k#4 = 0 [phi:main::@83->random#1] -- call_phi_near
+ // [345] phi random::k#4 = 0 [phi:main::@83->random#1] -- vbuz1=vbuc1
lda #0
sta.z random.k
jsr random
@@ -14607,7 +14607,7 @@ main: {
// [122] phi from main::@103 to main::@25 [phi:main::@103->main::@25]
// main::@25
// chrono_restart()
- // [123] call chrono_restart -- call_phi_near
+ // [123] call chrono_restart
jsr chrono_restart
// [124] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
// [124] phi n#20 = n#52 [phi:main::@25->main::@26#0] -- register_copy
@@ -14651,7 +14651,7 @@ main: {
// write_score()
// [128] call write_score
// [351] phi from main::@28 to write_score [phi:main::@28->write_score]
- // [351] phi score#13 = score#4 [phi:main::@28->write_score#0] -- call_phi_near
+ // [351] phi score#13 = score#4 [phi:main::@28->write_score#0] -- register_copy
jsr write_score
// main::@86
// POKE
@@ -14662,7 +14662,7 @@ main: {
// [130] call wait
// [381] phi from main::@86 to wait [phi:main::@86->wait]
// [381] phi z#53 = z#100 [phi:main::@86->wait#0] -- register_copy
- // [381] phi wait::n#6 = $14 [phi:main::@86->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = $14 [phi:main::@86->wait#1] -- vbuz1=vbuc1
lda #$14
sta.z wait.n
jsr wait
@@ -14747,7 +14747,7 @@ main: {
// [145] call clear_screen
// 10 ducks
// [321] phi from main::@44 to clear_screen [phi:main::@44->clear_screen]
- // [321] phi clear_screen::n#5 = 4 [phi:main::@44->clear_screen#0] -- call_phi_near
+ // [321] phi clear_screen::n#5 = 4 [phi:main::@44->clear_screen#0] -- vbuz1=vbuc1
lda #4
sta.z clear_screen.n
jsr clear_screen
@@ -14760,7 +14760,7 @@ main: {
// [147] chrout::petscii = lower -- vbuz1=vbuc1
lda #lower
sta.z chrout.petscii
- // [148] call chrout -- call_phi_near
+ // [148] call chrout
jsr chrout
// [149] phi from main::@91 to main::@92 [phi:main::@91->main::@92]
// main::@92
@@ -14768,7 +14768,7 @@ main: {
// [150] call textcolor
// Return to text mode, lowcase
// [334] phi from main::@92 to textcolor [phi:main::@92->textcolor]
- // [334] phi textcolor::color#7 = 7 [phi:main::@92->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 7 [phi:main::@92->textcolor#0] -- vbuz1=vbuc1
lda #7
sta.z textcolor.color
jsr textcolor
@@ -14777,7 +14777,7 @@ main: {
// cputs(game_over)
// [152] call cputs
// [337] phi from main::@93 to cputs [phi:main::@93->cputs]
- // [337] phi cputs::s#11 = game_over [phi:main::@93->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = game_over [phi:main::@93->cputs#0] -- pbuz1=pbuc1
lda #game_over
@@ -14789,7 +14789,7 @@ main: {
// [154] call textcolor
// Yellow
// [334] phi from main::@94 to textcolor [phi:main::@94->textcolor]
- // [334] phi textcolor::color#7 = 2 [phi:main::@94->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 2 [phi:main::@94->textcolor#0] -- vbuz1=vbuc1
lda #2
sta.z textcolor.color
jsr textcolor
@@ -14798,7 +14798,7 @@ main: {
// cputs(your_score)
// [156] call cputs
// [337] phi from main::@95 to cputs [phi:main::@95->cputs]
- // [337] phi cputs::s#11 = your_score [phi:main::@95->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = your_score [phi:main::@95->cputs#0] -- pbuz1=pbuc1
lda #your_score
@@ -14809,7 +14809,7 @@ main: {
// cputs(buffer)
// [158] call cputs
// [337] phi from main::@96 to cputs [phi:main::@96->cputs]
- // [337] phi cputs::s#11 = buffer [phi:main::@96->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = buffer [phi:main::@96->cputs#0] -- pbuz1=pbuc1
lda #buffer
@@ -14821,7 +14821,7 @@ main: {
// [160] call textcolor
// Red
// [334] phi from main::@97 to textcolor [phi:main::@97->textcolor]
- // [334] phi textcolor::color#7 = 3 [phi:main::@97->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 3 [phi:main::@97->textcolor#0] -- vbuz1=vbuc1
lda #3
sta.z textcolor.color
jsr textcolor
@@ -14830,7 +14830,7 @@ main: {
// cputs(high_score)
// [162] call cputs
// [337] phi from main::@98 to cputs [phi:main::@98->cputs]
- // [337] phi cputs::s#11 = high_score [phi:main::@98->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = high_score [phi:main::@98->cputs#0] -- pbuz1=pbuc1
lda #high_score
@@ -14867,14 +14867,14 @@ main: {
sta.z utoa.value+1
// [167] call utoa
// [390] phi from main::@46 to utoa [phi:main::@46->utoa]
- // [390] phi utoa::value#10 = utoa::value#2 [phi:main::@46->utoa#0] -- call_phi_near
+ // [390] phi utoa::value#10 = utoa::value#2 [phi:main::@46->utoa#0] -- register_copy
jsr utoa
// [168] phi from main::@46 to main::@100 [phi:main::@46->main::@100]
// main::@100
// cputs(buffer)
// [169] call cputs
// [337] phi from main::@100 to cputs [phi:main::@100->cputs]
- // [337] phi cputs::s#11 = buffer [phi:main::@100->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = buffer [phi:main::@100->cputs#0] -- pbuz1=pbuc1
lda #buffer
@@ -14886,7 +14886,7 @@ main: {
// [171] call textcolor
// Cyan
// [334] phi from main::@101 to textcolor [phi:main::@101->textcolor]
- // [334] phi textcolor::color#7 = 1 [phi:main::@101->textcolor#0] -- call_phi_near
+ // [334] phi textcolor::color#7 = 1 [phi:main::@101->textcolor#0] -- vbuz1=vbuc1
lda #1
sta.z textcolor.color
jsr textcolor
@@ -14895,7 +14895,7 @@ main: {
// cputs(play_again)
// [173] call cputs
// [337] phi from main::@102 to cputs [phi:main::@102->cputs]
- // [337] phi cputs::s#11 = play_again [phi:main::@102->cputs#0] -- call_phi_near
+ // [337] phi cputs::s#11 = play_again [phi:main::@102->cputs#0] -- pbuz1=pbuc1
lda #play_again
@@ -14951,7 +14951,7 @@ main: {
// main::@27
__b27:
// read_chrono()
- // [182] call read_chrono -- call_phi_near
+ // [182] call read_chrono
jsr read_chrono
// main::@85
// m=PEEK
@@ -15123,7 +15123,7 @@ main: {
// [212] call wait
// [381] phi from main::@42 to wait [phi:main::@42->wait]
// [381] phi z#53 = z#100 [phi:main::@42->wait#0] -- register_copy
- // [381] phi wait::n#6 = $a [phi:main::@42->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = $a [phi:main::@42->wait#1] -- vbuz1=vbuc1
lda #$a
sta.z wait.n
jsr wait
@@ -15280,7 +15280,7 @@ main: {
// Clear peephole if there is not bricks contact
// [381] phi from main::@36 to wait [phi:main::@36->wait]
// [381] phi z#53 = z#48 [phi:main::@36->wait#0] -- register_copy
- // [381] phi wait::n#6 = 5 [phi:main::@36->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = 5 [phi:main::@36->wait#1] -- vbuz1=vbuc1
lda #5
sta.z wait.n
jsr wait
@@ -15371,7 +15371,7 @@ main: {
// [254] call wait
// [381] phi from main::@89 to wait [phi:main::@89->wait]
// [381] phi z#53 = z#25 [phi:main::@89->wait#0] -- register_copy
- // [381] phi wait::n#6 = 5 [phi:main::@89->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = 5 [phi:main::@89->wait#1] -- vbuz1=vbuc1
lda #5
sta.z wait.n
jsr wait
@@ -15494,7 +15494,7 @@ main: {
// write_score()
// [269] call write_score
// [351] phi from main::@34 to write_score [phi:main::@34->write_score]
- // [351] phi score#13 = score#6 [phi:main::@34->write_score#0] -- call_phi_near
+ // [351] phi score#13 = score#6 [phi:main::@34->write_score#0] -- register_copy
jsr write_score
// [270] phi from main::@34 to main::@88 [phi:main::@34->main::@88]
// main::@88
@@ -15502,7 +15502,7 @@ main: {
// [271] call wait
// [381] phi from main::@88 to wait [phi:main::@88->wait]
// [381] phi z#53 = z#100 [phi:main::@88->wait#0] -- register_copy
- // [381] phi wait::n#6 = $a [phi:main::@88->wait#1] -- call_phi_near
+ // [381] phi wait::n#6 = $a [phi:main::@88->wait#1] -- vbuz1=vbuc1
lda #$a
sta.z wait.n
jsr wait
@@ -15525,7 +15525,7 @@ main: {
// [273] chrout::petscii = main::$57 -- vbuz1=vwuz2
lda.z __57
sta.z chrout.petscii
- // [274] call chrout -- call_phi_near
+ // [274] call chrout
jsr chrout
jmp __b11
// main::@21
@@ -15535,7 +15535,7 @@ main: {
ldy.z j_2
lda ducknumber,y
sta.z chrout.petscii
- // [276] call chrout -- call_phi_near
+ // [276] call chrout
jsr chrout
// main::@78
// for (j=0; j<5; j++)
@@ -15551,7 +15551,7 @@ main: {
ldy.z j_1
lda chrono,y
sta.z chrout.petscii
- // [279] call chrout -- call_phi_near
+ // [279] call chrout
jsr chrout
// main::@74
// for (j=0; j<4; ++j)
@@ -15577,7 +15577,7 @@ main: {
// [283] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [284] call chrout -- call_phi_near
+ // [284] call chrout
jsr chrout
// main::@73
// z+m
@@ -15618,7 +15618,7 @@ main: {
// [288] chrout::petscii = right -- vbuz1=vbuc1
lda #right
sta.z chrout.petscii
- // [289] call chrout -- call_phi_near
+ // [289] call chrout
jsr chrout
// main::@72
// for (j=1; j<=m; ++j)
@@ -15633,7 +15633,7 @@ main: {
// [291] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [292] call chrout -- call_phi_near
+ // [292] call chrout
jsr chrout
// [293] phi from main::@7 to main::@9 [phi:main::@7->main::@9]
// [293] phi n#101 = 2 [phi:main::@7->main::@9#0] -- vbuz1=vbuc1
@@ -15651,7 +15651,7 @@ main: {
// [295] chrout::petscii = brick -- vbuz1=vbuc1
lda #brick
sta.z chrout.petscii
- // [296] call chrout -- call_phi_near
+ // [296] call chrout
jsr chrout
// main::@64
// for (k=1;k<22;k++)
@@ -15667,7 +15667,7 @@ main: {
// [298] chrout::petscii = right -- vbuz1=vbuc1
lda #right
sta.z chrout.petscii
- // [299] call chrout -- call_phi_near
+ // [299] call chrout
jsr chrout
// main::@63
// for(n=2;n<22;++n)
@@ -15839,7 +15839,7 @@ clear_screen: {
// [325] call gotoxy
// From 0-->505 (506 bytes). ClearScreen with byte 'n' with color 'm'
// [304] phi from clear_screen::@3 to gotoxy [phi:clear_screen::@3->gotoxy]
- // [304] phi gotoxy::y#4 = 0 [phi:clear_screen::@3->gotoxy#0] -- call_phi_near
+ // [304] phi gotoxy::y#4 = 0 [phi:clear_screen::@3->gotoxy#0] -- vbuz1=vbuc1
lda #0
sta.z gotoxy.y
jsr gotoxy
@@ -15848,7 +15848,7 @@ clear_screen: {
// [326] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [327] call chrout -- call_phi_near
+ // [327] call chrout
jsr chrout
// clear_screen::@return
// }
@@ -15935,7 +15935,7 @@ cputs: {
__b2:
// cputc(c)
// [343] cputc::c#0 = cputs::c#1
- // [344] call cputc -- call_phi_near
+ // [344] call cputc
jsr cputc
jmp __b1
}
@@ -16014,7 +16014,7 @@ write_score: {
// [358] call utoa
// (!!) Needed. Possibly a bug
// [390] phi from write_score::@7 to utoa [phi:write_score::@7->utoa]
- // [390] phi utoa::value#10 = utoa::value#1 [phi:write_score::@7->utoa#0] -- call_phi_near
+ // [390] phi utoa::value#10 = utoa::value#1 [phi:write_score::@7->utoa#0] -- register_copy
jsr utoa
// write_score::@11
// if (score>9)
@@ -16063,14 +16063,14 @@ write_score: {
// [366] chrout::petscii = yellow -- vbuz1=vbuc1
lda #yellow
sta.z chrout.petscii
- // [367] call chrout -- call_phi_near
+ // [367] call chrout
jsr chrout
// write_score::@12
// chrout(home)
// [368] chrout::petscii = home -- vbuz1=vbuc1
lda #home
sta.z chrout.petscii
- // [369] call chrout -- call_phi_near
+ // [369] call chrout
jsr chrout
// write_score::@13
// POKE
@@ -16099,7 +16099,7 @@ write_score: {
ldy.z m
lda points,y
sta.z chrout.petscii
- // [375] call chrout -- call_phi_near
+ // [375] call chrout
jsr chrout
// write_score::@14
// for (m=0;m<4;m++)
@@ -16295,7 +16295,7 @@ utoa: {
// [405] utoa_append::value#0 = utoa::value#3
// [406] utoa_append::sub#0 = utoa::digit_value#0
// [407] call utoa_append
- // [432] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near
+ // [432] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append]
jsr utoa_append
// utoa_append(buffer++, value, digit_value)
// [408] utoa_append::return#0 = utoa_append::value#2
@@ -16340,7 +16340,7 @@ read_chrono: {
bcc !+
inc.z div16u8u.dividend+1
!:
- // [414] call div16u8u -- call_phi_near
+ // [414] call div16u8u
jsr div16u8u
// [415] div16u8u::return#2 = div16u8u::return#0 -- vwuz1=vwuz2
lda.z div16u8u.return
@@ -16413,7 +16413,7 @@ cputc: {
// [427] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
- // [428] call cputln -- call_phi_near
+ // [428] call cputln
jsr cputln
// cputc::@return
__breturn:
@@ -16424,7 +16424,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
- // [431] call cputln -- call_phi_near
+ // [431] call cputln
jsr cputln
rts
}
@@ -16509,7 +16509,7 @@ div16u8u: {
// [440] call divr8u
// [456] phi from div16u8u to divr8u [phi:div16u8u->divr8u]
// [456] phi divr8u::dividend#5 = divr8u::dividend#1 [phi:div16u8u->divr8u#0] -- register_copy
- // [456] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#1] -- call_phi_near
+ // [456] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#1] -- vbuz1=vbuc1
lda #0
sta.z divr8u.rem
jsr divr8u
@@ -16527,7 +16527,7 @@ div16u8u: {
// [445] call divr8u
// [456] phi from div16u8u::@1 to divr8u [phi:div16u8u::@1->divr8u]
// [456] phi divr8u::dividend#5 = divr8u::dividend#2 [phi:div16u8u::@1->divr8u#0] -- register_copy
- // [456] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#1] -- call_phi_near
+ // [456] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#1] -- register_copy
jsr divr8u
// unsigned char quotient_lo = divr8u(BYTE0(dividend), divisor, rem8u)
// [446] divr8u::return#3 = divr8u::return#0
@@ -16573,7 +16573,7 @@ cputln: {
// [453] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
- // [454] call cscroll -- call_phi_near
+ // [454] call cscroll
jsr cscroll
// cputln::@return
// }
@@ -16684,7 +16684,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [485] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [485] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -16700,7 +16700,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [485] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [485] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -16714,7 +16714,7 @@ cscroll: {
// [495] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuz1=vbuc1
lda #' '
sta.z memset.c
- // [495] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [495] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -16728,7 +16728,7 @@ cscroll: {
// [480] call memset
// [495] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [495] phi memset::c#4 = memset::c#1 [phi:cscroll::@4->memset#0] -- register_copy
- // [495] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [495] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
diff --git a/src/test/ref/emptyblock-error.log b/src/test/ref/emptyblock-error.log
index e0cecc608..94603b9c6 100644
--- a/src/test/ref/emptyblock-error.log
+++ b/src/test/ref/emptyblock-error.log
@@ -210,7 +210,7 @@ main: {
// main::@1
__b1:
// [2] call menu
- // [3] phi from main::@1 to menu [phi:main::@1->menu] -- call_phi_near
+ // [3] phi from main::@1 to menu [phi:main::@1->menu]
menu_from___b1:
jsr menu
jmp __b1_from___b1
@@ -223,7 +223,7 @@ menu: {
// menu::@1
__b1:
// [5] call mode
- // [7] phi from menu::@1 to mode [phi:menu::@1->mode] -- call_phi_near
+ // [7] phi from menu::@1 to mode [phi:menu::@1->mode]
mode_from___b1:
jsr mode
jmp __breturn
@@ -301,7 +301,7 @@ main: {
__b1:
// menu()
// [2] call menu
- // [3] phi from main::@1 to menu [phi:main::@1->menu] -- call_phi_near
+ // [3] phi from main::@1 to menu [phi:main::@1->menu]
jsr menu
jmp __b1
}
@@ -311,7 +311,7 @@ menu: {
// menu::@1
// mode()
// [5] call mode
- // [7] phi from menu::@1 to mode [phi:menu::@1->mode] -- call_phi_near
+ // [7] phi from menu::@1 to mode [phi:menu::@1->mode]
jsr mode
// menu::@return
// }
diff --git a/src/test/ref/enum-5.log b/src/test/ref/enum-5.log
index 22495f37d..de8d812af 100644
--- a/src/test/ref/enum-5.log
+++ b/src/test/ref/enum-5.log
@@ -120,7 +120,7 @@ main: {
// [0] *main::SCREEN = main::ON -- _deref_pbuc1=vbuc2
lda #ON
sta SCREEN
- // [1] call test -- call_phi_near
+ // [1] call test
jsr test
jmp __breturn
// main::@return
@@ -186,7 +186,7 @@ main: {
lda #ON
sta SCREEN
// test()
- // [1] call test -- call_phi_near
+ // [1] call test
jsr test
// main::@return
// }
diff --git a/src/test/ref/euclid-3.log b/src/test/ref/euclid-3.log
index 2f5eec06d..1fad1e5a5 100644
--- a/src/test/ref/euclid-3.log
+++ b/src/test/ref/euclid-3.log
@@ -1274,7 +1274,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call print_cls
- // [15] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [15] phi from main to print_cls [phi:main->print_cls]
print_cls_from_main:
jsr print_cls
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -1298,7 +1298,7 @@ main: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [18] phi print_euclid::a#10 = $80 [phi:main::@1->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $80 [phi:main::@1->print_euclid#3] -- vbuz1=vbuc1
lda #$80
sta.z print_euclid.a
jsr print_euclid
@@ -1318,7 +1318,7 @@ main: {
lda #$45
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#65 [phi:main::@2->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $a9 [phi:main::@2->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $a9 [phi:main::@2->print_euclid#3] -- vbuz1=vbuc1
lda #$a9
sta.z print_euclid.a
jsr print_euclid
@@ -1338,7 +1338,7 @@ main: {
lda #$37
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#66 [phi:main::@3->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $9b [phi:main::@3->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $9b [phi:main::@3->print_euclid#3] -- vbuz1=vbuc1
lda #$9b
sta.z print_euclid.a
jsr print_euclid
@@ -1358,7 +1358,7 @@ main: {
lda #3
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#67 [phi:main::@4->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $c7 [phi:main::@4->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $c7 [phi:main::@4->print_euclid#3] -- vbuz1=vbuc1
lda #$c7
sta.z print_euclid.a
jsr print_euclid
@@ -1378,7 +1378,7 @@ main: {
lda #$1a
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#68 [phi:main::@5->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $5b [phi:main::@5->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $5b [phi:main::@5->print_euclid#3] -- vbuz1=vbuc1
lda #$5b
sta.z print_euclid.a
jsr print_euclid
@@ -1398,7 +1398,7 @@ main: {
lda #$bb
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#69 [phi:main::@6->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $77 [phi:main::@6->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $77 [phi:main::@6->print_euclid#3] -- vbuz1=vbuc1
lda #$77
sta.z print_euclid.a
jsr print_euclid
@@ -1412,7 +1412,7 @@ main: {
// Clear the screen. Also resets current line/char cursor.
print_cls: {
// [16] call memset
- // [36] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [36] phi from print_cls to memset [phi:print_cls->memset]
memset_from_print_cls:
jsr memset
jmp __breturn
@@ -1432,7 +1432,7 @@ print_euclid: {
// [42] phi from print_euclid to print_uchar [phi:print_euclid->print_uchar]
print_uchar_from_print_euclid:
// [42] phi print_char_cursor#53 = print_char_cursor#55 [phi:print_euclid->print_uchar#0] -- register_copy
- // [42] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_euclid->print_uchar#1] -- call_phi_near
+ // [42] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_euclid->print_uchar#1] -- register_copy
jsr print_uchar
// [21] phi from print_euclid to print_euclid::@1 [phi:print_euclid->print_euclid::@1]
__b1_from_print_euclid:
@@ -1443,7 +1443,7 @@ print_euclid: {
// [50] phi from print_euclid::@1 to print_char [phi:print_euclid::@1->print_char]
print_char_from___b1:
// [50] phi print_char_cursor#32 = print_char_cursor#33 [phi:print_euclid::@1->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@1->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@1->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
jmp __b2
@@ -1455,7 +1455,7 @@ print_euclid: {
// [42] phi from print_euclid::@2 to print_uchar [phi:print_euclid::@2->print_uchar]
print_uchar_from___b2:
// [42] phi print_char_cursor#53 = print_char_cursor#33 [phi:print_euclid::@2->print_uchar#0] -- register_copy
- // [42] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_euclid::@2->print_uchar#1] -- call_phi_near
+ // [42] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_euclid::@2->print_uchar#1] -- register_copy
jsr print_uchar
// [25] phi from print_euclid::@2 to print_euclid::@3 [phi:print_euclid::@2->print_euclid::@3]
__b3_from___b2:
@@ -1466,7 +1466,7 @@ print_euclid: {
// [50] phi from print_euclid::@3 to print_char [phi:print_euclid::@3->print_char]
print_char_from___b3:
// [50] phi print_char_cursor#32 = print_char_cursor#33 [phi:print_euclid::@3->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@3->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
jmp __b4
@@ -1476,7 +1476,7 @@ print_euclid: {
// [28] euclid::b#0 = print_euclid::b#10 -- vbuxx=vbuz1
ldx.z b
// [29] call euclid
- // [54] phi from print_euclid::@4 to euclid [phi:print_euclid::@4->euclid] -- call_phi_near
+ // [54] phi from print_euclid::@4 to euclid [phi:print_euclid::@4->euclid]
euclid_from___b4:
jsr euclid
// [30] euclid::return#0 = euclid::a#2 -- vbuaa=vbuz1
@@ -1490,7 +1490,7 @@ print_euclid: {
// [42] phi from print_euclid::@5 to print_uchar [phi:print_euclid::@5->print_uchar]
print_uchar_from___b5:
// [42] phi print_char_cursor#53 = print_char_cursor#33 [phi:print_euclid::@5->print_uchar#0] -- register_copy
- // [42] phi print_uchar::b#3 = print_uchar::b#2 [phi:print_euclid::@5->print_uchar#1] -- call_phi_near
+ // [42] phi print_uchar::b#3 = print_uchar::b#2 [phi:print_euclid::@5->print_uchar#1] -- register_copy
jsr print_uchar
// [33] phi from print_euclid::@5 to print_euclid::@6 [phi:print_euclid::@5->print_euclid::@6]
__b6_from___b5:
@@ -1498,7 +1498,7 @@ print_euclid: {
// print_euclid::@6
__b6:
// [34] call print_ln
- // [61] phi from print_euclid::@6 to print_ln [phi:print_euclid::@6->print_ln] -- call_phi_near
+ // [61] phi from print_euclid::@6 to print_ln [phi:print_euclid::@6->print_ln]
print_ln_from___b6:
jsr print_ln
jmp __breturn
@@ -1572,7 +1572,7 @@ print_uchar: {
// [50] phi from print_uchar to print_char [phi:print_uchar->print_char]
print_char_from_print_uchar:
// [50] phi print_char_cursor#32 = print_char_cursor#53 [phi:print_uchar->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy
jsr print_char
jmp __b1
// print_uchar::@1
@@ -1586,7 +1586,7 @@ print_uchar: {
// [50] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char]
print_char_from___b1:
// [50] phi print_char_cursor#32 = print_char_cursor#33 [phi:print_uchar::@1->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy
jsr print_char
jmp __breturn
// print_uchar::@return
@@ -1885,7 +1885,7 @@ Score: 1607
main: {
// print_cls()
// [1] call print_cls
- // [15] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [15] phi from main to print_cls [phi:main->print_cls]
jsr print_cls
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
@@ -1905,7 +1905,7 @@ main: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [18] phi print_euclid::a#10 = $80 [phi:main::@1->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $80 [phi:main::@1->print_euclid#3] -- vbuz1=vbuc1
lda #$80
sta.z print_euclid.a
jsr print_euclid
@@ -1923,7 +1923,7 @@ main: {
lda #$45
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#65 [phi:main::@2->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $a9 [phi:main::@2->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $a9 [phi:main::@2->print_euclid#3] -- vbuz1=vbuc1
lda #$a9
sta.z print_euclid.a
jsr print_euclid
@@ -1941,7 +1941,7 @@ main: {
lda #$37
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#66 [phi:main::@3->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $9b [phi:main::@3->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $9b [phi:main::@3->print_euclid#3] -- vbuz1=vbuc1
lda #$9b
sta.z print_euclid.a
jsr print_euclid
@@ -1959,7 +1959,7 @@ main: {
lda #3
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#67 [phi:main::@4->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $c7 [phi:main::@4->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $c7 [phi:main::@4->print_euclid#3] -- vbuz1=vbuc1
lda #$c7
sta.z print_euclid.a
jsr print_euclid
@@ -1977,7 +1977,7 @@ main: {
lda #$1a
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#68 [phi:main::@5->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $5b [phi:main::@5->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $5b [phi:main::@5->print_euclid#3] -- vbuz1=vbuc1
lda #$5b
sta.z print_euclid.a
jsr print_euclid
@@ -1995,7 +1995,7 @@ main: {
lda #$bb
sta.z print_euclid.b
// [18] phi print_char_cursor#55 = print_char_cursor#69 [phi:main::@6->print_euclid#2] -- register_copy
- // [18] phi print_euclid::a#10 = $77 [phi:main::@6->print_euclid#3] -- call_phi_near
+ // [18] phi print_euclid::a#10 = $77 [phi:main::@6->print_euclid#3] -- vbuz1=vbuc1
lda #$77
sta.z print_euclid.a
jsr print_euclid
@@ -2009,7 +2009,7 @@ main: {
print_cls: {
// memset(print_screen, ' ', 1000)
// [16] call memset
- // [36] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [36] phi from print_cls to memset [phi:print_cls->memset]
jsr memset
// print_cls::@return
// }
@@ -2027,7 +2027,7 @@ print_euclid: {
// [20] call print_uchar
// [42] phi from print_euclid to print_uchar [phi:print_euclid->print_uchar]
// [42] phi print_char_cursor#53 = print_char_cursor#55 [phi:print_euclid->print_uchar#0] -- register_copy
- // [42] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_euclid->print_uchar#1] -- call_phi_near
+ // [42] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_euclid->print_uchar#1] -- register_copy
jsr print_uchar
// [21] phi from print_euclid to print_euclid::@1 [phi:print_euclid->print_euclid::@1]
// print_euclid::@1
@@ -2035,7 +2035,7 @@ print_euclid: {
// [22] call print_char
// [50] phi from print_euclid::@1 to print_char [phi:print_euclid::@1->print_char]
// [50] phi print_char_cursor#32 = print_char_cursor#33 [phi:print_euclid::@1->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@1->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@1->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// print_euclid::@2
@@ -2045,7 +2045,7 @@ print_euclid: {
// [24] call print_uchar
// [42] phi from print_euclid::@2 to print_uchar [phi:print_euclid::@2->print_uchar]
// [42] phi print_char_cursor#53 = print_char_cursor#33 [phi:print_euclid::@2->print_uchar#0] -- register_copy
- // [42] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_euclid::@2->print_uchar#1] -- call_phi_near
+ // [42] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_euclid::@2->print_uchar#1] -- register_copy
jsr print_uchar
// [25] phi from print_euclid::@2 to print_euclid::@3 [phi:print_euclid::@2->print_euclid::@3]
// print_euclid::@3
@@ -2053,7 +2053,7 @@ print_euclid: {
// [26] call print_char
// [50] phi from print_euclid::@3 to print_char [phi:print_euclid::@3->print_char]
// [50] phi print_char_cursor#32 = print_char_cursor#33 [phi:print_euclid::@3->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@3->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = ' ' [phi:print_euclid::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// print_euclid::@4
@@ -2062,7 +2062,7 @@ print_euclid: {
// [28] euclid::b#0 = print_euclid::b#10 -- vbuxx=vbuz1
ldx.z b
// [29] call euclid
- // [54] phi from print_euclid::@4 to euclid [phi:print_euclid::@4->euclid] -- call_phi_near
+ // [54] phi from print_euclid::@4 to euclid [phi:print_euclid::@4->euclid]
jsr euclid
// euclid(a,b)
// [30] euclid::return#0 = euclid::a#2 -- vbuaa=vbuz1
@@ -2074,13 +2074,13 @@ print_euclid: {
// [32] call print_uchar
// [42] phi from print_euclid::@5 to print_uchar [phi:print_euclid::@5->print_uchar]
// [42] phi print_char_cursor#53 = print_char_cursor#33 [phi:print_euclid::@5->print_uchar#0] -- register_copy
- // [42] phi print_uchar::b#3 = print_uchar::b#2 [phi:print_euclid::@5->print_uchar#1] -- call_phi_near
+ // [42] phi print_uchar::b#3 = print_uchar::b#2 [phi:print_euclid::@5->print_uchar#1] -- register_copy
jsr print_uchar
// [33] phi from print_euclid::@5 to print_euclid::@6 [phi:print_euclid::@5->print_euclid::@6]
// print_euclid::@6
// print_ln()
// [34] call print_ln
- // [61] phi from print_euclid::@6 to print_ln [phi:print_euclid::@6->print_ln] -- call_phi_near
+ // [61] phi from print_euclid::@6 to print_ln [phi:print_euclid::@6->print_ln]
jsr print_ln
// print_euclid::@return
// }
@@ -2152,7 +2152,7 @@ print_uchar: {
// Table of hexadecimal digits
// [50] phi from print_uchar to print_char [phi:print_uchar->print_char]
// [50] phi print_char_cursor#32 = print_char_cursor#53 [phi:print_uchar->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy
jsr print_char
// print_uchar::@1
// b&$f
@@ -2165,7 +2165,7 @@ print_uchar: {
// [48] call print_char
// [50] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char]
// [50] phi print_char_cursor#32 = print_char_cursor#33 [phi:print_uchar::@1->print_char#0] -- register_copy
- // [50] phi print_char::ch#4 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near
+ // [50] phi print_char::ch#4 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy
jsr print_char
// print_uchar::@return
// }
diff --git a/src/test/ref/euclid-problem-2.log b/src/test/ref/euclid-problem-2.log
index 697c007eb..4bd995818 100644
--- a/src/test/ref/euclid-problem-2.log
+++ b/src/test/ref/euclid-problem-2.log
@@ -499,7 +499,7 @@ main: {
euclid_from_main:
// [18] phi euclid::b#9 = 2 [phi:main->euclid#0] -- vbuxx=vbuc1
ldx #2
- // [18] phi euclid::a#10 = $80 [phi:main->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $80 [phi:main->euclid#1] -- vbuz1=vbuc1
lda #$80
sta.z euclid.a
jsr euclid
@@ -516,7 +516,7 @@ main: {
euclid_from___b1:
// [18] phi euclid::b#9 = $45 [phi:main::@1->euclid#0] -- vbuxx=vbuc1
ldx #$45
- // [18] phi euclid::a#10 = $a9 [phi:main::@1->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $a9 [phi:main::@1->euclid#1] -- vbuz1=vbuc1
lda #$a9
sta.z euclid.a
jsr euclid
@@ -533,7 +533,7 @@ main: {
euclid_from___b2:
// [18] phi euclid::b#9 = $9b [phi:main::@2->euclid#0] -- vbuxx=vbuc1
ldx #$9b
- // [18] phi euclid::a#10 = $ff [phi:main::@2->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $ff [phi:main::@2->euclid#1] -- vbuz1=vbuc1
lda #$ff
sta.z euclid.a
jsr euclid
@@ -550,7 +550,7 @@ main: {
euclid_from___b3:
// [18] phi euclid::b#9 = 3 [phi:main::@3->euclid#0] -- vbuxx=vbuc1
ldx #3
- // [18] phi euclid::a#10 = $63 [phi:main::@3->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $63 [phi:main::@3->euclid#1] -- vbuz1=vbuc1
lda #$63
sta.z euclid.a
jsr euclid
@@ -705,7 +705,7 @@ main: {
// [18] phi from main to euclid [phi:main->euclid]
// [18] phi euclid::b#9 = 2 [phi:main->euclid#0] -- vbuxx=vbuc1
ldx #2
- // [18] phi euclid::a#10 = $80 [phi:main->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $80 [phi:main->euclid#1] -- vbuz1=vbuc1
lda #$80
sta.z euclid.a
jsr euclid
@@ -722,7 +722,7 @@ main: {
// [18] phi from main::@1 to euclid [phi:main::@1->euclid]
// [18] phi euclid::b#9 = $45 [phi:main::@1->euclid#0] -- vbuxx=vbuc1
ldx #$45
- // [18] phi euclid::a#10 = $a9 [phi:main::@1->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $a9 [phi:main::@1->euclid#1] -- vbuz1=vbuc1
lda #$a9
sta.z euclid.a
jsr euclid
@@ -739,7 +739,7 @@ main: {
// [18] phi from main::@2 to euclid [phi:main::@2->euclid]
// [18] phi euclid::b#9 = $9b [phi:main::@2->euclid#0] -- vbuxx=vbuc1
ldx #$9b
- // [18] phi euclid::a#10 = $ff [phi:main::@2->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $ff [phi:main::@2->euclid#1] -- vbuz1=vbuc1
lda #$ff
sta.z euclid.a
jsr euclid
@@ -756,7 +756,7 @@ main: {
// [18] phi from main::@3 to euclid [phi:main::@3->euclid]
// [18] phi euclid::b#9 = 3 [phi:main::@3->euclid#0] -- vbuxx=vbuc1
ldx #3
- // [18] phi euclid::a#10 = $63 [phi:main::@3->euclid#1] -- call_phi_near
+ // [18] phi euclid::a#10 = $63 [phi:main::@3->euclid#1] -- vbuz1=vbuc1
lda #$63
sta.z euclid.a
jsr euclid
diff --git a/src/test/ref/examples/atari2600/atari2600-sprites.log b/src/test/ref/examples/atari2600/atari2600-sprites.log
index b2b4eda99..21d78081a 100644
--- a/src/test/ref/examples/atari2600/atari2600-sprites.log
+++ b/src/test/ref/examples/atari2600/atari2600-sprites.log
@@ -869,7 +869,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -1279,7 +1279,7 @@ __start: {
sta.z p0_xpos
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/examples/c64/3d/perspective.log b/src/test/ref/examples/c64/3d/perspective.log
index 0e9259487..75d6e8d72 100644
--- a/src/test/ref/examples/c64/3d/perspective.log
+++ b/src/test/ref/examples/c64/3d/perspective.log
@@ -1781,7 +1781,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [7] call main -- call_phi_near
+ // [7] call main
jsr main
jmp __breturn
// __start::@return
@@ -1794,7 +1794,7 @@ main: {
// asm { sei }
sei
// [10] call mulf_init
- // [17] phi from main to mulf_init [phi:main->mulf_init] -- call_phi_near
+ // [17] phi from main to mulf_init [phi:main->mulf_init]
mulf_init_from_main:
jsr mulf_init
jmp __b1
@@ -1811,7 +1811,7 @@ main: {
lda #>mulf_sqr2
sta.z psp2+1
// [13] call print_cls
- // [35] phi from main::@1 to print_cls [phi:main::@1->print_cls] -- call_phi_near
+ // [35] phi from main::@1 to print_cls [phi:main::@1->print_cls]
print_cls_from___b1:
jsr print_cls
// [14] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -1820,7 +1820,7 @@ main: {
// main::@2
__b2:
// [15] call do_perspective
- // [38] phi from main::@2 to do_perspective [phi:main::@2->do_perspective] -- call_phi_near
+ // [38] phi from main::@2 to do_perspective [phi:main::@2->do_perspective]
do_perspective_from___b2:
jsr do_perspective
jmp __breturn
@@ -1926,7 +1926,7 @@ mulf_init: {
// Clear the screen. Also resets current line/char cursor.
print_cls: {
// [36] call memset
- // [65] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [65] phi from print_cls to memset [phi:print_cls->memset]
memset_from_print_cls:
jsr memset
jmp __breturn
@@ -1949,7 +1949,7 @@ do_perspective: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [71] phi print_str::str#10 = do_perspective::str [phi:do_perspective->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str [phi:do_perspective->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -1963,7 +1963,7 @@ do_perspective: {
// [41] call print_schar
// [78] phi from do_perspective::@1 to print_schar [phi:do_perspective::@1->print_schar]
print_schar_from___b1:
- // [78] phi print_schar::b#4 = do_perspective::x#0 [phi:do_perspective::@1->print_schar#0] -- call_phi_near
+ // [78] phi print_schar::b#4 = do_perspective::x#0 [phi:do_perspective::@1->print_schar#0] -- vbsxx=vbsc1
ldx #x
jsr print_schar
// [42] phi from do_perspective::@1 to do_perspective::@2 [phi:do_perspective::@1->do_perspective::@2]
@@ -1975,7 +1975,7 @@ do_perspective: {
// [71] phi from do_perspective::@2 to print_str [phi:do_perspective::@2->print_str]
print_str_from___b2:
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@2->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@2->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@2->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -1989,7 +1989,7 @@ do_perspective: {
// [45] call print_schar
// [78] phi from do_perspective::@3 to print_schar [phi:do_perspective::@3->print_schar]
print_schar_from___b3:
- // [78] phi print_schar::b#4 = do_perspective::y#0 [phi:do_perspective::@3->print_schar#0] -- call_phi_near
+ // [78] phi print_schar::b#4 = do_perspective::y#0 [phi:do_perspective::@3->print_schar#0] -- vbsxx=vbsc1
ldx #y
jsr print_schar
// [46] phi from do_perspective::@3 to do_perspective::@4 [phi:do_perspective::@3->do_perspective::@4]
@@ -2001,7 +2001,7 @@ do_perspective: {
// [71] phi from do_perspective::@4 to print_str [phi:do_perspective::@4->print_str]
print_str_from___b4:
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@4->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@4->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@4->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2015,7 +2015,7 @@ do_perspective: {
// [49] call print_schar
// [78] phi from do_perspective::@5 to print_schar [phi:do_perspective::@5->print_schar]
print_schar_from___b5:
- // [78] phi print_schar::b#4 = do_perspective::z#0 [phi:do_perspective::@5->print_schar#0] -- call_phi_near
+ // [78] phi print_schar::b#4 = do_perspective::z#0 [phi:do_perspective::@5->print_schar#0] -- vbsxx=vbsc1
ldx #z
jsr print_schar
// [50] phi from do_perspective::@5 to do_perspective::@6 [phi:do_perspective::@5->do_perspective::@6]
@@ -2027,7 +2027,7 @@ do_perspective: {
// [71] phi from do_perspective::@6 to print_str [phi:do_perspective::@6->print_str]
print_str_from___b6:
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@6->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str3 [phi:do_perspective::@6->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str3 [phi:do_perspective::@6->print_str#1] -- pbuz1=pbuc1
lda #str3
@@ -2038,7 +2038,7 @@ do_perspective: {
jmp __b7
// do_perspective::@7
__b7:
- // [53] call perspective -- call_phi_near
+ // [53] call perspective
jsr perspective
jmp __b8
// do_perspective::@8
@@ -2049,7 +2049,7 @@ do_perspective: {
// [94] phi from do_perspective::@8 to print_uchar [phi:do_perspective::@8->print_uchar]
print_uchar_from___b8:
// [94] phi print_char_cursor#72 = print_char_cursor#1 [phi:do_perspective::@8->print_uchar#0] -- register_copy
- // [94] phi print_uchar::b#3 = print_uchar::b#1 [phi:do_perspective::@8->print_uchar#1] -- call_phi_near
+ // [94] phi print_uchar::b#3 = print_uchar::b#1 [phi:do_perspective::@8->print_uchar#1] -- register_copy
jsr print_uchar
// [56] phi from do_perspective::@8 to do_perspective::@9 [phi:do_perspective::@8->do_perspective::@9]
__b9_from___b8:
@@ -2060,7 +2060,7 @@ do_perspective: {
// [71] phi from do_perspective::@9 to print_str [phi:do_perspective::@9->print_str]
print_str_from___b9:
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@9->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@9->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@9->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2075,7 +2075,7 @@ do_perspective: {
// [94] phi from do_perspective::@10 to print_uchar [phi:do_perspective::@10->print_uchar]
print_uchar_from___b10:
// [94] phi print_char_cursor#72 = print_char_cursor#1 [phi:do_perspective::@10->print_uchar#0] -- register_copy
- // [94] phi print_uchar::b#3 = print_uchar::b#2 [phi:do_perspective::@10->print_uchar#1] -- call_phi_near
+ // [94] phi print_uchar::b#3 = print_uchar::b#2 [phi:do_perspective::@10->print_uchar#1] -- register_copy
jsr print_uchar
// [60] phi from do_perspective::@10 to do_perspective::@11 [phi:do_perspective::@10->do_perspective::@11]
__b11_from___b10:
@@ -2086,7 +2086,7 @@ do_perspective: {
// [71] phi from do_perspective::@11 to print_str [phi:do_perspective::@11->print_str]
print_str_from___b11:
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@11->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str5 [phi:do_perspective::@11->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str5 [phi:do_perspective::@11->print_str#1] -- pbuz1=pbuc1
lda #str5
@@ -2098,7 +2098,7 @@ do_perspective: {
// do_perspective::@12
__b12:
// [63] call print_ln
- // [102] phi from do_perspective::@12 to print_ln [phi:do_perspective::@12->print_ln] -- call_phi_near
+ // [102] phi from do_perspective::@12 to print_ln [phi:do_perspective::@12->print_ln]
print_ln_from___b12:
jsr print_ln
jmp __breturn
@@ -2196,7 +2196,7 @@ print_str: {
// [107] phi from print_str::@2 to print_char [phi:print_str::@2->print_char]
print_char_from___b2:
// [107] phi print_char_cursor#45 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy
jsr print_char
jmp __b3
// print_str::@3
@@ -2224,7 +2224,7 @@ print_schar: {
// [107] phi from print_schar::@3 to print_char [phi:print_schar::@3->print_char]
print_char_from___b3:
// [107] phi print_char_cursor#45 = print_char_cursor#1 [phi:print_schar::@3->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = ' ' [phi:print_schar::@3->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = ' ' [phi:print_schar::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [82] phi from print_schar::@3 print_schar::@4 to print_schar::@2 [phi:print_schar::@3/print_schar::@4->print_schar::@2]
@@ -2239,7 +2239,7 @@ print_schar: {
// [94] phi from print_schar::@2 to print_uchar [phi:print_schar::@2->print_uchar]
print_uchar_from___b2:
// [94] phi print_char_cursor#72 = print_char_cursor#11 [phi:print_schar::@2->print_uchar#0] -- register_copy
- // [94] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_schar::@2->print_uchar#1] -- call_phi_near
+ // [94] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_schar::@2->print_uchar#1] -- register_copy
jsr print_uchar
jmp __breturn
// print_schar::@return
@@ -2255,7 +2255,7 @@ print_schar: {
// [107] phi from print_schar::@1 to print_char [phi:print_schar::@1->print_char]
print_char_from___b1:
// [107] phi print_char_cursor#45 = print_char_cursor#1 [phi:print_schar::@1->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = '-' [phi:print_schar::@1->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = '-' [phi:print_schar::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
jmp __b4
@@ -2327,7 +2327,7 @@ print_uchar: {
// [107] phi from print_uchar to print_char [phi:print_uchar->print_char]
print_char_from_print_uchar:
// [107] phi print_char_cursor#45 = print_char_cursor#72 [phi:print_uchar->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar->print_char#1] -- register_copy
jsr print_char
jmp __b1
// print_uchar::@1
@@ -2341,7 +2341,7 @@ print_uchar: {
// [107] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char]
print_char_from___b1:
// [107] phi print_char_cursor#45 = print_char_cursor#11 [phi:print_uchar::@1->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- register_copy
jsr print_char
jmp __breturn
// print_uchar::@return
@@ -2772,7 +2772,7 @@ __start: {
sta.z psp2+1
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [7] call main -- call_phi_near
+ // [7] call main
jsr main
// __start::@return
// [8] return
@@ -2785,7 +2785,7 @@ main: {
sei
// mulf_init()
// [10] call mulf_init
- // [17] phi from main to mulf_init [phi:main->mulf_init] -- call_phi_near
+ // [17] phi from main to mulf_init [phi:main->mulf_init]
jsr mulf_init
// main::@1
// psp1 = (unsigned int)mulf_sqr1
@@ -2802,13 +2802,13 @@ main: {
sta.z psp2+1
// print_cls()
// [13] call print_cls
- // [35] phi from main::@1 to print_cls [phi:main::@1->print_cls] -- call_phi_near
+ // [35] phi from main::@1 to print_cls [phi:main::@1->print_cls]
jsr print_cls
// [14] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// do_perspective($39, -$47, $36)
// [15] call do_perspective
- // [38] phi from main::@2 to do_perspective [phi:main::@2->do_perspective] -- call_phi_near
+ // [38] phi from main::@2 to do_perspective [phi:main::@2->do_perspective]
jsr do_perspective
// main::@return
// }
@@ -2914,7 +2914,7 @@ mulf_init: {
print_cls: {
// memset(print_screen, ' ', 1000)
// [36] call memset
- // [65] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [65] phi from print_cls to memset [phi:print_cls->memset]
jsr memset
// print_cls::@return
// }
@@ -2935,7 +2935,7 @@ do_perspective: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [71] phi print_str::str#10 = do_perspective::str [phi:do_perspective->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str [phi:do_perspective->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2946,7 +2946,7 @@ do_perspective: {
// print_schar(x)
// [41] call print_schar
// [78] phi from do_perspective::@1 to print_schar [phi:do_perspective::@1->print_schar]
- // [78] phi print_schar::b#4 = do_perspective::x#0 [phi:do_perspective::@1->print_schar#0] -- call_phi_near
+ // [78] phi print_schar::b#4 = do_perspective::x#0 [phi:do_perspective::@1->print_schar#0] -- vbsxx=vbsc1
ldx #x
jsr print_schar
// [42] phi from do_perspective::@1 to do_perspective::@2 [phi:do_perspective::@1->do_perspective::@2]
@@ -2955,7 +2955,7 @@ do_perspective: {
// [43] call print_str
// [71] phi from do_perspective::@2 to print_str [phi:do_perspective::@2->print_str]
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@2->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@2->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@2->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2966,7 +2966,7 @@ do_perspective: {
// print_schar(y)
// [45] call print_schar
// [78] phi from do_perspective::@3 to print_schar [phi:do_perspective::@3->print_schar]
- // [78] phi print_schar::b#4 = do_perspective::y#0 [phi:do_perspective::@3->print_schar#0] -- call_phi_near
+ // [78] phi print_schar::b#4 = do_perspective::y#0 [phi:do_perspective::@3->print_schar#0] -- vbsxx=vbsc1
ldx #y
jsr print_schar
// [46] phi from do_perspective::@3 to do_perspective::@4 [phi:do_perspective::@3->do_perspective::@4]
@@ -2975,7 +2975,7 @@ do_perspective: {
// [47] call print_str
// [71] phi from do_perspective::@4 to print_str [phi:do_perspective::@4->print_str]
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@4->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@4->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@4->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2986,7 +2986,7 @@ do_perspective: {
// print_schar(z)
// [49] call print_schar
// [78] phi from do_perspective::@5 to print_schar [phi:do_perspective::@5->print_schar]
- // [78] phi print_schar::b#4 = do_perspective::z#0 [phi:do_perspective::@5->print_schar#0] -- call_phi_near
+ // [78] phi print_schar::b#4 = do_perspective::z#0 [phi:do_perspective::@5->print_schar#0] -- vbsxx=vbsc1
ldx #z
jsr print_schar
// [50] phi from do_perspective::@5 to do_perspective::@6 [phi:do_perspective::@5->do_perspective::@6]
@@ -2995,7 +2995,7 @@ do_perspective: {
// [51] call print_str
// [71] phi from do_perspective::@6 to print_str [phi:do_perspective::@6->print_str]
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@6->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str3 [phi:do_perspective::@6->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str3 [phi:do_perspective::@6->print_str#1] -- pbuz1=pbuc1
lda #str3
@@ -3004,7 +3004,7 @@ do_perspective: {
// [52] phi from do_perspective::@6 to do_perspective::@7 [phi:do_perspective::@6->do_perspective::@7]
// do_perspective::@7
// perspective(x, y, z)
- // [53] call perspective -- call_phi_near
+ // [53] call perspective
jsr perspective
// do_perspective::@8
// print_uchar((char)xr)
@@ -3013,7 +3013,7 @@ do_perspective: {
// [55] call print_uchar
// [94] phi from do_perspective::@8 to print_uchar [phi:do_perspective::@8->print_uchar]
// [94] phi print_char_cursor#72 = print_char_cursor#1 [phi:do_perspective::@8->print_uchar#0] -- register_copy
- // [94] phi print_uchar::b#3 = print_uchar::b#1 [phi:do_perspective::@8->print_uchar#1] -- call_phi_near
+ // [94] phi print_uchar::b#3 = print_uchar::b#1 [phi:do_perspective::@8->print_uchar#1] -- register_copy
jsr print_uchar
// [56] phi from do_perspective::@8 to do_perspective::@9 [phi:do_perspective::@8->do_perspective::@9]
// do_perspective::@9
@@ -3021,7 +3021,7 @@ do_perspective: {
// [57] call print_str
// [71] phi from do_perspective::@9 to print_str [phi:do_perspective::@9->print_str]
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@9->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@9->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str1 [phi:do_perspective::@9->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -3034,7 +3034,7 @@ do_perspective: {
// [59] call print_uchar
// [94] phi from do_perspective::@10 to print_uchar [phi:do_perspective::@10->print_uchar]
// [94] phi print_char_cursor#72 = print_char_cursor#1 [phi:do_perspective::@10->print_uchar#0] -- register_copy
- // [94] phi print_uchar::b#3 = print_uchar::b#2 [phi:do_perspective::@10->print_uchar#1] -- call_phi_near
+ // [94] phi print_uchar::b#3 = print_uchar::b#2 [phi:do_perspective::@10->print_uchar#1] -- register_copy
jsr print_uchar
// [60] phi from do_perspective::@10 to do_perspective::@11 [phi:do_perspective::@10->do_perspective::@11]
// do_perspective::@11
@@ -3042,7 +3042,7 @@ do_perspective: {
// [61] call print_str
// [71] phi from do_perspective::@11 to print_str [phi:do_perspective::@11->print_str]
// [71] phi print_char_cursor#77 = print_char_cursor#11 [phi:do_perspective::@11->print_str#0] -- register_copy
- // [71] phi print_str::str#10 = do_perspective::str5 [phi:do_perspective::@11->print_str#1] -- call_phi_near
+ // [71] phi print_str::str#10 = do_perspective::str5 [phi:do_perspective::@11->print_str#1] -- pbuz1=pbuc1
lda #str5
@@ -3052,7 +3052,7 @@ do_perspective: {
// do_perspective::@12
// print_ln()
// [63] call print_ln
- // [102] phi from do_perspective::@12 to print_ln [phi:do_perspective::@12->print_ln] -- call_phi_near
+ // [102] phi from do_perspective::@12 to print_ln [phi:do_perspective::@12->print_ln]
jsr print_ln
// do_perspective::@return
// }
@@ -3144,7 +3144,7 @@ print_str: {
// [76] call print_char
// [107] phi from print_str::@2 to print_char [phi:print_str::@2->print_char]
// [107] phi print_char_cursor#45 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy
jsr print_char
// print_str::@3
// print_char(*(str++));
@@ -3169,7 +3169,7 @@ print_schar: {
// [81] call print_char
// [107] phi from print_schar::@3 to print_char [phi:print_schar::@3->print_char]
// [107] phi print_char_cursor#45 = print_char_cursor#1 [phi:print_schar::@3->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = ' ' [phi:print_schar::@3->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = ' ' [phi:print_schar::@3->print_char#1] -- vbuaa=vbuc1
lda #' '
jsr print_char
// [82] phi from print_schar::@3 print_schar::@4 to print_schar::@2 [phi:print_schar::@3/print_schar::@4->print_schar::@2]
@@ -3181,7 +3181,7 @@ print_schar: {
// [84] call print_uchar
// [94] phi from print_schar::@2 to print_uchar [phi:print_schar::@2->print_uchar]
// [94] phi print_char_cursor#72 = print_char_cursor#11 [phi:print_schar::@2->print_uchar#0] -- register_copy
- // [94] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_schar::@2->print_uchar#1] -- call_phi_near
+ // [94] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_schar::@2->print_uchar#1] -- register_copy
jsr print_uchar
// print_schar::@return
// }
@@ -3194,7 +3194,7 @@ print_schar: {
// [87] call print_char
// [107] phi from print_schar::@1 to print_char [phi:print_schar::@1->print_char]
// [107] phi print_char_cursor#45 = print_char_cursor#1 [phi:print_schar::@1->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = '-' [phi:print_schar::@1->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = '-' [phi:print_schar::@1->print_char#1] -- vbuaa=vbuc1
lda #'-'
jsr print_char
// print_schar::@4
@@ -3268,7 +3268,7 @@ print_uchar: {
// Table of hexadecimal digits
// [107] phi from print_uchar to print_char [phi:print_uchar->print_char]
// [107] phi print_char_cursor#45 = print_char_cursor#72 [phi:print_uchar->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar->print_char#1] -- register_copy
jsr print_char
// print_uchar::@1
// b&$f
@@ -3281,7 +3281,7 @@ print_uchar: {
// [100] call print_char
// [107] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char]
// [107] phi print_char_cursor#45 = print_char_cursor#11 [phi:print_uchar::@1->print_char#0] -- register_copy
- // [107] phi print_char::ch#5 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- call_phi_near
+ // [107] phi print_char::ch#5 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- register_copy
jsr print_char
// print_uchar::@return
// }
diff --git a/src/test/ref/examples/c64/bresenham/bitmap-bresenham.log b/src/test/ref/examples/c64/bresenham/bitmap-bresenham.log
index 8995c17ed..78e8ae48d 100644
--- a/src/test/ref/examples/c64/bresenham/bitmap-bresenham.log
+++ b/src/test/ref/examples/c64/bresenham/bitmap-bresenham.log
@@ -2379,7 +2379,7 @@ main: {
lda #(SCREEN&$3fff)/$40|(BITMAP&$3fff)/$400
sta VICII_MEMORY
// [4] call bitmap_init
- // [11] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [11] phi from main to bitmap_init [phi:main->bitmap_init]
bitmap_init_from_main:
jsr bitmap_init
// [5] phi from main to main::@2 [phi:main->main::@2]
@@ -2388,7 +2388,7 @@ main: {
// main::@2
__b2:
// [6] call bitmap_clear
- // [33] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear] -- call_phi_near
+ // [33] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear]
bitmap_clear_from___b2:
jsr bitmap_clear
// [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
@@ -2397,7 +2397,7 @@ main: {
// main::@3
__b3:
// [8] call init_screen
- // [38] phi from main::@3 to init_screen [phi:main::@3->init_screen] -- call_phi_near
+ // [38] phi from main::@3 to init_screen [phi:main::@3->init_screen]
init_screen_from___b3:
jsr init_screen
// [9] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
@@ -2407,7 +2407,7 @@ main: {
// main::@1
__b1:
// [10] call lines
- // [44] phi from main::@1 to lines [phi:main::@1->lines] -- call_phi_near
+ // [44] phi from main::@1 to lines [phi:main::@1->lines]
lines_from___b1:
jsr lines
jmp __b1_from___b1
@@ -2540,7 +2540,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [54] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [54] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -2561,7 +2561,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [54] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [54] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -2660,7 +2660,7 @@ lines: {
sta.z bitmap_line.y2
lda #0
sta.z bitmap_line.y2+1
- // [52] call bitmap_line -- call_phi_near
+ // [52] call bitmap_line
jsr bitmap_line
jmp __b3
// lines::@3
@@ -2757,7 +2757,7 @@ bitmap_line: {
// [64] call abs_u16
// [114] phi from bitmap_line to abs_u16 [phi:bitmap_line->abs_u16]
abs_u16_from_bitmap_line:
- // [114] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [114] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// [65] abs_u16::return#0 = abs_u16::return#4
jmp __b12
@@ -2779,7 +2779,7 @@ bitmap_line: {
// [68] call abs_u16
// [114] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
abs_u16_from___b12:
- // [114] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [114] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- register_copy
jsr abs_u16
// [69] abs_u16::return#1 = abs_u16::return#4
jmp __b13
@@ -2811,7 +2811,7 @@ bitmap_line: {
// [74] call sgn_u16
// [121] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
sgn_u16_from___b1:
- // [121] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [121] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// [75] sgn_u16::return#0 = sgn_u16::return#4
jmp __b14
@@ -2833,7 +2833,7 @@ bitmap_line: {
// [78] call sgn_u16
// [121] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
sgn_u16_from___b14:
- // [121] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [121] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- register_copy
jsr sgn_u16
// [79] sgn_u16::return#1 = sgn_u16::return#4
jmp __b15
@@ -2876,7 +2876,7 @@ bitmap_line: {
// [128] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
bitmap_plot_from___b6:
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b16
// bitmap_line::@16
@@ -2955,7 +2955,7 @@ bitmap_line: {
// [128] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
bitmap_plot_from___b3:
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __breturn
// bitmap_line::@return
@@ -2988,7 +2988,7 @@ bitmap_line: {
// [128] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
bitmap_plot_from___b9:
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __b17
// bitmap_line::@17
@@ -3062,7 +3062,7 @@ bitmap_line: {
// [128] phi from bitmap_line::@4 to bitmap_plot [phi:bitmap_line::@4->bitmap_plot]
bitmap_plot_from___b4:
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#0 [phi:bitmap_line::@4->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- register_copy
jsr bitmap_plot
jmp __breturn
}
@@ -3595,26 +3595,26 @@ main: {
sta VICII_MEMORY
// bitmap_init(BITMAP, SCREEN)
// [4] call bitmap_init
- // [11] phi from main to bitmap_init [phi:main->bitmap_init] -- call_phi_near
+ // [11] phi from main to bitmap_init [phi:main->bitmap_init]
jsr bitmap_init
// [5] phi from main to main::@2 [phi:main->main::@2]
// main::@2
// bitmap_clear(BLACK, WHITE)
// [6] call bitmap_clear
- // [33] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear] -- call_phi_near
+ // [33] phi from main::@2 to bitmap_clear [phi:main::@2->bitmap_clear]
jsr bitmap_clear
// [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// init_screen()
// [8] call init_screen
- // [38] phi from main::@3 to init_screen [phi:main::@3->init_screen] -- call_phi_near
+ // [38] phi from main::@3 to init_screen [phi:main::@3->init_screen]
jsr init_screen
// [9] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
// main::@1
__b1:
// lines()
// [10] call lines
- // [44] phi from main::@1 to lines [phi:main::@1->lines] -- call_phi_near
+ // [44] phi from main::@1 to lines [phi:main::@1->lines]
jsr lines
jmp __b1
}
@@ -3738,7 +3738,7 @@ bitmap_clear: {
sta.z memset.str
lda #>SCREEN
sta.z memset.str+1
- // [54] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- call_phi_near
+ // [54] phi memset::num#2 = $3e8 [phi:bitmap_clear->memset#2] -- vwuz1=vwuc1
lda #<$3e8
sta.z memset.num
lda #>$3e8
@@ -3756,7 +3756,7 @@ bitmap_clear: {
sta.z memset.str
lda #>BITMAP
sta.z memset.str+1
- // [54] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- call_phi_near
+ // [54] phi memset::num#2 = $1f40 [phi:bitmap_clear::@1->memset#2] -- vwuz1=vwuc1
lda #<$1f40
sta.z memset.num
lda #>$1f40
@@ -3849,7 +3849,7 @@ lines: {
sta.z bitmap_line.y2
lda #0
sta.z bitmap_line.y2+1
- // [52] call bitmap_line -- call_phi_near
+ // [52] call bitmap_line
jsr bitmap_line
// lines::@3
// for(char l=0; labs_u16]
- // [114] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- call_phi_near
+ // [114] phi abs_u16::w#2 = abs_u16::w#0 [phi:bitmap_line->abs_u16#0] -- register_copy
jsr abs_u16
// unsigned int dx = abs_u16(x2-x1)
// [65] abs_u16::return#0 = abs_u16::return#4
@@ -3965,7 +3965,7 @@ bitmap_line: {
sta.z abs_u16.w+1
// [68] call abs_u16
// [114] phi from bitmap_line::@12 to abs_u16 [phi:bitmap_line::@12->abs_u16]
- // [114] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- call_phi_near
+ // [114] phi abs_u16::w#2 = abs_u16::w#1 [phi:bitmap_line::@12->abs_u16#0] -- register_copy
jsr abs_u16
// unsigned int dy = abs_u16(y2-y1)
// [69] abs_u16::return#1 = abs_u16::return#4
@@ -3996,7 +3996,7 @@ bitmap_line: {
sta.z sgn_u16.w+1
// [74] call sgn_u16
// [121] phi from bitmap_line::@1 to sgn_u16 [phi:bitmap_line::@1->sgn_u16]
- // [121] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- call_phi_near
+ // [121] phi sgn_u16::w#2 = sgn_u16::w#0 [phi:bitmap_line::@1->sgn_u16#0] -- register_copy
jsr sgn_u16
// unsigned int sx = sgn_u16(x2-x1)
// [75] sgn_u16::return#0 = sgn_u16::return#4
@@ -4017,7 +4017,7 @@ bitmap_line: {
sta.z sgn_u16.w+1
// [78] call sgn_u16
// [121] phi from bitmap_line::@14 to sgn_u16 [phi:bitmap_line::@14->sgn_u16]
- // [121] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- call_phi_near
+ // [121] phi sgn_u16::w#2 = sgn_u16::w#1 [phi:bitmap_line::@14->sgn_u16#0] -- register_copy
jsr sgn_u16
// unsigned int sy = sgn_u16(y2-y1)
// [79] sgn_u16::return#1 = sgn_u16::return#4
@@ -4056,7 +4056,7 @@ bitmap_line: {
// [86] call bitmap_plot
// [128] phi from bitmap_line::@6 to bitmap_plot [phi:bitmap_line::@6->bitmap_plot]
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#1 [phi:bitmap_line::@6->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#1 [phi:bitmap_line::@6->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@16
// y += sy
@@ -4130,7 +4130,7 @@ bitmap_line: {
// [97] call bitmap_plot
// [128] phi from bitmap_line::@3 to bitmap_plot [phi:bitmap_line::@3->bitmap_plot]
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#2 [phi:bitmap_line::@3->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#2 [phi:bitmap_line::@3->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@return
// }
@@ -4160,7 +4160,7 @@ bitmap_line: {
// [103] call bitmap_plot
// [128] phi from bitmap_line::@9 to bitmap_plot [phi:bitmap_line::@9->bitmap_plot]
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#3 [phi:bitmap_line::@9->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#3 [phi:bitmap_line::@9->bitmap_plot#1] -- register_copy
jsr bitmap_plot
// bitmap_line::@17
// x += sx
@@ -4232,7 +4232,7 @@ bitmap_line: {
// [113] call bitmap_plot
// [128] phi from bitmap_line::@4 to bitmap_plot [phi:bitmap_line::@4->bitmap_plot]
// [128] phi bitmap_plot::x#4 = bitmap_plot::x#0 [phi:bitmap_line::@4->bitmap_plot#0] -- register_copy
- // [128] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- call_phi_near
+ // [128] phi bitmap_plot::y#4 = bitmap_plot::y#0 [phi:bitmap_line::@4->bitmap_plot#1] -- register_copy
jsr bitmap_plot
rts
}
diff --git a/src/test/ref/examples/c64/crunching/test-byteboozer.log b/src/test/ref/examples/c64/crunching/test-byteboozer.log
index d603107b2..7d5cb9d8f 100644
--- a/src/test/ref/examples/c64/crunching/test-byteboozer.log
+++ b/src/test/ref/examples/c64/crunching/test-byteboozer.log
@@ -281,7 +281,7 @@ main: {
sta.z byteboozer_decrunch.crunched
lda #>CRUNCHED_SPRITE
sta.z byteboozer_decrunch.crunched+1
- // [1] call byteboozer_decrunch -- call_phi_near
+ // [1] call byteboozer_decrunch
// Decrunch sprite file into memory
jsr byteboozer_decrunch
jmp __b2
@@ -445,7 +445,7 @@ main: {
sta.z byteboozer_decrunch.crunched
lda #>CRUNCHED_SPRITE
sta.z byteboozer_decrunch.crunched+1
- // [1] call byteboozer_decrunch -- call_phi_near
+ // [1] call byteboozer_decrunch
// Decrunch sprite file into memory
jsr byteboozer_decrunch
// main::@2
diff --git a/src/test/ref/examples/c64/fastmultiply/fastmultiply8.log b/src/test/ref/examples/c64/fastmultiply/fastmultiply8.log
index 4b8b3bda8..6bb624ab9 100644
--- a/src/test/ref/examples/c64/fastmultiply/fastmultiply8.log
+++ b/src/test/ref/examples/c64/fastmultiply/fastmultiply8.log
@@ -1327,7 +1327,7 @@ main: {
.label i = $f
.label at_line = $d
// [1] call init_screen
- // [30] phi from main to init_screen [phi:main->init_screen] -- call_phi_near
+ // [30] phi from main to init_screen [phi:main->init_screen]
init_screen_from_main:
jsr init_screen
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -1361,7 +1361,7 @@ main: {
// [45] phi from main::@1 to print_schar_at [phi:main::@1->print_schar_at]
print_schar_at_from___b1:
// [45] phi print_schar_at::at#3 = print_schar_at::at#0 [phi:main::@1->print_schar_at#0] -- register_copy
- // [45] phi print_schar_at::b#4 = print_schar_at::b#1 [phi:main::@1->print_schar_at#1] -- call_phi_near
+ // [45] phi print_schar_at::b#4 = print_schar_at::b#1 [phi:main::@1->print_schar_at#1] -- register_copy
jsr print_schar_at
jmp __b5
// main::@5
@@ -1419,7 +1419,7 @@ main: {
// [45] phi from main::@2 to print_schar_at [phi:main::@2->print_schar_at]
print_schar_at_from___b2:
// [45] phi print_schar_at::at#3 = print_schar_at::at#1 [phi:main::@2->print_schar_at#0] -- register_copy
- // [45] phi print_schar_at::b#4 = print_schar_at::b#2 [phi:main::@2->print_schar_at#1] -- call_phi_near
+ // [45] phi print_schar_at::b#4 = print_schar_at::b#2 [phi:main::@2->print_schar_at#1] -- register_copy
jsr print_schar_at
jmp __b6
// main::@6
@@ -1459,7 +1459,7 @@ main: {
ldy.z j
lda vals,y
sta.z fmul8.bb
- // [19] call fmul8 -- call_phi_near
+ // [19] call fmul8
jsr fmul8
// [20] fmul8::return#0 = fmul8::return#2
jmp __b7
@@ -1477,7 +1477,7 @@ main: {
// [45] phi from main::@7 to print_schar_at [phi:main::@7->print_schar_at]
print_schar_at_from___b7:
// [45] phi print_schar_at::at#3 = print_schar_at::at#2 [phi:main::@7->print_schar_at#0] -- register_copy
- // [45] phi print_schar_at::b#4 = print_schar_at::b#3 [phi:main::@7->print_schar_at#1] -- call_phi_near
+ // [45] phi print_schar_at::b#4 = print_schar_at::b#3 [phi:main::@7->print_schar_at#1] -- register_copy
jsr print_schar_at
jmp __b8
// main::@8
@@ -1508,7 +1508,7 @@ init_screen: {
.const WHITE = 1
.label COLS = 2
// [31] call print_cls
- // [62] phi from init_screen to print_cls [phi:init_screen->print_cls] -- call_phi_near
+ // [62] phi from init_screen to print_cls [phi:init_screen->print_cls]
print_cls_from_init_screen:
jsr print_cls
// [32] phi from init_screen to init_screen::@1 [phi:init_screen->init_screen::@1]
@@ -1599,7 +1599,7 @@ print_schar_at: {
// [65] phi from print_schar_at::@3 to print_char_at [phi:print_schar_at::@3->print_char_at]
print_char_at_from___b3:
// [65] phi print_char_at::at#4 = print_char_at::at#1 [phi:print_schar_at::@3->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = ' ' [phi:print_schar_at::@3->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = ' ' [phi:print_schar_at::@3->print_char_at#1] -- vbuxx=vbuc1
ldx #' '
jsr print_char_at
// [49] phi from print_schar_at::@3 print_schar_at::@4 to print_schar_at::@2 [phi:print_schar_at::@3/print_schar_at::@4->print_schar_at::@2]
@@ -1615,7 +1615,7 @@ print_schar_at: {
inc.z print_uchar_at.at+1
!:
// [51] print_uchar_at::b#0 = (char)print_schar_at::b#6
- // [52] call print_uchar_at -- call_phi_near
+ // [52] call print_uchar_at
jsr print_uchar_at
jmp __breturn
// print_schar_at::@return
@@ -1629,7 +1629,7 @@ print_schar_at: {
// [65] phi from print_schar_at::@1 to print_char_at [phi:print_schar_at::@1->print_char_at]
print_char_at_from___b1:
// [65] phi print_char_at::at#4 = print_char_at::at#0 [phi:print_schar_at::@1->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = '-' [phi:print_schar_at::@1->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = '-' [phi:print_schar_at::@1->print_char_at#1] -- vbuxx=vbuc1
ldx #'-'
jsr print_char_at
jmp __b4
@@ -1677,7 +1677,7 @@ fmul8: {
// Clear the screen. Also resets current line/char cursor.
print_cls: {
// [63] call memset
- // [77] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [77] phi from print_cls to memset [phi:print_cls->memset]
memset_from_print_cls:
jsr memset
jmp __breturn
@@ -1722,7 +1722,7 @@ print_uchar_at: {
// [65] phi from print_uchar_at to print_char_at [phi:print_uchar_at->print_char_at]
print_char_at_from_print_uchar_at:
// [65] phi print_char_at::at#4 = print_char_at::at#2 [phi:print_uchar_at->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = print_char_at::ch#2 [phi:print_uchar_at->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = print_char_at::ch#2 [phi:print_uchar_at->print_char_at#1] -- register_copy
jsr print_char_at
jmp __b1
// print_uchar_at::@1
@@ -1742,7 +1742,7 @@ print_uchar_at: {
// [65] phi from print_uchar_at::@1 to print_char_at [phi:print_uchar_at::@1->print_char_at]
print_char_at_from___b1:
// [65] phi print_char_at::at#4 = print_char_at::at#3 [phi:print_uchar_at::@1->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = print_char_at::ch#3 [phi:print_uchar_at::@1->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = print_char_at::ch#3 [phi:print_uchar_at::@1->print_char_at#1] -- register_copy
jsr print_char_at
jmp __breturn
// print_uchar_at::@return
@@ -2072,7 +2072,7 @@ main: {
.label at_line = $d
// init_screen()
// [1] call init_screen
- // [30] phi from main to init_screen [phi:main->init_screen] -- call_phi_near
+ // [30] phi from main to init_screen [phi:main->init_screen]
jsr init_screen
// [2] phi from main to main::@1 [phi:main->main::@1]
// [2] phi main::at#4 = (char *) 1024+4 [phi:main->main::@1#0] -- pbuz1=pbuc1
@@ -2101,7 +2101,7 @@ main: {
// [5] call print_schar_at
// [45] phi from main::@1 to print_schar_at [phi:main::@1->print_schar_at]
// [45] phi print_schar_at::at#3 = print_schar_at::at#0 [phi:main::@1->print_schar_at#0] -- register_copy
- // [45] phi print_schar_at::b#4 = print_schar_at::b#1 [phi:main::@1->print_schar_at#1] -- call_phi_near
+ // [45] phi print_schar_at::b#4 = print_schar_at::b#1 [phi:main::@1->print_schar_at#1] -- register_copy
jsr print_schar_at
// main::@5
// at += 4
@@ -2156,7 +2156,7 @@ main: {
// [13] call print_schar_at
// [45] phi from main::@2 to print_schar_at [phi:main::@2->print_schar_at]
// [45] phi print_schar_at::at#3 = print_schar_at::at#1 [phi:main::@2->print_schar_at#0] -- register_copy
- // [45] phi print_schar_at::b#4 = print_schar_at::b#2 [phi:main::@2->print_schar_at#1] -- call_phi_near
+ // [45] phi print_schar_at::b#4 = print_schar_at::b#2 [phi:main::@2->print_schar_at#1] -- register_copy
jsr print_schar_at
// main::@6
// [14] main::at#12 = main::at#2 -- pbuz1=pbuz2
@@ -2192,7 +2192,7 @@ main: {
ldy.z j
lda vals,y
sta.z fmul8.bb
- // [19] call fmul8 -- call_phi_near
+ // [19] call fmul8
jsr fmul8
// [20] fmul8::return#0 = fmul8::return#2
// main::@7
@@ -2208,7 +2208,7 @@ main: {
// [24] call print_schar_at
// [45] phi from main::@7 to print_schar_at [phi:main::@7->print_schar_at]
// [45] phi print_schar_at::at#3 = print_schar_at::at#2 [phi:main::@7->print_schar_at#0] -- register_copy
- // [45] phi print_schar_at::b#4 = print_schar_at::b#3 [phi:main::@7->print_schar_at#1] -- call_phi_near
+ // [45] phi print_schar_at::b#4 = print_schar_at::b#3 [phi:main::@7->print_schar_at#1] -- register_copy
jsr print_schar_at
// main::@8
// for(char j: 0..8)
@@ -2236,7 +2236,7 @@ init_screen: {
.label COLS = 2
// print_cls()
// [31] call print_cls
- // [62] phi from init_screen to print_cls [phi:init_screen->print_cls] -- call_phi_near
+ // [62] phi from init_screen to print_cls [phi:init_screen->print_cls]
jsr print_cls
// [32] phi from init_screen to init_screen::@1 [phi:init_screen->init_screen::@1]
// [32] phi init_screen::l#2 = 0 [phi:init_screen->init_screen::@1#0] -- vbuxx=vbuc1
@@ -2321,7 +2321,7 @@ print_schar_at: {
// [48] call print_char_at
// [65] phi from print_schar_at::@3 to print_char_at [phi:print_schar_at::@3->print_char_at]
// [65] phi print_char_at::at#4 = print_char_at::at#1 [phi:print_schar_at::@3->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = ' ' [phi:print_schar_at::@3->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = ' ' [phi:print_schar_at::@3->print_char_at#1] -- vbuxx=vbuc1
ldx #' '
jsr print_char_at
// [49] phi from print_schar_at::@3 print_schar_at::@4 to print_schar_at::@2 [phi:print_schar_at::@3/print_schar_at::@4->print_schar_at::@2]
@@ -2335,7 +2335,7 @@ print_schar_at: {
inc.z print_uchar_at.at+1
!:
// [51] print_uchar_at::b#0 = (char)print_schar_at::b#6
- // [52] call print_uchar_at -- call_phi_near
+ // [52] call print_uchar_at
jsr print_uchar_at
// print_schar_at::@return
// }
@@ -2348,7 +2348,7 @@ print_schar_at: {
// [55] call print_char_at
// [65] phi from print_schar_at::@1 to print_char_at [phi:print_schar_at::@1->print_char_at]
// [65] phi print_char_at::at#4 = print_char_at::at#0 [phi:print_schar_at::@1->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = '-' [phi:print_schar_at::@1->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = '-' [phi:print_schar_at::@1->print_char_at#1] -- vbuxx=vbuc1
ldx #'-'
jsr print_char_at
// print_schar_at::@4
@@ -2397,7 +2397,7 @@ fmul8: {
print_cls: {
// memset(print_screen, ' ', 1000)
// [63] call memset
- // [77] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [77] phi from print_cls to memset [phi:print_cls->memset]
jsr memset
// print_cls::@return
// }
@@ -2441,7 +2441,7 @@ print_uchar_at: {
// Table of hexadecimal digits
// [65] phi from print_uchar_at to print_char_at [phi:print_uchar_at->print_char_at]
// [65] phi print_char_at::at#4 = print_char_at::at#2 [phi:print_uchar_at->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = print_char_at::ch#2 [phi:print_uchar_at->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = print_char_at::ch#2 [phi:print_uchar_at->print_char_at#1] -- register_copy
jsr print_char_at
// print_uchar_at::@1
// b&$f
@@ -2460,7 +2460,7 @@ print_uchar_at: {
// [75] call print_char_at
// [65] phi from print_uchar_at::@1 to print_char_at [phi:print_uchar_at::@1->print_char_at]
// [65] phi print_char_at::at#4 = print_char_at::at#3 [phi:print_uchar_at::@1->print_char_at#0] -- register_copy
- // [65] phi print_char_at::ch#4 = print_char_at::ch#3 [phi:print_uchar_at::@1->print_char_at#1] -- call_phi_near
+ // [65] phi print_char_at::ch#4 = print_char_at::ch#3 [phi:print_uchar_at::@1->print_char_at#1] -- register_copy
jsr print_char_at
// print_uchar_at::@return
// }
diff --git a/src/test/ref/examples/c64/fire/fire.log b/src/test/ref/examples/c64/fire/fire.log
index e59bb1d91..04aa6b997 100644
--- a/src/test/ref/examples/c64/fire/fire.log
+++ b/src/test/ref/examples/c64/fire/fire.log
@@ -1695,7 +1695,7 @@ main: {
sta.z fillscreen.screen
lda #>BUFFER
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = 0 [phi:main->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = 0 [phi:main->fillscreen#1] -- vbuxx=vbuc1
ldx #0
jsr fillscreen
// [4] phi from main to main::@5 [phi:main->main::@5]
@@ -1711,7 +1711,7 @@ main: {
sta.z fillscreen.screen
lda #>SCREEN1
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = 0 [phi:main::@5->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = 0 [phi:main::@5->fillscreen#1] -- vbuxx=vbuc1
ldx #0
jsr fillscreen
// [6] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
@@ -1727,7 +1727,7 @@ main: {
sta.z fillscreen.screen
lda #>SCREEN2
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = 0 [phi:main::@6->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = 0 [phi:main::@6->fillscreen#1] -- vbuxx=vbuc1
ldx #0
jsr fillscreen
// [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
@@ -1743,7 +1743,7 @@ main: {
sta.z fillscreen.screen
lda #>COLS
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = YELLOW [phi:main::@7->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = YELLOW [phi:main::@7->fillscreen#1] -- vbuxx=vbuc1
ldx #YELLOW
jsr fillscreen
jmp sid_rnd_init1
@@ -1763,7 +1763,7 @@ main: {
// main::@2
__b2:
// [13] call makecharset
- // [28] phi from main::@2 to makecharset [phi:main::@2->makecharset] -- call_phi_near
+ // [28] phi from main::@2 to makecharset [phi:main::@2->makecharset]
makecharset_from___b2:
jsr makecharset
// [14] phi from main::@2 main::@4 to main::@1 [phi:main::@2/main::@4->main::@1]
@@ -1775,7 +1775,7 @@ main: {
// [15] call fire
// [60] phi from main::@1 to fire [phi:main::@1->fire]
fire_from___b1:
- // [60] phi fire::screen#0 = SCREEN1 [phi:main::@1->fire#0] -- call_phi_near
+ // [60] phi fire::screen#0 = SCREEN1 [phi:main::@1->fire#0] -- pbuz1=pbuc1
lda #SCREEN1
@@ -1795,7 +1795,7 @@ main: {
// [18] call fire
// [60] phi from main::@3 to fire [phi:main::@3->fire]
fire_from___b3:
- // [60] phi fire::screen#0 = SCREEN2 [phi:main::@3->fire#0] -- call_phi_near
+ // [60] phi fire::screen#0 = SCREEN2 [phi:main::@3->fire#0] -- pbuz1=pbuc1
lda #SCREEN2
@@ -2546,7 +2546,7 @@ main: {
sta.z fillscreen.screen
lda #>BUFFER
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = 0 [phi:main->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = 0 [phi:main->fillscreen#1] -- vbuxx=vbuc1
ldx #0
jsr fillscreen
// [4] phi from main to main::@5 [phi:main->main::@5]
@@ -2559,7 +2559,7 @@ main: {
sta.z fillscreen.screen
lda #>SCREEN1
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = 0 [phi:main::@5->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = 0 [phi:main::@5->fillscreen#1] -- vbuxx=vbuc1
ldx #0
jsr fillscreen
// [6] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
@@ -2572,7 +2572,7 @@ main: {
sta.z fillscreen.screen
lda #>SCREEN2
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = 0 [phi:main::@6->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = 0 [phi:main::@6->fillscreen#1] -- vbuxx=vbuc1
ldx #0
jsr fillscreen
// [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
@@ -2585,7 +2585,7 @@ main: {
sta.z fillscreen.screen
lda #>COLS
sta.z fillscreen.screen+1
- // [21] phi fillscreen::fill#5 = YELLOW [phi:main::@7->fillscreen#1] -- call_phi_near
+ // [21] phi fillscreen::fill#5 = YELLOW [phi:main::@7->fillscreen#1] -- vbuxx=vbuc1
ldx #YELLOW
jsr fillscreen
// main::sid_rnd_init1
@@ -2603,7 +2603,7 @@ main: {
// main::@2
// makecharset(CHARSET)
// [13] call makecharset
- // [28] phi from main::@2 to makecharset [phi:main::@2->makecharset] -- call_phi_near
+ // [28] phi from main::@2 to makecharset [phi:main::@2->makecharset]
jsr makecharset
// [14] phi from main::@2 main::@4 to main::@1 [phi:main::@2/main::@4->main::@1]
// main::@1
@@ -2611,7 +2611,7 @@ main: {
// fire(SCREEN1)
// [15] call fire
// [60] phi from main::@1 to fire [phi:main::@1->fire]
- // [60] phi fire::screen#0 = SCREEN1 [phi:main::@1->fire#0] -- call_phi_near
+ // [60] phi fire::screen#0 = SCREEN1 [phi:main::@1->fire#0] -- pbuz1=pbuc1
lda #SCREEN1
@@ -2627,7 +2627,7 @@ main: {
// fire(SCREEN2)
// [18] call fire
// [60] phi from main::@3 to fire [phi:main::@3->fire]
- // [60] phi fire::screen#0 = SCREEN2 [phi:main::@3->fire#0] -- call_phi_near
+ // [60] phi fire::screen#0 = SCREEN2 [phi:main::@3->fire#0] -- pbuz1=pbuc1
lda #SCREEN2
diff --git a/src/test/ref/examples/c64/font-2x2/font-2x2.log b/src/test/ref/examples/c64/font-2x2/font-2x2.log
index 610d18dbd..54e8fc78d 100644
--- a/src/test/ref/examples/c64/font-2x2/font-2x2.log
+++ b/src/test/ref/examples/c64/font-2x2/font-2x2.log
@@ -2350,7 +2350,7 @@ main: {
lda #PROCPORT_RAM_CHARROM
sta.z PROCPORT
// [2] call font_2x2
- // [22] phi from main to font_2x2 [phi:main->font_2x2] -- call_phi_near
+ // [22] phi from main to font_2x2 [phi:main->font_2x2]
font_2x2_from_main:
jsr font_2x2
jmp __b6
@@ -2363,7 +2363,7 @@ main: {
cli
// [5] call font_compress
// Compress the font finding identical characters
- // [62] phi from main::@6 to font_compress [phi:main::@6->font_compress] -- call_phi_near
+ // [62] phi from main::@6 to font_compress [phi:main::@6->font_compress]
font_compress_from___b6:
jsr font_compress
// [6] phi from main::@6 to main::toD0181 [phi:main::@6->main::toD0181]
@@ -2382,7 +2382,7 @@ main: {
ldx FONT_COMPRESSED_MAP+' '
// [9] call memset
// Clear the screen
- // [85] phi from main::@5 to memset [phi:main::@5->memset] -- call_phi_near
+ // [85] phi from main::@5 to memset [phi:main::@5->memset]
memset_from___b5:
jsr memset
// [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
@@ -2420,7 +2420,7 @@ main: {
ldx.z x
// [14] show::y#0 = main::y#4 -- vbuaa=vbuz1
lda.z y
- // [15] call show -- call_phi_near
+ // [15] call show
jsr show
jmp __b7
// main::@7
@@ -2735,7 +2735,7 @@ font_compress: {
// [65] font_find::font_size#0 = font_compress::font_size#2
// [66] call font_find
// Look for the char in font_compressed
- // [106] phi from font_compress::@1 to font_find [phi:font_compress::@1->font_find] -- call_phi_near
+ // [106] phi from font_compress::@1 to font_find [phi:font_compress::@1->font_find]
font_find_from___b1:
jsr font_find
// [67] font_find::return#0 = font_find::return#3 -- vbuaa=vbuxx
@@ -3428,7 +3428,7 @@ main: {
sta.z PROCPORT
// font_2x2(CHARGEN, FONT_ORIGINAL)
// [2] call font_2x2
- // [22] phi from main to font_2x2 [phi:main->font_2x2] -- call_phi_near
+ // [22] phi from main to font_2x2 [phi:main->font_2x2]
jsr font_2x2
// main::@6
// *PROCPORT = PROCPORT_BASIC_KERNEL_IO
@@ -3441,7 +3441,7 @@ main: {
// char size = font_compress(FONT_ORIGINAL, FONT_COMPRESSED, FONT_COMPRESSED_MAP)
// [5] call font_compress
// Compress the font finding identical characters
- // [62] phi from main::@6 to font_compress [phi:main::@6->font_compress] -- call_phi_near
+ // [62] phi from main::@6 to font_compress [phi:main::@6->font_compress]
jsr font_compress
// [6] phi from main::@6 to main::toD0181 [phi:main::@6->main::toD0181]
// main::toD0181
@@ -3456,7 +3456,7 @@ main: {
ldx FONT_COMPRESSED_MAP+' '
// [9] call memset
// Clear the screen
- // [85] phi from main::@5 to memset [phi:main::@5->memset] -- call_phi_near
+ // [85] phi from main::@5 to memset [phi:main::@5->memset]
jsr memset
// [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
// [10] phi main::y#4 = 0 [phi:main::@5->main::@1#0] -- vbuz1=vbuc1
@@ -3485,7 +3485,7 @@ main: {
ldx.z x
// [14] show::y#0 = main::y#4 -- vbuaa=vbuz1
lda.z y
- // [15] call show -- call_phi_near
+ // [15] call show
jsr show
// main::@7
// show(c++, x, y, FONT_COMPRESSED_MAP);
@@ -3792,7 +3792,7 @@ font_compress: {
// [65] font_find::font_size#0 = font_compress::font_size#2
// [66] call font_find
// Look for the char in font_compressed
- // [106] phi from font_compress::@1 to font_find [phi:font_compress::@1->font_find] -- call_phi_near
+ // [106] phi from font_compress::@1 to font_find [phi:font_compress::@1->font_find]
jsr font_find
// char found = font_find(next_original, font_compressed, font_size)
// [67] font_find::return#0 = font_find::return#3 -- vbuaa=vbuxx
diff --git a/src/test/ref/examples/c64/kernalload/kernalload.log b/src/test/ref/examples/c64/kernalload/kernalload.log
index f2753c471..b0fba1a3b 100644
--- a/src/test/ref/examples/c64/kernalload/kernalload.log
+++ b/src/test/ref/examples/c64/kernalload/kernalload.log
@@ -763,7 +763,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
.const toSpritePtr1_return = LOAD_SPRITE/$40
- // [1] call loadFileToMemory -- call_phi_near
+ // [1] call loadFileToMemory
// Load sprite file into memory
jsr loadFileToMemory
// [2] loadFileToMemory::return#0 = loadFileToMemory::return#1
@@ -783,7 +783,7 @@ main: {
sta VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
// [6] error::err = main::status#0 -- vbuz1=vbuxx
stx.z error.err
- // [7] call error -- call_phi_near
+ // [7] call error
jsr error
jmp __b1
// main::@1
@@ -835,7 +835,7 @@ loadFileToMemory: {
sta.z setnam.filename
lda #>main.filename
sta.z setnam.filename+1
- // [16] call setnam -- call_phi_near
+ // [16] call setnam
jsr setnam
jmp __b1
// loadFileToMemory::@1
@@ -843,7 +843,7 @@ loadFileToMemory: {
// [17] setlfs::device = loadFileToMemory::device#0 -- vbuz1=vbuc1
lda #device
sta.z setlfs.device
- // [18] call setlfs -- call_phi_near
+ // [18] call setlfs
jsr setlfs
jmp __b2
// loadFileToMemory::@2
@@ -856,7 +856,7 @@ loadFileToMemory: {
// [20] load::verify = 0 -- vbuz1=vbuc1
lda #0
sta.z load.verify
- // [21] call load -- call_phi_near
+ // [21] call load
jsr load
// [22] load::return#0 = load::return#2
jmp __b3
@@ -898,7 +898,7 @@ setnam: {
lda.z filename+1
sta.z strlen.str+1
// [28] call strlen
- // [41] phi from setnam to strlen [phi:setnam->strlen] -- call_phi_near
+ // [41] phi from setnam to strlen [phi:setnam->strlen]
strlen_from_setnam:
jsr strlen
// [29] strlen::return#2 = strlen::len#2
@@ -1187,7 +1187,7 @@ Score: 720
main: {
.const toSpritePtr1_return = LOAD_SPRITE/$40
// char status = loadFileToMemory(8, "SPRITE", LOAD_SPRITE)
- // [1] call loadFileToMemory -- call_phi_near
+ // [1] call loadFileToMemory
// Load sprite file into memory
jsr loadFileToMemory
// [2] loadFileToMemory::return#0 = loadFileToMemory::return#1
@@ -1206,7 +1206,7 @@ main: {
// error(status)
// [6] error::err = main::status#0 -- vbuz1=vbuxx
stx.z error.err
- // [7] call error -- call_phi_near
+ // [7] call error
jsr error
// main::@1
__b1:
@@ -1257,14 +1257,14 @@ loadFileToMemory: {
sta.z setnam.filename
lda #>main.filename
sta.z setnam.filename+1
- // [16] call setnam -- call_phi_near
+ // [16] call setnam
jsr setnam
// loadFileToMemory::@1
// setlfs(device)
// [17] setlfs::device = loadFileToMemory::device#0 -- vbuz1=vbuc1
lda #device
sta.z setlfs.device
- // [18] call setlfs -- call_phi_near
+ // [18] call setlfs
jsr setlfs
// loadFileToMemory::@2
// load(address, 0)
@@ -1276,7 +1276,7 @@ loadFileToMemory: {
// [20] load::verify = 0 -- vbuz1=vbuc1
lda #0
sta.z load.verify
- // [21] call load -- call_phi_near
+ // [21] call load
jsr load
// [22] load::return#0 = load::return#2
// loadFileToMemory::@3
@@ -1316,7 +1316,7 @@ setnam: {
lda.z filename+1
sta.z strlen.str+1
// [28] call strlen
- // [41] phi from setnam to strlen [phi:setnam->strlen] -- call_phi_near
+ // [41] phi from setnam to strlen [phi:setnam->strlen]
jsr strlen
// strlen(filename)
// [29] strlen::return#2 = strlen::len#2
diff --git a/src/test/ref/examples/c64/krillload/krillload.log b/src/test/ref/examples/c64/krillload/krillload.log
index c9c97817f..665ca6f4e 100644
--- a/src/test/ref/examples/c64/krillload/krillload.log
+++ b/src/test/ref/examples/c64/krillload/krillload.log
@@ -461,7 +461,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
.const toSpritePtr1_return = $ff&SPRITE/$40
- // [1] call krill_install -- call_phi_near
+ // [1] call krill_install
// Install the Krill drive code
jsr krill_install
// [2] krill_install::return#2 = krill_install::return#0
@@ -488,7 +488,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [8] call krill_loadraw -- call_phi_near
+ // [8] call krill_loadraw
jsr krill_loadraw
// [9] krill_loadraw::return#2 = krill_loadraw::return#0
jmp __b7
@@ -744,7 +744,7 @@ Score: 128
main: {
.const toSpritePtr1_return = $ff&SPRITE/$40
// char status = krill_install()
- // [1] call krill_install -- call_phi_near
+ // [1] call krill_install
// Install the Krill drive code
jsr krill_install
// [2] krill_install::return#2 = krill_install::return#0
@@ -767,7 +767,7 @@ main: {
// main::@1
__b1:
// krill_loadraw("sprite")
- // [8] call krill_loadraw -- call_phi_near
+ // [8] call krill_loadraw
jsr krill_loadraw
// [9] krill_loadraw::return#2 = krill_loadraw::return#0
// main::@7
diff --git a/src/test/ref/examples/c64/linking/linking.log b/src/test/ref/examples/c64/linking/linking.log
index 8cb2caf14..fadfb0a08 100644
--- a/src/test/ref/examples/c64/linking/linking.log
+++ b/src/test/ref/examples/c64/linking/linking.log
@@ -330,7 +330,7 @@ main: {
lda BG_COLOR
sta.z fillscreen.c
// [6] call fillscreen
- // [8] phi from main::@2 to fillscreen [phi:main::@2->fillscreen] -- call_phi_near
+ // [8] phi from main::@2 to fillscreen [phi:main::@2->fillscreen]
fillscreen_from___b2:
jsr fillscreen
jmp __b3
@@ -496,7 +496,7 @@ main: {
lda BG_COLOR
sta.z fillscreen.c
// [6] call fillscreen
- // [8] phi from main::@2 to fillscreen [phi:main::@2->fillscreen] -- call_phi_near
+ // [8] phi from main::@2 to fillscreen [phi:main::@2->fillscreen]
jsr fillscreen
// main::@3
// (*BG_COLOR)++;
diff --git a/src/test/ref/examples/c64/multiplexer/simple-multiplexer.log b/src/test/ref/examples/c64/multiplexer/simple-multiplexer.log
index 09f17dcee..e8051dc8f 100644
--- a/src/test/ref/examples/c64/multiplexer/simple-multiplexer.log
+++ b/src/test/ref/examples/c64/multiplexer/simple-multiplexer.log
@@ -1674,7 +1674,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [7] call main -- call_phi_near
+ // [7] call main
jsr main
jmp __breturn
// __start::@return
@@ -1686,7 +1686,7 @@ __start: {
main: {
// asm { sei }
sei
- // [10] call init -- call_phi_near
+ // [10] call init
jsr init
// [11] phi from main to main::@1 [phi:main->main::@1]
__b1_from_main:
@@ -1694,7 +1694,7 @@ main: {
// main::@1
__b1:
// [12] call loop
- // [29] phi from main::@1 to loop [phi:main::@1->loop] -- call_phi_near
+ // [29] phi from main::@1 to loop [phi:main::@1->loop]
loop_from___b1:
jsr loop
jmp __breturn
@@ -1713,7 +1713,7 @@ init: {
sta D011
// [15] call plexInit
// Initialize the multiplexer
- // [54] phi from init to plexInit [phi:init->plexInit] -- call_phi_near
+ // [54] phi from init to plexInit [phi:init->plexInit]
plexInit_from_init:
jsr plexInit
// [16] phi from init to init::@1 [phi:init->init::@1]
@@ -1850,7 +1850,7 @@ loop: {
// [40] *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) = ++ *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) -- _deref_pbuc1=_inc__deref_pbuc1
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
// [41] call plexSort
- // [61] phi from loop::@5 to plexSort [phi:loop::@5->plexSort] -- call_phi_near
+ // [61] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
plexSort_from___b5:
jsr plexSort
jmp __b11
@@ -1903,7 +1903,7 @@ loop: {
__b9:
// [49] *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) = ++ *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) -- _deref_pbuc1=_inc__deref_pbuc1
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
- // [50] call plexShowSprite -- call_phi_near
+ // [50] call plexShowSprite
jsr plexShowSprite
jmp __b12
// loop::@12
@@ -2583,7 +2583,7 @@ __start: {
sta.z plex_free_next
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [7] call main -- call_phi_near
+ // [7] call main
jsr main
// __start::@return
// [8] return
@@ -2595,13 +2595,13 @@ main: {
// asm { sei }
sei
// init()
- // [10] call init -- call_phi_near
+ // [10] call init
jsr init
// [11] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// loop()
// [12] call loop
- // [29] phi from main::@1 to loop [phi:main::@1->loop] -- call_phi_near
+ // [29] phi from main::@1 to loop [phi:main::@1->loop]
jsr loop
// main::@return
// }
@@ -2620,7 +2620,7 @@ init: {
// plexInit(SCREEN)
// [15] call plexInit
// Initialize the multiplexer
- // [54] phi from init to plexInit [phi:init->plexInit] -- call_phi_near
+ // [54] phi from init to plexInit [phi:init->plexInit]
jsr plexInit
// [16] phi from init to init::@1 [phi:init->init::@1]
// [16] phi init::xp#2 = $20 [phi:init->init::@1#0] -- vwuz1=vwuc1
@@ -2748,7 +2748,7 @@ loop: {
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
// plexSort()
// [41] call plexSort
- // [61] phi from loop::@5 to plexSort [phi:loop::@5->plexSort] -- call_phi_near
+ // [61] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
jsr plexSort
// loop::@11
// VICII->BORDER_COLOR = BLACK
@@ -2796,7 +2796,7 @@ loop: {
// [49] *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) = ++ *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) -- _deref_pbuc1=_inc__deref_pbuc1
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
// plexShowSprite()
- // [50] call plexShowSprite -- call_phi_near
+ // [50] call plexShowSprite
jsr plexShowSprite
// loop::@12
// for( char ss: 0..PLEX_COUNT-1)
diff --git a/src/test/ref/examples/c64/nmisamples/nmisamples.log b/src/test/ref/examples/c64/nmisamples/nmisamples.log
index 3943b2d56..3b7a48291 100644
--- a/src/test/ref/examples/c64/nmisamples/nmisamples.log
+++ b/src/test/ref/examples/c64/nmisamples/nmisamples.log
@@ -329,7 +329,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -573,7 +573,7 @@ __start: {
sta.z sample+1
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/examples/c64/rasterbars/raster-bars.log b/src/test/ref/examples/c64/rasterbars/raster-bars.log
index df81be3ca..c46d54f43 100644
--- a/src/test/ref/examples/c64/rasterbars/raster-bars.log
+++ b/src/test/ref/examples/c64/rasterbars/raster-bars.log
@@ -248,7 +248,7 @@ main: {
jmp __b3
// main::@3
__b3:
- // [4] call raster -- call_phi_near
+ // [4] call raster
jsr raster
jmp __b1
}
@@ -419,7 +419,7 @@ main: {
// [3] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
// main::@3
// raster()
- // [4] call raster -- call_phi_near
+ // [4] call raster
jsr raster
jmp __b1
}
diff --git a/src/test/ref/examples/c64/scroll/scroll.log b/src/test/ref/examples/c64/scroll/scroll.log
index 5cdde9acf..0369e4d2d 100644
--- a/src/test/ref/examples/c64/scroll/scroll.log
+++ b/src/test/ref/examples/c64/scroll/scroll.log
@@ -517,7 +517,7 @@ main: {
.label line = SCREEN+$28
.label nxt = 4
// [1] call fillscreen
- // [21] phi from main to fillscreen [phi:main->fillscreen] -- call_phi_near
+ // [21] phi from main to fillscreen [phi:main->fillscreen]
fillscreen_from_main:
jsr fillscreen
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -802,7 +802,7 @@ main: {
.label nxt = 4
// fillscreen(SCREEN, $20)
// [1] call fillscreen
- // [21] phi from main to fillscreen [phi:main->fillscreen] -- call_phi_near
+ // [21] phi from main to fillscreen [phi:main->fillscreen]
jsr fillscreen
// [2] phi from main to main::@1 [phi:main->main::@1]
// [2] phi main::nxt#10 = TEXT [phi:main->main::@1#0] -- pbuz1=pbuc1
diff --git a/src/test/ref/examples/c64/scrollbig/scrollbig.log b/src/test/ref/examples/c64/scrollbig/scrollbig.log
index ef0ad24ba..8c184af4f 100644
--- a/src/test/ref/examples/c64/scrollbig/scrollbig.log
+++ b/src/test/ref/examples/c64/scrollbig/scrollbig.log
@@ -1466,7 +1466,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call fillscreen
- // [8] phi from main to fillscreen [phi:main->fillscreen] -- call_phi_near
+ // [8] phi from main to fillscreen [phi:main->fillscreen]
fillscreen_from_main:
jsr fillscreen
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -1514,7 +1514,7 @@ main: {
__b3:
// [5] *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR) = ++ *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR) -- _deref_pbuc1=_inc__deref_pbuc1
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR
- // [6] call scroll_soft -- call_phi_near
+ // [6] call scroll_soft
jsr scroll_soft
jmp __b4
// main::@4
@@ -1581,7 +1581,7 @@ scroll_soft: {
jmp __b2
// scroll_soft::@2
__b2:
- // [17] call scroll_bit -- call_phi_near
+ // [17] call scroll_bit
jsr scroll_bit
// [18] phi from scroll_soft::@2 to scroll_soft::@1 [phi:scroll_soft::@2->scroll_soft::@1]
__b1_from___b2:
@@ -1623,7 +1623,7 @@ scroll_bit: {
jmp __b2
// scroll_bit::@2
__b2:
- // [24] call next_char -- call_phi_near
+ // [24] call next_char
jsr next_char
// [25] next_char::return#0 = next_char::return#1 -- vbuaa=vbuxx
txa
@@ -1666,7 +1666,7 @@ scroll_bit: {
// scroll_bit::@1
__b1:
// [30] call scroll_hard
- // [52] phi from scroll_bit::@1 to scroll_hard [phi:scroll_bit::@1->scroll_hard] -- call_phi_near
+ // [52] phi from scroll_bit::@1 to scroll_hard [phi:scroll_bit::@1->scroll_hard]
scroll_hard_from___b1:
jsr scroll_hard
jmp __b7
@@ -2044,7 +2044,7 @@ Score: 20882
main: {
// fillscreen(SCREEN, $20)
// [1] call fillscreen
- // [8] phi from main to fillscreen [phi:main->fillscreen] -- call_phi_near
+ // [8] phi from main to fillscreen [phi:main->fillscreen]
jsr fillscreen
// [2] phi from main to main::@1 [phi:main->main::@1]
// [2] phi current_chargen#28 = CHARGEN [phi:main->main::@1#0] -- pbuz1=pbuc1
@@ -2087,7 +2087,7 @@ main: {
// [5] *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR) = ++ *((char *)VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR) -- _deref_pbuc1=_inc__deref_pbuc1
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR
// scroll_soft()
- // [6] call scroll_soft -- call_phi_near
+ // [6] call scroll_soft
jsr scroll_soft
// main::@4
// --VICII->BG_COLOR;
@@ -2151,7 +2151,7 @@ scroll_soft: {
// [16] phi from scroll_soft to scroll_soft::@2 [phi:scroll_soft->scroll_soft::@2]
// scroll_soft::@2
// scroll_bit()
- // [17] call scroll_bit -- call_phi_near
+ // [17] call scroll_bit
jsr scroll_bit
// [18] phi from scroll_soft::@2 to scroll_soft::@1 [phi:scroll_soft::@2->scroll_soft::@1]
// [18] phi current_chargen#12 = current_chargen#21 [phi:scroll_soft::@2->scroll_soft::@1#0] -- register_copy
@@ -2189,7 +2189,7 @@ scroll_bit: {
// [23] phi from scroll_bit to scroll_bit::@2 [phi:scroll_bit->scroll_bit::@2]
// scroll_bit::@2
// unsigned int c = next_char()
- // [24] call next_char -- call_phi_near
+ // [24] call next_char
jsr next_char
// [25] next_char::return#0 = next_char::return#1 -- vbuaa=vbuxx
txa
@@ -2229,7 +2229,7 @@ scroll_bit: {
__b1:
// scroll_hard()
// [30] call scroll_hard
- // [52] phi from scroll_bit::@1 to scroll_hard [phi:scroll_bit::@1->scroll_hard] -- call_phi_near
+ // [52] phi from scroll_bit::@1 to scroll_hard [phi:scroll_bit::@1->scroll_hard]
jsr scroll_hard
// scroll_bit::@7
// asm
diff --git a/src/test/ref/examples/c64/showlogo/showlogo.log b/src/test/ref/examples/c64/showlogo/showlogo.log
index a73435332..ec8afeea4 100644
--- a/src/test/ref/examples/c64/showlogo/showlogo.log
+++ b/src/test/ref/examples/c64/showlogo/showlogo.log
@@ -641,7 +641,7 @@ main: {
memset_from___b3:
// [16] phi memset::c#4 = BLACK [phi:main::@3->memset#0] -- vbuxx=vbuc1
ldx #BLACK
- // [16] phi memset::str#3 = (void *)SCREEN [phi:main::@3->memset#1] -- call_phi_near
+ // [16] phi memset::str#3 = (void *)SCREEN [phi:main::@3->memset#1] -- pvoz1=pvoc1
lda #SCREEN
@@ -657,7 +657,7 @@ main: {
memset_from___b4:
// [16] phi memset::c#4 = WHITE|8 [phi:main::@4->memset#0] -- vbuxx=vbuc1
ldx #WHITE|8
- // [16] phi memset::str#3 = (void *)COLS [phi:main::@4->memset#1] -- call_phi_near
+ // [16] phi memset::str#3 = (void *)COLS [phi:main::@4->memset#1] -- pvoz1=pvoc1
lda #COLS
@@ -916,7 +916,7 @@ main: {
// [16] phi from main::@3 to memset [phi:main::@3->memset]
// [16] phi memset::c#4 = BLACK [phi:main::@3->memset#0] -- vbuxx=vbuc1
ldx #BLACK
- // [16] phi memset::str#3 = (void *)SCREEN [phi:main::@3->memset#1] -- call_phi_near
+ // [16] phi memset::str#3 = (void *)SCREEN [phi:main::@3->memset#1] -- pvoz1=pvoc1
lda #SCREEN
@@ -929,7 +929,7 @@ main: {
// [16] phi from main::@4 to memset [phi:main::@4->memset]
// [16] phi memset::c#4 = WHITE|8 [phi:main::@4->memset#0] -- vbuxx=vbuc1
ldx #WHITE|8
- // [16] phi memset::str#3 = (void *)COLS [phi:main::@4->memset#1] -- call_phi_near
+ // [16] phi memset::str#3 = (void *)COLS [phi:main::@4->memset#1] -- pvoz1=pvoc1
lda #COLS
diff --git a/src/test/ref/examples/c64/zpcode/zpcode.log b/src/test/ref/examples/c64/zpcode/zpcode.log
index ba4f154fd..5de3e625f 100644
--- a/src/test/ref/examples/c64/zpcode/zpcode.log
+++ b/src/test/ref/examples/c64/zpcode/zpcode.log
@@ -382,7 +382,7 @@ main: {
__b4:
// [11] call loop
// Call code in normal memory
- // [17] phi from main::@4 to loop [phi:main::@4->loop] -- call_phi_near
+ // [17] phi from main::@4 to loop [phi:main::@4->loop]
loop_from___b4:
jsr loop
// [12] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
@@ -392,7 +392,7 @@ main: {
__b5:
// [13] call zpLoop
// Call code on zeropage
- // [0] phi from main::@5 to zpLoop [phi:main::@5->zpLoop] -- call_phi_near
+ // [0] phi from main::@5 to zpLoop [phi:main::@5->zpLoop]
zpLoop_from___b5:
jsr zpLoop
jmp __b6
@@ -581,14 +581,14 @@ main: {
// loop()
// [11] call loop
// Call code in normal memory
- // [17] phi from main::@4 to loop [phi:main::@4->loop] -- call_phi_near
+ // [17] phi from main::@4 to loop [phi:main::@4->loop]
jsr loop
// [12] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
// main::@5
// zpLoop()
// [13] call zpLoop
// Call code on zeropage
- // [0] phi from main::@5 to zpLoop [phi:main::@5->zpLoop] -- call_phi_near
+ // [0] phi from main::@5 to zpLoop [phi:main::@5->zpLoop]
jsr zpLoop
// main::@6
// *BG_COLOR = 0
diff --git a/src/test/ref/examples/cx16/cx16-rasterbars.log b/src/test/ref/examples/cx16/cx16-rasterbars.log
index 10ffb8032..18cd7a889 100644
--- a/src/test/ref/examples/cx16/cx16-rasterbars.log
+++ b/src/test/ref/examples/cx16/cx16-rasterbars.log
@@ -998,7 +998,7 @@ __start: {
// __start::@1
__b1:
// [8] call main
- // [51] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [51] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -1083,7 +1083,7 @@ irq_line: {
__b1:
// [27] call memset
// Animate the bars
- // [58] phi from irq_line::@1 to memset [phi:irq_line::@1->memset] -- call_phi_near
+ // [58] phi from irq_line::@1 to memset [phi:irq_line::@1->memset]
memset_from___b1:
jsr memset
jmp __b19
@@ -1567,7 +1567,7 @@ __start: {
// [7] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [8] call main
- // [51] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [51] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [9] return
@@ -1652,7 +1652,7 @@ irq_line: {
// memset(BARS, 0, sizeof(BARS))
// [27] call memset
// Animate the bars
- // [58] phi from irq_line::@1 to memset [phi:irq_line::@1->memset] -- call_phi_near
+ // [58] phi from irq_line::@1 to memset [phi:irq_line::@1->memset]
jsr memset
// irq_line::@19
// char idx = sin_idx--
diff --git a/src/test/ref/examples/helloworld/helloworld.log b/src/test/ref/examples/helloworld/helloworld.log
index 4fa87ecd3..06f0e6a9a 100644
--- a/src/test/ref/examples/helloworld/helloworld.log
+++ b/src/test/ref/examples/helloworld/helloworld.log
@@ -1423,7 +1423,7 @@ __start: {
sta.z conio_line_color
lda #>COLORRAM
sta.z conio_line_color+1
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
@@ -1431,7 +1431,7 @@ __start: {
// __start::@1
__b1:
// [7] call main
- // [27] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [27] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -1467,7 +1467,7 @@ conio_c64_init: {
// conio_c64_init::@1
__b1:
// [13] gotoxy::y#2 = conio_c64_init::line#2
- // [14] call gotoxy -- call_phi_near
+ // [14] call gotoxy
jsr gotoxy
jmp __breturn
// conio_c64_init::@return
@@ -1508,7 +1508,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
- // [23] call cputln -- call_phi_near
+ // [23] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@@ -1520,14 +1520,14 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
- // [26] call cputln -- call_phi_near
+ // [26] call cputln
jsr cputln
jmp __breturn
}
// main
main: {
// [28] call printf_str
- // [50] phi from main to printf_str [phi:main->printf_str] -- call_phi_near
+ // [50] phi from main to printf_str [phi:main->printf_str]
printf_str_from_main:
jsr printf_str
jmp __breturn
@@ -1663,7 +1663,7 @@ cputln: {
sta.z conio_cursor_x
// [47] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
- // [48] call cscroll -- call_phi_near
+ // [48] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@@ -1735,7 +1735,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [72] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [72] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -1754,7 +1754,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [72] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [72] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -1770,7 +1770,7 @@ cscroll: {
memset_from___b3:
// [82] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [82] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [82] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -1786,7 +1786,7 @@ cscroll: {
memset_from___b4:
// [82] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [82] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [82] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -2178,12 +2178,12 @@ __start: {
lda #>COLORRAM
sta.z conio_line_color+1
// #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll)
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [7] call main
- // [27] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [27] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [8] return
@@ -2212,7 +2212,7 @@ conio_c64_init: {
__b1:
// gotoxy(0, line)
// [13] gotoxy::y#2 = conio_c64_init::line#2
- // [14] call gotoxy -- call_phi_near
+ // [14] call gotoxy
jsr gotoxy
// conio_c64_init::@return
// }
@@ -2251,7 +2251,7 @@ cputc: {
// [22] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
- // [23] call cputln -- call_phi_near
+ // [23] call cputln
jsr cputln
// cputc::@return
__breturn:
@@ -2262,7 +2262,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
- // [26] call cputln -- call_phi_near
+ // [26] call cputln
jsr cputln
rts
}
@@ -2270,7 +2270,7 @@ cputc: {
main: {
// printf("hello world!\n")
// [28] call printf_str
- // [50] phi from main to printf_str [phi:main->printf_str] -- call_phi_near
+ // [50] phi from main to printf_str [phi:main->printf_str]
jsr printf_str
// main::@return
// }
@@ -2407,7 +2407,7 @@ cputln: {
// [47] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
- // [48] call cscroll -- call_phi_near
+ // [48] call cscroll
jsr cscroll
// cputln::@return
// }
@@ -2474,7 +2474,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [72] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [72] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -2490,7 +2490,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [72] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [72] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -2503,7 +2503,7 @@ cscroll: {
// [82] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
// [82] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [82] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [82] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -2516,7 +2516,7 @@ cscroll: {
// [82] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [82] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [82] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [82] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
diff --git a/src/test/ref/examples/mega65/32bit-addressing-mega65.log b/src/test/ref/examples/mega65/32bit-addressing-mega65.log
index 3a5303669..f50f22628 100644
--- a/src/test/ref/examples/mega65/32bit-addressing-mega65.log
+++ b/src/test/ref/examples/mega65/32bit-addressing-mega65.log
@@ -151,7 +151,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -267,7 +267,7 @@ __start: {
sta.z ADDR32+3
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/examples/mega65/banked-music.log b/src/test/ref/examples/mega65/banked-music.log
index 1f4c72627..483f214bb 100644
--- a/src/test/ref/examples/mega65/banked-music.log
+++ b/src/test/ref/examples/mega65/banked-music.log
@@ -1140,7 +1140,7 @@ irq: {
inc VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR
// [2] call memoryRemapBlock
// Remap memory to put music at $4000
- // [40] phi from irq to memoryRemapBlock [phi:irq->memoryRemapBlock] -- call_phi_near
+ // [40] phi from irq to memoryRemapBlock [phi:irq->memoryRemapBlock]
memoryRemapBlock_from_irq:
jsr memoryRemapBlock
// [3] phi from irq to irq::@4 [phi:irq->irq::@4]
@@ -1167,7 +1167,7 @@ irq: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = 0 [phi:irq::@1->memoryRemap#1] -- vbuzz=vbuc1
ldz #0
- // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:irq::@1->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:irq::@1->memoryRemap#2] -- vwuz1=vbuc1
lda #<0
sta.z memoryRemap.lowerPageOffset
lda #>0
@@ -1217,7 +1217,7 @@ main: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = 0 [phi:main->memoryRemap#1] -- vbuzz=vbuc1
ldz #0
- // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main->memoryRemap#2] -- vwuz1=vbuc1
lda #<0
sta.z memoryRemap.lowerPageOffset
lda #>0
@@ -1253,7 +1253,7 @@ main: {
// open sideborder
ldz #1
stz VICIV+OFFSET_STRUCT_MEGA65_VICIV_SIDBDRWD_LO
- // [20] call memcpy_dma4 -- call_phi_near
+ // [20] call memcpy_dma4
// Transfer banked code/data to upper memory ($10000)
jsr memcpy_dma4
// [21] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
@@ -1263,7 +1263,7 @@ main: {
__b6:
// [22] call memoryRemapBlock
// Remap [$4000-$5fff] to point to [$10000-$11fff]
- // [40] phi from main::@6 to memoryRemapBlock [phi:main::@6->memoryRemapBlock] -- call_phi_near
+ // [40] phi from main::@6 to memoryRemapBlock [phi:main::@6->memoryRemapBlock]
memoryRemapBlock_from___b6:
jsr memoryRemapBlock
jmp __b7
@@ -1290,7 +1290,7 @@ main: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = 0 [phi:main::@1->memoryRemap#1] -- vbuzz=vbuc1
ldz #0
- // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main::@1->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main::@1->memoryRemap#2] -- vwuz1=vbuc1
lda #<0
sta.z memoryRemap.lowerPageOffset
lda #>0
@@ -1386,7 +1386,7 @@ memoryRemapBlock: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = memoryRemapBlock::blockBits#0 [phi:memoryRemapBlock->memoryRemap#1] -- vbuzz=vbuc1
ldz #blockBits
- // [43] phi memoryRemap::lowerPageOffset#4 = memoryRemapBlock::pageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = memoryRemapBlock::pageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- vwuz1=vwuc1
lda #pageOffset
@@ -1847,7 +1847,7 @@ irq: {
// memoryRemapBlock(0x40, 0x100)
// [2] call memoryRemapBlock
// Remap memory to put music at $4000
- // [40] phi from irq to memoryRemapBlock [phi:irq->memoryRemapBlock] -- call_phi_near
+ // [40] phi from irq to memoryRemapBlock [phi:irq->memoryRemapBlock]
jsr memoryRemapBlock
// [3] phi from irq to irq::@4 [phi:irq->irq::@4]
// irq::@4
@@ -1867,7 +1867,7 @@ irq: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = 0 [phi:irq::@1->memoryRemap#1] -- vbuzz=vbuc1
taz
- // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:irq::@1->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:irq::@1->memoryRemap#2] -- vwuz1=vbuc1
sta.z memoryRemap.lowerPageOffset
sta.z memoryRemap.lowerPageOffset+1
jsr memoryRemap
@@ -1912,7 +1912,7 @@ main: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = 0 [phi:main->memoryRemap#1] -- vbuzz=vbuc1
taz
- // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main->memoryRemap#2] -- vwuz1=vbuc1
sta.z memoryRemap.lowerPageOffset
sta.z memoryRemap.lowerPageOffset+1
jsr memoryRemap
@@ -1952,7 +1952,7 @@ main: {
ldz #1
stz VICIV+OFFSET_STRUCT_MEGA65_VICIV_SIDBDRWD_LO
// memcpy_dma4(1, (void*)0x0000, 0, upperCodeData, MUSIC_END-MUSIC)
- // [20] call memcpy_dma4 -- call_phi_near
+ // [20] call memcpy_dma4
// Transfer banked code/data to upper memory ($10000)
jsr memcpy_dma4
// [21] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
@@ -1960,7 +1960,7 @@ main: {
// memoryRemapBlock(0x40, 0x100)
// [22] call memoryRemapBlock
// Remap [$4000-$5fff] to point to [$10000-$11fff]
- // [40] phi from main::@6 to memoryRemapBlock [phi:main::@6->memoryRemapBlock] -- call_phi_near
+ // [40] phi from main::@6 to memoryRemapBlock [phi:main::@6->memoryRemapBlock]
jsr memoryRemapBlock
// main::@7
// asm
@@ -1982,7 +1982,7 @@ main: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = 0 [phi:main::@1->memoryRemap#1] -- vbuzz=vbuc1
taz
- // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main::@1->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = 0 [phi:main::@1->memoryRemap#2] -- vwuz1=vbuc1
sta.z memoryRemap.lowerPageOffset
sta.z memoryRemap.lowerPageOffset+1
jsr memoryRemap
@@ -2078,7 +2078,7 @@ memoryRemapBlock: {
sta.z memoryRemap.upperPageOffset+1
// [43] phi memoryRemap::remapBlocks#4 = memoryRemapBlock::blockBits#0 [phi:memoryRemapBlock->memoryRemap#1] -- vbuzz=vbuc1
ldz #blockBits
- // [43] phi memoryRemap::lowerPageOffset#4 = memoryRemapBlock::pageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- call_phi_near
+ // [43] phi memoryRemap::lowerPageOffset#4 = memoryRemapBlock::pageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- vwuz1=vwuc1
lda #pageOffset
diff --git a/src/test/ref/examples/mega65/camelot-1536dots.log b/src/test/ref/examples/mega65/camelot-1536dots.log
index 5966d3c76..516889aad 100644
--- a/src/test/ref/examples/mega65/camelot-1536dots.log
+++ b/src/test/ref/examples/mega65/camelot-1536dots.log
@@ -2901,7 +2901,7 @@ __start: {
// __start::@1
__b1:
// [8] call main
- // [10] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [10] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -2927,7 +2927,7 @@ main: {
jmp __b6
// main::@6
__b6:
- // [13] call memoryRemap -- call_phi_near
+ // [13] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
jmp __b10
@@ -2960,7 +2960,7 @@ main: {
lda #VICIV_VFAST
ora VICIV+OFFSET_STRUCT_MEGA65_VICIV_CONTROLC
sta VICIV+OFFSET_STRUCT_MEGA65_VICIV_CONTROLC
- // [21] call graphics_mode -- call_phi_near
+ // [21] call graphics_mode
// Initialize graphics
jsr graphics_mode
jmp __b11
@@ -3053,7 +3053,7 @@ main: {
stz SPRITES_XMSB
// [43] call init_plot
// Initialize plotter
- // [110] phi from main::@9 to init_plot [phi:main::@9->init_plot] -- call_phi_near
+ // [110] phi from main::@9 to init_plot [phi:main::@9->init_plot]
init_plot_from___b9:
jsr init_plot
jmp __b12
@@ -3116,7 +3116,7 @@ main: {
// Clear the graphics
// [122] phi from main::@5 to memset_dma [phi:main::@5->memset_dma]
memset_dma_from___b5:
- // [122] phi memset_dma::dest#3 = memset_dma::dest#0 [phi:main::@5->memset_dma#0] -- call_phi_near
+ // [122] phi memset_dma::dest#3 = memset_dma::dest#0 [phi:main::@5->memset_dma#0] -- register_copy
jsr memset_dma
jmp __b13
// main::@13
@@ -3124,7 +3124,7 @@ main: {
// [56] *((char *)VICIV+OFFSET_STRUCT_MEGA65_VICIV_BORDER_COLOR) = PURPLE -- _deref_pbuc1=vbuc2
ldz #PURPLE
stz VICIV+OFFSET_STRUCT_MEGA65_VICIV_BORDER_COLOR
- // [57] call render_dots -- call_phi_near
+ // [57] call render_dots
// Render some dots
jsr render_dots
jmp __b14
@@ -3327,7 +3327,7 @@ graphics_mode: {
// Clear the graphics
// [122] phi from graphics_mode::@8 to memset_dma [phi:graphics_mode::@8->memset_dma]
memset_dma_from___b8:
- // [122] phi memset_dma::dest#3 = (void *)GRAPHICS1 [phi:graphics_mode::@8->memset_dma#0] -- call_phi_near
+ // [122] phi memset_dma::dest#3 = (void *)GRAPHICS1 [phi:graphics_mode::@8->memset_dma#0] -- pvoz1=pvoc1
lda #GRAPHICS1
@@ -3341,7 +3341,7 @@ graphics_mode: {
// [89] call memset_dma
// [122] phi from graphics_mode::@11 to memset_dma [phi:graphics_mode::@11->memset_dma]
memset_dma_from___b11:
- // [122] phi memset_dma::dest#3 = (void *)GRAPHICS2 [phi:graphics_mode::@11->memset_dma#0] -- call_phi_near
+ // [122] phi memset_dma::dest#3 = (void *)GRAPHICS2 [phi:graphics_mode::@11->memset_dma#0] -- pvoz1=pvoc1
lda #GRAPHICS2
@@ -3360,7 +3360,7 @@ graphics_mode: {
// [92] lpoke::val = 0 -- vbuz1=vbuc1
ldz #0
stz.z lpoke.val
- // [93] call lpoke -- call_phi_near
+ // [93] call lpoke
jsr lpoke
jmp __b9
// graphics_mode::@9
@@ -3373,7 +3373,7 @@ graphics_mode: {
// [96] lpoke::val = WHITE -- vbuz1=vbuc1
ldz #WHITE
stz.z lpoke.val
- // [97] call lpoke -- call_phi_near
+ // [97] call lpoke
// No extended attributes
jsr lpoke
jmp __b10
@@ -3840,7 +3840,7 @@ render_dots: {
ldy #0
adc (__25),y
taz
- // [161] call plot -- call_phi_near
+ // [161] call plot
jsr plot
jmp __b18
// render_dots::@18
@@ -4681,7 +4681,7 @@ __start: {
// [7] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [8] call main
- // [10] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [10] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [9] return
@@ -4701,7 +4701,7 @@ main: {
// [12] phi from main::SEI1 to main::@6 [phi:main::SEI1->main::@6]
// main::@6
// memoryRemap(0x00,0,0)
- // [13] call memoryRemap -- call_phi_near
+ // [13] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// main::@10
@@ -4740,7 +4740,7 @@ main: {
ora VICIV+OFFSET_STRUCT_MEGA65_VICIV_CONTROLC
sta VICIV+OFFSET_STRUCT_MEGA65_VICIV_CONTROLC
// graphics_mode()
- // [21] call graphics_mode -- call_phi_near
+ // [21] call graphics_mode
// Initialize graphics
jsr graphics_mode
// main::@11
@@ -4831,7 +4831,7 @@ main: {
// init_plot()
// [43] call init_plot
// Initialize plotter
- // [110] phi from main::@9 to init_plot [phi:main::@9->init_plot] -- call_phi_near
+ // [110] phi from main::@9 to init_plot [phi:main::@9->init_plot]
jsr init_plot
// main::@12
// asm
@@ -4894,7 +4894,7 @@ main: {
// [55] call memset_dma
// Clear the graphics
// [122] phi from main::@5 to memset_dma [phi:main::@5->memset_dma]
- // [122] phi memset_dma::dest#3 = memset_dma::dest#0 [phi:main::@5->memset_dma#0] -- call_phi_near
+ // [122] phi memset_dma::dest#3 = memset_dma::dest#0 [phi:main::@5->memset_dma#0] -- register_copy
jsr memset_dma
// main::@13
// VICIV->BORDER_COLOR = PURPLE
@@ -4902,7 +4902,7 @@ main: {
ldz #PURPLE
stz VICIV+OFFSET_STRUCT_MEGA65_VICIV_BORDER_COLOR
// render_dots()
- // [57] call render_dots -- call_phi_near
+ // [57] call render_dots
// Render some dots
jsr render_dots
// main::@14
@@ -5114,7 +5114,7 @@ graphics_mode: {
// [87] call memset_dma
// Clear the graphics
// [122] phi from graphics_mode::@8 to memset_dma [phi:graphics_mode::@8->memset_dma]
- // [122] phi memset_dma::dest#3 = (void *)GRAPHICS1 [phi:graphics_mode::@8->memset_dma#0] -- call_phi_near
+ // [122] phi memset_dma::dest#3 = (void *)GRAPHICS1 [phi:graphics_mode::@8->memset_dma#0] -- pvoz1=pvoc1
lda #GRAPHICS1
@@ -5125,7 +5125,7 @@ graphics_mode: {
// memset_dma(GRAPHICS2, 0x00, 40*25*8)
// [89] call memset_dma
// [122] phi from graphics_mode::@11 to memset_dma [phi:graphics_mode::@11->memset_dma]
- // [122] phi memset_dma::dest#3 = (void *)GRAPHICS2 [phi:graphics_mode::@11->memset_dma#0] -- call_phi_near
+ // [122] phi memset_dma::dest#3 = (void *)GRAPHICS2 [phi:graphics_mode::@11->memset_dma#0] -- pvoz1=pvoc1
lda #GRAPHICS2
@@ -5144,7 +5144,7 @@ graphics_mode: {
// [92] lpoke::val = 0 -- vbuz1=vbuc1
ldz #0
stz.z lpoke.val
- // [93] call lpoke -- call_phi_near
+ // [93] call lpoke
jsr lpoke
// graphics_mode::@9
// lpoke(cols++, 0);
@@ -5157,7 +5157,7 @@ graphics_mode: {
// [96] lpoke::val = WHITE -- vbuz1=vbuc1
ldz #WHITE
stz.z lpoke.val
- // [97] call lpoke -- call_phi_near
+ // [97] call lpoke
// No extended attributes
jsr lpoke
// graphics_mode::@10
@@ -5626,7 +5626,7 @@ render_dots: {
clc
adc (__25),y
taz
- // [161] call plot -- call_phi_near
+ // [161] call plot
jsr plot
// render_dots::@18
// idx_x1 -= 11
diff --git a/src/test/ref/examples/mega65/dma-test.log b/src/test/ref/examples/mega65/dma-test.log
index 1357cda42..6b118ed53 100644
--- a/src/test/ref/examples/mega65/dma-test.log
+++ b/src/test/ref/examples/mega65/dma-test.log
@@ -384,7 +384,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
jmp __b1
@@ -570,7 +570,7 @@ Score: 81
// main
main: {
// memoryRemap(0,0,0)
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// main::@1
diff --git a/src/test/ref/examples/mega65/dma-test2.log b/src/test/ref/examples/mega65/dma-test2.log
index 57c7da4f7..620a9ffa2 100644
--- a/src/test/ref/examples/mega65/dma-test2.log
+++ b/src/test/ref/examples/mega65/dma-test2.log
@@ -511,7 +511,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -519,7 +519,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [3] call memcpy_dma -- call_phi_near
+ // [3] call memcpy_dma
// Move screen up using DMA
jsr memcpy_dma
jmp __breturn
@@ -759,13 +759,13 @@ Score: 131
// main
main: {
// memoryRemap(0,0,0)
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// memcpy_dma(DEFAULT_SCREEN, DEFAULT_SCREEN+80, 24*80)
- // [3] call memcpy_dma -- call_phi_near
+ // [3] call memcpy_dma
// Move screen up using DMA
jsr memcpy_dma
// main::@return
diff --git a/src/test/ref/examples/mega65/dma-test3.log b/src/test/ref/examples/mega65/dma-test3.log
index 8673a5c03..f4fb1aa35 100644
--- a/src/test/ref/examples/mega65/dma-test3.log
+++ b/src/test/ref/examples/mega65/dma-test3.log
@@ -547,7 +547,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -555,7 +555,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [3] call memcpy_dma4 -- call_phi_near
+ // [3] call memcpy_dma4
// Move screen up using DMA
jsr memcpy_dma4
jmp __breturn
@@ -813,13 +813,13 @@ Score: 143
// main
main: {
// memoryRemap(0,0,0)
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// memcpy_dma4(0, DEFAULT_SCREEN, 0, DEFAULT_SCREEN+80, 24*80)
- // [3] call memcpy_dma4 -- call_phi_near
+ // [3] call memcpy_dma4
// Move screen up using DMA
jsr memcpy_dma4
// main::@return
diff --git a/src/test/ref/examples/mega65/dma-test4.log b/src/test/ref/examples/mega65/dma-test4.log
index 9499054f2..4b42f4f75 100644
--- a/src/test/ref/examples/mega65/dma-test4.log
+++ b/src/test/ref/examples/mega65/dma-test4.log
@@ -665,7 +665,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -673,7 +673,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [3] call memcpy_dma256 -- call_phi_near
+ // [3] call memcpy_dma256
// Move screen up using DMA
jsr memcpy_dma256
jmp __breturn
@@ -957,13 +957,13 @@ Score: 155
// main
main: {
// memoryRemap(0,0,0)
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// memcpy_dma256(0,0, DEFAULT_SCREEN, 0,0, DEFAULT_SCREEN+80, 24*80)
- // [3] call memcpy_dma256 -- call_phi_near
+ // [3] call memcpy_dma256
// Move screen up using DMA
jsr memcpy_dma256
// main::@return
diff --git a/src/test/ref/examples/mega65/dma-test5.log b/src/test/ref/examples/mega65/dma-test5.log
index b77b5b6cf..d58be21be 100644
--- a/src/test/ref/examples/mega65/dma-test5.log
+++ b/src/test/ref/examples/mega65/dma-test5.log
@@ -507,7 +507,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -515,7 +515,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [3] call memset_dma -- call_phi_near
+ // [3] call memset_dma
// Fill screen up using DMA
jsr memset_dma
jmp __breturn
@@ -755,13 +755,13 @@ Score: 131
// main
main: {
// memoryRemap(0,0,0)
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// memset_dma(DEFAULT_SCREEN, '*', 80*10)
- // [3] call memset_dma -- call_phi_near
+ // [3] call memset_dma
// Fill screen up using DMA
jsr memset_dma
// main::@return
diff --git a/src/test/ref/examples/mega65/dma-test6.log b/src/test/ref/examples/mega65/dma-test6.log
index 632c2b1ea..3145ecb9f 100644
--- a/src/test/ref/examples/mega65/dma-test6.log
+++ b/src/test/ref/examples/mega65/dma-test6.log
@@ -611,7 +611,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -619,7 +619,7 @@ main: {
jmp __b1
// main::@1
__b1:
- // [3] call memset_dma256 -- call_phi_near
+ // [3] call memset_dma256
// Fill screen up using 256MB DMA
jsr memset_dma256
jmp __breturn
@@ -884,13 +884,13 @@ Score: 143
// main
main: {
// memoryRemap(0,0,0)
- // [1] call memoryRemap -- call_phi_near
+ // [1] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// [2] phi from main to main::@1 [phi:main->main::@1]
// main::@1
// memset_dma256(0, 0, DEFAULT_SCREEN, '*', 80*10)
- // [3] call memset_dma256 -- call_phi_near
+ // [3] call memset_dma256
// Fill screen up using 256MB DMA
jsr memset_dma256
// main::@return
diff --git a/src/test/ref/examples/mega65/dypp65.log b/src/test/ref/examples/mega65/dypp65.log
index 178673d08..164eb0c8e 100644
--- a/src/test/ref/examples/mega65/dypp65.log
+++ b/src/test/ref/examples/mega65/dypp65.log
@@ -1460,7 +1460,7 @@ main: {
jmp __b11
// main::@11
__b11:
- // [3] call memoryRemap -- call_phi_near
+ // [3] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
jmp __b12
@@ -1563,7 +1563,7 @@ main: {
sta.z memset_dma.dest+1
// [60] phi memset_dma::fill#2 = 0 [phi:main::@12->memset_dma#1] -- vbuzz=vbuc1
ldz #0
- // [60] phi memset_dma::num#2 = (unsigned int)$2d*$19*2 [phi:main::@12->memset_dma#2] -- call_phi_near
+ // [60] phi memset_dma::num#2 = (unsigned int)$2d*$19*2 [phi:main::@12->memset_dma#2] -- vwuz1=vwuc1
lda #<$2d*$19*2
sta.z memset_dma.num
lda #>$2d*$19*2
@@ -1574,7 +1574,7 @@ main: {
jmp __b13
// main::@13
__b13:
- // [30] call memset_dma256 -- call_phi_near
+ // [30] call memset_dma256
// Fill the colours with WHITE - directly into $ff80000
jsr memset_dma256
// [31] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
@@ -1593,7 +1593,7 @@ main: {
sta.z memset_dma.dest+1
// [60] phi memset_dma::fill#2 = $55 [phi:main::@14->memset_dma#1] -- vbuzz=vbuc1
ldz #$55
- // [60] phi memset_dma::num#2 = (unsigned int)$2d*$20*8 [phi:main::@14->memset_dma#2] -- call_phi_near
+ // [60] phi memset_dma::num#2 = (unsigned int)$2d*$20*8 [phi:main::@14->memset_dma#2] -- vwuz1=vwuc1
lda #<$2d*$20*8
sta.z memset_dma.num
lda #>$2d*$20*8
@@ -2236,7 +2236,7 @@ main: {
// [2] phi from main::SEI1 to main::@11 [phi:main::SEI1->main::@11]
// main::@11
// memoryRemap(0,0,0)
- // [3] call memoryRemap -- call_phi_near
+ // [3] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// main::@12
@@ -2354,7 +2354,7 @@ main: {
lda #>SCREEN
sta.z memset_dma.dest+1
// [60] phi memset_dma::fill#2 = 0 [phi:main::@12->memset_dma#1] -- vbuzz=vbuc1
- // [60] phi memset_dma::num#2 = (unsigned int)$2d*$19*2 [phi:main::@12->memset_dma#2] -- call_phi_near
+ // [60] phi memset_dma::num#2 = (unsigned int)$2d*$19*2 [phi:main::@12->memset_dma#2] -- vwuz1=vwuc1
lda #<$2d*$19*2
sta.z memset_dma.num
lda #>$2d*$19*2
@@ -2363,7 +2363,7 @@ main: {
// [29] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
// main::@13
// memset_dma256(0xff,0x08,(void*)0x0000, WHITE, 45*25*2)
- // [30] call memset_dma256 -- call_phi_near
+ // [30] call memset_dma256
// Fill the colours with WHITE - directly into $ff80000
jsr memset_dma256
// [31] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
@@ -2379,7 +2379,7 @@ main: {
sta.z memset_dma.dest+1
// [60] phi memset_dma::fill#2 = $55 [phi:main::@14->memset_dma#1] -- vbuzz=vbuc1
ldz #$55
- // [60] phi memset_dma::num#2 = (unsigned int)$2d*$20*8 [phi:main::@14->memset_dma#2] -- call_phi_near
+ // [60] phi memset_dma::num#2 = (unsigned int)$2d*$20*8 [phi:main::@14->memset_dma#2] -- vwuz1=vwuc1
lda #<$2d*$20*8
sta.z memset_dma.num
lda #>$2d*$20*8
diff --git a/src/test/ref/examples/mega65/helloworld-mega65.log b/src/test/ref/examples/mega65/helloworld-mega65.log
index 3d741a72b..f4fcca264 100644
--- a/src/test/ref/examples/mega65/helloworld-mega65.log
+++ b/src/test/ref/examples/mega65/helloworld-mega65.log
@@ -1699,7 +1699,7 @@ __start: {
lda #>COLORRAM
sta.z conio_line_color+1
// [5] call conio_mega65_init
- // [9] phi from __start::__init1 to conio_mega65_init [phi:__start::__init1->conio_mega65_init] -- call_phi_near
+ // [9] phi from __start::__init1 to conio_mega65_init [phi:__start::__init1->conio_mega65_init]
conio_mega65_init_from___init1:
jsr conio_mega65_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
@@ -1708,7 +1708,7 @@ __start: {
// __start::@1
__b1:
// [7] call main
- // [34] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [34] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -1732,7 +1732,7 @@ conio_mega65_init: {
jmp __b2
// conio_mega65_init::@2
__b2:
- // [12] call memoryRemap -- call_phi_near
+ // [12] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
jmp __b3
@@ -1773,7 +1773,7 @@ conio_mega65_init: {
// conio_mega65_init::@1
__b1:
// [20] gotoxy::y#2 = conio_mega65_init::line#2
- // [21] call gotoxy -- call_phi_near
+ // [21] call gotoxy
jsr gotoxy
jmp __breturn
// conio_mega65_init::@return
@@ -1814,7 +1814,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
- // [30] call cputln -- call_phi_near
+ // [30] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@@ -1826,14 +1826,14 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
- // [33] call cputln -- call_phi_near
+ // [33] call cputln
jsr cputln
jmp __breturn
}
// main
main: {
// [35] call printf_str
- // [63] phi from main to printf_str [phi:main->printf_str] -- call_phi_near
+ // [63] phi from main to printf_str [phi:main->printf_str]
printf_str_from_main:
jsr printf_str
jmp __breturn
@@ -2026,7 +2026,7 @@ cputln: {
stz.z conio_cursor_x
// [60] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
- // [61] call cscroll -- call_phi_near
+ // [61] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@@ -2095,7 +2095,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [85] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$50 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [85] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$50 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$50
@@ -2114,7 +2114,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [85] phi memcpy::source#2 = (void *)COLORRAM+$50 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [85] phi memcpy::source#2 = (void *)COLORRAM+$50 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$50
@@ -2130,7 +2130,7 @@ cscroll: {
memset_from___b3:
// [95] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuzz=vbuc1
ldz #' '
- // [95] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$50-$50 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [95] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$50-$50 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$50-$50
@@ -2146,7 +2146,7 @@ cscroll: {
memset_from___b4:
// [95] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuzz=vbuc1
ldz #LIGHT_BLUE
- // [95] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$50-$50 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [95] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$50-$50 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$50-$50
@@ -2569,12 +2569,12 @@ __start: {
sta.z conio_line_color+1
// #pragma constructor_for(conio_mega65_init, cputc, clrscr, cscroll)
// [5] call conio_mega65_init
- // [9] phi from __start::__init1 to conio_mega65_init [phi:__start::__init1->conio_mega65_init] -- call_phi_near
+ // [9] phi from __start::__init1 to conio_mega65_init [phi:__start::__init1->conio_mega65_init]
jsr conio_mega65_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [7] call main
- // [34] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [34] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [8] return
@@ -2592,7 +2592,7 @@ conio_mega65_init: {
// [11] phi from conio_mega65_init::SEI1 to conio_mega65_init::@2 [phi:conio_mega65_init::SEI1->conio_mega65_init::@2]
// conio_mega65_init::@2
// memoryRemap(0,0,0)
- // [12] call memoryRemap -- call_phi_near
+ // [12] call memoryRemap
// Map memory to BANK 0 : 0x00XXXX - giving access to I/O
jsr memoryRemap
// conio_mega65_init::@3
@@ -2630,7 +2630,7 @@ conio_mega65_init: {
__b1:
// gotoxy(0, line)
// [20] gotoxy::y#2 = conio_mega65_init::line#2
- // [21] call gotoxy -- call_phi_near
+ // [21] call gotoxy
jsr gotoxy
// conio_mega65_init::@return
// }
@@ -2669,7 +2669,7 @@ cputc: {
// [29] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
- // [30] call cputln -- call_phi_near
+ // [30] call cputln
jsr cputln
// cputc::@return
__breturn:
@@ -2680,7 +2680,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
- // [33] call cputln -- call_phi_near
+ // [33] call cputln
jsr cputln
rts
}
@@ -2688,7 +2688,7 @@ cputc: {
main: {
// printf("hello world!")
// [35] call printf_str
- // [63] phi from main to printf_str [phi:main->printf_str] -- call_phi_near
+ // [63] phi from main to printf_str [phi:main->printf_str]
jsr printf_str
// main::@return
// }
@@ -2882,7 +2882,7 @@ cputln: {
// [60] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
- // [61] call cscroll -- call_phi_near
+ // [61] call cscroll
jsr cscroll
// cputln::@return
// }
@@ -2946,7 +2946,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [85] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$50 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [85] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$50 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$50
@@ -2962,7 +2962,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [85] phi memcpy::source#2 = (void *)COLORRAM+$50 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [85] phi memcpy::source#2 = (void *)COLORRAM+$50 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$50
@@ -2975,7 +2975,7 @@ cscroll: {
// [95] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
// [95] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuzz=vbuc1
ldz #' '
- // [95] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$50-$50 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [95] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$50-$50 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$50-$50
@@ -2988,7 +2988,7 @@ cscroll: {
// [95] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [95] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuzz=vbuc1
ldz #LIGHT_BLUE
- // [95] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$50-$50 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [95] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$50-$50 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$50-$50
diff --git a/src/test/ref/examples/mega65/memorymap-test.log b/src/test/ref/examples/mega65/memorymap-test.log
index e9f734cad..34e9e57ef 100644
--- a/src/test/ref/examples/mega65/memorymap-test.log
+++ b/src/test/ref/examples/mega65/memorymap-test.log
@@ -1023,7 +1023,7 @@ main: {
// Remap [$4000-$5fff] to point to [$10000-$11fff]
// [24] phi from main to memoryRemapBlock [phi:main->memoryRemapBlock]
memoryRemapBlock_from_main:
- // [24] phi memoryRemapBlock::blockPage#2 = $40 [phi:main->memoryRemapBlock#0] -- call_phi_near
+ // [24] phi memoryRemapBlock::blockPage#2 = $40 [phi:main->memoryRemapBlock#0] -- vbuxx=vbuc1
ldx #$40
jsr memoryRemapBlock
jmp __b7
@@ -1040,7 +1040,7 @@ main: {
// Remap [$8000-$9fff] to point to [$10000-$11fff]
// [24] phi from main::@7 to memoryRemapBlock [phi:main::@7->memoryRemapBlock]
memoryRemapBlock_from___b7:
- // [24] phi memoryRemapBlock::blockPage#2 = $80 [phi:main::@7->memoryRemapBlock#0] -- call_phi_near
+ // [24] phi memoryRemapBlock::blockPage#2 = $80 [phi:main::@7->memoryRemapBlock#0] -- vbuxx=vbuc1
ldx #$80
jsr memoryRemapBlock
jmp __b8
@@ -1064,7 +1064,7 @@ main: {
sta.z memoryRemap.upperPageOffset+1
// [33] phi memoryRemap::remapBlocks#2 = MEMORYBLOCK_4000|MEMORYBLOCK_8000 [phi:main::@8->memoryRemap#1] -- vbuzz=vbuc1
ldz #MEMORYBLOCK_4000|MEMORYBLOCK_8000
- // [33] phi memoryRemap::lowerPageOffset#2 = $c0 [phi:main::@8->memoryRemap#2] -- call_phi_near
+ // [33] phi memoryRemap::lowerPageOffset#2 = $c0 [phi:main::@8->memoryRemap#2] -- vwuz1=vbuc1
lda #<$c0
sta.z memoryRemap.lowerPageOffset
lda #>$c0
@@ -1102,7 +1102,7 @@ main: {
memoryRemap256M_from___b3:
// [46] phi memoryRemap256M::remapBlocks#2 = MEMORYBLOCK_4000 [phi:main::@3->memoryRemap256M#0] -- vbuxx=vbuc1
ldx #MEMORYBLOCK_4000
- // [46] phi memoryRemap256M::lowerPageOffset#2 = $ff800-$40 [phi:main::@3->memoryRemap256M#1] -- call_phi_near
+ // [46] phi memoryRemap256M::lowerPageOffset#2 = $ff800-$40 [phi:main::@3->memoryRemap256M#1] -- vduz1=vduc1
lda #<$ff800-$40
sta.z memoryRemap256M.lowerPageOffset
lda #>$ff800-$40
@@ -1134,7 +1134,7 @@ main: {
memoryRemap256M_from___b6:
// [46] phi memoryRemap256M::remapBlocks#2 = 0 [phi:main::@6->memoryRemap256M#0] -- vbuxx=vbuc1
ldx #0
- // [46] phi memoryRemap256M::lowerPageOffset#2 = 0 [phi:main::@6->memoryRemap256M#1] -- call_phi_near
+ // [46] phi memoryRemap256M::lowerPageOffset#2 = 0 [phi:main::@6->memoryRemap256M#1] -- vduz1=vbuc1
lda #0
sta.z memoryRemap256M.lowerPageOffset
lda #0
@@ -1223,7 +1223,7 @@ memoryRemapBlock: {
memoryRemap_from_memoryRemapBlock:
// [33] phi memoryRemap::upperPageOffset#2 = memoryRemap::upperPageOffset#0 [phi:memoryRemapBlock->memoryRemap#0] -- register_copy
// [33] phi memoryRemap::remapBlocks#2 = memoryRemap::remapBlocks#0 [phi:memoryRemapBlock->memoryRemap#1] -- register_copy
- // [33] phi memoryRemap::lowerPageOffset#2 = memoryRemap::lowerPageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- call_phi_near
+ // [33] phi memoryRemap::lowerPageOffset#2 = memoryRemap::lowerPageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- register_copy
jsr memoryRemap
jmp __breturn
// memoryRemapBlock::@return
@@ -1611,7 +1611,7 @@ main: {
// [1] call memoryRemapBlock
// Remap [$4000-$5fff] to point to [$10000-$11fff]
// [24] phi from main to memoryRemapBlock [phi:main->memoryRemapBlock]
- // [24] phi memoryRemapBlock::blockPage#2 = $40 [phi:main->memoryRemapBlock#0] -- call_phi_near
+ // [24] phi memoryRemapBlock::blockPage#2 = $40 [phi:main->memoryRemapBlock#0] -- vbuxx=vbuc1
ldx #$40
jsr memoryRemapBlock
// main::@7
@@ -1628,7 +1628,7 @@ main: {
// [4] call memoryRemapBlock
// Remap [$8000-$9fff] to point to [$10000-$11fff]
// [24] phi from main::@7 to memoryRemapBlock [phi:main::@7->memoryRemapBlock]
- // [24] phi memoryRemapBlock::blockPage#2 = $80 [phi:main::@7->memoryRemapBlock#0] -- call_phi_near
+ // [24] phi memoryRemapBlock::blockPage#2 = $80 [phi:main::@7->memoryRemapBlock#0] -- vbuxx=vbuc1
ldx #$80
jsr memoryRemapBlock
// main::@8
@@ -1652,7 +1652,7 @@ main: {
sta.z memoryRemap.upperPageOffset+1
// [33] phi memoryRemap::remapBlocks#2 = MEMORYBLOCK_4000|MEMORYBLOCK_8000 [phi:main::@8->memoryRemap#1] -- vbuzz=vbuc1
ldz #MEMORYBLOCK_4000|MEMORYBLOCK_8000
- // [33] phi memoryRemap::lowerPageOffset#2 = $c0 [phi:main::@8->memoryRemap#2] -- call_phi_near
+ // [33] phi memoryRemap::lowerPageOffset#2 = $c0 [phi:main::@8->memoryRemap#2] -- vwuz1=vbuc1
lda #<$c0
sta.z memoryRemap.lowerPageOffset
lda #>$c0
@@ -1686,7 +1686,7 @@ main: {
// [46] phi from main::@3 to memoryRemap256M [phi:main::@3->memoryRemap256M]
// [46] phi memoryRemap256M::remapBlocks#2 = MEMORYBLOCK_4000 [phi:main::@3->memoryRemap256M#0] -- vbuxx=vbuc1
ldx #MEMORYBLOCK_4000
- // [46] phi memoryRemap256M::lowerPageOffset#2 = $ff800-$40 [phi:main::@3->memoryRemap256M#1] -- call_phi_near
+ // [46] phi memoryRemap256M::lowerPageOffset#2 = $ff800-$40 [phi:main::@3->memoryRemap256M#1] -- vduz1=vduc1
lda #<$ff800-$40
sta.z memoryRemap256M.lowerPageOffset
lda #>$ff800-$40
@@ -1714,7 +1714,7 @@ main: {
// [46] phi from main::@6 to memoryRemap256M [phi:main::@6->memoryRemap256M]
// [46] phi memoryRemap256M::remapBlocks#2 = 0 [phi:main::@6->memoryRemap256M#0] -- vbuxx=vbuc1
ldx #0
- // [46] phi memoryRemap256M::lowerPageOffset#2 = 0 [phi:main::@6->memoryRemap256M#1] -- call_phi_near
+ // [46] phi memoryRemap256M::lowerPageOffset#2 = 0 [phi:main::@6->memoryRemap256M#1] -- vduz1=vbuc1
txa
sta.z memoryRemap256M.lowerPageOffset
sta.z memoryRemap256M.lowerPageOffset+1
@@ -1807,7 +1807,7 @@ memoryRemapBlock: {
// [33] phi from memoryRemapBlock to memoryRemap [phi:memoryRemapBlock->memoryRemap]
// [33] phi memoryRemap::upperPageOffset#2 = memoryRemap::upperPageOffset#0 [phi:memoryRemapBlock->memoryRemap#0] -- register_copy
// [33] phi memoryRemap::remapBlocks#2 = memoryRemap::remapBlocks#0 [phi:memoryRemapBlock->memoryRemap#1] -- register_copy
- // [33] phi memoryRemap::lowerPageOffset#2 = memoryRemap::lowerPageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- call_phi_near
+ // [33] phi memoryRemap::lowerPageOffset#2 = memoryRemap::lowerPageOffset#0 [phi:memoryRemapBlock->memoryRemap#2] -- register_copy
jsr memoryRemap
// memoryRemapBlock::@return
// }
diff --git a/src/test/ref/examples/mega65/raster65.log b/src/test/ref/examples/mega65/raster65.log
index 6c6c84084..a3be84bda 100644
--- a/src/test/ref/examples/mega65/raster65.log
+++ b/src/test/ref/examples/mega65/raster65.log
@@ -2201,7 +2201,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [7] call main -- call_phi_near
+ // [7] call main
jsr main
jmp __breturn
// __start::@return
@@ -2747,7 +2747,7 @@ main: {
__b1:
// [118] call memset
// Clear screen
- // [144] phi from main::@1 to memset [phi:main::@1->memset] -- call_phi_near
+ // [144] phi from main::@1 to memset [phi:main::@1->memset]
memset_from___b1:
jsr memset
// [119] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -3403,7 +3403,7 @@ __start: {
stz.z greet_idx
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [7] call main -- call_phi_near
+ // [7] call main
jsr main
// __start::@return
// [8] return
@@ -3965,7 +3965,7 @@ main: {
// memset(SCREEN, ' ', 40*25)
// [118] call memset
// Clear screen
- // [144] phi from main::@1 to memset [phi:main::@1->memset] -- call_phi_near
+ // [144] phi from main::@1 to memset [phi:main::@1->memset]
jsr memset
// [119] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// [119] phi main::i1#2 = 0 [phi:main::@1->main::@2#0] -- vbuxx=vbuc1
diff --git a/src/test/ref/examples/nes/nes-dxycp.log b/src/test/ref/examples/nes/nes-dxycp.log
index 7640dad65..fdccbdbe3 100644
--- a/src/test/ref/examples/nes/nes-dxycp.log
+++ b/src/test/ref/examples/nes/nes-dxycp.log
@@ -2194,7 +2194,7 @@ __start: {
// __start::@1
__b1:
// [5] call main
- // [45] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [45] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -2242,7 +2242,7 @@ vblank: {
jmp __b14
// vblank::@14
__b14:
- // [12] call readJoy1 -- call_phi_near
+ // [12] call readJoy1
// Read controller 1
jsr readJoy1
// [13] readJoy1::return#2 = readJoy1::joy#2
@@ -2538,7 +2538,7 @@ main: {
__b4:
// [71] call ppuDataTransfer
// Transfer the palette
- // [96] phi from main::@4 to ppuDataTransfer [phi:main::@4->ppuDataTransfer] -- call_phi_near
+ // [96] phi from main::@4 to ppuDataTransfer [phi:main::@4->ppuDataTransfer]
ppuDataTransfer_from___b4:
jsr ppuDataTransfer
// [72] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
@@ -2557,7 +2557,7 @@ main: {
sta.z ppuDataFill.size
lda #>$20*$1e
sta.z ppuDataFill.size+1
- // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_NAME_TABLE_0 [phi:main::@5->ppuDataFill#2] -- call_phi_near
+ // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_NAME_TABLE_0 [phi:main::@5->ppuDataFill#2] -- pvoz1=pvoc1
lda #PPU_NAME_TABLE_0
@@ -2578,7 +2578,7 @@ main: {
sta.z ppuDataFill.size
lda #>$40
sta.z ppuDataFill.size+1
- // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_ATTRIBUTE_TABLE_0 [phi:main::@6->ppuDataFill#2] -- call_phi_near
+ // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_ATTRIBUTE_TABLE_0 [phi:main::@6->ppuDataFill#2] -- pvoz1=pvoc1
lda #PPU_ATTRIBUTE_TABLE_0
@@ -3276,7 +3276,7 @@ __start: {
// [4] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [5] call main
- // [45] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [45] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [6] return
@@ -3318,7 +3318,7 @@ vblank: {
// [11] phi from vblank::ppuSpriteBufferDmaTransfer1 to vblank::@14 [phi:vblank::ppuSpriteBufferDmaTransfer1->vblank::@14]
// vblank::@14
// char joy = readJoy1()
- // [12] call readJoy1 -- call_phi_near
+ // [12] call readJoy1
// Read controller 1
jsr readJoy1
// [13] readJoy1::return#2 = readJoy1::joy#2
@@ -3596,7 +3596,7 @@ main: {
// ppuDataTransfer(PPU_PALETTE, PALETTE, sizeof(PALETTE))
// [71] call ppuDataTransfer
// Transfer the palette
- // [96] phi from main::@4 to ppuDataTransfer [phi:main::@4->ppuDataTransfer] -- call_phi_near
+ // [96] phi from main::@4 to ppuDataTransfer [phi:main::@4->ppuDataTransfer]
jsr ppuDataTransfer
// [72] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
// main::@5
@@ -3611,7 +3611,7 @@ main: {
sta.z ppuDataFill.size
lda #>$20*$1e
sta.z ppuDataFill.size+1
- // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_NAME_TABLE_0 [phi:main::@5->ppuDataFill#2] -- call_phi_near
+ // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_NAME_TABLE_0 [phi:main::@5->ppuDataFill#2] -- pvoz1=pvoc1
lda #PPU_NAME_TABLE_0
@@ -3629,7 +3629,7 @@ main: {
sta.z ppuDataFill.size
lda #>$40
sta.z ppuDataFill.size+1
- // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_ATTRIBUTE_TABLE_0 [phi:main::@6->ppuDataFill#2] -- call_phi_near
+ // [106] phi ppuDataFill::ppuDataPrepare1_ppuData#0 = (void * const )PPU_ATTRIBUTE_TABLE_0 [phi:main::@6->ppuDataFill#2] -- pvoz1=pvoc1
lda #PPU_ATTRIBUTE_TABLE_0
diff --git a/src/test/ref/examples/plus4/plus4-randomwalk.log b/src/test/ref/examples/plus4/plus4-randomwalk.log
index 9b13addd0..91996d03d 100644
--- a/src/test/ref/examples/plus4/plus4-randomwalk.log
+++ b/src/test/ref/examples/plus4/plus4-randomwalk.log
@@ -1195,7 +1195,7 @@ main: {
memset_from_main:
// [44] phi memset::c#5 = $a0 [phi:main->memset#0] -- vbuxx=vbuc1
ldx #$a0
- // [44] phi memset::str#4 = (void *)DEFAULT_SCREEN [phi:main->memset#1] -- call_phi_near
+ // [44] phi memset::str#4 = (void *)DEFAULT_SCREEN [phi:main->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN
@@ -1211,7 +1211,7 @@ main: {
memset_from___b10:
// [44] phi memset::c#5 = 0 [phi:main::@10->memset#0] -- vbuxx=vbuc1
ldx #0
- // [44] phi memset::str#4 = (void *)DEFAULT_COLORRAM [phi:main::@10->memset#1] -- call_phi_near
+ // [44] phi memset::str#4 = (void *)DEFAULT_COLORRAM [phi:main::@10->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_COLORRAM
@@ -1227,7 +1227,7 @@ main: {
memset_from___b11:
// [44] phi memset::c#5 = 0 [phi:main::@11->memset#0] -- vbuxx=vbuc1
ldx #0
- // [44] phi memset::str#4 = (void *)VISITS [phi:main::@11->memset#1] -- call_phi_near
+ // [44] phi memset::str#4 = (void *)VISITS [phi:main::@11->memset#1] -- pvoz1=pvoc1
lda #VISITS
@@ -1332,7 +1332,7 @@ main: {
lda FADE,y
ldy #0
sta (__8),y
- // [20] call rand -- call_phi_near
+ // [20] call rand
jsr rand
// [21] rand::return#2 = rand::return#0
jmp __b13
@@ -1814,7 +1814,7 @@ main: {
// [44] phi from main to memset [phi:main->memset]
// [44] phi memset::c#5 = $a0 [phi:main->memset#0] -- vbuxx=vbuc1
ldx #$a0
- // [44] phi memset::str#4 = (void *)DEFAULT_SCREEN [phi:main->memset#1] -- call_phi_near
+ // [44] phi memset::str#4 = (void *)DEFAULT_SCREEN [phi:main->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN
@@ -1827,7 +1827,7 @@ main: {
// [44] phi from main::@10 to memset [phi:main::@10->memset]
// [44] phi memset::c#5 = 0 [phi:main::@10->memset#0] -- vbuxx=vbuc1
ldx #0
- // [44] phi memset::str#4 = (void *)DEFAULT_COLORRAM [phi:main::@10->memset#1] -- call_phi_near
+ // [44] phi memset::str#4 = (void *)DEFAULT_COLORRAM [phi:main::@10->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_COLORRAM
@@ -1840,7 +1840,7 @@ main: {
// [44] phi from main::@11 to memset [phi:main::@11->memset]
// [44] phi memset::c#5 = 0 [phi:main::@11->memset#0] -- vbuxx=vbuc1
ldx #0
- // [44] phi memset::str#4 = (void *)VISITS [phi:main::@11->memset#1] -- call_phi_near
+ // [44] phi memset::str#4 = (void *)VISITS [phi:main::@11->memset#1] -- pvoz1=pvoc1
lda #VISITS
@@ -1946,7 +1946,7 @@ main: {
ldy #0
sta (__8),y
// rand()
- // [20] call rand -- call_phi_near
+ // [20] call rand
jsr rand
// [21] rand::return#2 = rand::return#0
// main::@13
diff --git a/src/test/ref/examples/rom/rom.log b/src/test/ref/examples/rom/rom.log
index 6fc4558a9..42362a5cd 100644
--- a/src/test/ref/examples/rom/rom.log
+++ b/src/test/ref/examples/rom/rom.log
@@ -567,7 +567,7 @@ main: {
call2_from_main:
// [34] phi call2::param2#2 = 2 [phi:main->call2#0] -- vbuaa=vbuc1
lda #2
- // [34] phi call2::param1#2 = 1 [phi:main->call2#1] -- call_phi_near
+ // [34] phi call2::param1#2 = 1 [phi:main->call2#1] -- vbuxx=vbuc1
ldx #1
jsr call2
// [13] call2::return = call2::return
@@ -583,7 +583,7 @@ main: {
call2_from___b1:
// [34] phi call2::param2#2 = 4 [phi:main::@1->call2#0] -- vbuaa=vbuc1
lda #4
- // [34] phi call2::param1#2 = 3 [phi:main::@1->call2#1] -- call_phi_near
+ // [34] phi call2::param1#2 = 3 [phi:main::@1->call2#1] -- vbuxx=vbuc1
ldx #3
jsr call2
// [17] call2::return = call2::return
@@ -599,7 +599,7 @@ main: {
call3_from___b2:
// [38] phi call3::param2#2 = 2 [phi:main::@2->call3#0] -- vbuaa=vbuc1
lda #2
- // [38] phi call3::param1#2 = 1 [phi:main::@2->call3#1] -- call_phi_near
+ // [38] phi call3::param1#2 = 1 [phi:main::@2->call3#1] -- vbuxx=vbuc1
ldx #1
jsr call3
// [21] call3::return#2 = call3::return#0
@@ -614,7 +614,7 @@ main: {
call3_from___b3:
// [38] phi call3::param2#2 = 4 [phi:main::@3->call3#0] -- vbuaa=vbuc1
lda #4
- // [38] phi call3::param1#2 = 3 [phi:main::@3->call3#1] -- call_phi_near
+ // [38] phi call3::param1#2 = 3 [phi:main::@3->call3#1] -- vbuxx=vbuc1
ldx #3
jsr call3
// [25] call3::return#3 = call3::return#0
@@ -828,7 +828,7 @@ main: {
// [34] phi from main to call2 [phi:main->call2]
// [34] phi call2::param2#2 = 2 [phi:main->call2#0] -- vbuaa=vbuc1
lda #2
- // [34] phi call2::param1#2 = 1 [phi:main->call2#1] -- call_phi_near
+ // [34] phi call2::param1#2 = 1 [phi:main->call2#1] -- vbuxx=vbuc1
ldx #1
jsr call2
// call2(1,2)
@@ -844,7 +844,7 @@ main: {
// [34] phi from main::@1 to call2 [phi:main::@1->call2]
// [34] phi call2::param2#2 = 4 [phi:main::@1->call2#0] -- vbuaa=vbuc1
lda #4
- // [34] phi call2::param1#2 = 3 [phi:main::@1->call2#1] -- call_phi_near
+ // [34] phi call2::param1#2 = 3 [phi:main::@1->call2#1] -- vbuxx=vbuc1
ldx #3
jsr call2
// call2(3,4)
@@ -860,7 +860,7 @@ main: {
// [38] phi from main::@2 to call3 [phi:main::@2->call3]
// [38] phi call3::param2#2 = 2 [phi:main::@2->call3#0] -- vbuaa=vbuc1
lda #2
- // [38] phi call3::param1#2 = 1 [phi:main::@2->call3#1] -- call_phi_near
+ // [38] phi call3::param1#2 = 1 [phi:main::@2->call3#1] -- vbuxx=vbuc1
ldx #1
jsr call3
// call3(1,2)
@@ -875,7 +875,7 @@ main: {
// [38] phi from main::@3 to call3 [phi:main::@3->call3]
// [38] phi call3::param2#2 = 4 [phi:main::@3->call3#0] -- vbuaa=vbuc1
lda #4
- // [38] phi call3::param1#2 = 3 [phi:main::@3->call3#1] -- call_phi_near
+ // [38] phi call3::param1#2 = 3 [phi:main::@3->call3#1] -- vbuxx=vbuc1
ldx #3
jsr call3
// call3(3,4)
diff --git a/src/test/ref/flipper-rex2.log b/src/test/ref/flipper-rex2.log
index d38c416eb..317adebed 100644
--- a/src/test/ref/flipper-rex2.log
+++ b/src/test/ref/flipper-rex2.log
@@ -718,7 +718,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call prepare
- // [11] phi from main to prepare [phi:main->prepare] -- call_phi_near
+ // [11] phi from main to prepare [phi:main->prepare]
prepare_from_main:
jsr prepare
// [2] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
@@ -759,7 +759,7 @@ main: {
// main::@4
__b4:
// [8] call flip
- // [17] phi from main::@4 to flip [phi:main::@4->flip] -- call_phi_near
+ // [17] phi from main::@4 to flip [phi:main::@4->flip]
flip_from___b4:
jsr flip
// [9] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
@@ -768,7 +768,7 @@ main: {
// main::@5
__b5:
// [10] call plot
- // [33] phi from main::@5 to plot [phi:main::@5->plot] -- call_phi_near
+ // [33] phi from main::@5 to plot [phi:main::@5->plot]
plot_from___b5:
jsr plot
jmp __b1_from___b5
@@ -1111,7 +1111,7 @@ Score: 83294
main: {
// prepare()
// [1] call prepare
- // [11] phi from main to prepare [phi:main->prepare] -- call_phi_near
+ // [11] phi from main to prepare [phi:main->prepare]
jsr prepare
// [2] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
__b3:
@@ -1144,13 +1144,13 @@ main: {
// main::@4
// flip()
// [8] call flip
- // [17] phi from main::@4 to flip [phi:main::@4->flip] -- call_phi_near
+ // [17] phi from main::@4 to flip [phi:main::@4->flip]
jsr flip
// [9] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
// main::@5
// plot()
// [10] call plot
- // [33] phi from main::@5 to plot [phi:main::@5->plot] -- call_phi_near
+ // [33] phi from main::@5 to plot [phi:main::@5->plot]
jsr plot
jmp __b3
}
diff --git a/src/test/ref/font-hex-show.log b/src/test/ref/font-hex-show.log
index 8ee442525..d0df97974 100644
--- a/src/test/ref/font-hex-show.log
+++ b/src/test/ref/font-hex-show.log
@@ -696,7 +696,7 @@ main: {
lda #toD0181_return
sta D018
// [3] call init_font_hex
- // [9] phi from main::@2 to init_font_hex [phi:main::@2->init_font_hex] -- call_phi_near
+ // [9] phi from main::@2 to init_font_hex [phi:main::@2->init_font_hex]
init_font_hex_from___b2:
jsr init_font_hex
// [4] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
@@ -1026,7 +1026,7 @@ main: {
sta D018
// init_font_hex(CHARSET)
// [3] call init_font_hex
- // [9] phi from main::@2 to init_font_hex [phi:main::@2->init_font_hex] -- call_phi_near
+ // [9] phi from main::@2 to init_font_hex [phi:main::@2->init_font_hex]
jsr init_font_hex
// [4] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
// [4] phi main::c#2 = 0 [phi:main::@2->main::@1#0] -- vbuxx=vbuc1
diff --git a/src/test/ref/fragment-synth.log b/src/test/ref/fragment-synth.log
index 0c290d92f..408bca681 100644
--- a/src/test/ref/fragment-synth.log
+++ b/src/test/ref/fragment-synth.log
@@ -311,7 +311,7 @@ main: {
sta.z fct.z
lda #>$450
sta.z fct.z+1
- // [11] phi fct::x#2 = $aa [phi:main->fct#1] -- call_phi_near
+ // [11] phi fct::x#2 = $aa [phi:main->fct#1] -- vbuxx=vbuc1
ldx #$aa
jsr fct
// [3] fct::return#0 = fct::return#2
@@ -329,7 +329,7 @@ main: {
sta.z fct.z
lda #>$450+1
sta.z fct.z+1
- // [11] phi fct::x#2 = $55 [phi:main::@1->fct#1] -- call_phi_near
+ // [11] phi fct::x#2 = $55 [phi:main::@1->fct#1] -- vbuxx=vbuc1
ldx #$55
jsr fct
// [7] fct::return#1 = fct::return#2
@@ -440,7 +440,7 @@ main: {
sta.z fct.z
lda #>$450
sta.z fct.z+1
- // [11] phi fct::x#2 = $aa [phi:main->fct#1] -- call_phi_near
+ // [11] phi fct::x#2 = $aa [phi:main->fct#1] -- vbuxx=vbuc1
ldx #$aa
jsr fct
// byte a1 = fct(x, z)
@@ -458,7 +458,7 @@ main: {
sta.z fct.z
lda #>$450+1
sta.z fct.z+1
- // [11] phi fct::x#2 = $55 [phi:main::@1->fct#1] -- call_phi_near
+ // [11] phi fct::x#2 = $55 [phi:main::@1->fct#1] -- vbuxx=vbuc1
ldx #$55
jsr fct
// byte a2 = fct(x, z)
diff --git a/src/test/ref/fragment-variations.log b/src/test/ref/fragment-variations.log
index c97d8efa9..ad1a43be9 100644
--- a/src/test/ref/fragment-variations.log
+++ b/src/test/ref/fragment-variations.log
@@ -298,7 +298,7 @@ main: {
sta.z mul16u.a
lda #>$a
sta.z mul16u.a+1
- // [10] phi mul16u::b#2 = $a [phi:main->mul16u#1] -- call_phi_near
+ // [10] phi mul16u::b#2 = $a [phi:main->mul16u#1] -- vwuz1=vwuc1
lda #<$a
sta.z mul16u.b
lda #>$a
@@ -326,7 +326,7 @@ main: {
sta.z mul16u.a
lda #>$3e8
sta.z mul16u.a+1
- // [10] phi mul16u::b#2 = $3e8 [phi:main::@1->mul16u#1] -- call_phi_near
+ // [10] phi mul16u::b#2 = $3e8 [phi:main::@1->mul16u#1] -- vwuz1=vwuc1
lda #<$3e8
sta.z mul16u.b
lda #>$3e8
@@ -458,7 +458,7 @@ main: {
sta.z mul16u.a
lda #>$a
sta.z mul16u.a+1
- // [10] phi mul16u::b#2 = $a [phi:main->mul16u#1] -- call_phi_near
+ // [10] phi mul16u::b#2 = $a [phi:main->mul16u#1] -- vwuz1=vwuc1
lda #<$a
sta.z mul16u.b
lda #>$a
@@ -486,7 +486,7 @@ main: {
sta.z mul16u.a
lda #>$3e8
sta.z mul16u.a+1
- // [10] phi mul16u::b#2 = $3e8 [phi:main::@1->mul16u#1] -- call_phi_near
+ // [10] phi mul16u::b#2 = $3e8 [phi:main::@1->mul16u#1] -- vwuz1=vwuc1
lda #<$3e8
sta.z mul16u.b
lda #>$3e8
diff --git a/src/test/ref/function-pointer-advanced-1.log b/src/test/ref/function-pointer-advanced-1.log
index 1692d8760..73b175d3d 100644
--- a/src/test/ref/function-pointer-advanced-1.log
+++ b/src/test/ref/function-pointer-advanced-1.log
@@ -1256,7 +1256,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [29] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [29] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -1409,7 +1409,7 @@ main: {
jmp __b3
// main::@3
__b3:
- // [33] call ln -- call_phi_near
+ // [33] call ln
jsr ln
// [34] phi from main::@3 to main::@6 [phi:main::@3->main::@6]
__b6_from___b3:
@@ -1419,7 +1419,7 @@ main: {
// [35] call exec
// [56] phi from main::@6 to exec [phi:main::@6->exec]
exec_from___b6:
- // [56] phi exec::collect#10 = &sum [phi:main::@6->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &sum [phi:main::@6->exec#0] -- pprz1=pprc1
lda #sum
@@ -1430,7 +1430,7 @@ main: {
jmp __b7
// main::@7
__b7:
- // [37] call ln -- call_phi_near
+ // [37] call ln
jsr ln
// [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
__b8_from___b7:
@@ -1440,7 +1440,7 @@ main: {
// [39] call exec
// [56] phi from main::@8 to exec [phi:main::@8->exec]
exec_from___b8:
- // [56] phi exec::collect#10 = &min [phi:main::@8->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &min [phi:main::@8->exec#0] -- pprz1=pprc1
lda #min
@@ -1451,7 +1451,7 @@ main: {
jmp __b9
// main::@9
__b9:
- // [41] call ln -- call_phi_near
+ // [41] call ln
jsr ln
// [42] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
__b10_from___b9:
@@ -1461,7 +1461,7 @@ main: {
// [43] call exec
// [56] phi from main::@10 to exec [phi:main::@10->exec]
exec_from___b10:
- // [56] phi exec::collect#10 = &max [phi:main::@10->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &max [phi:main::@10->exec#0] -- pprz1=pprc1
lda #max
@@ -1472,7 +1472,7 @@ main: {
jmp __b11
// main::@11
__b11:
- // [45] call ln -- call_phi_near
+ // [45] call ln
jsr ln
// [46] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
__b12_from___b11:
@@ -1482,7 +1482,7 @@ main: {
// [47] call exec
// [56] phi from main::@12 to exec [phi:main::@12->exec]
exec_from___b12:
- // [56] phi exec::collect#10 = &xor [phi:main::@12->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &xor [phi:main::@12->exec#0] -- pprz1=pprc1
lda #xor
@@ -1503,7 +1503,7 @@ main: {
// [76] phi from main::@2 to print [phi:main::@2->print]
print_from___b2:
// [76] phi idx#53 = idx#54 [phi:main::@2->print#0] -- register_copy
- // [76] phi print::i#2 = print::i#0 [phi:main::@2->print#1] -- call_phi_near
+ // [76] phi print::i#2 = print::i#0 [phi:main::@2->print#1] -- register_copy
jsr print
// [51] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
__b4_from___b2:
@@ -1514,7 +1514,7 @@ main: {
// [84] phi from main::@4 to cout [phi:main::@4->cout]
cout_from___b4:
// [84] phi idx#27 = idx#0 [phi:main::@4->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:main::@4->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:main::@4->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
jmp __b5
@@ -1556,7 +1556,7 @@ exec: {
// [84] phi idx#27 = 0 [phi:exec->cout#0] -- vbuz1=vbuc1
lda #0
sta.z idx
- // [84] phi cout::c#7 = ' ' [phi:exec->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// [58] phi from exec to exec::@4 [phi:exec->exec::@4]
@@ -1568,7 +1568,7 @@ exec: {
// [84] phi from exec::@4 to cout [phi:exec::@4->cout]
cout_from___b4:
// [84] phi idx#27 = idx#0 [phi:exec::@4->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:exec::@4->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec::@4->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// [60] phi from exec::@4 to exec::@5 [phi:exec::@4->exec::@5]
@@ -1580,7 +1580,7 @@ exec: {
// [84] phi from exec::@5 to cout [phi:exec::@5->cout]
cout_from___b5:
// [84] phi idx#27 = idx#0 [phi:exec::@5->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:exec::@5->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec::@5->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
jmp __b6
@@ -1631,7 +1631,7 @@ exec: {
// [76] phi from exec::@3 to print [phi:exec::@3->print]
print_from___b3:
// [76] phi idx#53 = idx#0 [phi:exec::@3->print#0] -- register_copy
- // [76] phi print::i#2 = print::i#1 [phi:exec::@3->print#1] -- call_phi_near
+ // [76] phi print::i#2 = print::i#1 [phi:exec::@3->print#1] -- register_copy
jsr print
// [73] phi from exec::@3 to exec::@7 [phi:exec::@3->exec::@7]
__b7_from___b3:
@@ -1642,7 +1642,7 @@ exec: {
// [84] phi from exec::@7 to cout [phi:exec::@7->cout]
cout_from___b7:
// [84] phi idx#27 = idx#0 [phi:exec::@7->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:exec::@7->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec::@7->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
jmp __b8
@@ -1676,7 +1676,7 @@ print: {
// [84] phi from print to cout [phi:print->cout]
cout_from_print:
// [84] phi idx#27 = idx#53 [phi:print->cout#0] -- register_copy
- // [84] phi cout::c#7 = cout::c#0 [phi:print->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = cout::c#0 [phi:print->cout#1] -- register_copy
jsr cout
jmp __b1
// print::@1
@@ -1691,7 +1691,7 @@ print: {
// [84] phi from print::@1 to cout [phi:print::@1->cout]
cout_from___b1:
// [84] phi idx#27 = idx#0 [phi:print::@1->cout#0] -- register_copy
- // [84] phi cout::c#7 = cout::c#1 [phi:print::@1->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = cout::c#1 [phi:print::@1->cout#1] -- register_copy
jsr cout
jmp __breturn
// print::@return
@@ -1965,7 +1965,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [29] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [29] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
@@ -2113,14 +2113,14 @@ main: {
// [32] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
// main::@3
// ln()
- // [33] call ln -- call_phi_near
+ // [33] call ln
jsr ln
// [34] phi from main::@3 to main::@6 [phi:main::@3->main::@6]
// main::@6
// exec(&sum)
// [35] call exec
// [56] phi from main::@6 to exec [phi:main::@6->exec]
- // [56] phi exec::collect#10 = &sum [phi:main::@6->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &sum [phi:main::@6->exec#0] -- pprz1=pprc1
lda #sum
@@ -2129,14 +2129,14 @@ main: {
// [36] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
// main::@7
// ln()
- // [37] call ln -- call_phi_near
+ // [37] call ln
jsr ln
// [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
// main::@8
// exec(&min)
// [39] call exec
// [56] phi from main::@8 to exec [phi:main::@8->exec]
- // [56] phi exec::collect#10 = &min [phi:main::@8->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &min [phi:main::@8->exec#0] -- pprz1=pprc1
lda #min
@@ -2145,14 +2145,14 @@ main: {
// [40] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
// main::@9
// ln()
- // [41] call ln -- call_phi_near
+ // [41] call ln
jsr ln
// [42] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
// main::@10
// exec(&max)
// [43] call exec
// [56] phi from main::@10 to exec [phi:main::@10->exec]
- // [56] phi exec::collect#10 = &max [phi:main::@10->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &max [phi:main::@10->exec#0] -- pprz1=pprc1
lda #max
@@ -2161,14 +2161,14 @@ main: {
// [44] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
// main::@11
// ln()
- // [45] call ln -- call_phi_near
+ // [45] call ln
jsr ln
// [46] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
// main::@12
// exec(&xor)
// [47] call exec
// [56] phi from main::@12 to exec [phi:main::@12->exec]
- // [56] phi exec::collect#10 = &xor [phi:main::@12->exec#0] -- call_phi_near
+ // [56] phi exec::collect#10 = &xor [phi:main::@12->exec#0] -- pprz1=pprc1
lda #xor
@@ -2188,7 +2188,7 @@ main: {
// [50] call print
// [76] phi from main::@2 to print [phi:main::@2->print]
// [76] phi idx#53 = idx#54 [phi:main::@2->print#0] -- register_copy
- // [76] phi print::i#2 = print::i#0 [phi:main::@2->print#1] -- call_phi_near
+ // [76] phi print::i#2 = print::i#0 [phi:main::@2->print#1] -- register_copy
jsr print
// [51] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
// main::@4
@@ -2196,7 +2196,7 @@ main: {
// [52] call cout
// [84] phi from main::@4 to cout [phi:main::@4->cout]
// [84] phi idx#27 = idx#0 [phi:main::@4->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:main::@4->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:main::@4->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// main::@5
@@ -2236,7 +2236,7 @@ exec: {
// [84] phi idx#27 = 0 [phi:exec->cout#0] -- vbuz1=vbuc1
lda #0
sta.z idx
- // [84] phi cout::c#7 = ' ' [phi:exec->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// [58] phi from exec to exec::@4 [phi:exec->exec::@4]
@@ -2245,7 +2245,7 @@ exec: {
// [59] call cout
// [84] phi from exec::@4 to cout [phi:exec::@4->cout]
// [84] phi idx#27 = idx#0 [phi:exec::@4->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:exec::@4->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec::@4->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// [60] phi from exec::@4 to exec::@5 [phi:exec::@4->exec::@5]
@@ -2254,7 +2254,7 @@ exec: {
// [61] call cout
// [84] phi from exec::@5 to cout [phi:exec::@5->cout]
// [84] phi idx#27 = idx#0 [phi:exec::@5->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:exec::@5->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec::@5->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// exec::@6
@@ -2302,7 +2302,7 @@ exec: {
// [72] call print
// [76] phi from exec::@3 to print [phi:exec::@3->print]
// [76] phi idx#53 = idx#0 [phi:exec::@3->print#0] -- register_copy
- // [76] phi print::i#2 = print::i#1 [phi:exec::@3->print#1] -- call_phi_near
+ // [76] phi print::i#2 = print::i#1 [phi:exec::@3->print#1] -- register_copy
jsr print
// [73] phi from exec::@3 to exec::@7 [phi:exec::@3->exec::@7]
// exec::@7
@@ -2310,7 +2310,7 @@ exec: {
// [74] call cout
// [84] phi from exec::@7 to cout [phi:exec::@7->cout]
// [84] phi idx#27 = idx#0 [phi:exec::@7->cout#0] -- register_copy
- // [84] phi cout::c#7 = ' ' [phi:exec::@7->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = ' ' [phi:exec::@7->cout#1] -- vbuxx=vbuc1
ldx #' '
jsr cout
// exec::@8
@@ -2343,7 +2343,7 @@ print: {
// [79] call cout
// [84] phi from print to cout [phi:print->cout]
// [84] phi idx#27 = idx#53 [phi:print->cout#0] -- register_copy
- // [84] phi cout::c#7 = cout::c#0 [phi:print->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = cout::c#0 [phi:print->cout#1] -- register_copy
jsr cout
// print::@1
// i&0x0f
@@ -2357,7 +2357,7 @@ print: {
// [82] call cout
// [84] phi from print::@1 to cout [phi:print::@1->cout]
// [84] phi idx#27 = idx#0 [phi:print::@1->cout#0] -- register_copy
- // [84] phi cout::c#7 = cout::c#1 [phi:print::@1->cout#1] -- call_phi_near
+ // [84] phi cout::c#7 = cout::c#1 [phi:print::@1->cout#1] -- register_copy
jsr cout
// print::@return
// }
diff --git a/src/test/ref/function-pointer-noarg-call-10.log b/src/test/ref/function-pointer-noarg-call-10.log
index 1d2198ef8..e0cc8628d 100644
--- a/src/test/ref/function-pointer-noarg-call-10.log
+++ b/src/test/ref/function-pointer-noarg-call-10.log
@@ -400,7 +400,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [11] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [11] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -414,7 +414,7 @@ world: {
// [6] call print
// [16] phi from world to print [phi:world->print]
print_from_world:
- // [16] phi print::msg#3 = world::msg [phi:world->print#0] -- call_phi_near
+ // [16] phi print::msg#3 = world::msg [phi:world->print#0] -- pbuz1=pbuc1
lda #msg
@@ -435,7 +435,7 @@ hello: {
// [9] call print
// [16] phi from hello to print [phi:hello->print]
print_from_hello:
- // [16] phi print::msg#3 = hello::msg [phi:hello->print#0] -- call_phi_near
+ // [16] phi print::msg#3 = hello::msg [phi:hello->print#0] -- pbuz1=pbuc1
lda #msg
@@ -456,7 +456,7 @@ main: {
// [12] call do10
// [23] phi from main to do10 [phi:main->do10]
do10_from_main:
- // [23] phi do10::fn#3 = &hello [phi:main->do10#0] -- call_phi_near
+ // [23] phi do10::fn#3 = &hello [phi:main->do10#0] -- pprz1=pprc1
lda #hello
@@ -470,7 +470,7 @@ main: {
// [14] call do10
// [23] phi from main::@1 to do10 [phi:main::@1->do10]
do10_from___b1:
- // [23] phi do10::fn#3 = &world [phi:main::@1->do10#0] -- call_phi_near
+ // [23] phi do10::fn#3 = &world [phi:main::@1->do10#0] -- pprz1=pprc1
lda #world
@@ -654,7 +654,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [11] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [11] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
@@ -665,7 +665,7 @@ world: {
// print("world ")
// [6] call print
// [16] phi from world to print [phi:world->print]
- // [16] phi print::msg#3 = world::msg [phi:world->print#0] -- call_phi_near
+ // [16] phi print::msg#3 = world::msg [phi:world->print#0] -- pbuz1=pbuc1
lda #msg
@@ -685,7 +685,7 @@ hello: {
// print("hello ")
// [9] call print
// [16] phi from hello to print [phi:hello->print]
- // [16] phi print::msg#3 = hello::msg [phi:hello->print#0] -- call_phi_near
+ // [16] phi print::msg#3 = hello::msg [phi:hello->print#0] -- pbuz1=pbuc1
lda #msg
@@ -705,7 +705,7 @@ main: {
// do10(&hello)
// [12] call do10
// [23] phi from main to do10 [phi:main->do10]
- // [23] phi do10::fn#3 = &hello [phi:main->do10#0] -- call_phi_near
+ // [23] phi do10::fn#3 = &hello [phi:main->do10#0] -- pprz1=pprc1
lda #hello
@@ -716,7 +716,7 @@ main: {
// do10(&world)
// [14] call do10
// [23] phi from main::@1 to do10 [phi:main::@1->do10]
- // [23] phi do10::fn#3 = &world [phi:main::@1->do10#0] -- call_phi_near
+ // [23] phi do10::fn#3 = &world [phi:main::@1->do10#0] -- pprz1=pprc1
lda #world
diff --git a/src/test/ref/function-pointer-noarg-call-13.log b/src/test/ref/function-pointer-noarg-call-13.log
index 34209ef12..8035feb5b 100644
--- a/src/test/ref/function-pointer-noarg-call-13.log
+++ b/src/test/ref/function-pointer-noarg-call-13.log
@@ -213,7 +213,7 @@ main: {
sta.z enableDLI.dliptr
lda #>fn1
sta.z enableDLI.dliptr+1
- // [5] call enableDLI -- call_phi_near
+ // [5] call enableDLI
jsr enableDLI
jmp __b1
// main::@1
@@ -223,7 +223,7 @@ main: {
sta.z enableDLI.dliptr
lda #>fn2
sta.z enableDLI.dliptr+1
- // [7] call enableDLI -- call_phi_near
+ // [7] call enableDLI
jsr enableDLI
jmp __breturn
// main::@return
@@ -325,7 +325,7 @@ main: {
sta.z enableDLI.dliptr
lda #>fn1
sta.z enableDLI.dliptr+1
- // [5] call enableDLI -- call_phi_near
+ // [5] call enableDLI
jsr enableDLI
// main::@1
// enableDLI(&fn2)
@@ -334,7 +334,7 @@ main: {
sta.z enableDLI.dliptr
lda #>fn2
sta.z enableDLI.dliptr+1
- // [7] call enableDLI -- call_phi_near
+ // [7] call enableDLI
jsr enableDLI
// main::@return
// }
diff --git a/src/test/ref/function-pointer-noarg-call-14.log b/src/test/ref/function-pointer-noarg-call-14.log
index 154ebc78d..da9ae74fb 100644
--- a/src/test/ref/function-pointer-noarg-call-14.log
+++ b/src/test/ref/function-pointer-noarg-call-14.log
@@ -1541,7 +1541,7 @@ __start: {
sta.z conio_line_color
lda #>COLORRAM
sta.z conio_line_color+1
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
@@ -1549,7 +1549,7 @@ __start: {
// __start::@1
__b1:
// [7] call main
- // [33] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [33] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -1563,7 +1563,7 @@ world: {
// [10] call printf_str
// [38] phi from world to printf_str [phi:world->printf_str]
printf_str_from_world:
- // [38] phi printf_str::s#4 = world::s [phi:world->printf_str#0] -- call_phi_near
+ // [38] phi printf_str::s#4 = world::s [phi:world->printf_str#0] -- pbuz1=pbuc1
lda #s
@@ -1584,7 +1584,7 @@ hello: {
// [13] call printf_str
// [38] phi from hello to printf_str [phi:hello->printf_str]
printf_str_from_hello:
- // [38] phi printf_str::s#4 = hello::s [phi:hello->printf_str#0] -- call_phi_near
+ // [38] phi printf_str::s#4 = hello::s [phi:hello->printf_str#0] -- pbuz1=pbuc1
lda #s
@@ -1627,7 +1627,7 @@ conio_c64_init: {
// conio_c64_init::@1
__b1:
// [19] gotoxy::y#2 = conio_c64_init::line#2
- // [20] call gotoxy -- call_phi_near
+ // [20] call gotoxy
jsr gotoxy
jmp __breturn
// conio_c64_init::@return
@@ -1668,7 +1668,7 @@ cputc: {
jmp __b3
// cputc::@3
__b3:
- // [29] call cputln -- call_phi_near
+ // [29] call cputln
jsr cputln
jmp __breturn
// cputc::@return
@@ -1680,7 +1680,7 @@ cputc: {
jmp __b1
// cputc::@1
__b1:
- // [32] call cputln -- call_phi_near
+ // [32] call cputln
jsr cputln
jmp __breturn
}
@@ -1689,7 +1689,7 @@ main: {
// [34] call f1
// [67] phi from main to f1 [phi:main->f1]
f1_from_main:
- // [67] phi f1::fn#2 = &hello [phi:main->f1#0] -- call_phi_near
+ // [67] phi f1::fn#2 = &hello [phi:main->f1#0] -- pprz1=pprc1
lda #hello
@@ -1703,7 +1703,7 @@ main: {
// [36] call f1
// [67] phi from main::@1 to f1 [phi:main::@1->f1]
f1_from___b1:
- // [67] phi f1::fn#2 = &world [phi:main::@1->f1#0] -- call_phi_near
+ // [67] phi f1::fn#2 = &world [phi:main::@1->f1#0] -- pprz1=pprc1
lda #world
@@ -1876,7 +1876,7 @@ cputln: {
sta.z conio_cursor_x
// [64] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
- // [65] call cscroll -- call_phi_near
+ // [65] call cscroll
jsr cscroll
jmp __breturn
// cputln::@return
@@ -1919,7 +1919,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [83] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [83] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -1938,7 +1938,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [83] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [83] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -1954,7 +1954,7 @@ cscroll: {
memset_from___b3:
// [93] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [93] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [93] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -1970,7 +1970,7 @@ cscroll: {
memset_from___b4:
// [93] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [93] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [93] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
@@ -2381,12 +2381,12 @@ __start: {
lda #>COLORRAM
sta.z conio_line_color+1
// #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll)
- // [5] call conio_c64_init -- call_phi_near
+ // [5] call conio_c64_init
jsr conio_c64_init
// [6] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [7] call main
- // [33] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [33] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [8] return
@@ -2397,7 +2397,7 @@ world: {
// printf("world!")
// [10] call printf_str
// [38] phi from world to printf_str [phi:world->printf_str]
- // [38] phi printf_str::s#4 = world::s [phi:world->printf_str#0] -- call_phi_near
+ // [38] phi printf_str::s#4 = world::s [phi:world->printf_str#0] -- pbuz1=pbuc1
lda #s
@@ -2417,7 +2417,7 @@ hello: {
// printf("hello ")
// [13] call printf_str
// [38] phi from hello to printf_str [phi:hello->printf_str]
- // [38] phi printf_str::s#4 = hello::s [phi:hello->printf_str#0] -- call_phi_near
+ // [38] phi printf_str::s#4 = hello::s [phi:hello->printf_str#0] -- pbuz1=pbuc1
lda #s
@@ -2455,7 +2455,7 @@ conio_c64_init: {
__b1:
// gotoxy(0, line)
// [19] gotoxy::y#2 = conio_c64_init::line#2
- // [20] call gotoxy -- call_phi_near
+ // [20] call gotoxy
jsr gotoxy
// conio_c64_init::@return
// }
@@ -2494,7 +2494,7 @@ cputc: {
// [28] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3]
// cputc::@3
// cputln()
- // [29] call cputln -- call_phi_near
+ // [29] call cputln
jsr cputln
// cputc::@return
__breturn:
@@ -2505,7 +2505,7 @@ cputc: {
// cputc::@1
__b1:
// cputln()
- // [32] call cputln -- call_phi_near
+ // [32] call cputln
jsr cputln
rts
}
@@ -2514,7 +2514,7 @@ main: {
// f1(&hello)
// [34] call f1
// [67] phi from main to f1 [phi:main->f1]
- // [67] phi f1::fn#2 = &hello [phi:main->f1#0] -- call_phi_near
+ // [67] phi f1::fn#2 = &hello [phi:main->f1#0] -- pprz1=pprc1
lda #hello
@@ -2525,7 +2525,7 @@ main: {
// f1(&world)
// [36] call f1
// [67] phi from main::@1 to f1 [phi:main::@1->f1]
- // [67] phi f1::fn#2 = &world [phi:main::@1->f1#0] -- call_phi_near
+ // [67] phi f1::fn#2 = &world [phi:main::@1->f1#0] -- pprz1=pprc1
lda #world
@@ -2698,7 +2698,7 @@ cputln: {
// [64] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1
inc.z conio_cursor_y
// cscroll()
- // [65] call cscroll -- call_phi_near
+ // [65] call cscroll
jsr cscroll
// cputln::@return
// }
@@ -2738,7 +2738,7 @@ cscroll: {
sta.z memcpy.destination
lda #>DEFAULT_SCREEN
sta.z memcpy.destination+1
- // [83] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near
+ // [83] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$28
@@ -2754,7 +2754,7 @@ cscroll: {
sta.z memcpy.destination
lda #>COLORRAM
sta.z memcpy.destination+1
- // [83] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near
+ // [83] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1
lda #COLORRAM+$28
@@ -2767,7 +2767,7 @@ cscroll: {
// [93] phi from cscroll::@3 to memset [phi:cscroll::@3->memset]
// [93] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1
ldx #' '
- // [93] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near
+ // [93] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- pvoz1=pvoc1
lda #DEFAULT_SCREEN+$19*$28-$28
@@ -2780,7 +2780,7 @@ cscroll: {
// [93] phi from cscroll::@4 to memset [phi:cscroll::@4->memset]
// [93] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1
ldx #LIGHT_BLUE
- // [93] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near
+ // [93] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1
lda #COLORRAM+$19*$28-$28
diff --git a/src/test/ref/function-pointer-noarg-call-3.log b/src/test/ref/function-pointer-noarg-call-3.log
index 293123223..1aff2dbc6 100644
--- a/src/test/ref/function-pointer-noarg-call-3.log
+++ b/src/test/ref/function-pointer-noarg-call-3.log
@@ -334,7 +334,7 @@ main: {
inc.z i
// [7] getfn::b#0 = main::i#1 -- vbuaa=vbuz1
lda.z i
- // [8] call getfn -- call_phi_near
+ // [8] call getfn
jsr getfn
// [9] getfn::return#0 = getfn::return#3
jmp __b3
@@ -495,7 +495,7 @@ main: {
// getfn(++i)
// [7] getfn::b#0 = main::i#1 -- vbuaa=vbuz1
lda.z i
- // [8] call getfn -- call_phi_near
+ // [8] call getfn
jsr getfn
// [9] getfn::return#0 = getfn::return#3
// main::@3
diff --git a/src/test/ref/function-pointer-noarg-call-7.log b/src/test/ref/function-pointer-noarg-call-7.log
index 6fd6ebde6..2cf1501c4 100644
--- a/src/test/ref/function-pointer-noarg-call-7.log
+++ b/src/test/ref/function-pointer-noarg-call-7.log
@@ -307,7 +307,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [12] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [12] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -350,7 +350,7 @@ hello: {
// main
main: {
// [13] call do10
- // [15] phi from main to do10 [phi:main->do10] -- call_phi_near
+ // [15] phi from main to do10 [phi:main->do10]
do10_from_main:
jsr do10
jmp __breturn
@@ -479,7 +479,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [12] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [12] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
@@ -518,7 +518,7 @@ hello: {
main: {
// do10(f)
// [13] call do10
- // [15] phi from main to do10 [phi:main->do10] -- call_phi_near
+ // [15] phi from main to do10 [phi:main->do10]
jsr do10
// main::@return
// }
diff --git a/src/test/ref/function-pointer-noarg-call-8.log b/src/test/ref/function-pointer-noarg-call-8.log
index 339af3fa2..c5d6cde97 100644
--- a/src/test/ref/function-pointer-noarg-call-8.log
+++ b/src/test/ref/function-pointer-noarg-call-8.log
@@ -341,7 +341,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [4] call main -- call_phi_near
+ // [4] call main
jsr main
jmp __breturn
// __start::@return
@@ -388,7 +388,7 @@ main: {
lda #>msg1
sta.z msg+1
// [14] call do10
- // [18] phi from main to do10 [phi:main->do10] -- call_phi_near
+ // [18] phi from main to do10 [phi:main->do10]
do10_from_main:
jsr do10
jmp __b1
@@ -400,7 +400,7 @@ main: {
lda #>msg2
sta.z msg+1
// [16] call do10
- // [18] phi from main::@1 to do10 [phi:main::@1->do10] -- call_phi_near
+ // [18] phi from main::@1 to do10 [phi:main::@1->do10]
do10_from___b1:
jsr do10
jmp __breturn
@@ -543,7 +543,7 @@ __start: {
sta.z idx
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [4] call main -- call_phi_near
+ // [4] call main
jsr main
// __start::@return
// [5] return
@@ -588,7 +588,7 @@ main: {
sta.z msg+1
// do10(f)
// [14] call do10
- // [18] phi from main to do10 [phi:main->do10] -- call_phi_near
+ // [18] phi from main to do10 [phi:main->do10]
jsr do10
// main::@1
// msg = msg2
@@ -599,7 +599,7 @@ main: {
sta.z msg+1
// do10(f)
// [16] call do10
- // [18] phi from main::@1 to do10 [phi:main::@1->do10] -- call_phi_near
+ // [18] phi from main::@1 to do10 [phi:main::@1->do10]
jsr do10
// main::@return
// }
diff --git a/src/test/ref/function-pointer-noarg-call-9.log b/src/test/ref/function-pointer-noarg-call-9.log
index 7547a463a..e11a1a25c 100644
--- a/src/test/ref/function-pointer-noarg-call-9.log
+++ b/src/test/ref/function-pointer-noarg-call-9.log
@@ -174,7 +174,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [7] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [7] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -280,7 +280,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [7] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [7] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/function-pointer-param-workaround.log b/src/test/ref/function-pointer-param-workaround.log
index e3173e1e5..98cb9eeeb 100644
--- a/src/test/ref/function-pointer-param-workaround.log
+++ b/src/test/ref/function-pointer-param-workaround.log
@@ -550,7 +550,7 @@ __start: {
// __start::@1
__b1:
// [4] call main
- // [32] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [32] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -880,7 +880,7 @@ __start: {
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [4] call main
- // [32] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [32] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [5] return
diff --git a/src/test/ref/function-pointer-problem-1.log b/src/test/ref/function-pointer-problem-1.log
index 485a6a16d..33a272696 100644
--- a/src/test/ref/function-pointer-problem-1.log
+++ b/src/test/ref/function-pointer-problem-1.log
@@ -167,7 +167,7 @@ main: {
sta.z enableDLI.dliptr
lda #>fn1
sta.z enableDLI.dliptr+1
- // [3] call enableDLI -- call_phi_near
+ // [3] call enableDLI
jsr enableDLI
jmp __breturn
// main::@return
@@ -253,7 +253,7 @@ main: {
sta.z enableDLI.dliptr
lda #>fn1
sta.z enableDLI.dliptr+1
- // [3] call enableDLI -- call_phi_near
+ // [3] call enableDLI
jsr enableDLI
// main::@return
// }
diff --git a/src/test/ref/function-pointer-return-2.log b/src/test/ref/function-pointer-return-2.log
index 87123a32f..3016e22f8 100644
--- a/src/test/ref/function-pointer-return-2.log
+++ b/src/test/ref/function-pointer-return-2.log
@@ -267,7 +267,7 @@ main: {
// Create pointer to function without &
// [11] phi from main::@1 to set_border [phi:main::@1->set_border]
set_border_from___b1:
- // [11] phi set_border::fn#2 = &fn1 [phi:main::@1->set_border#0] -- call_phi_near
+ // [11] phi set_border::fn#2 = &fn1 [phi:main::@1->set_border#0] -- pprz1=pprc1
lda #fn1
@@ -281,7 +281,7 @@ main: {
// [4] call set_border
// [11] phi from main::@2 to set_border [phi:main::@2->set_border]
set_border_from___b2:
- // [11] phi set_border::fn#2 = &fn2 [phi:main::@2->set_border#0] -- call_phi_near
+ // [11] phi set_border::fn#2 = &fn2 [phi:main::@2->set_border#0] -- pprz1=pprc1
lda #fn2
@@ -418,7 +418,7 @@ main: {
// [2] call set_border
// Create pointer to function without &
// [11] phi from main::@1 to set_border [phi:main::@1->set_border]
- // [11] phi set_border::fn#2 = &fn1 [phi:main::@1->set_border#0] -- call_phi_near
+ // [11] phi set_border::fn#2 = &fn1 [phi:main::@1->set_border#0] -- pprz1=pprc1
lda #fn1
@@ -429,7 +429,7 @@ main: {
// set_border(fn2)
// [4] call set_border
// [11] phi from main::@2 to set_border [phi:main::@2->set_border]
- // [11] phi set_border::fn#2 = &fn2 [phi:main::@2->set_border#0] -- call_phi_near
+ // [11] phi set_border::fn#2 = &fn2 [phi:main::@2->set_border#0] -- pprz1=pprc1
lda #fn2
diff --git a/src/test/ref/function-pointer-return-3.log b/src/test/ref/function-pointer-return-3.log
index 0e4451486..e4f571d97 100644
--- a/src/test/ref/function-pointer-return-3.log
+++ b/src/test/ref/function-pointer-return-3.log
@@ -384,7 +384,7 @@ main: {
lda #>tasks
adc #0
sta.z run.task+1
- // [6] call run -- call_phi_near
+ // [6] call run
jsr run
jmp __b3
// main::@3
@@ -569,7 +569,7 @@ main: {
lda #>tasks
adc #0
sta.z run.task+1
- // [6] call run -- call_phi_near
+ // [6] call run
jsr run
// main::@3
// for(char i=0; i < sizeof(tasks)/sizeof(struct Task); i++)
diff --git a/src/test/ref/global-label-problem.log b/src/test/ref/global-label-problem.log
index 64d27f2cf..630fe9e72 100644
--- a/src/test/ref/global-label-problem.log
+++ b/src/test/ref/global-label-problem.log
@@ -344,7 +344,7 @@ main: {
print_from_main:
// [7] phi idx#27 = 0 [phi:main->print#0] -- vbuxx=vbuc1
ldx #0
- // [7] phi print::msg#7 = msg [phi:main->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = msg [phi:main->print#1] -- pbuz1=pbuc1
lda #msg
@@ -359,7 +359,7 @@ main: {
// [7] phi from main::@1 to print [phi:main::@1->print]
print_from___b1:
// [7] phi idx#27 = idx#19 [phi:main::@1->print#0] -- register_copy
- // [7] phi print::msg#7 = main::msg1 [phi:main::@1->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = main::msg1 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -371,7 +371,7 @@ main: {
// main::@2
__b2:
// [5] call print1
- // [14] phi from main::@2 to print1 [phi:main::@2->print1] -- call_phi_near
+ // [14] phi from main::@2 to print1 [phi:main::@2->print1]
print1_from___b2:
jsr print1
jmp __breturn
@@ -427,7 +427,7 @@ print1: {
// [7] phi from print1 to print [phi:print1->print]
print_from_print1:
// [7] phi idx#27 = idx#19 [phi:print1->print#0] -- register_copy
- // [7] phi print::msg#7 = print1::msg [phi:print1->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = print1::msg [phi:print1->print#1] -- pbuz1=pbuc1
lda #msg
@@ -442,7 +442,7 @@ print1: {
// [7] phi from print1::@1 to print [phi:print1::@1->print]
print_from___b1:
// [7] phi idx#27 = idx#19 [phi:print1::@1->print#0] -- register_copy
- // [7] phi print::msg#7 = msg [phi:print1::@1->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = msg [phi:print1::@1->print#1] -- pbuz1=pbuc1
lda #<@msg
sta.z print.msg
lda #>@msg
@@ -537,7 +537,7 @@ main: {
// [7] phi from main to print [phi:main->print]
// [7] phi idx#27 = 0 [phi:main->print#0] -- vbuxx=vbuc1
ldx #0
- // [7] phi print::msg#7 = msg [phi:main->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = msg [phi:main->print#1] -- pbuz1=pbuc1
lda #msg
@@ -549,7 +549,7 @@ main: {
// [3] call print
// [7] phi from main::@1 to print [phi:main::@1->print]
// [7] phi idx#27 = idx#19 [phi:main::@1->print#0] -- register_copy
- // [7] phi print::msg#7 = main::msg1 [phi:main::@1->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = main::msg1 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -559,7 +559,7 @@ main: {
// main::@2
// print1()
// [5] call print1
- // [14] phi from main::@2 to print1 [phi:main::@2->print1] -- call_phi_near
+ // [14] phi from main::@2 to print1 [phi:main::@2->print1]
jsr print1
// main::@return
// }
@@ -612,7 +612,7 @@ print1: {
// [15] call print
// [7] phi from print1 to print [phi:print1->print]
// [7] phi idx#27 = idx#19 [phi:print1->print#0] -- register_copy
- // [7] phi print::msg#7 = print1::msg [phi:print1->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = print1::msg [phi:print1->print#1] -- pbuz1=pbuc1
lda #msg
@@ -624,7 +624,7 @@ print1: {
// [17] call print
// [7] phi from print1::@1 to print [phi:print1::@1->print]
// [7] phi idx#27 = idx#19 [phi:print1::@1->print#0] -- register_copy
- // [7] phi print::msg#7 = msg [phi:print1::@1->print#1] -- call_phi_near
+ // [7] phi print::msg#7 = msg [phi:print1::@1->print#1] -- pbuz1=pbuc1
lda #<@msg
sta.z print.msg
lda #>@msg
diff --git a/src/test/ref/global-pc-multiple.log b/src/test/ref/global-pc-multiple.log
index 5587b71f0..f2c01c47e 100644
--- a/src/test/ref/global-pc-multiple.log
+++ b/src/test/ref/global-pc-multiple.log
@@ -174,7 +174,7 @@ main: {
jmp __b2
// main::@2
__b2:
- // [4] call incScreen -- call_phi_near
+ // [4] call incScreen
jsr incScreen
jmp __b1
}
@@ -252,7 +252,7 @@ main: {
// main::@2
__b2:
// incScreen()
- // [4] call incScreen -- call_phi_near
+ // [4] call incScreen
jsr incScreen
jmp __b1
}
diff --git a/src/test/ref/helloworld2.log b/src/test/ref/helloworld2.log
index acd112cb5..d80d75484 100644
--- a/src/test/ref/helloworld2.log
+++ b/src/test/ref/helloworld2.log
@@ -260,7 +260,7 @@ main: {
// [1] call print2
// [5] phi from main to print2 [phi:main->print2]
print2_from_main:
- // [5] phi print2::at#4 = screen [phi:main->print2#0] -- call_phi_near
+ // [5] phi print2::at#4 = screen [phi:main->print2#0] -- pbuz1=pbuc1
lda #screen
@@ -274,7 +274,7 @@ main: {
// [3] call print2
// [5] phi from main::@1 to print2 [phi:main::@1->print2]
print2_from___b1:
- // [5] phi print2::at#4 = screen+$50 [phi:main::@1->print2#0] -- call_phi_near
+ // [5] phi print2::at#4 = screen+$50 [phi:main::@1->print2#0] -- pbuz1=pbuc1
lda #screen+$50
@@ -388,7 +388,7 @@ main: {
// print2(screen, hello)
// [1] call print2
// [5] phi from main to print2 [phi:main->print2]
- // [5] phi print2::at#4 = screen [phi:main->print2#0] -- call_phi_near
+ // [5] phi print2::at#4 = screen [phi:main->print2#0] -- pbuz1=pbuc1
lda #screen
@@ -399,7 +399,7 @@ main: {
// print2(screen+80, hello)
// [3] call print2
// [5] phi from main::@1 to print2 [phi:main::@1->print2]
- // [5] phi print2::at#4 = screen+$50 [phi:main::@1->print2#0] -- call_phi_near
+ // [5] phi print2::at#4 = screen+$50 [phi:main::@1->print2#0] -- pbuz1=pbuc1
lda #screen+$50
diff --git a/src/test/ref/hex2dec-ptrptr.log b/src/test/ref/hex2dec-ptrptr.log
index a6584ab71..39f626dc1 100644
--- a/src/test/ref/hex2dec-ptrptr.log
+++ b/src/test/ref/hex2dec-ptrptr.log
@@ -757,7 +757,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call cls
- // [13] phi from main to cls [phi:main->cls] -- call_phi_near
+ // [13] phi from main to cls [phi:main->cls]
cls_from_main:
jsr cls
jmp __b1
@@ -771,7 +771,7 @@ main: {
// [3] call utoa16w
// [19] phi from main::@1 to utoa16w [phi:main::@1->utoa16w]
utoa16w_from___b1:
- // [19] phi utoa16w::value#5 = 0 [phi:main::@1->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = 0 [phi:main::@1->utoa16w#0] -- vwuz1=vbuc1
lda #<0
sta.z utoa16w.value
lda #>0
@@ -788,7 +788,7 @@ main: {
// [5] call utoa16w
// [19] phi from main::@2 to utoa16w [phi:main::@2->utoa16w]
utoa16w_from___b2:
- // [19] phi utoa16w::value#5 = $4d2 [phi:main::@2->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $4d2 [phi:main::@2->utoa16w#0] -- vwuz1=vwuc1
lda #<$4d2
sta.z utoa16w.value
lda #>$4d2
@@ -805,7 +805,7 @@ main: {
// [7] call utoa16w
// [19] phi from main::@3 to utoa16w [phi:main::@3->utoa16w]
utoa16w_from___b3:
- // [19] phi utoa16w::value#5 = $162e [phi:main::@3->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $162e [phi:main::@3->utoa16w#0] -- vwuz1=vwuc1
lda #<$162e
sta.z utoa16w.value
lda #>$162e
@@ -822,7 +822,7 @@ main: {
// [9] call utoa16w
// [19] phi from main::@4 to utoa16w [phi:main::@4->utoa16w]
utoa16w_from___b4:
- // [19] phi utoa16w::value#5 = $270f [phi:main::@4->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $270f [phi:main::@4->utoa16w#0] -- vwuz1=vwuc1
lda #<$270f
sta.z utoa16w.value
lda #>$270f
@@ -839,7 +839,7 @@ main: {
// [11] call utoa16w
// [19] phi from main::@5 to utoa16w [phi:main::@5->utoa16w]
utoa16w_from___b5:
- // [19] phi utoa16w::value#5 = $e608 [phi:main::@5->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $e608 [phi:main::@5->utoa16w#0] -- vwuz1=vwuc1
lda #<$e608
sta.z utoa16w.value
lda #>$e608
@@ -909,7 +909,7 @@ utoa16w: {
utoa16n_from_utoa16w:
// [40] phi utoa16n::started#7 = 0 [phi:utoa16w->utoa16n#0] -- vbuxx=vbuc1
ldx #0
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- register_copy
jsr utoa16n
// [23] utoa16n::return#0 = utoa16n::return#4
jmp __b1
@@ -925,7 +925,7 @@ utoa16w: {
// [40] phi from utoa16w::@1 to utoa16n [phi:utoa16w::@1->utoa16n]
utoa16n_from___b1:
// [40] phi utoa16n::started#7 = utoa16n::started#1 [phi:utoa16w::@1->utoa16n#0] -- register_copy
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- register_copy
jsr utoa16n
// [29] utoa16n::return#1 = utoa16n::return#4
jmp __b2
@@ -944,7 +944,7 @@ utoa16w: {
// [40] phi from utoa16w::@2 to utoa16n [phi:utoa16w::@2->utoa16n]
utoa16n_from___b2:
// [40] phi utoa16n::started#7 = utoa16n::started#2 [phi:utoa16w::@2->utoa16n#0] -- register_copy
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- register_copy
jsr utoa16n
jmp __b3
// utoa16w::@3
@@ -958,7 +958,7 @@ utoa16w: {
utoa16n_from___b3:
// [40] phi utoa16n::started#7 = 1 [phi:utoa16w::@3->utoa16n#0] -- vbuxx=vbuc1
ldx #1
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- register_copy
jsr utoa16n
jmp __b4
// utoa16w::@4
@@ -1159,7 +1159,7 @@ Score: 751
main: {
// cls()
// [1] call cls
- // [13] phi from main to cls [phi:main->cls] -- call_phi_near
+ // [13] phi from main to cls [phi:main->cls]
jsr cls
// main::@1
// utoa16w(00000, screen)
@@ -1170,7 +1170,7 @@ main: {
sta.z utoa16w.dst+1
// [3] call utoa16w
// [19] phi from main::@1 to utoa16w [phi:main::@1->utoa16w]
- // [19] phi utoa16w::value#5 = 0 [phi:main::@1->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = 0 [phi:main::@1->utoa16w#0] -- vwuz1=vbuc1
lda #<0
sta.z utoa16w.value
sta.z utoa16w.value+1
@@ -1184,7 +1184,7 @@ main: {
sta.z utoa16w.dst+1
// [5] call utoa16w
// [19] phi from main::@2 to utoa16w [phi:main::@2->utoa16w]
- // [19] phi utoa16w::value#5 = $4d2 [phi:main::@2->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $4d2 [phi:main::@2->utoa16w#0] -- vwuz1=vwuc1
lda #<$4d2
sta.z utoa16w.value
lda #>$4d2
@@ -1199,7 +1199,7 @@ main: {
sta.z utoa16w.dst+1
// [7] call utoa16w
// [19] phi from main::@3 to utoa16w [phi:main::@3->utoa16w]
- // [19] phi utoa16w::value#5 = $162e [phi:main::@3->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $162e [phi:main::@3->utoa16w#0] -- vwuz1=vwuc1
lda #<$162e
sta.z utoa16w.value
lda #>$162e
@@ -1214,7 +1214,7 @@ main: {
sta.z utoa16w.dst+1
// [9] call utoa16w
// [19] phi from main::@4 to utoa16w [phi:main::@4->utoa16w]
- // [19] phi utoa16w::value#5 = $270f [phi:main::@4->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $270f [phi:main::@4->utoa16w#0] -- vwuz1=vwuc1
lda #<$270f
sta.z utoa16w.value
lda #>$270f
@@ -1229,7 +1229,7 @@ main: {
sta.z utoa16w.dst+1
// [11] call utoa16w
// [19] phi from main::@5 to utoa16w [phi:main::@5->utoa16w]
- // [19] phi utoa16w::value#5 = $e608 [phi:main::@5->utoa16w#0] -- call_phi_near
+ // [19] phi utoa16w::value#5 = $e608 [phi:main::@5->utoa16w#0] -- vwuz1=vwuc1
lda #<$e608
sta.z utoa16w.value
lda #>$e608
@@ -1296,7 +1296,7 @@ utoa16w: {
// [40] phi from utoa16w to utoa16n [phi:utoa16w->utoa16n]
// [40] phi utoa16n::started#7 = 0 [phi:utoa16w->utoa16n#0] -- vbuxx=vbuc1
ldx #0
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16n(BYTE1(value)>>4, &dst, started)
// [23] utoa16n::return#0 = utoa16n::return#4
@@ -1313,7 +1313,7 @@ utoa16w: {
// [28] call utoa16n
// [40] phi from utoa16w::@1 to utoa16n [phi:utoa16w::@1->utoa16n]
// [40] phi utoa16n::started#7 = utoa16n::started#1 [phi:utoa16w::@1->utoa16n#0] -- register_copy
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16n(BYTE1(value)&0x0f, &dst, started)
// [29] utoa16n::return#1 = utoa16n::return#4
@@ -1333,7 +1333,7 @@ utoa16w: {
// [34] call utoa16n
// [40] phi from utoa16w::@2 to utoa16n [phi:utoa16w::@2->utoa16n]
// [40] phi utoa16n::started#7 = utoa16n::started#2 [phi:utoa16w::@2->utoa16n#0] -- register_copy
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16w::@3
// BYTE0(value)
@@ -1346,7 +1346,7 @@ utoa16w: {
// [40] phi from utoa16w::@3 to utoa16n [phi:utoa16w::@3->utoa16n]
// [40] phi utoa16n::started#7 = 1 [phi:utoa16w::@3->utoa16n#0] -- vbuxx=vbuc1
ldx #1
- // [40] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- call_phi_near
+ // [40] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16w::@4
// *dst = 0
diff --git a/src/test/ref/hex2dec.log b/src/test/ref/hex2dec.log
index 42d4de639..458bec309 100644
--- a/src/test/ref/hex2dec.log
+++ b/src/test/ref/hex2dec.log
@@ -1415,7 +1415,7 @@ main: {
// asm { sei }
sei
// [1] call cls
- // [31] phi from main to cls [phi:main->cls] -- call_phi_near
+ // [31] phi from main to cls [phi:main->cls]
cls_from_main:
jsr cls
jmp __b1
@@ -1450,7 +1450,7 @@ main: {
// [9] call utoa16w
// [37] phi from main::@2 to utoa16w [phi:main::@2->utoa16w]
utoa16w_from___b2:
- // [37] phi utoa16w::value#5 = 0 [phi:main::@2->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = 0 [phi:main::@2->utoa16w#0] -- vwuz1=vbuc1
lda #<0
sta.z utoa16w.value
lda #>0
@@ -1469,7 +1469,7 @@ main: {
// [12] call utoa16w
// [37] phi from main::@5 to utoa16w [phi:main::@5->utoa16w]
utoa16w_from___b5:
- // [37] phi utoa16w::value#5 = $4d2 [phi:main::@5->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $4d2 [phi:main::@5->utoa16w#0] -- vwuz1=vwuc1
lda #<$4d2
sta.z utoa16w.value
lda #>$4d2
@@ -1488,7 +1488,7 @@ main: {
// [15] call utoa16w
// [37] phi from main::@6 to utoa16w [phi:main::@6->utoa16w]
utoa16w_from___b6:
- // [37] phi utoa16w::value#5 = $162e [phi:main::@6->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $162e [phi:main::@6->utoa16w#0] -- vwuz1=vwuc1
lda #<$162e
sta.z utoa16w.value
lda #>$162e
@@ -1507,7 +1507,7 @@ main: {
// [18] call utoa16w
// [37] phi from main::@7 to utoa16w [phi:main::@7->utoa16w]
utoa16w_from___b7:
- // [37] phi utoa16w::value#5 = $270f [phi:main::@7->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $270f [phi:main::@7->utoa16w#0] -- vwuz1=vwuc1
lda #<$270f
sta.z utoa16w.value
lda #>$270f
@@ -1526,7 +1526,7 @@ main: {
// [21] call utoa16w
// [37] phi from main::@8 to utoa16w [phi:main::@8->utoa16w]
utoa16w_from___b8:
- // [37] phi utoa16w::value#5 = $e608 [phi:main::@8->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $e608 [phi:main::@8->utoa16w#0] -- vwuz1=vwuc1
lda #<$e608
sta.z utoa16w.value
lda #>$e608
@@ -1549,7 +1549,7 @@ main: {
lda #0
sta.z utoa10w.value+1
// [26] call utoa10w
- // [58] phi from main::@9 to utoa10w [phi:main::@9->utoa10w] -- call_phi_near
+ // [58] phi from main::@9 to utoa10w [phi:main::@9->utoa10w]
utoa10w_from___b9:
jsr utoa10w
// [27] phi from main::@9 to main::@3 [phi:main::@9->main::@3]
@@ -1638,7 +1638,7 @@ utoa16w: {
utoa16n_from_utoa16w:
// [78] phi utoa16n::started#7 = 0 [phi:utoa16w->utoa16n#0] -- vbuxx=vbuc1
ldx #0
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- register_copy
jsr utoa16n
// [41] utoa16n::return#0 = utoa16n::return#4
jmp __b1
@@ -1654,7 +1654,7 @@ utoa16w: {
// [78] phi from utoa16w::@1 to utoa16n [phi:utoa16w::@1->utoa16n]
utoa16n_from___b1:
// [78] phi utoa16n::started#7 = utoa16n::started#1 [phi:utoa16w::@1->utoa16n#0] -- register_copy
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- register_copy
jsr utoa16n
// [47] utoa16n::return#1 = utoa16n::return#4
jmp __b2
@@ -1673,7 +1673,7 @@ utoa16w: {
// [78] phi from utoa16w::@2 to utoa16n [phi:utoa16w::@2->utoa16n]
utoa16n_from___b2:
// [78] phi utoa16n::started#7 = utoa16n::started#2 [phi:utoa16w::@2->utoa16n#0] -- register_copy
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- register_copy
jsr utoa16n
jmp __b3
// utoa16w::@3
@@ -1687,7 +1687,7 @@ utoa16w: {
utoa16n_from___b3:
// [78] phi utoa16n::started#7 = 1 [phi:utoa16w::@3->utoa16n#0] -- vbuxx=vbuc1
ldx #1
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- register_copy
jsr utoa16n
jmp __b4
// utoa16w::@4
@@ -2138,7 +2138,7 @@ main: {
sei
// cls()
// [1] call cls
- // [31] phi from main to cls [phi:main->cls] -- call_phi_near
+ // [31] phi from main to cls [phi:main->cls]
jsr cls
// main::@1
__b1:
@@ -2175,7 +2175,7 @@ main: {
sta.z utoa16w.dst+1
// [9] call utoa16w
// [37] phi from main::@2 to utoa16w [phi:main::@2->utoa16w]
- // [37] phi utoa16w::value#5 = 0 [phi:main::@2->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = 0 [phi:main::@2->utoa16w#0] -- vwuz1=vbuc1
lda #<0
sta.z utoa16w.value
sta.z utoa16w.value+1
@@ -2192,7 +2192,7 @@ main: {
sta.z utoa16w.dst+1
// [12] call utoa16w
// [37] phi from main::@5 to utoa16w [phi:main::@5->utoa16w]
- // [37] phi utoa16w::value#5 = $4d2 [phi:main::@5->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $4d2 [phi:main::@5->utoa16w#0] -- vwuz1=vwuc1
lda #<$4d2
sta.z utoa16w.value
lda #>$4d2
@@ -2210,7 +2210,7 @@ main: {
sta.z utoa16w.dst+1
// [15] call utoa16w
// [37] phi from main::@6 to utoa16w [phi:main::@6->utoa16w]
- // [37] phi utoa16w::value#5 = $162e [phi:main::@6->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $162e [phi:main::@6->utoa16w#0] -- vwuz1=vwuc1
lda #<$162e
sta.z utoa16w.value
lda #>$162e
@@ -2228,7 +2228,7 @@ main: {
sta.z utoa16w.dst+1
// [18] call utoa16w
// [37] phi from main::@7 to utoa16w [phi:main::@7->utoa16w]
- // [37] phi utoa16w::value#5 = $270f [phi:main::@7->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $270f [phi:main::@7->utoa16w#0] -- vwuz1=vwuc1
lda #<$270f
sta.z utoa16w.value
lda #>$270f
@@ -2246,7 +2246,7 @@ main: {
sta.z utoa16w.dst+1
// [21] call utoa16w
// [37] phi from main::@8 to utoa16w [phi:main::@8->utoa16w]
- // [37] phi utoa16w::value#5 = $e608 [phi:main::@8->utoa16w#0] -- call_phi_near
+ // [37] phi utoa16w::value#5 = $e608 [phi:main::@8->utoa16w#0] -- vwuz1=vwuc1
lda #<$e608
sta.z utoa16w.value
lda #>$e608
@@ -2271,7 +2271,7 @@ main: {
lda #0
sta.z utoa10w.value+1
// [26] call utoa10w
- // [58] phi from main::@9 to utoa10w [phi:main::@9->utoa10w] -- call_phi_near
+ // [58] phi from main::@9 to utoa10w [phi:main::@9->utoa10w]
jsr utoa10w
// [27] phi from main::@9 to main::@3 [phi:main::@9->main::@3]
// [27] phi main::i#2 = 0 [phi:main::@9->main::@3#0] -- vbuxx=vbuc1
@@ -2357,7 +2357,7 @@ utoa16w: {
// [78] phi from utoa16w to utoa16n [phi:utoa16w->utoa16n]
// [78] phi utoa16n::started#7 = 0 [phi:utoa16w->utoa16n#0] -- vbuxx=vbuc1
ldx #0
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#0 [phi:utoa16w->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16n(BYTE1(value)>>4, &dst, started)
// [41] utoa16n::return#0 = utoa16n::return#4
@@ -2374,7 +2374,7 @@ utoa16w: {
// [46] call utoa16n
// [78] phi from utoa16w::@1 to utoa16n [phi:utoa16w::@1->utoa16n]
// [78] phi utoa16n::started#7 = utoa16n::started#1 [phi:utoa16w::@1->utoa16n#0] -- register_copy
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#1 [phi:utoa16w::@1->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16n(BYTE1(value)&0x0f, &dst, started)
// [47] utoa16n::return#1 = utoa16n::return#4
@@ -2394,7 +2394,7 @@ utoa16w: {
// [52] call utoa16n
// [78] phi from utoa16w::@2 to utoa16n [phi:utoa16w::@2->utoa16n]
// [78] phi utoa16n::started#7 = utoa16n::started#2 [phi:utoa16w::@2->utoa16n#0] -- register_copy
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#2 [phi:utoa16w::@2->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16w::@3
// BYTE0(value)
@@ -2407,7 +2407,7 @@ utoa16w: {
// [78] phi from utoa16w::@3 to utoa16n [phi:utoa16w::@3->utoa16n]
// [78] phi utoa16n::started#7 = 1 [phi:utoa16w::@3->utoa16n#0] -- vbuxx=vbuc1
ldx #1
- // [78] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- call_phi_near
+ // [78] phi utoa16n::nybble#4 = utoa16n::nybble#3 [phi:utoa16w::@3->utoa16n#1] -- register_copy
jsr utoa16n
// utoa16w::@4
// *dst = 0
diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log
index df198b8fa..e7e0c5e28 100644
--- a/src/test/ref/incrementinarray.log
+++ b/src/test/ref/incrementinarray.log
@@ -757,7 +757,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
// [1] call print_cls
- // [11] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [11] phi from main to print_cls [phi:main->print_cls]
print_cls_from_main:
jsr print_cls
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -778,7 +778,7 @@ main: {
// main::@1
__b1:
// [3] call print_str
- // [14] phi from main::@1 to print_str [phi:main::@1->print_str] -- call_phi_near
+ // [14] phi from main::@1 to print_str [phi:main::@1->print_str]
print_str_from___b1:
jsr print_str
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -787,7 +787,7 @@ main: {
// main::@2
__b2:
// [5] call print_ln
- // [21] phi from main::@2 to print_ln [phi:main::@2->print_ln] -- call_phi_near
+ // [21] phi from main::@2 to print_ln [phi:main::@2->print_ln]
print_ln_from___b2:
jsr print_ln
jmp __b3
@@ -823,7 +823,7 @@ main: {
// Clear the screen. Also resets current line/char cursor.
print_cls: {
// [12] call memset
- // [26] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [26] phi from print_cls to memset [phi:print_cls->memset]
memset_from_print_cls:
jsr memset
jmp __breturn
@@ -863,7 +863,7 @@ print_str: {
// [18] print_char::ch#0 = *print_str::str#2 -- vbuaa=_deref_pbuz1
ldy #0
lda (str),y
- // [19] call print_char -- call_phi_near
+ // [19] call print_char
jsr print_char
jmp __b3
// print_str::@3
@@ -1101,7 +1101,7 @@ Score: 9880
main: {
// print_cls()
// [1] call print_cls
- // [11] phi from main to print_cls [phi:main->print_cls] -- call_phi_near
+ // [11] phi from main to print_cls [phi:main->print_cls]
jsr print_cls
// [2] phi from main to main::@1 [phi:main->main::@1]
// [2] phi main::i#2 = 0 [phi:main->main::@1#0] -- vbuxx=vbuc1
@@ -1120,13 +1120,13 @@ main: {
__b1:
// print_str(txt)
// [3] call print_str
- // [14] phi from main::@1 to print_str [phi:main::@1->print_str] -- call_phi_near
+ // [14] phi from main::@1 to print_str [phi:main::@1->print_str]
jsr print_str
// [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
// main::@2
// print_ln()
// [5] call print_ln
- // [21] phi from main::@2 to print_ln [phi:main::@2->print_ln] -- call_phi_near
+ // [21] phi from main::@2 to print_ln [phi:main::@2->print_ln]
jsr print_ln
// main::@3
// txt[1]++;
@@ -1160,7 +1160,7 @@ main: {
print_cls: {
// memset(print_screen, ' ', 1000)
// [12] call memset
- // [26] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near
+ // [26] phi from print_cls to memset [phi:print_cls->memset]
jsr memset
// print_cls::@return
// }
@@ -1197,7 +1197,7 @@ print_str: {
// [18] print_char::ch#0 = *print_str::str#2 -- vbuaa=_deref_pbuz1
ldy #0
lda (str),y
- // [19] call print_char -- call_phi_near
+ // [19] call print_char
jsr print_char
// print_str::@3
// print_char(*(str++));
diff --git a/src/test/ref/init-value-npe.log b/src/test/ref/init-value-npe.log
index 605953a1e..0934bf1d1 100644
--- a/src/test/ref/init-value-npe.log
+++ b/src/test/ref/init-value-npe.log
@@ -238,7 +238,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call memset -- call_phi_near
+ // [1] call memset
jsr memset
jmp __breturn
// main::@return
@@ -302,7 +302,7 @@ Score: 24
// main
main: {
// memset(myscreen)
- // [1] call memset -- call_phi_near
+ // [1] call memset
jsr memset
// main::@return
// }
diff --git a/src/test/ref/init-volatiles.log b/src/test/ref/init-volatiles.log
index 28a4e887d..479f85898 100644
--- a/src/test/ref/init-volatiles.log
+++ b/src/test/ref/init-volatiles.log
@@ -154,7 +154,7 @@ __start: {
// __start::@1
__b1:
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -241,7 +241,7 @@ __start: {
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [3] call main
- // [5] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [5] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/inline-asm-ref-scoped.log b/src/test/ref/inline-asm-ref-scoped.log
index 321189d27..87605b4e1 100644
--- a/src/test/ref/inline-asm-ref-scoped.log
+++ b/src/test/ref/inline-asm-ref-scoped.log
@@ -106,7 +106,7 @@ main: {
// asm { lda#'c' stasub.ll+1 }
lda #'c'
sta sub.ll+1
- // [1] call sub -- call_phi_near
+ // [1] call sub
jsr sub
jmp __breturn
// main::@return
@@ -165,7 +165,7 @@ main: {
lda #'c'
sta sub.ll+1
// sub()
- // [1] call sub -- call_phi_near
+ // [1] call sub
jsr sub
// main::@return
// }
diff --git a/src/test/ref/inline-asm-uses-1.log b/src/test/ref/inline-asm-uses-1.log
index 746828cb6..f1456dbff 100644
--- a/src/test/ref/inline-asm-uses-1.log
+++ b/src/test/ref/inline-asm-uses-1.log
@@ -201,7 +201,7 @@ main: {
// [0] fgetc::channel = 7 -- vbuz1=vbuc1
lda #7
sta.z fgetc.channel
- // [1] call fgetc -- call_phi_near
+ // [1] call fgetc
jsr fgetc
// [2] fgetc::return#0 = fgetc::return#2
jmp __b1
@@ -301,7 +301,7 @@ main: {
// [0] fgetc::channel = 7 -- vbuz1=vbuc1
lda #7
sta.z fgetc.channel
- // [1] call fgetc -- call_phi_near
+ // [1] call fgetc
jsr fgetc
// [2] fgetc::return#0 = fgetc::return#2
// main::@1
diff --git a/src/test/ref/inline-kickasm-uses-problem.log b/src/test/ref/inline-kickasm-uses-problem.log
index 66bedbc96..e583b0c27 100644
--- a/src/test/ref/inline-kickasm-uses-problem.log
+++ b/src/test/ref/inline-kickasm-uses-problem.log
@@ -187,7 +187,7 @@ ASSEMBLER BEFORE OPTIMIZATION
.segment Code
// main
main: {
- // [1] call foo -- call_phi_near
+ // [1] call foo
jsr foo
jmp __breturn
// main::@return
@@ -291,7 +291,7 @@ Score: 320
// main
main: {
// foo(a, b)
- // [1] call foo -- call_phi_near
+ // [1] call foo
jsr foo
// main::@return
// }
diff --git a/src/test/ref/inline-pointer-1.log b/src/test/ref/inline-pointer-1.log
index 04e35a32f..edca90a05 100644
--- a/src/test/ref/inline-pointer-1.log
+++ b/src/test/ref/inline-pointer-1.log
@@ -194,7 +194,7 @@ main: {
puta_from_main:
// [5] phi puta::pl#2 = 0 [phi:main->puta#0] -- vbuaa=vbuc1
lda #0
- // [5] phi puta::ph#2 = 4 [phi:main->puta#1] -- call_phi_near
+ // [5] phi puta::ph#2 = 4 [phi:main->puta#1] -- vbuxx=vbuc1
ldx #4
jsr puta
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -207,7 +207,7 @@ main: {
puta_from___b1:
// [5] phi puta::pl#2 = $18 [phi:main::@1->puta#0] -- vbuaa=vbuc1
lda #$18
- // [5] phi puta::ph#2 = 5 [phi:main::@1->puta#1] -- call_phi_near
+ // [5] phi puta::ph#2 = 5 [phi:main::@1->puta#1] -- vbuxx=vbuc1
ldx #5
jsr puta
jmp __breturn
@@ -287,7 +287,7 @@ main: {
// [5] phi from main to puta [phi:main->puta]
// [5] phi puta::pl#2 = 0 [phi:main->puta#0] -- vbuaa=vbuc1
lda #0
- // [5] phi puta::ph#2 = 4 [phi:main->puta#1] -- call_phi_near
+ // [5] phi puta::ph#2 = 4 [phi:main->puta#1] -- vbuxx=vbuc1
ldx #4
jsr puta
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -297,7 +297,7 @@ main: {
// [5] phi from main::@1 to puta [phi:main::@1->puta]
// [5] phi puta::pl#2 = $18 [phi:main::@1->puta#0] -- vbuaa=vbuc1
lda #$18
- // [5] phi puta::ph#2 = 5 [phi:main::@1->puta#1] -- call_phi_near
+ // [5] phi puta::ph#2 = 5 [phi:main::@1->puta#1] -- vbuxx=vbuc1
ldx #5
jsr puta
// main::@return
diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log
index 1eaae4ccd..cd5c7f730 100644
--- a/src/test/ref/inline-string-2.log
+++ b/src/test/ref/inline-string-2.log
@@ -379,7 +379,7 @@ main: {
sta.z screen
lda #>$400
sta.z screen+1
- // [5] phi print_msg::idx#2 = 1 [phi:main->print_msg#1] -- call_phi_near
+ // [5] phi print_msg::idx#2 = 1 [phi:main->print_msg#1] -- vbuxx=vbuc1
ldx #1
jsr print_msg
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -391,7 +391,7 @@ main: {
// [5] phi from main::@1 to print_msg [phi:main::@1->print_msg]
print_msg_from___b1:
// [5] phi screen#20 = screen#15 [phi:main::@1->print_msg#0] -- register_copy
- // [5] phi print_msg::idx#2 = 2 [phi:main::@1->print_msg#1] -- call_phi_near
+ // [5] phi print_msg::idx#2 = 2 [phi:main::@1->print_msg#1] -- vbuxx=vbuc1
ldx #2
jsr print_msg
jmp __breturn
@@ -432,7 +432,7 @@ print_msg: {
__b2:
// [9] print::msg#0 = print_msg::msg#3
// [10] call print
- // [12] phi from print_msg::@2 to print [phi:print_msg::@2->print] -- call_phi_near
+ // [12] phi from print_msg::@2 to print [phi:print_msg::@2->print]
print_from___b2:
jsr print
jmp __breturn
@@ -570,7 +570,7 @@ main: {
sta.z screen
lda #>$400
sta.z screen+1
- // [5] phi print_msg::idx#2 = 1 [phi:main->print_msg#1] -- call_phi_near
+ // [5] phi print_msg::idx#2 = 1 [phi:main->print_msg#1] -- vbuxx=vbuc1
ldx #1
jsr print_msg
// [2] phi from main to main::@1 [phi:main->main::@1]
@@ -579,7 +579,7 @@ main: {
// [3] call print_msg
// [5] phi from main::@1 to print_msg [phi:main::@1->print_msg]
// [5] phi screen#20 = screen#15 [phi:main::@1->print_msg#0] -- register_copy
- // [5] phi print_msg::idx#2 = 2 [phi:main::@1->print_msg#1] -- call_phi_near
+ // [5] phi print_msg::idx#2 = 2 [phi:main::@1->print_msg#1] -- vbuxx=vbuc1
ldx #2
jsr print_msg
// main::@return
@@ -616,7 +616,7 @@ print_msg: {
// print(msg)
// [9] print::msg#0 = print_msg::msg#3
// [10] call print
- // [12] phi from print_msg::@2 to print [phi:print_msg::@2->print] -- call_phi_near
+ // [12] phi from print_msg::@2 to print [phi:print_msg::@2->print]
jsr print
// print_msg::@return
// }
diff --git a/src/test/ref/inline-string-4.log b/src/test/ref/inline-string-4.log
index 4880aa4b8..e46adc6d2 100644
--- a/src/test/ref/inline-string-4.log
+++ b/src/test/ref/inline-string-4.log
@@ -122,7 +122,7 @@ ASSEMBLER BEFORE OPTIMIZATION
// main
main: {
.label dw = msg
- // [1] call output -- call_phi_near
+ // [1] call output
jsr output
jmp __breturn
// main::@return
@@ -193,7 +193,7 @@ Score: 42
main: {
.label dw = msg
// output(dw)
- // [1] call output -- call_phi_near
+ // [1] call output
jsr output
// main::@return
// }
diff --git a/src/test/ref/inline-string.log b/src/test/ref/inline-string.log
index 6c4793398..5662d1b07 100644
--- a/src/test/ref/inline-string.log
+++ b/src/test/ref/inline-string.log
@@ -274,7 +274,7 @@ main: {
sta.z screen
lda #>$400
sta.z screen+1
- // [7] phi print::msg#6 = msg1 [phi:main->print#1] -- call_phi_near
+ // [7] phi print::msg#6 = msg1 [phi:main->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -289,7 +289,7 @@ main: {
// [7] phi from main::@1 to print [phi:main::@1->print]
print_from___b1:
// [7] phi screen#20 = screen#13 [phi:main::@1->print#0] -- register_copy
- // [7] phi print::msg#6 = main::msg2 [phi:main::@1->print#1] -- call_phi_near
+ // [7] phi print::msg#6 = main::msg2 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg2
@@ -304,7 +304,7 @@ main: {
// [7] phi from main::@2 to print [phi:main::@2->print]
print_from___b2:
// [7] phi screen#20 = screen#13 [phi:main::@2->print#0] -- register_copy
- // [7] phi print::msg#6 = main::msg [phi:main::@2->print#1] -- call_phi_near
+ // [7] phi print::msg#6 = main::msg [phi:main::@2->print#1] -- pbuz1=pbuc1
lda #msg
@@ -438,7 +438,7 @@ main: {
sta.z screen
lda #>$400
sta.z screen+1
- // [7] phi print::msg#6 = msg1 [phi:main->print#1] -- call_phi_near
+ // [7] phi print::msg#6 = msg1 [phi:main->print#1] -- pbuz1=pbuc1
lda #msg1
@@ -450,7 +450,7 @@ main: {
// [3] call print
// [7] phi from main::@1 to print [phi:main::@1->print]
// [7] phi screen#20 = screen#13 [phi:main::@1->print#0] -- register_copy
- // [7] phi print::msg#6 = main::msg2 [phi:main::@1->print#1] -- call_phi_near
+ // [7] phi print::msg#6 = main::msg2 [phi:main::@1->print#1] -- pbuz1=pbuc1
lda #msg2
@@ -462,7 +462,7 @@ main: {
// [5] call print
// [7] phi from main::@2 to print [phi:main::@2->print]
// [7] phi screen#20 = screen#13 [phi:main::@2->print#0] -- register_copy
- // [7] phi print::msg#6 = main::msg [phi:main::@2->print#1] -- call_phi_near
+ // [7] phi print::msg#6 = main::msg [phi:main::@2->print#1] -- pbuz1=pbuc1
lda #msg
diff --git a/src/test/ref/int-conversion.log b/src/test/ref/int-conversion.log
index 9bc0b5d39..cd6b3338f 100644
--- a/src/test/ref/int-conversion.log
+++ b/src/test/ref/int-conversion.log
@@ -1663,7 +1663,7 @@ main: {
// main::@3
__b3:
// [4] call testUnaryOperator
- // [10] phi from main::@3 to testUnaryOperator [phi:main::@3->testUnaryOperator] -- call_phi_near
+ // [10] phi from main::@3 to testUnaryOperator [phi:main::@3->testUnaryOperator]
testUnaryOperator_from___b3:
jsr testUnaryOperator
// [5] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
@@ -1672,7 +1672,7 @@ main: {
// main::@4
__b4:
// [6] call testBinaryOperator
- // [23] phi from main::@4 to testBinaryOperator [phi:main::@4->testBinaryOperator] -- call_phi_near
+ // [23] phi from main::@4 to testBinaryOperator [phi:main::@4->testBinaryOperator]
testBinaryOperator_from___b4:
jsr testBinaryOperator
jmp __breturn
@@ -1707,7 +1707,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testUnaryOperator->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testUnaryOperator->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testUnaryOperator->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
jsr assertType
// [12] phi from testUnaryOperator to testUnaryOperator::@1 [phi:testUnaryOperator->testUnaryOperator::@1]
@@ -1722,7 +1722,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_SIGNED_CHAR [phi:testUnaryOperator::@1->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_SIGNED_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testUnaryOperator::@1->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testUnaryOperator::@1->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_SIGNED_CHAR
jsr assertType
// [14] phi from testUnaryOperator::@1 to testUnaryOperator::@2 [phi:testUnaryOperator::@1->testUnaryOperator::@2]
@@ -1737,7 +1737,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testUnaryOperator::@2->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testUnaryOperator::@2->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testUnaryOperator::@2->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [16] phi from testUnaryOperator::@2 to testUnaryOperator::@3 [phi:testUnaryOperator::@2->testUnaryOperator::@3]
@@ -1752,7 +1752,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testUnaryOperator::@3->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testUnaryOperator::@3->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testUnaryOperator::@3->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_INT
jsr assertType
// [18] phi from testUnaryOperator::@3 to testUnaryOperator::@4 [phi:testUnaryOperator::@3->testUnaryOperator::@4]
@@ -1767,7 +1767,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testUnaryOperator::@4->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testUnaryOperator::@4->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testUnaryOperator::@4->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [20] phi from testUnaryOperator::@4 to testUnaryOperator::@5 [phi:testUnaryOperator::@4->testUnaryOperator::@5]
@@ -1782,7 +1782,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testUnaryOperator::@5->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testUnaryOperator::@5->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testUnaryOperator::@5->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
jmp __breturn
@@ -1802,7 +1802,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testBinaryOperator->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
jsr assertType
// [25] phi from testBinaryOperator to testBinaryOperator::@1 [phi:testBinaryOperator->testBinaryOperator::@1]
@@ -1817,7 +1817,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testBinaryOperator::@1->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@1->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@1->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
jsr assertType
// [27] phi from testBinaryOperator::@1 to testBinaryOperator::@2 [phi:testBinaryOperator::@1->testBinaryOperator::@2]
@@ -1832,7 +1832,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@2->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@2->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@2->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [29] phi from testBinaryOperator::@2 to testBinaryOperator::@3 [phi:testBinaryOperator::@2->testBinaryOperator::@3]
@@ -1847,7 +1847,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@3->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@3->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@3->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_INT
jsr assertType
// [31] phi from testBinaryOperator::@3 to testBinaryOperator::@4 [phi:testBinaryOperator::@3->testBinaryOperator::@4]
@@ -1862,7 +1862,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@4->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@4->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@4->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [33] phi from testBinaryOperator::@4 to testBinaryOperator::@5 [phi:testBinaryOperator::@4->testBinaryOperator::@5]
@@ -1877,7 +1877,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@5->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@5->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@5->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
jmp __b6
@@ -1893,7 +1893,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testBinaryOperator::@6->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@6->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@6->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
jsr assertType
// [37] phi from testBinaryOperator::@6 to testBinaryOperator::@7 [phi:testBinaryOperator::@6->testBinaryOperator::@7]
@@ -1908,7 +1908,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_SIGNED_CHAR [phi:testBinaryOperator::@7->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_SIGNED_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testBinaryOperator::@7->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testBinaryOperator::@7->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_SIGNED_CHAR
jsr assertType
// [39] phi from testBinaryOperator::@7 to testBinaryOperator::@8 [phi:testBinaryOperator::@7->testBinaryOperator::@8]
@@ -1923,7 +1923,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@8->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@8->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@8->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [41] phi from testBinaryOperator::@8 to testBinaryOperator::@9 [phi:testBinaryOperator::@8->testBinaryOperator::@9]
@@ -1938,7 +1938,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@9->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@9->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@9->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_INT
jsr assertType
// [43] phi from testBinaryOperator::@9 to testBinaryOperator::@10 [phi:testBinaryOperator::@9->testBinaryOperator::@10]
@@ -1953,7 +1953,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@10->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@10->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@10->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [45] phi from testBinaryOperator::@10 to testBinaryOperator::@11 [phi:testBinaryOperator::@10->testBinaryOperator::@11]
@@ -1968,7 +1968,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@11->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@11->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@11->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
jmp __b12
@@ -1984,7 +1984,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@12->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@12->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@12->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [49] phi from testBinaryOperator::@12 to testBinaryOperator::@13 [phi:testBinaryOperator::@12->testBinaryOperator::@13]
@@ -1999,7 +1999,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@13->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@13->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@13->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [51] phi from testBinaryOperator::@13 to testBinaryOperator::@14 [phi:testBinaryOperator::@13->testBinaryOperator::@14]
@@ -2014,7 +2014,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@14->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@14->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@14->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [53] phi from testBinaryOperator::@14 to testBinaryOperator::@15 [phi:testBinaryOperator::@14->testBinaryOperator::@15]
@@ -2029,7 +2029,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@15->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@15->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@15->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [55] phi from testBinaryOperator::@15 to testBinaryOperator::@16 [phi:testBinaryOperator::@15->testBinaryOperator::@16]
@@ -2044,7 +2044,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@16->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@16->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@16->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [57] phi from testBinaryOperator::@16 to testBinaryOperator::@17 [phi:testBinaryOperator::@16->testBinaryOperator::@17]
@@ -2059,7 +2059,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@17->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@17->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@17->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
// [59] phi from testBinaryOperator::@17 to testBinaryOperator::@18 [phi:testBinaryOperator::@17->testBinaryOperator::@18]
@@ -2076,7 +2076,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@18->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@18->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@18->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_INT
jsr assertType
// [61] phi from testBinaryOperator::@18 to testBinaryOperator::@19 [phi:testBinaryOperator::@18->testBinaryOperator::@19]
@@ -2091,7 +2091,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@19->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@19->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@19->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_INT
jsr assertType
// [63] phi from testBinaryOperator::@19 to testBinaryOperator::@20 [phi:testBinaryOperator::@19->testBinaryOperator::@20]
@@ -2106,7 +2106,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@20->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@20->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@20->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
jsr assertType
// [65] phi from testBinaryOperator::@20 to testBinaryOperator::@21 [phi:testBinaryOperator::@20->testBinaryOperator::@21]
@@ -2121,7 +2121,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@21->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@21->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@21->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_INT
jsr assertType
// [67] phi from testBinaryOperator::@21 to testBinaryOperator::@22 [phi:testBinaryOperator::@21->testBinaryOperator::@22]
@@ -2136,7 +2136,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@22->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@22->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@22->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [69] phi from testBinaryOperator::@22 to testBinaryOperator::@23 [phi:testBinaryOperator::@22->testBinaryOperator::@23]
@@ -2151,7 +2151,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@23->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@23->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@23->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
jmp __b24
@@ -2167,7 +2167,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@24->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@24->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@24->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [73] phi from testBinaryOperator::@24 to testBinaryOperator::@25 [phi:testBinaryOperator::@24->testBinaryOperator::@25]
@@ -2182,7 +2182,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@25->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@25->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@25->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [75] phi from testBinaryOperator::@25 to testBinaryOperator::@26 [phi:testBinaryOperator::@25->testBinaryOperator::@26]
@@ -2197,7 +2197,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@26->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@26->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@26->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [77] phi from testBinaryOperator::@26 to testBinaryOperator::@27 [phi:testBinaryOperator::@26->testBinaryOperator::@27]
@@ -2212,7 +2212,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@27->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@27->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@27->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [79] phi from testBinaryOperator::@27 to testBinaryOperator::@28 [phi:testBinaryOperator::@27->testBinaryOperator::@28]
@@ -2227,7 +2227,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@28->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@28->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@28->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [81] phi from testBinaryOperator::@28 to testBinaryOperator::@29 [phi:testBinaryOperator::@28->testBinaryOperator::@29]
@@ -2242,7 +2242,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@29->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@29->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@29->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
jmp __b30
@@ -2258,7 +2258,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@30->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@30->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@30->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
// [85] phi from testBinaryOperator::@30 to testBinaryOperator::@31 [phi:testBinaryOperator::@30->testBinaryOperator::@31]
@@ -2273,7 +2273,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@31->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@31->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@31->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
// [87] phi from testBinaryOperator::@31 to testBinaryOperator::@32 [phi:testBinaryOperator::@31->testBinaryOperator::@32]
@@ -2288,7 +2288,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@32->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@32->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@32->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
// [89] phi from testBinaryOperator::@32 to testBinaryOperator::@33 [phi:testBinaryOperator::@32->testBinaryOperator::@33]
@@ -2303,7 +2303,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@33->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@33->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@33->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
// [91] phi from testBinaryOperator::@33 to testBinaryOperator::@34 [phi:testBinaryOperator::@33->testBinaryOperator::@34]
@@ -2318,7 +2318,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@34->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@34->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@34->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
jsr assertType
// [93] phi from testBinaryOperator::@34 to testBinaryOperator::@35 [phi:testBinaryOperator::@34->testBinaryOperator::@35]
@@ -2333,7 +2333,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@35->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@35->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@35->assertType#2] -- vbuyy=vbuc1
ldy #TYPEID_LONG
jsr assertType
jmp __breturn
@@ -2695,13 +2695,13 @@ main: {
// main::@3
// testUnaryOperator()
// [4] call testUnaryOperator
- // [10] phi from main::@3 to testUnaryOperator [phi:main::@3->testUnaryOperator] -- call_phi_near
+ // [10] phi from main::@3 to testUnaryOperator [phi:main::@3->testUnaryOperator]
jsr testUnaryOperator
// [5] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
// main::@4
// testBinaryOperator()
// [6] call testBinaryOperator
- // [23] phi from main::@4 to testBinaryOperator [phi:main::@4->testBinaryOperator] -- call_phi_near
+ // [23] phi from main::@4 to testBinaryOperator [phi:main::@4->testBinaryOperator]
jsr testBinaryOperator
// main::@return
// }
@@ -2735,7 +2735,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testUnaryOperator->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testUnaryOperator->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testUnaryOperator->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [12] phi from testUnaryOperator to testUnaryOperator::@1 [phi:testUnaryOperator->testUnaryOperator::@1]
@@ -2747,7 +2747,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_SIGNED_CHAR [phi:testUnaryOperator::@1->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_SIGNED_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testUnaryOperator::@1->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testUnaryOperator::@1->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [14] phi from testUnaryOperator::@1 to testUnaryOperator::@2 [phi:testUnaryOperator::@1->testUnaryOperator::@2]
@@ -2759,7 +2759,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testUnaryOperator::@2->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testUnaryOperator::@2->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testUnaryOperator::@2->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [16] phi from testUnaryOperator::@2 to testUnaryOperator::@3 [phi:testUnaryOperator::@2->testUnaryOperator::@3]
@@ -2771,7 +2771,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testUnaryOperator::@3->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testUnaryOperator::@3->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testUnaryOperator::@3->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [18] phi from testUnaryOperator::@3 to testUnaryOperator::@4 [phi:testUnaryOperator::@3->testUnaryOperator::@4]
@@ -2783,7 +2783,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testUnaryOperator::@4->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testUnaryOperator::@4->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testUnaryOperator::@4->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [20] phi from testUnaryOperator::@4 to testUnaryOperator::@5 [phi:testUnaryOperator::@4->testUnaryOperator::@5]
@@ -2795,7 +2795,7 @@ testUnaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testUnaryOperator::@5->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testUnaryOperator::@5->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testUnaryOperator::@5->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// testUnaryOperator::@return
@@ -2814,7 +2814,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testBinaryOperator->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [25] phi from testBinaryOperator to testBinaryOperator::@1 [phi:testBinaryOperator->testBinaryOperator::@1]
@@ -2826,7 +2826,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testBinaryOperator::@1->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@1->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@1->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [27] phi from testBinaryOperator::@1 to testBinaryOperator::@2 [phi:testBinaryOperator::@1->testBinaryOperator::@2]
@@ -2838,7 +2838,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@2->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@2->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@2->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [29] phi from testBinaryOperator::@2 to testBinaryOperator::@3 [phi:testBinaryOperator::@2->testBinaryOperator::@3]
@@ -2850,7 +2850,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@3->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@3->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@3->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [31] phi from testBinaryOperator::@3 to testBinaryOperator::@4 [phi:testBinaryOperator::@3->testBinaryOperator::@4]
@@ -2862,7 +2862,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@4->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@4->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@4->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [33] phi from testBinaryOperator::@4 to testBinaryOperator::@5 [phi:testBinaryOperator::@4->testBinaryOperator::@5]
@@ -2874,7 +2874,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@5->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@5->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@5->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// testBinaryOperator::@6
@@ -2889,7 +2889,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_CHAR [phi:testBinaryOperator::@6->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@6->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_CHAR [phi:testBinaryOperator::@6->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [37] phi from testBinaryOperator::@6 to testBinaryOperator::@7 [phi:testBinaryOperator::@6->testBinaryOperator::@7]
@@ -2901,7 +2901,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_SIGNED_CHAR [phi:testBinaryOperator::@7->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_SIGNED_CHAR
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testBinaryOperator::@7->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_SIGNED_CHAR [phi:testBinaryOperator::@7->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [39] phi from testBinaryOperator::@7 to testBinaryOperator::@8 [phi:testBinaryOperator::@7->testBinaryOperator::@8]
@@ -2913,7 +2913,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@8->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@8->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@8->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [41] phi from testBinaryOperator::@8 to testBinaryOperator::@9 [phi:testBinaryOperator::@8->testBinaryOperator::@9]
@@ -2925,7 +2925,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@9->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@9->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@9->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [43] phi from testBinaryOperator::@9 to testBinaryOperator::@10 [phi:testBinaryOperator::@9->testBinaryOperator::@10]
@@ -2937,7 +2937,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@10->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@10->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@10->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [45] phi from testBinaryOperator::@10 to testBinaryOperator::@11 [phi:testBinaryOperator::@10->testBinaryOperator::@11]
@@ -2949,7 +2949,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@11->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@11->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@11->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// testBinaryOperator::@12
@@ -2964,7 +2964,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@12->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@12->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@12->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [49] phi from testBinaryOperator::@12 to testBinaryOperator::@13 [phi:testBinaryOperator::@12->testBinaryOperator::@13]
@@ -2976,7 +2976,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@13->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@13->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@13->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [51] phi from testBinaryOperator::@13 to testBinaryOperator::@14 [phi:testBinaryOperator::@13->testBinaryOperator::@14]
@@ -2988,7 +2988,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@14->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@14->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@14->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [53] phi from testBinaryOperator::@14 to testBinaryOperator::@15 [phi:testBinaryOperator::@14->testBinaryOperator::@15]
@@ -3000,7 +3000,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@15->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@15->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@15->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [55] phi from testBinaryOperator::@15 to testBinaryOperator::@16 [phi:testBinaryOperator::@15->testBinaryOperator::@16]
@@ -3012,7 +3012,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@16->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@16->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@16->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [57] phi from testBinaryOperator::@16 to testBinaryOperator::@17 [phi:testBinaryOperator::@16->testBinaryOperator::@17]
@@ -3024,7 +3024,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@17->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@17->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@17->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [59] phi from testBinaryOperator::@17 to testBinaryOperator::@18 [phi:testBinaryOperator::@17->testBinaryOperator::@18]
@@ -3038,7 +3038,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@18->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@18->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@18->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [61] phi from testBinaryOperator::@18 to testBinaryOperator::@19 [phi:testBinaryOperator::@18->testBinaryOperator::@19]
@@ -3050,7 +3050,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@19->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@19->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@19->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [63] phi from testBinaryOperator::@19 to testBinaryOperator::@20 [phi:testBinaryOperator::@19->testBinaryOperator::@20]
@@ -3062,7 +3062,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@20->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@20->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_INT [phi:testBinaryOperator::@20->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [65] phi from testBinaryOperator::@20 to testBinaryOperator::@21 [phi:testBinaryOperator::@20->testBinaryOperator::@21]
@@ -3074,7 +3074,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_INT [phi:testBinaryOperator::@21->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_INT
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@21->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_INT [phi:testBinaryOperator::@21->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [67] phi from testBinaryOperator::@21 to testBinaryOperator::@22 [phi:testBinaryOperator::@21->testBinaryOperator::@22]
@@ -3086,7 +3086,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@22->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@22->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@22->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [69] phi from testBinaryOperator::@22 to testBinaryOperator::@23 [phi:testBinaryOperator::@22->testBinaryOperator::@23]
@@ -3098,7 +3098,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@23->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@23->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@23->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// testBinaryOperator::@24
@@ -3113,7 +3113,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@24->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@24->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@24->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [73] phi from testBinaryOperator::@24 to testBinaryOperator::@25 [phi:testBinaryOperator::@24->testBinaryOperator::@25]
@@ -3125,7 +3125,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@25->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@25->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@25->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [75] phi from testBinaryOperator::@25 to testBinaryOperator::@26 [phi:testBinaryOperator::@25->testBinaryOperator::@26]
@@ -3137,7 +3137,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@26->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@26->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@26->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [77] phi from testBinaryOperator::@26 to testBinaryOperator::@27 [phi:testBinaryOperator::@26->testBinaryOperator::@27]
@@ -3149,7 +3149,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@27->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@27->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@27->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [79] phi from testBinaryOperator::@27 to testBinaryOperator::@28 [phi:testBinaryOperator::@27->testBinaryOperator::@28]
@@ -3161,7 +3161,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@28->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@28->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@28->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [81] phi from testBinaryOperator::@28 to testBinaryOperator::@29 [phi:testBinaryOperator::@28->testBinaryOperator::@29]
@@ -3173,7 +3173,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@29->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@29->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@29->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// testBinaryOperator::@30
@@ -3188,7 +3188,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@30->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@30->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@30->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [85] phi from testBinaryOperator::@30 to testBinaryOperator::@31 [phi:testBinaryOperator::@30->testBinaryOperator::@31]
@@ -3200,7 +3200,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@31->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@31->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@31->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [87] phi from testBinaryOperator::@31 to testBinaryOperator::@32 [phi:testBinaryOperator::@31->testBinaryOperator::@32]
@@ -3212,7 +3212,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@32->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@32->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@32->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [89] phi from testBinaryOperator::@32 to testBinaryOperator::@33 [phi:testBinaryOperator::@32->testBinaryOperator::@33]
@@ -3224,7 +3224,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@33->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@33->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@33->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [91] phi from testBinaryOperator::@33 to testBinaryOperator::@34 [phi:testBinaryOperator::@33->testBinaryOperator::@34]
@@ -3236,7 +3236,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@34->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_UNSIGNED_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@34->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_UNSIGNED_LONG [phi:testBinaryOperator::@34->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// [93] phi from testBinaryOperator::@34 to testBinaryOperator::@35 [phi:testBinaryOperator::@34->testBinaryOperator::@35]
@@ -3248,7 +3248,7 @@ testBinaryOperator: {
// [96] phi assertType::t2#42 = TYPEID_LONG [phi:testBinaryOperator::@35->assertType#1] -- vbuz1=vbuc1
lda #TYPEID_LONG
sta.z assertType.t2
- // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@35->assertType#2] -- call_phi_near
+ // [96] phi assertType::t1#42 = TYPEID_LONG [phi:testBinaryOperator::@35->assertType#2] -- vbuyy=vbuc1
tay
jsr assertType
// testBinaryOperator::@return
diff --git a/src/test/ref/int-literals.log b/src/test/ref/int-literals.log
index 21f38a123..7e001ef35 100644
--- a/src/test/ref/int-literals.log
+++ b/src/test/ref/int-literals.log
@@ -836,7 +836,7 @@ main: {
// main::@3
__b3:
// [4] call testSimpleTypes
- // [8] phi from main::@3 to testSimpleTypes [phi:main::@3->testSimpleTypes] -- call_phi_near
+ // [8] phi from main::@3 to testSimpleTypes [phi:main::@3->testSimpleTypes]
testSimpleTypes_from___b3:
jsr testSimpleTypes
jmp __breturn
@@ -871,7 +871,7 @@ testSimpleTypes: {
sta.z idx
// [41] phi assertType::t2#16 = TYPEID_CHAR [phi:testSimpleTypes->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
- // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_CHAR
jsr assertType
// [10] phi from testSimpleTypes to testSimpleTypes::@1 [phi:testSimpleTypes->testSimpleTypes::@1]
@@ -885,7 +885,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@1->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_CHAR [phi:testSimpleTypes::@1->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
- // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes::@1->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes::@1->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_CHAR
jsr assertType
// [12] phi from testSimpleTypes::@1 to testSimpleTypes::@2 [phi:testSimpleTypes::@1->testSimpleTypes::@2]
@@ -899,7 +899,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@2->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@2->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_SIGNED_CHAR
- // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@2->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@2->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_SIGNED_CHAR
jsr assertType
// [14] phi from testSimpleTypes::@2 to testSimpleTypes::@3 [phi:testSimpleTypes::@2->testSimpleTypes::@3]
@@ -913,7 +913,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@3->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@3->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_SIGNED_CHAR
- // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@3->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@3->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_SIGNED_CHAR
jsr assertType
// [16] phi from testSimpleTypes::@3 to testSimpleTypes::@4 [phi:testSimpleTypes::@3->testSimpleTypes::@4]
@@ -927,7 +927,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@4->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@4->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@4->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@4->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// [18] phi from testSimpleTypes::@4 to testSimpleTypes::@5 [phi:testSimpleTypes::@4->testSimpleTypes::@5]
@@ -941,7 +941,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@5->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@5->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@5->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@5->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// [20] phi from testSimpleTypes::@5 to testSimpleTypes::@6 [phi:testSimpleTypes::@5->testSimpleTypes::@6]
@@ -955,7 +955,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@6->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@6->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@6->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@6->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// [22] phi from testSimpleTypes::@6 to testSimpleTypes::@7 [phi:testSimpleTypes::@6->testSimpleTypes::@7]
@@ -969,7 +969,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@7->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_INT [phi:testSimpleTypes::@7->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_INT
- // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@7->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@7->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_INT
jsr assertType
// [24] phi from testSimpleTypes::@7 to testSimpleTypes::@8 [phi:testSimpleTypes::@7->testSimpleTypes::@8]
@@ -983,7 +983,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@8->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_INT [phi:testSimpleTypes::@8->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_INT
- // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@8->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@8->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_INT
jsr assertType
// [26] phi from testSimpleTypes::@8 to testSimpleTypes::@9 [phi:testSimpleTypes::@8->testSimpleTypes::@9]
@@ -997,7 +997,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@9->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_INT [phi:testSimpleTypes::@9->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_INT
- // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@9->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@9->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_INT
jsr assertType
// [28] phi from testSimpleTypes::@9 to testSimpleTypes::@10 [phi:testSimpleTypes::@9->testSimpleTypes::@10]
@@ -1011,7 +1011,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@10->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@10->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@10->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@10->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_LONG
jsr assertType
// [30] phi from testSimpleTypes::@10 to testSimpleTypes::@11 [phi:testSimpleTypes::@10->testSimpleTypes::@11]
@@ -1025,7 +1025,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@11->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@11->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@11->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@11->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_LONG
jsr assertType
// [32] phi from testSimpleTypes::@11 to testSimpleTypes::@12 [phi:testSimpleTypes::@11->testSimpleTypes::@12]
@@ -1039,7 +1039,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@12->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_LONG [phi:testSimpleTypes::@12->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_LONG
- // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@12->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@12->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_LONG
jsr assertType
// [34] phi from testSimpleTypes::@12 to testSimpleTypes::@13 [phi:testSimpleTypes::@12->testSimpleTypes::@13]
@@ -1053,7 +1053,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@13->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_LONG [phi:testSimpleTypes::@13->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_LONG
- // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@13->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@13->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_LONG
jsr assertType
// [36] phi from testSimpleTypes::@13 to testSimpleTypes::@14 [phi:testSimpleTypes::@13->testSimpleTypes::@14]
@@ -1067,7 +1067,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@14->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_LONG [phi:testSimpleTypes::@14->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_LONG
- // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@14->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@14->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_LONG
jsr assertType
// [38] phi from testSimpleTypes::@14 to testSimpleTypes::@15 [phi:testSimpleTypes::@14->testSimpleTypes::@15]
@@ -1081,7 +1081,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@15->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@15->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@15->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@15->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
jmp __breturn
@@ -1296,7 +1296,7 @@ main: {
// main::@3
// testSimpleTypes()
// [4] call testSimpleTypes
- // [8] phi from main::@3 to testSimpleTypes [phi:main::@3->testSimpleTypes] -- call_phi_near
+ // [8] phi from main::@3 to testSimpleTypes [phi:main::@3->testSimpleTypes]
jsr testSimpleTypes
// main::@return
// }
@@ -1330,7 +1330,7 @@ testSimpleTypes: {
sta.z idx
// [41] phi assertType::t2#16 = TYPEID_CHAR [phi:testSimpleTypes->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
- // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_CHAR
jsr assertType
// [10] phi from testSimpleTypes to testSimpleTypes::@1 [phi:testSimpleTypes->testSimpleTypes::@1]
@@ -1341,7 +1341,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@1->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_CHAR [phi:testSimpleTypes::@1->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_CHAR
- // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes::@1->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_CHAR [phi:testSimpleTypes::@1->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_CHAR
jsr assertType
// [12] phi from testSimpleTypes::@1 to testSimpleTypes::@2 [phi:testSimpleTypes::@1->testSimpleTypes::@2]
@@ -1352,7 +1352,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@2->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@2->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_SIGNED_CHAR
- // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@2->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@2->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_SIGNED_CHAR
jsr assertType
// [14] phi from testSimpleTypes::@2 to testSimpleTypes::@3 [phi:testSimpleTypes::@2->testSimpleTypes::@3]
@@ -1363,7 +1363,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@3->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@3->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_SIGNED_CHAR
- // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@3->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_SIGNED_CHAR [phi:testSimpleTypes::@3->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_SIGNED_CHAR
jsr assertType
// [16] phi from testSimpleTypes::@3 to testSimpleTypes::@4 [phi:testSimpleTypes::@3->testSimpleTypes::@4]
@@ -1374,7 +1374,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@4->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@4->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@4->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@4->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// [18] phi from testSimpleTypes::@4 to testSimpleTypes::@5 [phi:testSimpleTypes::@4->testSimpleTypes::@5]
@@ -1385,7 +1385,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@5->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@5->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@5->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@5->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// [20] phi from testSimpleTypes::@5 to testSimpleTypes::@6 [phi:testSimpleTypes::@5->testSimpleTypes::@6]
@@ -1396,7 +1396,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@6->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@6->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@6->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@6->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// [22] phi from testSimpleTypes::@6 to testSimpleTypes::@7 [phi:testSimpleTypes::@6->testSimpleTypes::@7]
@@ -1407,7 +1407,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@7->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_INT [phi:testSimpleTypes::@7->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_INT
- // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@7->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@7->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_INT
jsr assertType
// [24] phi from testSimpleTypes::@7 to testSimpleTypes::@8 [phi:testSimpleTypes::@7->testSimpleTypes::@8]
@@ -1418,7 +1418,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@8->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_INT [phi:testSimpleTypes::@8->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_INT
- // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@8->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@8->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_INT
jsr assertType
// [26] phi from testSimpleTypes::@8 to testSimpleTypes::@9 [phi:testSimpleTypes::@8->testSimpleTypes::@9]
@@ -1429,7 +1429,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@9->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_INT [phi:testSimpleTypes::@9->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_INT
- // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@9->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_INT [phi:testSimpleTypes::@9->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_INT
jsr assertType
// [28] phi from testSimpleTypes::@9 to testSimpleTypes::@10 [phi:testSimpleTypes::@9->testSimpleTypes::@10]
@@ -1440,7 +1440,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@10->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@10->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@10->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@10->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_LONG
jsr assertType
// [30] phi from testSimpleTypes::@10 to testSimpleTypes::@11 [phi:testSimpleTypes::@10->testSimpleTypes::@11]
@@ -1451,7 +1451,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@11->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@11->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_LONG
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@11->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_LONG [phi:testSimpleTypes::@11->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_LONG
jsr assertType
// [32] phi from testSimpleTypes::@11 to testSimpleTypes::@12 [phi:testSimpleTypes::@11->testSimpleTypes::@12]
@@ -1462,7 +1462,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@12->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_LONG [phi:testSimpleTypes::@12->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_LONG
- // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@12->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@12->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_LONG
jsr assertType
// [34] phi from testSimpleTypes::@12 to testSimpleTypes::@13 [phi:testSimpleTypes::@12->testSimpleTypes::@13]
@@ -1473,7 +1473,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@13->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_LONG [phi:testSimpleTypes::@13->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_LONG
- // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@13->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@13->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_LONG
jsr assertType
// [36] phi from testSimpleTypes::@13 to testSimpleTypes::@14 [phi:testSimpleTypes::@13->testSimpleTypes::@14]
@@ -1484,7 +1484,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@14->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_LONG [phi:testSimpleTypes::@14->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_LONG
- // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@14->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_LONG [phi:testSimpleTypes::@14->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_LONG
jsr assertType
// [38] phi from testSimpleTypes::@14 to testSimpleTypes::@15 [phi:testSimpleTypes::@14->testSimpleTypes::@15]
@@ -1495,7 +1495,7 @@ testSimpleTypes: {
// [41] phi idx#44 = idx#20 [phi:testSimpleTypes::@15->assertType#0] -- register_copy
// [41] phi assertType::t2#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@15->assertType#1] -- vbuyy=vbuc1
ldy #TYPEID_UNSIGNED_INT
- // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@15->assertType#2] -- call_phi_near
+ // [41] phi assertType::t1#16 = TYPEID_UNSIGNED_INT [phi:testSimpleTypes::@15->assertType#2] -- vbuxx=vbuc1
ldx #TYPEID_UNSIGNED_INT
jsr assertType
// testSimpleTypes::@return
diff --git a/src/test/ref/intermediates-simple.log b/src/test/ref/intermediates-simple.log
index e7f494d08..e1c27b801 100644
--- a/src/test/ref/intermediates-simple.log
+++ b/src/test/ref/intermediates-simple.log
@@ -427,7 +427,7 @@ main: {
// [10] sum::a#0 = main::i#2 -- vbuaa=vbuz1
lda.z i
// [11] sum::b#0 = main::j#2
- // [12] call sum -- call_phi_near
+ // [12] call sum
jsr sum
// [13] sum::return#0 = sum::return#1
jmp __b5
@@ -593,7 +593,7 @@ main: {
// [10] sum::a#0 = main::i#2 -- vbuaa=vbuz1
lda.z i
// [11] sum::b#0 = main::j#2
- // [12] call sum -- call_phi_near
+ // [12] call sum
jsr sum
// [13] sum::return#0 = sum::return#1
// main::@5
diff --git a/src/test/ref/intermediates-struct.log b/src/test/ref/intermediates-struct.log
index 87e4ff885..e5d380194 100644
--- a/src/test/ref/intermediates-struct.log
+++ b/src/test/ref/intermediates-struct.log
@@ -322,7 +322,7 @@ main: {
sum_from_main:
// [8] phi sum::b#2 = 2 [phi:main->sum#0] -- vbuxx=vbuc1
ldx #2
- // [8] phi sum::a#2 = 1 [phi:main->sum#1] -- call_phi_near
+ // [8] phi sum::a#2 = 1 [phi:main->sum#1] -- vbuaa=vbuc1
lda #1
jsr sum
jmp __b1
@@ -343,7 +343,7 @@ main: {
sum_from___b1:
// [8] phi sum::b#2 = 4 [phi:main::@1->sum#0] -- vbuxx=vbuc1
ldx #4
- // [8] phi sum::a#2 = 3 [phi:main::@1->sum#1] -- call_phi_near
+ // [8] phi sum::a#2 = 3 [phi:main::@1->sum#1] -- vbuaa=vbuc1
lda #3
jsr sum
jmp __b2
@@ -461,7 +461,7 @@ main: {
// [8] phi from main to sum [phi:main->sum]
// [8] phi sum::b#2 = 2 [phi:main->sum#0] -- vbuxx=vbuc1
ldx #2
- // [8] phi sum::a#2 = 1 [phi:main->sum#1] -- call_phi_near
+ // [8] phi sum::a#2 = 1 [phi:main->sum#1] -- vbuaa=vbuc1
lda #1
jsr sum
// main::@1
@@ -482,7 +482,7 @@ main: {
// [8] phi from main::@1 to sum [phi:main::@1->sum]
// [8] phi sum::b#2 = 4 [phi:main::@1->sum#0] -- vbuxx=vbuc1
ldx #4
- // [8] phi sum::a#2 = 3 [phi:main::@1->sum#1] -- call_phi_near
+ // [8] phi sum::a#2 = 3 [phi:main::@1->sum#1] -- vbuaa=vbuc1
lda #3
jsr sum
// main::@2
diff --git a/src/test/ref/interrupt-volatile-reuse-problem1.log b/src/test/ref/interrupt-volatile-reuse-problem1.log
index 8888465a9..60e6229f4 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem1.log
+++ b/src/test/ref/interrupt-volatile-reuse-problem1.log
@@ -184,7 +184,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [4] call main -- call_phi_near
+ // [4] call main
jsr main
jmp __breturn
// __start::@return
@@ -289,7 +289,7 @@ __start: {
sta.z col2
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [4] call main -- call_phi_near
+ // [4] call main
jsr main
// __start::@return
// [5] return
diff --git a/src/test/ref/interrupt-volatile-reuse-problem2.log b/src/test/ref/interrupt-volatile-reuse-problem2.log
index 02cc05904..3922bcedf 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem2.log
+++ b/src/test/ref/interrupt-volatile-reuse-problem2.log
@@ -360,7 +360,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -567,7 +567,7 @@ __start: {
sta.z col1
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/irq-hardware-clobber-jsr.log b/src/test/ref/irq-hardware-clobber-jsr.log
index 879ac1b96..c4418d11e 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.log
+++ b/src/test/ref/irq-hardware-clobber-jsr.log
@@ -271,7 +271,7 @@ ASSEMBLER BEFORE OPTIMIZATION
irq: {
// interrupt(isr_hardware_clobber_entry) -- isr_hardware_all_entry
sta rega+1
- // [1] call do_irq -- call_phi_near
+ // [1] call do_irq
jsr do_irq
jmp __breturn
// irq::@return
@@ -455,7 +455,7 @@ irq: {
// interrupt(isr_hardware_clobber_entry) -- isr_hardware_all_entry
sta rega+1
// do_irq()
- // [1] call do_irq -- call_phi_near
+ // [1] call do_irq
jsr do_irq
// irq::@return
// }
diff --git a/src/test/ref/irq-idx-problem.log b/src/test/ref/irq-idx-problem.log
index b1e8a310d..2b82b1652 100644
--- a/src/test/ref/irq-idx-problem.log
+++ b/src/test/ref/irq-idx-problem.log
@@ -407,7 +407,7 @@ __start: {
jmp __b1
// __start::@1
__b1:
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
jmp __breturn
// __start::@return
@@ -649,7 +649,7 @@ __start: {
sta.z irq_idx
// [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
- // [3] call main -- call_phi_near
+ // [3] call main
jsr main
// __start::@return
// [4] return
diff --git a/src/test/ref/irq-local-var-overlap-problem.log b/src/test/ref/irq-local-var-overlap-problem.log
index d373a75d5..e6cb4199f 100644
--- a/src/test/ref/irq-local-var-overlap-problem.log
+++ b/src/test/ref/irq-local-var-overlap-problem.log
@@ -977,7 +977,7 @@ irq: {
// [6] *FGCOL = irq::$3 -- _deref_pbuc1=vbuaa
sta FGCOL
// [7] call sub_irq
- // [38] phi from irq::@3 to sub_irq [phi:irq::@3->sub_irq] -- call_phi_near
+ // [38] phi from irq::@3 to sub_irq [phi:irq::@3->sub_irq]
sub_irq_from___b3:
jsr sub_irq
jmp __b7
@@ -1096,7 +1096,7 @@ main: {
// [29] *FGCOL = main::$1 -- _deref_pbuc1=vbuaa
sta FGCOL
// [30] call sub_main
- // [52] phi from main::@3 to sub_main [phi:main::@3->sub_main] -- call_phi_near
+ // [52] phi from main::@3 to sub_main [phi:main::@3->sub_main]
sub_main_from___b3:
jsr sub_main
jmp __b6
@@ -1554,7 +1554,7 @@ irq: {
sta FGCOL
// sub_irq()
// [7] call sub_irq
- // [38] phi from irq::@3 to sub_irq [phi:irq::@3->sub_irq] -- call_phi_near
+ // [38] phi from irq::@3 to sub_irq [phi:irq::@3->sub_irq]
jsr sub_irq
// irq::@7
// for( byte k: 0..10 )
@@ -1667,7 +1667,7 @@ main: {
sta FGCOL
// sub_main()
// [30] call sub_main
- // [52] phi from main::@3 to sub_main [phi:main::@3->sub_main] -- call_phi_near
+ // [52] phi from main::@3 to sub_main [phi:main::@3->sub_main]
jsr sub_main
// main::@6
// for( byte k: 0..10 )
diff --git a/src/test/ref/keyboard-glitch.log b/src/test/ref/keyboard-glitch.log
index 81329ce03..4d3548707 100644
--- a/src/test/ref/keyboard-glitch.log
+++ b/src/test/ref/keyboard-glitch.log
@@ -670,7 +670,7 @@ main: {
// main::@1
__b1:
// [2] call menu
- // [3] phi from main::@1 to menu [phi:main::@1->menu] -- call_phi_near
+ // [3] phi from main::@1 to menu [phi:main::@1->menu]
menu_from___b1:
jsr menu
jmp __b1_from___b1
@@ -686,7 +686,7 @@ menu: {
// [5] call keyboard_key_pressed
// [27] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
keyboard_key_pressed_from___b1:
- // [27] phi keyboard_key_pressed::key#4 = KEY_C [phi:menu::@1->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_C [phi:menu::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_C
jsr keyboard_key_pressed
// [6] keyboard_key_pressed::return#2 = keyboard_key_pressed::return#0
@@ -702,7 +702,7 @@ menu: {
jmp __b5
// menu::@5
__b5:
- // [10] call pressed -- call_phi_near
+ // [10] call pressed
jsr pressed
jmp __breturn
// menu::@return
@@ -717,7 +717,7 @@ menu: {
// [13] call keyboard_key_pressed
// [27] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
keyboard_key_pressed_from___b2:
- // [27] phi keyboard_key_pressed::key#4 = KEY_I [phi:menu::@2->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_I [phi:menu::@2->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_I
jsr keyboard_key_pressed
// [14] keyboard_key_pressed::return#3 = keyboard_key_pressed::return#0
@@ -745,7 +745,7 @@ menu: {
// [20] call keyboard_key_pressed
// [27] phi from menu::@3 to keyboard_key_pressed [phi:menu::@3->keyboard_key_pressed]
keyboard_key_pressed_from___b3:
- // [27] phi keyboard_key_pressed::key#4 = KEY_E [phi:menu::@3->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_E [phi:menu::@3->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_E
jsr keyboard_key_pressed
// [21] keyboard_key_pressed::return#4 = keyboard_key_pressed::return#0
@@ -789,7 +789,7 @@ keyboard_key_pressed: {
lsr
// [30] keyboard_matrix_read::rowid#0 = keyboard_key_pressed::rowidx#0 -- vbuxx=vbuaa
tax
- // [31] call keyboard_matrix_read -- call_phi_near
+ // [31] call keyboard_matrix_read
jsr keyboard_matrix_read
// [32] keyboard_matrix_read::return#2 = keyboard_matrix_read::return#0
jmp __b1
@@ -817,7 +817,7 @@ pressed: {
// [38] call keyboard_key_pressed
// [27] phi from pressed::@1 to keyboard_key_pressed [phi:pressed::@1->keyboard_key_pressed]
keyboard_key_pressed_from___b1:
- // [27] phi keyboard_key_pressed::key#4 = KEY_SPACE [phi:pressed::@1->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_SPACE [phi:pressed::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_SPACE
jsr keyboard_key_pressed
// [39] keyboard_key_pressed::return#10 = keyboard_key_pressed::return#0
@@ -1043,7 +1043,7 @@ main: {
__b1:
// menu()
// [2] call menu
- // [3] phi from main::@1 to menu [phi:main::@1->menu] -- call_phi_near
+ // [3] phi from main::@1 to menu [phi:main::@1->menu]
jsr menu
jmp __b1
}
@@ -1055,7 +1055,7 @@ menu: {
// keyboard_key_pressed(KEY_C)
// [5] call keyboard_key_pressed
// [27] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
- // [27] phi keyboard_key_pressed::key#4 = KEY_C [phi:menu::@1->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_C [phi:menu::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_C
jsr keyboard_key_pressed
// keyboard_key_pressed(KEY_C)
@@ -1069,7 +1069,7 @@ menu: {
// [9] phi from menu::@8 to menu::@5 [phi:menu::@8->menu::@5]
// menu::@5
// pressed()
- // [10] call pressed -- call_phi_near
+ // [10] call pressed
jsr pressed
// menu::@return
// }
@@ -1081,7 +1081,7 @@ menu: {
// keyboard_key_pressed(KEY_I)
// [13] call keyboard_key_pressed
// [27] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
- // [27] phi keyboard_key_pressed::key#4 = KEY_I [phi:menu::@2->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_I [phi:menu::@2->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_I
jsr keyboard_key_pressed
// keyboard_key_pressed(KEY_I)
@@ -1107,7 +1107,7 @@ menu: {
// keyboard_key_pressed(KEY_E)
// [20] call keyboard_key_pressed
// [27] phi from menu::@3 to keyboard_key_pressed [phi:menu::@3->keyboard_key_pressed]
- // [27] phi keyboard_key_pressed::key#4 = KEY_E [phi:menu::@3->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_E [phi:menu::@3->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_E
jsr keyboard_key_pressed
// keyboard_key_pressed(KEY_E)
@@ -1155,7 +1155,7 @@ keyboard_key_pressed: {
// keyboard_matrix_read(rowidx)
// [30] keyboard_matrix_read::rowid#0 = keyboard_key_pressed::rowidx#0 -- vbuxx=vbuaa
tax
- // [31] call keyboard_matrix_read -- call_phi_near
+ // [31] call keyboard_matrix_read
jsr keyboard_matrix_read
// [32] keyboard_matrix_read::return#2 = keyboard_matrix_read::return#0
// keyboard_key_pressed::@1
@@ -1179,7 +1179,7 @@ pressed: {
// keyboard_key_pressed(KEY_SPACE)
// [38] call keyboard_key_pressed
// [27] phi from pressed::@1 to keyboard_key_pressed [phi:pressed::@1->keyboard_key_pressed]
- // [27] phi keyboard_key_pressed::key#4 = KEY_SPACE [phi:pressed::@1->keyboard_key_pressed#0] -- call_phi_near
+ // [27] phi keyboard_key_pressed::key#4 = KEY_SPACE [phi:pressed::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1
ldx #KEY_SPACE
jsr keyboard_key_pressed
// keyboard_key_pressed(KEY_SPACE)
diff --git a/src/test/ref/library-constructor-1.log b/src/test/ref/library-constructor-1.log
index 4b87ac3cb..0b755e7a0 100644
--- a/src/test/ref/library-constructor-1.log
+++ b/src/test/ref/library-constructor-1.log
@@ -177,7 +177,7 @@ __start: {
// [1] my_value = 0 -- vbuz1=vbuc1
lda #0
sta.z my_value
- // [2] call my_init -- call_phi_near
+ // [2] call my_init
jsr my_init
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
__b1_from___init1:
@@ -185,7 +185,7 @@ __start: {
// __start::@1
__b1:
// [4] call main
- // [8] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [8] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -207,7 +207,7 @@ my_init: {
}
// main
main: {
- // [9] call print -- call_phi_near
+ // [9] call print
jsr print
jmp __breturn
// main::@return
@@ -285,12 +285,12 @@ __start: {
lda #0
sta.z my_value
// #pragma constructor_for(my_init, print)
- // [2] call my_init -- call_phi_near
+ // [2] call my_init
jsr my_init
// [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1]
// __start::@1
// [4] call main
- // [8] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [8] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [5] return
@@ -310,7 +310,7 @@ my_init: {
// main
main: {
// print()
- // [9] call print -- call_phi_near
+ // [9] call print
jsr print
// main::@return
// }
diff --git a/src/test/ref/library-constructor-3.log b/src/test/ref/library-constructor-3.log
index 9319d815b..9e70da966 100644
--- a/src/test/ref/library-constructor-3.log
+++ b/src/test/ref/library-constructor-3.log
@@ -220,14 +220,14 @@ __start: {
sta.z SCREEN
lda #>0
sta.z SCREEN+1
- // [3] call init_1 -- call_phi_near
+ // [3] call init_1
jsr init_1
// [4] phi from __start::__init1 to __start::@2 [phi:__start::__init1->__start::@2]
__b2_from___init1:
jmp __b2
// __start::@2
__b2:
- // [5] call init_2 -- call_phi_near
+ // [5] call init_2
jsr init_2
// [6] phi from __start::@2 to __start::@1 [phi:__start::@2->__start::@1]
__b1_from___b2:
@@ -235,7 +235,7 @@ __start: {
// __start::@1
__b1:
// [7] call main
- // [13] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [13] phi from __start::@1 to main [phi:__start::@1->main]
main_from___b1:
jsr main
jmp __breturn
@@ -270,7 +270,7 @@ init_1: {
}
// main
main: {
- // [14] call print -- call_phi_near
+ // [14] call print
jsr print
jmp __breturn
// main::@return
@@ -363,17 +363,17 @@ __start: {
sta.z SCREEN
sta.z SCREEN+1
// #pragma constructor_for(init_1, print)
- // [3] call init_1 -- call_phi_near
+ // [3] call init_1
jsr init_1
// [4] phi from __start::__init1 to __start::@2 [phi:__start::__init1->__start::@2]
// __start::@2
// #pragma constructor_for(init_2, print)
- // [5] call init_2 -- call_phi_near
+ // [5] call init_2
jsr init_2
// [6] phi from __start::@2 to __start::@1 [phi:__start::@2->__start::@1]
// __start::@1
// [7] call main
- // [13] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near
+ // [13] phi from __start::@1 to main [phi:__start::@1->main]
jsr main
// __start::@return
// [8] return
@@ -406,7 +406,7 @@ init_1: {
// main
main: {
// print()
- // [14] call print -- call_phi_near
+ // [14] call print
jsr print
// main::@return
// }
diff --git a/src/test/ref/linegen.log b/src/test/ref/linegen.log
index 3862c529e..a5ce9bad7 100644
--- a/src/test/ref/linegen.log
+++ b/src/test/ref/linegen.log
@@ -2465,7 +2465,7 @@ main: {
sta.z lin16u_gen.min
lda #>$22d
sta.z lin16u_gen.min+1
- // [58] phi lin16u_gen::max#3 = $7461 [phi:main->lin16u_gen#2] -- call_phi_near
+ // [58] phi lin16u_gen::max#3 = $7461 [phi:main->lin16u_gen#2] -- vwuz1=vwuc1
lda #<$7461
sta.z lin16u_gen.max
lda #>$7461
@@ -2489,7 +2489,7 @@ main: {
sta.z lin16u_gen.min
lda #>$79cb
sta.z lin16u_gen.min+1
- // [58] phi lin16u_gen::max#3 = $f781 [phi:main::@4->lin16u_gen#2] -- call_phi_near
+ // [58] phi lin16u_gen::max#3 = $f781 [phi:main::@4->lin16u_gen#2] -- vwuz1=vwuc1
lda #<$f781
sta.z lin16u_gen.max
lda #>$f781
@@ -2513,7 +2513,7 @@ main: {
sta.z lin16u_gen.min
lda #>0
sta.z lin16u_gen.min+1
- // [58] phi lin16u_gen::max#3 = $6488 [phi:main::@5->lin16u_gen#2] -- call_phi_near
+ // [58] phi lin16u_gen::max#3 = $6488 [phi:main::@5->lin16u_gen#2] -- vwuz1=vwuc1
lda #<$6488
sta.z lin16u_gen.max
lda #>$6488
@@ -2525,7 +2525,7 @@ main: {
// main::@6
__b6:
// [7] call print_cls
- // [78] phi from main::@6 to print_cls [phi:main::@6->print_cls] -- call_phi_near
+ // [78] phi from main::@6 to print_cls [phi:main::@6->print_cls]
print_cls_from___b6:
jsr print_cls
// [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
@@ -2541,7 +2541,7 @@ main: {
sta.z print_char_cursor
lda #>print_screen
sta.z print_char_cursor+1
- // [81] phi print_str::str#13 = main::str [phi:main::@7->print_str#1] -- call_phi_near
+ // [81] phi print_str::str#13 = main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2555,7 +2555,7 @@ main: {
// [11] call print_uint
// [88] phi from main::@8 to print_uint [phi:main::@8->print_uint]
print_uint_from___b8:
- // [88] phi print_uint::w#10 = $22d [phi:main::@8->print_uint#0] -- call_phi_near
+ // [88] phi print_uint::w#10 = $22d [phi:main::@8->print_uint#0] -- vwuz1=vwuc1
lda #<$22d
sta.z print_uint.w
lda #>$22d
@@ -2570,7 +2570,7 @@ main: {
// [81] phi from main::@9 to print_str [phi:main::@9->print_str]
print_str_from___b9:
// [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@9->print_str#0] -- register_copy
- // [81] phi print_str::str#13 = main::str1 [phi:main::@9->print_str#1] -- call_phi_near
+ // [81] phi print_str::str#13 = main::str1 [phi:main::@9->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2584,7 +2584,7 @@ main: {
// [15] call print_uint
// [88] phi from main::@10 to print_uint [phi:main::@10->print_uint]
print_uint_from___b10:
- // [88] phi print_uint::w#10 = $79cb [phi:main::@10->print_uint#0] -- call_phi_near
+ // [88] phi print_uint::w#10 = $79cb [phi:main::@10->print_uint#0] -- vwuz1=vwuc1
lda #<$79cb
sta.z print_uint.w
lda #>$79cb
@@ -2599,7 +2599,7 @@ main: {
// [81] phi from main::@11 to print_str [phi:main::@11->print_str]
print_str_from___b11:
// [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@11->print_str#0] -- register_copy
- // [81] phi print_str::str#13 = main::str1 [phi:main::@11->print_str#1] -- call_phi_near
+ // [81] phi print_str::str#13 = main::str1 [phi:main::@11->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2613,7 +2613,7 @@ main: {
// [19] call print_uint
// [88] phi from main::@12 to print_uint [phi:main::@12->print_uint]
print_uint_from___b12:
- // [88] phi print_uint::w#10 = 0 [phi:main::@12->print_uint#0] -- call_phi_near
+ // [88] phi print_uint::w#10 = 0 [phi:main::@12->print_uint#0] -- vwuz1=vbuc1
lda #<0
sta.z print_uint.w
lda #>0
@@ -2627,7 +2627,7 @@ main: {
// [21] call print_ln
// [94] phi from main::@13 to print_ln [phi:main::@13->print_ln]
print_ln_from___b13:
- // [94] phi print_line_cursor#23 = print_screen#0 [phi:main::@13->print_ln#0] -- call_phi_near
+ // [94] phi print_line_cursor#23 = print_screen#0 [phi:main::@13->print_ln#0] -- pbuz1=pbuc1
lda #print_screen
@@ -2657,7 +2657,7 @@ main: {
// [81] phi from main::@3 to print_str [phi:main::@3->print_str]
print_str_from___b3:
// [81] phi print_char_cursor#89 = print_char_cursor#100 [phi:main::@3->print_str#0] -- register_copy
- // [81] phi print_str::str#13 = main::str [phi:main::@3->print_str#1] -- call_phi_near
+ // [81] phi print_str::str#13 = main::str [phi:main::@3->print_str#1] -- pbuz1=pbuc1
lda #str
@@ -2671,7 +2671,7 @@ main: {
// [27] call print_uint
// [88] phi from main::@22 to print_uint [phi:main::@22->print_uint]
print_uint_from___b22:
- // [88] phi print_uint::w#10 = $7461 [phi:main::@22->print_uint#0] -- call_phi_near
+ // [88] phi print_uint::w#10 = $7461 [phi:main::@22->print_uint#0] -- vwuz1=vwuc1
lda #<$7461
sta.z print_uint.w
lda #>$7461
@@ -2686,7 +2686,7 @@ main: {
// [81] phi from main::@23 to print_str [phi:main::@23->print_str]
print_str_from___b23:
// [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@23->print_str#0] -- register_copy
- // [81] phi print_str::str#13 = main::str1 [phi:main::@23->print_str#1] -- call_phi_near
+ // [81] phi print_str::str#13 = main::str1 [phi:main::@23->print_str#1] -- pbuz1=pbuc1
lda #str1
@@ -2700,7 +2700,7 @@ main: {
// [31] call print_uint
// [88] phi from main::@24 to print_uint [phi:main::@24->print_uint]
print_uint_from___b24:
- // [88] phi print_uint::w#10 = $f781 [phi:main::@24->print_uint#0] -- call_phi_near
+ // [88] phi print_uint::w#10 = $f781 [phi:main::@24->print_uint#0] -- vwuz1=vwuc1
lda #<$f781
sta.z print_uint.w
lda #>$f781
@@ -2715,7 +2715,7 @@ main: {
// [81] phi from main::@25 to print_str [phi:main::@25->print_str]
print_str_from___b25:
// [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@25->print_str#0] -- register_copy
- // [81] phi print_str::str#13 = main::str1 [phi:main::@25->print_str#1] -- call_phi_near
+ // [81] phi print_str::str#13 = main::str1 [phi:main::@25->print_str#1] -- pbuz1=pbuc1
lda #