From 291ce871c45d9f7c892e293c6622e8e49fc446ac Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Sun, 23 Apr 2023 11:54:47 +0200 Subject: [PATCH] Working on far call merge. --- .../call_phi_close_cx16_ram.asm | 2 +- .../call_phi_close_cx16_rom.asm | 3 +- .../mos6502-common/call_phi_far_cx16_ram.asm | 2 +- .../mos6502-common/call_phi_far_cx16_rom.asm | 2 +- .../fragment/mos6502-common/call_phi_near.asm | 2 +- .../AsmFragmentInstanceSpecBuilder.java | 2 +- .../dk/camelot64/kickc/model/Directive.java | 10 +- .../dk/camelot64/kickc/model/Program.java | 8 +- .../kickc/model/{ => symbols}/Bank.java | 39 +- .../kickc/model/symbols/Procedure.java | 73 ++-- .../camelot64/kickc/model/symbols/Scope.java | 2 - .../dk/camelot64/kickc/parser/CParser.java | 4 +- .../Pass0GenerateStatementSequence.java | 42 +-- .../kickc/passes/Pass4CodeGeneration.java | 42 +-- src/test/ref/address-0.log | 4 +- src/test/ref/address-2.log | 4 +- src/test/ref/address-5.log | 16 +- src/test/ref/address-6.log | 16 +- src/test/ref/address-of-1.log | 12 +- src/test/ref/address-of-2.log | 12 +- src/test/ref/address-of-3.log | 12 +- src/test/ref/array-16bit-lookup.log | 4 +- src/test/ref/asm-mnemonic-names.log | 4 +- src/test/ref/assignment-compound.log | 44 +-- src/test/ref/atarixl-md5b.log | 16 +- src/test/ref/bitmap-circle-2.log | 44 +-- src/test/ref/bitmap-circle.log | 44 +-- src/test/ref/bitmap-line-anim-1.log | 56 +-- src/test/ref/bitmap-line-anim-2.log | 52 +-- src/test/ref/bitmap-plot-0.log | 28 +- src/test/ref/bitmap-plot-3.log | 52 +-- src/test/ref/bitmap-plotter.log | 16 +- src/test/ref/bool-const.log | 12 +- src/test/ref/bool-function.log | 4 +- src/test/ref/bool-ifs.log | 16 +- src/test/ref/bool-vars.log | 16 +- src/test/ref/c-types.log | 196 +++++------ src/test/ref/c64dtv-8bppcharstretch.log | 20 +- src/test/ref/c64dtv-8bppchunkystretch.log | 16 +- .../ref/call-banked-phi-case-1-near-0.log | 4 +- .../ref/call-banked-phi-case-1-near-1.log | 8 +- .../ref/call-banked-phi-case-2-close-0.asm | 2 +- .../ref/call-banked-phi-case-2-close-0.log | 4 +- .../ref/call-banked-phi-case-2-close-1.asm | 2 +- .../ref/call-banked-phi-case-2-close-1.log | 4 +- .../ref/call-banked-phi-case-3-near-0.asm | 2 +- .../ref/call-banked-phi-case-3-near-0.log | 8 +- .../ref/call-banked-phi-case-3-near-1.asm | 3 +- .../ref/call-banked-phi-case-3-near-1.cfg | 2 +- .../ref/call-banked-phi-case-3-near-1.log | 20 +- .../ref/call-banked-phi-case-3-near-1.sym | 2 +- .../ref/call-banked-phi-case-4-near-0.asm | 4 +- .../ref/call-banked-phi-case-4-near-0.log | 12 +- .../ref/call-banked-phi-case-4-near-1.asm | 4 +- .../ref/call-banked-phi-case-4-near-1.log | 12 +- src/test/ref/call-banked-phi-case-5-far-0.asm | 4 +- src/test/ref/call-banked-phi-case-5-far-0.log | 8 +- src/test/ref/call-banked-phi-case-5-far-1.asm | 4 +- src/test/ref/call-banked-phi-case-5-far-1.log | 8 +- .../ref/call-banked-phi-case-6-close-0.asm | 4 +- .../ref/call-banked-phi-case-6-close-0.log | 8 +- .../ref/call-banked-phi-case-6-close-1.asm | 4 +- .../ref/call-banked-phi-case-6-close-1.log | 8 +- src/test/ref/call-parameter-autocast.log | 12 +- src/test/ref/callconstparam.log | 8 +- src/test/ref/casting-negative.log | 72 ++-- src/test/ref/casting.log | 4 +- src/test/ref/cbm-keyboard.log | 92 ++--- src/test/ref/cia-timer-cyclecount.log | 36 +- src/test/ref/cia-timer-simple.log | 36 +- src/test/ref/clobber-a-problem.log | 4 +- src/test/ref/complex/includes/includes-1.log | 4 +- src/test/ref/complex/includes/includes-2.log | 4 +- src/test/ref/complex/xmega65/xmega65.log | 8 +- src/test/ref/const-bool-return-problem.log | 8 +- src/test/ref/const-early-identification.log | 8 +- src/test/ref/const-identification.log | 8 +- src/test/ref/const-param.log | 12 +- src/test/ref/const-volatile-problem.log | 4 +- src/test/ref/constants.log | 92 ++--- src/test/ref/constref-not-literal-problem.log | 4 +- src/test/ref/cordic-atan2-16.log | 8 +- src/test/ref/cordic-atan2-clear.log | 12 +- src/test/ref/cordic-atan2.log | 8 +- src/test/ref/cstyle-decl-function.log | 8 +- src/test/ref/declared-memory-var-6.log | 40 +-- src/test/ref/declared-memory-var-7.log | 4 +- src/test/ref/declared-memory-var-8.log | 4 +- src/test/ref/declared-ssa-var-0.log | 4 +- src/test/ref/default-font.log | 4 +- src/test/ref/deref-to-derefidx-2.log | 8 +- src/test/ref/deref-to-derefidx.log | 8 +- src/test/ref/ducks-array.log | 20 +- src/test/ref/ducks-loop211.log | 4 +- src/test/ref/ducks-total.log | 332 +++++++++--------- src/test/ref/emptyblock-error.log | 8 +- src/test/ref/enum-5.log | 4 +- src/test/ref/euclid-3.log | 68 ++-- src/test/ref/euclid-problem-2.log | 16 +- .../examples/atari2600/atari2600-sprites.log | 4 +- src/test/ref/examples/c64/3d/perspective.log | 96 ++--- .../c64/bresenham/bitmap-bresenham.log | 60 ++-- .../c64/crunching/test-byteboozer.log | 4 +- .../c64/fastmultiply/fastmultiply8.log | 48 +-- src/test/ref/examples/c64/fire/fire.log | 28 +- .../ref/examples/c64/font-2x2/font-2x2.log | 20 +- .../examples/c64/kernalload/kernalload.log | 24 +- .../ref/examples/c64/krillload/krillload.log | 8 +- src/test/ref/examples/c64/linking/linking.log | 4 +- .../c64/multiplexer/simple-multiplexer.log | 24 +- .../examples/c64/nmisamples/nmisamples.log | 4 +- .../examples/c64/rasterbars/raster-bars.log | 4 +- src/test/ref/examples/c64/scroll/scroll.log | 4 +- .../ref/examples/c64/scrollbig/scrollbig.log | 20 +- .../ref/examples/c64/showlogo/showlogo.log | 8 +- src/test/ref/examples/c64/zpcode/zpcode.log | 8 +- .../ref/examples/cx16/cx16-rasterbars.log | 8 +- .../ref/examples/helloworld/helloworld.log | 44 +-- .../mega65/32bit-addressing-mega65.log | 4 +- src/test/ref/examples/mega65/banked-music.log | 28 +- .../ref/examples/mega65/camelot-1536dots.log | 44 +-- src/test/ref/examples/mega65/dma-test.log | 4 +- src/test/ref/examples/mega65/dma-test2.log | 8 +- src/test/ref/examples/mega65/dma-test3.log | 8 +- src/test/ref/examples/mega65/dma-test4.log | 8 +- src/test/ref/examples/mega65/dma-test5.log | 8 +- src/test/ref/examples/mega65/dma-test6.log | 8 +- src/test/ref/examples/mega65/dypp65.log | 16 +- .../ref/examples/mega65/helloworld-mega65.log | 48 +-- .../ref/examples/mega65/memorymap-test.log | 24 +- src/test/ref/examples/mega65/raster65.log | 8 +- src/test/ref/examples/nes/nes-dxycp.log | 20 +- .../ref/examples/plus4/plus4-randomwalk.log | 16 +- src/test/ref/examples/rom/rom.log | 16 +- src/test/ref/flipper-rex2.log | 12 +- src/test/ref/font-hex-show.log | 4 +- src/test/ref/fragment-synth.log | 8 +- src/test/ref/fragment-variations.log | 8 +- src/test/ref/function-pointer-advanced-1.log | 72 ++-- .../ref/function-pointer-noarg-call-10.log | 20 +- .../ref/function-pointer-noarg-call-13.log | 8 +- .../ref/function-pointer-noarg-call-14.log | 56 +-- .../ref/function-pointer-noarg-call-3.log | 4 +- .../ref/function-pointer-noarg-call-7.log | 8 +- .../ref/function-pointer-noarg-call-8.log | 12 +- .../ref/function-pointer-noarg-call-9.log | 4 +- .../ref/function-pointer-param-workaround.log | 4 +- src/test/ref/function-pointer-problem-1.log | 4 +- src/test/ref/function-pointer-return-2.log | 8 +- src/test/ref/function-pointer-return-3.log | 4 +- src/test/ref/global-label-problem.log | 20 +- src/test/ref/global-pc-multiple.log | 4 +- src/test/ref/helloworld2.log | 8 +- src/test/ref/hex2dec-ptrptr.log | 40 +-- src/test/ref/hex2dec.log | 44 +-- src/test/ref/incrementinarray.log | 20 +- src/test/ref/init-value-npe.log | 4 +- src/test/ref/init-volatiles.log | 4 +- src/test/ref/inline-asm-ref-scoped.log | 4 +- src/test/ref/inline-asm-uses-1.log | 4 +- src/test/ref/inline-kickasm-uses-problem.log | 4 +- src/test/ref/inline-pointer-1.log | 8 +- src/test/ref/inline-string-2.log | 12 +- src/test/ref/inline-string-4.log | 4 +- src/test/ref/inline-string.log | 12 +- src/test/ref/int-conversion.log | 176 +++++----- src/test/ref/int-literals.log | 68 ++-- src/test/ref/intermediates-simple.log | 4 +- src/test/ref/intermediates-struct.log | 8 +- .../ref/interrupt-volatile-reuse-problem1.log | 4 +- .../ref/interrupt-volatile-reuse-problem2.log | 4 +- src/test/ref/irq-hardware-clobber-jsr.log | 4 +- src/test/ref/irq-idx-problem.log | 4 +- .../ref/irq-local-var-overlap-problem.log | 8 +- src/test/ref/keyboard-glitch.log | 28 +- src/test/ref/library-constructor-1.log | 12 +- src/test/ref/library-constructor-3.log | 16 +- src/test/ref/linegen.log | 136 +++---- src/test/ref/literal-word-pointer-0.log | 4 +- src/test/ref/literal-word-pointer-1.log | 4 +- src/test/ref/liverange-1.log | 8 +- src/test/ref/liverange-10.log | 32 +- src/test/ref/liverange-2.log | 4 +- src/test/ref/liverange-3.log | 4 +- src/test/ref/liverange-4.log | 8 +- src/test/ref/liverange-5.log | 8 +- src/test/ref/liverange-6.log | 4 +- src/test/ref/liverange-7.log | 8 +- src/test/ref/liverange-8.log | 12 +- src/test/ref/liverange-9.log | 20 +- src/test/ref/liverange-call-problem.log | 16 +- src/test/ref/liverange-problem-0.log | 12 +- src/test/ref/liverange.log | 8 +- src/test/ref/longbranch-interrupt-problem.log | 4 +- src/test/ref/longjump2.log | 8 +- src/test/ref/loop-memset-min.log | 4 +- src/test/ref/loop-problem.log | 12 +- src/test/ref/loop-problem2.log | 8 +- src/test/ref/loophead-problem-2.log | 4 +- src/test/ref/loophead-problem-3.log | 4 +- src/test/ref/loophead-problem.log | 4 +- src/test/ref/loopnest.log | 4 +- src/test/ref/loopnest2.log | 8 +- src/test/ref/loopnest3.log | 8 +- src/test/ref/malloc-0.log | 8 +- src/test/ref/malloc-1.log | 8 +- src/test/ref/memcpy-0.log | 8 +- src/test/ref/memcpy-1.log | 8 +- src/test/ref/memory-heap.log | 8 +- .../ref/millfork-benchmarks/linkedlist-kc.log | 56 +-- .../ref/millfork-benchmarks/plasma-kc.log | 56 +-- .../ref/millfork-benchmarks/romsum-kc.log | 68 ++-- src/test/ref/millfork-benchmarks/sieve-kc.log | 80 ++--- src/test/ref/min-fmul-16.log | 36 +- src/test/ref/missing-band.log | 4 +- src/test/ref/modglobal.log | 8 +- src/test/ref/modglobalmin.log | 8 +- src/test/ref/mul8u-min.log | 4 +- .../simple-multiplexer-irq.log | 24 +- src/test/ref/multiply-16bit-const.log | 32 +- src/test/ref/nes-array.log | 8 +- src/test/ref/nomodify-3.log | 4 +- src/test/ref/nomodify-4.log | 8 +- src/test/ref/norom-charset.log | 4 +- src/test/ref/null-constant-1.log | 8 +- src/test/ref/number-conversion.log | 140 ++++---- src/test/ref/number-ternary-fail-2.log | 8 +- src/test/ref/number-type.log | 8 +- src/test/ref/overlap-allocation-2.log | 16 +- src/test/ref/overlap-allocation.log | 12 +- src/test/ref/plus-0.log | 8 +- src/test/ref/plus4-kbhit.log | 4 +- src/test/ref/plus4-keyboard-test.log | 4 +- src/test/ref/pointer-plus-0.log | 8 +- src/test/ref/pointer-pointer-2.log | 4 +- src/test/ref/pointer-pointer-3.log | 12 +- src/test/ref/pointer-swap.log | 20 +- src/test/ref/pointer-void-1.log | 12 +- src/test/ref/pointer-void-2.log | 12 +- src/test/ref/pointer-void-3.log | 8 +- src/test/ref/post-increment-problem-2.log | 4 +- src/test/ref/pragma-noparam-noparen.log | 1 - src/test/ref/pragma-noparenthesis.log | 8 +- src/test/ref/primes-1000-2.log | 40 +-- src/test/ref/print-problem.log | 12 +- src/test/ref/printf-1.log | 88 ++--- src/test/ref/printf-10.log | 16 +- src/test/ref/printf-11.log | 12 +- src/test/ref/printf-12.log | 232 ++++++------ src/test/ref/printf-14.log | 64 ++-- src/test/ref/printf-15.log | 52 +-- src/test/ref/printf-17.log | 136 +++---- src/test/ref/printf-18.log | 84 ++--- src/test/ref/printf-19.log | 148 ++++---- src/test/ref/printmsg.log | 28 +- src/test/ref/problem-ma-var-overwrite.log | 8 +- src/test/ref/problem-negate-const.log | 4 +- .../ref/problem-struct-inline-parameter-1.log | 4 +- .../ref/problem-struct-inline-parameter.log | 4 +- .../procedure-callingconvention-stack-4.log | 4 +- .../procedure-callingconvention-stack-5.log | 4 +- src/test/ref/procedure-declare-10.log | 4 +- src/test/ref/procedure-declare-2.log | 8 +- src/test/ref/procedure-declare-3.log | 8 +- src/test/ref/procedure-declare-4.log | 8 +- src/test/ref/procedure-declare-5.log | 4 +- src/test/ref/processor-port-test.log | 188 +++++----- src/test/ref/ptrptr-optimize-1.log | 8 +- src/test/ref/ptrptr-optimize-2.log | 8 +- src/test/ref/ptrtest.log | 16 +- src/test/ref/register-0.log | 16 +- src/test/ref/reserve-zp-global-range.log | 4 +- src/test/ref/reserve-zp-global.log | 4 +- src/test/ref/reserve-zp-procedure-1.log | 4 +- src/test/ref/reserve-zp-procedure-2.log | 8 +- src/test/ref/reserve-zp-procedure-3.log | 4 +- src/test/ref/reserve-zp-procedure-4.log | 4 +- src/test/ref/robozzle64-label-problem.log | 8 +- src/test/ref/roll-sprite-msb.log | 4 +- src/test/ref/scan-desire-problem.log | 24 +- src/test/ref/scrollbig-clobber.log | 4 +- src/test/ref/semi-struct-1.log | 44 +-- src/test/ref/sepa-optimize-problem-1.log | 24 +- src/test/ref/sieve-min.log | 28 +- src/test/ref/signed-char-comparison.log | 4 +- src/test/ref/signed-indexed-subtract.log | 56 +-- src/test/ref/signed-words.log | 8 +- src/test/ref/sinus-basic.log | 72 ++-- src/test/ref/sinusgen16.log | 96 ++--- src/test/ref/sqr-delta.log | 4 +- src/test/ref/stack-relative-addressing.log | 4 +- src/test/ref/stars-2.log | 76 ++-- src/test/ref/static-init-code-0.log | 4 +- src/test/ref/strcmp-0.log | 244 ++++++------- src/test/ref/strcpy-0.log | 8 +- .../ref/string-const-consolidation-noroot.log | 12 +- .../ref/string-const-consolidation-root.log | 32 +- src/test/ref/string-const-consolidation.log | 12 +- src/test/ref/string-escapes-2.log | 4 +- src/test/ref/string-escapes-4.log | 4 +- src/test/ref/string-pointer-problem.log | 4 +- src/test/ref/strip.log | 16 +- src/test/ref/strncat-0.log | 12 +- src/test/ref/struct-11.log | 8 +- src/test/ref/struct-11b.log | 8 +- src/test/ref/struct-12.log | 8 +- src/test/ref/struct-22.log | 8 +- src/test/ref/struct-23.log | 8 +- src/test/ref/struct-3.log | 8 +- src/test/ref/struct-44.log | 76 ++-- src/test/ref/struct-5.log | 4 +- src/test/ref/struct-pointer-ints.log | 4 +- src/test/ref/struct-ptr-14.log | 4 +- src/test/ref/struct-ptr-16.log | 8 +- src/test/ref/struct-ptr-17.log | 8 +- src/test/ref/struct-ptr-18.log | 4 +- src/test/ref/struct-ptr-19.log | 8 +- src/test/ref/struct-ptr-22.log | 44 +-- src/test/ref/struct-ptr-23.log | 8 +- src/test/ref/struct-ptr-24.log | 4 +- src/test/ref/struct-ptr-26.log | 20 +- src/test/ref/struct-ptr-28.log | 8 +- src/test/ref/struct-ptr-29.log | 8 +- src/test/ref/struct-ptr-30.log | 4 +- src/test/ref/struct-ptr-31.log | 8 +- src/test/ref/struct-ptr-34.log | 8 +- src/test/ref/struct-unwinding-2.log | 16 +- src/test/ref/summin.log | 12 +- src/test/ref/ternary-3.log | 12 +- src/test/ref/test-comments-block.log | 4 +- src/test/ref/test-comments-global.log | 4 +- src/test/ref/test-comments-single.log | 4 +- src/test/ref/test-comparisons-sword.log | 64 ++-- src/test/ref/test-comparisons-word.log | 56 +-- .../ref/test-interrupt-volatile-write.log | 4 +- src/test/ref/test-interrupt-volatile.log | 4 +- src/test/ref/test-keyboard-space.log | 12 +- src/test/ref/test-keyboard.log | 20 +- src/test/ref/test-lowhigh.log | 88 ++--- src/test/ref/test-scroll-up.log | 12 +- src/test/ref/test-signed-word-minus-byte.log | 52 +-- src/test/ref/tod-1.log | 64 ++-- src/test/ref/toupper-1.log | 60 ++-- src/test/ref/travis1.log | 24 +- src/test/ref/typedef-2.log | 4 +- src/test/ref/typedef-4.log | 4 +- src/test/ref/typeid-plus-bytes.log | 16 +- src/test/ref/union-7.log | 8 +- src/test/ref/union-8.log | 8 +- src/test/ref/var-register-zp-3.log | 12 +- src/test/ref/var-register.log | 4 +- src/test/ref/varmodel-ma_mem-3.log | 8 +- src/test/ref/varmodel-mem-1.log | 8 +- src/test/ref/void-parameter.log | 12 +- src/test/ref/volatile-0.log | 4 +- src/test/ref/volatile-2.log | 4 +- src/test/ref/voronoi.log | 16 +- src/test/ref/weeip-bbslist.log | 84 ++--- src/test/ref/weeip-checksum.log | 12 +- src/test/ref/wfragment1.log | 4 +- src/test/ref/zeropage-sinus.log | 16 +- src/test/ref/zp-reserve-coalesce-problem.log | 8 +- src/test/ref/zpparammin.log | 8 +- 363 files changed, 3814 insertions(+), 3869 deletions(-) rename src/main/java/dk/camelot64/kickc/model/{ => symbols}/Bank.java (89%) 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 #str1 @@ -2729,7 +2729,7 @@ main: { // [35] call print_uint // [88] phi from main::@26 to print_uint [phi:main::@26->print_uint] print_uint_from___b26: - // [88] phi print_uint::w#10 = $6488 [phi:main::@26->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = $6488 [phi:main::@26->print_uint#0] -- vwuz1=vwuc1 lda #<$6488 sta.z print_uint.w lda #>$6488 @@ -2743,7 +2743,7 @@ main: { // [37] call print_ln // [94] phi from main::@27 to print_ln [phi:main::@27->print_ln] print_ln_from___b27: - // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@27->print_ln#0] -- call_phi_near + // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@27->print_ln#0] -- register_copy jsr print_ln jmp __breturn // main::@return @@ -2763,7 +2763,7 @@ main: { // [99] phi from main::@2 to print_uchar [phi:main::@2->print_uchar] print_uchar_from___b2: // [99] phi print_char_cursor#84 = print_char_cursor#104 [phi:main::@2->print_uchar#0] -- register_copy - // [99] phi print_uchar::b#3 = print_uchar::b#2 [phi:main::@2->print_uchar#1] -- call_phi_near + // [99] phi print_uchar::b#3 = print_uchar::b#2 [phi:main::@2->print_uchar#1] -- register_copy jsr print_uchar // [42] phi from main::@2 to main::@14 [phi:main::@2->main::@14] __b14_from___b2: @@ -2774,7 +2774,7 @@ main: { // [81] phi from main::@14 to print_str [phi:main::@14->print_str] print_str_from___b14: // [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@14->print_str#0] -- register_copy - // [81] phi print_str::str#13 = main::str1 [phi:main::@14->print_str#1] -- call_phi_near + // [81] phi print_str::str#13 = main::str1 [phi:main::@14->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -2796,7 +2796,7 @@ main: { // [46] call print_uint // [88] phi from main::@15 to print_uint [phi:main::@15->print_uint] print_uint_from___b15: - // [88] phi print_uint::w#10 = print_uint::w#3 [phi:main::@15->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = print_uint::w#3 [phi:main::@15->print_uint#0] -- register_copy jsr print_uint // [47] phi from main::@15 to main::@16 [phi:main::@15->main::@16] __b16_from___b15: @@ -2807,7 +2807,7 @@ main: { // [81] phi from main::@16 to print_str [phi:main::@16->print_str] print_str_from___b16: // [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@16->print_str#0] -- register_copy - // [81] phi print_str::str#13 = main::str1 [phi:main::@16->print_str#1] -- call_phi_near + // [81] phi print_str::str#13 = main::str1 [phi:main::@16->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -2825,7 +2825,7 @@ main: { // [50] call print_uint // [88] phi from main::@17 to print_uint [phi:main::@17->print_uint] print_uint_from___b17: - // [88] phi print_uint::w#10 = print_uint::w#4 [phi:main::@17->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = print_uint::w#4 [phi:main::@17->print_uint#0] -- register_copy jsr print_uint // [51] phi from main::@17 to main::@18 [phi:main::@17->main::@18] __b18_from___b17: @@ -2836,7 +2836,7 @@ main: { // [81] phi from main::@18 to print_str [phi:main::@18->print_str] print_str_from___b18: // [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@18->print_str#0] -- register_copy - // [81] phi print_str::str#13 = main::str1 [phi:main::@18->print_str#1] -- call_phi_near + // [81] phi print_str::str#13 = main::str1 [phi:main::@18->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -2854,7 +2854,7 @@ main: { // [54] call print_uint // [88] phi from main::@19 to print_uint [phi:main::@19->print_uint] print_uint_from___b19: - // [88] phi print_uint::w#10 = print_uint::w#5 [phi:main::@19->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = print_uint::w#5 [phi:main::@19->print_uint#0] -- register_copy jsr print_uint // [55] phi from main::@19 to main::@20 [phi:main::@19->main::@20] __b20_from___b19: @@ -2864,7 +2864,7 @@ main: { // [56] call print_ln // [94] phi from main::@20 to print_ln [phi:main::@20->print_ln] print_ln_from___b20: - // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@20->print_ln#0] -- call_phi_near + // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@20->print_ln#0] -- register_copy jsr print_ln jmp __b21 // main::@21 @@ -2914,7 +2914,7 @@ lin16u_gen: { // [107] phi from lin16u_gen to divr16u [phi:lin16u_gen->divr16u] divr16u_from_lin16u_gen: // [107] phi divr16u::dividend#5 = divr16u::dividend#1 [phi:lin16u_gen->divr16u#0] -- register_copy - // [107] phi divr16u::rem#10 = 0 [phi:lin16u_gen->divr16u#1] -- call_phi_near + // [107] phi divr16u::rem#10 = 0 [phi:lin16u_gen->divr16u#1] -- vwuz1=vbuc1 lda #<0 sta.z divr16u.rem lda #>0 @@ -2938,7 +2938,7 @@ lin16u_gen: { sta.z divr16u.dividend lda #>0 sta.z divr16u.dividend+1 - // [107] phi divr16u::rem#10 = divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#1] -- call_phi_near + // [107] phi divr16u::rem#10 = divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#1] -- register_copy jsr divr16u // [66] divr16u::return#3 = divr16u::return#0 jmp __b4 @@ -3039,7 +3039,7 @@ lin16u_gen: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [79] call memset - // [125] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [125] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -3080,7 +3080,7 @@ print_str: { // [131] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [131] phi print_char_cursor#51 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [131] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [131] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -3103,7 +3103,7 @@ print_uint: { // [99] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [99] phi print_char_cursor#84 = print_char_cursor#1 [phi:print_uint->print_uchar#0] -- register_copy - // [99] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [99] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -3114,7 +3114,7 @@ print_uint: { // [99] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [99] phi print_char_cursor#84 = print_char_cursor#10 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [99] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [99] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -3173,7 +3173,7 @@ print_uchar: { // [131] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [131] phi print_char_cursor#51 = print_char_cursor#84 [phi:print_uchar->print_char#0] -- register_copy - // [131] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [131] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -3187,7 +3187,7 @@ print_uchar: { // [131] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [131] phi print_char_cursor#51 = print_char_cursor#10 [phi:print_uchar::@1->print_char#0] -- register_copy - // [131] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [131] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -3755,7 +3755,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 @@ -3776,7 +3776,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 @@ -3796,7 +3796,7 @@ main: { lda #<0 sta.z lin16u_gen.min 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 @@ -3806,7 +3806,7 @@ main: { // main::@6 // print_cls() // [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] jsr print_cls // [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7] // main::@7 @@ -3818,7 +3818,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 @@ -3829,7 +3829,7 @@ main: { // print_uint(557) // [11] call print_uint // [88] phi from main::@8 to print_uint [phi:main::@8->print_uint] - // [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 @@ -3841,7 +3841,7 @@ main: { // [13] call print_str // [81] phi from main::@9 to print_str [phi:main::@9->print_str] // [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 @@ -3852,7 +3852,7 @@ main: { // print_uint(31179) // [15] call print_uint // [88] phi from main::@10 to print_uint [phi:main::@10->print_uint] - // [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 @@ -3864,7 +3864,7 @@ main: { // [17] call print_str // [81] phi from main::@11 to print_str [phi:main::@11->print_str] // [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 @@ -3875,7 +3875,7 @@ main: { // print_uint(0) // [19] call print_uint // [88] phi from main::@12 to print_uint [phi:main::@12->print_uint] - // [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 sta.z print_uint.w+1 @@ -3885,7 +3885,7 @@ main: { // print_ln() // [21] call print_ln // [94] phi from main::@13 to print_ln [phi:main::@13->print_ln] - // [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 @@ -3912,7 +3912,7 @@ main: { // [25] call print_str // [81] phi from main::@3 to print_str [phi:main::@3->print_str] // [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 @@ -3923,7 +3923,7 @@ main: { // print_uint(29793) // [27] call print_uint // [88] phi from main::@22 to print_uint [phi:main::@22->print_uint] - // [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 @@ -3935,7 +3935,7 @@ main: { // [29] call print_str // [81] phi from main::@23 to print_str [phi:main::@23->print_str] // [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 @@ -3946,7 +3946,7 @@ main: { // print_uint(63361) // [31] call print_uint // [88] phi from main::@24 to print_uint [phi:main::@24->print_uint] - // [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 @@ -3958,7 +3958,7 @@ main: { // [33] call print_str // [81] phi from main::@25 to print_str [phi:main::@25->print_str] // [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 #str1 @@ -3969,7 +3969,7 @@ main: { // print_uint($6488) // [35] call print_uint // [88] phi from main::@26 to print_uint [phi:main::@26->print_uint] - // [88] phi print_uint::w#10 = $6488 [phi:main::@26->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = $6488 [phi:main::@26->print_uint#0] -- vwuz1=vwuc1 lda #<$6488 sta.z print_uint.w lda #>$6488 @@ -3980,7 +3980,7 @@ main: { // print_ln() // [37] call print_ln // [94] phi from main::@27 to print_ln [phi:main::@27->print_ln] - // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@27->print_ln#0] -- call_phi_near + // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@27->print_ln#0] -- register_copy jsr print_ln // main::@return // } @@ -4000,7 +4000,7 @@ main: { // [41] call print_uchar // [99] phi from main::@2 to print_uchar [phi:main::@2->print_uchar] // [99] phi print_char_cursor#84 = print_char_cursor#104 [phi:main::@2->print_uchar#0] -- register_copy - // [99] phi print_uchar::b#3 = print_uchar::b#2 [phi:main::@2->print_uchar#1] -- call_phi_near + // [99] phi print_uchar::b#3 = print_uchar::b#2 [phi:main::@2->print_uchar#1] -- register_copy jsr print_uchar // [42] phi from main::@2 to main::@14 [phi:main::@2->main::@14] // main::@14 @@ -4008,7 +4008,7 @@ main: { // [43] call print_str // [81] phi from main::@14 to print_str [phi:main::@14->print_str] // [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@14->print_str#0] -- register_copy - // [81] phi print_str::str#13 = main::str1 [phi:main::@14->print_str#1] -- call_phi_near + // [81] phi print_str::str#13 = main::str1 [phi:main::@14->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -4028,7 +4028,7 @@ main: { sta.z print_uint.w+1 // [46] call print_uint // [88] phi from main::@15 to print_uint [phi:main::@15->print_uint] - // [88] phi print_uint::w#10 = print_uint::w#3 [phi:main::@15->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = print_uint::w#3 [phi:main::@15->print_uint#0] -- register_copy jsr print_uint // [47] phi from main::@15 to main::@16 [phi:main::@15->main::@16] // main::@16 @@ -4036,7 +4036,7 @@ main: { // [48] call print_str // [81] phi from main::@16 to print_str [phi:main::@16->print_str] // [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@16->print_str#0] -- register_copy - // [81] phi print_str::str#13 = main::str1 [phi:main::@16->print_str#1] -- call_phi_near + // [81] phi print_str::str#13 = main::str1 [phi:main::@16->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -4052,7 +4052,7 @@ main: { sta.z print_uint.w+1 // [50] call print_uint // [88] phi from main::@17 to print_uint [phi:main::@17->print_uint] - // [88] phi print_uint::w#10 = print_uint::w#4 [phi:main::@17->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = print_uint::w#4 [phi:main::@17->print_uint#0] -- register_copy jsr print_uint // [51] phi from main::@17 to main::@18 [phi:main::@17->main::@18] // main::@18 @@ -4060,7 +4060,7 @@ main: { // [52] call print_str // [81] phi from main::@18 to print_str [phi:main::@18->print_str] // [81] phi print_char_cursor#89 = print_char_cursor#10 [phi:main::@18->print_str#0] -- register_copy - // [81] phi print_str::str#13 = main::str1 [phi:main::@18->print_str#1] -- call_phi_near + // [81] phi print_str::str#13 = main::str1 [phi:main::@18->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -4076,14 +4076,14 @@ main: { sta.z print_uint.w+1 // [54] call print_uint // [88] phi from main::@19 to print_uint [phi:main::@19->print_uint] - // [88] phi print_uint::w#10 = print_uint::w#5 [phi:main::@19->print_uint#0] -- call_phi_near + // [88] phi print_uint::w#10 = print_uint::w#5 [phi:main::@19->print_uint#0] -- register_copy jsr print_uint // [55] phi from main::@19 to main::@20 [phi:main::@19->main::@20] // main::@20 // print_ln() // [56] call print_ln // [94] phi from main::@20 to print_ln [phi:main::@20->print_ln] - // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@20->print_ln#0] -- call_phi_near + // [94] phi print_line_cursor#23 = print_line_cursor#0 [phi:main::@20->print_ln#0] -- register_copy jsr print_ln // main::@21 // for(byte i=0; i<20; i++) @@ -4132,7 +4132,7 @@ lin16u_gen: { // [61] call divr16u // [107] phi from lin16u_gen to divr16u [phi:lin16u_gen->divr16u] // [107] phi divr16u::dividend#5 = divr16u::dividend#1 [phi:lin16u_gen->divr16u#0] -- register_copy - // [107] phi divr16u::rem#10 = 0 [phi:lin16u_gen->divr16u#1] -- call_phi_near + // [107] phi divr16u::rem#10 = 0 [phi:lin16u_gen->divr16u#1] -- vwuz1=vbuc1 lda #<0 sta.z divr16u.rem sta.z divr16u.rem+1 @@ -4153,7 +4153,7 @@ lin16u_gen: { lda #<0 sta.z divr16u.dividend sta.z divr16u.dividend+1 - // [107] phi divr16u::rem#10 = divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#1] -- call_phi_near + // [107] phi divr16u::rem#10 = divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#1] -- register_copy jsr divr16u // word stepf = divr16u(0, length-1, rem16u) // [66] divr16u::return#3 = divr16u::return#0 @@ -4255,7 +4255,7 @@ lin16u_gen: { print_cls: { // memset(print_screen, ' ', 1000) // [79] call memset - // [125] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [125] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -4291,7 +4291,7 @@ print_str: { // [86] call print_char // [131] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [131] phi print_char_cursor#51 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [131] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [131] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); @@ -4313,7 +4313,7 @@ print_uint: { // [90] call print_uchar // [99] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [99] phi print_char_cursor#84 = print_char_cursor#1 [phi:print_uint->print_uchar#0] -- register_copy - // [99] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [99] phi print_uchar::b#3 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -4322,7 +4322,7 @@ print_uint: { // [92] call print_uchar // [99] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [99] phi print_char_cursor#84 = print_char_cursor#10 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [99] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [99] phi print_uchar::b#3 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -4379,7 +4379,7 @@ print_uchar: { // Table of hexadecimal digits // [131] phi from print_uchar to print_char [phi:print_uchar->print_char] // [131] phi print_char_cursor#51 = print_char_cursor#84 [phi:print_uchar->print_char#0] -- register_copy - // [131] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [131] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -4392,7 +4392,7 @@ print_uchar: { // [105] call print_char // [131] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [131] phi print_char_cursor#51 = print_char_cursor#10 [phi:print_uchar::@1->print_char#0] -- register_copy - // [131] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [131] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/literal-word-pointer-0.log b/src/test/ref/literal-word-pointer-0.log index f4f8a8669..cf77457ea 100644 --- a/src/test/ref/literal-word-pointer-0.log +++ b/src/test/ref/literal-word-pointer-0.log @@ -119,7 +119,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call print -- call_phi_near + // [1] call print jsr print jmp __breturn // main::@return @@ -182,7 +182,7 @@ Score: 28 // main main: { // print("qwe") - // [1] call print -- call_phi_near + // [1] call print jsr print // main::@return // } diff --git a/src/test/ref/literal-word-pointer-1.log b/src/test/ref/literal-word-pointer-1.log index d5311dfc3..1cbc5c0cf 100644 --- a/src/test/ref/literal-word-pointer-1.log +++ b/src/test/ref/literal-word-pointer-1.log @@ -120,7 +120,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call print -- call_phi_near + // [1] call print jsr print jmp __breturn // main::@return @@ -183,7 +183,7 @@ Score: 28 // main main: { // print("qwe") - // [1] call print -- call_phi_near + // [1] call print jsr print // main::@return // } diff --git a/src/test/ref/liverange-1.log b/src/test/ref/liverange-1.log index d04ec4df2..cf178a468 100644 --- a/src/test/ref/liverange-1.log +++ b/src/test/ref/liverange-1.log @@ -208,7 +208,7 @@ main: { out_from_main: // [5] phi idx#11 = 0 [phi:main->out#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi out::c#2 = 'c' [phi:main->out#1] -- call_phi_near + // [5] phi out::c#2 = 'c' [phi:main->out#1] -- vbuaa=vbuc1 lda #'c' jsr out // [2] phi from main to main::@1 [phi:main->main::@1] @@ -220,7 +220,7 @@ main: { // [5] phi from main::@1 to out [phi:main::@1->out] out_from___b1: // [5] phi idx#11 = idx#12 [phi:main::@1->out#0] -- register_copy - // [5] phi out::c#2 = 'm' [phi:main::@1->out#1] -- call_phi_near + // [5] phi out::c#2 = 'm' [phi:main::@1->out#1] -- vbuaa=vbuc1 lda #'m' jsr out jmp __breturn @@ -297,7 +297,7 @@ main: { // [5] phi from main to out [phi:main->out] // [5] phi idx#11 = 0 [phi:main->out#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi out::c#2 = 'c' [phi:main->out#1] -- call_phi_near + // [5] phi out::c#2 = 'c' [phi:main->out#1] -- vbuaa=vbuc1 lda #'c' jsr out // [2] phi from main to main::@1 [phi:main->main::@1] @@ -306,7 +306,7 @@ main: { // [3] call out // [5] phi from main::@1 to out [phi:main::@1->out] // [5] phi idx#11 = idx#12 [phi:main::@1->out#0] -- register_copy - // [5] phi out::c#2 = 'm' [phi:main::@1->out#1] -- call_phi_near + // [5] phi out::c#2 = 'm' [phi:main::@1->out#1] -- vbuaa=vbuc1 lda #'m' jsr out // main::@return diff --git a/src/test/ref/liverange-10.log b/src/test/ref/liverange-10.log index f43be339a..9d8e362be 100644 --- a/src/test/ref/liverange-10.log +++ b/src/test/ref/liverange-10.log @@ -678,7 +678,7 @@ main: { sta.z outsw.sw lda.z sw+1 sta.z outsw.sw+1 - // [3] call outsw -- call_phi_near + // [3] call outsw jsr outsw jmp __b3 // main::@3 @@ -714,7 +714,7 @@ main: { // [20] phi from main::@2 to outw [phi:main::@2->outw] outw_from___b2: // [20] phi idx#35 = idx#11 [phi:main::@2->outw#0] -- register_copy - // [20] phi outw::w#2 = outw::w#0 [phi:main::@2->outw#1] -- call_phi_near + // [20] phi outw::w#2 = outw::w#0 [phi:main::@2->outw#1] -- register_copy jsr outw jmp __b4 // main::@4 @@ -753,7 +753,7 @@ outsw: { out_from___b2: // [38] phi out::c#5 = '-' [phi:outsw::@2->out#0] -- vbuaa=vbuc1 lda #'-' - // [38] phi idx#27 = idx#31 [phi:outsw::@2->out#1] -- call_phi_near + // [38] phi idx#27 = idx#31 [phi:outsw::@2->out#1] -- register_copy jsr out jmp __b3 // outsw::@3 @@ -779,7 +779,7 @@ outsw: { // [20] phi from outsw::@1 to outw [phi:outsw::@1->outw] outw_from___b1: // [20] phi idx#35 = idx#33 [phi:outsw::@1->outw#0] -- register_copy - // [20] phi outw::w#2 = outw::w#1 [phi:outsw::@1->outw#1] -- call_phi_near + // [20] phi outw::w#2 = outw::w#1 [phi:outsw::@1->outw#1] -- register_copy jsr outw jmp __breturn // outsw::@return @@ -805,7 +805,7 @@ outw: { // [38] phi from outw to out [phi:outw->out] out_from_outw: // [38] phi out::c#5 = out::c#1 [phi:outw->out#0] -- register_copy - // [38] phi idx#27 = idx#35 [phi:outw->out#1] -- call_phi_near + // [38] phi idx#27 = idx#35 [phi:outw->out#1] -- register_copy jsr out jmp __b1 // outw::@1 @@ -821,7 +821,7 @@ outw: { // [38] phi from outw::@1 to out [phi:outw::@1->out] out_from___b1: // [38] phi out::c#5 = out::c#2 [phi:outw::@1->out#0] -- register_copy - // [38] phi idx#27 = idx#11 [phi:outw::@1->out#1] -- call_phi_near + // [38] phi idx#27 = idx#11 [phi:outw::@1->out#1] -- register_copy jsr out jmp __b2 // outw::@2 @@ -840,7 +840,7 @@ outw: { // [38] phi from outw::@2 to out [phi:outw::@2->out] out_from___b2: // [38] phi out::c#5 = out::c#3 [phi:outw::@2->out#0] -- register_copy - // [38] phi idx#27 = idx#11 [phi:outw::@2->out#1] -- call_phi_near + // [38] phi idx#27 = idx#11 [phi:outw::@2->out#1] -- register_copy jsr out jmp __b3 // outw::@3 @@ -856,7 +856,7 @@ outw: { // [38] phi from outw::@3 to out [phi:outw::@3->out] out_from___b3: // [38] phi out::c#5 = out::c#4 [phi:outw::@3->out#0] -- register_copy - // [38] phi idx#27 = idx#11 [phi:outw::@3->out#1] -- call_phi_near + // [38] phi idx#27 = idx#11 [phi:outw::@3->out#1] -- register_copy jsr out jmp __breturn // outw::@return @@ -1033,7 +1033,7 @@ main: { sta.z outsw.sw lda.z sw+1 sta.z outsw.sw+1 - // [3] call outsw -- call_phi_near + // [3] call outsw jsr outsw // main::@3 // for(signed int sw: -20..19 ) @@ -1063,7 +1063,7 @@ main: { // [8] call outw // [20] phi from main::@2 to outw [phi:main::@2->outw] // [20] phi idx#35 = idx#11 [phi:main::@2->outw#0] -- register_copy - // [20] phi outw::w#2 = outw::w#0 [phi:main::@2->outw#1] -- call_phi_near + // [20] phi outw::w#2 = outw::w#0 [phi:main::@2->outw#1] -- register_copy jsr outw // main::@4 // for(unsigned int w: 0..39 ) @@ -1098,7 +1098,7 @@ outsw: { // [38] phi from outsw::@2 to out [phi:outsw::@2->out] // [38] phi out::c#5 = '-' [phi:outsw::@2->out#0] -- vbuaa=vbuc1 lda #'-' - // [38] phi idx#27 = idx#31 [phi:outsw::@2->out#1] -- call_phi_near + // [38] phi idx#27 = idx#31 [phi:outsw::@2->out#1] -- register_copy jsr out // outsw::@3 // sw = -sw @@ -1120,7 +1120,7 @@ outsw: { // [18] call outw // [20] phi from outsw::@1 to outw [phi:outsw::@1->outw] // [20] phi idx#35 = idx#33 [phi:outsw::@1->outw#0] -- register_copy - // [20] phi outw::w#2 = outw::w#1 [phi:outsw::@1->outw#1] -- call_phi_near + // [20] phi outw::w#2 = outw::w#1 [phi:outsw::@1->outw#1] -- register_copy jsr outw // outsw::@return // } @@ -1147,7 +1147,7 @@ outw: { // [24] call out // [38] phi from outw to out [phi:outw->out] // [38] phi out::c#5 = out::c#1 [phi:outw->out#0] -- register_copy - // [38] phi idx#27 = idx#35 [phi:outw->out#1] -- call_phi_near + // [38] phi idx#27 = idx#35 [phi:outw->out#1] -- register_copy jsr out // outw::@1 // BYTE1(w) @@ -1163,7 +1163,7 @@ outw: { // [28] call out // [38] phi from outw::@1 to out [phi:outw::@1->out] // [38] phi out::c#5 = out::c#2 [phi:outw::@1->out#0] -- register_copy - // [38] phi idx#27 = idx#11 [phi:outw::@1->out#1] -- call_phi_near + // [38] phi idx#27 = idx#11 [phi:outw::@1->out#1] -- register_copy jsr out // outw::@2 // BYTE0(w) @@ -1182,7 +1182,7 @@ outw: { // [32] call out // [38] phi from outw::@2 to out [phi:outw::@2->out] // [38] phi out::c#5 = out::c#3 [phi:outw::@2->out#0] -- register_copy - // [38] phi idx#27 = idx#11 [phi:outw::@2->out#1] -- call_phi_near + // [38] phi idx#27 = idx#11 [phi:outw::@2->out#1] -- register_copy jsr out // outw::@3 // BYTE0(w) @@ -1198,7 +1198,7 @@ outw: { // [36] call out // [38] phi from outw::@3 to out [phi:outw::@3->out] // [38] phi out::c#5 = out::c#4 [phi:outw::@3->out#0] -- register_copy - // [38] phi idx#27 = idx#11 [phi:outw::@3->out#1] -- call_phi_near + // [38] phi idx#27 = idx#11 [phi:outw::@3->out#1] -- register_copy jsr out // outw::@return // } diff --git a/src/test/ref/liverange-2.log b/src/test/ref/liverange-2.log index 87bd1b501..5c92c0723 100644 --- a/src/test/ref/liverange-2.log +++ b/src/test/ref/liverange-2.log @@ -343,7 +343,7 @@ main: { adc.z a // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print jmp __b6 // main::@6 @@ -499,7 +499,7 @@ main: { // print(b, ca) // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print // main::@6 // for( char c: 0..100 ) diff --git a/src/test/ref/liverange-3.log b/src/test/ref/liverange-3.log index d434831cd..ba653de71 100644 --- a/src/test/ref/liverange-3.log +++ b/src/test/ref/liverange-3.log @@ -350,7 +350,7 @@ main: { adc.z a // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print jmp __b6 // main::@6 @@ -508,7 +508,7 @@ main: { // print(b, ca) // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print // main::@6 // for( char c: 0..100 ) diff --git a/src/test/ref/liverange-4.log b/src/test/ref/liverange-4.log index 8b05758c7..1a9b9083e 100644 --- a/src/test/ref/liverange-4.log +++ b/src/test/ref/liverange-4.log @@ -394,7 +394,7 @@ main: { adc.z a // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print jmp __b6 // main::@6 @@ -432,7 +432,7 @@ main: { print: { // [15] out::b#0 = print::b#0 // [16] out::ca#0 = print::ca#0 - // [17] call out -- call_phi_near + // [17] call out jsr out jmp __breturn // print::@return @@ -572,7 +572,7 @@ main: { // print(b, ca) // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print // main::@6 // for( char c: 0..100 ) @@ -607,7 +607,7 @@ print: { // out(b, ca) // [15] out::b#0 = print::b#0 // [16] out::ca#0 = print::ca#0 - // [17] call out -- call_phi_near + // [17] call out jsr out // print::@return // } diff --git a/src/test/ref/liverange-5.log b/src/test/ref/liverange-5.log index ff19a3bcd..1fd2e49e2 100644 --- a/src/test/ref/liverange-5.log +++ b/src/test/ref/liverange-5.log @@ -401,7 +401,7 @@ main: { adc.z a // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print jmp __b6 // main::@6 @@ -439,7 +439,7 @@ main: { print: { // [15] out::b#0 = print::b#0 // [16] out::ca#0 = print::ca#0 - // [17] call out -- call_phi_near + // [17] call out jsr out jmp __breturn // print::@return @@ -581,7 +581,7 @@ main: { // print(b, ca) // [5] print::b#0 = main::b#4 // [6] print::ca#0 = main::ca#0 - // [7] call print -- call_phi_near + // [7] call print jsr print // main::@6 // for( char c: 0..100 ) @@ -616,7 +616,7 @@ print: { // out(b, ca) // [15] out::b#0 = print::b#0 // [16] out::ca#0 = print::ca#0 - // [17] call out -- call_phi_near + // [17] call out jsr out // print::@return // } diff --git a/src/test/ref/liverange-6.log b/src/test/ref/liverange-6.log index 5e9a05aed..74a12a553 100644 --- a/src/test/ref/liverange-6.log +++ b/src/test/ref/liverange-6.log @@ -245,7 +245,7 @@ main: { __b1: // [2] out::c#0 = msg[main::i#2] -- vbuaa=pbuc1_derefidx_vbuyy lda msg,y - // [3] call out -- call_phi_near + // [3] call out jsr out jmp __b2 // main::@2 @@ -348,7 +348,7 @@ main: { // out(msg[i]) // [2] out::c#0 = msg[main::i#2] -- vbuaa=pbuc1_derefidx_vbuyy lda msg,y - // [3] call out -- call_phi_near + // [3] call out jsr out // main::@2 // for( byte i: 0..11) diff --git a/src/test/ref/liverange-7.log b/src/test/ref/liverange-7.log index 5b899a517..674748c62 100644 --- a/src/test/ref/liverange-7.log +++ b/src/test/ref/liverange-7.log @@ -294,7 +294,7 @@ main: { // main::@1 __b1: // [2] out2::c#0 = main::c#2 - // [3] call out2 -- call_phi_near + // [3] call out2 jsr out2 jmp __b2 // main::@2 @@ -315,7 +315,7 @@ main: { // void out2(__register(A) char c) out2: { // [7] out::c#0 = out2::c#0 - // [8] call out -- call_phi_near + // [8] call out jsr out jmp __breturn // out2::@return @@ -412,7 +412,7 @@ main: { __b1: // out2(c) // [2] out2::c#0 = main::c#2 - // [3] call out2 -- call_phi_near + // [3] call out2 jsr out2 // main::@2 // for(char c: 0..39 ) @@ -432,7 +432,7 @@ main: { out2: { // out(c) // [7] out::c#0 = out2::c#0 - // [8] call out -- call_phi_near + // [8] call out jsr out // out2::@return // } diff --git a/src/test/ref/liverange-8.log b/src/test/ref/liverange-8.log index fc882b20b..860335293 100644 --- a/src/test/ref/liverange-8.log +++ b/src/test/ref/liverange-8.log @@ -319,7 +319,7 @@ main: { // main::@1 __b1: // [2] out2::c#0 = main::c#2 - // [3] call out2 -- call_phi_near + // [3] call out2 jsr out2 jmp __b2 // main::@2 @@ -344,7 +344,7 @@ out2: { // [12] phi from out2 to out [phi:out2->out] out_from_out2: // [12] phi out::c#2 = out::c#0 [phi:out2->out#0] -- register_copy - // [12] phi idx#15 = idx#19 [phi:out2->out#1] -- call_phi_near + // [12] phi idx#15 = idx#19 [phi:out2->out#1] -- register_copy jsr out jmp __b1 // out2::@1 @@ -354,7 +354,7 @@ out2: { // [12] phi from out2::@1 to out [phi:out2::@1->out] out_from___b1: // [12] phi out::c#2 = out::c#1 [phi:out2::@1->out#0] -- register_copy - // [12] phi idx#15 = idx#16 [phi:out2::@1->out#1] -- call_phi_near + // [12] phi idx#15 = idx#16 [phi:out2::@1->out#1] -- register_copy jsr out jmp __breturn // out2::@return @@ -458,7 +458,7 @@ main: { __b1: // out2(c) // [2] out2::c#0 = main::c#2 - // [3] call out2 -- call_phi_near + // [3] call out2 jsr out2 // main::@2 // for(char c: 0..39 ) @@ -481,7 +481,7 @@ out2: { // [8] call out // [12] phi from out2 to out [phi:out2->out] // [12] phi out::c#2 = out::c#0 [phi:out2->out#0] -- register_copy - // [12] phi idx#15 = idx#19 [phi:out2->out#1] -- call_phi_near + // [12] phi idx#15 = idx#19 [phi:out2->out#1] -- register_copy jsr out // out2::@1 // out(c) @@ -489,7 +489,7 @@ out2: { // [10] call out // [12] phi from out2::@1 to out [phi:out2::@1->out] // [12] phi out::c#2 = out::c#1 [phi:out2::@1->out#0] -- register_copy - // [12] phi idx#15 = idx#16 [phi:out2::@1->out#1] -- call_phi_near + // [12] phi idx#15 = idx#16 [phi:out2::@1->out#1] -- register_copy jsr out // out2::@return // } diff --git a/src/test/ref/liverange-9.log b/src/test/ref/liverange-9.log index fd8477728..090151016 100644 --- a/src/test/ref/liverange-9.log +++ b/src/test/ref/liverange-9.log @@ -417,7 +417,7 @@ main: { __b1: // [2] outsw::c#0 = main::c#2 // [3] call outsw - // [7] phi from main::@1 to outsw [phi:main::@1->outsw] -- call_phi_near + // [7] phi from main::@1 to outsw [phi:main::@1->outsw] outsw_from___b1: jsr outsw jmp __b2 @@ -442,13 +442,13 @@ outsw: { out_from_outsw: // [12] phi out::c#3 = '-' [phi:outsw->out#0] -- vbuaa=vbuc1 lda #'-' - // [12] phi idx#21 = idx#25 [phi:outsw->out#1] -- call_phi_near + // [12] phi idx#21 = idx#25 [phi:outsw->out#1] -- register_copy jsr out jmp __b1 // outsw::@1 __b1: // [9] outw::c#0 = outsw::c#0 - // [10] call outw -- call_phi_near + // [10] call outw jsr outw jmp __breturn // outsw::@return @@ -482,7 +482,7 @@ outw: { // [12] phi from outw to out [phi:outw->out] out_from_outw: // [12] phi out::c#3 = out::c#1 [phi:outw->out#0] -- register_copy - // [12] phi idx#21 = idx#22 [phi:outw->out#1] -- call_phi_near + // [12] phi idx#21 = idx#22 [phi:outw->out#1] -- register_copy jsr out jmp __b1 // outw::@1 @@ -494,7 +494,7 @@ outw: { // [12] phi from outw::@1 to out [phi:outw::@1->out] out_from___b1: // [12] phi out::c#3 = out::c#2 [phi:outw::@1->out#0] -- register_copy - // [12] phi idx#21 = idx#22 [phi:outw::@1->out#1] -- call_phi_near + // [12] phi idx#21 = idx#22 [phi:outw::@1->out#1] -- register_copy jsr out jmp __breturn // outw::@return @@ -595,7 +595,7 @@ main: { // outsw(c) // [2] outsw::c#0 = main::c#2 // [3] call outsw - // [7] phi from main::@1 to outsw [phi:main::@1->outsw] -- call_phi_near + // [7] phi from main::@1 to outsw [phi:main::@1->outsw] jsr outsw // main::@2 // for(char c: 0..39 ) @@ -617,12 +617,12 @@ outsw: { // [12] phi from outsw to out [phi:outsw->out] // [12] phi out::c#3 = '-' [phi:outsw->out#0] -- vbuaa=vbuc1 lda #'-' - // [12] phi idx#21 = idx#25 [phi:outsw->out#1] -- call_phi_near + // [12] phi idx#21 = idx#25 [phi:outsw->out#1] -- register_copy jsr out // outsw::@1 // outw(c) // [9] outw::c#0 = outsw::c#0 - // [10] call outw -- call_phi_near + // [10] call outw jsr outw // outsw::@return // } @@ -656,7 +656,7 @@ outw: { // [17] call out // [12] phi from outw to out [phi:outw->out] // [12] phi out::c#3 = out::c#1 [phi:outw->out#0] -- register_copy - // [12] phi idx#21 = idx#22 [phi:outw->out#1] -- call_phi_near + // [12] phi idx#21 = idx#22 [phi:outw->out#1] -- register_copy jsr out // outw::@1 // out(c&0x0f) @@ -666,7 +666,7 @@ outw: { // [19] call out // [12] phi from outw::@1 to out [phi:outw::@1->out] // [12] phi out::c#3 = out::c#2 [phi:outw::@1->out#0] -- register_copy - // [12] phi idx#21 = idx#22 [phi:outw::@1->out#1] -- call_phi_near + // [12] phi idx#21 = idx#22 [phi:outw::@1->out#1] -- register_copy jsr out // outw::@return // } diff --git a/src/test/ref/liverange-call-problem.log b/src/test/ref/liverange-call-problem.log index 87040feb9..e61f1eb79 100644 --- a/src/test/ref/liverange-call-problem.log +++ b/src/test/ref/liverange-call-problem.log @@ -325,7 +325,7 @@ main: { // [1] call incw1 // [11] phi from main to incw1 [phi:main->incw1] incw1_from_main: - // [11] phi w1#12 = 0 [phi:main->incw1#0] -- call_phi_near + // [11] phi w1#12 = 0 [phi:main->incw1#0] -- vwuz1=vwuc1 lda #<0 sta.z w1 lda #>0 @@ -339,7 +339,7 @@ main: { // [3] call incw2 // [14] phi from main::@1 to incw2 [phi:main::@1->incw2] incw2_from___b1: - // [14] phi w2#11 = 0 [phi:main::@1->incw2#0] -- call_phi_near + // [14] phi w2#11 = 0 [phi:main::@1->incw2#0] -- vwuz1=vwuc1 lda #<0 sta.z w2 lda #>0 @@ -353,7 +353,7 @@ main: { // [5] call incw1 // [11] phi from main::@2 to incw1 [phi:main::@2->incw1] incw1_from___b2: - // [11] phi w1#12 = w1#13 [phi:main::@2->incw1#0] -- call_phi_near + // [11] phi w1#12 = w1#13 [phi:main::@2->incw1#0] -- register_copy jsr incw1 // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -363,7 +363,7 @@ main: { // [7] call incw2 // [14] phi from main::@3 to incw2 [phi:main::@3->incw2] incw2_from___b3: - // [14] phi w2#11 = w2#12 [phi:main::@3->incw2#0] -- call_phi_near + // [14] phi w2#11 = w2#12 [phi:main::@3->incw2#0] -- register_copy jsr incw2 jmp __b4 // main::@4 @@ -484,7 +484,7 @@ main: { // incw1() // [1] call incw1 // [11] phi from main to incw1 [phi:main->incw1] - // [11] phi w1#12 = 0 [phi:main->incw1#0] -- call_phi_near + // [11] phi w1#12 = 0 [phi:main->incw1#0] -- vwuz1=vwuc1 lda #<0 sta.z w1 sta.z w1+1 @@ -494,7 +494,7 @@ main: { // incw2() // [3] call incw2 // [14] phi from main::@1 to incw2 [phi:main::@1->incw2] - // [14] phi w2#11 = 0 [phi:main::@1->incw2#0] -- call_phi_near + // [14] phi w2#11 = 0 [phi:main::@1->incw2#0] -- vwuz1=vwuc1 lda #<0 sta.z w2 sta.z w2+1 @@ -504,14 +504,14 @@ main: { // incw1() // [5] call incw1 // [11] phi from main::@2 to incw1 [phi:main::@2->incw1] - // [11] phi w1#12 = w1#13 [phi:main::@2->incw1#0] -- call_phi_near + // [11] phi w1#12 = w1#13 [phi:main::@2->incw1#0] -- register_copy jsr incw1 // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // incw2() // [7] call incw2 // [14] phi from main::@3 to incw2 [phi:main::@3->incw2] - // [14] phi w2#11 = w2#12 [phi:main::@3->incw2#0] -- call_phi_near + // [14] phi w2#11 = w2#12 [phi:main::@3->incw2#0] -- register_copy jsr incw2 // main::@4 // SCREEN[0] = w1 diff --git a/src/test/ref/liverange-problem-0.log b/src/test/ref/liverange-problem-0.log index 53d595e94..914eb6461 100644 --- a/src/test/ref/liverange-problem-0.log +++ b/src/test/ref/liverange-problem-0.log @@ -305,7 +305,7 @@ __start: { // [2] call malloc // [11] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] malloc_from___init1: - // [11] phi MEM#6 = (char *) 1024 [phi:__start::__init1->malloc#0] -- call_phi_near + // [11] phi MEM#6 = (char *) 1024 [phi:__start::__init1->malloc#0] -- pbuz1=pbuc1 lda #<$400 sta.z MEM lda #>$400 @@ -323,7 +323,7 @@ __start: { // [5] call malloc // [11] phi from __start::@2 to malloc [phi:__start::@2->malloc] malloc_from___b2: - // [11] phi MEM#6 = MEM#0 [phi:__start::@2->malloc#0] -- call_phi_near + // [11] phi MEM#6 = MEM#0 [phi:__start::@2->malloc#0] -- register_copy jsr malloc // [6] malloc::return#3 = malloc::return#0 jmp __b3 @@ -335,7 +335,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [9] call main -- call_phi_near + // [9] call main jsr main jmp __breturn // __start::@return @@ -458,7 +458,7 @@ __start: { // byte* SCREEN_1 = malloc() // [2] call malloc // [11] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] - // [11] phi MEM#6 = (char *) 1024 [phi:__start::__init1->malloc#0] -- call_phi_near + // [11] phi MEM#6 = (char *) 1024 [phi:__start::__init1->malloc#0] -- pbuz1=pbuc1 lda #<$400 sta.z MEM lda #>$400 @@ -475,7 +475,7 @@ __start: { // byte* SCREEN_2 = malloc() // [5] call malloc // [11] phi from __start::@2 to malloc [phi:__start::@2->malloc] - // [11] phi MEM#6 = MEM#0 [phi:__start::@2->malloc#0] -- call_phi_near + // [11] phi MEM#6 = MEM#0 [phi:__start::@2->malloc#0] -- register_copy jsr malloc // byte* SCREEN_2 = malloc() // [6] malloc::return#3 = malloc::return#0 @@ -483,7 +483,7 @@ __start: { // [7] SCREEN_2#0 = malloc::return#3 // [8] phi from __start::@3 to __start::@1 [phi:__start::@3->__start::@1] // __start::@1 - // [9] call main -- call_phi_near + // [9] call main jsr main // __start::@return // [10] return diff --git a/src/test/ref/liverange.log b/src/test/ref/liverange.log index 928b6882c..458f3370d 100644 --- a/src/test/ref/liverange.log +++ b/src/test/ref/liverange.log @@ -300,7 +300,7 @@ main: { // [1] call inci // [12] phi from main to inci [phi:main->inci] inci_from_main: - // [12] phi i#11 = 0 [phi:main->inci#0] -- call_phi_near + // [12] phi i#11 = 0 [phi:main->inci#0] -- vbuyy=vbuc1 ldy #0 jsr inci // [2] inci::return#0 = inci::return#2 @@ -315,7 +315,7 @@ main: { // [5] call inci // [12] phi from main::@1 to inci [phi:main::@1->inci] inci_from___b1: - // [12] phi i#11 = i#12 [phi:main::@1->inci#0] -- call_phi_near + // [12] phi i#11 = i#12 [phi:main::@1->inci#0] -- register_copy jsr inci // [6] inci::return#1 = inci::return#2 jmp __b2 @@ -415,7 +415,7 @@ main: { // inci() // [1] call inci // [12] phi from main to inci [phi:main->inci] - // [12] phi i#11 = 0 [phi:main->inci#0] -- call_phi_near + // [12] phi i#11 = 0 [phi:main->inci#0] -- vbuyy=vbuc1 ldy #0 jsr inci // inci() @@ -430,7 +430,7 @@ main: { // inci() // [5] call inci // [12] phi from main::@1 to inci [phi:main::@1->inci] - // [12] phi i#11 = i#12 [phi:main::@1->inci#0] -- call_phi_near + // [12] phi i#11 = i#12 [phi:main::@1->inci#0] -- register_copy jsr inci // inci() // [6] inci::return#1 = inci::return#2 diff --git a/src/test/ref/longbranch-interrupt-problem.log b/src/test/ref/longbranch-interrupt-problem.log index 1333b4a9d..c8bb0b78d 100644 --- a/src/test/ref/longbranch-interrupt-problem.log +++ b/src/test/ref/longbranch-interrupt-problem.log @@ -221,7 +221,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -338,7 +338,7 @@ __start: { sta.z col // [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/longjump2.log b/src/test/ref/longjump2.log index 28d9a1199..124820e22 100644 --- a/src/test/ref/longjump2.log +++ b/src/test/ref/longjump2.log @@ -225,7 +225,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call long1 - // [5] phi from main to long1 [phi:main->long1] -- call_phi_near + // [5] phi from main to long1 [phi:main->long1] long1_from_main: jsr long1 // [2] phi from main to main::@1 [phi:main->main::@1] @@ -234,7 +234,7 @@ main: { // main::@1 __b1: // [3] call long2 - // [12] phi from main::@1 to long2 [phi:main::@1->long2] -- call_phi_near + // [12] phi from main::@1 to long2 [phi:main::@1->long2] long2_from___b1: jsr long2 jmp __breturn @@ -881,13 +881,13 @@ Score: 10640 main: { // long1() // [1] call long1 - // [5] phi from main to long1 [phi:main->long1] -- call_phi_near + // [5] phi from main to long1 [phi:main->long1] jsr long1 // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // long2() // [3] call long2 - // [12] phi from main::@1 to long2 [phi:main::@1->long2] -- call_phi_near + // [12] phi from main::@1 to long2 [phi:main::@1->long2] jsr long2 // main::@return // } diff --git a/src/test/ref/loop-memset-min.log b/src/test/ref/loop-memset-min.log index 050eaf119..58b097890 100644 --- a/src/test/ref/loop-memset-min.log +++ b/src/test/ref/loop-memset-min.log @@ -276,7 +276,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call memset - // [3] phi from main to memset [phi:main->memset] -- call_phi_near + // [3] phi from main to memset [phi:main->memset] memset_from_main: jsr memset jmp __breturn @@ -387,7 +387,7 @@ Score: 523 main: { // memset(SCREEN, 'c', 1000) // [1] call memset - // [3] phi from main to memset [phi:main->memset] -- call_phi_near + // [3] phi from main to memset [phi:main->memset] jsr memset // main::@return // } diff --git a/src/test/ref/loop-problem.log b/src/test/ref/loop-problem.log index 4a4be12eb..ea713553e 100644 --- a/src/test/ref/loop-problem.log +++ b/src/test/ref/loop-problem.log @@ -200,7 +200,7 @@ main: { // [0] *SCREEN = '0' -- _deref_pbuc1=vbuc2 lda #'0' sta SCREEN - // [1] call d -- call_phi_near + // [1] call d jsr d // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -208,7 +208,7 @@ main: { // main::@1 __b1: // [3] call b - // [7] phi from main::@1 to b [phi:main::@1->b] -- call_phi_near + // [7] phi from main::@1 to b [phi:main::@1->b] b_from___b1: jsr b jmp __breturn @@ -240,7 +240,7 @@ b: { jmp __b1 // b::@1 __b1: - // [9] call d -- call_phi_near + // [9] call d jsr d jmp __b2 // b::@2 @@ -317,13 +317,13 @@ main: { lda #'0' sta SCREEN // d() - // [1] call d -- call_phi_near + // [1] call d jsr d // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // b() // [3] call b - // [7] phi from main::@1 to b [phi:main::@1->b] -- call_phi_near + // [7] phi from main::@1 to b [phi:main::@1->b] jsr b // main::@return // } @@ -350,7 +350,7 @@ b: { // b::@1 __b1: // d() - // [9] call d -- call_phi_near + // [9] call d jsr d // b::@2 // for( byte i: 0..3) diff --git a/src/test/ref/loop-problem2.log b/src/test/ref/loop-problem2.log index 100d011b9..7a74d1625 100644 --- a/src/test/ref/loop-problem2.log +++ b/src/test/ref/loop-problem2.log @@ -243,7 +243,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call print_cls - // [5] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [5] 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] @@ -252,7 +252,7 @@ main: { // main::@1 __b1: // [3] call mode_ctrl - // [11] phi from main::@1 to mode_ctrl [phi:main::@1->mode_ctrl] -- call_phi_near + // [11] phi from main::@1 to mode_ctrl [phi:main::@1->mode_ctrl] mode_ctrl_from___b1: jsr mode_ctrl jmp __breturn @@ -385,13 +385,13 @@ Score: 794 main: { // print_cls() // [1] call print_cls - // [5] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [5] 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 // mode_ctrl() // [3] call mode_ctrl - // [11] phi from main::@1 to mode_ctrl [phi:main::@1->mode_ctrl] -- call_phi_near + // [11] phi from main::@1 to mode_ctrl [phi:main::@1->mode_ctrl] jsr mode_ctrl // main::@return // } diff --git a/src/test/ref/loophead-problem-2.log b/src/test/ref/loophead-problem-2.log index c9022a575..290ef02b1 100644 --- a/src/test/ref/loophead-problem-2.log +++ b/src/test/ref/loophead-problem-2.log @@ -371,7 +371,7 @@ ASSEMBLER BEFORE OPTIMIZATION main: { .label screen = $400 // [1] call scan_for_lowest - // [11] phi from main to scan_for_lowest [phi:main->scan_for_lowest] -- call_phi_near + // [11] phi from main to scan_for_lowest [phi:main->scan_for_lowest] scan_for_lowest_from_main: jsr scan_for_lowest // [2] scan_for_lowest::return#0 = scan_for_lowest::lowest#2 -- vbuaa=vbuz1 @@ -552,7 +552,7 @@ main: { .label screen = $400 // char hit_check=scan_for_lowest() // [1] call scan_for_lowest - // [11] phi from main to scan_for_lowest [phi:main->scan_for_lowest] -- call_phi_near + // [11] phi from main to scan_for_lowest [phi:main->scan_for_lowest] jsr scan_for_lowest // char hit_check=scan_for_lowest() // [2] scan_for_lowest::return#0 = scan_for_lowest::lowest#2 -- vbuaa=vbuz1 diff --git a/src/test/ref/loophead-problem-3.log b/src/test/ref/loophead-problem-3.log index bf1dd5e41..637540734 100644 --- a/src/test/ref/loophead-problem-3.log +++ b/src/test/ref/loophead-problem-3.log @@ -384,7 +384,7 @@ main: { .label result = 2 .label kaputt = $a // [1] call mul16u - // [10] phi from main to mul16u [phi:main->mul16u] -- call_phi_near + // [10] phi from main to mul16u [phi:main->mul16u] mul16u_from_main: jsr mul16u // [2] mul16u::return#2 = mul16u::res#2 @@ -591,7 +591,7 @@ main: { .label kaputt = $a // dword result = mul16u(4,123) // [1] call mul16u - // [10] phi from main to mul16u [phi:main->mul16u] -- call_phi_near + // [10] phi from main to mul16u [phi:main->mul16u] jsr mul16u // dword result = mul16u(4,123) // [2] mul16u::return#2 = mul16u::res#2 diff --git a/src/test/ref/loophead-problem.log b/src/test/ref/loophead-problem.log index 20bd0994d..47c442d02 100644 --- a/src/test/ref/loophead-problem.log +++ b/src/test/ref/loophead-problem.log @@ -248,7 +248,7 @@ main: { lda #'a' sta screen+$28 // [1] call popup_selector - // [4] phi from main to popup_selector [phi:main->popup_selector] -- call_phi_near + // [4] phi from main to popup_selector [phi:main->popup_selector] popup_selector_from_main: jsr popup_selector jmp __b1 @@ -356,7 +356,7 @@ main: { sta screen+$28 // popup_selector() // [1] call popup_selector - // [4] phi from main to popup_selector [phi:main->popup_selector] -- call_phi_near + // [4] phi from main to popup_selector [phi:main->popup_selector] jsr popup_selector // main::@1 // screen[41] = opcode diff --git a/src/test/ref/loopnest.log b/src/test/ref/loopnest.log index deb69c6c0..7e7d6ce10 100644 --- a/src/test/ref/loopnest.log +++ b/src/test/ref/loopnest.log @@ -204,7 +204,7 @@ main: { // main::@1 __b1: // [2] call nest - // [6] phi from main::@1 to nest [phi:main::@1->nest] -- call_phi_near + // [6] phi from main::@1 to nest [phi:main::@1->nest] nest_from___b1: jsr nest jmp __b2 @@ -314,7 +314,7 @@ main: { __b1: // nest() // [2] call nest - // [6] phi from main::@1 to nest [phi:main::@1->nest] -- call_phi_near + // [6] phi from main::@1 to nest [phi:main::@1->nest] jsr nest // main::@2 // while (--i>0) diff --git a/src/test/ref/loopnest2.log b/src/test/ref/loopnest2.log index d661e5dd3..56e80a72b 100644 --- a/src/test/ref/loopnest2.log +++ b/src/test/ref/loopnest2.log @@ -430,7 +430,7 @@ main: { // main::@2 __b2: // [3] call nest1 - // [9] phi from main::@2 to nest1 [phi:main::@2->nest1] -- call_phi_near + // [9] phi from main::@2 to nest1 [phi:main::@2->nest1] nest1_from___b2: jsr nest1 jmp __b4 @@ -482,7 +482,7 @@ nest1: { // nest1::@2 __b2: // [12] call nest2 - // [18] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2] -- call_phi_near + // [18] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2] nest2_from___b2: jsr nest2 jmp __b4 @@ -679,7 +679,7 @@ main: { __b2: // nest1() // [3] call nest1 - // [9] phi from main::@2 to nest1 [phi:main::@2->nest1] -- call_phi_near + // [9] phi from main::@2 to nest1 [phi:main::@2->nest1] jsr nest1 // main::@4 // while (--j>0) @@ -720,7 +720,7 @@ nest1: { __b2: // nest2() // [12] call nest2 - // [18] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2] -- call_phi_near + // [18] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2] jsr nest2 // nest1::@4 // while (--j>0) diff --git a/src/test/ref/loopnest3.log b/src/test/ref/loopnest3.log index 24dc49f7e..71ea05214 100644 --- a/src/test/ref/loopnest3.log +++ b/src/test/ref/loopnest3.log @@ -257,7 +257,7 @@ main: { // main::@1 __b1: // [2] b::i#0 = main::i#2 - // [3] call b -- call_phi_near + // [3] call b jsr b jmp __b2 // main::@2 @@ -279,7 +279,7 @@ main: { b: { // [7] c::i#0 = b::i#0 // [8] call c - // [10] phi from b to c [phi:b->c] -- call_phi_near + // [10] phi from b to c [phi:b->c] c_from_b: jsr c jmp __breturn @@ -391,7 +391,7 @@ main: { __b1: // b(i) // [2] b::i#0 = main::i#2 - // [3] call b -- call_phi_near + // [3] call b jsr b // main::@2 // for(byte i:0..100) @@ -412,7 +412,7 @@ b: { // c(i) // [7] c::i#0 = b::i#0 // [8] call c - // [10] phi from b to c [phi:b->c] -- call_phi_near + // [10] phi from b to c [phi:b->c] jsr c // b::@return // } diff --git a/src/test/ref/malloc-0.log b/src/test/ref/malloc-0.log index 408edd611..0925f45ce 100644 --- a/src/test/ref/malloc-0.log +++ b/src/test/ref/malloc-0.log @@ -298,7 +298,7 @@ __start: { // __start::__init1 __init1: // [2] call malloc - // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] -- call_phi_near + // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] malloc_from___init1: jsr malloc // [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] @@ -307,7 +307,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 @@ -434,12 +434,12 @@ __start: { // __start::__init1 // byte* BYTES = malloc(0x100) // [2] call malloc - // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] -- call_phi_near + // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] jsr malloc // [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 diff --git a/src/test/ref/malloc-1.log b/src/test/ref/malloc-1.log index 310f06395..72f6b7643 100644 --- a/src/test/ref/malloc-1.log +++ b/src/test/ref/malloc-1.log @@ -325,7 +325,7 @@ __start: { // __start::__init1 __init1: // [2] call malloc - // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] -- call_phi_near + // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] malloc_from___init1: jsr malloc // [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] @@ -334,7 +334,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 @@ -486,12 +486,12 @@ __start: { // __start::__init1 // word* WORDS = malloc(0x200) // [2] call malloc - // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] -- call_phi_near + // [6] phi from __start::__init1 to malloc [phi:__start::__init1->malloc] jsr malloc // [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 diff --git a/src/test/ref/memcpy-0.log b/src/test/ref/memcpy-0.log index ea377248e..3a6c0f1db 100644 --- a/src/test/ref/memcpy-0.log +++ b/src/test/ref/memcpy-0.log @@ -496,7 +496,7 @@ main: { sta.z memcpy.destination lda #>SCREEN_COPY sta.z memcpy.destination+1 - // [10] phi memcpy::source#2 = (void *)SCREEN [phi:main::@1->memcpy#2] -- call_phi_near + // [10] phi memcpy::source#2 = (void *)SCREEN [phi:main::@1->memcpy#2] -- pvoz1=pvoc1 lda #SCREEN @@ -523,7 +523,7 @@ main: { sta.z memcpy.destination lda #>CHARSET sta.z memcpy.destination+1 - // [10] phi memcpy::source#2 = (void *)CHARGEN [phi:main::@2->memcpy#2] -- call_phi_near + // [10] phi memcpy::source#2 = (void *)CHARGEN [phi:main::@2->memcpy#2] -- pvoz1=pvoc1 lda #CHARGEN @@ -722,7 +722,7 @@ main: { sta.z memcpy.destination lda #>SCREEN_COPY sta.z memcpy.destination+1 - // [10] phi memcpy::source#2 = (void *)SCREEN [phi:main::@1->memcpy#2] -- call_phi_near + // [10] phi memcpy::source#2 = (void *)SCREEN [phi:main::@1->memcpy#2] -- pvoz1=pvoc1 lda #SCREEN @@ -749,7 +749,7 @@ main: { sta.z memcpy.destination lda #>CHARSET sta.z memcpy.destination+1 - // [10] phi memcpy::source#2 = (void *)CHARGEN [phi:main::@2->memcpy#2] -- call_phi_near + // [10] phi memcpy::source#2 = (void *)CHARGEN [phi:main::@2->memcpy#2] -- pvoz1=pvoc1 lda #CHARGEN diff --git a/src/test/ref/memcpy-1.log b/src/test/ref/memcpy-1.log index 65e8f759a..ff7dcf584 100644 --- a/src/test/ref/memcpy-1.log +++ b/src/test/ref/memcpy-1.log @@ -622,7 +622,7 @@ main: { sta.z memcpy.destination lda #>SCREEN+$a sta.z memcpy.destination+1 - // [18] phi memcpy::source#2 = (void *)CAMELOT [phi:main::@3->memcpy#2] -- call_phi_near + // [18] phi memcpy::source#2 = (void *)CAMELOT [phi:main::@3->memcpy#2] -- pvoz1=pvoc1 lda #CAMELOT @@ -646,7 +646,7 @@ main: { sta.z memcpy.destination lda #>SCREEN+$32 sta.z memcpy.destination+1 - // [18] phi memcpy::source#2 = (void *)main::$5 [phi:main::@4->memcpy#2] -- call_phi_near + // [18] phi memcpy::source#2 = (void *)main::$5 [phi:main::@4->memcpy#2] -- pvoz1=pvoc1 lda #<__5 sta.z memcpy.source lda #>__5 @@ -940,7 +940,7 @@ main: { sta.z memcpy.destination lda #>SCREEN+$a sta.z memcpy.destination+1 - // [18] phi memcpy::source#2 = (void *)CAMELOT [phi:main::@3->memcpy#2] -- call_phi_near + // [18] phi memcpy::source#2 = (void *)CAMELOT [phi:main::@3->memcpy#2] -- pvoz1=pvoc1 lda #CAMELOT @@ -961,7 +961,7 @@ main: { sta.z memcpy.destination lda #>SCREEN+$32 sta.z memcpy.destination+1 - // [18] phi memcpy::source#2 = (void *)main::$5 [phi:main::@4->memcpy#2] -- call_phi_near + // [18] phi memcpy::source#2 = (void *)main::$5 [phi:main::@4->memcpy#2] -- pvoz1=pvoc1 lda #<__5 sta.z memcpy.source lda #>__5 diff --git a/src/test/ref/memory-heap.log b/src/test/ref/memory-heap.log index b46ea16fc..a27fca8c9 100644 --- a/src/test/ref/memory-heap.log +++ b/src/test/ref/memory-heap.log @@ -451,7 +451,7 @@ main: { // [1] call malloc // [14] phi from main to malloc [phi:main->malloc] malloc_from_main: - // [14] phi heap_head#8 = HEAP_TOP [phi:main->malloc#0] -- call_phi_near + // [14] phi heap_head#8 = HEAP_TOP [phi:main->malloc#0] -- pbuz1=pbuc1 lda #HEAP_TOP @@ -468,7 +468,7 @@ main: { // [3] call malloc // [14] phi from main::@2 to malloc [phi:main::@2->malloc] malloc_from___b2: - // [14] phi heap_head#8 = heap_head#0 [phi:main::@2->malloc#0] -- call_phi_near + // [14] phi heap_head#8 = heap_head#0 [phi:main::@2->malloc#0] -- register_copy jsr malloc jmp __b3 // main::@3 @@ -629,7 +629,7 @@ main: { // unsigned char* buf1 = malloc(100) // [1] call malloc // [14] phi from main to malloc [phi:main->malloc] - // [14] phi heap_head#8 = HEAP_TOP [phi:main->malloc#0] -- call_phi_near + // [14] phi heap_head#8 = HEAP_TOP [phi:main->malloc#0] -- pbuz1=pbuc1 lda #HEAP_TOP @@ -645,7 +645,7 @@ main: { // unsigned char* buf2 = malloc(100) // [3] call malloc // [14] phi from main::@2 to malloc [phi:main::@2->malloc] - // [14] phi heap_head#8 = heap_head#0 [phi:main::@2->malloc#0] -- call_phi_near + // [14] phi heap_head#8 = heap_head#0 [phi:main::@2->malloc#0] -- register_copy jsr malloc // main::@3 // unsigned char* buf2 = malloc(100) diff --git a/src/test/ref/millfork-benchmarks/linkedlist-kc.log b/src/test/ref/millfork-benchmarks/linkedlist-kc.log index 8e9709be8..88b764718 100644 --- a/src/test/ref/millfork-benchmarks/linkedlist-kc.log +++ b/src/test/ref/millfork-benchmarks/linkedlist-kc.log @@ -1515,7 +1515,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 @@ -1528,7 +1528,7 @@ __start: { main: { .label __5 = 6 .label i = $a - // [6] call start -- call_phi_near + // [6] call start jsr start // [7] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -1575,7 +1575,7 @@ main: { __b2: // [9] prepend::x#0 = main::i#2 // [10] call prepend - // [26] phi from main::@2 to prepend [phi:main::@2->prepend] -- call_phi_near + // [26] phi from main::@2 to prepend [phi:main::@2->prepend] prepend_from___b2: jsr prepend jmp __b5 @@ -1598,7 +1598,7 @@ main: { jmp __b3 // main::@3 __b3: - // [14] call sum -- call_phi_near + // [14] call sum jsr sum // [15] sum::return#2 = sum::s#3 jmp __b6 @@ -1611,7 +1611,7 @@ main: { // [40] phi from main::@6 to print_char [phi:main::@6->print_char] print_char_from___b6: // [40] phi print_char_cursor#27 = print_char_cursor#48 [phi:main::@6->print_char#0] -- register_copy - // [40] phi print_char::ch#3 = print_char::ch#2 [phi:main::@6->print_char#1] -- call_phi_near + // [40] phi print_char::ch#3 = print_char::ch#2 [phi:main::@6->print_char#1] -- register_copy jsr print_char jmp __b7 // main::@7 @@ -1626,7 +1626,7 @@ main: { jmp __b4 // main::@4 __b4: - // [22] call end -- call_phi_near + // [22] call end jsr end jmp __breturn // main::@return @@ -1652,7 +1652,7 @@ start: { prepend: { .label new = 4 .label x = $a - // [27] call alloc -- call_phi_near + // [27] call alloc jsr alloc // [28] alloc::return#2 = alloc::return#0 jmp __b1 @@ -1765,7 +1765,7 @@ end: { sta.z Ticks lda.z last_time+1 sta.z Ticks+1 - // [45] call start -- call_phi_near + // [45] call start jsr start jmp __b1 // end::@1 @@ -1784,7 +1784,7 @@ end: { lda.z last_time+1 sta.z Ticks_1+1 // [48] print_uint::w#0 = Ticks#1 - // [49] call print_uint -- call_phi_near + // [49] call print_uint jsr print_uint // [50] phi from end::@1 to end::@2 [phi:end::@1->end::@2] __b2_from___b1: @@ -1792,7 +1792,7 @@ end: { // end::@2 __b2: // [51] call print_ln - // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] -- call_phi_near + // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] print_ln_from___b2: jsr print_ln jmp __breturn @@ -1843,7 +1843,7 @@ print_uint: { // [58] call print_uchar // [67] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: - // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1853,7 +1853,7 @@ print_uint: { // [60] call print_uchar // [67] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: - // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1919,7 +1919,7 @@ print_uchar: { // [40] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [40] phi print_char_cursor#27 = print_char_cursor#28 [phi:print_uchar->print_char#0] -- register_copy - // [40] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [40] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1933,7 +1933,7 @@ print_uchar: { // [40] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [40] phi print_char_cursor#27 = print_char_cursor#28 [phi:print_uchar::@1->print_char#0] -- register_copy - // [40] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [40] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -2169,7 +2169,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 @@ -2180,7 +2180,7 @@ main: { .label __5 = 6 .label i = $a // start() - // [6] call start -- call_phi_near + // [6] call start jsr start // [7] phi from main to main::@1 [phi:main->main::@1] // [7] phi main::c#7 = 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 @@ -2215,7 +2215,7 @@ main: { // prepend(i) // [9] prepend::x#0 = main::i#2 // [10] call prepend - // [26] phi from main::@2 to prepend [phi:main::@2->prepend] -- call_phi_near + // [26] phi from main::@2 to prepend [phi:main::@2->prepend] jsr prepend // main::@5 // for(unsigned int i : 0..2999) @@ -2234,7 +2234,7 @@ main: { // [13] phi from main::@5 to main::@3 [phi:main::@5->main::@3] // main::@3 // sum() - // [14] call sum -- call_phi_near + // [14] call sum jsr sum // [15] sum::return#2 = sum::s#3 // main::@6 @@ -2245,7 +2245,7 @@ main: { // [18] call print_char // [40] phi from main::@6 to print_char [phi:main::@6->print_char] // [40] phi print_char_cursor#27 = print_char_cursor#48 [phi:main::@6->print_char#0] -- register_copy - // [40] phi print_char::ch#3 = print_char::ch#2 [phi:main::@6->print_char#1] -- call_phi_near + // [40] phi print_char::ch#3 = print_char::ch#2 [phi:main::@6->print_char#1] -- register_copy jsr print_char // main::@7 // for(unsigned char c : 0..4) @@ -2257,7 +2257,7 @@ main: { // [21] phi from main::@7 to main::@4 [phi:main::@7->main::@4] // main::@4 // end() - // [22] call end -- call_phi_near + // [22] call end jsr end // main::@return // } @@ -2283,7 +2283,7 @@ prepend: { .label new = 4 .label x = $a // alloc() - // [27] call alloc -- call_phi_near + // [27] call alloc jsr alloc // [28] alloc::return#2 = alloc::return#0 // prepend::@1 @@ -2399,7 +2399,7 @@ end: { lda.z last_time+1 sta.z Ticks+1 // start() - // [45] call start -- call_phi_near + // [45] call start jsr start // end::@1 // last_time -= Ticks @@ -2419,13 +2419,13 @@ end: { sta.z Ticks_1+1 // print_uint(Ticks) // [48] print_uint::w#0 = Ticks#1 - // [49] call print_uint -- call_phi_near + // [49] call print_uint jsr print_uint // [50] phi from end::@1 to end::@2 [phi:end::@1->end::@2] // end::@2 // print_ln() // [51] call print_ln - // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] -- call_phi_near + // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] jsr print_ln // end::@return // } @@ -2475,7 +2475,7 @@ print_uint: { ldx.z w+1 // [58] call print_uchar // [67] phi from print_uint to print_uchar [phi:print_uint->print_uchar] - // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -2483,7 +2483,7 @@ print_uint: { ldx.z w // [60] call print_uchar // [67] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] - // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@return // } @@ -2546,7 +2546,7 @@ print_uchar: { // Table of hexadecimal digits // [40] phi from print_uchar to print_char [phi:print_uchar->print_char] // [40] phi print_char_cursor#27 = print_char_cursor#28 [phi:print_uchar->print_char#0] -- register_copy - // [40] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [40] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2559,7 +2559,7 @@ print_uchar: { // [73] call print_char // [40] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [40] phi print_char_cursor#27 = print_char_cursor#28 [phi:print_uchar::@1->print_char#0] -- register_copy - // [40] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [40] phi print_char::ch#3 = 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/millfork-benchmarks/plasma-kc.log b/src/test/ref/millfork-benchmarks/plasma-kc.log index 717ae4bad..6498dc65b 100644 --- a/src/test/ref/millfork-benchmarks/plasma-kc.log +++ b/src/test/ref/millfork-benchmarks/plasma-kc.log @@ -2315,7 +2315,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 @@ -2330,7 +2330,7 @@ main: { .label v = $19 .label count = 2 // [6] call makechar - // [25] phi from main to makechar [phi:main->makechar] -- call_phi_near + // [25] phi from main to makechar [phi:main->makechar] makechar_from_main: jsr makechar // [7] phi from main to main::@4 [phi:main->main::@4] @@ -2338,7 +2338,7 @@ main: { jmp __b4 // main::@4 __b4: - // [8] call start -- call_phi_near + // [8] call start jsr start jmp __b5 // main::@5 @@ -2378,7 +2378,7 @@ main: { // [16] *((char *)CIA2) = main::block#1 -- _deref_pbuc1=vbuz1 lda.z block sta CIA2 - // [17] call end -- call_phi_near + // [17] call end /* Reset screen colors */ jsr end jmp __breturn @@ -2395,7 +2395,7 @@ main: { /* Build page 1, then make it visible */ // [61] phi from main::@2 to doplasma [phi:main::@2->doplasma] doplasma_from___b2: - // [61] phi doplasma::scrn#13 = SCREEN1 [phi:main::@2->doplasma#0] -- call_phi_near + // [61] phi doplasma::scrn#13 = SCREEN1 [phi:main::@2->doplasma#0] -- pbuz1=pbuc1 lda #SCREEN1 @@ -2411,7 +2411,7 @@ main: { /* Build page 2, then make it visible */ // [61] phi from main::@6 to doplasma [phi:main::@6->doplasma] doplasma_from___b6: - // [61] phi doplasma::scrn#13 = SCREEN2 [phi:main::@6->doplasma#0] -- call_phi_near + // [61] phi doplasma::scrn#13 = SCREEN2 [phi:main::@6->doplasma#0] -- pbuz1=pbuc1 lda #SCREEN2 @@ -2565,7 +2565,7 @@ makechar: { jmp __b6 // makechar::@6 __b6: - // [42] call rand -- call_phi_near + // [42] call rand jsr rand // [43] rand::return#2 = rand::return#0 jmp __b10 @@ -2623,7 +2623,7 @@ end: { sta.z Ticks lda.z last_time+1 sta.z Ticks+1 - // [53] call start -- call_phi_near + // [53] call start jsr start jmp __b1 // end::@1 @@ -2642,7 +2642,7 @@ end: { lda.z last_time+1 sta.z Ticks_1+1 // [56] print_uint::w#0 = Ticks#1 - // [57] call print_uint -- call_phi_near + // [57] call print_uint jsr print_uint // [58] phi from end::@1 to end::@2 [phi:end::@1->end::@2] __b2_from___b1: @@ -2650,7 +2650,7 @@ end: { // end::@2 __b2: // [59] call print_ln - // [99] phi from end::@2 to print_ln [phi:end::@2->print_ln] -- call_phi_near + // [99] phi from end::@2 to print_ln [phi:end::@2->print_ln] print_ln_from___b2: jsr print_ln jmp __breturn @@ -2897,7 +2897,7 @@ print_uint: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [104] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [104] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -2908,7 +2908,7 @@ print_uint: { // [104] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [104] phi print_char_cursor#37 = print_char_cursor#27 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [104] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [104] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -2974,7 +2974,7 @@ print_uchar: { // [112] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [112] phi print_char_cursor#26 = print_char_cursor#37 [phi:print_uchar->print_char#0] -- register_copy - // [112] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [112] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -2988,7 +2988,7 @@ print_uchar: { // [112] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [112] phi print_char_cursor#26 = print_char_cursor#27 [phi:print_uchar::@1->print_char#0] -- register_copy - // [112] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [112] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -3361,7 +3361,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 @@ -3374,12 +3374,12 @@ main: { .label count = 2 // makechar() // [6] call makechar - // [25] phi from main to makechar [phi:main->makechar] -- call_phi_near + // [25] phi from main to makechar [phi:main->makechar] jsr makechar // [7] phi from main to main::@4 [phi:main->main::@4] // main::@4 // start() - // [8] call start -- call_phi_near + // [8] call start jsr start // main::@5 // block = CIA2->PORT_A @@ -3421,7 +3421,7 @@ main: { lda.z block sta CIA2 // end() - // [17] call end -- call_phi_near + // [17] call end /* Reset screen colors */ jsr end // main::@return @@ -3435,7 +3435,7 @@ main: { // [20] call doplasma /* Build page 1, then make it visible */ // [61] phi from main::@2 to doplasma [phi:main::@2->doplasma] - // [61] phi doplasma::scrn#13 = SCREEN1 [phi:main::@2->doplasma#0] -- call_phi_near + // [61] phi doplasma::scrn#13 = SCREEN1 [phi:main::@2->doplasma#0] -- pbuz1=pbuc1 lda #SCREEN1 @@ -3450,7 +3450,7 @@ main: { // [22] call doplasma /* Build page 2, then make it visible */ // [61] phi from main::@6 to doplasma [phi:main::@6->doplasma] - // [61] phi doplasma::scrn#13 = SCREEN2 [phi:main::@6->doplasma#0] -- call_phi_near + // [61] phi doplasma::scrn#13 = SCREEN2 [phi:main::@6->doplasma#0] -- pbuz1=pbuc1 lda #SCREEN2 @@ -3597,7 +3597,7 @@ makechar: { // makechar::@6 __b6: // rand() - // [42] call rand -- call_phi_near + // [42] call rand jsr rand // [43] rand::return#2 = rand::return#0 // makechar::@10 @@ -3653,7 +3653,7 @@ end: { lda.z last_time+1 sta.z Ticks+1 // start() - // [53] call start -- call_phi_near + // [53] call start jsr start // end::@1 // last_time -= Ticks @@ -3673,13 +3673,13 @@ end: { sta.z Ticks_1+1 // print_uint(Ticks) // [56] print_uint::w#0 = Ticks#1 - // [57] call print_uint -- call_phi_near + // [57] call print_uint jsr print_uint // [58] phi from end::@1 to end::@2 [phi:end::@1->end::@2] // end::@2 // print_ln() // [59] call print_ln - // [99] phi from end::@2 to print_ln [phi:end::@2->print_ln] -- call_phi_near + // [99] phi from end::@2 to print_ln [phi:end::@2->print_ln] jsr print_ln // end::@return // } @@ -3932,7 +3932,7 @@ print_uint: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [104] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [104] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -3941,7 +3941,7 @@ print_uint: { // [97] call print_uchar // [104] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [104] phi print_char_cursor#37 = print_char_cursor#27 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [104] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [104] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -4004,7 +4004,7 @@ print_uchar: { // Table of hexadecimal digits // [112] phi from print_uchar to print_char [phi:print_uchar->print_char] // [112] phi print_char_cursor#26 = print_char_cursor#37 [phi:print_uchar->print_char#0] -- register_copy - // [112] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [112] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -4017,7 +4017,7 @@ print_uchar: { // [110] call print_char // [112] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [112] phi print_char_cursor#26 = print_char_cursor#27 [phi:print_uchar::@1->print_char#0] -- register_copy - // [112] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [112] phi print_char::ch#2 = 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/millfork-benchmarks/romsum-kc.log b/src/test/ref/millfork-benchmarks/romsum-kc.log index f2b536ec9..a29fd50cf 100644 --- a/src/test/ref/millfork-benchmarks/romsum-kc.log +++ b/src/test/ref/millfork-benchmarks/romsum-kc.log @@ -2079,7 +2079,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 @@ -2091,7 +2091,7 @@ __start: { // main main: { .label i = $d - // [6] call start -- call_phi_near + // [6] call start jsr start // [7] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -2125,7 +2125,7 @@ main: { jmp __b3 // main::@3 __b3: - // [10] call end -- call_phi_near + // [10] call end jsr end jmp __breturn // main::@return @@ -2138,7 +2138,7 @@ main: { // main::@2 __b2: // [13] call sum - // [32] phi from main::@2 to sum [phi:main::@2->sum] -- call_phi_near + // [32] phi from main::@2 to sum [phi:main::@2->sum] sum_from___b2: jsr sum // [14] sum::return#2 = sum::s#3 @@ -2146,7 +2146,7 @@ main: { // main::@4 __b4: // [15] print_uint_decimal::w#0 = sum::return#2 - // [16] call print_uint_decimal -- call_phi_near + // [16] call print_uint_decimal jsr print_uint_decimal // [17] phi from main::@4 to main::@5 [phi:main::@4->main::@5] __b5_from___b4: @@ -2156,7 +2156,7 @@ main: { // [18] call print_ln // [48] phi from main::@5 to print_ln [phi:main::@5->print_ln] print_ln_from___b5: - // [48] phi print_char_cursor#49 = print_char_cursor#1 [phi:main::@5->print_ln#0] -- call_phi_near + // [48] phi print_char_cursor#49 = print_char_cursor#1 [phi:main::@5->print_ln#0] -- register_copy jsr print_ln jmp __b6 // main::@6 @@ -2198,7 +2198,7 @@ end: { sta.z Ticks lda.z last_time+1 sta.z Ticks+1 - // [24] call start -- call_phi_near + // [24] call start jsr start jmp __b1 // end::@1 @@ -2217,7 +2217,7 @@ end: { lda.z last_time+1 sta.z Ticks_1+1 // [27] print_uint::w#0 = Ticks#1 - // [28] call print_uint -- call_phi_near + // [28] call print_uint jsr print_uint // [29] phi from end::@1 to end::@2 [phi:end::@1->end::@2] __b2_from___b1: @@ -2227,7 +2227,7 @@ end: { // [30] call print_ln // [48] phi from end::@2 to print_ln [phi:end::@2->print_ln] print_ln_from___b2: - // [48] phi print_char_cursor#49 = print_char_cursor#12 [phi:end::@2->print_ln#0] -- call_phi_near + // [48] phi print_char_cursor#49 = print_char_cursor#12 [phi:end::@2->print_ln#0] -- register_copy jsr print_ln jmp __breturn // end::@return @@ -2320,7 +2320,7 @@ print_uint_decimal: { .label w = 2 // [43] utoa::value#0 = print_uint_decimal::w#0 // [44] call utoa - // [58] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] -- call_phi_near + // [58] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] utoa_from_print_uint_decimal: jsr utoa // [45] phi from print_uint_decimal to print_uint_decimal::@1 [phi:print_uint_decimal->print_uint_decimal::@1] @@ -2329,7 +2329,7 @@ print_uint_decimal: { // print_uint_decimal::@1 __b1: // [46] call print_str - // [79] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] -- call_phi_near + // [79] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] print_str_from___b1: jsr print_str jmp __breturn @@ -2382,7 +2382,7 @@ print_uint: { // [86] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [86] phi print_char_cursor#52 = print_char_cursor#54 [phi:print_uint->print_uchar#0] -- register_copy - // [86] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [86] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -2393,7 +2393,7 @@ print_uint: { // [86] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [86] phi print_char_cursor#52 = print_char_cursor#12 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [86] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [86] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -2506,7 +2506,7 @@ utoa: { // [73] utoa_append::value#0 = utoa::value#2 // [74] utoa_append::sub#0 = utoa::digit_value#0 // [75] call utoa_append - // [94] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near + // [94] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] utoa_append_from___b5: jsr utoa_append // [76] utoa_append::return#0 = utoa_append::value#2 @@ -2562,7 +2562,7 @@ print_str: { // [101] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [101] phi print_char_cursor#36 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [101] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [101] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -2596,7 +2596,7 @@ print_uchar: { // [101] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [101] phi print_char_cursor#36 = print_char_cursor#52 [phi:print_uchar->print_char#0] -- register_copy - // [101] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [101] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -2610,7 +2610,7 @@ print_uchar: { // [101] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [101] phi print_char_cursor#36 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [101] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [101] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -3007,7 +3007,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 @@ -3017,7 +3017,7 @@ __start: { main: { .label i = $d // start() - // [6] call start -- call_phi_near + // [6] call start jsr start // [7] phi from main to main::@1 [phi:main->main::@1] // [7] phi print_line_cursor#22 = print_screen#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 @@ -3047,7 +3047,7 @@ main: { // [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3] // main::@3 // end() - // [10] call end -- call_phi_near + // [10] call end jsr end // main::@return // } @@ -3058,21 +3058,21 @@ main: { __b2: // sum() // [13] call sum - // [32] phi from main::@2 to sum [phi:main::@2->sum] -- call_phi_near + // [32] phi from main::@2 to sum [phi:main::@2->sum] jsr sum // sum() // [14] sum::return#2 = sum::s#3 // main::@4 // print_uint_decimal(sum()) // [15] print_uint_decimal::w#0 = sum::return#2 - // [16] call print_uint_decimal -- call_phi_near + // [16] call print_uint_decimal jsr print_uint_decimal // [17] phi from main::@4 to main::@5 [phi:main::@4->main::@5] // main::@5 // print_ln() // [18] call print_ln // [48] phi from main::@5 to print_ln [phi:main::@5->print_ln] - // [48] phi print_char_cursor#49 = print_char_cursor#1 [phi:main::@5->print_ln#0] -- call_phi_near + // [48] phi print_char_cursor#49 = print_char_cursor#1 [phi:main::@5->print_ln#0] -- register_copy jsr print_ln // main::@6 // for(i=0;i<6;i++) @@ -3114,7 +3114,7 @@ end: { lda.z last_time+1 sta.z Ticks+1 // start() - // [24] call start -- call_phi_near + // [24] call start jsr start // end::@1 // last_time -= Ticks @@ -3134,14 +3134,14 @@ end: { sta.z Ticks_1+1 // print_uint(Ticks) // [27] print_uint::w#0 = Ticks#1 - // [28] call print_uint -- call_phi_near + // [28] call print_uint jsr print_uint // [29] phi from end::@1 to end::@2 [phi:end::@1->end::@2] // end::@2 // print_ln() // [30] call print_ln // [48] phi from end::@2 to print_ln [phi:end::@2->print_ln] - // [48] phi print_char_cursor#49 = print_char_cursor#12 [phi:end::@2->print_ln#0] -- call_phi_near + // [48] phi print_char_cursor#49 = print_char_cursor#12 [phi:end::@2->print_ln#0] -- register_copy jsr print_ln // end::@return // } @@ -3231,13 +3231,13 @@ print_uint_decimal: { // utoa(w, decimal_digits, DECIMAL) // [43] utoa::value#0 = print_uint_decimal::w#0 // [44] call utoa - // [58] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] -- call_phi_near + // [58] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] jsr utoa // [45] phi from print_uint_decimal to print_uint_decimal::@1 [phi:print_uint_decimal->print_uint_decimal::@1] // print_uint_decimal::@1 // print_str(decimal_digits) // [46] call print_str - // [79] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] -- call_phi_near + // [79] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] jsr print_str // print_uint_decimal::@return // } @@ -3286,7 +3286,7 @@ print_uint: { // [54] call print_uchar // [86] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [86] phi print_char_cursor#52 = print_char_cursor#54 [phi:print_uint->print_uchar#0] -- register_copy - // [86] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [86] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -3295,7 +3295,7 @@ print_uint: { // [56] call print_uchar // [86] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [86] phi print_char_cursor#52 = print_char_cursor#12 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [86] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [86] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -3404,7 +3404,7 @@ utoa: { // [73] utoa_append::value#0 = utoa::value#2 // [74] utoa_append::sub#0 = utoa::digit_value#0 // [75] call utoa_append - // [94] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near + // [94] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] jsr utoa_append // utoa_append(buffer++, value, digit_value) // [76] utoa_append::return#0 = utoa_append::value#2 @@ -3457,7 +3457,7 @@ print_str: { // [84] call print_char // [101] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [101] phi print_char_cursor#36 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [101] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [101] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); @@ -3490,7 +3490,7 @@ print_uchar: { // Table of hexadecimal digits // [101] phi from print_uchar to print_char [phi:print_uchar->print_char] // [101] phi print_char_cursor#36 = print_char_cursor#52 [phi:print_uchar->print_char#0] -- register_copy - // [101] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [101] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -3503,7 +3503,7 @@ print_uchar: { // [92] call print_char // [101] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [101] phi print_char_cursor#36 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [101] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [101] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/millfork-benchmarks/sieve-kc.log b/src/test/ref/millfork-benchmarks/sieve-kc.log index c022d9e19..2d2c4c18b 100644 --- a/src/test/ref/millfork-benchmarks/sieve-kc.log +++ b/src/test/ref/millfork-benchmarks/sieve-kc.log @@ -1162,7 +1162,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 @@ -1173,7 +1173,7 @@ __start: { } // main main: { - // [6] call start -- call_phi_near + // [6] call start jsr start // [7] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -1181,7 +1181,7 @@ main: { // main::@1 __b1: // [8] call round - // [32] phi from main::@1 to round [phi:main::@1->round] -- call_phi_near + // [32] phi from main::@1 to round [phi:main::@1->round] round_from___b1: jsr round // [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -1190,7 +1190,7 @@ main: { // main::@2 __b2: // [10] call round - // [32] phi from main::@2 to round [phi:main::@2->round] -- call_phi_near + // [32] phi from main::@2 to round [phi:main::@2->round] round_from___b2: jsr round // [11] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -1199,7 +1199,7 @@ main: { // main::@3 __b3: // [12] call round - // [32] phi from main::@3 to round [phi:main::@3->round] -- call_phi_near + // [32] phi from main::@3 to round [phi:main::@3->round] round_from___b3: jsr round // [13] phi from main::@3 to main::@4 [phi:main::@3->main::@4] @@ -1208,7 +1208,7 @@ main: { // main::@4 __b4: // [14] call round - // [32] phi from main::@4 to round [phi:main::@4->round] -- call_phi_near + // [32] phi from main::@4 to round [phi:main::@4->round] round_from___b4: jsr round // [15] phi from main::@4 to main::@5 [phi:main::@4->main::@5] @@ -1217,7 +1217,7 @@ main: { // main::@5 __b5: // [16] call round - // [32] phi from main::@5 to round [phi:main::@5->round] -- call_phi_near + // [32] phi from main::@5 to round [phi:main::@5->round] round_from___b5: jsr round // [17] phi from main::@5 to main::@6 [phi:main::@5->main::@6] @@ -1226,7 +1226,7 @@ main: { // main::@6 __b6: // [18] call round - // [32] phi from main::@6 to round [phi:main::@6->round] -- call_phi_near + // [32] phi from main::@6 to round [phi:main::@6->round] round_from___b6: jsr round // [19] phi from main::@6 to main::@7 [phi:main::@6->main::@7] @@ -1235,7 +1235,7 @@ main: { // main::@7 __b7: // [20] call round - // [32] phi from main::@7 to round [phi:main::@7->round] -- call_phi_near + // [32] phi from main::@7 to round [phi:main::@7->round] round_from___b7: jsr round // [21] phi from main::@7 to main::@8 [phi:main::@7->main::@8] @@ -1244,7 +1244,7 @@ main: { // main::@8 __b8: // [22] call round - // [32] phi from main::@8 to round [phi:main::@8->round] -- call_phi_near + // [32] phi from main::@8 to round [phi:main::@8->round] round_from___b8: jsr round // [23] phi from main::@8 to main::@9 [phi:main::@8->main::@9] @@ -1253,7 +1253,7 @@ main: { // main::@9 __b9: // [24] call round - // [32] phi from main::@9 to round [phi:main::@9->round] -- call_phi_near + // [32] phi from main::@9 to round [phi:main::@9->round] round_from___b9: jsr round // [25] phi from main::@9 to main::@10 [phi:main::@9->main::@10] @@ -1262,7 +1262,7 @@ main: { // main::@10 __b10: // [26] call round - // [32] phi from main::@10 to round [phi:main::@10->round] -- call_phi_near + // [32] phi from main::@10 to round [phi:main::@10->round] round_from___b10: jsr round // [27] phi from main::@10 to main::@11 [phi:main::@10->main::@11] @@ -1270,7 +1270,7 @@ main: { jmp __b11 // main::@11 __b11: - // [28] call end -- call_phi_near + // [28] call end jsr end jmp __breturn // main::@return @@ -1411,7 +1411,7 @@ end: { sta.z Ticks lda.z last_time+1 sta.z Ticks+1 - // [49] call start -- call_phi_near + // [49] call start jsr start jmp __b1 // end::@1 @@ -1430,7 +1430,7 @@ end: { lda.z last_time+1 sta.z Ticks_1+1 // [52] print_uint::w#0 = Ticks#1 - // [53] call print_uint -- call_phi_near + // [53] call print_uint jsr print_uint // [54] phi from end::@1 to end::@2 [phi:end::@1->end::@2] __b2_from___b1: @@ -1438,7 +1438,7 @@ end: { // end::@2 __b2: // [55] call print_ln - // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] -- call_phi_near + // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] print_ln_from___b2: jsr print_ln jmp __breturn @@ -1462,7 +1462,7 @@ print_uint: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1473,7 +1473,7 @@ print_uint: { // [67] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [67] phi print_char_cursor#37 = print_char_cursor#27 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1539,7 +1539,7 @@ print_uchar: { // [75] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [75] phi print_char_cursor#26 = print_char_cursor#37 [phi:print_uchar->print_char#0] -- register_copy - // [75] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [75] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1553,7 +1553,7 @@ print_uchar: { // [75] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [75] phi print_char_cursor#26 = print_char_cursor#27 [phi:print_uchar::@1->print_char#0] -- register_copy - // [75] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [75] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1802,7 +1802,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 @@ -1811,72 +1811,72 @@ __start: { // main main: { // start() - // [6] call start -- call_phi_near + // [6] call start jsr start // [7] phi from main to main::@1 [phi:main->main::@1] // main::@1 // round() // [8] call round - // [32] phi from main::@1 to round [phi:main::@1->round] -- call_phi_near + // [32] phi from main::@1 to round [phi:main::@1->round] jsr round // [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // round() // [10] call round - // [32] phi from main::@2 to round [phi:main::@2->round] -- call_phi_near + // [32] phi from main::@2 to round [phi:main::@2->round] jsr round // [11] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // round() // [12] call round - // [32] phi from main::@3 to round [phi:main::@3->round] -- call_phi_near + // [32] phi from main::@3 to round [phi:main::@3->round] jsr round // [13] phi from main::@3 to main::@4 [phi:main::@3->main::@4] // main::@4 // round() // [14] call round - // [32] phi from main::@4 to round [phi:main::@4->round] -- call_phi_near + // [32] phi from main::@4 to round [phi:main::@4->round] jsr round // [15] phi from main::@4 to main::@5 [phi:main::@4->main::@5] // main::@5 // round() // [16] call round - // [32] phi from main::@5 to round [phi:main::@5->round] -- call_phi_near + // [32] phi from main::@5 to round [phi:main::@5->round] jsr round // [17] phi from main::@5 to main::@6 [phi:main::@5->main::@6] // main::@6 // round() // [18] call round - // [32] phi from main::@6 to round [phi:main::@6->round] -- call_phi_near + // [32] phi from main::@6 to round [phi:main::@6->round] jsr round // [19] phi from main::@6 to main::@7 [phi:main::@6->main::@7] // main::@7 // round() // [20] call round - // [32] phi from main::@7 to round [phi:main::@7->round] -- call_phi_near + // [32] phi from main::@7 to round [phi:main::@7->round] jsr round // [21] phi from main::@7 to main::@8 [phi:main::@7->main::@8] // main::@8 // round() // [22] call round - // [32] phi from main::@8 to round [phi:main::@8->round] -- call_phi_near + // [32] phi from main::@8 to round [phi:main::@8->round] jsr round // [23] phi from main::@8 to main::@9 [phi:main::@8->main::@9] // main::@9 // round() // [24] call round - // [32] phi from main::@9 to round [phi:main::@9->round] -- call_phi_near + // [32] phi from main::@9 to round [phi:main::@9->round] jsr round // [25] phi from main::@9 to main::@10 [phi:main::@9->main::@10] // main::@10 // round() // [26] call round - // [32] phi from main::@10 to round [phi:main::@10->round] -- call_phi_near + // [32] phi from main::@10 to round [phi:main::@10->round] jsr round // [27] phi from main::@10 to main::@11 [phi:main::@10->main::@11] // main::@11 // end() - // [28] call end -- call_phi_near + // [28] call end jsr end // main::@return // } @@ -2016,7 +2016,7 @@ end: { lda.z last_time+1 sta.z Ticks+1 // start() - // [49] call start -- call_phi_near + // [49] call start jsr start // end::@1 // last_time -= Ticks @@ -2036,13 +2036,13 @@ end: { sta.z Ticks_1+1 // print_uint(Ticks) // [52] print_uint::w#0 = Ticks#1 - // [53] call print_uint -- call_phi_near + // [53] call print_uint jsr print_uint // [54] phi from end::@1 to end::@2 [phi:end::@1->end::@2] // end::@2 // print_ln() // [55] call print_ln - // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] -- call_phi_near + // [62] phi from end::@2 to print_ln [phi:end::@2->print_ln] jsr print_ln // end::@return // } @@ -2064,7 +2064,7 @@ print_uint: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -2073,7 +2073,7 @@ print_uint: { // [60] call print_uchar // [67] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [67] phi print_char_cursor#37 = print_char_cursor#27 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [67] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -2136,7 +2136,7 @@ print_uchar: { // Table of hexadecimal digits // [75] phi from print_uchar to print_char [phi:print_uchar->print_char] // [75] phi print_char_cursor#26 = print_char_cursor#37 [phi:print_uchar->print_char#0] -- register_copy - // [75] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [75] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2149,7 +2149,7 @@ print_uchar: { // [73] call print_char // [75] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [75] phi print_char_cursor#26 = print_char_cursor#27 [phi:print_uchar::@1->print_char#0] -- register_copy - // [75] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [75] phi print_char::ch#2 = 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/min-fmul-16.log b/src/test/ref/min-fmul-16.log index c77e7eb9b..a5d1cdb6c 100644 --- a/src/test/ref/min-fmul-16.log +++ b/src/test/ref/min-fmul-16.log @@ -1304,7 +1304,7 @@ main: { .label b = $929 .label r = $a // [1] call mulf_init - // [12] phi from main to mulf_init [phi:main->mulf_init] -- call_phi_near + // [12] phi from main to mulf_init [phi:main->mulf_init] mulf_init_from_main: jsr mulf_init jmp __b4 @@ -1334,7 +1334,7 @@ main: { __b3: // [5] *BORDER_COLOR = ++ *BORDER_COLOR -- _deref_pbuc1=_inc__deref_pbuc1 inc BORDER_COLOR - // [6] call mulf16u -- call_phi_near + // [6] call mulf16u jsr mulf16u // [7] mulf16u::return#0 = mulf16u::return#1 jmp __b5 @@ -1344,7 +1344,7 @@ main: { // [9] *BORDER_COLOR = -- *BORDER_COLOR -- _deref_pbuc1=_dec__deref_pbuc1 dec BORDER_COLOR // [10] print_ulong::dw#0 = main::r#0 - // [11] call print_ulong -- call_phi_near + // [11] call print_ulong jsr print_ulong // [3] phi from main::@5 to main::@1 [phi:main::@5->main::@1] __b1_from___b5: @@ -1702,7 +1702,7 @@ print_ulong: { // [51] phi from print_ulong to print_uint [phi:print_ulong->print_uint] print_uint_from_print_ulong: // [51] phi print_char_cursor#36 = print_char_cursor#15 [phi:print_ulong->print_uint#0] -- register_copy - // [51] phi print_uint::w#2 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- call_phi_near + // [51] phi print_uint::w#2 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- register_copy jsr print_uint jmp __b1 // print_ulong::@1 @@ -1716,7 +1716,7 @@ print_ulong: { // [51] phi from print_ulong::@1 to print_uint [phi:print_ulong::@1->print_uint] print_uint_from___b1: // [51] phi print_char_cursor#36 = print_char_cursor#10 [phi:print_ulong::@1->print_uint#0] -- register_copy - // [51] phi print_uint::w#2 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- call_phi_near + // [51] phi print_uint::w#2 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- register_copy jsr print_uint jmp __breturn // print_ulong::@return @@ -1735,7 +1735,7 @@ print_uint: { // [57] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [57] phi print_char_cursor#38 = print_char_cursor#36 [phi:print_uint->print_uchar#0] -- register_copy - // [57] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [57] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1746,7 +1746,7 @@ print_uint: { // [57] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [57] phi print_char_cursor#38 = print_char_cursor#10 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [57] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [57] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1772,7 +1772,7 @@ print_uchar: { // [65] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [65] phi print_char_cursor#28 = print_char_cursor#38 [phi:print_uchar->print_char#0] -- register_copy - // [65] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [65] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1786,7 +1786,7 @@ print_uchar: { // [65] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [65] phi print_char_cursor#28 = print_char_cursor#10 [phi:print_uchar::@1->print_char#0] -- register_copy - // [65] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [65] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -2039,7 +2039,7 @@ main: { .label r = $a // mulf_init() // [1] call mulf_init - // [12] phi from main to mulf_init [phi:main->mulf_init] -- call_phi_near + // [12] phi from main to mulf_init [phi:main->mulf_init] jsr mulf_init // main::@4 // asm @@ -2064,7 +2064,7 @@ main: { // [5] *BORDER_COLOR = ++ *BORDER_COLOR -- _deref_pbuc1=_inc__deref_pbuc1 inc BORDER_COLOR // dword r = mulf16u(a, b) - // [6] call mulf16u -- call_phi_near + // [6] call mulf16u jsr mulf16u // [7] mulf16u::return#0 = mulf16u::return#1 // main::@5 @@ -2074,7 +2074,7 @@ main: { dec BORDER_COLOR // print_ulong(r) // [10] print_ulong::dw#0 = main::r#0 - // [11] call print_ulong -- call_phi_near + // [11] call print_ulong jsr print_ulong // [3] phi from main::@5 to main::@1 [phi:main::@5->main::@1] // [3] phi print_char_cursor#15 = SCREEN [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 @@ -2431,7 +2431,7 @@ print_ulong: { // [47] call print_uint // [51] phi from print_ulong to print_uint [phi:print_ulong->print_uint] // [51] phi print_char_cursor#36 = print_char_cursor#15 [phi:print_ulong->print_uint#0] -- register_copy - // [51] phi print_uint::w#2 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- call_phi_near + // [51] phi print_uint::w#2 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- register_copy jsr print_uint // print_ulong::@1 // print_uint(WORD0(dw)) @@ -2443,7 +2443,7 @@ print_ulong: { // [49] call print_uint // [51] phi from print_ulong::@1 to print_uint [phi:print_ulong::@1->print_uint] // [51] phi print_char_cursor#36 = print_char_cursor#10 [phi:print_ulong::@1->print_uint#0] -- register_copy - // [51] phi print_uint::w#2 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- call_phi_near + // [51] phi print_uint::w#2 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- register_copy jsr print_uint // print_ulong::@return // } @@ -2461,7 +2461,7 @@ print_uint: { // [53] call print_uchar // [57] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [57] phi print_char_cursor#38 = print_char_cursor#36 [phi:print_uint->print_uchar#0] -- register_copy - // [57] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [57] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -2470,7 +2470,7 @@ print_uint: { // [55] call print_uchar // [57] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [57] phi print_char_cursor#38 = print_char_cursor#10 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [57] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [57] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -2496,7 +2496,7 @@ print_uchar: { // Table of hexadecimal digits // [65] phi from print_uchar to print_char [phi:print_uchar->print_char] // [65] phi print_char_cursor#28 = print_char_cursor#38 [phi:print_uchar->print_char#0] -- register_copy - // [65] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [65] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2509,7 +2509,7 @@ print_uchar: { // [63] call print_char // [65] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [65] phi print_char_cursor#28 = print_char_cursor#10 [phi:print_uchar::@1->print_char#0] -- register_copy - // [65] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [65] phi print_char::ch#2 = 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/missing-band.log b/src/test/ref/missing-band.log index f452c37cb..344b3707d 100644 --- a/src/test/ref/missing-band.log +++ b/src/test/ref/missing-band.log @@ -198,7 +198,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { .label a = 2 - // [1] call foo -- call_phi_near + // [1] call foo jsr foo // [2] foo::return#0 = foo::return#1 jmp __b1 @@ -287,7 +287,7 @@ Score: 39 main: { .label a = 2 // foo(1) - // [1] call foo -- call_phi_near + // [1] call foo jsr foo // [2] foo::return#0 = foo::return#1 // main::@1 diff --git a/src/test/ref/modglobal.log b/src/test/ref/modglobal.log index c76028bca..955b0c772 100644 --- a/src/test/ref/modglobal.log +++ b/src/test/ref/modglobal.log @@ -394,7 +394,7 @@ main: { ldx #0 // [13] phi cnt2#11 = 0 [phi:main->inccnt#1] -- vbuyy=vbuc1 ldy #0 - // [13] phi cnt#12 = 0 [phi:main->inccnt#2] -- call_phi_near + // [13] phi cnt#12 = 0 [phi:main->inccnt#2] -- vbuaa=vbuc1 lda #0 jsr inccnt // [2] inccnt::return#0 = inccnt::return#2 @@ -413,7 +413,7 @@ main: { inccnt_from___b1: // [13] phi cnt3#11 = cnt3#12 [phi:main::@1->inccnt#0] -- register_copy // [13] phi cnt2#11 = cnt2#12 [phi:main::@1->inccnt#1] -- register_copy - // [13] phi cnt#12 = cnt#1 [phi:main::@1->inccnt#2] -- call_phi_near + // [13] phi cnt#12 = cnt#1 [phi:main::@1->inccnt#2] -- register_copy jsr inccnt // [7] inccnt::return#1 = inccnt::return#2 jmp __b2 @@ -527,7 +527,7 @@ main: { ldx #0 // [13] phi cnt2#11 = 0 [phi:main->inccnt#1] -- vbuyy=vbuc1 ldy #0 - // [13] phi cnt#12 = 0 [phi:main->inccnt#2] -- call_phi_near + // [13] phi cnt#12 = 0 [phi:main->inccnt#2] -- vbuaa=vbuc1 txa jsr inccnt // inccnt() @@ -547,7 +547,7 @@ main: { // [13] phi from main::@1 to inccnt [phi:main::@1->inccnt] // [13] phi cnt3#11 = cnt3#12 [phi:main::@1->inccnt#0] -- register_copy // [13] phi cnt2#11 = cnt2#12 [phi:main::@1->inccnt#1] -- register_copy - // [13] phi cnt#12 = cnt#1 [phi:main::@1->inccnt#2] -- call_phi_near + // [13] phi cnt#12 = cnt#1 [phi:main::@1->inccnt#2] -- register_copy jsr inccnt // inccnt() // [7] inccnt::return#1 = inccnt::return#2 diff --git a/src/test/ref/modglobalmin.log b/src/test/ref/modglobalmin.log index 1868da3ec..be74abc80 100644 --- a/src/test/ref/modglobalmin.log +++ b/src/test/ref/modglobalmin.log @@ -215,7 +215,7 @@ main: { // [1] call inccnt // [8] phi from main to inccnt [phi:main->inccnt] inccnt_from_main: - // [8] phi cnt#13 = 0 [phi:main->inccnt#0] -- call_phi_near + // [8] phi cnt#13 = 0 [phi:main->inccnt#0] -- vbuxx=vbuc1 ldx #0 jsr inccnt jmp __b1 @@ -228,7 +228,7 @@ main: { // [4] call inccnt // [8] phi from main::@1 to inccnt [phi:main::@1->inccnt] inccnt_from___b1: - // [8] phi cnt#13 = cnt#1 [phi:main::@1->inccnt#0] -- call_phi_near + // [8] phi cnt#13 = cnt#1 [phi:main::@1->inccnt#0] -- register_copy jsr inccnt jmp __b2 // main::@2 @@ -305,7 +305,7 @@ main: { // inccnt() // [1] call inccnt // [8] phi from main to inccnt [phi:main->inccnt] - // [8] phi cnt#13 = 0 [phi:main->inccnt#0] -- call_phi_near + // [8] phi cnt#13 = 0 [phi:main->inccnt#0] -- vbuxx=vbuc1 ldx #0 jsr inccnt // main::@1 @@ -318,7 +318,7 @@ main: { // inccnt() // [4] call inccnt // [8] phi from main::@1 to inccnt [phi:main::@1->inccnt] - // [8] phi cnt#13 = cnt#1 [phi:main::@1->inccnt#0] -- call_phi_near + // [8] phi cnt#13 = cnt#1 [phi:main::@1->inccnt#0] -- register_copy jsr inccnt // main::@2 // SCREEN[1]=++cnt; diff --git a/src/test/ref/mul8u-min.log b/src/test/ref/mul8u-min.log index 7fc828d4b..200b2bb19 100644 --- a/src/test/ref/mul8u-min.log +++ b/src/test/ref/mul8u-min.log @@ -516,7 +516,7 @@ main: { ldx.z a // [4] mul8u::b#0 = main::b#2 -- vbuaa=vbuyy tya - // [5] call mul8u -- call_phi_near + // [5] call mul8u jsr mul8u // [6] mul8u::return#2 = mul8u::res#2 jmp __b4 @@ -757,7 +757,7 @@ main: { ldx.z a // [4] mul8u::b#0 = main::b#2 -- vbuaa=vbuyy tya - // [5] call mul8u -- call_phi_near + // [5] call mul8u jsr mul8u // [6] mul8u::return#2 = mul8u::res#2 // main::@4 diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log index 4028e59da..ba50c3453 100644 --- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log +++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log @@ -1759,7 +1759,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [8] call main -- call_phi_near + // [8] call main jsr main jmp __breturn // __start::@return @@ -1782,7 +1782,7 @@ plex_irq: { jmp __b3 // plex_irq::@3 __b3: - // [13] call plexShowSprite -- call_phi_near + // [13] call plexShowSprite jsr plexShowSprite jmp plexFreeNextYpos1 // plex_irq::plexFreeNextYpos1 @@ -1851,7 +1851,7 @@ plex_irq: { main: { // asm { sei } sei - // [27] call init -- call_phi_near + // [27] call init jsr init // [28] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -1859,7 +1859,7 @@ main: { // main::@1 __b1: // [29] call loop - // [79] phi from main::@1 to loop [phi:main::@1->loop] -- call_phi_near + // [79] phi from main::@1 to loop [phi:main::@1->loop] loop_from___b1: jsr loop jmp __breturn @@ -1981,7 +1981,7 @@ init: { sta D011 // [57] call plexInit // Initialize the multiplexer - // [94] phi from init to plexInit [phi:init->plexInit] -- call_phi_near + // [94] phi from init to plexInit [phi:init->plexInit] plexInit_from_init: jsr plexInit // [58] phi from init to init::@1 [phi:init->init::@1] @@ -2147,7 +2147,7 @@ loop: { // [90] *BORDER_COLOR = ++ *BORDER_COLOR -- _deref_pbuc1=_inc__deref_pbuc1 inc BORDER_COLOR // [91] call plexSort - // [101] phi from loop::@5 to plexSort [phi:loop::@5->plexSort] -- call_phi_near + // [101] phi from loop::@5 to plexSort [phi:loop::@5->plexSort] plexSort_from___b5: jsr plexSort jmp __b6 @@ -2756,7 +2756,7 @@ __start: { sta.z framedone // [7] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] // __start::@1 - // [8] call main -- call_phi_near + // [8] call main jsr main // __start::@return // [9] return @@ -2777,7 +2777,7 @@ plex_irq: { // plex_irq::@3 __b3: // plexShowSprite() - // [13] call plexShowSprite -- call_phi_near + // [13] call plexShowSprite jsr plexShowSprite // plex_irq::plexFreeNextYpos1 // return PLEX_FREE_YPOS[plex_free_next]; @@ -2847,13 +2847,13 @@ main: { // asm { sei } sei // init() - // [27] call init -- call_phi_near + // [27] call init jsr init // [28] phi from main to main::@1 [phi:main->main::@1] // main::@1 // loop() // [29] call loop - // [79] phi from main::@1 to loop [phi:main::@1->loop] -- call_phi_near + // [79] phi from main::@1 to loop [phi:main::@1->loop] jsr loop // main::@return // } @@ -2989,7 +2989,7 @@ init: { // plexInit(SCREEN) // [57] call plexInit // Initialize the multiplexer - // [94] phi from init to plexInit [phi:init->plexInit] -- call_phi_near + // [94] phi from init to plexInit [phi:init->plexInit] jsr plexInit // [58] phi from init to init::@1 [phi:init->init::@1] // [58] phi init::xp#2 = $20 [phi:init->init::@1#0] -- vwuz1=vwuc1 @@ -3153,7 +3153,7 @@ loop: { inc BORDER_COLOR // plexSort() // [91] call plexSort - // [101] phi from loop::@5 to plexSort [phi:loop::@5->plexSort] -- call_phi_near + // [101] phi from loop::@5 to plexSort [phi:loop::@5->plexSort] jsr plexSort // loop::@6 // *BORDER_COLOR = GREEN diff --git a/src/test/ref/multiply-16bit-const.log b/src/test/ref/multiply-16bit-const.log index a2bb26f85..d043c37d7 100644 --- a/src/test/ref/multiply-16bit-const.log +++ b/src/test/ref/multiply-16bit-const.log @@ -1638,7 +1638,7 @@ main: { .label __10 = 2 .label __11 = 2 // [1] call print_cls - // [18] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [18] 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] @@ -1793,7 +1793,7 @@ main: { lda.z print_ulong_decimal.w+3 adc.z i+3 sta.z print_ulong_decimal.w+3 - // [13] call print_ulong_decimal -- call_phi_near + // [13] call print_ulong_decimal jsr print_ulong_decimal // [14] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -1801,7 +1801,7 @@ main: { // main::@3 __b3: // [15] call print_ln - // [26] phi from main::@3 to print_ln [phi:main::@3->print_ln] -- call_phi_near + // [26] phi from main::@3 to print_ln [phi:main::@3->print_ln] print_ln_from___b3: jsr print_ln jmp __b4 @@ -1837,7 +1837,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [19] call memset - // [32] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [32] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -1853,7 +1853,7 @@ print_ulong_decimal: { .label w = 2 // [21] ultoa::value#0 = print_ulong_decimal::w#0 // [22] call ultoa - // [38] phi from print_ulong_decimal to ultoa [phi:print_ulong_decimal->ultoa] -- call_phi_near + // [38] phi from print_ulong_decimal to ultoa [phi:print_ulong_decimal->ultoa] ultoa_from_print_ulong_decimal: jsr ultoa // [23] phi from print_ulong_decimal to print_ulong_decimal::@1 [phi:print_ulong_decimal->print_ulong_decimal::@1] @@ -1861,7 +1861,7 @@ print_ulong_decimal: { jmp __b1 // print_ulong_decimal::@1 __b1: - // [24] call print_str -- call_phi_near + // [24] call print_str jsr print_str jmp __breturn // print_ulong_decimal::@return @@ -2076,7 +2076,7 @@ ultoa: { // [53] ultoa_append::value#0 = ultoa::value#2 // [54] ultoa_append::sub#0 = ultoa::digit_value#0 // [55] call ultoa_append - // [66] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] -- call_phi_near + // [66] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] ultoa_append_from___b5: jsr ultoa_append // [56] ultoa_append::return#0 = ultoa_append::value#2 @@ -2133,7 +2133,7 @@ print_str: { // [63] print_char::ch#0 = *print_str::str#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (str),y - // [64] call print_char -- call_phi_near + // [64] call print_char jsr print_char jmp __b3 // print_str::@3 @@ -2473,7 +2473,7 @@ main: { .label __11 = 2 // print_cls() // [1] call print_cls - // [18] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [18] 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 print_char_cursor#13 = print_screen#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 @@ -2625,13 +2625,13 @@ main: { lda.z print_ulong_decimal.w+3 adc.z i+3 sta.z print_ulong_decimal.w+3 - // [13] call print_ulong_decimal -- call_phi_near + // [13] call print_ulong_decimal jsr print_ulong_decimal // [14] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // print_ln() // [15] call print_ln - // [26] phi from main::@3 to print_ln [phi:main::@3->print_ln] -- call_phi_near + // [26] phi from main::@3 to print_ln [phi:main::@3->print_ln] jsr print_ln // main::@4 // i+=333 @@ -2665,7 +2665,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [19] call memset - // [32] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [32] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -2680,12 +2680,12 @@ print_ulong_decimal: { // ultoa(w, decimal_digits_long, DECIMAL) // [21] ultoa::value#0 = print_ulong_decimal::w#0 // [22] call ultoa - // [38] phi from print_ulong_decimal to ultoa [phi:print_ulong_decimal->ultoa] -- call_phi_near + // [38] phi from print_ulong_decimal to ultoa [phi:print_ulong_decimal->ultoa] jsr ultoa // [23] phi from print_ulong_decimal to print_ulong_decimal::@1 [phi:print_ulong_decimal->print_ulong_decimal::@1] // print_ulong_decimal::@1 // print_str(decimal_digits_long) - // [24] call print_str -- call_phi_near + // [24] call print_str jsr print_str // print_ulong_decimal::@return // } @@ -2893,7 +2893,7 @@ ultoa: { // [53] ultoa_append::value#0 = ultoa::value#2 // [54] ultoa_append::sub#0 = ultoa::digit_value#0 // [55] call ultoa_append - // [66] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] -- call_phi_near + // [66] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] jsr ultoa_append // ultoa_append(buffer++, value, digit_value) // [56] ultoa_append::return#0 = ultoa_append::value#2 @@ -2948,7 +2948,7 @@ print_str: { // [63] print_char::ch#0 = *print_str::str#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (str),y - // [64] call print_char -- call_phi_near + // [64] call print_char jsr print_char // print_str::@3 // print_char(*(str++)); diff --git a/src/test/ref/nes-array.log b/src/test/ref/nes-array.log index 7aef83712..9730630ef 100644 --- a/src/test/ref/nes-array.log +++ b/src/test/ref/nes-array.log @@ -318,7 +318,7 @@ main: { sta.z foo.y lda #>y1 sta.z foo.y+1 - // [11] phi foo::x#2 = 1 [phi:main->foo#1] -- call_phi_near + // [11] phi foo::x#2 = 1 [phi:main->foo#1] -- vbuxx=vbuc1 ldx #1 jsr foo // [3] foo::return#2 = foo::return#0 @@ -339,7 +339,7 @@ main: { sta.z foo.y lda #>y2 sta.z foo.y+1 - // [11] phi foo::x#2 = 2 [phi:main::@1->foo#1] -- call_phi_near + // [11] phi foo::x#2 = 2 [phi:main::@1->foo#1] -- vbuxx=vbuc1 ldx #2 jsr foo // [7] foo::return#3 = foo::return#0 @@ -476,7 +476,7 @@ main: { sta.z foo.y lda #>y1 sta.z foo.y+1 - // [11] phi foo::x#2 = 1 [phi:main->foo#1] -- call_phi_near + // [11] phi foo::x#2 = 1 [phi:main->foo#1] -- vbuxx=vbuc1 ldx #1 jsr foo // foo(1, &y1) @@ -497,7 +497,7 @@ main: { sta.z foo.y lda #>y2 sta.z foo.y+1 - // [11] phi foo::x#2 = 2 [phi:main::@1->foo#1] -- call_phi_near + // [11] phi foo::x#2 = 2 [phi:main::@1->foo#1] -- vbuxx=vbuc1 ldx #2 jsr foo // foo(2, &y2) diff --git a/src/test/ref/nomodify-3.log b/src/test/ref/nomodify-3.log index c417d2987..54e25b59f 100644 --- a/src/test/ref/nomodify-3.log +++ b/src/test/ref/nomodify-3.log @@ -133,7 +133,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -204,7 +204,7 @@ __start: { sta.z i // [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/nomodify-4.log b/src/test/ref/nomodify-4.log index 2967bc6f7..7acfaf501 100644 --- a/src/test/ref/nomodify-4.log +++ b/src/test/ref/nomodify-4.log @@ -140,7 +140,7 @@ main: { // [1] call print // [5] phi from main to print [phi:main->print] print_from_main: - // [5] phi print::c#2 = 'a' [phi:main->print#0] -- call_phi_near + // [5] phi print::c#2 = 'a' [phi:main->print#0] -- vbuaa=vbuc1 lda #'a' jsr print // [2] phi from main to main::@1 [phi:main->main::@1] @@ -151,7 +151,7 @@ main: { // [3] call print // [5] phi from main::@1 to print [phi:main::@1->print] print_from___b1: - // [5] phi print::c#2 = 'b' [phi:main::@1->print#0] -- call_phi_near + // [5] phi print::c#2 = 'b' [phi:main::@1->print#0] -- vbuaa=vbuc1 lda #'b' jsr print jmp __breturn @@ -219,7 +219,7 @@ main: { // print('a') // [1] call print // [5] phi from main to print [phi:main->print] - // [5] phi print::c#2 = 'a' [phi:main->print#0] -- call_phi_near + // [5] phi print::c#2 = 'a' [phi:main->print#0] -- vbuaa=vbuc1 lda #'a' jsr print // [2] phi from main to main::@1 [phi:main->main::@1] @@ -227,7 +227,7 @@ main: { // print('b') // [3] call print // [5] phi from main::@1 to print [phi:main::@1->print] - // [5] phi print::c#2 = 'b' [phi:main::@1->print#0] -- call_phi_near + // [5] phi print::c#2 = 'b' [phi:main::@1->print#0] -- vbuaa=vbuc1 lda #'b' jsr print // main::@return diff --git a/src/test/ref/norom-charset.log b/src/test/ref/norom-charset.log index 9004c2050..d4b232a12 100644 --- a/src/test/ref/norom-charset.log +++ b/src/test/ref/norom-charset.log @@ -606,7 +606,7 @@ main: { lda charset_spec_row+1,x sta.z gen_char3.spec+1 // [8] call gen_char3 - // [11] phi from main::@2 to gen_char3 [phi:main::@2->gen_char3] -- call_phi_near + // [11] phi from main::@2 to gen_char3 [phi:main::@2->gen_char3] gen_char3_from___b2: jsr gen_char3 jmp __b4 @@ -868,7 +868,7 @@ main: { lda charset_spec_row+1,x sta.z gen_char3.spec+1 // [8] call gen_char3 - // [11] phi from main::@2 to gen_char3 [phi:main::@2->gen_char3] -- call_phi_near + // [11] phi from main::@2 to gen_char3 [phi:main::@2->gen_char3] jsr gen_char3 // main::@4 // charset = charset+8 diff --git a/src/test/ref/null-constant-1.log b/src/test/ref/null-constant-1.log index 5927f14f1..1c2cc9f25 100644 --- a/src/test/ref/null-constant-1.log +++ b/src/test/ref/null-constant-1.log @@ -249,7 +249,7 @@ main: { // [1] call get // [10] phi from main to get [phi:main->get] get_from_main: - // [10] phi get::ptr#2 = main::SCREEN [phi:main->get#0] -- call_phi_near + // [10] phi get::ptr#2 = main::SCREEN [phi:main->get#0] -- pbuz1=pbuc1 lda #SCREEN @@ -265,7 +265,7 @@ main: { // [5] call get // [10] phi from main::@1 to get [phi:main::@1->get] get_from___b1: - // [10] phi get::ptr#2 = 0 [phi:main::@1->get#0] -- call_phi_near + // [10] phi get::ptr#2 = 0 [phi:main::@1->get#0] -- pbuz1=vbuc1 lda #<0 sta.z get.ptr lda #>0 @@ -379,7 +379,7 @@ main: { // get(SCREEN) // [1] call get // [10] phi from main to get [phi:main->get] - // [10] phi get::ptr#2 = main::SCREEN [phi:main->get#0] -- call_phi_near + // [10] phi get::ptr#2 = main::SCREEN [phi:main->get#0] -- pbuz1=pbuc1 lda #SCREEN @@ -395,7 +395,7 @@ main: { // get(NULL) // [5] call get // [10] phi from main::@1 to get [phi:main::@1->get] - // [10] phi get::ptr#2 = 0 [phi:main::@1->get#0] -- call_phi_near + // [10] phi get::ptr#2 = 0 [phi:main::@1->get#0] -- pbuz1=vbuc1 lda #<0 sta.z get.ptr sta.z get.ptr+1 diff --git a/src/test/ref/number-conversion.log b/src/test/ref/number-conversion.log index 7c834dd71..db482258b 100644 --- a/src/test/ref/number-conversion.log +++ b/src/test/ref/number-conversion.log @@ -1393,7 +1393,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_SIGNED_CHAR [phi:main->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_SIGNED_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_SIGNED_CHAR [phi:main->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_SIGNED_CHAR [phi:main->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_SIGNED_CHAR jsr assertType // [2] phi from main to main::@1 [phi:main->main::@1] @@ -1408,7 +1408,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_INT [phi:main::@1->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@1->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@1->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_INT jsr assertType // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -1423,7 +1423,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@2->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@2->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@2->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -1438,7 +1438,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_INT [phi:main::@3->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@3->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@3->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_INT jsr assertType // [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4] @@ -1453,7 +1453,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_INT [phi:main::@4->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@4->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@4->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_INT jsr assertType // [10] phi from main::@4 to main::@5 [phi:main::@4->main::@5] @@ -1468,7 +1468,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@5->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@5->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@5->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType // [12] phi from main::@5 to main::@6 [phi:main::@5->main::@6] @@ -1483,7 +1483,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@6->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@6->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@6->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType // [14] phi from main::@6 to main::@7 [phi:main::@6->main::@7] @@ -1498,7 +1498,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@7->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@7->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@7->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType // [16] phi from main::@7 to main::@8 [phi:main::@7->main::@8] @@ -1513,7 +1513,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@8->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@8->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@8->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType // [18] phi from main::@8 to main::@9 [phi:main::@8->main::@9] @@ -1529,7 +1529,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@9->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@9->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@9->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_CHAR jsr assertType // [20] phi from main::@9 to main::@10 [phi:main::@9->main::@10] @@ -1544,7 +1544,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@10->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@10->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@10->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_CHAR jsr assertType // [22] phi from main::@10 to main::@11 [phi:main::@10->main::@11] @@ -1559,7 +1559,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@11->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@11->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@11->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [24] phi from main::@11 to main::@12 [phi:main::@11->main::@12] @@ -1574,7 +1574,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@12->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@12->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@12->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [26] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -1589,7 +1589,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@13->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@13->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@13->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [28] phi from main::@13 to main::@14 [phi:main::@13->main::@14] @@ -1604,7 +1604,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@14->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@14->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@14->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [30] phi from main::@14 to main::@15 [phi:main::@14->main::@15] @@ -1619,7 +1619,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@15->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@15->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@15->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [32] phi from main::@15 to main::@16 [phi:main::@15->main::@16] @@ -1634,7 +1634,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@16->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@16->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@16->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [34] phi from main::@16 to main::@17 [phi:main::@16->main::@17] @@ -1649,7 +1649,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@17->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@17->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@17->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [36] phi from main::@17 to main::@18 [phi:main::@17->main::@18] @@ -1664,7 +1664,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@18->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@18->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@18->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [38] phi from main::@18 to main::@19 [phi:main::@18->main::@19] @@ -1679,7 +1679,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@19->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@19->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@19->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [40] phi from main::@19 to main::@20 [phi:main::@19->main::@20] @@ -1694,7 +1694,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@20->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@20->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@20->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [42] phi from main::@20 to main::@21 [phi:main::@20->main::@21] @@ -1710,7 +1710,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@21->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@21->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@21->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_CHAR jsr assertType // [44] phi from main::@21 to main::@22 [phi:main::@21->main::@22] @@ -1725,7 +1725,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@22->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@22->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@22->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_CHAR jsr assertType // [46] phi from main::@22 to main::@23 [phi:main::@22->main::@23] @@ -1740,7 +1740,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@23->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@23->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@23->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_CHAR jsr assertType // [48] phi from main::@23 to main::@24 [phi:main::@23->main::@24] @@ -1755,7 +1755,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@24->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@24->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@24->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [50] phi from main::@24 to main::@25 [phi:main::@24->main::@25] @@ -1770,7 +1770,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@25->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@25->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@25->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [52] phi from main::@25 to main::@26 [phi:main::@25->main::@26] @@ -1785,7 +1785,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@26->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@26->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@26->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [54] phi from main::@26 to main::@27 [phi:main::@26->main::@27] @@ -1800,7 +1800,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@27->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@27->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@27->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [56] phi from main::@27 to main::@28 [phi:main::@27->main::@28] @@ -1815,7 +1815,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@28->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@28->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@28->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [58] phi from main::@28 to main::@29 [phi:main::@28->main::@29] @@ -1830,7 +1830,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@29->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@29->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@29->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_INT jsr assertType // [60] phi from main::@29 to main::@30 [phi:main::@29->main::@30] @@ -1845,7 +1845,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@30->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@30->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@30->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [62] phi from main::@30 to main::@31 [phi:main::@30->main::@31] @@ -1860,7 +1860,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@31->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@31->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@31->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [64] phi from main::@31 to main::@32 [phi:main::@31->main::@32] @@ -1875,7 +1875,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@32->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@32->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@32->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [66] phi from main::@32 to main::@33 [phi:main::@32->main::@33] @@ -1890,7 +1890,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@33->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@33->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@33->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_UNSIGNED_LONG jsr assertType // [68] phi from main::@33 to main::@34 [phi:main::@33->main::@34] @@ -1905,7 +1905,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@34->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@34->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@34->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType jmp __breturn @@ -2199,7 +2199,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_SIGNED_CHAR [phi:main->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_SIGNED_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_SIGNED_CHAR [phi:main->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_SIGNED_CHAR [phi:main->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [2] phi from main to main::@1 [phi:main->main::@1] @@ -2211,7 +2211,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_INT [phi:main::@1->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@1->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@1->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -2223,7 +2223,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@2->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@2->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@2->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -2235,7 +2235,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_INT [phi:main::@3->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@3->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@3->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4] @@ -2247,7 +2247,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_INT [phi:main::@4->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@4->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_INT [phi:main::@4->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [10] phi from main::@4 to main::@5 [phi:main::@4->main::@5] @@ -2259,7 +2259,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@5->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@5->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@5->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [12] phi from main::@5 to main::@6 [phi:main::@5->main::@6] @@ -2271,7 +2271,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@6->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@6->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@6->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [14] phi from main::@6 to main::@7 [phi:main::@6->main::@7] @@ -2283,7 +2283,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@7->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@7->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@7->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [16] phi from main::@7 to main::@8 [phi:main::@7->main::@8] @@ -2295,7 +2295,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_LONG [phi:main::@8->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@8->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@8->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [18] phi from main::@8 to main::@9 [phi:main::@8->main::@9] @@ -2308,7 +2308,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@9->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@9->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@9->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [20] phi from main::@9 to main::@10 [phi:main::@9->main::@10] @@ -2320,7 +2320,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@10->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@10->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@10->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [22] phi from main::@10 to main::@11 [phi:main::@10->main::@11] @@ -2332,7 +2332,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@11->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@11->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@11->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [24] phi from main::@11 to main::@12 [phi:main::@11->main::@12] @@ -2344,7 +2344,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@12->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@12->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@12->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [26] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -2356,7 +2356,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@13->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@13->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@13->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [28] phi from main::@13 to main::@14 [phi:main::@13->main::@14] @@ -2368,7 +2368,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@14->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@14->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@14->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [30] phi from main::@14 to main::@15 [phi:main::@14->main::@15] @@ -2380,7 +2380,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@15->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@15->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@15->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [32] phi from main::@15 to main::@16 [phi:main::@15->main::@16] @@ -2392,7 +2392,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@16->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@16->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@16->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [34] phi from main::@16 to main::@17 [phi:main::@16->main::@17] @@ -2404,7 +2404,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@17->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@17->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@17->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [36] phi from main::@17 to main::@18 [phi:main::@17->main::@18] @@ -2416,7 +2416,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@18->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@18->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@18->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [38] phi from main::@18 to main::@19 [phi:main::@18->main::@19] @@ -2428,7 +2428,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@19->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@19->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@19->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [40] phi from main::@19 to main::@20 [phi:main::@19->main::@20] @@ -2440,7 +2440,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@20->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@20->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@20->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [42] phi from main::@20 to main::@21 [phi:main::@20->main::@21] @@ -2453,7 +2453,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@21->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@21->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@21->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [44] phi from main::@21 to main::@22 [phi:main::@21->main::@22] @@ -2465,7 +2465,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@22->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@22->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@22->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [46] phi from main::@22 to main::@23 [phi:main::@22->main::@23] @@ -2477,7 +2477,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_CHAR [phi:main::@23->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_CHAR sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@23->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_CHAR [phi:main::@23->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [48] phi from main::@23 to main::@24 [phi:main::@23->main::@24] @@ -2489,7 +2489,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@24->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@24->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@24->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [50] phi from main::@24 to main::@25 [phi:main::@24->main::@25] @@ -2501,7 +2501,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@25->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@25->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@25->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [52] phi from main::@25 to main::@26 [phi:main::@25->main::@26] @@ -2513,7 +2513,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@26->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@26->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@26->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [54] phi from main::@26 to main::@27 [phi:main::@26->main::@27] @@ -2525,7 +2525,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@27->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@27->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@27->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [56] phi from main::@27 to main::@28 [phi:main::@27->main::@28] @@ -2537,7 +2537,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@28->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@28->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@28->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [58] phi from main::@28 to main::@29 [phi:main::@28->main::@29] @@ -2549,7 +2549,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_INT [phi:main::@29->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_INT sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@29->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_INT [phi:main::@29->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [60] phi from main::@29 to main::@30 [phi:main::@29->main::@30] @@ -2561,7 +2561,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@30->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@30->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@30->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [62] phi from main::@30 to main::@31 [phi:main::@30->main::@31] @@ -2573,7 +2573,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@31->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@31->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@31->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [64] phi from main::@31 to main::@32 [phi:main::@31->main::@32] @@ -2585,7 +2585,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@32->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@32->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@32->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [66] phi from main::@32 to main::@33 [phi:main::@32->main::@33] @@ -2597,7 +2597,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@33->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@33->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_UNSIGNED_LONG [phi:main::@33->assertType#2] -- vbuyy=vbuc1 tay jsr assertType // [68] phi from main::@33 to main::@34 [phi:main::@33->main::@34] @@ -2609,7 +2609,7 @@ main: { // [71] phi assertType::t2#35 = TYPEID_UNSIGNED_LONG [phi:main::@34->assertType#1] -- vbuz1=vbuc1 lda #TYPEID_UNSIGNED_LONG sta.z assertType.t2 - // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@34->assertType#2] -- call_phi_near + // [71] phi assertType::t1#35 = TYPEID_LONG [phi:main::@34->assertType#2] -- vbuyy=vbuc1 ldy #TYPEID_LONG jsr assertType // main::@return diff --git a/src/test/ref/number-ternary-fail-2.log b/src/test/ref/number-ternary-fail-2.log index da320d2ee..99ddb8acf 100644 --- a/src/test/ref/number-ternary-fail-2.log +++ b/src/test/ref/number-ternary-fail-2.log @@ -560,7 +560,7 @@ main: { .label height = 6*2+3 .label maze = malloc.return // [1] call malloc - // [6] phi from main to malloc [phi:main->malloc] -- call_phi_near + // [6] phi from main to malloc [phi:main->malloc] malloc_from_main: jsr malloc // [2] phi from main to main::@1 [phi:main->main::@1] @@ -569,7 +569,7 @@ main: { // main::@1 __b1: // [3] call SolveMaze - // [8] phi from main::@1 to SolveMaze [phi:main::@1->SolveMaze] -- call_phi_near + // [8] phi from main::@1 to SolveMaze [phi:main::@1->SolveMaze] SolveMaze_from___b1: jsr SolveMaze jmp __b2 @@ -742,13 +742,13 @@ main: { .label maze = malloc.return // malloc(width * height) // [1] call malloc - // [6] phi from main to malloc [phi:main->malloc] -- call_phi_near + // [6] phi from main to malloc [phi:main->malloc] jsr malloc // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // SolveMaze(maze, width, height) // [3] call SolveMaze - // [8] phi from main::@1 to SolveMaze [phi:main::@1->SolveMaze] -- call_phi_near + // [8] phi from main::@1 to SolveMaze [phi:main::@1->SolveMaze] jsr SolveMaze // main::@2 // asm diff --git a/src/test/ref/number-type.log b/src/test/ref/number-type.log index 78c5c6e98..88a159a46 100644 --- a/src/test/ref/number-type.log +++ b/src/test/ref/number-type.log @@ -609,14 +609,14 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call testBytes -- call_phi_near + // [1] call testBytes jsr testBytes // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: jmp __b1 // main::@1 __b1: - // [3] call testSBytes -- call_phi_near + // [3] call testSBytes jsr testSBytes jmp __breturn // main::@return @@ -765,12 +765,12 @@ Score: 180 // main main: { // testBytes() - // [1] call testBytes -- call_phi_near + // [1] call testBytes jsr testBytes // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // testSBytes() - // [3] call testSBytes -- call_phi_near + // [3] call testSBytes jsr testSBytes // main::@return // } diff --git a/src/test/ref/overlap-allocation-2.log b/src/test/ref/overlap-allocation-2.log index 349d1069a..3eeee67ea 100644 --- a/src/test/ref/overlap-allocation-2.log +++ b/src/test/ref/overlap-allocation-2.log @@ -318,7 +318,7 @@ main: { // [3] call line // [12] phi from main::@1 to line [phi:main::@1->line] line_from___b1: - // [12] phi line::l#2 = line::l#0 [phi:main::@1->line#0] -- call_phi_near + // [12] phi line::l#2 = line::l#0 [phi:main::@1->line#0] -- register_copy jsr line jmp __b3 // main::@3 @@ -345,7 +345,7 @@ main: { // [8] call line // [12] phi from main::@2 to line [phi:main::@2->line] line_from___b2: - // [12] phi line::l#2 = line::l#1 [phi:main::@2->line#0] -- call_phi_near + // [12] phi line::l#2 = line::l#1 [phi:main::@2->line#0] -- register_copy jsr line jmp __b4 // main::@4 @@ -368,7 +368,7 @@ line: { // [14] call plot // [18] phi from line to plot [phi:line->plot] plot_from_line: - // [18] phi plot::x#2 = plot::x#0 [phi:line->plot#0] -- call_phi_near + // [18] phi plot::x#2 = plot::x#0 [phi:line->plot#0] -- register_copy jsr plot jmp __b1 // line::@1 @@ -379,7 +379,7 @@ line: { // [16] call plot // [18] phi from line::@1 to plot [phi:line::@1->plot] plot_from___b1: - // [18] phi plot::x#2 = plot::x#1 [phi:line::@1->plot#0] -- call_phi_near + // [18] phi plot::x#2 = plot::x#1 [phi:line::@1->plot#0] -- register_copy jsr plot jmp __breturn // line::@return @@ -491,7 +491,7 @@ main: { tax // [3] call line // [12] phi from main::@1 to line [phi:main::@1->line] - // [12] phi line::l#2 = line::l#0 [phi:main::@1->line#0] -- call_phi_near + // [12] phi line::l#2 = line::l#0 [phi:main::@1->line#0] -- register_copy jsr line // main::@3 // for(byte i : 0..8) @@ -513,7 +513,7 @@ main: { tax // [8] call line // [12] phi from main::@2 to line [phi:main::@2->line] - // [12] phi line::l#2 = line::l#1 [phi:main::@2->line#0] -- call_phi_near + // [12] phi line::l#2 = line::l#1 [phi:main::@2->line#0] -- register_copy jsr line // main::@4 // for(byte j : 10..18) @@ -534,7 +534,7 @@ line: { // [13] plot::x#0 = line::l#2 // [14] call plot // [18] phi from line to plot [phi:line->plot] - // [18] phi plot::x#2 = plot::x#0 [phi:line->plot#0] -- call_phi_near + // [18] phi plot::x#2 = plot::x#0 [phi:line->plot#0] -- register_copy jsr plot // line::@1 // plot(l+20) @@ -543,7 +543,7 @@ line: { axs #-[$14] // [16] call plot // [18] phi from line::@1 to plot [phi:line::@1->plot] - // [18] phi plot::x#2 = plot::x#1 [phi:line::@1->plot#0] -- call_phi_near + // [18] phi plot::x#2 = plot::x#1 [phi:line::@1->plot#0] -- register_copy jsr plot // line::@return // } diff --git a/src/test/ref/overlap-allocation.log b/src/test/ref/overlap-allocation.log index 7fa4b33d3..52b2b1b17 100644 --- a/src/test/ref/overlap-allocation.log +++ b/src/test/ref/overlap-allocation.log @@ -308,7 +308,7 @@ main: { // [3] call plot // [17] phi from main::@1 to plot [phi:main::@1->plot] plot_from___b1: - // [17] phi plot::x#3 = plot::x#0 [phi:main::@1->plot#0] -- call_phi_near + // [17] phi plot::x#3 = plot::x#0 [phi:main::@1->plot#0] -- register_copy jsr plot jmp __b4 // main::@4 @@ -333,7 +333,7 @@ main: { // [8] call plot // [17] phi from main::@2 to plot [phi:main::@2->plot] plot_from___b2: - // [17] phi plot::x#3 = plot::x#1 [phi:main::@2->plot#0] -- call_phi_near + // [17] phi plot::x#3 = plot::x#1 [phi:main::@2->plot#0] -- register_copy jsr plot jmp __b5 // main::@5 @@ -358,7 +358,7 @@ main: { // [13] call plot // [17] phi from main::@3 to plot [phi:main::@3->plot] plot_from___b3: - // [17] phi plot::x#3 = plot::x#2 [phi:main::@3->plot#0] -- call_phi_near + // [17] phi plot::x#3 = plot::x#2 [phi:main::@3->plot#0] -- register_copy jsr plot jmp __b6 // main::@6 @@ -478,7 +478,7 @@ main: { // [2] plot::x#0 = main::i#2 // [3] call plot // [17] phi from main::@1 to plot [phi:main::@1->plot] - // [17] phi plot::x#3 = plot::x#0 [phi:main::@1->plot#0] -- call_phi_near + // [17] phi plot::x#3 = plot::x#0 [phi:main::@1->plot#0] -- register_copy jsr plot // main::@4 // for(byte i : 0..10) @@ -498,7 +498,7 @@ main: { // [7] plot::x#1 = main::j#2 // [8] call plot // [17] phi from main::@2 to plot [phi:main::@2->plot] - // [17] phi plot::x#3 = plot::x#1 [phi:main::@2->plot#0] -- call_phi_near + // [17] phi plot::x#3 = plot::x#1 [phi:main::@2->plot#0] -- register_copy jsr plot // main::@5 // for(byte j : 0..10) @@ -518,7 +518,7 @@ main: { // [12] plot::x#2 = main::k#2 // [13] call plot // [17] phi from main::@3 to plot [phi:main::@3->plot] - // [17] phi plot::x#3 = plot::x#2 [phi:main::@3->plot#0] -- call_phi_near + // [17] phi plot::x#3 = plot::x#2 [phi:main::@3->plot#0] -- register_copy jsr plot // main::@6 // for(byte k : 0..10) diff --git a/src/test/ref/plus-0.log b/src/test/ref/plus-0.log index 896fa94b1..3b95a5fc5 100644 --- a/src/test/ref/plus-0.log +++ b/src/test/ref/plus-0.log @@ -369,7 +369,7 @@ main: { fill_from_main: // [5] phi fill::ch#4 = 'a' [phi:main->fill#0] -- vbuxx=vbuc1 ldx #'a' - // [5] phi fill::screen#4 = (char *) 1024 [phi:main->fill#1] -- call_phi_near + // [5] phi fill::screen#4 = (char *) 1024 [phi:main->fill#1] -- pbuz1=pbuc1 lda #<$400 sta.z fill.screen lda #>$400 @@ -385,7 +385,7 @@ main: { fill_from___b1: // [5] phi fill::ch#4 = 'b' [phi:main::@1->fill#0] -- vbuxx=vbuc1 ldx #'b' - // [5] phi fill::screen#4 = (char *) 8192 [phi:main::@1->fill#1] -- call_phi_near + // [5] phi fill::screen#4 = (char *) 8192 [phi:main::@1->fill#1] -- pbuz1=pbuc1 lda #<$2000 sta.z fill.screen lda #>$2000 @@ -537,7 +537,7 @@ main: { // [5] phi from main to fill [phi:main->fill] // [5] phi fill::ch#4 = 'a' [phi:main->fill#0] -- vbuxx=vbuc1 ldx #'a' - // [5] phi fill::screen#4 = (char *) 1024 [phi:main->fill#1] -- call_phi_near + // [5] phi fill::screen#4 = (char *) 1024 [phi:main->fill#1] -- pbuz1=pbuc1 lda #<$400 sta.z fill.screen lda #>$400 @@ -550,7 +550,7 @@ main: { // [5] phi from main::@1 to fill [phi:main::@1->fill] // [5] phi fill::ch#4 = 'b' [phi:main::@1->fill#0] -- vbuxx=vbuc1 ldx #'b' - // [5] phi fill::screen#4 = (char *) 8192 [phi:main::@1->fill#1] -- call_phi_near + // [5] phi fill::screen#4 = (char *) 8192 [phi:main::@1->fill#1] -- pbuz1=pbuc1 lda #<$2000 sta.z fill.screen lda #>$2000 diff --git a/src/test/ref/plus4-kbhit.log b/src/test/ref/plus4-kbhit.log index 8fdc1fc16..88c782d0d 100644 --- a/src/test/ref/plus4-kbhit.log +++ b/src/test/ref/plus4-kbhit.log @@ -226,7 +226,7 @@ main: { jmp __b1 // main::@1 __b1: - // [2] call kbhit -- call_phi_near + // [2] call kbhit jsr kbhit // [3] kbhit::return#0 = kbhit::return#1 jmp __b2 @@ -338,7 +338,7 @@ main: { // main::@1 __b1: // kbhit() - // [2] call kbhit -- call_phi_near + // [2] call kbhit jsr kbhit // [3] kbhit::return#0 = kbhit::return#1 // main::@2 diff --git a/src/test/ref/plus4-keyboard-test.log b/src/test/ref/plus4-keyboard-test.log index 0fa8a6a96..3e88ecc22 100644 --- a/src/test/ref/plus4-keyboard-test.log +++ b/src/test/ref/plus4-keyboard-test.log @@ -573,7 +573,7 @@ main: { // asm { sei } sei // [1] call memset - // [18] phi from main to memset [phi:main->memset] -- call_phi_near + // [18] phi from main to memset [phi:main->memset] memset_from_main: jsr memset // [2] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1] @@ -830,7 +830,7 @@ main: { sei // memset(DEFAULT_SCREEN, ' ', 0x0400) // [1] call memset - // [18] phi from main to memset [phi:main->memset] -- call_phi_near + // [18] phi from main to memset [phi:main->memset] jsr memset // [2] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1] __b5: diff --git a/src/test/ref/pointer-plus-0.log b/src/test/ref/pointer-plus-0.log index 8240d1a2b..359e48e62 100644 --- a/src/test/ref/pointer-plus-0.log +++ b/src/test/ref/pointer-plus-0.log @@ -241,7 +241,7 @@ main: { // [1] call first // [10] phi from main to first [phi:main->first] first_from_main: - // [10] phi first::return#2 = msg1 [phi:main->first#0] -- call_phi_near + // [10] phi first::return#2 = msg1 [phi:main->first#0] -- pbuz1=pbuc1 lda #msg1 @@ -259,7 +259,7 @@ main: { // [5] call first // [10] phi from main::@1 to first [phi:main::@1->first] first_from___b1: - // [10] phi first::return#2 = msg2 [phi:main::@1->first#0] -- call_phi_near + // [10] phi first::return#2 = msg2 [phi:main::@1->first#0] -- pbuz1=pbuc1 lda #msg2 @@ -352,7 +352,7 @@ main: { // first(msg1) // [1] call first // [10] phi from main to first [phi:main->first] - // [10] phi first::return#2 = msg1 [phi:main->first#0] -- call_phi_near + // [10] phi first::return#2 = msg1 [phi:main->first#0] -- pbuz1=pbuc1 lda #msg1 @@ -370,7 +370,7 @@ main: { // first(msg2) // [5] call first // [10] phi from main::@1 to first [phi:main::@1->first] - // [10] phi first::return#2 = msg2 [phi:main::@1->first#0] -- call_phi_near + // [10] phi first::return#2 = msg2 [phi:main::@1->first#0] -- pbuz1=pbuc1 lda #msg2 diff --git a/src/test/ref/pointer-pointer-2.log b/src/test/ref/pointer-pointer-2.log index 618e61fe6..ddb2effb8 100644 --- a/src/test/ref/pointer-pointer-2.log +++ b/src/test/ref/pointer-pointer-2.log @@ -394,7 +394,7 @@ main: { jmp __b1 // main::@1 __b1: - // [2] call nexttext -- call_phi_near + // [2] call nexttext jsr nexttext // [3] phi from main::@1 main::@3 to main::@2 [phi:main::@1/main::@3->main::@2] __b2_from___b1: @@ -584,7 +584,7 @@ main: { // main::@1 __b1: // nexttext(&text) - // [2] call nexttext -- call_phi_near + // [2] call nexttext jsr nexttext // [3] phi from main::@1 main::@3 to main::@2 [phi:main::@1/main::@3->main::@2] // [3] phi main::screen#2 = main::screen#4 [phi:main::@1/main::@3->main::@2#0] -- register_copy diff --git a/src/test/ref/pointer-pointer-3.log b/src/test/ref/pointer-pointer-3.log index 78e4ba2e4..45197a30d 100644 --- a/src/test/ref/pointer-pointer-3.log +++ b/src/test/ref/pointer-pointer-3.log @@ -224,7 +224,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 @@ -238,7 +238,7 @@ main: { // [6] call setscreen // [11] phi from main to setscreen [phi:main->setscreen] setscreen_from_main: - // [11] phi setscreen::val#2 = screen1 [phi:main->setscreen#0] -- call_phi_near + // [11] phi setscreen::val#2 = screen1 [phi:main->setscreen#0] -- pbuz1=pbuc1 lda #screen1 @@ -254,7 +254,7 @@ main: { // [8] call setscreen // [11] phi from main::@1 to setscreen [phi:main::@1->setscreen] setscreen_from___b1: - // [11] phi setscreen::val#2 = screen2 [phi:main::@1->setscreen#0] -- call_phi_near + // [11] phi setscreen::val#2 = screen2 [phi:main::@1->setscreen#0] -- pbuz1=pbuc1 lda #screen2 @@ -359,7 +359,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 @@ -370,7 +370,7 @@ main: { // setscreen(&screen, screen1) // [6] call setscreen // [11] phi from main to setscreen [phi:main->setscreen] - // [11] phi setscreen::val#2 = screen1 [phi:main->setscreen#0] -- call_phi_near + // [11] phi setscreen::val#2 = screen1 [phi:main->setscreen#0] -- pbuz1=pbuc1 lda #screen1 @@ -385,7 +385,7 @@ main: { // setscreen(&screen, screen2) // [8] call setscreen // [11] phi from main::@1 to setscreen [phi:main::@1->setscreen] - // [11] phi setscreen::val#2 = screen2 [phi:main::@1->setscreen#0] -- call_phi_near + // [11] phi setscreen::val#2 = screen2 [phi:main::@1->setscreen#0] -- pbuz1=pbuc1 lda #screen2 diff --git a/src/test/ref/pointer-swap.log b/src/test/ref/pointer-swap.log index 25a014563..3044bc33c 100644 --- a/src/test/ref/pointer-swap.log +++ b/src/test/ref/pointer-swap.log @@ -611,7 +611,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [11] phi tempbuffer#9 = (char *) 0 [phi:main->print#3] -- call_phi_near + // [11] phi tempbuffer#9 = (char *) 0 [phi:main->print#3] -- pbuz1=pbuc1 lda #<0 sta.z tempbuffer_1 lda #>0 @@ -630,7 +630,7 @@ main: { sta.z newbuffer lda #>buffer2 sta.z newbuffer+1 - // [23] phi tempbuffer#0 = buffer1 [phi:main::@1->swap#1] -- call_phi_near + // [23] phi tempbuffer#0 = buffer1 [phi:main::@1->swap#1] -- pbuz1=pbuc1 lda #buffer1 @@ -653,7 +653,7 @@ main: { // [23] phi from main::@2 to swap [phi:main::@2->swap] swap_from___b2: // [23] phi newbuffer#0 = newbuffer#23 [phi:main::@2->swap#0] -- register_copy - // [23] phi tempbuffer#0 = tempbuffer#22 [phi:main::@2->swap#1] -- call_phi_near + // [23] phi tempbuffer#0 = tempbuffer#22 [phi:main::@2->swap#1] -- register_copy jsr swap jmp __b3 // main::@3 @@ -672,7 +672,7 @@ main: { // [23] phi from main::@3 to swap [phi:main::@3->swap] swap_from___b3: // [23] phi newbuffer#0 = newbuffer#24 [phi:main::@3->swap#0] -- register_copy - // [23] phi tempbuffer#0 = tempbuffer#23 [phi:main::@3->swap#1] -- call_phi_near + // [23] phi tempbuffer#0 = tempbuffer#23 [phi:main::@3->swap#1] -- register_copy jsr swap jmp __breturn // main::@return @@ -746,7 +746,7 @@ swap: { // [11] phi oldbuffer#9 = oldbuffer#22 [phi:swap->print#0] -- register_copy // [11] phi newbuffer#9 = newbuffer#22 [phi:swap->print#1] -- register_copy // [11] phi screen#12 = screen#0 [phi:swap->print#2] -- register_copy - // [11] phi tempbuffer#9 = tempbuffer#21 [phi:swap->print#3] -- call_phi_near + // [11] phi tempbuffer#9 = tempbuffer#21 [phi:swap->print#3] -- register_copy jsr print jmp __breturn // swap::@return @@ -872,7 +872,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [11] phi tempbuffer#9 = (char *) 0 [phi:main->print#3] -- call_phi_near + // [11] phi tempbuffer#9 = (char *) 0 [phi:main->print#3] -- pbuz1=pbuc1 lda #<0 sta.z tempbuffer_1 sta.z tempbuffer_1+1 @@ -887,7 +887,7 @@ main: { sta.z newbuffer lda #>buffer2 sta.z newbuffer+1 - // [23] phi tempbuffer#0 = buffer1 [phi:main::@1->swap#1] -- call_phi_near + // [23] phi tempbuffer#0 = buffer1 [phi:main::@1->swap#1] -- pbuz1=pbuc1 lda #buffer1 @@ -908,7 +908,7 @@ main: { // [6] call swap // [23] phi from main::@2 to swap [phi:main::@2->swap] // [23] phi newbuffer#0 = newbuffer#23 [phi:main::@2->swap#0] -- register_copy - // [23] phi tempbuffer#0 = tempbuffer#22 [phi:main::@2->swap#1] -- call_phi_near + // [23] phi tempbuffer#0 = tempbuffer#22 [phi:main::@2->swap#1] -- register_copy jsr swap // main::@3 // [7] tempbuffer#23 = newbuffer#0 -- pbuz1=pbuz2 @@ -925,7 +925,7 @@ main: { // [9] call swap // [23] phi from main::@3 to swap [phi:main::@3->swap] // [23] phi newbuffer#0 = newbuffer#24 [phi:main::@3->swap#0] -- register_copy - // [23] phi tempbuffer#0 = tempbuffer#23 [phi:main::@3->swap#1] -- call_phi_near + // [23] phi tempbuffer#0 = tempbuffer#23 [phi:main::@3->swap#1] -- register_copy jsr swap // main::@return // } @@ -1004,7 +1004,7 @@ swap: { // [11] phi oldbuffer#9 = oldbuffer#22 [phi:swap->print#0] -- register_copy // [11] phi newbuffer#9 = newbuffer#22 [phi:swap->print#1] -- register_copy // [11] phi screen#12 = screen#0 [phi:swap->print#2] -- register_copy - // [11] phi tempbuffer#9 = tempbuffer#21 [phi:swap->print#3] -- call_phi_near + // [11] phi tempbuffer#9 = tempbuffer#21 [phi:swap->print#3] -- register_copy jsr print // swap::@return // } diff --git a/src/test/ref/pointer-void-1.log b/src/test/ref/pointer-void-1.log index 1910db674..d8e90126b 100644 --- a/src/test/ref/pointer-void-1.log +++ b/src/test/ref/pointer-void-1.log @@ -290,7 +290,7 @@ main: { print_from_main: // [9] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 - // [9] phi print::ptr#3 = main::vb [phi:main->print#1] -- call_phi_near + // [9] phi print::ptr#3 = main::vb [phi:main->print#1] -- pvoz1=pvoc1 lda #vb @@ -305,7 +305,7 @@ main: { // [9] phi from main::@1 to print [phi:main::@1->print] print_from___b1: // [9] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy - // [9] phi print::ptr#3 = main::vw [phi:main::@1->print#1] -- call_phi_near + // [9] phi print::ptr#3 = main::vw [phi:main::@1->print#1] -- pvoz1=pvoc1 lda #vw @@ -320,7 +320,7 @@ main: { // [9] phi from main::@2 to print [phi:main::@2->print] print_from___b2: // [9] phi idx#13 = idx#14 [phi:main::@2->print#0] -- register_copy - // [9] phi print::ptr#3 = main::vd [phi:main::@2->print#1] -- call_phi_near + // [9] phi print::ptr#3 = main::vd [phi:main::@2->print#1] -- pvoz1=pvoc1 lda #vd @@ -441,7 +441,7 @@ main: { // [9] phi from main to print [phi:main->print] // [9] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 - // [9] phi print::ptr#3 = main::vb [phi:main->print#1] -- call_phi_near + // [9] phi print::ptr#3 = main::vb [phi:main->print#1] -- pvoz1=pvoc1 lda #vb @@ -453,7 +453,7 @@ main: { // [5] call print // [9] phi from main::@1 to print [phi:main::@1->print] // [9] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy - // [9] phi print::ptr#3 = main::vw [phi:main::@1->print#1] -- call_phi_near + // [9] phi print::ptr#3 = main::vw [phi:main::@1->print#1] -- pvoz1=pvoc1 lda #vw @@ -465,7 +465,7 @@ main: { // [7] call print // [9] phi from main::@2 to print [phi:main::@2->print] // [9] phi idx#13 = idx#14 [phi:main::@2->print#0] -- register_copy - // [9] phi print::ptr#3 = main::vd [phi:main::@2->print#1] -- call_phi_near + // [9] phi print::ptr#3 = main::vd [phi:main::@2->print#1] -- pvoz1=pvoc1 lda #vd diff --git a/src/test/ref/pointer-void-2.log b/src/test/ref/pointer-void-2.log index 36f96bc13..1ddbf6b8f 100644 --- a/src/test/ref/pointer-void-2.log +++ b/src/test/ref/pointer-void-2.log @@ -284,7 +284,7 @@ main: { print_from_main: // [9] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 - // [9] phi print::ptr#3 = (void *)&main::b [phi:main->print#1] -- call_phi_near + // [9] phi print::ptr#3 = (void *)&main::b [phi:main->print#1] -- pvoz1=pvoc1 lda #b @@ -299,7 +299,7 @@ main: { // [9] phi from main::@1 to print [phi:main::@1->print] print_from___b1: // [9] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy - // [9] phi print::ptr#3 = (void *)&main::w [phi:main::@1->print#1] -- call_phi_near + // [9] phi print::ptr#3 = (void *)&main::w [phi:main::@1->print#1] -- pvoz1=pvoc1 lda #w @@ -314,7 +314,7 @@ main: { // [9] phi from main::@2 to print [phi:main::@2->print] print_from___b2: // [9] phi idx#13 = idx#14 [phi:main::@2->print#0] -- register_copy - // [9] phi print::ptr#3 = (void *)&main::d [phi:main::@2->print#1] -- call_phi_near + // [9] phi print::ptr#3 = (void *)&main::d [phi:main::@2->print#1] -- pvoz1=pvoc1 lda #d @@ -429,7 +429,7 @@ main: { // [9] phi from main to print [phi:main->print] // [9] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 - // [9] phi print::ptr#3 = (void *)&main::b [phi:main->print#1] -- call_phi_near + // [9] phi print::ptr#3 = (void *)&main::b [phi:main->print#1] -- pvoz1=pvoc1 lda #b @@ -441,7 +441,7 @@ main: { // [5] call print // [9] phi from main::@1 to print [phi:main::@1->print] // [9] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy - // [9] phi print::ptr#3 = (void *)&main::w [phi:main::@1->print#1] -- call_phi_near + // [9] phi print::ptr#3 = (void *)&main::w [phi:main::@1->print#1] -- pvoz1=pvoc1 lda #w @@ -453,7 +453,7 @@ main: { // [7] call print // [9] phi from main::@2 to print [phi:main::@2->print] // [9] phi idx#13 = idx#14 [phi:main::@2->print#0] -- register_copy - // [9] phi print::ptr#3 = (void *)&main::d [phi:main::@2->print#1] -- call_phi_near + // [9] phi print::ptr#3 = (void *)&main::d [phi:main::@2->print#1] -- pvoz1=pvoc1 lda #d diff --git a/src/test/ref/pointer-void-3.log b/src/test/ref/pointer-void-3.log index 8c1aced57..e6393cae6 100644 --- a/src/test/ref/pointer-void-3.log +++ b/src/test/ref/pointer-void-3.log @@ -284,7 +284,7 @@ main: { // [1] call malloc // [12] phi from main to malloc [phi:main->malloc] malloc_from_main: - // [12] phi heap_head#11 = (char *) 49152 [phi:main->malloc#0] -- call_phi_near + // [12] phi heap_head#11 = (char *) 49152 [phi:main->malloc#0] -- pbuz1=pbuc1 lda #<$c000 sta.z heap_head lda #>$c000 @@ -302,7 +302,7 @@ main: { // [4] call malloc // [12] phi from main::@1 to malloc [phi:main::@1->malloc] malloc_from___b1: - // [12] phi heap_head#11 = heap_head#12 [phi:main::@1->malloc#0] -- call_phi_near + // [12] phi heap_head#11 = heap_head#12 [phi:main::@1->malloc#0] -- register_copy jsr malloc // [5] malloc::return#1 = malloc::return#2 jmp __b2 @@ -418,7 +418,7 @@ main: { // byte* buf1 = malloc() // [1] call malloc // [12] phi from main to malloc [phi:main->malloc] - // [12] phi heap_head#11 = (char *) 49152 [phi:main->malloc#0] -- call_phi_near + // [12] phi heap_head#11 = (char *) 49152 [phi:main->malloc#0] -- pbuz1=pbuc1 lda #<$c000 sta.z heap_head lda #>$c000 @@ -435,7 +435,7 @@ main: { // byte* buf2 = malloc() // [4] call malloc // [12] phi from main::@1 to malloc [phi:main::@1->malloc] - // [12] phi heap_head#11 = heap_head#12 [phi:main::@1->malloc#0] -- call_phi_near + // [12] phi heap_head#11 = heap_head#12 [phi:main::@1->malloc#0] -- register_copy jsr malloc // byte* buf2 = malloc() // [5] malloc::return#1 = malloc::return#2 diff --git a/src/test/ref/post-increment-problem-2.log b/src/test/ref/post-increment-problem-2.log index fb71a2f3d..0b912585f 100644 --- a/src/test/ref/post-increment-problem-2.log +++ b/src/test/ref/post-increment-problem-2.log @@ -245,7 +245,7 @@ main: { jmp __b2 // main::@2 __b2: - // [5] call incscreen -- call_phi_near + // [5] call incscreen jsr incscreen jmp __b3 // main::@3 @@ -342,7 +342,7 @@ main: { // main::@2 __b2: // incscreen(offset) - // [5] call incscreen -- call_phi_near + // [5] call incscreen jsr incscreen // main::@3 // for (char x=0;x<254;x++) diff --git a/src/test/ref/pragma-noparam-noparen.log b/src/test/ref/pragma-noparam-noparen.log index 68ccb3b9d..ec255c1a4 100644 --- a/src/test/ref/pragma-noparam-noparen.log +++ b/src/test/ref/pragma-noparam-noparen.log @@ -1,4 +1,3 @@ -Warning! Unknown #pragma nobank CONTROL FLOW GRAPH SSA diff --git a/src/test/ref/pragma-noparenthesis.log b/src/test/ref/pragma-noparenthesis.log index 7632e3d44..c12b0e992 100644 --- a/src/test/ref/pragma-noparenthesis.log +++ b/src/test/ref/pragma-noparenthesis.log @@ -150,14 +150,14 @@ __start: { jmp __init1 // __start::__init1 __init1: - // [2] call init -- call_phi_near + // [2] call init jsr init // [3] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] __b1_from___init1: jmp __b1 // __start::@1 __b1: - // [4] call main -- call_phi_near + // [4] call main jsr main jmp __breturn // __start::@return @@ -235,11 +235,11 @@ Score: 42 __start: { // [1] phi from __start to __start::__init1 [phi:__start->__start::__init1] // __start::__init1 - // [2] call init -- call_phi_near + // [2] call init jsr init // [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/primes-1000-2.log b/src/test/ref/primes-1000-2.log index c6f05a9b7..178959548 100644 --- a/src/test/ref/primes-1000-2.log +++ b/src/test/ref/primes-1000-2.log @@ -2572,7 +2572,7 @@ main: { // [5] mul8u::a#1 = main::p#0 -- vbuxx=vbuaa tax // [6] mul8u::b#0 = main::p#0 - // [7] call mul8u -- call_phi_near + // [7] call mul8u jsr mul8u // [8] mul8u::return#2 = mul8u::res#2 jmp __b8 @@ -2630,7 +2630,7 @@ main: { // [17] div16u8u::divisor#0 = (char)PRIMES[main::$13] -- vbuz1=_byte_pwuc1_derefidx_vbuxx lda PRIMES,x sta.z div16u8u.divisor - // [18] call div16u8u -- call_phi_near + // [18] call div16u8u jsr div16u8u jmp __b9 // main::@9 @@ -2700,7 +2700,7 @@ main: { lda.z potential+1 sta (__15),y // [28] print_uint_decimal::w#0 = potential#11 - // [29] call print_uint_decimal -- call_phi_near + // [29] call print_uint_decimal jsr print_uint_decimal // [30] phi from main::@6 to main::@10 [phi:main::@6->main::@10] __b10_from___b6: @@ -2710,7 +2710,7 @@ main: { // [31] call print_char // [57] phi from main::@10 to print_char [phi:main::@10->print_char] print_char_from___b10: - // [57] phi print_char::ch#2 = ' ' [phi:main::@10->print_char#0] -- call_phi_near + // [57] phi print_char::ch#2 = ' ' [phi:main::@10->print_char#0] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b11 @@ -2818,7 +2818,7 @@ div16u8u: { divr8u_from_div16u8u: // [61] phi divr8u::divisor#6 = divr8u::divisor#0 [phi:div16u8u->divr8u#0] -- register_copy // [61] phi divr8u::dividend#5 = divr8u::dividend#1 [phi:div16u8u->divr8u#1] -- register_copy - // [61] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#2] -- call_phi_near + // [61] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#2] -- vbuyy=vbuc1 ldy #0 jsr divr8u jmp __b1 @@ -2834,7 +2834,7 @@ div16u8u: { divr8u_from___b1: // [61] phi divr8u::divisor#6 = divr8u::divisor#1 [phi:div16u8u::@1->divr8u#0] -- register_copy // [61] phi divr8u::dividend#5 = divr8u::dividend#2 [phi:div16u8u::@1->divr8u#1] -- register_copy - // [61] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#2] -- call_phi_near + // [61] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#2] -- register_copy jsr divr8u jmp __breturn // div16u8u::@return @@ -2853,7 +2853,7 @@ print_uint_decimal: { lda.z w+1 sta.z utoa.value+1 // [53] call utoa - // [78] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] -- call_phi_near + // [78] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] utoa_from_print_uint_decimal: jsr utoa // [54] phi from print_uint_decimal to print_uint_decimal::@1 [phi:print_uint_decimal->print_uint_decimal::@1] @@ -2862,7 +2862,7 @@ print_uint_decimal: { // print_uint_decimal::@1 __b1: // [55] call print_str - // [99] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] -- call_phi_near + // [99] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] print_str_from___b1: jsr print_str jmp __breturn @@ -3088,7 +3088,7 @@ utoa: { // [93] utoa_append::value#0 = utoa::value#2 // [94] utoa_append::sub#0 = utoa::digit_value#0 // [95] call utoa_append - // [106] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near + // [106] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] utoa_append_from___b5: jsr utoa_append // [96] utoa_append::return#0 = utoa_append::value#2 @@ -3143,7 +3143,7 @@ print_str: { // [104] call print_char // [57] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: - // [57] phi print_char::ch#2 = print_char::ch#0 [phi:print_str::@2->print_char#0] -- call_phi_near + // [57] phi print_char::ch#2 = print_char::ch#0 [phi:print_str::@2->print_char#0] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -3628,7 +3628,7 @@ main: { // [5] mul8u::a#1 = main::p#0 -- vbuxx=vbuaa tax // [6] mul8u::b#0 = main::p#0 - // [7] call mul8u -- call_phi_near + // [7] call mul8u jsr mul8u // [8] mul8u::return#2 = mul8u::res#2 // main::@8 @@ -3679,7 +3679,7 @@ main: { // [17] div16u8u::divisor#0 = (char)PRIMES[main::$13] -- vbuz1=_byte_pwuc1_derefidx_vbuxx lda PRIMES,x sta.z div16u8u.divisor - // [18] call div16u8u -- call_phi_near + // [18] call div16u8u jsr div16u8u // main::@9 // div16u8u(potential, (char)PRIMES[test_idx++]); @@ -3746,14 +3746,14 @@ main: { sta (__15),y // print_uint_decimal(potential) // [28] print_uint_decimal::w#0 = potential#11 - // [29] call print_uint_decimal -- call_phi_near + // [29] call print_uint_decimal jsr print_uint_decimal // [30] phi from main::@6 to main::@10 [phi:main::@6->main::@10] // main::@10 // print_char(' ') // [31] call print_char // [57] phi from main::@10 to print_char [phi:main::@10->print_char] - // [57] phi print_char::ch#2 = ' ' [phi:main::@10->print_char#0] -- call_phi_near + // [57] phi print_char::ch#2 = ' ' [phi:main::@10->print_char#0] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@11 @@ -3859,7 +3859,7 @@ div16u8u: { // [61] phi from div16u8u to divr8u [phi:div16u8u->divr8u] // [61] phi divr8u::divisor#6 = divr8u::divisor#0 [phi:div16u8u->divr8u#0] -- register_copy // [61] phi divr8u::dividend#5 = divr8u::dividend#1 [phi:div16u8u->divr8u#1] -- register_copy - // [61] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#2] -- call_phi_near + // [61] phi divr8u::rem#10 = 0 [phi:div16u8u->divr8u#2] -- vbuyy=vbuc1 ldy #0 jsr divr8u // div16u8u::@1 @@ -3873,7 +3873,7 @@ div16u8u: { // [61] phi from div16u8u::@1 to divr8u [phi:div16u8u::@1->divr8u] // [61] phi divr8u::divisor#6 = divr8u::divisor#1 [phi:div16u8u::@1->divr8u#0] -- register_copy // [61] phi divr8u::dividend#5 = divr8u::dividend#2 [phi:div16u8u::@1->divr8u#1] -- register_copy - // [61] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#2] -- call_phi_near + // [61] phi divr8u::rem#10 = divr8u::rem#4 [phi:div16u8u::@1->divr8u#2] -- register_copy jsr divr8u // div16u8u::@return // } @@ -3892,13 +3892,13 @@ print_uint_decimal: { lda.z w+1 sta.z utoa.value+1 // [53] call utoa - // [78] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] -- call_phi_near + // [78] phi from print_uint_decimal to utoa [phi:print_uint_decimal->utoa] jsr utoa // [54] phi from print_uint_decimal to print_uint_decimal::@1 [phi:print_uint_decimal->print_uint_decimal::@1] // print_uint_decimal::@1 // print_str(decimal_digits) // [55] call print_str - // [99] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] -- call_phi_near + // [99] phi from print_uint_decimal::@1 to print_str [phi:print_uint_decimal::@1->print_str] jsr print_str // print_uint_decimal::@return // } @@ -4114,7 +4114,7 @@ utoa: { // [93] utoa_append::value#0 = utoa::value#2 // [94] utoa_append::sub#0 = utoa::digit_value#0 // [95] call utoa_append - // [106] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near + // [106] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] jsr utoa_append // utoa_append(buffer++, value, digit_value) // [96] utoa_append::return#0 = utoa_append::value#2 @@ -4166,7 +4166,7 @@ print_str: { lda (str),y // [104] call print_char // [57] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] - // [57] phi print_char::ch#2 = print_char::ch#0 [phi:print_str::@2->print_char#0] -- call_phi_near + // [57] phi print_char::ch#2 = print_char::ch#0 [phi:print_str::@2->print_char#0] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); diff --git a/src/test/ref/print-problem.log b/src/test/ref/print-problem.log index f20359e65..660c6d482 100644 --- a/src/test/ref/print-problem.log +++ b/src/test/ref/print-problem.log @@ -273,7 +273,7 @@ main: { // [1] call ln // [9] phi from main to ln [phi:main->ln] ln_from_main: - // [9] phi line#13 = $40 [phi:main->ln#0] -- call_phi_near + // [9] phi line#13 = $40 [phi:main->ln#0] -- vbuaa=vbuc1 lda #$40 jsr ln // [2] phi from main to main::@1 [phi:main->main::@1] @@ -284,7 +284,7 @@ main: { // [3] call ln // [9] phi from main::@1 to ln [phi:main::@1->ln] ln_from___b1: - // [9] phi line#13 = line#14 [phi:main::@1->ln#0] -- call_phi_near + // [9] phi line#13 = line#14 [phi:main::@1->ln#0] -- register_copy jsr ln // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -294,7 +294,7 @@ main: { // [5] call ln // [9] phi from main::@2 to ln [phi:main::@2->ln] ln_from___b2: - // [9] phi line#13 = line#14 [phi:main::@2->ln#0] -- call_phi_near + // [9] phi line#13 = line#14 [phi:main::@2->ln#0] -- register_copy jsr ln jmp __b3 // main::@3 @@ -375,7 +375,7 @@ main: { // ln() // [1] call ln // [9] phi from main to ln [phi:main->ln] - // [9] phi line#13 = $40 [phi:main->ln#0] -- call_phi_near + // [9] phi line#13 = $40 [phi:main->ln#0] -- vbuaa=vbuc1 lda #$40 jsr ln // [2] phi from main to main::@1 [phi:main->main::@1] @@ -383,14 +383,14 @@ main: { // ln() // [3] call ln // [9] phi from main::@1 to ln [phi:main::@1->ln] - // [9] phi line#13 = line#14 [phi:main::@1->ln#0] -- call_phi_near + // [9] phi line#13 = line#14 [phi:main::@1->ln#0] -- register_copy jsr ln // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // ln() // [5] call ln // [9] phi from main::@2 to ln [phi:main::@2->ln] - // [9] phi line#13 = line#14 [phi:main::@2->ln#0] -- call_phi_near + // [9] phi line#13 = line#14 [phi:main::@2->ln#0] -- register_copy jsr ln // main::@3 // *SCREEN = ch diff --git a/src/test/ref/printf-1.log b/src/test/ref/printf-1.log index 17ab790c4..697639266 100644 --- a/src/test/ref/printf-1.log +++ b/src/test/ref/printf-1.log @@ -2496,7 +2496,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: @@ -2504,7 +2504,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 @@ -2540,7 +2540,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 @@ -2581,7 +2581,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [23] call cputln -- call_phi_near + // [23] call cputln jsr cputln jmp __breturn // cputc::@return @@ -2593,14 +2593,14 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln jmp __breturn } // main main: { // [28] call clrscr - // [64] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [64] phi from main to clrscr [phi:main->clrscr] clrscr_from_main: jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] @@ -2616,7 +2616,7 @@ main: { sta.z printf_string.str lda #>str sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@1->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@1->printf_string#1] -- vbuz1=vbuc1 lda #0 sta.z printf_string.format_justify_left jsr printf_string @@ -2625,7 +2625,7 @@ main: { jmp __b2 // main::@2 __b2: - // [32] call cputln -- call_phi_near + // [32] call cputln jsr cputln // [33] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -2640,7 +2640,7 @@ main: { sta.z printf_string.str lda #>str1 sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@3->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@3->printf_string#1] -- vbuz1=vbuc1 lda #0 sta.z printf_string.format_justify_left jsr printf_string @@ -2649,7 +2649,7 @@ main: { jmp __b4 // main::@4 __b4: - // [36] call cputln -- call_phi_near + // [36] call cputln jsr cputln // [37] phi from main::@4 to main::@5 [phi:main::@4->main::@5] __b5_from___b4: @@ -2664,7 +2664,7 @@ main: { sta.z printf_string.str lda #>str sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@5->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@5->printf_string#1] -- vbuz1=vbuc1 lda #1 sta.z printf_string.format_justify_left jsr printf_string @@ -2673,7 +2673,7 @@ main: { jmp __b6 // main::@6 __b6: - // [40] call cputln -- call_phi_near + // [40] call cputln jsr cputln // [41] phi from main::@6 to main::@7 [phi:main::@6->main::@7] __b7_from___b6: @@ -2688,7 +2688,7 @@ main: { sta.z printf_string.str lda #>str1 sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@7->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@7->printf_string#1] -- vbuz1=vbuc1 lda #1 sta.z printf_string.format_justify_left jsr printf_string @@ -2827,7 +2827,7 @@ cputln: { sta.z conio_cursor_x // [61] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [62] call cscroll -- call_phi_near + // [62] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -2954,7 +2954,7 @@ printf_string: { lda.z str+1 sta.z strlen.str+1 // [82] call strlen - // [114] phi from printf_string::@3 to strlen [phi:printf_string::@3->strlen] -- call_phi_near + // [114] phi from printf_string::@3 to strlen [phi:printf_string::@3->strlen] strlen_from___b3: jsr strlen // [83] strlen::return#2 = strlen::len#2 @@ -3012,14 +3012,14 @@ printf_string: { // [120] phi printf_padding::pad#4 = ' ' [phi:printf_string::@4->printf_padding#0] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [120] phi printf_padding::length#3 = printf_padding::length#0 [phi:printf_string::@4->printf_padding#1] -- call_phi_near + // [120] phi printf_padding::length#3 = printf_padding::length#0 [phi:printf_string::@4->printf_padding#1] -- register_copy jsr printf_padding jmp __b2 // printf_string::@2 __b2: // [94] printf_str::s#1 = printf_string::str#10 // [95] call printf_str - // [128] phi from printf_string::@2 to printf_str [phi:printf_string::@2->printf_str] -- call_phi_near + // [128] phi from printf_string::@2 to printf_str [phi:printf_string::@2->printf_str] printf_str_from___b2: jsr printf_str jmp __b7 @@ -3047,7 +3047,7 @@ printf_string: { // [120] phi printf_padding::pad#4 = ' ' [phi:printf_string::@5->printf_padding#0] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [120] phi printf_padding::length#3 = printf_padding::length#1 [phi:printf_string::@5->printf_padding#1] -- call_phi_near + // [120] phi printf_padding::length#3 = printf_padding::length#1 [phi:printf_string::@5->printf_padding#1] -- register_copy jsr printf_padding jmp __breturn // printf_string::@return @@ -3075,7 +3075,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [137] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [137] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -3094,7 +3094,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [137] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [137] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -3110,7 +3110,7 @@ cscroll: { memset_from___b3: // [147] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [147] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [147] 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 @@ -3126,7 +3126,7 @@ cscroll: { memset_from___b4: // [147] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [147] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [147] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -3782,12 +3782,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 @@ -3816,7 +3816,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 // } @@ -3855,7 +3855,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: @@ -3866,7 +3866,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln rts } @@ -3874,7 +3874,7 @@ cputc: { main: { // clrscr() // [28] call clrscr - // [64] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [64] phi from main to clrscr [phi:main->clrscr] jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] // main::@1 @@ -3886,14 +3886,14 @@ main: { sta.z printf_string.str lda #>str sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@1->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@1->printf_string#1] -- vbuz1=vbuc1 lda #0 sta.z printf_string.format_justify_left jsr printf_string // [31] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // cputln() - // [32] call cputln -- call_phi_near + // [32] call cputln jsr cputln // [33] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 @@ -3905,14 +3905,14 @@ main: { sta.z printf_string.str lda #>str1 sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@3->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 0 [phi:main::@3->printf_string#1] -- vbuz1=vbuc1 lda #0 sta.z printf_string.format_justify_left jsr printf_string // [35] phi from main::@3 to main::@4 [phi:main::@3->main::@4] // main::@4 // cputln() - // [36] call cputln -- call_phi_near + // [36] call cputln jsr cputln // [37] phi from main::@4 to main::@5 [phi:main::@4->main::@5] // main::@5 @@ -3924,14 +3924,14 @@ main: { sta.z printf_string.str lda #>str sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@5->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@5->printf_string#1] -- vbuz1=vbuc1 lda #1 sta.z printf_string.format_justify_left jsr printf_string // [39] phi from main::@5 to main::@6 [phi:main::@5->main::@6] // main::@6 // cputln() - // [40] call cputln -- call_phi_near + // [40] call cputln jsr cputln // [41] phi from main::@6 to main::@7 [phi:main::@6->main::@7] // main::@7 @@ -3943,7 +3943,7 @@ main: { sta.z printf_string.str lda #>str1 sta.z printf_string.str+1 - // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@7->printf_string#1] -- call_phi_near + // [80] phi printf_string::format_justify_left#10 = 1 [phi:main::@7->printf_string#1] -- vbuz1=vbuc1 lda #1 sta.z printf_string.format_justify_left jsr printf_string @@ -4084,7 +4084,7 @@ cputln: { // [61] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [62] call cscroll -- call_phi_near + // [62] call cscroll jsr cscroll // cputln::@return // } @@ -4210,7 +4210,7 @@ printf_string: { lda.z str+1 sta.z strlen.str+1 // [82] call strlen - // [114] phi from printf_string::@3 to strlen [phi:printf_string::@3->strlen] -- call_phi_near + // [114] phi from printf_string::@3 to strlen [phi:printf_string::@3->strlen] jsr strlen // strlen(str) // [83] strlen::return#2 = strlen::len#2 @@ -4260,14 +4260,14 @@ printf_string: { // [120] phi printf_padding::pad#4 = ' ' [phi:printf_string::@4->printf_padding#0] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [120] phi printf_padding::length#3 = printf_padding::length#0 [phi:printf_string::@4->printf_padding#1] -- call_phi_near + // [120] phi printf_padding::length#3 = printf_padding::length#0 [phi:printf_string::@4->printf_padding#1] -- register_copy jsr printf_padding // printf_string::@2 __b2: // printf_str(putc, str) // [94] printf_str::s#1 = printf_string::str#10 // [95] call printf_str - // [128] phi from printf_string::@2 to printf_str [phi:printf_string::@2->printf_str] -- call_phi_near + // [128] phi from printf_string::@2 to printf_str [phi:printf_string::@2->printf_str] jsr printf_str // printf_string::@7 // if(format.justify_left && padding) @@ -4291,7 +4291,7 @@ printf_string: { // [120] phi printf_padding::pad#4 = ' ' [phi:printf_string::@5->printf_padding#0] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [120] phi printf_padding::length#3 = printf_padding::length#1 [phi:printf_string::@5->printf_padding#1] -- call_phi_near + // [120] phi printf_padding::length#3 = printf_padding::length#1 [phi:printf_string::@5->printf_padding#1] -- register_copy jsr printf_padding // printf_string::@return __breturn: @@ -4317,7 +4317,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [137] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [137] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -4333,7 +4333,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [137] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [137] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -4346,7 +4346,7 @@ cscroll: { // [147] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [147] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [147] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [147] 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 @@ -4359,7 +4359,7 @@ cscroll: { // [147] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [147] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [147] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [147] 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/printf-10.log b/src/test/ref/printf-10.log index dc91acd48..d9c32976a 100644 --- a/src/test/ref/printf-10.log +++ b/src/test/ref/printf-10.log @@ -394,7 +394,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [7] phi printf_str::str#6 = main::str [phi:main->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#6 = main::str [phi:main->printf_str#1] -- pbuz1=pbuc1 lda #str @@ -406,7 +406,7 @@ main: { // main::@1 __b1: // [3] call printf_string - // [14] phi from main::@1 to printf_string [phi:main::@1->printf_string] -- call_phi_near + // [14] phi from main::@1 to printf_string [phi:main::@1->printf_string] printf_string_from___b1: jsr printf_string // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -418,7 +418,7 @@ main: { // [7] phi from main::@2 to printf_str [phi:main::@2->printf_str] printf_str_from___b2: // [7] phi screen#25 = screen#1 [phi:main::@2->printf_str#0] -- register_copy - // [7] phi printf_str::str#6 = main::str1 [phi:main::@2->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#6 = main::str1 [phi:main::@2->printf_str#1] -- pbuz1=pbuc1 lda #str1 @@ -488,7 +488,7 @@ printf_string: { // [7] phi from printf_string to printf_str [phi:printf_string->printf_str] printf_str_from_printf_string: // [7] phi screen#25 = screen#1 [phi:printf_string->printf_str#0] -- register_copy - // [7] phi printf_str::str#6 = main::name [phi:printf_string->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#6 = main::name [phi:printf_string->printf_str#1] -- pbuz1=pbuc1 lda #main.name @@ -585,7 +585,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [7] phi printf_str::str#6 = main::str [phi:main->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#6 = main::str [phi:main->printf_str#1] -- pbuz1=pbuc1 lda #str @@ -595,7 +595,7 @@ main: { // main::@1 // printf("Hello, I am %s. who are you?", name) // [3] call printf_string - // [14] phi from main::@1 to printf_string [phi:main::@1->printf_string] -- call_phi_near + // [14] phi from main::@1 to printf_string [phi:main::@1->printf_string] jsr printf_string // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 @@ -603,7 +603,7 @@ main: { // [5] call printf_str // [7] phi from main::@2 to printf_str [phi:main::@2->printf_str] // [7] phi screen#25 = screen#1 [phi:main::@2->printf_str#0] -- register_copy - // [7] phi printf_str::str#6 = main::str1 [phi:main::@2->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#6 = main::str1 [phi:main::@2->printf_str#1] -- pbuz1=pbuc1 lda #str1 @@ -670,7 +670,7 @@ printf_string: { // [15] call printf_str // [7] phi from printf_string to printf_str [phi:printf_string->printf_str] // [7] phi screen#25 = screen#1 [phi:printf_string->printf_str#0] -- register_copy - // [7] phi printf_str::str#6 = main::name [phi:printf_string->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#6 = main::name [phi:printf_string->printf_str#1] -- pbuz1=pbuc1 lda #main.name diff --git a/src/test/ref/printf-11.log b/src/test/ref/printf-11.log index 7ebcbc0f7..9aa0d1b12 100644 --- a/src/test/ref/printf-11.log +++ b/src/test/ref/printf-11.log @@ -521,7 +521,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [7] phi printf_str::str#5 = main::str [phi:main->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#5 = main::str [phi:main->printf_str#1] -- pbuz1=pbuc1 lda #str @@ -532,7 +532,7 @@ main: { jmp __b1 // main::@1 __b1: - // [3] call printf_uint -- call_phi_near + // [3] call printf_uint jsr printf_uint // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -543,7 +543,7 @@ main: { // [7] phi from main::@2 to printf_str [phi:main::@2->printf_str] printf_str_from___b2: // [7] phi screen#27 = screen#17 [phi:main::@2->printf_str#0] -- register_copy - // [7] phi printf_str::str#5 = main::str1 [phi:main::@2->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#5 = main::str1 [phi:main::@2->printf_str#1] -- pbuz1=pbuc1 lda #str1 @@ -748,7 +748,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [7] phi printf_str::str#5 = main::str [phi:main->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#5 = main::str [phi:main->printf_str#1] -- pbuz1=pbuc1 lda #str @@ -757,7 +757,7 @@ main: { // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // printf("Commodore is %x cool", pct) - // [3] call printf_uint -- call_phi_near + // [3] call printf_uint jsr printf_uint // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 @@ -765,7 +765,7 @@ main: { // [5] call printf_str // [7] phi from main::@2 to printf_str [phi:main::@2->printf_str] // [7] phi screen#27 = screen#17 [phi:main::@2->printf_str#0] -- register_copy - // [7] phi printf_str::str#5 = main::str1 [phi:main::@2->printf_str#1] -- call_phi_near + // [7] phi printf_str::str#5 = main::str1 [phi:main::@2->printf_str#1] -- pbuz1=pbuc1 lda #str1 diff --git a/src/test/ref/printf-12.log b/src/test/ref/printf-12.log index d8bb5d234..b25c502ae 100644 --- a/src/test/ref/printf-12.log +++ b/src/test/ref/printf-12.log @@ -7801,7 +7801,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: @@ -7809,7 +7809,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 @@ -7845,7 +7845,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 @@ -7886,7 +7886,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [23] call cputln -- call_phi_near + // [23] call cputln jsr cputln jmp __breturn // cputc::@return @@ -7898,7 +7898,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln jmp __breturn } @@ -7912,7 +7912,7 @@ main: { .label ul = $8aa52 .label c = $2c // [28] call clrscr - // [104] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [104] phi from main to clrscr [phi:main->clrscr] clrscr_from_main: jsr clrscr jmp __b1 @@ -7929,7 +7929,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -7953,7 +7953,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@2->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@2->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -7972,7 +7972,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s2 [phi:main::@3->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s2 [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -7988,7 +7988,7 @@ main: { printf_uint_from___b4: // [129] phi printf_uint::format_radix#2 = HEXADECIMAL [phi:main::@4->printf_uint#0] -- vbuxx=vbuc1 ldx #HEXADECIMAL - // [129] phi printf_uint::uvalue#2 = (unsigned int)&main::c [phi:main::@4->printf_uint#1] -- call_phi_near + // [129] phi printf_uint::uvalue#2 = (unsigned int)&main::c [phi:main::@4->printf_uint#1] -- vwuz1=vwuc1 lda #c @@ -8007,7 +8007,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@5->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8026,7 +8026,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s4 [phi:main::@6->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s4 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -8050,7 +8050,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@7->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@7->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8069,7 +8069,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s6 [phi:main::@8->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s6 [phi:main::@8->printf_str#1] -- pbuz1=pbuc1 lda #s6 @@ -8080,7 +8080,7 @@ main: { jmp __b9 // main::@9 __b9: - // [50] call printf_schar -- call_phi_near + // [50] call printf_schar jsr printf_schar // [51] phi from main::@9 to main::@10 [phi:main::@9->main::@10] __b10_from___b9: @@ -8095,7 +8095,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@10->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@10->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8114,7 +8114,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s8 [phi:main::@11->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s8 [phi:main::@11->printf_str#1] -- pbuz1=pbuc1 lda #s8 @@ -8126,7 +8126,7 @@ main: { // main::@12 __b12: // [56] call printf_uchar - // [144] phi from main::@12 to printf_uchar [phi:main::@12->printf_uchar] -- call_phi_near + // [144] phi from main::@12 to printf_uchar [phi:main::@12->printf_uchar] printf_uchar_from___b12: jsr printf_uchar // [57] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -8142,7 +8142,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@13->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@13->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8161,7 +8161,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s10 [phi:main::@14->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s10 [phi:main::@14->printf_str#1] -- pbuz1=pbuc1 lda #s10 @@ -8172,7 +8172,7 @@ main: { jmp __b15 // main::@15 __b15: - // [62] call printf_sint -- call_phi_near + // [62] call printf_sint jsr printf_sint // [63] phi from main::@15 to main::@16 [phi:main::@15->main::@16] __b16_from___b15: @@ -8187,7 +8187,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@16->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@16->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8206,7 +8206,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s12 [phi:main::@17->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s12 [phi:main::@17->printf_str#1] -- pbuz1=pbuc1 lda #s12 @@ -8222,7 +8222,7 @@ main: { printf_uint_from___b18: // [129] phi printf_uint::format_radix#2 = DECIMAL [phi:main::@18->printf_uint#0] -- vbuxx=vbuc1 ldx #DECIMAL - // [129] phi printf_uint::uvalue#2 = main::ui [phi:main::@18->printf_uint#1] -- call_phi_near + // [129] phi printf_uint::uvalue#2 = main::ui [phi:main::@18->printf_uint#1] -- vwuz1=vwuc1 lda #ui @@ -8241,7 +8241,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@19->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@19->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8260,7 +8260,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s14 [phi:main::@20->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s14 [phi:main::@20->printf_str#1] -- pbuz1=pbuc1 lda #s14 @@ -8271,7 +8271,7 @@ main: { jmp __b21 // main::@21 __b21: - // [74] call printf_slong -- call_phi_near + // [74] call printf_slong jsr printf_slong // [75] phi from main::@21 to main::@22 [phi:main::@21->main::@22] __b22_from___b21: @@ -8286,7 +8286,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@22->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@22->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8305,7 +8305,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s16 [phi:main::@23->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s16 [phi:main::@23->printf_str#1] -- pbuz1=pbuc1 lda #s16 @@ -8317,7 +8317,7 @@ main: { // main::@24 __b24: // [80] call printf_ulong - // [164] phi from main::@24 to printf_ulong [phi:main::@24->printf_ulong] -- call_phi_near + // [164] phi from main::@24 to printf_ulong [phi:main::@24->printf_ulong] printf_ulong_from___b24: jsr printf_ulong // [81] phi from main::@24 to main::@25 [phi:main::@24->main::@25] @@ -8333,7 +8333,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@25->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@25->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -8490,7 +8490,7 @@ cputln: { sta.z conio_cursor_x // [101] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [102] call cscroll -- call_phi_near + // [102] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -8660,7 +8660,7 @@ printf_uint: { // [183] phi from printf_uint::@1 to utoa [phi:printf_uint::@1->utoa] utoa_from___b1: // [183] phi utoa::value#10 = utoa::value#2 [phi:printf_uint::@1->utoa#0] -- register_copy - // [183] phi utoa::radix#2 = utoa::radix#1 [phi:printf_uint::@1->utoa#1] -- call_phi_near + // [183] phi utoa::radix#2 = utoa::radix#1 [phi:printf_uint::@1->utoa#1] -- register_copy jsr utoa jmp __b2 // printf_uint::@2 @@ -8687,7 +8687,7 @@ printf_uint: { // [214] phi printf_number_buffer::format_justify_left#10 = 0 [phi:printf_uint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #0 sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = 0 [phi:printf_uint::@2->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = 0 [phi:printf_uint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #0 jsr printf_number_buffer jmp __breturn @@ -8726,7 +8726,7 @@ printf_schar: { // [140] call uctoa // [255] phi from printf_schar::@2 to uctoa [phi:printf_schar::@2->uctoa] uctoa_from___b2: - // [255] phi uctoa::value#10 = printf_schar::uvalue#0 [phi:printf_schar::@2->uctoa#0] -- call_phi_near + // [255] phi uctoa::value#10 = printf_schar::uvalue#0 [phi:printf_schar::@2->uctoa#0] -- vbuxx=vbuc1 ldx #uvalue jsr uctoa jmp __b3 @@ -8754,7 +8754,7 @@ printf_schar: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_schar::format_justify_left#0 [phi:printf_schar::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_schar::format_min_length#0 [phi:printf_schar::@3->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_schar::format_min_length#0 [phi:printf_schar::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -8783,7 +8783,7 @@ printf_uchar: { // Format number into buffer // [255] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] uctoa_from___b1: - // [255] phi uctoa::value#10 = main::uc [phi:printf_uchar::@1->uctoa#0] -- call_phi_near + // [255] phi uctoa::value#10 = main::uc [phi:printf_uchar::@1->uctoa#0] -- vbuxx=vbuc1 ldx #main.uc jsr uctoa jmp __b2 @@ -8811,7 +8811,7 @@ printf_uchar: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_uchar::format_justify_left#0 [phi:printf_uchar::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_uchar::format_min_length#0 [phi:printf_uchar::@2->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_uchar::format_min_length#0 [phi:printf_uchar::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -8855,7 +8855,7 @@ printf_sint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [183] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- call_phi_near + // [183] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- vbuxx=vbuc1 ldx #DECIMAL jsr utoa jmp __b3 @@ -8883,7 +8883,7 @@ printf_sint: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_sint::format_justify_left#0 [phi:printf_sint::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_sint::format_min_length#0 [phi:printf_sint::@3->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_sint::format_min_length#0 [phi:printf_sint::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -8922,7 +8922,7 @@ printf_slong: { // [160] call ultoa // [274] phi from printf_slong::@2 to ultoa [phi:printf_slong::@2->ultoa] ultoa_from___b2: - // [274] phi ultoa::value#10 = printf_slong::uvalue#0 [phi:printf_slong::@2->ultoa#0] -- call_phi_near + // [274] phi ultoa::value#10 = printf_slong::uvalue#0 [phi:printf_slong::@2->ultoa#0] -- vduz1=vduc1 lda #uvalue @@ -8957,7 +8957,7 @@ printf_slong: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_slong::format_justify_left#0 [phi:printf_slong::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_slong::format_min_length#0 [phi:printf_slong::@3->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_slong::format_min_length#0 [phi:printf_slong::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -8986,7 +8986,7 @@ printf_ulong: { // Format number into buffer // [274] phi from printf_ulong::@1 to ultoa [phi:printf_ulong::@1->ultoa] ultoa_from___b1: - // [274] phi ultoa::value#10 = main::ul [phi:printf_ulong::@1->ultoa#0] -- call_phi_near + // [274] phi ultoa::value#10 = main::ul [phi:printf_ulong::@1->ultoa#0] -- vduz1=vduc1 lda #main.ul @@ -9021,7 +9021,7 @@ printf_ulong: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_ulong::format_justify_left#0 [phi:printf_ulong::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_ulong::format_min_length#0 [phi:printf_ulong::@2->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_ulong::format_min_length#0 [phi:printf_ulong::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -9050,7 +9050,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [295] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [295] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -9069,7 +9069,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [295] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [295] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -9085,7 +9085,7 @@ cscroll: { memset_from___b3: // [305] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [305] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [305] 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 @@ -9101,7 +9101,7 @@ cscroll: { memset_from___b4: // [305] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [305] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [305] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -9330,7 +9330,7 @@ utoa: { // [208] utoa_append::value#0 = utoa::value#3 // [209] utoa_append::sub#0 = utoa::digit_value#0 // [210] call utoa_append - // [313] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] -- call_phi_near + // [313] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] utoa_append_from___b10: jsr utoa_append // [211] utoa_append::return#0 = utoa_append::value#2 @@ -9372,7 +9372,7 @@ printf_number_buffer: { // printf_number_buffer::@6 __b6: // [217] call strlen - // [320] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] -- call_phi_near + // [320] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] strlen_from___b6: jsr strlen // [218] strlen::return#2 = strlen::len#2 @@ -9456,7 +9456,7 @@ printf_number_buffer: { // [326] phi printf_padding::pad#5 = ' ' [phi:printf_number_buffer::@8->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [326] phi printf_padding::length#4 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- call_phi_near + // [326] phi printf_padding::length#4 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- register_copy jsr printf_padding jmp __b2 // printf_number_buffer::@2 @@ -9501,7 +9501,7 @@ printf_number_buffer: { // [326] phi printf_padding::pad#5 = '0' [phi:printf_number_buffer::@10->printf_padding#1] -- vbuz1=vbuc1 lda #'0' sta.z printf_padding.pad - // [326] phi printf_padding::length#4 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- call_phi_near + // [326] phi printf_padding::length#4 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- register_copy jsr printf_padding jmp __b4 // printf_number_buffer::@4 @@ -9515,7 +9515,7 @@ printf_number_buffer: { // printf_number_buffer::@11 __b11: // [245] call strupr - // [334] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] -- call_phi_near + // [334] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] strupr_from___b11: jsr strupr jmp __b5 @@ -9526,7 +9526,7 @@ printf_number_buffer: { // [120] phi from printf_number_buffer::@5 to printf_str [phi:printf_number_buffer::@5->printf_str] printf_str_from___b5: // [120] phi printf_str::putc#21 = printf_str::putc#0 [phi:printf_number_buffer::@5->printf_str#0] -- register_copy - // [120] phi printf_str::s#21 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- pbuz1=pbuc1 lda #printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS @@ -9565,7 +9565,7 @@ printf_number_buffer: { // [326] phi printf_padding::pad#5 = ' ' [phi:printf_number_buffer::@12->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [326] phi printf_padding::length#4 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- call_phi_near + // [326] phi printf_padding::length#4 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- register_copy jsr printf_padding jmp __breturn // printf_number_buffer::@return @@ -9668,7 +9668,7 @@ uctoa: { // [268] uctoa_append::value#0 = uctoa::value#3 // [269] uctoa_append::sub#0 = uctoa::digit_value#0 // [270] call uctoa_append - // [344] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [344] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] uctoa_append_from___b5: jsr uctoa_append // [271] uctoa_append::return#0 = uctoa_append::value#2 @@ -9808,7 +9808,7 @@ ultoa: { // [289] ultoa_append::value#0 = ultoa::value#3 // [290] ultoa_append::sub#0 = ultoa::digit_value#0 // [291] call ultoa_append - // [351] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] -- call_phi_near + // [351] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] ultoa_append_from___b5: jsr ultoa_append // [292] ultoa_append::return#0 = ultoa_append::value#2 @@ -10129,7 +10129,7 @@ strupr: { // [338] toupper::ch#0 = *strupr::src#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (src),y - // [339] call toupper -- call_phi_near + // [339] call toupper jsr toupper // [340] toupper::return#3 = toupper::return#2 jmp __b3 @@ -11291,12 +11291,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 @@ -11325,7 +11325,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 // } @@ -11364,7 +11364,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: @@ -11375,7 +11375,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln rts } @@ -11390,7 +11390,7 @@ main: { .label c = $2c // clrscr() // [28] call clrscr - // [104] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [104] phi from main to clrscr [phi:main->clrscr] jsr clrscr // main::@1 // char c = 'x' @@ -11405,7 +11405,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -11427,7 +11427,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@2->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@2->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11443,7 +11443,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s2 [phi:main::@3->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s2 [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -11456,7 +11456,7 @@ main: { // [129] phi from main::@4 to printf_uint [phi:main::@4->printf_uint] // [129] phi printf_uint::format_radix#2 = HEXADECIMAL [phi:main::@4->printf_uint#0] -- vbuxx=vbuc1 ldx #HEXADECIMAL - // [129] phi printf_uint::uvalue#2 = (unsigned int)&main::c [phi:main::@4->printf_uint#1] -- call_phi_near + // [129] phi printf_uint::uvalue#2 = (unsigned int)&main::c [phi:main::@4->printf_uint#1] -- vwuz1=vwuc1 lda #c @@ -11472,7 +11472,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@5->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11488,7 +11488,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s4 [phi:main::@6->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s4 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -11510,7 +11510,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@7->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@7->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11526,7 +11526,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s6 [phi:main::@8->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s6 [phi:main::@8->printf_str#1] -- pbuz1=pbuc1 lda #s6 @@ -11535,7 +11535,7 @@ main: { // [49] phi from main::@8 to main::@9 [phi:main::@8->main::@9] // main::@9 // printf("A signed char: %hhd\n", sc) - // [50] call printf_schar -- call_phi_near + // [50] call printf_schar jsr printf_schar // [51] phi from main::@9 to main::@10 [phi:main::@9->main::@10] // main::@10 @@ -11547,7 +11547,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@10->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@10->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11563,7 +11563,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s8 [phi:main::@11->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s8 [phi:main::@11->printf_str#1] -- pbuz1=pbuc1 lda #s8 @@ -11573,7 +11573,7 @@ main: { // main::@12 // printf("An unsigned char: %hhu\n", uc) // [56] call printf_uchar - // [144] phi from main::@12 to printf_uchar [phi:main::@12->printf_uchar] -- call_phi_near + // [144] phi from main::@12 to printf_uchar [phi:main::@12->printf_uchar] jsr printf_uchar // [57] phi from main::@12 to main::@13 [phi:main::@12->main::@13] // main::@13 @@ -11585,7 +11585,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@13->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@13->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11601,7 +11601,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s10 [phi:main::@14->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s10 [phi:main::@14->printf_str#1] -- pbuz1=pbuc1 lda #s10 @@ -11610,7 +11610,7 @@ main: { // [61] phi from main::@14 to main::@15 [phi:main::@14->main::@15] // main::@15 // printf("A signed int: %d\n", si) - // [62] call printf_sint -- call_phi_near + // [62] call printf_sint jsr printf_sint // [63] phi from main::@15 to main::@16 [phi:main::@15->main::@16] // main::@16 @@ -11622,7 +11622,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@16->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@16->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11638,7 +11638,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s12 [phi:main::@17->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s12 [phi:main::@17->printf_str#1] -- pbuz1=pbuc1 lda #s12 @@ -11651,7 +11651,7 @@ main: { // [129] phi from main::@18 to printf_uint [phi:main::@18->printf_uint] // [129] phi printf_uint::format_radix#2 = DECIMAL [phi:main::@18->printf_uint#0] -- vbuxx=vbuc1 ldx #DECIMAL - // [129] phi printf_uint::uvalue#2 = main::ui [phi:main::@18->printf_uint#1] -- call_phi_near + // [129] phi printf_uint::uvalue#2 = main::ui [phi:main::@18->printf_uint#1] -- vwuz1=vwuc1 lda #ui @@ -11667,7 +11667,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@19->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@19->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11683,7 +11683,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s14 [phi:main::@20->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s14 [phi:main::@20->printf_str#1] -- pbuz1=pbuc1 lda #s14 @@ -11692,7 +11692,7 @@ main: { // [73] phi from main::@20 to main::@21 [phi:main::@20->main::@21] // main::@21 // printf("A signed long: %ld\n", sl) - // [74] call printf_slong -- call_phi_near + // [74] call printf_slong jsr printf_slong // [75] phi from main::@21 to main::@22 [phi:main::@21->main::@22] // main::@22 @@ -11704,7 +11704,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@22->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@22->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11720,7 +11720,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s16 [phi:main::@23->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s16 [phi:main::@23->printf_str#1] -- pbuz1=pbuc1 lda #s16 @@ -11730,7 +11730,7 @@ main: { // main::@24 // printf("An unsigned long: %lu\n", ul) // [80] call printf_ulong - // [164] phi from main::@24 to printf_ulong [phi:main::@24->printf_ulong] -- call_phi_near + // [164] phi from main::@24 to printf_ulong [phi:main::@24->printf_ulong] jsr printf_ulong // [81] phi from main::@24 to main::@25 [phi:main::@24->main::@25] // main::@25 @@ -11742,7 +11742,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [120] phi printf_str::s#21 = main::s1 [phi:main::@25->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = main::s1 [phi:main::@25->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -11901,7 +11901,7 @@ cputln: { // [101] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [102] call cscroll -- call_phi_near + // [102] call cscroll jsr cscroll // cputln::@return // } @@ -12068,7 +12068,7 @@ printf_uint: { // Format number into buffer // [183] phi from printf_uint::@1 to utoa [phi:printf_uint::@1->utoa] // [183] phi utoa::value#10 = utoa::value#2 [phi:printf_uint::@1->utoa#0] -- register_copy - // [183] phi utoa::radix#2 = utoa::radix#1 [phi:printf_uint::@1->utoa#1] -- call_phi_near + // [183] phi utoa::radix#2 = utoa::radix#1 [phi:printf_uint::@1->utoa#1] -- register_copy jsr utoa // printf_uint::@2 // printf_number_buffer(putc, printf_buffer, format) @@ -12092,7 +12092,7 @@ printf_uint: { sta.z printf_number_buffer.format_zero_padding // [214] phi printf_number_buffer::format_justify_left#10 = 0 [phi:printf_uint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = 0 [phi:printf_uint::@2->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = 0 [phi:printf_uint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 tax jsr printf_number_buffer // printf_uint::@return @@ -12127,7 +12127,7 @@ printf_schar: { // uctoa(uvalue, printf_buffer.digits, format.radix) // [140] call uctoa // [255] phi from printf_schar::@2 to uctoa [phi:printf_schar::@2->uctoa] - // [255] phi uctoa::value#10 = printf_schar::uvalue#0 [phi:printf_schar::@2->uctoa#0] -- call_phi_near + // [255] phi uctoa::value#10 = printf_schar::uvalue#0 [phi:printf_schar::@2->uctoa#0] -- vbuxx=vbuc1 ldx #uvalue jsr uctoa // printf_schar::@3 @@ -12153,7 +12153,7 @@ printf_schar: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_schar::format_justify_left#0 [phi:printf_schar::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_schar::format_min_length#0 [phi:printf_schar::@3->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_schar::format_min_length#0 [phi:printf_schar::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_schar::@return @@ -12180,7 +12180,7 @@ printf_uchar: { // [146] call uctoa // Format number into buffer // [255] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] - // [255] phi uctoa::value#10 = main::uc [phi:printf_uchar::@1->uctoa#0] -- call_phi_near + // [255] phi uctoa::value#10 = main::uc [phi:printf_uchar::@1->uctoa#0] -- vbuxx=vbuc1 ldx #main.uc jsr uctoa // printf_uchar::@2 @@ -12206,7 +12206,7 @@ printf_uchar: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_uchar::format_justify_left#0 [phi:printf_uchar::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_uchar::format_min_length#0 [phi:printf_uchar::@2->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_uchar::format_min_length#0 [phi:printf_uchar::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_uchar::@return @@ -12246,7 +12246,7 @@ printf_sint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [183] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- call_phi_near + // [183] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- vbuxx=vbuc1 ldx #DECIMAL jsr utoa // printf_sint::@3 @@ -12272,7 +12272,7 @@ printf_sint: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_sint::format_justify_left#0 [phi:printf_sint::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_sint::format_min_length#0 [phi:printf_sint::@3->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_sint::format_min_length#0 [phi:printf_sint::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_sint::@return @@ -12307,7 +12307,7 @@ printf_slong: { // ultoa(uvalue, printf_buffer.digits, format.radix) // [160] call ultoa // [274] phi from printf_slong::@2 to ultoa [phi:printf_slong::@2->ultoa] - // [274] phi ultoa::value#10 = printf_slong::uvalue#0 [phi:printf_slong::@2->ultoa#0] -- call_phi_near + // [274] phi ultoa::value#10 = printf_slong::uvalue#0 [phi:printf_slong::@2->ultoa#0] -- vduz1=vduc1 lda #uvalue @@ -12340,7 +12340,7 @@ printf_slong: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_slong::format_justify_left#0 [phi:printf_slong::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_slong::format_min_length#0 [phi:printf_slong::@3->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_slong::format_min_length#0 [phi:printf_slong::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_slong::@return @@ -12367,7 +12367,7 @@ printf_ulong: { // [166] call ultoa // Format number into buffer // [274] phi from printf_ulong::@1 to ultoa [phi:printf_ulong::@1->ultoa] - // [274] phi ultoa::value#10 = main::ul [phi:printf_ulong::@1->ultoa#0] -- call_phi_near + // [274] phi ultoa::value#10 = main::ul [phi:printf_ulong::@1->ultoa#0] -- vduz1=vduc1 lda #main.ul @@ -12400,7 +12400,7 @@ printf_ulong: { // [214] phi printf_number_buffer::format_justify_left#10 = printf_ulong::format_justify_left#0 [phi:printf_ulong::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [214] phi printf_number_buffer::format_min_length#10 = printf_ulong::format_min_length#0 [phi:printf_ulong::@2->printf_number_buffer#5] -- call_phi_near + // [214] phi printf_number_buffer::format_min_length#10 = printf_ulong::format_min_length#0 [phi:printf_ulong::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_ulong::@return @@ -12426,7 +12426,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [295] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [295] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -12442,7 +12442,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [295] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [295] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -12455,7 +12455,7 @@ cscroll: { // [305] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [305] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [305] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [305] 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 @@ -12468,7 +12468,7 @@ cscroll: { // [305] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [305] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [305] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [305] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -12693,7 +12693,7 @@ utoa: { // [208] utoa_append::value#0 = utoa::value#3 // [209] utoa_append::sub#0 = utoa::digit_value#0 // [210] call utoa_append - // [313] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] -- call_phi_near + // [313] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] jsr utoa_append // utoa_append(buffer++, value, digit_value) // [211] utoa_append::return#0 = utoa_append::value#2 @@ -12733,7 +12733,7 @@ printf_number_buffer: { // printf_number_buffer::@6 // strlen(buffer.digits) // [217] call strlen - // [320] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] -- call_phi_near + // [320] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] jsr strlen // strlen(buffer.digits) // [218] strlen::return#2 = strlen::len#2 @@ -12804,7 +12804,7 @@ printf_number_buffer: { // [326] phi printf_padding::pad#5 = ' ' [phi:printf_number_buffer::@8->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [326] phi printf_padding::length#4 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- call_phi_near + // [326] phi printf_padding::length#4 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@2 __b2: @@ -12845,7 +12845,7 @@ printf_number_buffer: { // [326] phi printf_padding::pad#5 = '0' [phi:printf_number_buffer::@10->printf_padding#1] -- vbuz1=vbuc1 lda #'0' sta.z printf_padding.pad - // [326] phi printf_padding::length#4 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- call_phi_near + // [326] phi printf_padding::length#4 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@4 __b4: @@ -12857,7 +12857,7 @@ printf_number_buffer: { // printf_number_buffer::@11 // strupr(buffer.digits) // [245] call strupr - // [334] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] -- call_phi_near + // [334] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] jsr strupr // printf_number_buffer::@5 __b5: @@ -12866,7 +12866,7 @@ printf_number_buffer: { // [247] call printf_str // [120] phi from printf_number_buffer::@5 to printf_str [phi:printf_number_buffer::@5->printf_str] // [120] phi printf_str::putc#21 = printf_str::putc#0 [phi:printf_number_buffer::@5->printf_str#0] -- register_copy - // [120] phi printf_str::s#21 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- call_phi_near + // [120] phi printf_str::s#21 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- pbuz1=pbuc1 lda #printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS @@ -12900,7 +12900,7 @@ printf_number_buffer: { // [326] phi printf_padding::pad#5 = ' ' [phi:printf_number_buffer::@12->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [326] phi printf_padding::length#4 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- call_phi_near + // [326] phi printf_padding::length#4 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@return __breturn: @@ -13000,7 +13000,7 @@ uctoa: { // [268] uctoa_append::value#0 = uctoa::value#3 // [269] uctoa_append::sub#0 = uctoa::digit_value#0 // [270] call uctoa_append - // [344] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [344] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] jsr uctoa_append // uctoa_append(buffer++, value, digit_value) // [271] uctoa_append::return#0 = uctoa_append::value#2 @@ -13137,7 +13137,7 @@ ultoa: { // [289] ultoa_append::value#0 = ultoa::value#3 // [290] ultoa_append::sub#0 = ultoa::digit_value#0 // [291] call ultoa_append - // [351] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] -- call_phi_near + // [351] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] jsr ultoa_append // ultoa_append(buffer++, value, digit_value) // [292] ultoa_append::return#0 = ultoa_append::value#2 @@ -13446,7 +13446,7 @@ strupr: { // [338] toupper::ch#0 = *strupr::src#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (src),y - // [339] call toupper -- call_phi_near + // [339] call toupper jsr toupper // [340] toupper::return#3 = toupper::return#2 // strupr::@3 diff --git a/src/test/ref/printf-14.log b/src/test/ref/printf-14.log index 4a61c0595..8ab5f163e 100644 --- a/src/test/ref/printf-14.log +++ b/src/test/ref/printf-14.log @@ -3645,7 +3645,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: @@ -3653,7 +3653,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 @@ -3689,7 +3689,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 @@ -3730,7 +3730,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [23] call cputln -- call_phi_near + // [23] call cputln jsr cputln jmp __breturn // cputc::@return @@ -3742,7 +3742,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln jmp __breturn } @@ -3750,7 +3750,7 @@ cputc: { main: { .label c = 7 // [28] call clrscr - // [52] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [52] phi from main to clrscr [phi:main->clrscr] clrscr_from_main: jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] @@ -3759,7 +3759,7 @@ main: { // main::@1 __b1: // [30] call printf_uchar - // [68] phi from main::@1 to printf_uchar [phi:main::@1->printf_uchar] -- call_phi_near + // [68] phi from main::@1 to printf_uchar [phi:main::@1->printf_uchar] printf_uchar_from___b1: jsr printf_uchar jmp __breturn @@ -3891,7 +3891,7 @@ cputln: { sta.z conio_cursor_x // [49] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [50] call cscroll -- call_phi_near + // [50] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -4013,7 +4013,7 @@ printf_uchar: { sta printf_buffer // [70] call uctoa // Format number into buffer - // [87] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] -- call_phi_near + // [87] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] uctoa_from___b1: jsr uctoa jmp __b2 @@ -4023,7 +4023,7 @@ printf_uchar: { lda printf_buffer // [72] call printf_number_buffer // Print using format - // [106] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] -- call_phi_near + // [106] 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 @@ -4052,7 +4052,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [114] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [114] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -4071,7 +4071,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [114] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [114] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -4087,7 +4087,7 @@ cscroll: { memset_from___b3: // [124] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [124] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [124] 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 @@ -4103,7 +4103,7 @@ cscroll: { memset_from___b4: // [124] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [124] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [124] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -4230,7 +4230,7 @@ uctoa: { // [100] uctoa_append::value#0 = uctoa::value#2 // [101] uctoa_append::sub#0 = uctoa::digit_value#0 // [102] call uctoa_append - // [132] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [132] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] uctoa_append_from___b5: jsr uctoa_append // [103] uctoa_append::return#0 = uctoa_append::value#2 @@ -4280,7 +4280,7 @@ printf_number_buffer: { // printf_number_buffer::@2 __b2: // [112] call printf_str - // [139] phi from printf_number_buffer::@2 to printf_str [phi:printf_number_buffer::@2->printf_str] -- call_phi_near + // [139] phi from printf_number_buffer::@2 to printf_str [phi:printf_number_buffer::@2->printf_str] printf_str_from___b2: jsr printf_str jmp __breturn @@ -4903,12 +4903,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 @@ -4937,7 +4937,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 // } @@ -4976,7 +4976,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: @@ -4987,7 +4987,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln rts } @@ -4996,13 +4996,13 @@ main: { .label c = 7 // clrscr() // [28] call clrscr - // [52] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [52] phi from main to clrscr [phi:main->clrscr] jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] // main::@1 // printf("%u", c) // [30] call printf_uchar - // [68] phi from main::@1 to printf_uchar [phi:main::@1->printf_uchar] -- call_phi_near + // [68] phi from main::@1 to printf_uchar [phi:main::@1->printf_uchar] jsr printf_uchar // main::@return // } @@ -5135,7 +5135,7 @@ cputln: { // [49] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [50] call cscroll -- call_phi_near + // [50] call cscroll jsr cscroll // cputln::@return // } @@ -5257,7 +5257,7 @@ printf_uchar: { // uctoa(uvalue, printf_buffer.digits, format.radix) // [70] call uctoa // Format number into buffer - // [87] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] -- call_phi_near + // [87] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] jsr uctoa // printf_uchar::@2 // printf_number_buffer(putc, printf_buffer, format) @@ -5265,7 +5265,7 @@ printf_uchar: { lda printf_buffer // [72] call printf_number_buffer // Print using format - // [106] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] -- call_phi_near + // [106] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] jsr printf_number_buffer // printf_uchar::@return // } @@ -5290,7 +5290,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [114] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [114] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -5306,7 +5306,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [114] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [114] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -5319,7 +5319,7 @@ cscroll: { // [124] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [124] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [124] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [124] 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 @@ -5332,7 +5332,7 @@ cscroll: { // [124] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [124] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [124] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [124] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -5457,7 +5457,7 @@ uctoa: { // [100] uctoa_append::value#0 = uctoa::value#2 // [101] uctoa_append::sub#0 = uctoa::digit_value#0 // [102] call uctoa_append - // [132] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [132] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] jsr uctoa_append // uctoa_append(buffer++, value, digit_value) // [103] uctoa_append::return#0 = uctoa_append::value#2 @@ -5502,7 +5502,7 @@ printf_number_buffer: { __b2: // printf_str(putc, buffer.digits) // [112] call printf_str - // [139] phi from printf_number_buffer::@2 to printf_str [phi:printf_number_buffer::@2->printf_str] -- call_phi_near + // [139] phi from printf_number_buffer::@2 to printf_str [phi:printf_number_buffer::@2->printf_str] jsr printf_str // printf_number_buffer::@return // } diff --git a/src/test/ref/printf-15.log b/src/test/ref/printf-15.log index dcca7d5bb..1717f7db4 100644 --- a/src/test/ref/printf-15.log +++ b/src/test/ref/printf-15.log @@ -1683,7 +1683,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: @@ -1691,7 +1691,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 @@ -1727,7 +1727,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 @@ -1768,7 +1768,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [23] call cputln -- call_phi_near + // [23] call cputln jsr cputln jmp __breturn // cputc::@return @@ -1780,14 +1780,14 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln jmp __breturn } // main main: { // [28] call clrscr - // [54] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [54] phi from main to clrscr [phi:main->clrscr] clrscr_from_main: jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] @@ -1798,7 +1798,7 @@ main: { // [30] call printf_str // [70] phi from main::@1 to printf_str [phi:main::@1->printf_str] printf_str_from___b1: - // [70] phi printf_str::s#4 = main::s [phi:main::@1->printf_str#0] -- call_phi_near + // [70] phi printf_str::s#4 = main::s [phi:main::@1->printf_str#0] -- pbuz1=pbuc1 lda #s @@ -1812,7 +1812,7 @@ main: { // [32] call printf_str // [70] phi from main::@2 to printf_str [phi:main::@2->printf_str] printf_str_from___b2: - // [70] phi printf_str::s#4 = main::s1 [phi:main::@2->printf_str#0] -- call_phi_near + // [70] phi printf_str::s#4 = main::s1 [phi:main::@2->printf_str#0] -- pbuz1=pbuc1 lda #s1 @@ -1953,7 +1953,7 @@ cputln: { sta.z conio_cursor_x // [51] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [52] call cscroll -- call_phi_near + // [52] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -2120,7 +2120,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [92] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [92] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -2139,7 +2139,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [92] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [92] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -2155,7 +2155,7 @@ cscroll: { memset_from___b3: // [102] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [102] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [102] 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 @@ -2171,7 +2171,7 @@ cscroll: { memset_from___b4: // [102] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [102] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [102] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -2604,12 +2604,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 @@ -2638,7 +2638,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 // } @@ -2677,7 +2677,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: @@ -2688,7 +2688,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln rts } @@ -2696,14 +2696,14 @@ cputc: { main: { // clrscr() // [28] call clrscr - // [54] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [54] phi from main to clrscr [phi:main->clrscr] jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] // main::@1 // printf("Lone 1\n") // [30] call printf_str // [70] phi from main::@1 to printf_str [phi:main::@1->printf_str] - // [70] phi printf_str::s#4 = main::s [phi:main::@1->printf_str#0] -- call_phi_near + // [70] phi printf_str::s#4 = main::s [phi:main::@1->printf_str#0] -- pbuz1=pbuc1 lda #s @@ -2714,7 +2714,7 @@ main: { // printf("Lone 2\n") // [32] call printf_str // [70] phi from main::@2 to printf_str [phi:main::@2->printf_str] - // [70] phi printf_str::s#4 = main::s1 [phi:main::@2->printf_str#0] -- call_phi_near + // [70] phi printf_str::s#4 = main::s1 [phi:main::@2->printf_str#0] -- pbuz1=pbuc1 lda #s1 @@ -2857,7 +2857,7 @@ cputln: { // [51] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [52] call cscroll -- call_phi_near + // [52] call cscroll jsr cscroll // cputln::@return // } @@ -3020,7 +3020,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [92] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [92] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -3036,7 +3036,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [92] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [92] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -3049,7 +3049,7 @@ cscroll: { // [102] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [102] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [102] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [102] 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 @@ -3062,7 +3062,7 @@ cscroll: { // [102] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [102] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [102] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [102] 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/printf-17.log b/src/test/ref/printf-17.log index dbf187967..234dffab6 100644 --- a/src/test/ref/printf-17.log +++ b/src/test/ref/printf-17.log @@ -4498,7 +4498,7 @@ __start: { // __start::@1 __b1: // [5] call main - // [16] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [16] phi from __start::@1 to main [phi:__start::@1->main] main_from___b1: jsr main jmp __breturn @@ -4579,7 +4579,7 @@ main: { // [17] call snprintf_init // [67] phi from main to snprintf_init [phi:main->snprintf_init] snprintf_init_from_main: - // [67] phi snprintf_init::n#4 = $14 [phi:main->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = $14 [phi:main->snprintf_init#0] -- vwuz1=vbuc1 lda #<$14 sta.z snprintf_init.n lda #>$14 @@ -4598,7 +4598,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -4617,7 +4617,7 @@ main: { // [23] call print // [81] phi from main::@2 to print [phi:main::@2->print] print_from___b2: - // [81] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- call_phi_near + // [81] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -4631,7 +4631,7 @@ main: { // [25] call snprintf_init // [67] phi from main::@3 to snprintf_init [phi:main::@3->snprintf_init] snprintf_init_from___b3: - // [67] phi snprintf_init::n#4 = $14 [phi:main::@3->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = $14 [phi:main::@3->snprintf_init#0] -- vwuz1=vbuc1 lda #<$14 sta.z snprintf_init.n lda #>$14 @@ -4650,7 +4650,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -4662,7 +4662,7 @@ main: { // main::@5 __b5: // [29] call printf_string - // [88] phi from main::@5 to printf_string [phi:main::@5->printf_string] -- call_phi_near + // [88] phi from main::@5 to printf_string [phi:main::@5->printf_string] printf_string_from___b5: jsr printf_string jmp __b6 @@ -4683,7 +4683,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -4702,7 +4702,7 @@ main: { // [37] call print // [81] phi from main::@7 to print [phi:main::@7->print] print_from___b7: - // [81] phi screen#25 = screen#1 [phi:main::@7->print#0] -- call_phi_near + // [81] phi screen#25 = screen#1 [phi:main::@7->print#0] -- register_copy jsr print // [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8] __b8_from___b7: @@ -4712,7 +4712,7 @@ main: { // [39] call snprintf_init // [67] phi from main::@8 to snprintf_init [phi:main::@8->snprintf_init] snprintf_init_from___b8: - // [67] phi snprintf_init::n#4 = $14 [phi:main::@8->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = $14 [phi:main::@8->snprintf_init#0] -- vwuz1=vbuc1 lda #<$14 sta.z snprintf_init.n lda #>$14 @@ -4731,7 +4731,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -4745,7 +4745,7 @@ main: { // [43] call printf_sint // [92] phi from main::@10 to printf_sint [phi:main::@10->printf_sint] printf_sint_from___b10: - // [92] phi printf_sint::value#3 = 3 [phi:main::@10->printf_sint#0] -- call_phi_near + // [92] phi printf_sint::value#3 = 3 [phi:main::@10->printf_sint#0] -- vwsz1=vbsc1 lda #<3 sta.z printf_sint.value lda #>3 @@ -4764,7 +4764,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -4776,7 +4776,7 @@ main: { // main::@12 __b12: // [47] call printf_uint - // [103] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] -- call_phi_near + // [103] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] printf_uint_from___b12: jsr printf_uint // [48] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -4792,7 +4792,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -4811,7 +4811,7 @@ main: { // [53] call print // [81] phi from main::@14 to print [phi:main::@14->print] print_from___b14: - // [81] phi screen#25 = screen#1 [phi:main::@14->print#0] -- call_phi_near + // [81] phi screen#25 = screen#1 [phi:main::@14->print#0] -- register_copy jsr print // [54] phi from main::@14 to main::@15 [phi:main::@14->main::@15] __b15_from___b14: @@ -4821,7 +4821,7 @@ main: { // [55] call snprintf_init // [67] phi from main::@15 to snprintf_init [phi:main::@15->snprintf_init] snprintf_init_from___b15: - // [67] phi snprintf_init::n#4 = 6 [phi:main::@15->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = 6 [phi:main::@15->snprintf_init#0] -- vwuz1=vbuc1 lda #<6 sta.z snprintf_init.n lda #>6 @@ -4840,7 +4840,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- pbuz1=pbuc1 lda #s6 @@ -4854,7 +4854,7 @@ main: { // [59] call printf_sint // [92] phi from main::@17 to printf_sint [phi:main::@17->printf_sint] printf_sint_from___b17: - // [92] phi printf_sint::value#3 = $56ce [phi:main::@17->printf_sint#0] -- call_phi_near + // [92] phi printf_sint::value#3 = $56ce [phi:main::@17->printf_sint#0] -- vwsz1=vwsc1 lda #<$56ce sta.z printf_sint.value lda #>$56ce @@ -4873,7 +4873,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -4892,7 +4892,7 @@ main: { // [65] call print // [81] phi from main::@19 to print [phi:main::@19->print] print_from___b19: - // [81] phi screen#25 = screen#1 [phi:main::@19->print#0] -- call_phi_near + // [81] phi screen#25 = screen#1 [phi:main::@19->print#0] -- register_copy jsr print jmp __breturn // main::@return @@ -5051,7 +5051,7 @@ printf_string: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- pbuz1=pbuc1 lda #main.str @@ -5101,7 +5101,7 @@ printf_sint: { // [109] phi from printf_sint::@2 to utoa [phi:printf_sint::@2->utoa] utoa_from___b2: // [109] phi utoa::value#10 = utoa::value#1 [phi:printf_sint::@2->utoa#0] -- register_copy - // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- vbuxx=vbuc1 ldx #DECIMAL jsr utoa jmp __b3 @@ -5129,7 +5129,7 @@ printf_sint: { // [140] phi printf_number_buffer::format_justify_left#10 = 0 [phi:printf_sint::@3->printf_number_buffer#4] -- vbuz1=vbuc1 lda #0 sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#2 = 0 [phi:printf_sint::@3->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#2 = 0 [phi:printf_sint::@3->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #0 jsr printf_number_buffer jmp __breturn @@ -5164,7 +5164,7 @@ printf_uint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- vbuxx=vbuc1 ldx #HEXADECIMAL jsr utoa jmp __b2 @@ -5192,7 +5192,7 @@ printf_uint: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_uint::format_justify_left#0 [phi:printf_uint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#2 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#2 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -5397,7 +5397,7 @@ utoa: { // [134] utoa_append::value#0 = utoa::value#3 // [135] utoa_append::sub#0 = utoa::digit_value#0 // [136] call utoa_append - // [181] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] -- call_phi_near + // [181] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] utoa_append_from___b10: jsr utoa_append // [137] utoa_append::return#0 = utoa_append::value#2 @@ -5439,7 +5439,7 @@ printf_number_buffer: { // printf_number_buffer::@6 __b6: // [143] call strlen - // [188] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] -- call_phi_near + // [188] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] strlen_from___b6: jsr strlen // [144] strlen::return#2 = strlen::len#2 @@ -5523,7 +5523,7 @@ printf_number_buffer: { // [194] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@8->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [194] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- call_phi_near + // [194] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- register_copy jsr printf_padding jmp __b2 // printf_number_buffer::@2 @@ -5568,7 +5568,7 @@ printf_number_buffer: { // [194] phi printf_padding::pad#7 = '0' [phi:printf_number_buffer::@10->printf_padding#1] -- vbuz1=vbuc1 lda #'0' sta.z printf_padding.pad - // [194] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- call_phi_near + // [194] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- register_copy jsr printf_padding jmp __b4 // printf_number_buffer::@4 @@ -5582,7 +5582,7 @@ printf_number_buffer: { // printf_number_buffer::@11 __b11: // [171] call strupr - // [202] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] -- call_phi_near + // [202] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] strupr_from___b11: jsr strupr jmp __b5 @@ -5593,7 +5593,7 @@ printf_number_buffer: { // [72] phi from printf_number_buffer::@5 to printf_str [phi:printf_number_buffer::@5->printf_str] printf_str_from___b5: // [72] phi printf_str::putc#12 = printf_str::putc#0 [phi:printf_number_buffer::@5->printf_str#0] -- register_copy - // [72] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- pbuz1=pbuc1 lda #printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS @@ -5632,7 +5632,7 @@ printf_number_buffer: { // [194] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@12->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [194] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- call_phi_near + // [194] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- register_copy jsr printf_padding jmp __breturn // printf_number_buffer::@return @@ -5833,7 +5833,7 @@ strupr: { // [206] toupper::ch#0 = *strupr::src#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (src),y - // [207] call toupper -- call_phi_near + // [207] call toupper jsr toupper // [208] toupper::return#3 = toupper::return#2 jmp __b3 @@ -6471,7 +6471,7 @@ __start: { // [4] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] // __start::@1 // [5] call main - // [16] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [16] phi from __start::@1 to main [phi:__start::@1->main] jsr main // __start::@return // [6] return @@ -6546,7 +6546,7 @@ main: { // snprintf(BUF, 20, "hello world! ") // [17] call snprintf_init // [67] phi from main to snprintf_init [phi:main->snprintf_init] - // [67] phi snprintf_init::n#4 = $14 [phi:main->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = $14 [phi:main->snprintf_init#0] -- vwuz1=vbuc1 lda #<$14 sta.z snprintf_init.n lda #>$14 @@ -6562,7 +6562,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -6580,7 +6580,7 @@ main: { // print(BUF) // [23] call print // [81] phi from main::@2 to print [phi:main::@2->print] - // [81] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- call_phi_near + // [81] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -6591,7 +6591,7 @@ main: { // snprintf(BUF, 20, "hello %s%c ", "world", '!') // [25] call snprintf_init // [67] phi from main::@3 to snprintf_init [phi:main::@3->snprintf_init] - // [67] phi snprintf_init::n#4 = $14 [phi:main::@3->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = $14 [phi:main::@3->snprintf_init#0] -- vwuz1=vbuc1 lda #<$14 sta.z snprintf_init.n lda #>$14 @@ -6607,7 +6607,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -6617,7 +6617,7 @@ main: { // main::@5 // snprintf(BUF, 20, "hello %s%c ", "world", '!') // [29] call printf_string - // [88] phi from main::@5 to printf_string [phi:main::@5->printf_string] -- call_phi_near + // [88] phi from main::@5 to printf_string [phi:main::@5->printf_string] jsr printf_string // main::@6 // snprintf(BUF, 20, "hello %s%c ", "world", '!') @@ -6635,7 +6635,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -6653,14 +6653,14 @@ main: { // print(BUF) // [37] call print // [81] phi from main::@7 to print [phi:main::@7->print] - // [81] phi screen#25 = screen#1 [phi:main::@7->print#0] -- call_phi_near + // [81] phi screen#25 = screen#1 [phi:main::@7->print#0] -- register_copy jsr print // [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8] // main::@8 // snprintf(BUF, 20, "hello %d+%x! ", 3,11) // [39] call snprintf_init // [67] phi from main::@8 to snprintf_init [phi:main::@8->snprintf_init] - // [67] phi snprintf_init::n#4 = $14 [phi:main::@8->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = $14 [phi:main::@8->snprintf_init#0] -- vwuz1=vbuc1 lda #<$14 sta.z snprintf_init.n lda #>$14 @@ -6676,7 +6676,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -6687,7 +6687,7 @@ main: { // snprintf(BUF, 20, "hello %d+%x! ", 3,11) // [43] call printf_sint // [92] phi from main::@10 to printf_sint [phi:main::@10->printf_sint] - // [92] phi printf_sint::value#3 = 3 [phi:main::@10->printf_sint#0] -- call_phi_near + // [92] phi printf_sint::value#3 = 3 [phi:main::@10->printf_sint#0] -- vwsz1=vbsc1 lda #<3 sta.z printf_sint.value lda #>3 @@ -6703,7 +6703,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -6713,7 +6713,7 @@ main: { // main::@12 // snprintf(BUF, 20, "hello %d+%x! ", 3,11) // [47] call printf_uint - // [103] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] -- call_phi_near + // [103] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] jsr printf_uint // [48] phi from main::@12 to main::@13 [phi:main::@12->main::@13] // main::@13 @@ -6725,7 +6725,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -6743,14 +6743,14 @@ main: { // print(BUF) // [53] call print // [81] phi from main::@14 to print [phi:main::@14->print] - // [81] phi screen#25 = screen#1 [phi:main::@14->print#0] -- call_phi_near + // [81] phi screen#25 = screen#1 [phi:main::@14->print#0] -- register_copy jsr print // [54] phi from main::@14 to main::@15 [phi:main::@14->main::@15] // main::@15 // snprintf(BUF, 6, "hi %d! ", 22222) // [55] call snprintf_init // [67] phi from main::@15 to snprintf_init [phi:main::@15->snprintf_init] - // [67] phi snprintf_init::n#4 = 6 [phi:main::@15->snprintf_init#0] -- call_phi_near + // [67] phi snprintf_init::n#4 = 6 [phi:main::@15->snprintf_init#0] -- vwuz1=vbuc1 lda #<6 sta.z snprintf_init.n lda #>6 @@ -6766,7 +6766,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- pbuz1=pbuc1 lda #s6 @@ -6777,7 +6777,7 @@ main: { // snprintf(BUF, 6, "hi %d! ", 22222) // [59] call printf_sint // [92] phi from main::@17 to printf_sint [phi:main::@17->printf_sint] - // [92] phi printf_sint::value#3 = $56ce [phi:main::@17->printf_sint#0] -- call_phi_near + // [92] phi printf_sint::value#3 = $56ce [phi:main::@17->printf_sint#0] -- vwsz1=vwsc1 lda #<$56ce sta.z printf_sint.value lda #>$56ce @@ -6793,7 +6793,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -6811,7 +6811,7 @@ main: { // print(BUF) // [65] call print // [81] phi from main::@19 to print [phi:main::@19->print] - // [81] phi screen#25 = screen#1 [phi:main::@19->print#0] -- call_phi_near + // [81] phi screen#25 = screen#1 [phi:main::@19->print#0] -- register_copy jsr print // main::@return // } @@ -6963,7 +6963,7 @@ printf_string: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [72] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- pbuz1=pbuc1 lda #main.str @@ -7013,7 +7013,7 @@ printf_sint: { // [99] call utoa // [109] phi from printf_sint::@2 to utoa [phi:printf_sint::@2->utoa] // [109] phi utoa::value#10 = utoa::value#1 [phi:printf_sint::@2->utoa#0] -- register_copy - // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@2->utoa#1] -- vbuxx=vbuc1 ldx #DECIMAL jsr utoa // printf_sint::@3 @@ -7038,7 +7038,7 @@ printf_sint: { sta.z printf_number_buffer.format_zero_padding // [140] phi printf_number_buffer::format_justify_left#10 = 0 [phi:printf_sint::@3->printf_number_buffer#4] -- vbuz1=vbuc1 sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#2 = 0 [phi:printf_sint::@3->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#2 = 0 [phi:printf_sint::@3->printf_number_buffer#5] -- vbuxx=vbuc1 tax jsr printf_number_buffer // printf_sint::@return @@ -7071,7 +7071,7 @@ printf_uint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- vbuxx=vbuc1 ldx #HEXADECIMAL jsr utoa // printf_uint::@2 @@ -7097,7 +7097,7 @@ printf_uint: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_uint::format_justify_left#0 [phi:printf_uint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#2 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#2 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_uint::@return @@ -7296,7 +7296,7 @@ utoa: { // [134] utoa_append::value#0 = utoa::value#3 // [135] utoa_append::sub#0 = utoa::digit_value#0 // [136] call utoa_append - // [181] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] -- call_phi_near + // [181] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] jsr utoa_append // utoa_append(buffer++, value, digit_value) // [137] utoa_append::return#0 = utoa_append::value#2 @@ -7336,7 +7336,7 @@ printf_number_buffer: { // printf_number_buffer::@6 // strlen(buffer.digits) // [143] call strlen - // [188] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] -- call_phi_near + // [188] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] jsr strlen // strlen(buffer.digits) // [144] strlen::return#2 = strlen::len#2 @@ -7407,7 +7407,7 @@ printf_number_buffer: { // [194] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@8->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [194] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- call_phi_near + // [194] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@2 __b2: @@ -7448,7 +7448,7 @@ printf_number_buffer: { // [194] phi printf_padding::pad#7 = '0' [phi:printf_number_buffer::@10->printf_padding#1] -- vbuz1=vbuc1 lda #'0' sta.z printf_padding.pad - // [194] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- call_phi_near + // [194] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@4 __b4: @@ -7460,7 +7460,7 @@ printf_number_buffer: { // printf_number_buffer::@11 // strupr(buffer.digits) // [171] call strupr - // [202] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] -- call_phi_near + // [202] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] jsr strupr // printf_number_buffer::@5 __b5: @@ -7469,7 +7469,7 @@ printf_number_buffer: { // [173] call printf_str // [72] phi from printf_number_buffer::@5 to printf_str [phi:printf_number_buffer::@5->printf_str] // [72] phi printf_str::putc#12 = printf_str::putc#0 [phi:printf_number_buffer::@5->printf_str#0] -- register_copy - // [72] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- call_phi_near + // [72] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- pbuz1=pbuc1 lda #printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS @@ -7503,7 +7503,7 @@ printf_number_buffer: { // [194] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@12->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [194] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- call_phi_near + // [194] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@return __breturn: @@ -7696,7 +7696,7 @@ strupr: { // [206] toupper::ch#0 = *strupr::src#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (src),y - // [207] call toupper -- call_phi_near + // [207] call toupper jsr toupper // [208] toupper::return#3 = toupper::return#2 // strupr::@3 diff --git a/src/test/ref/printf-18.log b/src/test/ref/printf-18.log index 03e8f0b22..ef837a417 100644 --- a/src/test/ref/printf-18.log +++ b/src/test/ref/printf-18.log @@ -2389,7 +2389,7 @@ __start: { sta.z __snprintf_buffer lda #>0 sta.z __snprintf_buffer+1 - // [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: @@ -2397,7 +2397,7 @@ __start: { // __start::@1 __b1: // [10] call main - // [39] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [39] phi from __start::@1 to main [phi:__start::@1->main] main_from___b1: jsr main jmp __breturn @@ -2500,7 +2500,7 @@ conio_c64_init: { // conio_c64_init::@1 __b1: // [25] gotoxy::y#2 = conio_c64_init::line#2 - // [26] call gotoxy -- call_phi_near + // [26] call gotoxy jsr gotoxy jmp __breturn // conio_c64_init::@return @@ -2541,7 +2541,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [35] call cputln -- call_phi_near + // [35] call cputln jsr cputln jmp __breturn // cputc::@return @@ -2553,7 +2553,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [38] call cputln -- call_phi_near + // [38] call cputln jsr cputln jmp __breturn } @@ -2562,7 +2562,7 @@ main: { // [40] call snprintf_init // [87] phi from main to snprintf_init [phi:main->snprintf_init] snprintf_init_from_main: - // [87] phi snprintf_init::s#2 = BUF1 [phi:main->snprintf_init#0] -- call_phi_near + // [87] phi snprintf_init::s#2 = BUF1 [phi:main->snprintf_init#0] -- pbuz1=pbuc1 lda #BUF1 @@ -2581,7 +2581,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -2600,7 +2600,7 @@ main: { // [46] call snprintf_init // [87] phi from main::@2 to snprintf_init [phi:main::@2->snprintf_init] snprintf_init_from___b2: - // [87] phi snprintf_init::s#2 = BUF2 [phi:main::@2->snprintf_init#0] -- call_phi_near + // [87] phi snprintf_init::s#2 = BUF2 [phi:main::@2->snprintf_init#0] -- pbuz1=pbuc1 lda #BUF2 @@ -2619,7 +2619,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s1 [phi:main::@3->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s1 [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -2638,7 +2638,7 @@ main: { sta.z printf_string.putc lda #>snputc sta.z printf_string.putc+1 - // [101] phi printf_string::str#10 = main::str [phi:main::@4->printf_string#1] -- call_phi_near + // [101] phi printf_string::str#10 = main::str [phi:main::@4->printf_string#1] -- pbuz1=pbuc1 lda #str @@ -2669,7 +2669,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s2 [phi:main::@5->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s2 [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -2688,7 +2688,7 @@ main: { sta.z printf_string.putc lda #>cputc sta.z printf_string.putc+1 - // [101] phi printf_string::str#10 = BUF1 [phi:main::@6->printf_string#1] -- call_phi_near + // [101] phi printf_string::str#10 = BUF1 [phi:main::@6->printf_string#1] -- pbuz1=pbuc1 lda #BUF1 @@ -2707,7 +2707,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s3 [phi:main::@7->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s3 [phi:main::@7->printf_str#1] -- pbuz1=pbuc1 lda #s3 @@ -2726,7 +2726,7 @@ main: { sta.z printf_string.putc lda #>cputc sta.z printf_string.putc+1 - // [101] phi printf_string::str#10 = BUF2 [phi:main::@8->printf_string#1] -- call_phi_near + // [101] phi printf_string::str#10 = BUF2 [phi:main::@8->printf_string#1] -- pbuz1=pbuc1 lda #BUF2 @@ -2745,7 +2745,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s2 [phi:main::@9->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s2 [phi:main::@9->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -2892,7 +2892,7 @@ cputln: { sta.z conio_cursor_x // [84] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [85] call cscroll -- call_phi_near + // [85] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -2984,7 +2984,7 @@ printf_string: { // [92] phi from printf_string::@1 to printf_str [phi:printf_string::@1->printf_str] printf_str_from___b1: // [92] phi printf_str::putc#8 = printf_str::putc#0 [phi:printf_string::@1->printf_str#0] -- register_copy - // [92] phi printf_str::s#8 = printf_str::s#1 [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = printf_str::s#1 [phi:printf_string::@1->printf_str#1] -- register_copy jsr printf_str jmp __breturn // printf_string::@return @@ -3012,7 +3012,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [119] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [119] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -3031,7 +3031,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [119] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [119] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -3047,7 +3047,7 @@ cscroll: { memset_from___b3: // [129] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [129] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [129] 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 @@ -3063,7 +3063,7 @@ cscroll: { memset_from___b4: // [129] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [129] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [129] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -3577,12 +3577,12 @@ __start: { sta.z __snprintf_buffer sta.z __snprintf_buffer+1 // #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 - // [39] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [39] phi from __start::@1 to main [phi:__start::@1->main] jsr main // __start::@return // [11] return @@ -3675,7 +3675,7 @@ conio_c64_init: { __b1: // gotoxy(0, line) // [25] gotoxy::y#2 = conio_c64_init::line#2 - // [26] call gotoxy -- call_phi_near + // [26] call gotoxy jsr gotoxy // conio_c64_init::@return // } @@ -3714,7 +3714,7 @@ cputc: { // [34] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3] // cputc::@3 // cputln() - // [35] call cputln -- call_phi_near + // [35] call cputln jsr cputln // cputc::@return __breturn: @@ -3725,7 +3725,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [38] call cputln -- call_phi_near + // [38] call cputln jsr cputln rts } @@ -3734,7 +3734,7 @@ main: { // snprintf(BUF1, 20, "hello world!") // [40] call snprintf_init // [87] phi from main to snprintf_init [phi:main->snprintf_init] - // [87] phi snprintf_init::s#2 = BUF1 [phi:main->snprintf_init#0] -- call_phi_near + // [87] phi snprintf_init::s#2 = BUF1 [phi:main->snprintf_init#0] -- pbuz1=pbuc1 lda #BUF1 @@ -3750,7 +3750,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -3768,7 +3768,7 @@ main: { // snprintf(BUF2, 20, "hello %s%c", "world", '!') // [46] call snprintf_init // [87] phi from main::@2 to snprintf_init [phi:main::@2->snprintf_init] - // [87] phi snprintf_init::s#2 = BUF2 [phi:main::@2->snprintf_init#0] -- call_phi_near + // [87] phi snprintf_init::s#2 = BUF2 [phi:main::@2->snprintf_init#0] -- pbuz1=pbuc1 lda #BUF2 @@ -3784,7 +3784,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s1 [phi:main::@3->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s1 [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -3800,7 +3800,7 @@ main: { sta.z printf_string.putc lda #>snputc sta.z printf_string.putc+1 - // [101] phi printf_string::str#10 = main::str [phi:main::@4->printf_string#1] -- call_phi_near + // [101] phi printf_string::str#10 = main::str [phi:main::@4->printf_string#1] -- pbuz1=pbuc1 lda #str @@ -3830,7 +3830,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s2 [phi:main::@5->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s2 [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -3846,7 +3846,7 @@ main: { sta.z printf_string.putc lda #>cputc sta.z printf_string.putc+1 - // [101] phi printf_string::str#10 = BUF1 [phi:main::@6->printf_string#1] -- call_phi_near + // [101] phi printf_string::str#10 = BUF1 [phi:main::@6->printf_string#1] -- pbuz1=pbuc1 lda #BUF1 @@ -3862,7 +3862,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s3 [phi:main::@7->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s3 [phi:main::@7->printf_str#1] -- pbuz1=pbuc1 lda #s3 @@ -3878,7 +3878,7 @@ main: { sta.z printf_string.putc lda #>cputc sta.z printf_string.putc+1 - // [101] phi printf_string::str#10 = BUF2 [phi:main::@8->printf_string#1] -- call_phi_near + // [101] phi printf_string::str#10 = BUF2 [phi:main::@8->printf_string#1] -- pbuz1=pbuc1 lda #BUF2 @@ -3894,7 +3894,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [92] phi printf_str::s#8 = main::s2 [phi:main::@9->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = main::s2 [phi:main::@9->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -4043,7 +4043,7 @@ cputln: { // [84] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [85] call cscroll -- call_phi_near + // [85] call cscroll jsr cscroll // cputln::@return // } @@ -4131,7 +4131,7 @@ printf_string: { // [104] call printf_str // [92] phi from printf_string::@1 to printf_str [phi:printf_string::@1->printf_str] // [92] phi printf_str::putc#8 = printf_str::putc#0 [phi:printf_string::@1->printf_str#0] -- register_copy - // [92] phi printf_str::s#8 = printf_str::s#1 [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [92] phi printf_str::s#8 = printf_str::s#1 [phi:printf_string::@1->printf_str#1] -- register_copy jsr printf_str // printf_string::@return // } @@ -4156,7 +4156,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [119] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [119] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -4172,7 +4172,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [119] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [119] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -4185,7 +4185,7 @@ cscroll: { // [129] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [129] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [129] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [129] 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 @@ -4198,7 +4198,7 @@ cscroll: { // [129] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [129] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [129] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [129] 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/printf-19.log b/src/test/ref/printf-19.log index df40a64fe..a8ac45c87 100644 --- a/src/test/ref/printf-19.log +++ b/src/test/ref/printf-19.log @@ -5428,7 +5428,7 @@ __start: { // __start::@1 __b1: // [5] call main - // [16] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [16] phi from __start::@1 to main [phi:__start::@1->main] main_from___b1: jsr main jmp __breturn @@ -5506,7 +5506,7 @@ snputc: { } // main main: { - // [17] call snprintf_init -- call_phi_near + // [17] call snprintf_init jsr snprintf_init // [18] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -5521,7 +5521,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -5540,7 +5540,7 @@ main: { // [23] call print // [80] phi from main::@2 to print [phi:main::@2->print] print_from___b2: - // [80] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- call_phi_near + // [80] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -5551,7 +5551,7 @@ main: { jmp __b3 // main::@3 __b3: - // [25] call snprintf_init -- call_phi_near + // [25] call snprintf_init jsr snprintf_init // [26] phi from main::@3 to main::@4 [phi:main::@3->main::@4] __b4_from___b3: @@ -5566,7 +5566,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -5578,7 +5578,7 @@ main: { // main::@5 __b5: // [29] call printf_string - // [87] phi from main::@5 to printf_string [phi:main::@5->printf_string] -- call_phi_near + // [87] phi from main::@5 to printf_string [phi:main::@5->printf_string] printf_string_from___b5: jsr printf_string jmp __b6 @@ -5599,7 +5599,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -5618,14 +5618,14 @@ main: { // [37] call print // [80] phi from main::@7 to print [phi:main::@7->print] print_from___b7: - // [80] phi screen#25 = screen#1 [phi:main::@7->print#0] -- call_phi_near + // [80] phi screen#25 = screen#1 [phi:main::@7->print#0] -- register_copy jsr print // [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8] __b8_from___b7: jmp __b8 // main::@8 __b8: - // [39] call snprintf_init -- call_phi_near + // [39] call snprintf_init jsr snprintf_init // [40] phi from main::@8 to main::@9 [phi:main::@8->main::@9] __b9_from___b8: @@ -5640,7 +5640,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -5651,7 +5651,7 @@ main: { jmp __b10 // main::@10 __b10: - // [43] call printf_sint -- call_phi_near + // [43] call printf_sint jsr printf_sint // [44] phi from main::@10 to main::@11 [phi:main::@10->main::@11] __b11_from___b10: @@ -5666,7 +5666,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -5678,7 +5678,7 @@ main: { // main::@12 __b12: // [47] call printf_uint - // [97] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] -- call_phi_near + // [97] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] printf_uint_from___b12: jsr printf_uint // [48] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -5694,7 +5694,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -5713,14 +5713,14 @@ main: { // [53] call print // [80] phi from main::@14 to print [phi:main::@14->print] print_from___b14: - // [80] phi screen#25 = screen#1 [phi:main::@14->print#0] -- call_phi_near + // [80] phi screen#25 = screen#1 [phi:main::@14->print#0] -- register_copy jsr print // [54] phi from main::@14 to main::@15 [phi:main::@14->main::@15] __b15_from___b14: jmp __b15 // main::@15 __b15: - // [55] call snprintf_init -- call_phi_near + // [55] call snprintf_init jsr snprintf_init // [56] phi from main::@15 to main::@16 [phi:main::@15->main::@16] __b16_from___b15: @@ -5735,7 +5735,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- pbuz1=pbuc1 lda #s6 @@ -5746,7 +5746,7 @@ main: { jmp __b17 // main::@17 __b17: - // [59] call printf_slong -- call_phi_near + // [59] call printf_slong jsr printf_slong // [60] phi from main::@17 to main::@18 [phi:main::@17->main::@18] __b18_from___b17: @@ -5761,7 +5761,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -5780,7 +5780,7 @@ main: { // [65] call print // [80] phi from main::@19 to print [phi:main::@19->print] print_from___b19: - // [80] phi screen#25 = screen#1 [phi:main::@19->print#0] -- call_phi_near + // [80] phi screen#25 = screen#1 [phi:main::@19->print#0] -- register_copy jsr print jmp __breturn // main::@return @@ -5938,7 +5938,7 @@ printf_string: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- pbuz1=pbuc1 lda #main.str @@ -5979,7 +5979,7 @@ printf_sint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@1->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@1->utoa#1] -- vbuxx=vbuc1 ldx #DECIMAL jsr utoa jmp __b2 @@ -6007,7 +6007,7 @@ printf_sint: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_sint::format_justify_left#0 [phi:printf_sint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#3 = printf_sint::format_min_length#0 [phi:printf_sint::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#3 = printf_sint::format_min_length#0 [phi:printf_sint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -6042,7 +6042,7 @@ printf_uint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- vbuxx=vbuc1 ldx #HEXADECIMAL jsr utoa jmp __b2 @@ -6070,7 +6070,7 @@ printf_uint: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_uint::format_justify_left#0 [phi:printf_uint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#3 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#3 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -6101,7 +6101,7 @@ printf_slong: { // printf_slong::@1 __b1: // [105] call ultoa - // [181] phi from printf_slong::@1 to ultoa [phi:printf_slong::@1->ultoa] -- call_phi_near + // [181] phi from printf_slong::@1 to ultoa [phi:printf_slong::@1->ultoa] ultoa_from___b1: jsr ultoa jmp __b2 @@ -6129,7 +6129,7 @@ printf_slong: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_slong::format_justify_left#0 [phi:printf_slong::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#3 = printf_slong::format_min_length#0 [phi:printf_slong::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#3 = printf_slong::format_min_length#0 [phi:printf_slong::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer jmp __breturn @@ -6334,7 +6334,7 @@ utoa: { // [134] utoa_append::value#0 = utoa::value#3 // [135] utoa_append::sub#0 = utoa::digit_value#0 // [136] call utoa_append - // [202] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] -- call_phi_near + // [202] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] utoa_append_from___b10: jsr utoa_append // [137] utoa_append::return#0 = utoa_append::value#2 @@ -6376,7 +6376,7 @@ printf_number_buffer: { // printf_number_buffer::@6 __b6: // [143] call strlen - // [209] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] -- call_phi_near + // [209] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] strlen_from___b6: jsr strlen // [144] strlen::return#2 = strlen::len#2 @@ -6460,7 +6460,7 @@ printf_number_buffer: { // [215] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@8->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [215] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- call_phi_near + // [215] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- register_copy jsr printf_padding jmp __b2 // printf_number_buffer::@2 @@ -6505,7 +6505,7 @@ printf_number_buffer: { // [215] phi printf_padding::pad#7 = '0' [phi:printf_number_buffer::@10->printf_padding#1] -- vbuz1=vbuc1 lda #'0' sta.z printf_padding.pad - // [215] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- call_phi_near + // [215] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- register_copy jsr printf_padding jmp __b4 // printf_number_buffer::@4 @@ -6519,7 +6519,7 @@ printf_number_buffer: { // printf_number_buffer::@11 __b11: // [171] call strupr - // [223] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] -- call_phi_near + // [223] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] strupr_from___b11: jsr strupr jmp __b5 @@ -6530,7 +6530,7 @@ printf_number_buffer: { // [71] phi from printf_number_buffer::@5 to printf_str [phi:printf_number_buffer::@5->printf_str] printf_str_from___b5: // [71] phi printf_str::putc#12 = printf_str::putc#0 [phi:printf_number_buffer::@5->printf_str#0] -- register_copy - // [71] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- pbuz1=pbuc1 lda #printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS @@ -6569,7 +6569,7 @@ printf_number_buffer: { // [215] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@12->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [215] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- call_phi_near + // [215] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- register_copy jsr printf_padding jmp __breturn // printf_number_buffer::@return @@ -6707,7 +6707,7 @@ ultoa: { // [196] ultoa_append::value#0 = ultoa::value#2 // [197] ultoa_append::sub#0 = ultoa::digit_value#0 // [198] call ultoa_append - // [233] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] -- call_phi_near + // [233] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] ultoa_append_from___b5: jsr ultoa_append // [199] ultoa_append::return#0 = ultoa_append::value#2 @@ -6918,7 +6918,7 @@ strupr: { // [227] toupper::ch#0 = *strupr::src#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (src),y - // [228] call toupper -- call_phi_near + // [228] call toupper jsr toupper // [229] toupper::return#3 = toupper::return#2 jmp __b3 @@ -7723,7 +7723,7 @@ __start: { // [4] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] // __start::@1 // [5] call main - // [16] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [16] phi from __start::@1 to main [phi:__start::@1->main] jsr main // __start::@return // [6] return @@ -7796,7 +7796,7 @@ snputc: { // main main: { // sprintf(BUF, "hello world! ") - // [17] call snprintf_init -- call_phi_near + // [17] call snprintf_init jsr snprintf_init // [18] phi from main to main::@1 [phi:main->main::@1] // main::@1 @@ -7808,7 +7808,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s [phi:main::@1->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -7826,7 +7826,7 @@ main: { // print(BUF) // [23] call print // [80] phi from main::@2 to print [phi:main::@2->print] - // [80] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- call_phi_near + // [80] phi screen#25 = (char *) 1024 [phi:main::@2->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -7835,7 +7835,7 @@ main: { // [24] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // sprintf(BUF, "hello %s%c ", "world", '!') - // [25] call snprintf_init -- call_phi_near + // [25] call snprintf_init jsr snprintf_init // [26] phi from main::@3 to main::@4 [phi:main::@3->main::@4] // main::@4 @@ -7847,7 +7847,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s1 [phi:main::@4->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -7857,7 +7857,7 @@ main: { // main::@5 // sprintf(BUF, "hello %s%c ", "world", '!') // [29] call printf_string - // [87] phi from main::@5 to printf_string [phi:main::@5->printf_string] -- call_phi_near + // [87] phi from main::@5 to printf_string [phi:main::@5->printf_string] jsr printf_string // main::@6 // sprintf(BUF, "hello %s%c ", "world", '!') @@ -7875,7 +7875,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s2 [phi:main::@6->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -7893,12 +7893,12 @@ main: { // print(BUF) // [37] call print // [80] phi from main::@7 to print [phi:main::@7->print] - // [80] phi screen#25 = screen#1 [phi:main::@7->print#0] -- call_phi_near + // [80] phi screen#25 = screen#1 [phi:main::@7->print#0] -- register_copy jsr print // [38] phi from main::@7 to main::@8 [phi:main::@7->main::@8] // main::@8 // sprintf(BUF, "hello %d+%x! ", 3,11) - // [39] call snprintf_init -- call_phi_near + // [39] call snprintf_init jsr snprintf_init // [40] phi from main::@8 to main::@9 [phi:main::@8->main::@9] // main::@9 @@ -7910,7 +7910,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s1 [phi:main::@9->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -7919,7 +7919,7 @@ main: { // [42] phi from main::@9 to main::@10 [phi:main::@9->main::@10] // main::@10 // sprintf(BUF, "hello %d+%x! ", 3,11) - // [43] call printf_sint -- call_phi_near + // [43] call printf_sint jsr printf_sint // [44] phi from main::@10 to main::@11 [phi:main::@10->main::@11] // main::@11 @@ -7931,7 +7931,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s4 [phi:main::@11->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -7941,7 +7941,7 @@ main: { // main::@12 // sprintf(BUF, "hello %d+%x! ", 3,11) // [47] call printf_uint - // [97] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] -- call_phi_near + // [97] phi from main::@12 to printf_uint [phi:main::@12->printf_uint] jsr printf_uint // [48] phi from main::@12 to main::@13 [phi:main::@12->main::@13] // main::@13 @@ -7953,7 +7953,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s5 [phi:main::@13->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -7971,12 +7971,12 @@ main: { // print(BUF) // [53] call print // [80] phi from main::@14 to print [phi:main::@14->print] - // [80] phi screen#25 = screen#1 [phi:main::@14->print#0] -- call_phi_near + // [80] phi screen#25 = screen#1 [phi:main::@14->print#0] -- register_copy jsr print // [54] phi from main::@14 to main::@15 [phi:main::@14->main::@15] // main::@15 // sprintf(BUF, "hi %ld! ", 22222222l) - // [55] call snprintf_init -- call_phi_near + // [55] call snprintf_init jsr snprintf_init // [56] phi from main::@15 to main::@16 [phi:main::@15->main::@16] // main::@16 @@ -7988,7 +7988,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s6 [phi:main::@16->printf_str#1] -- pbuz1=pbuc1 lda #s6 @@ -7997,7 +7997,7 @@ main: { // [58] phi from main::@16 to main::@17 [phi:main::@16->main::@17] // main::@17 // sprintf(BUF, "hi %ld! ", 22222222l) - // [59] call printf_slong -- call_phi_near + // [59] call printf_slong jsr printf_slong // [60] phi from main::@17 to main::@18 [phi:main::@17->main::@18] // main::@18 @@ -8009,7 +8009,7 @@ main: { sta.z printf_str.putc lda #>snputc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::s5 [phi:main::@18->printf_str#1] -- pbuz1=pbuc1 lda #s5 @@ -8027,7 +8027,7 @@ main: { // print(BUF) // [65] call print // [80] phi from main::@19 to print [phi:main::@19->print] - // [80] phi screen#25 = screen#1 [phi:main::@19->print#0] -- call_phi_near + // [80] phi screen#25 = screen#1 [phi:main::@19->print#0] -- register_copy jsr print // main::@return // } @@ -8178,7 +8178,7 @@ printf_string: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [71] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = main::str [phi:printf_string::@1->printf_str#1] -- pbuz1=pbuc1 lda #main.str @@ -8216,7 +8216,7 @@ printf_sint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@1->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = DECIMAL [phi:printf_sint::@1->utoa#1] -- vbuxx=vbuc1 ldx #DECIMAL jsr utoa // printf_sint::@2 @@ -8242,7 +8242,7 @@ printf_sint: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_sint::format_justify_left#0 [phi:printf_sint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#3 = printf_sint::format_min_length#0 [phi:printf_sint::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#3 = printf_sint::format_min_length#0 [phi:printf_sint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_sint::@return @@ -8275,7 +8275,7 @@ printf_uint: { sta.z utoa.value lda #>uvalue sta.z utoa.value+1 - // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- call_phi_near + // [109] phi utoa::radix#2 = HEXADECIMAL [phi:printf_uint::@1->utoa#1] -- vbuxx=vbuc1 ldx #HEXADECIMAL jsr utoa // printf_uint::@2 @@ -8301,7 +8301,7 @@ printf_uint: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_uint::format_justify_left#0 [phi:printf_uint::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#3 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#3 = printf_uint::format_min_length#0 [phi:printf_uint::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_uint::@return @@ -8330,7 +8330,7 @@ printf_slong: { // printf_slong::@1 // ultoa(uvalue, printf_buffer.digits, format.radix) // [105] call ultoa - // [181] phi from printf_slong::@1 to ultoa [phi:printf_slong::@1->ultoa] -- call_phi_near + // [181] phi from printf_slong::@1 to ultoa [phi:printf_slong::@1->ultoa] jsr ultoa // printf_slong::@2 // printf_number_buffer(putc, printf_buffer, format) @@ -8355,7 +8355,7 @@ printf_slong: { // [140] phi printf_number_buffer::format_justify_left#10 = printf_slong::format_justify_left#0 [phi:printf_slong::@2->printf_number_buffer#4] -- vbuz1=vbuc1 lda #format_justify_left sta.z printf_number_buffer.format_justify_left - // [140] phi printf_number_buffer::format_min_length#3 = printf_slong::format_min_length#0 [phi:printf_slong::@2->printf_number_buffer#5] -- call_phi_near + // [140] phi printf_number_buffer::format_min_length#3 = printf_slong::format_min_length#0 [phi:printf_slong::@2->printf_number_buffer#5] -- vbuxx=vbuc1 ldx #format_min_length jsr printf_number_buffer // printf_slong::@return @@ -8554,7 +8554,7 @@ utoa: { // [134] utoa_append::value#0 = utoa::value#3 // [135] utoa_append::sub#0 = utoa::digit_value#0 // [136] call utoa_append - // [202] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] -- call_phi_near + // [202] phi from utoa::@10 to utoa_append [phi:utoa::@10->utoa_append] jsr utoa_append // utoa_append(buffer++, value, digit_value) // [137] utoa_append::return#0 = utoa_append::value#2 @@ -8594,7 +8594,7 @@ printf_number_buffer: { // printf_number_buffer::@6 // strlen(buffer.digits) // [143] call strlen - // [209] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] -- call_phi_near + // [209] phi from printf_number_buffer::@6 to strlen [phi:printf_number_buffer::@6->strlen] jsr strlen // strlen(buffer.digits) // [144] strlen::return#2 = strlen::len#2 @@ -8665,7 +8665,7 @@ printf_number_buffer: { // [215] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@8->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [215] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- call_phi_near + // [215] phi printf_padding::length#6 = printf_padding::length#0 [phi:printf_number_buffer::@8->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@2 __b2: @@ -8706,7 +8706,7 @@ printf_number_buffer: { // [215] phi printf_padding::pad#7 = '0' [phi:printf_number_buffer::@10->printf_padding#1] -- vbuz1=vbuc1 lda #'0' sta.z printf_padding.pad - // [215] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- call_phi_near + // [215] phi printf_padding::length#6 = printf_padding::length#1 [phi:printf_number_buffer::@10->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@4 __b4: @@ -8718,7 +8718,7 @@ printf_number_buffer: { // printf_number_buffer::@11 // strupr(buffer.digits) // [171] call strupr - // [223] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] -- call_phi_near + // [223] phi from printf_number_buffer::@11 to strupr [phi:printf_number_buffer::@11->strupr] jsr strupr // printf_number_buffer::@5 __b5: @@ -8727,7 +8727,7 @@ printf_number_buffer: { // [173] call printf_str // [71] phi from printf_number_buffer::@5 to printf_str [phi:printf_number_buffer::@5->printf_str] // [71] phi printf_str::putc#12 = printf_str::putc#0 [phi:printf_number_buffer::@5->printf_str#0] -- register_copy - // [71] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- call_phi_near + // [71] phi printf_str::s#12 = (char *)&printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS [phi:printf_number_buffer::@5->printf_str#1] -- pbuz1=pbuc1 lda #printf_buffer+OFFSET_STRUCT_PRINTF_BUFFER_NUMBER_DIGITS @@ -8761,7 +8761,7 @@ printf_number_buffer: { // [215] phi printf_padding::pad#7 = ' ' [phi:printf_number_buffer::@12->printf_padding#1] -- vbuz1=vbuc1 lda #' ' sta.z printf_padding.pad - // [215] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- call_phi_near + // [215] phi printf_padding::length#6 = printf_padding::length#2 [phi:printf_number_buffer::@12->printf_padding#2] -- register_copy jsr printf_padding // printf_number_buffer::@return __breturn: @@ -8897,7 +8897,7 @@ ultoa: { // [196] ultoa_append::value#0 = ultoa::value#2 // [197] ultoa_append::sub#0 = ultoa::digit_value#0 // [198] call ultoa_append - // [233] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] -- call_phi_near + // [233] phi from ultoa::@5 to ultoa_append [phi:ultoa::@5->ultoa_append] jsr ultoa_append // ultoa_append(buffer++, value, digit_value) // [199] ultoa_append::return#0 = ultoa_append::value#2 @@ -9099,7 +9099,7 @@ strupr: { // [227] toupper::ch#0 = *strupr::src#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (src),y - // [228] call toupper -- call_phi_near + // [228] call toupper jsr toupper // [229] toupper::return#3 = toupper::return#2 // strupr::@3 diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log index abad22ec3..292681b07 100644 --- a/src/test/ref/printmsg.log +++ b/src/test/ref/printmsg.log @@ -531,7 +531,7 @@ main: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [13] phi print_str::str#7 = msg [phi:main->print_str#1] -- call_phi_near + // [13] phi print_str::str#7 = msg [phi:main->print_str#1] -- pbuz1=pbuc1 lda #msg @@ -545,7 +545,7 @@ main: { // [3] call print_ln // [20] phi from main::@1 to print_ln [phi:main::@1->print_ln] print_ln_from___b1: - // [20] phi print_line_cursor#18 = print_screen#0 [phi:main::@1->print_ln#0] -- call_phi_near + // [20] phi print_line_cursor#18 = print_screen#0 [phi:main::@1->print_ln#0] -- pbuz1=pbuc1 lda #print_screen @@ -563,7 +563,7 @@ main: { // [13] phi from main::@2 to print_str [phi:main::@2->print_str] print_str_from___b2: // [13] phi print_char_cursor#36 = print_char_cursor#37 [phi:main::@2->print_str#0] -- register_copy - // [13] phi print_str::str#7 = msg2 [phi:main::@2->print_str#1] -- call_phi_near + // [13] phi print_str::str#7 = msg2 [phi:main::@2->print_str#1] -- pbuz1=pbuc1 lda #msg2 @@ -577,7 +577,7 @@ main: { // [7] call print_ln // [20] phi from main::@3 to print_ln [phi:main::@3->print_ln] print_ln_from___b3: - // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@3->print_ln#0] -- call_phi_near + // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@3->print_ln#0] -- register_copy jsr print_ln jmp __b4 // main::@4 @@ -591,7 +591,7 @@ main: { // [13] phi from main::@4 to print_str [phi:main::@4->print_str] print_str_from___b4: // [13] phi print_char_cursor#36 = print_char_cursor#38 [phi:main::@4->print_str#0] -- register_copy - // [13] phi print_str::str#7 = msg3 [phi:main::@4->print_str#1] -- call_phi_near + // [13] phi print_str::str#7 = msg3 [phi:main::@4->print_str#1] -- pbuz1=pbuc1 lda #msg3 @@ -605,7 +605,7 @@ main: { // [11] call print_ln // [20] phi from main::@5 to print_ln [phi:main::@5->print_ln] print_ln_from___b5: - // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@5->print_ln#0] -- call_phi_near + // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@5->print_ln#0] -- register_copy jsr print_ln jmp __breturn // main::@return @@ -641,7 +641,7 @@ print_str: { // [17] print_char::ch#0 = *print_str::str#4 -- vbuaa=_deref_pbuz1 ldy #0 lda (str),y - // [18] call print_char -- call_phi_near + // [18] call print_char jsr print_char jmp __b3 // print_str::@3 @@ -825,7 +825,7 @@ main: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [13] phi print_str::str#7 = msg [phi:main->print_str#1] -- call_phi_near + // [13] phi print_str::str#7 = msg [phi:main->print_str#1] -- pbuz1=pbuc1 lda #msg @@ -836,7 +836,7 @@ main: { // print_ln() // [3] call print_ln // [20] phi from main::@1 to print_ln [phi:main::@1->print_ln] - // [20] phi print_line_cursor#18 = print_screen#0 [phi:main::@1->print_ln#0] -- call_phi_near + // [20] phi print_line_cursor#18 = print_screen#0 [phi:main::@1->print_ln#0] -- pbuz1=pbuc1 lda #print_screen @@ -852,7 +852,7 @@ main: { // [5] call print_str // [13] phi from main::@2 to print_str [phi:main::@2->print_str] // [13] phi print_char_cursor#36 = print_char_cursor#37 [phi:main::@2->print_str#0] -- register_copy - // [13] phi print_str::str#7 = msg2 [phi:main::@2->print_str#1] -- call_phi_near + // [13] phi print_str::str#7 = msg2 [phi:main::@2->print_str#1] -- pbuz1=pbuc1 lda #msg2 @@ -863,7 +863,7 @@ main: { // print_ln() // [7] call print_ln // [20] phi from main::@3 to print_ln [phi:main::@3->print_ln] - // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@3->print_ln#0] -- call_phi_near + // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@3->print_ln#0] -- register_copy jsr print_ln // main::@4 // [8] print_char_cursor#38 = print_line_cursor#0 -- pbuz1=pbuz2 @@ -875,7 +875,7 @@ main: { // [9] call print_str // [13] phi from main::@4 to print_str [phi:main::@4->print_str] // [13] phi print_char_cursor#36 = print_char_cursor#38 [phi:main::@4->print_str#0] -- register_copy - // [13] phi print_str::str#7 = msg3 [phi:main::@4->print_str#1] -- call_phi_near + // [13] phi print_str::str#7 = msg3 [phi:main::@4->print_str#1] -- pbuz1=pbuc1 lda #msg3 @@ -886,7 +886,7 @@ main: { // print_ln() // [11] call print_ln // [20] phi from main::@5 to print_ln [phi:main::@5->print_ln] - // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@5->print_ln#0] -- call_phi_near + // [20] phi print_line_cursor#18 = print_line_cursor#0 [phi:main::@5->print_ln#0] -- register_copy jsr print_ln // main::@return // } @@ -919,7 +919,7 @@ print_str: { // [17] print_char::ch#0 = *print_str::str#4 -- vbuaa=_deref_pbuz1 ldy #0 lda (str),y - // [18] call print_char -- call_phi_near + // [18] call print_char jsr print_char // print_str::@3 // print_char(*(str++)); diff --git a/src/test/ref/problem-ma-var-overwrite.log b/src/test/ref/problem-ma-var-overwrite.log index 5e3db2880..d18329c7a 100644 --- a/src/test/ref/problem-ma-var-overwrite.log +++ b/src/test/ref/problem-ma-var-overwrite.log @@ -252,7 +252,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 @@ main: { sta.z test.videoMem lda.z h1+1 sta.z test.videoMem+1 - // [6] call test -- call_phi_near + // [6] call test jsr test jmp __breturn // main::@return @@ -396,7 +396,7 @@ __start: { sta.z h1+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 @@ -410,7 +410,7 @@ main: { sta.z test.videoMem lda.z h1+1 sta.z test.videoMem+1 - // [6] call test -- call_phi_near + // [6] call test jsr test // main::@return // } diff --git a/src/test/ref/problem-negate-const.log b/src/test/ref/problem-negate-const.log index 95d7df45e..31fdf120c 100644 --- a/src/test/ref/problem-negate-const.log +++ b/src/test/ref/problem-negate-const.log @@ -145,7 +145,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call printneg -- call_phi_near + // [1] call printneg jsr printneg jmp __breturn // main::@return @@ -204,7 +204,7 @@ Score: 24 // main main: { // printneg(-4) - // [1] call printneg -- call_phi_near + // [1] call printneg jsr printneg // main::@return // } diff --git a/src/test/ref/problem-struct-inline-parameter-1.log b/src/test/ref/problem-struct-inline-parameter-1.log index 083face16..288ce050f 100644 --- a/src/test/ref/problem-struct-inline-parameter-1.log +++ b/src/test/ref/problem-struct-inline-parameter-1.log @@ -224,7 +224,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call print -- call_phi_near + // [1] call print jsr print jmp __breturn // main::@return @@ -298,7 +298,7 @@ Score: 36 // main main: { // print('c', { '-', '-' } ) - // [1] call print -- call_phi_near + // [1] call print jsr print // main::@return // } diff --git a/src/test/ref/problem-struct-inline-parameter.log b/src/test/ref/problem-struct-inline-parameter.log index 9c2be3a86..90545c237 100644 --- a/src/test/ref/problem-struct-inline-parameter.log +++ b/src/test/ref/problem-struct-inline-parameter.log @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call print -- call_phi_near + // [1] call print jsr print jmp __breturn // main::@return @@ -297,7 +297,7 @@ Score: 36 // main main: { // print('c', (struct format){ '-', '-' } ) - // [1] call print -- call_phi_near + // [1] call print jsr print // main::@return // } diff --git a/src/test/ref/procedure-callingconvention-stack-4.log b/src/test/ref/procedure-callingconvention-stack-4.log index b45d2c468..b07b5e8a0 100644 --- a/src/test/ref/procedure-callingconvention-stack-4.log +++ b/src/test/ref/procedure-callingconvention-stack-4.log @@ -328,7 +328,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 @@ -503,7 +503,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 diff --git a/src/test/ref/procedure-callingconvention-stack-5.log b/src/test/ref/procedure-callingconvention-stack-5.log index dd9548762..31ccc9f71 100644 --- a/src/test/ref/procedure-callingconvention-stack-5.log +++ b/src/test/ref/procedure-callingconvention-stack-5.log @@ -245,7 +245,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -387,7 +387,7 @@ __start: { sta.z current+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/procedure-declare-10.log b/src/test/ref/procedure-declare-10.log index 3218ad121..5f3d5ca17 100644 --- a/src/test/ref/procedure-declare-10.log +++ b/src/test/ref/procedure-declare-10.log @@ -263,7 +263,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call memcpy - // [3] phi from main to memcpy [phi:main->memcpy] -- call_phi_near + // [3] phi from main to memcpy [phi:main->memcpy] memcpy_from_main: jsr memcpy jmp __breturn @@ -400,7 +400,7 @@ Score: 783 main: { // memcpy(SCREEN, STRING, sizeof(STRING)) // [1] call memcpy - // [3] phi from main to memcpy [phi:main->memcpy] -- call_phi_near + // [3] phi from main to memcpy [phi:main->memcpy] jsr memcpy // main::@return // } diff --git a/src/test/ref/procedure-declare-2.log b/src/test/ref/procedure-declare-2.log index 47974ca58..21d1bd4ac 100644 --- a/src/test/ref/procedure-declare-2.log +++ b/src/test/ref/procedure-declare-2.log @@ -257,7 +257,7 @@ main: { sum_from_main: // [10] phi sum::b#2 = 1 [phi:main->sum#0] -- vbuaa=vbuc1 lda #1 - // [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#2 = sum::return#0 @@ -272,7 +272,7 @@ main: { sum_from___b1: // [10] phi sum::b#2 = 2 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #2 - // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- call_phi_near + // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #'b' jsr sum // [6] sum::return#3 = sum::return#0 @@ -370,7 +370,7 @@ main: { // [10] phi from main to sum [phi:main->sum] // [10] phi sum::b#2 = 1 [phi:main->sum#0] -- vbuaa=vbuc1 lda #1 - // [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', 1) @@ -385,7 +385,7 @@ main: { // [10] phi from main::@1 to sum [phi:main::@1->sum] // [10] phi sum::b#2 = 2 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #2 - // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- call_phi_near + // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #'b' jsr sum // sum('b', 2) diff --git a/src/test/ref/procedure-declare-3.log b/src/test/ref/procedure-declare-3.log index b5e6d9a40..bf558df5c 100644 --- a/src/test/ref/procedure-declare-3.log +++ b/src/test/ref/procedure-declare-3.log @@ -257,7 +257,7 @@ main: { sum_from_main: // [10] phi sum::b#2 = 1 [phi:main->sum#0] -- vbuaa=vbuc1 lda #1 - // [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#2 = sum::return#0 @@ -272,7 +272,7 @@ main: { sum_from___b1: // [10] phi sum::b#2 = 2 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #2 - // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- call_phi_near + // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #'b' jsr sum // [6] sum::return#3 = sum::return#0 @@ -370,7 +370,7 @@ main: { // [10] phi from main to sum [phi:main->sum] // [10] phi sum::b#2 = 1 [phi:main->sum#0] -- vbuaa=vbuc1 lda #1 - // [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', 1) @@ -385,7 +385,7 @@ main: { // [10] phi from main::@1 to sum [phi:main::@1->sum] // [10] phi sum::b#2 = 2 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #2 - // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- call_phi_near + // [10] phi sum::a#2 = 'b' [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #'b' jsr sum // sum('b', 2) diff --git a/src/test/ref/procedure-declare-4.log b/src/test/ref/procedure-declare-4.log index 91a28e0c1..15d26e0d7 100644 --- a/src/test/ref/procedure-declare-4.log +++ b/src/test/ref/procedure-declare-4.log @@ -257,7 +257,7 @@ main: { sum_from_main: // [10] phi sum::w#2 = 1 [phi:main->sum#0] -- vbuaa=vbuc1 lda #1 - // [10] phi sum::q#2 = 'a' [phi:main->sum#1] -- call_phi_near + // [10] phi sum::q#2 = 'a' [phi:main->sum#1] -- vbuxx=vbuc1 ldx #'a' jsr sum // [2] sum::return#2 = sum::return#0 @@ -272,7 +272,7 @@ main: { sum_from___b1: // [10] phi sum::w#2 = 2 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #2 - // [10] phi sum::q#2 = 'b' [phi:main::@1->sum#1] -- call_phi_near + // [10] phi sum::q#2 = 'b' [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #'b' jsr sum // [6] sum::return#3 = sum::return#0 @@ -371,7 +371,7 @@ main: { // [10] phi from main to sum [phi:main->sum] // [10] phi sum::w#2 = 1 [phi:main->sum#0] -- vbuaa=vbuc1 lda #1 - // [10] phi sum::q#2 = 'a' [phi:main->sum#1] -- call_phi_near + // [10] phi sum::q#2 = 'a' [phi:main->sum#1] -- vbuxx=vbuc1 ldx #'a' jsr sum // sum('a', 1) @@ -386,7 +386,7 @@ main: { // [10] phi from main::@1 to sum [phi:main::@1->sum] // [10] phi sum::w#2 = 2 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #2 - // [10] phi sum::q#2 = 'b' [phi:main::@1->sum#1] -- call_phi_near + // [10] phi sum::q#2 = 'b' [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #'b' jsr sum // sum('b', 2) diff --git a/src/test/ref/procedure-declare-5.log b/src/test/ref/procedure-declare-5.log index cd4778497..b7f393e78 100644 --- a/src/test/ref/procedure-declare-5.log +++ b/src/test/ref/procedure-declare-5.log @@ -150,7 +150,7 @@ ASSEMBLER BEFORE OPTIMIZATION main: { .label SCREEN = $400 // [1] call f - // [4] phi from main to f [phi:main->f] -- call_phi_near + // [4] phi from main to f [phi:main->f] f_from_main: jsr f jmp __b1 @@ -217,7 +217,7 @@ main: { .label SCREEN = $400 // f() // [1] call f - // [4] phi from main to f [phi:main->f] -- call_phi_near + // [4] phi from main to f [phi:main->f] jsr f // main::@1 // SCREEN[0] = f() diff --git a/src/test/ref/processor-port-test.log b/src/test/ref/processor-port-test.log index 5e5e887b4..77456ef24 100644 --- a/src/test/ref/processor-port-test.log +++ b/src/test/ref/processor-port-test.log @@ -2507,7 +2507,7 @@ main: { lda #$dd sta IO_RAM // [9] call print_cls - // [64] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [64] phi from main to print_cls [phi:main->print_cls] print_cls_from_main: jsr print_cls // [10] phi from main to main::@2 [phi:main->main::@2] @@ -2523,7 +2523,7 @@ main: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [67] phi print_str::str#13 = main::str [phi:main::@2->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = main::str [phi:main::@2->print_str#1] -- pbuz1=pbuc1 lda #str @@ -2538,7 +2538,7 @@ main: { // [74] phi from main::@3 to print_ln [phi:main::@3->print_ln] print_ln_from___b3: // [74] phi print_char_cursor#118 = print_char_cursor#1 [phi:main::@3->print_ln#0] -- register_copy - // [74] phi print_line_cursor#69 = print_screen#0 [phi:main::@3->print_ln#1] -- call_phi_near + // [74] phi print_line_cursor#69 = print_screen#0 [phi:main::@3->print_ln#1] -- pbuz1=pbuc1 lda #print_screen @@ -2558,7 +2558,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_RAM_ALL [phi:main::@4->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_RAM_ALL sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@4->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@4->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [16] phi from main::@4 to main::@5 [phi:main::@4->main::@5] @@ -2575,7 +2575,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_RAM_IO [phi:main::@5->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_RAM_IO sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@5->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@5->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [18] phi from main::@5 to main::@6 [phi:main::@5->main::@6] @@ -2592,7 +2592,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_RAM_CHARROM [phi:main::@6->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_RAM_CHARROM sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@6->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@6->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [20] phi from main::@6 to main::@7 [phi:main::@6->main::@7] @@ -2609,7 +2609,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_KERNEL_IO [phi:main::@7->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_KERNEL_IO sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@7->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@7->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [22] phi from main::@7 to main::@8 [phi:main::@7->main::@8] @@ -2626,7 +2626,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_BASIC_KERNEL_IO [phi:main::@8->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_BASIC_KERNEL_IO sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@8->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@8->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [24] phi from main::@8 to main::@9 [phi:main::@8->main::@9] @@ -2643,7 +2643,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@9->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = 0 [phi:main::@9->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = 0 [phi:main::@9->testProcport#2] -- vbuxx=vbuc1 ldx #0 jsr testProcport // [26] phi from main::@9 to main::@10 [phi:main::@9->main::@10] @@ -2660,7 +2660,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@10->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@10->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@10->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [28] phi from main::@10 to main::@11 [phi:main::@10->main::@11] @@ -2677,7 +2677,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@11->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@11->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@11->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [30] phi from main::@11 to main::@12 [phi:main::@11->main::@12] @@ -2694,7 +2694,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@12->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@12->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@12->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [32] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -2711,7 +2711,7 @@ main: { // [79] phi testProcport::port#23 = $55 [phi:main::@13->testProcport#1] -- vbuz1=vbuc1 lda #$55 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@13->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@13->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [34] phi from main::@13 to main::@14 [phi:main::@13->main::@14] @@ -2728,7 +2728,7 @@ main: { // [79] phi testProcport::port#23 = $aa [phi:main::@14->testProcport#1] -- vbuz1=vbuc1 lda #$aa sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@14->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@14->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [36] phi from main::@14 to main::@15 [phi:main::@14->main::@15] @@ -2745,7 +2745,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@15->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@15->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@15->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [38] phi from main::@15 to main::@16 [phi:main::@15->main::@16] @@ -2762,7 +2762,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@16->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $55 [phi:main::@16->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $55 [phi:main::@16->testProcport#2] -- vbuxx=vbuc1 ldx #$55 jsr testProcport // [40] phi from main::@16 to main::@17 [phi:main::@16->main::@17] @@ -2779,7 +2779,7 @@ main: { // [79] phi testProcport::port#23 = $55 [phi:main::@17->testProcport#1] -- vbuz1=vbuc1 lda #$55 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $55 [phi:main::@17->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $55 [phi:main::@17->testProcport#2] -- vbuxx=vbuc1 ldx #$55 jsr testProcport // [42] phi from main::@17 to main::@18 [phi:main::@17->main::@18] @@ -2796,7 +2796,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@18->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $55 [phi:main::@18->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $55 [phi:main::@18->testProcport#2] -- vbuxx=vbuc1 ldx #$55 jsr testProcport // [44] phi from main::@18 to main::@19 [phi:main::@18->main::@19] @@ -2813,7 +2813,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@19->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $aa [phi:main::@19->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $aa [phi:main::@19->testProcport#2] -- vbuxx=vbuc1 ldx #$aa jsr testProcport // [46] phi from main::@19 to main::@20 [phi:main::@19->main::@20] @@ -2830,7 +2830,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@20->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $aa [phi:main::@20->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $aa [phi:main::@20->testProcport#2] -- vbuxx=vbuc1 ldx #$aa jsr testProcport // [48] phi from main::@20 to main::@21 [phi:main::@20->main::@21] @@ -2847,7 +2847,7 @@ main: { // [79] phi testProcport::port#23 = $aa [phi:main::@21->testProcport#1] -- vbuz1=vbuc1 lda #$aa sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $aa [phi:main::@21->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $aa [phi:main::@21->testProcport#2] -- vbuxx=vbuc1 ldx #$aa jsr testProcport // [50] phi from main::@21 to main::@22 [phi:main::@21->main::@22] @@ -2864,7 +2864,7 @@ main: { // [79] phi testProcport::port#23 = $d0 [phi:main::@22->testProcport#1] -- vbuz1=vbuc1 lda #$d0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@22->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@22->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [52] phi from main::@22 to main::@23 [phi:main::@22->main::@23] @@ -2881,7 +2881,7 @@ main: { // [79] phi testProcport::port#23 = $55 [phi:main::@23->testProcport#1] -- vbuz1=vbuc1 lda #$55 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@23->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@23->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [54] phi from main::@23 to main::@24 [phi:main::@23->main::@24] @@ -2898,7 +2898,7 @@ main: { // [79] phi testProcport::port#23 = $15 [phi:main::@24->testProcport#1] -- vbuz1=vbuc1 lda #$15 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $17 [phi:main::@24->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $17 [phi:main::@24->testProcport#2] -- vbuxx=vbuc1 ldx #$17 jsr testProcport // [56] phi from main::@24 to main::@25 [phi:main::@24->main::@25] @@ -2915,7 +2915,7 @@ main: { // [79] phi testProcport::port#23 = $15 [phi:main::@25->testProcport#1] -- vbuz1=vbuc1 lda #$15 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $17 [phi:main::@25->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $17 [phi:main::@25->testProcport#2] -- vbuxx=vbuc1 ldx #$17 jsr testProcport // [58] phi from main::@25 to main::@26 [phi:main::@25->main::@26] @@ -2932,7 +2932,7 @@ main: { // [79] phi testProcport::port#23 = $17 [phi:main::@26->testProcport#1] -- vbuz1=vbuc1 lda #$17 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $17 [phi:main::@26->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $17 [phi:main::@26->testProcport#2] -- vbuxx=vbuc1 ldx #$17 jsr testProcport jmp __b27 @@ -2963,7 +2963,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [65] call memset - // [120] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [120] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -3004,7 +3004,7 @@ print_str: { // [126] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [126] phi print_char_cursor#66 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [126] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [126] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -3077,7 +3077,7 @@ testProcport: { // [67] phi from testProcport to print_str [phi:testProcport->print_str] print_str_from_testProcport: // [67] phi print_char_cursor#124 = print_char_cursor#126 [phi:testProcport->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str [phi:testProcport->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str [phi:testProcport->print_str#1] -- pbuz1=pbuc1 lda #str @@ -3090,7 +3090,7 @@ testProcport: { // [88] call print_uchar // [130] phi from testProcport::@1 to print_uchar [phi:testProcport::@1->print_uchar] print_uchar_from___b1: - // [130] phi print_uchar::b#8 = print_uchar::b#0 [phi:testProcport::@1->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#0 [phi:testProcport::@1->print_uchar#0] -- register_copy jsr print_uchar // [89] phi from testProcport::@1 to testProcport::@2 [phi:testProcport::@1->testProcport::@2] __b2_from___b1: @@ -3101,7 +3101,7 @@ testProcport: { // [67] phi from testProcport::@2 to print_str [phi:testProcport::@2->print_str] print_str_from___b2: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@2->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@2->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@2->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -3115,7 +3115,7 @@ testProcport: { // [92] call print_uchar // [130] phi from testProcport::@3 to print_uchar [phi:testProcport::@3->print_uchar] print_uchar_from___b3: - // [130] phi print_uchar::b#8 = print_uchar::b#1 [phi:testProcport::@3->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#1 [phi:testProcport::@3->print_uchar#0] -- register_copy jsr print_uchar // [93] phi from testProcport::@3 to testProcport::@4 [phi:testProcport::@3->testProcport::@4] __b4_from___b3: @@ -3126,7 +3126,7 @@ testProcport: { // [67] phi from testProcport::@4 to print_str [phi:testProcport::@4->print_str] print_str_from___b4: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@4->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@4->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@4->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -3140,7 +3140,7 @@ testProcport: { // [96] call print_uchar // [130] phi from testProcport::@5 to print_uchar [phi:testProcport::@5->print_uchar] print_uchar_from___b5: - // [130] phi print_uchar::b#8 = print_uchar::b#2 [phi:testProcport::@5->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#2 [phi:testProcport::@5->print_uchar#0] -- register_copy jsr print_uchar // [97] phi from testProcport::@5 to testProcport::@6 [phi:testProcport::@5->testProcport::@6] __b6_from___b5: @@ -3151,7 +3151,7 @@ testProcport: { // [67] phi from testProcport::@6 to print_str [phi:testProcport::@6->print_str] print_str_from___b6: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@6->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@6->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@6->print_str#1] -- pbuz1=pbuc1 lda #str3 @@ -3165,7 +3165,7 @@ testProcport: { // [100] call print_uchar // [130] phi from testProcport::@7 to print_uchar [phi:testProcport::@7->print_uchar] print_uchar_from___b7: - // [130] phi print_uchar::b#8 = print_uchar::b#3 [phi:testProcport::@7->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#3 [phi:testProcport::@7->print_uchar#0] -- register_copy jsr print_uchar // [101] phi from testProcport::@7 to testProcport::@8 [phi:testProcport::@7->testProcport::@8] __b8_from___b7: @@ -3176,7 +3176,7 @@ testProcport: { // [67] phi from testProcport::@8 to print_str [phi:testProcport::@8->print_str] print_str_from___b8: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@8->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@8->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@8->print_str#1] -- pbuz1=pbuc1 lda #str3 @@ -3190,7 +3190,7 @@ testProcport: { // [104] call print_uchar // [130] phi from testProcport::@9 to print_uchar [phi:testProcport::@9->print_uchar] print_uchar_from___b9: - // [130] phi print_uchar::b#8 = print_uchar::b#4 [phi:testProcport::@9->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#4 [phi:testProcport::@9->print_uchar#0] -- register_copy jsr print_uchar // [105] phi from testProcport::@9 to testProcport::@10 [phi:testProcport::@9->testProcport::@10] __b10_from___b9: @@ -3201,7 +3201,7 @@ testProcport: { // [67] phi from testProcport::@10 to print_str [phi:testProcport::@10->print_str] print_str_from___b10: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@10->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@10->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@10->print_str#1] -- pbuz1=pbuc1 lda #str5 @@ -3215,7 +3215,7 @@ testProcport: { // [108] call print_uchar // [130] phi from testProcport::@11 to print_uchar [phi:testProcport::@11->print_uchar] print_uchar_from___b11: - // [130] phi print_uchar::b#8 = print_uchar::b#5 [phi:testProcport::@11->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#5 [phi:testProcport::@11->print_uchar#0] -- register_copy jsr print_uchar // [109] phi from testProcport::@11 to testProcport::@12 [phi:testProcport::@11->testProcport::@12] __b12_from___b11: @@ -3226,7 +3226,7 @@ testProcport: { // [67] phi from testProcport::@12 to print_str [phi:testProcport::@12->print_str] print_str_from___b12: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@12->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@12->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@12->print_str#1] -- pbuz1=pbuc1 lda #str5 @@ -3240,7 +3240,7 @@ testProcport: { // [112] call print_uchar // [130] phi from testProcport::@13 to print_uchar [phi:testProcport::@13->print_uchar] print_uchar_from___b13: - // [130] phi print_uchar::b#8 = print_uchar::b#6 [phi:testProcport::@13->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#6 [phi:testProcport::@13->print_uchar#0] -- register_copy jsr print_uchar // [113] phi from testProcport::@13 to testProcport::@14 [phi:testProcport::@13->testProcport::@14] __b14_from___b13: @@ -3251,7 +3251,7 @@ testProcport: { // [67] phi from testProcport::@14 to print_str [phi:testProcport::@14->print_str] print_str_from___b14: // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@14->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@14->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@14->print_str#1] -- pbuz1=pbuc1 lda #str5 @@ -3265,7 +3265,7 @@ testProcport: { // [116] call print_uchar // [130] phi from testProcport::@15 to print_uchar [phi:testProcport::@15->print_uchar] print_uchar_from___b15: - // [130] phi print_uchar::b#8 = print_uchar::b#7 [phi:testProcport::@15->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#7 [phi:testProcport::@15->print_uchar#0] -- register_copy jsr print_uchar // [117] phi from testProcport::@15 to testProcport::@16 [phi:testProcport::@15->testProcport::@16] __b16_from___b15: @@ -3276,7 +3276,7 @@ testProcport: { // [74] phi from testProcport::@16 to print_ln [phi:testProcport::@16->print_ln] print_ln_from___b16: // [74] phi print_char_cursor#118 = print_char_cursor#67 [phi:testProcport::@16->print_ln#0] -- register_copy - // [74] phi print_line_cursor#69 = print_line_cursor#0 [phi:testProcport::@16->print_ln#1] -- call_phi_near + // [74] phi print_line_cursor#69 = print_line_cursor#0 [phi:testProcport::@16->print_ln#1] -- register_copy jsr print_ln jmp __breturn // testProcport::@return @@ -3377,7 +3377,7 @@ print_uchar: { // [126] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [126] phi print_char_cursor#66 = print_char_cursor#1 [phi:print_uchar->print_char#0] -- register_copy - // [126] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [126] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -3391,7 +3391,7 @@ print_uchar: { // [126] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [126] phi print_char_cursor#66 = print_char_cursor#67 [phi:print_uchar::@1->print_char#0] -- register_copy - // [126] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [126] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -3795,7 +3795,7 @@ main: { sta IO_RAM // print_cls() // [9] call print_cls - // [64] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [64] phi from main to print_cls [phi:main->print_cls] jsr print_cls // [10] phi from main to main::@2 [phi:main->main::@2] // main::@2 @@ -3807,7 +3807,7 @@ main: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [67] phi print_str::str#13 = main::str [phi:main::@2->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = main::str [phi:main::@2->print_str#1] -- pbuz1=pbuc1 lda #str @@ -3819,7 +3819,7 @@ main: { // [13] call print_ln // [74] phi from main::@3 to print_ln [phi:main::@3->print_ln] // [74] phi print_char_cursor#118 = print_char_cursor#1 [phi:main::@3->print_ln#0] -- register_copy - // [74] phi print_line_cursor#69 = print_screen#0 [phi:main::@3->print_ln#1] -- call_phi_near + // [74] phi print_line_cursor#69 = print_screen#0 [phi:main::@3->print_ln#1] -- pbuz1=pbuc1 lda #print_screen @@ -3836,7 +3836,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_RAM_ALL [phi:main::@4->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_RAM_ALL sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@4->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@4->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [16] phi from main::@4 to main::@5 [phi:main::@4->main::@5] @@ -3850,7 +3850,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_RAM_IO [phi:main::@5->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_RAM_IO sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@5->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@5->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [18] phi from main::@5 to main::@6 [phi:main::@5->main::@6] @@ -3864,7 +3864,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_RAM_CHARROM [phi:main::@6->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_RAM_CHARROM sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@6->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@6->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [20] phi from main::@6 to main::@7 [phi:main::@6->main::@7] @@ -3878,7 +3878,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_KERNEL_IO [phi:main::@7->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_KERNEL_IO sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@7->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@7->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [22] phi from main::@7 to main::@8 [phi:main::@7->main::@8] @@ -3892,7 +3892,7 @@ main: { // [79] phi testProcport::port#23 = PROCPORT_BASIC_KERNEL_IO [phi:main::@8->testProcport#1] -- vbuz1=vbuc1 lda #PROCPORT_BASIC_KERNEL_IO sta.z testProcport.port - // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@8->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = PROCPORT_DDR_MEMORY_MASK [phi:main::@8->testProcport#2] -- vbuxx=vbuc1 ldx #PROCPORT_DDR_MEMORY_MASK jsr testProcport // [24] phi from main::@8 to main::@9 [phi:main::@8->main::@9] @@ -3905,7 +3905,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = 0 [phi:main::@9->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = 0 [phi:main::@9->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = 0 [phi:main::@9->testProcport#2] -- vbuxx=vbuc1 tax jsr testProcport // [26] phi from main::@9 to main::@10 [phi:main::@9->main::@10] @@ -3918,7 +3918,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = 0 [phi:main::@10->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@10->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@10->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [28] phi from main::@10 to main::@11 [phi:main::@10->main::@11] @@ -3932,7 +3932,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@11->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@11->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@11->testProcport#2] -- vbuxx=vbuc1 tax jsr testProcport // [30] phi from main::@11 to main::@12 [phi:main::@11->main::@12] @@ -3946,7 +3946,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@12->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@12->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@12->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [32] phi from main::@12 to main::@13 [phi:main::@12->main::@13] @@ -3960,7 +3960,7 @@ main: { // [79] phi testProcport::port#23 = $55 [phi:main::@13->testProcport#1] -- vbuz1=vbuc1 lda #$55 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@13->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@13->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [34] phi from main::@13 to main::@14 [phi:main::@13->main::@14] @@ -3974,7 +3974,7 @@ main: { // [79] phi testProcport::port#23 = $aa [phi:main::@14->testProcport#1] -- vbuz1=vbuc1 lda #$aa sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@14->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@14->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [36] phi from main::@14 to main::@15 [phi:main::@14->main::@15] @@ -3987,7 +3987,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = $ff [phi:main::@15->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@15->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@15->testProcport#2] -- vbuxx=vbuc1 tax jsr testProcport // [38] phi from main::@15 to main::@16 [phi:main::@15->main::@16] @@ -4001,7 +4001,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@16->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $55 [phi:main::@16->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $55 [phi:main::@16->testProcport#2] -- vbuxx=vbuc1 ldx #$55 jsr testProcport // [40] phi from main::@16 to main::@17 [phi:main::@16->main::@17] @@ -4014,7 +4014,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = $55 [phi:main::@17->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $55 [phi:main::@17->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $55 [phi:main::@17->testProcport#2] -- vbuxx=vbuc1 tax jsr testProcport // [42] phi from main::@17 to main::@18 [phi:main::@17->main::@18] @@ -4028,7 +4028,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@18->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $55 [phi:main::@18->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $55 [phi:main::@18->testProcport#2] -- vbuxx=vbuc1 ldx #$55 jsr testProcport // [44] phi from main::@18 to main::@19 [phi:main::@18->main::@19] @@ -4042,7 +4042,7 @@ main: { // [79] phi testProcport::port#23 = 0 [phi:main::@19->testProcport#1] -- vbuz1=vbuc1 lda #0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $aa [phi:main::@19->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $aa [phi:main::@19->testProcport#2] -- vbuxx=vbuc1 ldx #$aa jsr testProcport // [46] phi from main::@19 to main::@20 [phi:main::@19->main::@20] @@ -4056,7 +4056,7 @@ main: { // [79] phi testProcport::port#23 = $ff [phi:main::@20->testProcport#1] -- vbuz1=vbuc1 lda #$ff sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $aa [phi:main::@20->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $aa [phi:main::@20->testProcport#2] -- vbuxx=vbuc1 ldx #$aa jsr testProcport // [48] phi from main::@20 to main::@21 [phi:main::@20->main::@21] @@ -4069,7 +4069,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = $aa [phi:main::@21->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $aa [phi:main::@21->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $aa [phi:main::@21->testProcport#2] -- vbuxx=vbuc1 tax jsr testProcport // [50] phi from main::@21 to main::@22 [phi:main::@21->main::@22] @@ -4083,7 +4083,7 @@ main: { // [79] phi testProcport::port#23 = $d0 [phi:main::@22->testProcport#1] -- vbuz1=vbuc1 lda #$d0 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@22->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@22->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [52] phi from main::@22 to main::@23 [phi:main::@22->main::@23] @@ -4096,7 +4096,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = $55 [phi:main::@23->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $ff [phi:main::@23->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $ff [phi:main::@23->testProcport#2] -- vbuxx=vbuc1 ldx #$ff jsr testProcport // [54] phi from main::@23 to main::@24 [phi:main::@23->main::@24] @@ -4109,7 +4109,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = $15 [phi:main::@24->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $17 [phi:main::@24->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $17 [phi:main::@24->testProcport#2] -- vbuxx=vbuc1 ldx #$17 jsr testProcport // [56] phi from main::@24 to main::@25 [phi:main::@24->main::@25] @@ -4123,7 +4123,7 @@ main: { // [79] phi testProcport::port#23 = $15 [phi:main::@25->testProcport#1] -- vbuz1=vbuc1 lda #$15 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $17 [phi:main::@25->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $17 [phi:main::@25->testProcport#2] -- vbuxx=vbuc1 ldx #$17 jsr testProcport // [58] phi from main::@25 to main::@26 [phi:main::@25->main::@26] @@ -4136,7 +4136,7 @@ main: { sta.z testProcport.ddr2 // [79] phi testProcport::port#23 = $17 [phi:main::@26->testProcport#1] -- vbuz1=vbuc1 sta.z testProcport.port - // [79] phi testProcport::ddr#23 = $17 [phi:main::@26->testProcport#2] -- call_phi_near + // [79] phi testProcport::ddr#23 = $17 [phi:main::@26->testProcport#2] -- vbuxx=vbuc1 tax jsr testProcport // main::@27 @@ -4169,7 +4169,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [65] call memset - // [120] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [120] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -4205,7 +4205,7 @@ print_str: { // [72] call print_char // [126] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [126] phi print_char_cursor#66 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [126] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [126] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); @@ -4280,7 +4280,7 @@ testProcport: { // [86] call print_str // [67] phi from testProcport to print_str [phi:testProcport->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#126 [phi:testProcport->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str [phi:testProcport->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str [phi:testProcport->print_str#1] -- pbuz1=pbuc1 lda #str @@ -4291,7 +4291,7 @@ testProcport: { // [87] print_uchar::b#0 = testProcport::ddr#23 // [88] call print_uchar // [130] phi from testProcport::@1 to print_uchar [phi:testProcport::@1->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#0 [phi:testProcport::@1->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#0 [phi:testProcport::@1->print_uchar#0] -- register_copy jsr print_uchar // [89] phi from testProcport::@1 to testProcport::@2 [phi:testProcport::@1->testProcport::@2] // testProcport::@2 @@ -4299,7 +4299,7 @@ testProcport: { // [90] call print_str // [67] phi from testProcport::@2 to print_str [phi:testProcport::@2->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@2->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@2->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@2->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -4311,7 +4311,7 @@ testProcport: { ldx.z port // [92] call print_uchar // [130] phi from testProcport::@3 to print_uchar [phi:testProcport::@3->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#1 [phi:testProcport::@3->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#1 [phi:testProcport::@3->print_uchar#0] -- register_copy jsr print_uchar // [93] phi from testProcport::@3 to testProcport::@4 [phi:testProcport::@3->testProcport::@4] // testProcport::@4 @@ -4319,7 +4319,7 @@ testProcport: { // [94] call print_str // [67] phi from testProcport::@4 to print_str [phi:testProcport::@4->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@4->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@4->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str1 [phi:testProcport::@4->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -4331,7 +4331,7 @@ testProcport: { ldx.z ddr2 // [96] call print_uchar // [130] phi from testProcport::@5 to print_uchar [phi:testProcport::@5->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#2 [phi:testProcport::@5->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#2 [phi:testProcport::@5->print_uchar#0] -- register_copy jsr print_uchar // [97] phi from testProcport::@5 to testProcport::@6 [phi:testProcport::@5->testProcport::@6] // testProcport::@6 @@ -4339,7 +4339,7 @@ testProcport: { // [98] call print_str // [67] phi from testProcport::@6 to print_str [phi:testProcport::@6->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@6->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@6->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@6->print_str#1] -- pbuz1=pbuc1 lda #str3 @@ -4351,7 +4351,7 @@ testProcport: { ldx.z PROCPORT_DDR // [100] call print_uchar // [130] phi from testProcport::@7 to print_uchar [phi:testProcport::@7->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#3 [phi:testProcport::@7->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#3 [phi:testProcport::@7->print_uchar#0] -- register_copy jsr print_uchar // [101] phi from testProcport::@7 to testProcport::@8 [phi:testProcport::@7->testProcport::@8] // testProcport::@8 @@ -4359,7 +4359,7 @@ testProcport: { // [102] call print_str // [67] phi from testProcport::@8 to print_str [phi:testProcport::@8->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@8->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@8->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str3 [phi:testProcport::@8->print_str#1] -- pbuz1=pbuc1 lda #str3 @@ -4371,7 +4371,7 @@ testProcport: { ldx.z PROCPORT // [104] call print_uchar // [130] phi from testProcport::@9 to print_uchar [phi:testProcport::@9->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#4 [phi:testProcport::@9->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#4 [phi:testProcport::@9->print_uchar#0] -- register_copy jsr print_uchar // [105] phi from testProcport::@9 to testProcport::@10 [phi:testProcport::@9->testProcport::@10] // testProcport::@10 @@ -4379,7 +4379,7 @@ testProcport: { // [106] call print_str // [67] phi from testProcport::@10 to print_str [phi:testProcport::@10->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@10->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@10->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@10->print_str#1] -- pbuz1=pbuc1 lda #str5 @@ -4391,7 +4391,7 @@ testProcport: { ldx BASIC_ROM // [108] call print_uchar // [130] phi from testProcport::@11 to print_uchar [phi:testProcport::@11->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#5 [phi:testProcport::@11->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#5 [phi:testProcport::@11->print_uchar#0] -- register_copy jsr print_uchar // [109] phi from testProcport::@11 to testProcport::@12 [phi:testProcport::@11->testProcport::@12] // testProcport::@12 @@ -4399,7 +4399,7 @@ testProcport: { // [110] call print_str // [67] phi from testProcport::@12 to print_str [phi:testProcport::@12->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@12->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@12->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@12->print_str#1] -- pbuz1=pbuc1 lda #str5 @@ -4411,7 +4411,7 @@ testProcport: { ldx IO_RAM // [112] call print_uchar // [130] phi from testProcport::@13 to print_uchar [phi:testProcport::@13->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#6 [phi:testProcport::@13->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#6 [phi:testProcport::@13->print_uchar#0] -- register_copy jsr print_uchar // [113] phi from testProcport::@13 to testProcport::@14 [phi:testProcport::@13->testProcport::@14] // testProcport::@14 @@ -4419,7 +4419,7 @@ testProcport: { // [114] call print_str // [67] phi from testProcport::@14 to print_str [phi:testProcport::@14->print_str] // [67] phi print_char_cursor#124 = print_char_cursor#67 [phi:testProcport::@14->print_str#0] -- register_copy - // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@14->print_str#1] -- call_phi_near + // [67] phi print_str::str#13 = testProcport::str5 [phi:testProcport::@14->print_str#1] -- pbuz1=pbuc1 lda #str5 @@ -4431,7 +4431,7 @@ testProcport: { ldx KERNAL_ROM // [116] call print_uchar // [130] phi from testProcport::@15 to print_uchar [phi:testProcport::@15->print_uchar] - // [130] phi print_uchar::b#8 = print_uchar::b#7 [phi:testProcport::@15->print_uchar#0] -- call_phi_near + // [130] phi print_uchar::b#8 = print_uchar::b#7 [phi:testProcport::@15->print_uchar#0] -- register_copy jsr print_uchar // [117] phi from testProcport::@15 to testProcport::@16 [phi:testProcport::@15->testProcport::@16] // testProcport::@16 @@ -4439,7 +4439,7 @@ testProcport: { // [118] call print_ln // [74] phi from testProcport::@16 to print_ln [phi:testProcport::@16->print_ln] // [74] phi print_char_cursor#118 = print_char_cursor#67 [phi:testProcport::@16->print_ln#0] -- register_copy - // [74] phi print_line_cursor#69 = print_line_cursor#0 [phi:testProcport::@16->print_ln#1] -- call_phi_near + // [74] phi print_line_cursor#69 = print_line_cursor#0 [phi:testProcport::@16->print_ln#1] -- register_copy jsr print_ln // testProcport::@return // } @@ -4540,7 +4540,7 @@ print_uchar: { // Table of hexadecimal digits // [126] phi from print_uchar to print_char [phi:print_uchar->print_char] // [126] phi print_char_cursor#66 = print_char_cursor#1 [phi:print_uchar->print_char#0] -- register_copy - // [126] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [126] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -4553,7 +4553,7 @@ print_uchar: { // [136] call print_char // [126] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [126] phi print_char_cursor#66 = print_char_cursor#67 [phi:print_uchar::@1->print_char#0] -- register_copy - // [126] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [126] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/ptrptr-optimize-1.log b/src/test/ref/ptrptr-optimize-1.log index 467c93875..e4fffb39e 100644 --- a/src/test/ref/ptrptr-optimize-1.log +++ b/src/test/ref/ptrptr-optimize-1.log @@ -172,7 +172,7 @@ main: { // [1] call sub // [5] phi from main to sub [phi:main->sub] sub_from_main: - // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- vbuaa=vbuc1 lda #'a' jsr sub // [2] phi from main to main::@1 [phi:main->main::@1] @@ -183,7 +183,7 @@ main: { // [3] call sub // [5] phi from main::@1 to sub [phi:main::@1->sub] sub_from___b1: - // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- vbuaa=vbuc1 lda #'b' jsr sub jmp __breturn @@ -271,7 +271,7 @@ main: { // sub('a',pscreen) // [1] call sub // [5] phi from main to sub [phi:main->sub] - // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- vbuaa=vbuc1 lda #'a' jsr sub // [2] phi from main to main::@1 [phi:main->main::@1] @@ -279,7 +279,7 @@ main: { // sub('b',pscreen) // [3] call sub // [5] phi from main::@1 to sub [phi:main::@1->sub] - // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- vbuaa=vbuc1 lda #'b' jsr sub // main::@return diff --git a/src/test/ref/ptrptr-optimize-2.log b/src/test/ref/ptrptr-optimize-2.log index 112d4cd77..f569b5aab 100644 --- a/src/test/ref/ptrptr-optimize-2.log +++ b/src/test/ref/ptrptr-optimize-2.log @@ -172,7 +172,7 @@ main: { // [1] call sub // [5] phi from main to sub [phi:main->sub] sub_from_main: - // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- vbuaa=vbuc1 lda #'a' jsr sub // [2] phi from main to main::@1 [phi:main->main::@1] @@ -183,7 +183,7 @@ main: { // [3] call sub // [5] phi from main::@1 to sub [phi:main::@1->sub] sub_from___b1: - // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- vbuaa=vbuc1 lda #'b' jsr sub jmp __breturn @@ -270,7 +270,7 @@ main: { // sub('a',&screen) // [1] call sub // [5] phi from main to sub [phi:main->sub] - // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'a' [phi:main->sub#0] -- vbuaa=vbuc1 lda #'a' jsr sub // [2] phi from main to main::@1 [phi:main->main::@1] @@ -278,7 +278,7 @@ main: { // sub('b',&screen) // [3] call sub // [5] phi from main::@1 to sub [phi:main::@1->sub] - // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- call_phi_near + // [5] phi sub::ch#2 = 'b' [phi:main::@1->sub#0] -- vbuaa=vbuc1 lda #'b' jsr sub // main::@return diff --git a/src/test/ref/ptrtest.log b/src/test/ref/ptrtest.log index 9a333a160..42e5fb047 100644 --- a/src/test/ref/ptrtest.log +++ b/src/test/ref/ptrtest.log @@ -519,14 +519,14 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call lvalue -- call_phi_near + // [1] call lvalue jsr lvalue // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: jmp __b1 // main::@1 __b1: - // [3] call rvalue -- call_phi_near + // [3] call rvalue jsr rvalue // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -534,7 +534,7 @@ main: { // main::@2 __b2: // [5] call rvaluevar - // [23] phi from main::@2 to rvaluevar [phi:main::@2->rvaluevar] -- call_phi_near + // [23] phi from main::@2 to rvaluevar [phi:main::@2->rvaluevar] rvaluevar_from___b2: jsr rvaluevar // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -543,7 +543,7 @@ main: { // main::@3 __b3: // [7] call lvaluevar - // [31] phi from main::@3 to lvaluevar [phi:main::@3->lvaluevar] -- call_phi_near + // [31] phi from main::@3 to lvaluevar [phi:main::@3->lvaluevar] lvaluevar_from___b3: jsr lvaluevar jmp __breturn @@ -837,24 +837,24 @@ Score: 1318 // main main: { // lvalue() - // [1] call lvalue -- call_phi_near + // [1] call lvalue jsr lvalue // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // rvalue() - // [3] call rvalue -- call_phi_near + // [3] call rvalue jsr rvalue // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // rvaluevar() // [5] call rvaluevar - // [23] phi from main::@2 to rvaluevar [phi:main::@2->rvaluevar] -- call_phi_near + // [23] phi from main::@2 to rvaluevar [phi:main::@2->rvaluevar] jsr rvaluevar // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // lvaluevar() // [7] call lvaluevar - // [31] phi from main::@3 to lvaluevar [phi:main::@3->lvaluevar] -- call_phi_near + // [31] phi from main::@3 to lvaluevar [phi:main::@3->lvaluevar] jsr lvaluevar // main::@return // } diff --git a/src/test/ref/register-0.log b/src/test/ref/register-0.log index 539c7ec51..7b7e77db1 100644 --- a/src/test/ref/register-0.log +++ b/src/test/ref/register-0.log @@ -183,7 +183,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -196,7 +196,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 @@ -204,7 +204,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 @@ -212,7 +212,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 @@ -299,7 +299,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 @@ -311,21 +311,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/reserve-zp-global-range.log b/src/test/ref/reserve-zp-global-range.log index 8ca16bd1a..48726c166 100644 --- a/src/test/ref/reserve-zp-global-range.log +++ b/src/test/ref/reserve-zp-global-range.log @@ -198,7 +198,7 @@ main: { __b1: // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 jmp __b2 @@ -292,7 +292,7 @@ main: { // sub1(i) // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 // main::@2 diff --git a/src/test/ref/reserve-zp-global.log b/src/test/ref/reserve-zp-global.log index 6750f7002..1c39d5bee 100644 --- a/src/test/ref/reserve-zp-global.log +++ b/src/test/ref/reserve-zp-global.log @@ -198,7 +198,7 @@ main: { __b1: // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 jmp __b2 @@ -292,7 +292,7 @@ main: { // sub1(i) // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 // main::@2 diff --git a/src/test/ref/reserve-zp-procedure-1.log b/src/test/ref/reserve-zp-procedure-1.log index a4705e225..8d61803a7 100644 --- a/src/test/ref/reserve-zp-procedure-1.log +++ b/src/test/ref/reserve-zp-procedure-1.log @@ -198,7 +198,7 @@ main: { __b1: // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 jmp __b2 @@ -292,7 +292,7 @@ main: { // sub1(i) // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 // main::@2 diff --git a/src/test/ref/reserve-zp-procedure-2.log b/src/test/ref/reserve-zp-procedure-2.log index 6296a0655..869577f5f 100644 --- a/src/test/ref/reserve-zp-procedure-2.log +++ b/src/test/ref/reserve-zp-procedure-2.log @@ -298,7 +298,7 @@ main: { __b1: // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 jmp __b2 @@ -310,7 +310,7 @@ main: { sta SCREEN,y // [6] sub2::i#0 = main::i -- vbuxx=vbuz1 ldx.z i - // [7] call sub2 -- call_phi_near + // [7] call sub2 jsr sub2 // [8] sub2::return#0 = sub2::return#1 jmp __b3 @@ -437,7 +437,7 @@ main: { // sub1(i) // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 // main::@2 @@ -449,7 +449,7 @@ main: { // sub2(i) // [6] sub2::i#0 = main::i -- vbuxx=vbuz1 ldx.z i - // [7] call sub2 -- call_phi_near + // [7] call sub2 jsr sub2 // [8] sub2::return#0 = sub2::return#1 // main::@3 diff --git a/src/test/ref/reserve-zp-procedure-3.log b/src/test/ref/reserve-zp-procedure-3.log index 25f767086..73b02ba54 100644 --- a/src/test/ref/reserve-zp-procedure-3.log +++ b/src/test/ref/reserve-zp-procedure-3.log @@ -198,7 +198,7 @@ main: { __b1: // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 jmp __b2 @@ -292,7 +292,7 @@ main: { // sub1(i) // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 // main::@2 diff --git a/src/test/ref/reserve-zp-procedure-4.log b/src/test/ref/reserve-zp-procedure-4.log index bd9d8b75a..2f13f19d0 100644 --- a/src/test/ref/reserve-zp-procedure-4.log +++ b/src/test/ref/reserve-zp-procedure-4.log @@ -198,7 +198,7 @@ main: { __b1: // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 jmp __b2 @@ -292,7 +292,7 @@ main: { // sub1(i) // [1] sub1::i#0 = main::i -- vbuaa=vbuz1 lda.z i - // [2] call sub1 -- call_phi_near + // [2] call sub1 jsr sub1 // [3] sub1::return#0 = sub1::return#1 // main::@2 diff --git a/src/test/ref/robozzle64-label-problem.log b/src/test/ref/robozzle64-label-problem.log index d9ac26394..74249a35f 100644 --- a/src/test/ref/robozzle64-label-problem.log +++ b/src/test/ref/robozzle64-label-problem.log @@ -509,7 +509,7 @@ main: { // [3] call mul8u // [16] phi from main::@1 to mul8u [phi:main::@1->mul8u] mul8u_from___b1: - // [16] phi mul8u::a#6 = mul8u::a#1 [phi:main::@1->mul8u#0] -- call_phi_near + // [16] phi mul8u::a#6 = mul8u::a#1 [phi:main::@1->mul8u#0] -- register_copy jsr mul8u // [4] mul8u::return#2 = mul8u::res#2 jmp __b2 @@ -528,7 +528,7 @@ main: { // [8] call mul8u // [16] phi from main::@2 to mul8u [phi:main::@2->mul8u] mul8u_from___b2: - // [16] phi mul8u::a#6 = mul8u::a#2 [phi:main::@2->mul8u#0] -- call_phi_near + // [16] phi mul8u::a#6 = mul8u::a#2 [phi:main::@2->mul8u#0] -- register_copy jsr mul8u // [9] mul8u::return#3 = mul8u::res#2 jmp __b3 @@ -751,7 +751,7 @@ main: { ldx.z y // [3] call mul8u // [16] phi from main::@1 to mul8u [phi:main::@1->mul8u] - // [16] phi mul8u::a#6 = mul8u::a#1 [phi:main::@1->mul8u#0] -- call_phi_near + // [16] phi mul8u::a#6 = mul8u::a#1 [phi:main::@1->mul8u#0] -- register_copy jsr mul8u // word z1 = mul8u(y,40) // [4] mul8u::return#2 = mul8u::res#2 @@ -770,7 +770,7 @@ main: { ldx.z y // [8] call mul8u // [16] phi from main::@2 to mul8u [phi:main::@2->mul8u] - // [16] phi mul8u::a#6 = mul8u::a#2 [phi:main::@2->mul8u#0] -- call_phi_near + // [16] phi mul8u::a#6 = mul8u::a#2 [phi:main::@2->mul8u#0] -- register_copy jsr mul8u // word z2 = mul8u(y,40) // [9] mul8u::return#3 = mul8u::res#2 diff --git a/src/test/ref/roll-sprite-msb.log b/src/test/ref/roll-sprite-msb.log index d17638634..0e330842b 100644 --- a/src/test/ref/roll-sprite-msb.log +++ b/src/test/ref/roll-sprite-msb.log @@ -388,7 +388,7 @@ main: { // [2] position_sprite::spriteno#0 = main::s#2 -- vbuz1=vbuxx stx.z position_sprite.spriteno // [3] position_sprite::x#0 = main::xpos#2 - // [4] call position_sprite -- call_phi_near + // [4] call position_sprite jsr position_sprite jmp __b2 // main::@2 @@ -575,7 +575,7 @@ main: { // [2] position_sprite::spriteno#0 = main::s#2 -- vbuz1=vbuxx stx.z position_sprite.spriteno // [3] position_sprite::x#0 = main::xpos#2 - // [4] call position_sprite -- call_phi_near + // [4] call position_sprite jsr position_sprite // main::@2 // xpos += 10 diff --git a/src/test/ref/scan-desire-problem.log b/src/test/ref/scan-desire-problem.log index 618158d3f..1e41f8d2a 100644 --- a/src/test/ref/scan-desire-problem.log +++ b/src/test/ref/scan-desire-problem.log @@ -1413,7 +1413,7 @@ main: { .label y = $14 .label x = $15 // [1] call init - // [15] phi from main to init [phi:main->init] -- call_phi_near + // [15] phi from main to init [phi:main->init] init_from_main: jsr init // [2] phi from main to main::@1 [phi:main->main::@1] @@ -1469,7 +1469,7 @@ main: { // [11] draw_block::x#0 = main::x#2 -- vbuxx=vbuz1 ldx.z x // [12] draw_block::y#0 = main::y#2 - // [13] call draw_block -- call_phi_near + // [13] call draw_block jsr draw_block jmp __b6 // main::@6 @@ -1484,7 +1484,7 @@ main: { // init init: { .const toD0181_return = (>(screen&$3fff)*4)|(>charset)/4&$f - // [16] call init_sprites -- call_phi_near + // [16] call init_sprites jsr init_sprites // [17] phi from init to init::@2 [phi:init->init::@2] __b2_from_init: @@ -1496,7 +1496,7 @@ init: { memset_from___b2: // [66] phi memset::c#4 = 0 [phi:init::@2->memset#0] -- vbuxx=vbuc1 ldx #0 - // [66] phi memset::str#3 = (void *)screen [phi:init::@2->memset#1] -- call_phi_near + // [66] phi memset::str#3 = (void *)screen [phi:init::@2->memset#1] -- pvoz1=pvoc1 lda #screen @@ -1512,7 +1512,7 @@ init: { memset_from___b3: // [66] phi memset::c#4 = BLACK [phi:init::@3->memset#0] -- vbuxx=vbuc1 ldx #BLACK - // [66] phi memset::str#3 = (void *)colors [phi:init::@3->memset#1] -- call_phi_near + // [66] phi memset::str#3 = (void *)colors [phi:init::@3->memset#1] -- pvoz1=pvoc1 lda #colors @@ -1589,7 +1589,7 @@ draw_block: { // [33] mul8u::a#1 = draw_block::y#1 -- vbuxx=vbuaa tax // [34] call mul8u - // [74] phi from draw_block to mul8u [phi:draw_block->mul8u] -- call_phi_near + // [74] phi from draw_block to mul8u [phi:draw_block->mul8u] mul8u_from_draw_block: jsr mul8u // [35] mul8u::return#2 = mul8u::res#2 @@ -2147,7 +2147,7 @@ main: { .label x = $15 // init() // [1] call init - // [15] phi from main to init [phi:main->init] -- call_phi_near + // [15] phi from main to init [phi:main->init] jsr init // [2] phi from main to main::@1 [phi:main->main::@1] // [2] phi main::x#2 = 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 @@ -2199,7 +2199,7 @@ main: { // [11] draw_block::x#0 = main::x#2 -- vbuxx=vbuz1 ldx.z x // [12] draw_block::y#0 = main::y#2 - // [13] call draw_block -- call_phi_near + // [13] call draw_block jsr draw_block // main::@6 // for (byte y = 0; y < 9; y++) @@ -2213,7 +2213,7 @@ main: { init: { .const toD0181_return = (>(screen&$3fff)*4)|(>charset)/4&$f // init_sprites() - // [16] call init_sprites -- call_phi_near + // [16] call init_sprites jsr init_sprites // [17] phi from init to init::@2 [phi:init->init::@2] // init::@2 @@ -2222,7 +2222,7 @@ init: { // [66] phi from init::@2 to memset [phi:init::@2->memset] // [66] phi memset::c#4 = 0 [phi:init::@2->memset#0] -- vbuxx=vbuc1 ldx #0 - // [66] phi memset::str#3 = (void *)screen [phi:init::@2->memset#1] -- call_phi_near + // [66] phi memset::str#3 = (void *)screen [phi:init::@2->memset#1] -- pvoz1=pvoc1 lda #screen @@ -2235,7 +2235,7 @@ init: { // [66] phi from init::@3 to memset [phi:init::@3->memset] // [66] phi memset::c#4 = BLACK [phi:init::@3->memset#0] -- vbuxx=vbuc1 ldx #BLACK - // [66] phi memset::str#3 = (void *)colors [phi:init::@3->memset#1] -- call_phi_near + // [66] phi memset::str#3 = (void *)colors [phi:init::@3->memset#1] -- pvoz1=pvoc1 lda #colors @@ -2316,7 +2316,7 @@ draw_block: { // [33] mul8u::a#1 = draw_block::y#1 -- vbuxx=vbuaa tax // [34] call mul8u - // [74] phi from draw_block to mul8u [phi:draw_block->mul8u] -- call_phi_near + // [74] phi from draw_block to mul8u [phi:draw_block->mul8u] jsr mul8u // word z = mul8u(y,40) // [35] mul8u::return#2 = mul8u::res#2 diff --git a/src/test/ref/scrollbig-clobber.log b/src/test/ref/scrollbig-clobber.log index 2b1e27aaa..dc0c56401 100644 --- a/src/test/ref/scrollbig-clobber.log +++ b/src/test/ref/scrollbig-clobber.log @@ -325,7 +325,7 @@ main: { jmp __b1 // main::@1 __b1: - // [2] call next_char -- call_phi_near + // [2] call next_char jsr next_char // [3] next_char::return#0 = next_char::return#1 jmp __b2 @@ -481,7 +481,7 @@ main: { // main::@1 __b1: // next_char() - // [2] call next_char -- call_phi_near + // [2] call next_char jsr next_char // [3] next_char::return#0 = next_char::return#1 // main::@2 diff --git a/src/test/ref/semi-struct-1.log b/src/test/ref/semi-struct-1.log index cb6b90aba..68e2418bd 100644 --- a/src/test/ref/semi-struct-1.log +++ b/src/test/ref/semi-struct-1.log @@ -1524,7 +1524,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Initialize some points and print them main: { // [1] call init_points - // [5] phi from main to init_points [phi:main->init_points] -- call_phi_near + // [5] phi from main to init_points [phi:main->init_points] init_points_from_main: jsr init_points // [2] phi from main to main::@1 [phi:main->main::@1] @@ -1533,7 +1533,7 @@ main: { // main::@1 __b1: // [3] call print_points - // [18] phi from main::@1 to print_points [phi:main::@1->print_points] -- call_phi_near + // [18] phi from main::@1 to print_points [phi:main::@1->print_points] print_points_from___b1: jsr print_points jmp __breturn @@ -1624,7 +1624,7 @@ print_points: { .label point = 9 .label i = 8 // [19] call print_cls - // [37] phi from print_points to print_cls [phi:print_points->print_cls] -- call_phi_near + // [37] phi from print_points to print_cls [phi:print_points->print_cls] print_cls_from_print_points: jsr print_cls // [20] phi from print_points to print_points::@1 [phi:print_points->print_points::@1] @@ -1674,7 +1674,7 @@ print_points: { // [40] phi from print_points::@2 to print_uchar [phi:print_points::@2->print_uchar] print_uchar_from___b2: // [40] phi print_char_cursor#45 = print_char_cursor#48 [phi:print_points::@2->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_points::@2->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_points::@2->print_uchar#1] -- register_copy jsr print_uchar // [26] phi from print_points::@2 to print_points::@4 [phi:print_points::@2->print_points::@4] __b4_from___b2: @@ -1682,7 +1682,7 @@ print_points: { // print_points::@4 __b4: // [27] call print_str - // [48] phi from print_points::@4 to print_str [phi:print_points::@4->print_str] -- call_phi_near + // [48] phi from print_points::@4 to print_str [phi:print_points::@4->print_str] print_str_from___b4: jsr print_str // [28] phi from print_points::@4 to print_points::pointYpos1 [phi:print_points::@4->print_points::pointYpos1] @@ -1701,7 +1701,7 @@ print_points: { // [40] phi from print_points::@3 to print_uchar [phi:print_points::@3->print_uchar] print_uchar_from___b3: // [40] phi print_char_cursor#45 = print_char_cursor#30 [phi:print_points::@3->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_points::@3->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_points::@3->print_uchar#1] -- register_copy jsr print_uchar // [31] phi from print_points::@3 to print_points::@5 [phi:print_points::@3->print_points::@5] __b5_from___b3: @@ -1709,7 +1709,7 @@ print_points: { // print_points::@5 __b5: // [32] call print_ln - // [55] phi from print_points::@5 to print_ln [phi:print_points::@5->print_ln] -- call_phi_near + // [55] phi from print_points::@5 to print_ln [phi:print_points::@5->print_ln] print_ln_from___b5: jsr print_ln jmp __b6 @@ -1748,7 +1748,7 @@ print_points: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [38] call memset - // [60] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [60] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -1775,7 +1775,7 @@ print_uchar: { // [66] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [66] phi print_char_cursor#29 = print_char_cursor#45 [phi:print_uchar->print_char#0] -- register_copy - // [66] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [66] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1789,7 +1789,7 @@ print_uchar: { // [66] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [66] phi print_char_cursor#29 = print_char_cursor#30 [phi:print_uchar::@1->print_char#0] -- register_copy - // [66] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [66] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1831,7 +1831,7 @@ print_str: { // [66] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [66] phi print_char_cursor#29 = print_char_cursor#30 [phi:print_str::@2->print_char#0] -- register_copy - // [66] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [66] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -2178,13 +2178,13 @@ Score: 10419 main: { // init_points() // [1] call init_points - // [5] phi from main to init_points [phi:main->init_points] -- call_phi_near + // [5] phi from main to init_points [phi:main->init_points] jsr init_points // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // print_points() // [3] call print_points - // [18] phi from main::@1 to print_points [phi:main::@1->print_points] -- call_phi_near + // [18] phi from main::@1 to print_points [phi:main::@1->print_points] jsr print_points // main::@return // } @@ -2264,7 +2264,7 @@ print_points: { .label i = 8 // print_cls() // [19] call print_cls - // [37] phi from print_points to print_cls [phi:print_points->print_cls] -- call_phi_near + // [37] phi from print_points to print_cls [phi:print_points->print_cls] jsr print_cls // [20] phi from print_points to print_points::@1 [phi:print_points->print_points::@1] // [20] phi print_line_cursor#26 = print_screen#0 [phi:print_points->print_points::@1#0] -- pbuz1=pbuc1 @@ -2306,13 +2306,13 @@ print_points: { // [25] call print_uchar // [40] phi from print_points::@2 to print_uchar [phi:print_points::@2->print_uchar] // [40] phi print_char_cursor#45 = print_char_cursor#48 [phi:print_points::@2->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_points::@2->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_points::@2->print_uchar#1] -- register_copy jsr print_uchar // [26] phi from print_points::@2 to print_points::@4 [phi:print_points::@2->print_points::@4] // print_points::@4 // print_str(" ") // [27] call print_str - // [48] phi from print_points::@4 to print_str [phi:print_points::@4->print_str] -- call_phi_near + // [48] phi from print_points::@4 to print_str [phi:print_points::@4->print_str] jsr print_str // [28] phi from print_points::@4 to print_points::pointYpos1 [phi:print_points::@4->print_points::pointYpos1] // print_points::pointYpos1 @@ -2325,13 +2325,13 @@ print_points: { // [30] call print_uchar // [40] phi from print_points::@3 to print_uchar [phi:print_points::@3->print_uchar] // [40] phi print_char_cursor#45 = print_char_cursor#30 [phi:print_points::@3->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_points::@3->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_points::@3->print_uchar#1] -- register_copy jsr print_uchar // [31] phi from print_points::@3 to print_points::@5 [phi:print_points::@3->print_points::@5] // print_points::@5 // print_ln() // [32] call print_ln - // [55] phi from print_points::@5 to print_ln [phi:print_points::@5->print_ln] -- call_phi_near + // [55] phi from print_points::@5 to print_ln [phi:print_points::@5->print_ln] jsr print_ln // print_points::@6 // for(byte i: 0..NUM_POINTS-1) @@ -2367,7 +2367,7 @@ print_points: { print_cls: { // memset(print_screen, ' ', 1000) // [38] call memset - // [60] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [60] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -2393,7 +2393,7 @@ print_uchar: { // Table of hexadecimal digits // [66] phi from print_uchar to print_char [phi:print_uchar->print_char] // [66] phi print_char_cursor#29 = print_char_cursor#45 [phi:print_uchar->print_char#0] -- register_copy - // [66] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [66] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2406,7 +2406,7 @@ print_uchar: { // [46] call print_char // [66] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [66] phi print_char_cursor#29 = print_char_cursor#30 [phi:print_uchar::@1->print_char#0] -- register_copy - // [66] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [66] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } @@ -2445,7 +2445,7 @@ print_str: { // [53] call print_char // [66] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [66] phi print_char_cursor#29 = print_char_cursor#30 [phi:print_str::@2->print_char#0] -- register_copy - // [66] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [66] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); diff --git a/src/test/ref/sepa-optimize-problem-1.log b/src/test/ref/sepa-optimize-problem-1.log index 36fc38e6c..9af598909 100644 --- a/src/test/ref/sepa-optimize-problem-1.log +++ b/src/test/ref/sepa-optimize-problem-1.log @@ -408,7 +408,7 @@ __start: { // __start::@1 __b1: // [3] call main - // [9] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [9] phi from __start::@1 to main [phi:__start::@1->main] main_from___b1: jsr main jmp __breturn @@ -440,14 +440,14 @@ xputc: { } // main main: { - // [10] call _updatePotatoSprite -- call_phi_near + // [10] call _updatePotatoSprite jsr _updatePotatoSprite // [11] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: jmp __b1 // main::@1 __b1: - // [12] call _updateLupineSprite -- call_phi_near + // [12] call _updateLupineSprite jsr _updateLupineSprite jmp __breturn // main::@return @@ -474,7 +474,7 @@ _updatePotatoSprite: { sta.z _copyDigitToAnySprite.pointer lda #>SPR_POTATO_UI sta.z _copyDigitToAnySprite.pointer+1 - // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#0 [phi:_updatePotatoSprite->_copyDigitToAnySprite#1] -- call_phi_near + // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#0 [phi:_updatePotatoSprite->_copyDigitToAnySprite#1] -- register_copy jsr _copyDigitToAnySprite jmp __breturn // _updatePotatoSprite::@return @@ -501,7 +501,7 @@ _updateLupineSprite: { sta.z _copyDigitToAnySprite.pointer lda #>SPR_LUPINE_UI sta.z _copyDigitToAnySprite.pointer+1 - // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#1 [phi:_updateLupineSprite->_copyDigitToAnySprite#1] -- call_phi_near + // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#1 [phi:_updateLupineSprite->_copyDigitToAnySprite#1] -- register_copy jsr _copyDigitToAnySprite jmp __b1 // _updateLupineSprite::@1 @@ -516,7 +516,7 @@ _updateLupineSprite: { sta.z _copyDigitToAnySprite.pointer lda #>SPR_LUPINE_UI sta.z _copyDigitToAnySprite.pointer+1 - // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#2 [phi:_updateLupineSprite::@1->_copyDigitToAnySprite#1] -- call_phi_near + // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#2 [phi:_updateLupineSprite::@1->_copyDigitToAnySprite#1] -- register_copy jsr _copyDigitToAnySprite jmp __breturn // _updateLupineSprite::@return @@ -650,7 +650,7 @@ __start: { // [2] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] // __start::@1 // [3] call main - // [9] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [9] phi from __start::@1 to main [phi:__start::@1->main] jsr main // __start::@return // [4] return @@ -681,12 +681,12 @@ xputc: { // main main: { // _updatePotatoSprite() - // [10] call _updatePotatoSprite -- call_phi_near + // [10] call _updatePotatoSprite jsr _updatePotatoSprite // [11] phi from main to main::@1 [phi:main->main::@1] // main::@1 // _updateLupineSprite() - // [12] call _updateLupineSprite -- call_phi_near + // [12] call _updateLupineSprite jsr _updateLupineSprite // main::@return // } @@ -713,7 +713,7 @@ _updatePotatoSprite: { sta.z _copyDigitToAnySprite.pointer lda #>SPR_POTATO_UI sta.z _copyDigitToAnySprite.pointer+1 - // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#0 [phi:_updatePotatoSprite->_copyDigitToAnySprite#1] -- call_phi_near + // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#0 [phi:_updatePotatoSprite->_copyDigitToAnySprite#1] -- register_copy jsr _copyDigitToAnySprite // _updatePotatoSprite::@return // } @@ -740,7 +740,7 @@ _updateLupineSprite: { sta.z _copyDigitToAnySprite.pointer lda #>SPR_LUPINE_UI sta.z _copyDigitToAnySprite.pointer+1 - // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#1 [phi:_updateLupineSprite->_copyDigitToAnySprite#1] -- call_phi_near + // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#1 [phi:_updateLupineSprite->_copyDigitToAnySprite#1] -- register_copy jsr _copyDigitToAnySprite // _updateLupineSprite::@1 // _copyDigitToAnySprite(SPR_LUPINE_UI, num2str[1]) @@ -753,7 +753,7 @@ _updateLupineSprite: { sta.z _copyDigitToAnySprite.pointer lda #>SPR_LUPINE_UI sta.z _copyDigitToAnySprite.pointer+1 - // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#2 [phi:_updateLupineSprite::@1->_copyDigitToAnySprite#1] -- call_phi_near + // [28] phi _copyDigitToAnySprite::c#3 = _copyDigitToAnySprite::c#2 [phi:_updateLupineSprite::@1->_copyDigitToAnySprite#1] -- register_copy jsr _copyDigitToAnySprite // _updateLupineSprite::@return // } diff --git a/src/test/ref/sieve-min.log b/src/test/ref/sieve-min.log index 7101f227f..230bd0d2d 100644 --- a/src/test/ref/sieve-min.log +++ b/src/test/ref/sieve-min.log @@ -1009,7 +1009,7 @@ main: { .label __16 = 4 // [1] call memset // Fill sieve with zeros - // [25] phi from main to memset [phi:main->memset] -- call_phi_near + // [25] phi from main to memset [phi:main->memset] memset_from_main: jsr memset // [2] phi from main to main::@1 [phi:main->main::@1] @@ -1083,7 +1083,7 @@ main: { // main::@10 __b10: // [9] print_uint::w#0 = main::i#10 - // [10] call print_uint -- call_phi_near + // [10] call print_uint jsr print_uint // [11] phi from main::@10 to main::@12 [phi:main::@10->main::@12] __b12_from___b10: @@ -1094,7 +1094,7 @@ main: { // [36] phi from main::@12 to print_char [phi:main::@12->print_char] print_char_from___b12: // [36] phi print_char_cursor#20 = print_char_cursor#21 [phi:main::@12->print_char#0] -- register_copy - // [36] phi print_char::ch#3 = ' ' [phi:main::@12->print_char#1] -- call_phi_near + // [36] phi print_char::ch#3 = ' ' [phi:main::@12->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [13] phi from main::@12 main::@8 to main::@9 [phi:main::@12/main::@8->main::@9] @@ -1256,7 +1256,7 @@ print_uint: { // [40] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [40] phi print_char_cursor#28 = print_char_cursor#29 [phi:print_uint->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1267,7 +1267,7 @@ print_uint: { // [40] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [40] phi print_char_cursor#28 = print_char_cursor#21 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1311,7 +1311,7 @@ print_uchar: { // [36] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [36] phi print_char_cursor#20 = print_char_cursor#28 [phi:print_uchar->print_char#0] -- register_copy - // [36] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [36] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1325,7 +1325,7 @@ print_uchar: { // [36] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [36] phi print_char_cursor#20 = print_char_cursor#21 [phi:print_uchar::@1->print_char#0] -- register_copy - // [36] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [36] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1502,7 +1502,7 @@ main: { // memset(sieve, 0, COUNT) // [1] call memset // Fill sieve with zeros - // [25] phi from main to memset [phi:main->memset] -- call_phi_near + // [25] phi from main to memset [phi:main->memset] jsr memset // [2] phi from main to main::@1 [phi:main->main::@1] // [2] phi main::sieve_i#2 = sieve+2 [phi:main->main::@1#0] -- pbuz1=pbuc1 @@ -1573,7 +1573,7 @@ main: { // main::@10 // print_uint(i) // [9] print_uint::w#0 = main::i#10 - // [10] call print_uint -- call_phi_near + // [10] call print_uint jsr print_uint // [11] phi from main::@10 to main::@12 [phi:main::@10->main::@12] // main::@12 @@ -1581,7 +1581,7 @@ main: { // [12] call print_char // [36] phi from main::@12 to print_char [phi:main::@12->print_char] // [36] phi print_char_cursor#20 = print_char_cursor#21 [phi:main::@12->print_char#0] -- register_copy - // [36] phi print_char::ch#3 = ' ' [phi:main::@12->print_char#1] -- call_phi_near + // [36] phi print_char::ch#3 = ' ' [phi:main::@12->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [13] phi from main::@12 main::@8 to main::@9 [phi:main::@12/main::@8->main::@9] @@ -1741,7 +1741,7 @@ print_uint: { // [32] call print_uchar // [40] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [40] phi print_char_cursor#28 = print_char_cursor#29 [phi:print_uint->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -1750,7 +1750,7 @@ print_uint: { // [34] call print_uchar // [40] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [40] phi print_char_cursor#28 = print_char_cursor#21 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [40] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -1795,7 +1795,7 @@ print_uchar: { // Table of hexadecimal digits // [36] phi from print_uchar to print_char [phi:print_uchar->print_char] // [36] phi print_char_cursor#20 = print_char_cursor#28 [phi:print_uchar->print_char#0] -- register_copy - // [36] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [36] phi print_char::ch#3 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -1808,7 +1808,7 @@ print_uchar: { // [46] call print_char // [36] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [36] phi print_char_cursor#20 = print_char_cursor#21 [phi:print_uchar::@1->print_char#0] -- register_copy - // [36] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [36] phi print_char::ch#3 = 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/signed-char-comparison.log b/src/test/ref/signed-char-comparison.log index ed3c75220..ae96661aa 100644 --- a/src/test/ref/signed-char-comparison.log +++ b/src/test/ref/signed-char-comparison.log @@ -224,7 +224,7 @@ main: { // main::@1 __b1: // [2] debug::dy#0 = main::dy#2 - // [3] call debug -- call_phi_near + // [3] call debug jsr debug jmp __b2 // main::@2 @@ -328,7 +328,7 @@ main: { __b1: // debug(dy) // [2] debug::dy#0 = main::dy#2 - // [3] call debug -- call_phi_near + // [3] call debug jsr debug // main::@2 // for(signed char dy:-128..127) diff --git a/src/test/ref/signed-indexed-subtract.log b/src/test/ref/signed-indexed-subtract.log index b877c1b21..b7ebd34f7 100644 --- a/src/test/ref/signed-indexed-subtract.log +++ b/src/test/ref/signed-indexed-subtract.log @@ -1219,7 +1219,7 @@ main: { sub_from___b1: // [22] phi sub::s#3 = $80 [phi:main::@1->sub#0] -- vbuxx=vbuc1 ldx #$80 - // [22] phi sub::idx#3 = sub::idx#0 [phi:main::@1->sub#1] -- call_phi_near + // [22] phi sub::idx#3 = sub::idx#0 [phi:main::@1->sub#1] -- register_copy jsr sub jmp __b4 // main::@4 @@ -1231,7 +1231,7 @@ main: { sub_from___b4: // [22] phi sub::s#3 = $40 [phi:main::@4->sub#0] -- vbuxx=vbuc1 ldx #$40 - // [22] phi sub::idx#3 = sub::idx#1 [phi:main::@4->sub#1] -- call_phi_near + // [22] phi sub::idx#3 = sub::idx#1 [phi:main::@4->sub#1] -- register_copy jsr sub jmp __b5 // main::@5 @@ -1243,7 +1243,7 @@ main: { sub_from___b5: // [22] phi sub::s#3 = $40 [phi:main::@5->sub#0] -- vbuxx=vbuc1 ldx #$40 - // [22] phi sub::idx#3 = sub::idx#2 [phi:main::@5->sub#1] -- call_phi_near + // [22] phi sub::idx#3 = sub::idx#2 [phi:main::@5->sub#1] -- register_copy jsr sub jmp __b6 // main::@6 @@ -1259,7 +1259,7 @@ main: { // main::@2 __b2: // [11] call print_cls - // [26] phi from main::@2 to print_cls [phi:main::@2->print_cls] -- call_phi_near + // [26] phi from main::@2 to print_cls [phi:main::@2->print_cls] print_cls_from___b2: jsr print_cls // [12] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -1289,7 +1289,7 @@ main: { sta.z print_sint.w lda words+1,y sta.z print_sint.w+1 - // [15] call print_sint -- call_phi_near + // [15] call print_sint jsr print_sint // [16] phi from main::@3 to main::@7 [phi:main::@3->main::@7] __b7_from___b3: @@ -1297,7 +1297,7 @@ main: { // main::@7 __b7: // [17] call print_ln - // [39] phi from main::@7 to print_ln [phi:main::@7->print_ln] -- call_phi_near + // [39] phi from main::@7 to print_ln [phi:main::@7->print_ln] print_ln_from___b7: jsr print_ln jmp __b8 @@ -1353,7 +1353,7 @@ sub: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [27] call memset - // [44] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [44] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -1379,7 +1379,7 @@ print_sint: { // [50] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] print_char_from___b3: // [50] phi print_char_cursor#35 = print_char_cursor#51 [phi:print_sint::@3->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [32] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -1390,7 +1390,7 @@ print_sint: { // print_sint::@2 __b2: // [33] print_uint::w#0 = (unsigned int)print_sint::w#4 - // [34] call print_uint -- call_phi_near + // [34] call print_uint jsr print_uint jmp __breturn // print_sint::@return @@ -1406,7 +1406,7 @@ print_sint: { // [50] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] print_char_from___b1: // [50] phi print_char_cursor#35 = print_char_cursor#51 [phi:print_sint::@1->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char jmp __b4 @@ -1530,7 +1530,7 @@ print_uint: { // [55] call print_uchar // [59] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: - // [59] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [59] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1540,7 +1540,7 @@ print_uint: { // [57] call print_uchar // [59] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: - // [59] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [59] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1566,7 +1566,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#35 = print_char_cursor#12 [phi:print_uchar->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = print_char::ch#2 [phi:print_uchar->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = print_char::ch#2 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1580,7 +1580,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#35 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1797,7 +1797,7 @@ main: { // [22] phi from main::@1 to sub [phi:main::@1->sub] // [22] phi sub::s#3 = $80 [phi:main::@1->sub#0] -- vbuxx=vbuc1 ldx #$80 - // [22] phi sub::idx#3 = sub::idx#0 [phi:main::@1->sub#1] -- call_phi_near + // [22] phi sub::idx#3 = sub::idx#0 [phi:main::@1->sub#1] -- register_copy jsr sub // main::@4 // sub(i, $40) @@ -1807,7 +1807,7 @@ main: { // [22] phi from main::@4 to sub [phi:main::@4->sub] // [22] phi sub::s#3 = $40 [phi:main::@4->sub#0] -- vbuxx=vbuc1 ldx #$40 - // [22] phi sub::idx#3 = sub::idx#1 [phi:main::@4->sub#1] -- call_phi_near + // [22] phi sub::idx#3 = sub::idx#1 [phi:main::@4->sub#1] -- register_copy jsr sub // main::@5 // sub(i, $40) @@ -1817,7 +1817,7 @@ main: { // [22] phi from main::@5 to sub [phi:main::@5->sub] // [22] phi sub::s#3 = $40 [phi:main::@5->sub#0] -- vbuxx=vbuc1 ldx #$40 - // [22] phi sub::idx#3 = sub::idx#2 [phi:main::@5->sub#1] -- call_phi_near + // [22] phi sub::idx#3 = sub::idx#2 [phi:main::@5->sub#1] -- register_copy jsr sub // main::@6 // for(byte i: 0..8) @@ -1830,7 +1830,7 @@ main: { // main::@2 // print_cls() // [11] call print_cls - // [26] phi from main::@2 to print_cls [phi:main::@2->print_cls] -- call_phi_near + // [26] phi from main::@2 to print_cls [phi:main::@2->print_cls] jsr print_cls // [12] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // [12] phi print_line_cursor#21 = print_screen#0 [phi:main::@2->main::@3#0] -- pbuz1=pbuc1 @@ -1858,13 +1858,13 @@ main: { sta.z print_sint.w lda words+1,y sta.z print_sint.w+1 - // [15] call print_sint -- call_phi_near + // [15] call print_sint jsr print_sint // [16] phi from main::@3 to main::@7 [phi:main::@3->main::@7] // main::@7 // print_ln() // [17] call print_ln - // [39] phi from main::@7 to print_ln [phi:main::@7->print_ln] -- call_phi_near + // [39] phi from main::@7 to print_ln [phi:main::@7->print_ln] jsr print_ln // main::@8 // for(byte j: 0..8) @@ -1917,7 +1917,7 @@ sub: { print_cls: { // memset(print_screen, ' ', 1000) // [27] call memset - // [44] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [44] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -1939,7 +1939,7 @@ print_sint: { // [31] call print_char // [50] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] // [50] phi print_char_cursor#35 = print_char_cursor#51 [phi:print_sint::@3->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [32] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -1948,7 +1948,7 @@ print_sint: { __b2: // print_uint((unsigned int)w) // [33] print_uint::w#0 = (unsigned int)print_sint::w#4 - // [34] call print_uint -- call_phi_near + // [34] call print_uint jsr print_uint // print_sint::@return // } @@ -1961,7 +1961,7 @@ print_sint: { // [37] call print_char // [50] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] // [50] phi print_char_cursor#35 = print_char_cursor#51 [phi:print_sint::@1->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char // print_sint::@4 @@ -2082,7 +2082,7 @@ print_uint: { ldx.z w+1 // [55] call print_uchar // [59] phi from print_uint to print_uchar [phi:print_uint->print_uchar] - // [59] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [59] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -2090,7 +2090,7 @@ print_uint: { ldx.z w // [57] call print_uchar // [59] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] - // [59] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [59] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@return // } @@ -2116,7 +2116,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#35 = print_char_cursor#12 [phi:print_uchar->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = print_char::ch#2 [phi:print_uchar->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = print_char::ch#2 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2129,7 +2129,7 @@ print_uchar: { // [65] call print_char // [50] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [50] phi print_char_cursor#35 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [50] phi print_char::ch#4 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [50] phi print_char::ch#4 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/signed-words.log b/src/test/ref/signed-words.log index 3657fb28c..400f1a240 100644 --- a/src/test/ref/signed-words.log +++ b/src/test/ref/signed-words.log @@ -961,7 +961,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call init -- call_phi_near + // [1] call init jsr init // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -1011,7 +1011,7 @@ main: { jmp __b2 // main::@2 __b2: - // [5] call anim -- call_phi_near + // [5] call anim jsr anim jmp __b1_from___b2 } @@ -1443,7 +1443,7 @@ Score: 6364 // main main: { // init() - // [1] call init -- call_phi_near + // [1] call init jsr init // [2] phi from main to main::@1 [phi:main->main::@1] // [2] phi yvel_init#15 = $64 [phi:main->main::@1#0] -- vwsz1=vwsc1 @@ -1484,7 +1484,7 @@ main: { // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // anim() - // [5] call anim -- call_phi_near + // [5] call anim jsr anim jmp __b1 } diff --git a/src/test/ref/sinus-basic.log b/src/test/ref/sinus-basic.log index 5f8b3b043..a837a383f 100644 --- a/src/test/ref/sinus-basic.log +++ b/src/test/ref/sinus-basic.log @@ -1301,7 +1301,7 @@ main: { // [1] call setFAC // [34] phi from main to setFAC [phi:main->setFAC] setFAC_from_main: - // [34] phi setFAC::prepareMEM1_mem#0 = $4fb [phi:main->setFAC#0] -- call_phi_near + // [34] phi setFAC::prepareMEM1_mem#0 = $4fb [phi:main->setFAC#0] -- vwuz1=vwuc1 lda #<$4fb sta.z setFAC.prepareMEM1_mem lda #>$4fb @@ -1312,7 +1312,7 @@ main: { jmp __b2 // main::@2 __b2: - // [3] call divFACby10 -- call_phi_near + // [3] call divFACby10 jsr divFACby10 // [4] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -1322,7 +1322,7 @@ main: { // [5] call setMEMtoFAC // [43] phi from main::@3 to setMEMtoFAC [phi:main::@3->setMEMtoFAC] setMEMtoFAC_from___b3: - // [43] phi setMEMtoFAC::mem#2 = main::f_127 [phi:main::@3->setMEMtoFAC#0] -- call_phi_near + // [43] phi setMEMtoFAC::mem#2 = main::f_127 [phi:main::@3->setMEMtoFAC#0] -- pbuz1=pbuc1 lda #f_127 @@ -1354,7 +1354,7 @@ main: { // [8] call setFAC // [34] phi from main::@1 to setFAC [phi:main::@1->setFAC] setFAC_from___b1: - // [34] phi setFAC::prepareMEM1_mem#0 = setFAC::w#1 [phi:main::@1->setFAC#0] -- call_phi_near + // [34] phi setFAC::prepareMEM1_mem#0 = setFAC::w#1 [phi:main::@1->setFAC#0] -- register_copy jsr setFAC // [9] phi from main::@1 to main::@4 [phi:main::@1->main::@4] __b4_from___b1: @@ -1364,7 +1364,7 @@ main: { // [10] call mulFACbyMEM // [50] phi from main::@4 to mulFACbyMEM [phi:main::@4->mulFACbyMEM] mulFACbyMEM_from___b4: - // [50] phi mulFACbyMEM::mem#2 = main::f_2pi [phi:main::@4->mulFACbyMEM#0] -- call_phi_near + // [50] phi mulFACbyMEM::mem#2 = main::f_2pi [phi:main::@4->mulFACbyMEM#0] -- pbuz1=pbuc1 lda #f_2pi @@ -1378,7 +1378,7 @@ main: { // [12] call setMEMtoFAC // [43] phi from main::@5 to setMEMtoFAC [phi:main::@5->setMEMtoFAC] setMEMtoFAC_from___b5: - // [43] phi setMEMtoFAC::mem#2 = main::f_i [phi:main::@5->setMEMtoFAC#0] -- call_phi_near + // [43] phi setMEMtoFAC::mem#2 = main::f_i [phi:main::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 lda #f_i @@ -1392,7 +1392,7 @@ main: { // [14] call setFAC // [34] phi from main::@6 to setFAC [phi:main::@6->setFAC] setFAC_from___b6: - // [34] phi setFAC::prepareMEM1_mem#0 = $19 [phi:main::@6->setFAC#0] -- call_phi_near + // [34] phi setFAC::prepareMEM1_mem#0 = $19 [phi:main::@6->setFAC#0] -- vwuz1=vbuc1 lda #<$19 sta.z setFAC.prepareMEM1_mem lda #>$19 @@ -1404,7 +1404,7 @@ main: { // main::@7 __b7: // [16] call divMEMbyFAC - // [57] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC] -- call_phi_near + // [57] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC] divMEMbyFAC_from___b7: jsr divMEMbyFAC // [17] phi from main::@7 to main::@8 [phi:main::@7->main::@8] @@ -1412,7 +1412,7 @@ main: { jmp __b8 // main::@8 __b8: - // [18] call sinFAC -- call_phi_near + // [18] call sinFAC jsr sinFAC // [19] phi from main::@8 to main::@9 [phi:main::@8->main::@9] __b9_from___b8: @@ -1422,7 +1422,7 @@ main: { // [20] call mulFACbyMEM // [50] phi from main::@9 to mulFACbyMEM [phi:main::@9->mulFACbyMEM] mulFACbyMEM_from___b9: - // [50] phi mulFACbyMEM::mem#2 = main::f_127 [phi:main::@9->mulFACbyMEM#0] -- call_phi_near + // [50] phi mulFACbyMEM::mem#2 = main::f_127 [phi:main::@9->mulFACbyMEM#0] -- pbuz1=pbuc1 lda #f_127 @@ -1434,7 +1434,7 @@ main: { // main::@10 __b10: // [22] call addMEMtoFAC - // [64] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC] -- call_phi_near + // [64] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC] addMEMtoFAC_from___b10: jsr addMEMtoFAC // [23] phi from main::@10 to main::@11 [phi:main::@10->main::@11] @@ -1442,14 +1442,14 @@ main: { jmp __b11 // main::@11 __b11: - // [24] call getFAC -- call_phi_near + // [24] call getFAC jsr getFAC // [25] getFAC::return#2 = getFAC::return#0 jmp __b12 // main::@12 __b12: // [26] print_uint::w#0 = getFAC::return#2 - // [27] call print_uint -- call_phi_near + // [27] call print_uint jsr print_uint // [28] phi from main::@12 to main::@13 [phi:main::@12->main::@13] __b13_from___b12: @@ -1457,7 +1457,7 @@ main: { // main::@13 __b13: // [29] call print_ln - // [77] phi from main::@13 to print_ln [phi:main::@13->print_ln] -- call_phi_near + // [77] phi from main::@13 to print_ln [phi:main::@13->print_ln] print_ln_from___b13: jsr print_ln jmp __b14 @@ -1702,7 +1702,7 @@ print_uint: { // [82] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [82] phi print_char_cursor#33 = print_char_cursor#34 [phi:print_uint->print_uchar#0] -- register_copy - // [82] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [82] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1713,7 +1713,7 @@ print_uint: { // [82] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [82] phi print_char_cursor#33 = print_char_cursor#25 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [82] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [82] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1772,7 +1772,7 @@ print_uchar: { // [90] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [90] phi print_char_cursor#24 = print_char_cursor#33 [phi:print_uchar->print_char#0] -- register_copy - // [90] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [90] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1786,7 +1786,7 @@ print_uchar: { // [90] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [90] phi print_char_cursor#24 = print_char_cursor#25 [phi:print_uchar::@1->print_char#0] -- register_copy - // [90] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [90] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -2062,7 +2062,7 @@ main: { // setFAC(1275) // [1] call setFAC // [34] phi from main to setFAC [phi:main->setFAC] - // [34] phi setFAC::prepareMEM1_mem#0 = $4fb [phi:main->setFAC#0] -- call_phi_near + // [34] phi setFAC::prepareMEM1_mem#0 = $4fb [phi:main->setFAC#0] -- vwuz1=vwuc1 lda #<$4fb sta.z setFAC.prepareMEM1_mem lda #>$4fb @@ -2071,14 +2071,14 @@ main: { // [2] phi from main to main::@2 [phi:main->main::@2] // main::@2 // divFACby10() - // [3] call divFACby10 -- call_phi_near + // [3] call divFACby10 jsr divFACby10 // [4] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // setMEMtoFAC(f_127) // [5] call setMEMtoFAC // [43] phi from main::@3 to setMEMtoFAC [phi:main::@3->setMEMtoFAC] - // [43] phi setMEMtoFAC::mem#2 = main::f_127 [phi:main::@3->setMEMtoFAC#0] -- call_phi_near + // [43] phi setMEMtoFAC::mem#2 = main::f_127 [phi:main::@3->setMEMtoFAC#0] -- pbuz1=pbuc1 lda #f_127 @@ -2108,14 +2108,14 @@ main: { sta.z setFAC.w+1 // [8] call setFAC // [34] phi from main::@1 to setFAC [phi:main::@1->setFAC] - // [34] phi setFAC::prepareMEM1_mem#0 = setFAC::w#1 [phi:main::@1->setFAC#0] -- call_phi_near + // [34] phi setFAC::prepareMEM1_mem#0 = setFAC::w#1 [phi:main::@1->setFAC#0] -- register_copy jsr setFAC // [9] phi from main::@1 to main::@4 [phi:main::@1->main::@4] // main::@4 // mulFACbyMEM(f_2pi) // [10] call mulFACbyMEM // [50] phi from main::@4 to mulFACbyMEM [phi:main::@4->mulFACbyMEM] - // [50] phi mulFACbyMEM::mem#2 = main::f_2pi [phi:main::@4->mulFACbyMEM#0] -- call_phi_near + // [50] phi mulFACbyMEM::mem#2 = main::f_2pi [phi:main::@4->mulFACbyMEM#0] -- pbuz1=pbuc1 lda #f_2pi @@ -2126,7 +2126,7 @@ main: { // setMEMtoFAC(f_i) // [12] call setMEMtoFAC // [43] phi from main::@5 to setMEMtoFAC [phi:main::@5->setMEMtoFAC] - // [43] phi setMEMtoFAC::mem#2 = main::f_i [phi:main::@5->setMEMtoFAC#0] -- call_phi_near + // [43] phi setMEMtoFAC::mem#2 = main::f_i [phi:main::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 lda #f_i @@ -2137,7 +2137,7 @@ main: { // setFAC(25) // [14] call setFAC // [34] phi from main::@6 to setFAC [phi:main::@6->setFAC] - // [34] phi setFAC::prepareMEM1_mem#0 = $19 [phi:main::@6->setFAC#0] -- call_phi_near + // [34] phi setFAC::prepareMEM1_mem#0 = $19 [phi:main::@6->setFAC#0] -- vwuz1=vbuc1 lda #<$19 sta.z setFAC.prepareMEM1_mem lda #>$19 @@ -2147,19 +2147,19 @@ main: { // main::@7 // divMEMbyFAC(f_i) // [16] call divMEMbyFAC - // [57] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC] -- call_phi_near + // [57] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC] jsr divMEMbyFAC // [17] phi from main::@7 to main::@8 [phi:main::@7->main::@8] // main::@8 // sinFAC() - // [18] call sinFAC -- call_phi_near + // [18] call sinFAC jsr sinFAC // [19] phi from main::@8 to main::@9 [phi:main::@8->main::@9] // main::@9 // mulFACbyMEM(f_127) // [20] call mulFACbyMEM // [50] phi from main::@9 to mulFACbyMEM [phi:main::@9->mulFACbyMEM] - // [50] phi mulFACbyMEM::mem#2 = main::f_127 [phi:main::@9->mulFACbyMEM#0] -- call_phi_near + // [50] phi mulFACbyMEM::mem#2 = main::f_127 [phi:main::@9->mulFACbyMEM#0] -- pbuz1=pbuc1 lda #f_127 @@ -2169,24 +2169,24 @@ main: { // main::@10 // addMEMtoFAC(f_127) // [22] call addMEMtoFAC - // [64] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC] -- call_phi_near + // [64] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC] jsr addMEMtoFAC // [23] phi from main::@10 to main::@11 [phi:main::@10->main::@11] // main::@11 // getFAC() - // [24] call getFAC -- call_phi_near + // [24] call getFAC jsr getFAC // [25] getFAC::return#2 = getFAC::return#0 // main::@12 // print_uint(getFAC()) // [26] print_uint::w#0 = getFAC::return#2 - // [27] call print_uint -- call_phi_near + // [27] call print_uint jsr print_uint // [28] phi from main::@12 to main::@13 [phi:main::@12->main::@13] // main::@13 // print_ln() // [29] call print_ln - // [77] phi from main::@13 to print_ln [phi:main::@13->print_ln] -- call_phi_near + // [77] phi from main::@13 to print_ln [phi:main::@13->print_ln] jsr print_ln // main::@14 // for(byte i : 1..25) @@ -2422,7 +2422,7 @@ print_uint: { // [73] call print_uchar // [82] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [82] phi print_char_cursor#33 = print_char_cursor#34 [phi:print_uint->print_uchar#0] -- register_copy - // [82] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [82] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -2431,7 +2431,7 @@ print_uint: { // [75] call print_uchar // [82] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [82] phi print_char_cursor#33 = print_char_cursor#25 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [82] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [82] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -2488,7 +2488,7 @@ print_uchar: { // Table of hexadecimal digits // [90] phi from print_uchar to print_char [phi:print_uchar->print_char] // [90] phi print_char_cursor#24 = print_char_cursor#33 [phi:print_uchar->print_char#0] -- register_copy - // [90] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [90] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2501,7 +2501,7 @@ print_uchar: { // [88] call print_char // [90] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [90] phi print_char_cursor#24 = print_char_cursor#25 [phi:print_uchar::@1->print_char#0] -- register_copy - // [90] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [90] phi print_char::ch#2 = 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/sinusgen16.log b/src/test/ref/sinusgen16.log index 3136a40cd..03d6776c4 100644 --- a/src/test/ref/sinusgen16.log +++ b/src/test/ref/sinusgen16.log @@ -2907,7 +2907,7 @@ main: { .label sw = $1a .label st1 = $24 // [1] call sin16s_gen - // [17] phi from main to sin16s_gen [phi:main->sin16s_gen] -- call_phi_near + // [17] phi from main to sin16s_gen [phi:main->sin16s_gen] sin16s_gen_from_main: jsr sin16s_gen // [2] phi from main to main::@5 [phi:main->main::@5] @@ -2916,7 +2916,7 @@ main: { // main::@5 __b5: // [3] call print_cls - // [32] phi from main::@5 to print_cls [phi:main::@5->print_cls] -- call_phi_near + // [32] phi from main::@5 to print_cls [phi:main::@5->print_cls] print_cls_from___b5: jsr print_cls // [4] phi from main::@5 to main::@1 [phi:main::@5->main::@1] @@ -2969,7 +2969,7 @@ main: { // [35] phi from main::@4 to print_str [phi:main::@4->print_str] print_str_from___b4: // [35] phi print_char_cursor#58 = print_char_cursor#20 [phi:main::@4->print_str#0] -- register_copy - // [35] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- call_phi_near + // [35] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -2983,7 +2983,7 @@ main: { // main::@3 __b3: // [12] print_sint::w#1 = main::sw#0 - // [13] call print_sint -- call_phi_near + // [13] call print_sint jsr print_sint // [14] phi from main::@3 to main::@6 [phi:main::@3->main::@6] __b6_from___b3: @@ -2994,7 +2994,7 @@ main: { // [35] phi from main::@6 to print_str [phi:main::@6->print_str] print_str_from___b6: // [35] phi print_char_cursor#58 = print_char_cursor#12 [phi:main::@6->print_str#0] -- register_copy - // [35] phi print_str::str#6 = main::str [phi:main::@6->print_str#1] -- call_phi_near + // [35] phi print_str::str#6 = main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 lda #str @@ -3039,7 +3039,7 @@ sin16s_gen: { .label i = $12 // [18] call div32u16u // u[4.28] step = PI*2/wavelength - // [52] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u] -- call_phi_near + // [52] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u] div32u16u_from_sin16s_gen: jsr div32u16u // [19] div32u16u::return#0 = div32u16u::return#1 @@ -3097,7 +3097,7 @@ sin16s_gen: { sta.z sin16s.x+2 lda.z x+3 sta.z sin16s.x+3 - // [25] call sin16s -- call_phi_near + // [25] call sin16s jsr sin16s // [26] sin16s::return#0 = sin16s::return#1 jmp __b4 @@ -3149,7 +3149,7 @@ sin16s_gen: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [33] call memset - // [102] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [102] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -3190,7 +3190,7 @@ print_str: { // [108] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [108] phi print_char_cursor#36 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [108] 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 @@ -3219,7 +3219,7 @@ print_sint: { // [108] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] print_char_from___b3: // [108] phi print_char_cursor#36 = print_char_cursor#54 [phi:print_sint::@3->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [108] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [45] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -3230,7 +3230,7 @@ print_sint: { // print_sint::@2 __b2: // [46] print_uint::w#0 = (unsigned int)print_sint::w#4 - // [47] call print_uint -- call_phi_near + // [47] call print_uint jsr print_uint jmp __breturn // print_sint::@return @@ -3246,7 +3246,7 @@ print_sint: { // [108] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] print_char_from___b1: // [108] phi print_char_cursor#36 = print_char_cursor#54 [phi:print_sint::@1->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [108] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char jmp __b4 @@ -3278,7 +3278,7 @@ div32u16u: { sta.z divr16u.dividend lda #>PI2_u4f28>>$10 sta.z divr16u.dividend+1 - // [117] phi divr16u::rem#10 = 0 [phi:div32u16u->divr16u#1] -- call_phi_near + // [117] phi divr16u::rem#10 = 0 [phi:div32u16u->divr16u#1] -- vwuz1=vbuc1 lda #<0 sta.z divr16u.rem lda #>0 @@ -3302,7 +3302,7 @@ div32u16u: { sta.z divr16u.dividend lda #>PI2_u4f28&$ffff sta.z divr16u.dividend+1 - // [117] phi divr16u::rem#10 = divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- call_phi_near + // [117] phi divr16u::rem#10 = divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy jsr divr16u // [58] divr16u::return#3 = divr16u::return#0 jmp __b2 @@ -3475,7 +3475,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 0 [phi:sin16s::@2->mulu16_sel#0] -- vbuxx=vbuc1 ldx #0 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#0 [phi:sin16s::@2->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy jsr mulu16_sel // [73] mulu16_sel::return#0 = mulu16_sel::return#12 jmp __b7 @@ -3499,7 +3499,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 ldx #1 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy jsr mulu16_sel // [78] mulu16_sel::return#1 = mulu16_sel::return#12 -- vwuz1=vwuz2 lda.z mulu16_sel.return @@ -3522,7 +3522,7 @@ sin16s: { sta.z mulu16_sel.v2 lda #>$10000/6 sta.z mulu16_sel.v2+1 - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy jsr mulu16_sel // [82] mulu16_sel::return#2 = mulu16_sel::return#12 jmp __b9 @@ -3551,7 +3551,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 ldx #0 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy jsr mulu16_sel // [88] mulu16_sel::return#10 = mulu16_sel::return#12 -- vwuz1=vwuz2 lda.z mulu16_sel.return @@ -3575,7 +3575,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 ldx #0 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy jsr mulu16_sel // [93] mulu16_sel::return#11 = mulu16_sel::return#12 jmp __b11 @@ -3706,7 +3706,7 @@ print_uint: { // [113] call print_uchar // [144] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: - // [144] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [144] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -3716,7 +3716,7 @@ print_uint: { // [115] call print_uchar // [144] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: - // [144] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [144] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -3851,7 +3851,7 @@ mulu16_sel: { lda.z v1+1 sta.z mul16u.a+1 // [137] mul16u::b#0 = mulu16_sel::v2#5 - // [138] call mul16u -- call_phi_near + // [138] call mul16u jsr mul16u // [139] mul16u::return#0 = mul16u::res#2 jmp __b1 @@ -3898,7 +3898,7 @@ print_uchar: { // [108] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [108] phi print_char_cursor#36 = print_char_cursor#12 [phi:print_uchar->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar->print_char#1] -- call_phi_near + // [108] 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 @@ -3912,7 +3912,7 @@ print_uchar: { // [108] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [108] phi print_char_cursor#36 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [108] 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 @@ -4468,13 +4468,13 @@ main: { .label st1 = $24 // sin16s_gen(sintab1, wavelength) // [1] call sin16s_gen - // [17] phi from main to sin16s_gen [phi:main->sin16s_gen] -- call_phi_near + // [17] phi from main to sin16s_gen [phi:main->sin16s_gen] jsr sin16s_gen // [2] phi from main to main::@5 [phi:main->main::@5] // main::@5 // print_cls() // [3] call print_cls - // [32] phi from main::@5 to print_cls [phi:main::@5->print_cls] -- call_phi_near + // [32] phi from main::@5 to print_cls [phi:main::@5->print_cls] jsr print_cls // [4] phi from main::@5 to main::@1 [phi:main::@5->main::@1] // [4] phi print_char_cursor#20 = print_screen#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 @@ -4522,7 +4522,7 @@ main: { // [10] call print_str // [35] phi from main::@4 to print_str [phi:main::@4->print_str] // [35] phi print_char_cursor#58 = print_char_cursor#20 [phi:main::@4->print_str#0] -- register_copy - // [35] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- call_phi_near + // [35] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -4534,7 +4534,7 @@ main: { __b3: // print_sint(sw) // [12] print_sint::w#1 = main::sw#0 - // [13] call print_sint -- call_phi_near + // [13] call print_sint jsr print_sint // [14] phi from main::@3 to main::@6 [phi:main::@3->main::@6] // main::@6 @@ -4542,7 +4542,7 @@ main: { // [15] call print_str // [35] phi from main::@6 to print_str [phi:main::@6->print_str] // [35] phi print_char_cursor#58 = print_char_cursor#12 [phi:main::@6->print_str#0] -- register_copy - // [35] phi print_str::str#6 = main::str [phi:main::@6->print_str#1] -- call_phi_near + // [35] phi print_str::str#6 = main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 lda #str @@ -4586,7 +4586,7 @@ sin16s_gen: { // unsigned long step = div32u16u(PI2_u4f28, wavelength) // [18] call div32u16u // u[4.28] step = PI*2/wavelength - // [52] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u] -- call_phi_near + // [52] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u] jsr div32u16u // unsigned long step = div32u16u(PI2_u4f28, wavelength) // [19] div32u16u::return#0 = div32u16u::return#1 @@ -4639,7 +4639,7 @@ sin16s_gen: { sta.z sin16s.x+2 lda.z x+3 sta.z sin16s.x+3 - // [25] call sin16s -- call_phi_near + // [25] call sin16s jsr sin16s // [26] sin16s::return#0 = sin16s::return#1 // sin16s_gen::@4 @@ -4693,7 +4693,7 @@ sin16s_gen: { print_cls: { // memset(print_screen, ' ', 1000) // [33] call memset - // [102] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [102] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -4729,7 +4729,7 @@ print_str: { // [40] call print_char // [108] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [108] phi print_char_cursor#36 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [108] 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++)); @@ -4755,7 +4755,7 @@ print_sint: { // [44] call print_char // [108] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] // [108] phi print_char_cursor#36 = print_char_cursor#54 [phi:print_sint::@3->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [108] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [45] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -4764,7 +4764,7 @@ print_sint: { __b2: // print_uint((unsigned int)w) // [46] print_uint::w#0 = (unsigned int)print_sint::w#4 - // [47] call print_uint -- call_phi_near + // [47] call print_uint jsr print_uint // print_sint::@return // } @@ -4777,7 +4777,7 @@ print_sint: { // [50] call print_char // [108] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] // [108] phi print_char_cursor#36 = print_char_cursor#54 [phi:print_sint::@1->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [108] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char // print_sint::@4 @@ -4808,7 +4808,7 @@ div32u16u: { sta.z divr16u.dividend lda #>PI2_u4f28>>$10 sta.z divr16u.dividend+1 - // [117] phi divr16u::rem#10 = 0 [phi:div32u16u->divr16u#1] -- call_phi_near + // [117] phi divr16u::rem#10 = 0 [phi:div32u16u->divr16u#1] -- vwuz1=vbuc1 lda #<0 sta.z divr16u.rem sta.z divr16u.rem+1 @@ -4830,7 +4830,7 @@ div32u16u: { sta.z divr16u.dividend lda #>PI2_u4f28&$ffff sta.z divr16u.dividend+1 - // [117] phi divr16u::rem#10 = divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- call_phi_near + // [117] phi divr16u::rem#10 = divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy jsr divr16u // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u) // [58] divr16u::return#3 = divr16u::return#0 @@ -4999,7 +4999,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 0 [phi:sin16s::@2->mulu16_sel#0] -- vbuxx=vbuc1 ldx #0 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#0 [phi:sin16s::@2->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy jsr mulu16_sel // unsigned int x2 = mulu16_sel(x1, x1, 0) // [73] mulu16_sel::return#0 = mulu16_sel::return#12 @@ -5022,7 +5022,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 ldx #1 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy jsr mulu16_sel // unsigned int x3 = mulu16_sel(x2, x1, 1) // [78] mulu16_sel::return#1 = mulu16_sel::return#12 -- vwuz1=vwuz2 @@ -5044,7 +5044,7 @@ sin16s: { sta.z mulu16_sel.v2 lda #>$10000/6 sta.z mulu16_sel.v2+1 - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy jsr mulu16_sel // unsigned int x3_6 = mulu16_sel(x3, $10000/6, 1) // [82] mulu16_sel::return#2 = mulu16_sel::return#12 @@ -5073,7 +5073,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 ldx #0 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy jsr mulu16_sel // unsigned int x4 = mulu16_sel(x3, x1, 0) // [88] mulu16_sel::return#10 = mulu16_sel::return#12 -- vwuz1=vwuz2 @@ -5096,7 +5096,7 @@ sin16s: { // [135] phi mulu16_sel::select#5 = 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 ldx #0 // [135] phi mulu16_sel::v2#5 = mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy - // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- call_phi_near + // [135] phi mulu16_sel::v1#5 = mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy jsr mulu16_sel // unsigned int x5 = mulu16_sel(x4, x1, 0) // [93] mulu16_sel::return#11 = mulu16_sel::return#12 @@ -5222,7 +5222,7 @@ print_uint: { ldx.z w+1 // [113] call print_uchar // [144] phi from print_uint to print_uchar [phi:print_uint->print_uchar] - // [144] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [144] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -5230,7 +5230,7 @@ print_uint: { ldx.z w // [115] call print_uchar // [144] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] - // [144] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [144] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@return // } @@ -5359,7 +5359,7 @@ mulu16_sel: { lda.z v1+1 sta.z mul16u.a+1 // [137] mul16u::b#0 = mulu16_sel::v2#5 - // [138] call mul16u -- call_phi_near + // [138] call mul16u jsr mul16u // [139] mul16u::return#0 = mul16u::res#2 // mulu16_sel::@1 @@ -5406,7 +5406,7 @@ print_uchar: { // Table of hexadecimal digits // [108] phi from print_uchar to print_char [phi:print_uchar->print_char] // [108] phi print_char_cursor#36 = print_char_cursor#12 [phi:print_uchar->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar->print_char#1] -- call_phi_near + // [108] 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 @@ -5419,7 +5419,7 @@ print_uchar: { // [150] call print_char // [108] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [108] phi print_char_cursor#36 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [108] phi print_char::ch#5 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [108] 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/sqr-delta.log b/src/test/ref/sqr-delta.log index a1c585f80..8e9d5d606 100644 --- a/src/test/ref/sqr-delta.log +++ b/src/test/ref/sqr-delta.log @@ -307,7 +307,7 @@ ASSEMBLER BEFORE OPTIMIZATION main: { .label __0 = $a // [1] call ifunc - // [6] phi from main to ifunc [phi:main->ifunc] -- call_phi_near + // [6] phi from main to ifunc [phi:main->ifunc] ifunc_from_main: jsr ifunc // [2] ifunc::return#2 = ifunc::return#0 @@ -517,7 +517,7 @@ main: { .label __0 = $a // ifunc(8) // [1] call ifunc - // [6] phi from main to ifunc [phi:main->ifunc] -- call_phi_near + // [6] phi from main to ifunc [phi:main->ifunc] jsr ifunc // ifunc(8) // [2] ifunc::return#2 = ifunc::return#0 diff --git a/src/test/ref/stack-relative-addressing.log b/src/test/ref/stack-relative-addressing.log index 997b6394f..086bef0c7 100644 --- a/src/test/ref/stack-relative-addressing.log +++ b/src/test/ref/stack-relative-addressing.log @@ -123,7 +123,7 @@ main: { pha lda #'3' pha - // [1] call peek_stack -- call_phi_near + // [1] call peek_stack // Then call a function jsr peek_stack jmp __b1 @@ -209,7 +209,7 @@ main: { lda #'3' pha // peek_stack() - // [1] call peek_stack -- call_phi_near + // [1] call peek_stack // Then call a function jsr peek_stack // main::@1 diff --git a/src/test/ref/stars-2.log b/src/test/ref/stars-2.log index 41f56edd7..ef8de9f69 100644 --- a/src/test/ref/stars-2.log +++ b/src/test/ref/stars-2.log @@ -3903,7 +3903,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: @@ -3911,7 +3911,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 @@ -3947,7 +3947,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 @@ -3988,7 +3988,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [23] call cputln -- call_phi_near + // [23] call cputln jsr cputln jmp __breturn // cputc::@return @@ -4000,7 +4000,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln jmp __breturn } @@ -4008,7 +4008,7 @@ cputc: { main: { .label i = $17 // [28] call clrscr - // [61] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [61] phi from main to clrscr [phi:main->clrscr] clrscr_from_main: jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] @@ -4036,7 +4036,7 @@ main: { // [33] call printf_uchar // [77] phi from main::@2 to printf_uchar [phi:main::@2->printf_uchar] printf_uchar_from___b2: - // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#0 [phi:main::@2->printf_uchar#0] -- call_phi_near + // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#0 [phi:main::@2->printf_uchar#0] -- register_copy jsr printf_uchar // [34] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -4051,7 +4051,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [84] phi printf_str::s#5 = main::s [phi:main::@3->printf_str#1] -- call_phi_near + // [84] phi printf_str::s#5 = main::s [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -4066,7 +4066,7 @@ main: { // [37] call printf_uchar // [77] phi from main::@4 to printf_uchar [phi:main::@4->printf_uchar] printf_uchar_from___b4: - // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#1 [phi:main::@4->printf_uchar#0] -- call_phi_near + // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#1 [phi:main::@4->printf_uchar#0] -- register_copy jsr printf_uchar // [38] phi from main::@4 to main::@5 [phi:main::@4->main::@5] __b5_from___b4: @@ -4081,7 +4081,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [84] phi printf_str::s#5 = main::s1 [phi:main::@5->printf_str#1] -- call_phi_near + // [84] phi printf_str::s#5 = main::s1 [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -4226,7 +4226,7 @@ cputln: { sta.z conio_cursor_x // [58] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [59] call cscroll -- call_phi_near + // [59] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -4349,7 +4349,7 @@ printf_uchar: { // [79] uctoa::value#1 = printf_uchar::uvalue#2 // [80] call uctoa // Format number into buffer - // [106] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] -- call_phi_near + // [106] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] uctoa_from___b1: jsr uctoa jmp __b2 @@ -4359,7 +4359,7 @@ printf_uchar: { lda printf_buffer // [82] call printf_number_buffer // Print using format - // [125] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] -- call_phi_near + // [125] 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 @@ -4430,7 +4430,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [133] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [133] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -4449,7 +4449,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [133] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [133] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -4465,7 +4465,7 @@ cscroll: { memset_from___b3: // [143] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [143] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [143] 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 @@ -4481,7 +4481,7 @@ cscroll: { memset_from___b4: // [143] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [143] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [143] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -4606,7 +4606,7 @@ uctoa: { // [119] uctoa_append::value#0 = uctoa::value#2 // [120] uctoa_append::sub#0 = uctoa::digit_value#0 // [121] call uctoa_append - // [151] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [151] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] uctoa_append_from___b5: jsr uctoa_append // [122] uctoa_append::return#0 = uctoa_append::value#2 @@ -4664,7 +4664,7 @@ printf_number_buffer: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [84] phi printf_str::s#5 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near + // [84] phi printf_str::s#5 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- pbuz1=pbuc1 lda #buffer_digits @@ -5278,12 +5278,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 @@ -5312,7 +5312,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 // } @@ -5351,7 +5351,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: @@ -5362,7 +5362,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln rts } @@ -5371,7 +5371,7 @@ main: { .label i = $17 // clrscr() // [28] call clrscr - // [61] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [61] phi from main to clrscr [phi:main->clrscr] jsr clrscr // [29] phi from main to main::@1 [phi:main->main::@1] // [29] phi main::i#2 = 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 @@ -5396,7 +5396,7 @@ main: { ldx stars,y // [33] call printf_uchar // [77] phi from main::@2 to printf_uchar [phi:main::@2->printf_uchar] - // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#0 [phi:main::@2->printf_uchar#0] -- call_phi_near + // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#0 [phi:main::@2->printf_uchar#0] -- register_copy jsr printf_uchar // [34] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 @@ -5408,7 +5408,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [84] phi printf_str::s#5 = main::s [phi:main::@3->printf_str#1] -- call_phi_near + // [84] phi printf_str::s#5 = main::s [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -5421,7 +5421,7 @@ main: { ldx stars+5,y // [37] call printf_uchar // [77] phi from main::@4 to printf_uchar [phi:main::@4->printf_uchar] - // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#1 [phi:main::@4->printf_uchar#0] -- call_phi_near + // [77] phi printf_uchar::uvalue#2 = printf_uchar::uvalue#1 [phi:main::@4->printf_uchar#0] -- register_copy jsr printf_uchar // [38] phi from main::@4 to main::@5 [phi:main::@4->main::@5] // main::@5 @@ -5433,7 +5433,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [84] phi printf_str::s#5 = main::s1 [phi:main::@5->printf_str#1] -- call_phi_near + // [84] phi printf_str::s#5 = main::s1 [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -5579,7 +5579,7 @@ cputln: { // [58] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [59] call cscroll -- call_phi_near + // [59] call cscroll jsr cscroll // cputln::@return // } @@ -5702,7 +5702,7 @@ printf_uchar: { // [79] uctoa::value#1 = printf_uchar::uvalue#2 // [80] call uctoa // Format number into buffer - // [106] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] -- call_phi_near + // [106] phi from printf_uchar::@1 to uctoa [phi:printf_uchar::@1->uctoa] jsr uctoa // printf_uchar::@2 // printf_number_buffer(putc, printf_buffer, format) @@ -5710,7 +5710,7 @@ printf_uchar: { lda printf_buffer // [82] call printf_number_buffer // Print using format - // [125] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] -- call_phi_near + // [125] phi from printf_uchar::@2 to printf_number_buffer [phi:printf_uchar::@2->printf_number_buffer] jsr printf_number_buffer // printf_uchar::@return // } @@ -5775,7 +5775,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [133] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [133] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -5791,7 +5791,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [133] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [133] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -5804,7 +5804,7 @@ cscroll: { // [143] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [143] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [143] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [143] 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 @@ -5817,7 +5817,7 @@ cscroll: { // [143] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [143] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [143] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [143] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -5940,7 +5940,7 @@ uctoa: { // [119] uctoa_append::value#0 = uctoa::value#2 // [120] uctoa_append::sub#0 = uctoa::digit_value#0 // [121] call uctoa_append - // [151] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [151] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] jsr uctoa_append // uctoa_append(buffer++, value, digit_value) // [122] uctoa_append::return#0 = uctoa_append::value#2 @@ -5992,7 +5992,7 @@ printf_number_buffer: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [84] phi printf_str::s#5 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near + // [84] phi printf_str::s#5 = 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/static-init-code-0.log b/src/test/ref/static-init-code-0.log index 1f7fcb3d1..30a96a03e 100644 --- a/src/test/ref/static-init-code-0.log +++ b/src/test/ref/static-init-code-0.log @@ -161,7 +161,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [4] call main -- call_phi_near + // [4] call main jsr main jmp __breturn // __start::@return @@ -246,7 +246,7 @@ __start: { sta.z c2 // [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/strcmp-0.log b/src/test/ref/strcmp-0.log index 9481ebe15..3f97576c7 100644 --- a/src/test/ref/strcmp-0.log +++ b/src/test/ref/strcmp-0.log @@ -6231,7 +6231,7 @@ __start: { // [5] conio_textcolor = LIGHT_BLUE -- vbuz1=vbuc1 lda #LIGHT_BLUE sta.z conio_textcolor - // [6] call conio_c64_init -- call_phi_near + // [6] call conio_c64_init jsr conio_c64_init // [7] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] __b1_from___init1: @@ -6239,7 +6239,7 @@ __start: { // __start::@1 __b1: // [8] call main - // [28] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [28] phi from __start::@1 to main [phi:__start::@1->main] main_from___b1: jsr main jmp __breturn @@ -6275,7 +6275,7 @@ conio_c64_init: { // conio_c64_init::@1 __b1: // [14] gotoxy::y#2 = conio_c64_init::line#2 - // [15] call gotoxy -- call_phi_near + // [15] call gotoxy jsr gotoxy jmp __breturn // conio_c64_init::@return @@ -6316,7 +6316,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [24] call cputln -- call_phi_near + // [24] call cputln jsr cputln jmp __breturn // cputc::@return @@ -6328,7 +6328,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [27] call cputln -- call_phi_near + // [27] call cputln jsr cputln jmp __breturn } @@ -6342,7 +6342,7 @@ main: { sta.z strcmp.s2 lda #>str2 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str1 [phi:main->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str1 [phi:main->strcmp#1] -- pbuz1=pbuc1 lda #str1 @@ -6364,7 +6364,7 @@ main: { lda #>message sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#0 [phi:main::@2->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@2->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@2->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -6381,7 +6381,7 @@ main: { sta.z strcmp.s2 lda #>str21 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str11 [phi:main::@3->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str11 [phi:main::@3->strcmp#1] -- pbuz1=pbuc1 lda #str11 @@ -6403,7 +6403,7 @@ main: { lda #>message1 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#1 [phi:main::@4->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@4->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@4->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -6420,7 +6420,7 @@ main: { sta.z strcmp.s2 lda #>str11 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str12 [phi:main::@5->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str12 [phi:main::@5->strcmp#1] -- pbuz1=pbuc1 lda #str12 @@ -6442,7 +6442,7 @@ main: { lda #>message2 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#2 [phi:main::@6->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@6->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@6->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -6459,7 +6459,7 @@ main: { sta.z strcmp.s2 lda #>str13 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str13 [phi:main::@7->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str13 [phi:main::@7->strcmp#1] -- pbuz1=pbuc1 lda #str13 @@ -6481,7 +6481,7 @@ main: { lda #>message3 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#3 [phi:main::@8->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@8->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@8->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -6498,7 +6498,7 @@ main: { sta.z strcmp.s2 lda #>str14 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str14 [phi:main::@9->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str14 [phi:main::@9->strcmp#1] -- pbuz1=pbuc1 lda #str14 @@ -6520,7 +6520,7 @@ main: { lda #>message4 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#4 [phi:main::@10->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@10->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@10->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -6537,7 +6537,7 @@ main: { sta.z strcmp.s2 lda #>str25 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str15 [phi:main::@11->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str15 [phi:main::@11->strcmp#1] -- pbuz1=pbuc1 lda #str15 @@ -6559,7 +6559,7 @@ main: { lda #>message5 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#5 [phi:main::@12->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@12->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@12->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -6576,7 +6576,7 @@ main: { sta.z strcmp.s2 lda #>str26 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str16 [phi:main::@13->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str16 [phi:main::@13->strcmp#1] -- pbuz1=pbuc1 lda #str16 @@ -6598,7 +6598,7 @@ main: { lda #>message6 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#6 [phi:main::@14->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@14->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@14->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -6615,7 +6615,7 @@ main: { sta.z strcmp.s2 lda #>str27 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str16 [phi:main::@15->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str16 [phi:main::@15->strcmp#1] -- pbuz1=pbuc1 lda #str16 @@ -6637,7 +6637,7 @@ main: { lda #>message7 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#7 [phi:main::@16->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@16->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@16->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -6659,7 +6659,7 @@ main: { sta.z strncmp.s2 lda #>str28 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str18 [phi:main::@17->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str18 [phi:main::@17->strncmp#2] -- pbuz1=pbuc1 lda #str18 @@ -6681,7 +6681,7 @@ main: { lda #>message8 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#8 [phi:main::@18->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@18->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@18->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -6703,7 +6703,7 @@ main: { sta.z strncmp.s2 lda #>str29 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str19 [phi:main::@19->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str19 [phi:main::@19->strncmp#2] -- pbuz1=pbuc1 lda #str19 @@ -6725,7 +6725,7 @@ main: { lda #>message9 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#9 [phi:main::@20->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@20->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@20->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -6747,7 +6747,7 @@ main: { sta.z strncmp.s2 lda #>str210 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str21 [phi:main::@21->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str21 [phi:main::@21->strncmp#2] -- pbuz1=pbuc1 lda #str21 @@ -6769,7 +6769,7 @@ main: { lda #>message10 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#10 [phi:main::@22->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@22->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@22->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -6791,7 +6791,7 @@ main: { sta.z strncmp.s2 lda #>str211 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str111 [phi:main::@23->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str111 [phi:main::@23->strncmp#2] -- pbuz1=pbuc1 lda #str111 @@ -6813,7 +6813,7 @@ main: { lda #>message11 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#11 [phi:main::@24->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@24->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@24->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -6835,7 +6835,7 @@ main: { sta.z strncmp.s2 lda #>str212 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str12 [phi:main::@25->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str12 [phi:main::@25->strncmp#2] -- pbuz1=pbuc1 lda #str12 @@ -6857,7 +6857,7 @@ main: { lda #>message12 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#12 [phi:main::@26->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@26->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@26->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -6879,7 +6879,7 @@ main: { sta.z memcmp.str2 lda #>__35 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::str12 [phi:main::@27->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::str12 [phi:main::@27->memcmp#2] -- pvoz1=pvoc1 lda #str12 @@ -6901,7 +6901,7 @@ main: { lda #>message13 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#13 [phi:main::@28->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@28->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@28->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -6923,7 +6923,7 @@ main: { sta.z memcmp.str2 lda #>str13 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::str13 [phi:main::@29->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::str13 [phi:main::@29->memcmp#2] -- pvoz1=pvoc1 lda #str13 @@ -6945,7 +6945,7 @@ main: { lda #>message14 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#14 [phi:main::@30->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@30->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@30->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -6967,7 +6967,7 @@ main: { sta.z memcmp.str2 lda #>__39 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::$38 [phi:main::@31->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::$38 [phi:main::@31->memcmp#2] -- pvoz1=pvoc1 lda #<__38 sta.z memcmp.str1 lda #>__38 @@ -6989,7 +6989,7 @@ main: { lda #>message15 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#15 [phi:main::@32->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@32->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@32->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -7011,7 +7011,7 @@ main: { sta.z memcmp.str2 lda #>str111 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::str14 [phi:main::@33->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::str14 [phi:main::@33->memcmp#2] -- pvoz1=pvoc1 lda #str14 @@ -7033,7 +7033,7 @@ main: { lda #>message16 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#16 [phi:main::@34->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@34->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@34->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -7250,7 +7250,7 @@ cputln: { sta.z conio_cursor_x // [131] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [132] call cscroll -- call_phi_near + // [132] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -7401,7 +7401,7 @@ assert_cmp: { // [153] call textcolor // [219] phi from assert_cmp::@8 to textcolor [phi:assert_cmp::@8->textcolor] textcolor_from___b8: - // [219] phi textcolor::color#2 = RED [phi:assert_cmp::@8->textcolor#0] -- call_phi_near + // [219] phi textcolor::color#2 = RED [phi:assert_cmp::@8->textcolor#0] -- vbuaa=vbuc1 lda #RED jsr textcolor // [154] phi from assert_cmp::@8 to assert_cmp::@12 [phi:assert_cmp::@8->assert_cmp::@12] @@ -7417,7 +7417,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s2 [phi:assert_cmp::@12->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s2 [phi:assert_cmp::@12->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -7431,7 +7431,7 @@ assert_cmp: { // [157] call printf_schar // [231] phi from assert_cmp::@13 to printf_schar [phi:assert_cmp::@13->printf_schar] printf_schar_from___b13: - // [231] phi printf_schar::value#3 = printf_schar::value#1 [phi:assert_cmp::@13->printf_schar#0] -- call_phi_near + // [231] phi printf_schar::value#3 = printf_schar::value#1 [phi:assert_cmp::@13->printf_schar#0] -- register_copy jsr printf_schar // [158] phi from assert_cmp::@13 to assert_cmp::@14 [phi:assert_cmp::@13->assert_cmp::@14] __b14_from___b13: @@ -7446,7 +7446,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s3 [phi:assert_cmp::@14->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s3 [phi:assert_cmp::@14->printf_str#1] -- pbuz1=pbuc1 lda #s3 @@ -7460,7 +7460,7 @@ assert_cmp: { // [161] call printf_schar // [231] phi from assert_cmp::@15 to printf_schar [phi:assert_cmp::@15->printf_schar] printf_schar_from___b15: - // [231] phi printf_schar::value#3 = printf_schar::value#2 [phi:assert_cmp::@15->printf_schar#0] -- call_phi_near + // [231] phi printf_schar::value#3 = printf_schar::value#2 [phi:assert_cmp::@15->printf_schar#0] -- register_copy jsr printf_schar // [162] phi from assert_cmp::@15 to assert_cmp::@16 [phi:assert_cmp::@15->assert_cmp::@16] __b16_from___b15: @@ -7475,7 +7475,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s4 [phi:assert_cmp::@16->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s4 [phi:assert_cmp::@16->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -7488,7 +7488,7 @@ assert_cmp: { // [165] call printf_string // [242] phi from assert_cmp::@17 to printf_string [phi:assert_cmp::@17->printf_string] printf_string_from___b17: - // [242] phi printf_string::str#2 = printf_string::str#1 [phi:assert_cmp::@17->printf_string#0] -- call_phi_near + // [242] phi printf_string::str#2 = printf_string::str#1 [phi:assert_cmp::@17->printf_string#0] -- register_copy jsr printf_string // [166] phi from assert_cmp::@17 to assert_cmp::@18 [phi:assert_cmp::@17->assert_cmp::@18] __b18_from___b17: @@ -7503,7 +7503,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@18->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@18->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -7522,7 +7522,7 @@ assert_cmp: { // [170] call textcolor // [219] phi from assert_cmp::@1 to textcolor [phi:assert_cmp::@1->textcolor] textcolor_from___b1: - // [219] phi textcolor::color#2 = GREEN [phi:assert_cmp::@1->textcolor#0] -- call_phi_near + // [219] phi textcolor::color#2 = GREEN [phi:assert_cmp::@1->textcolor#0] -- vbuaa=vbuc1 lda #GREEN jsr textcolor // [171] phi from assert_cmp::@1 to assert_cmp::@9 [phi:assert_cmp::@1->assert_cmp::@9] @@ -7538,7 +7538,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s [phi:assert_cmp::@9->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s [phi:assert_cmp::@9->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -7551,7 +7551,7 @@ assert_cmp: { // [174] call printf_string // [242] phi from assert_cmp::@10 to printf_string [phi:assert_cmp::@10->printf_string] printf_string_from___b10: - // [242] phi printf_string::str#2 = printf_string::str#0 [phi:assert_cmp::@10->printf_string#0] -- call_phi_near + // [242] phi printf_string::str#2 = printf_string::str#0 [phi:assert_cmp::@10->printf_string#0] -- register_copy jsr printf_string // [175] phi from assert_cmp::@10 to assert_cmp::@11 [phi:assert_cmp::@10->assert_cmp::@11] __b11_from___b10: @@ -7566,7 +7566,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@11->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@11->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -7819,7 +7819,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [246] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [246] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -7838,7 +7838,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [246] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [246] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -7854,7 +7854,7 @@ cscroll: { memset_from___b3: // [256] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [256] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [256] 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 @@ -7869,7 +7869,7 @@ cscroll: { // [256] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] memset_from___b4: // [256] phi memset::c#4 = memset::c#1 [phi:cscroll::@4->memset#0] -- register_copy - // [256] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [256] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -7988,7 +7988,7 @@ printf_schar: { __b2: // [237] uctoa::value#1 = (char)printf_schar::value#5 // [238] call uctoa - // [264] phi from printf_schar::@2 to uctoa [phi:printf_schar::@2->uctoa] -- call_phi_near + // [264] phi from printf_schar::@2 to uctoa [phi:printf_schar::@2->uctoa] uctoa_from___b2: jsr uctoa jmp __b3 @@ -7998,7 +7998,7 @@ printf_schar: { lda printf_buffer // [240] call printf_number_buffer // Print using format - // [283] phi from printf_schar::@3 to printf_number_buffer [phi:printf_schar::@3->printf_number_buffer] -- call_phi_near + // [283] phi from printf_schar::@3 to printf_number_buffer [phi:printf_schar::@3->printf_number_buffer] printf_number_buffer_from___b3: jsr printf_number_buffer jmp __breturn @@ -8029,7 +8029,7 @@ printf_string: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- register_copy jsr printf_str jmp __breturn // printf_string::@return @@ -8239,7 +8239,7 @@ uctoa: { // [277] uctoa_append::value#0 = uctoa::value#2 // [278] uctoa_append::sub#0 = uctoa::digit_value#0 // [279] call uctoa_append - // [291] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [291] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] uctoa_append_from___b5: jsr uctoa_append // [280] uctoa_append::return#0 = uctoa_append::value#2 @@ -8297,7 +8297,7 @@ printf_number_buffer: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- pbuz1=pbuc1 lda #buffer_digits @@ -9187,12 +9187,12 @@ __start: { lda #LIGHT_BLUE sta.z conio_textcolor // #pragma constructor_for(conio_c64_init, cputc, clrscr, cscroll) - // [6] call conio_c64_init -- call_phi_near + // [6] call conio_c64_init jsr conio_c64_init // [7] phi from __start::__init1 to __start::@1 [phi:__start::__init1->__start::@1] // __start::@1 // [8] call main - // [28] phi from __start::@1 to main [phi:__start::@1->main] -- call_phi_near + // [28] phi from __start::@1 to main [phi:__start::@1->main] jsr main // __start::@return // [9] return @@ -9221,7 +9221,7 @@ conio_c64_init: { __b1: // gotoxy(0, line) // [14] gotoxy::y#2 = conio_c64_init::line#2 - // [15] call gotoxy -- call_phi_near + // [15] call gotoxy jsr gotoxy // conio_c64_init::@return // } @@ -9260,7 +9260,7 @@ cputc: { // [23] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3] // cputc::@3 // cputln() - // [24] call cputln -- call_phi_near + // [24] call cputln jsr cputln // cputc::@return __breturn: @@ -9271,7 +9271,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [27] call cputln -- call_phi_near + // [27] call cputln jsr cputln rts } @@ -9285,7 +9285,7 @@ main: { sta.z strcmp.s2 lda #>str2 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str1 [phi:main->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str1 [phi:main->strcmp#1] -- pbuz1=pbuc1 lda #str1 @@ -9306,7 +9306,7 @@ main: { lda #>message sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#0 [phi:main::@2->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@2->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@2->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -9320,7 +9320,7 @@ main: { sta.z strcmp.s2 lda #>str21 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str11 [phi:main::@3->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str11 [phi:main::@3->strcmp#1] -- pbuz1=pbuc1 lda #str11 @@ -9341,7 +9341,7 @@ main: { lda #>message1 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#1 [phi:main::@4->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@4->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@4->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -9355,7 +9355,7 @@ main: { sta.z strcmp.s2 lda #>str11 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str12 [phi:main::@5->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str12 [phi:main::@5->strcmp#1] -- pbuz1=pbuc1 lda #str12 @@ -9376,7 +9376,7 @@ main: { lda #>message2 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#2 [phi:main::@6->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@6->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@6->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -9390,7 +9390,7 @@ main: { sta.z strcmp.s2 lda #>str13 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str13 [phi:main::@7->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str13 [phi:main::@7->strcmp#1] -- pbuz1=pbuc1 lda #str13 @@ -9411,7 +9411,7 @@ main: { lda #>message3 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#3 [phi:main::@8->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@8->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@8->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -9425,7 +9425,7 @@ main: { sta.z strcmp.s2 lda #>str14 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str14 [phi:main::@9->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str14 [phi:main::@9->strcmp#1] -- pbuz1=pbuc1 lda #str14 @@ -9446,7 +9446,7 @@ main: { lda #>message4 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#4 [phi:main::@10->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@10->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@10->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -9460,7 +9460,7 @@ main: { sta.z strcmp.s2 lda #>str25 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str15 [phi:main::@11->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str15 [phi:main::@11->strcmp#1] -- pbuz1=pbuc1 lda #str15 @@ -9481,7 +9481,7 @@ main: { lda #>message5 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#5 [phi:main::@12->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@12->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@12->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -9495,7 +9495,7 @@ main: { sta.z strcmp.s2 lda #>str26 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str16 [phi:main::@13->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str16 [phi:main::@13->strcmp#1] -- pbuz1=pbuc1 lda #str16 @@ -9516,7 +9516,7 @@ main: { lda #>message6 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#6 [phi:main::@14->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@14->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@14->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -9530,7 +9530,7 @@ main: { sta.z strcmp.s2 lda #>str27 sta.z strcmp.s2+1 - // [134] phi strcmp::s1#0 = main::str16 [phi:main::@15->strcmp#1] -- call_phi_near + // [134] phi strcmp::s1#0 = main::str16 [phi:main::@15->strcmp#1] -- pbuz1=pbuc1 lda #str16 @@ -9551,7 +9551,7 @@ main: { lda #>message7 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#7 [phi:main::@16->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@16->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@16->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -9570,7 +9570,7 @@ main: { sta.z strncmp.s2 lda #>str28 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str18 [phi:main::@17->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str18 [phi:main::@17->strncmp#2] -- pbuz1=pbuc1 lda #str18 @@ -9591,7 +9591,7 @@ main: { lda #>message8 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#8 [phi:main::@18->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@18->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@18->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -9610,7 +9610,7 @@ main: { sta.z strncmp.s2 lda #>str29 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str19 [phi:main::@19->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str19 [phi:main::@19->strncmp#2] -- pbuz1=pbuc1 lda #str19 @@ -9631,7 +9631,7 @@ main: { lda #>message9 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#9 [phi:main::@20->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@20->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@20->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -9650,7 +9650,7 @@ main: { sta.z strncmp.s2 lda #>str210 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str21 [phi:main::@21->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str21 [phi:main::@21->strncmp#2] -- pbuz1=pbuc1 lda #str21 @@ -9671,7 +9671,7 @@ main: { lda #>message10 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#10 [phi:main::@22->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@22->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@22->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -9690,7 +9690,7 @@ main: { sta.z strncmp.s2 lda #>str211 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str111 [phi:main::@23->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str111 [phi:main::@23->strncmp#2] -- pbuz1=pbuc1 lda #str111 @@ -9711,7 +9711,7 @@ main: { lda #>message11 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#11 [phi:main::@24->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@24->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@24->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -9730,7 +9730,7 @@ main: { sta.z strncmp.s2 lda #>str212 sta.z strncmp.s2+1 - // [181] phi strncmp::s1#0 = main::str12 [phi:main::@25->strncmp#2] -- call_phi_near + // [181] phi strncmp::s1#0 = main::str12 [phi:main::@25->strncmp#2] -- pbuz1=pbuc1 lda #str12 @@ -9751,7 +9751,7 @@ main: { lda #>message12 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#12 [phi:main::@26->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@26->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@26->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -9770,7 +9770,7 @@ main: { sta.z memcmp.str2 lda #>__35 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::str12 [phi:main::@27->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::str12 [phi:main::@27->memcmp#2] -- pvoz1=pvoc1 lda #str12 @@ -9791,7 +9791,7 @@ main: { lda #>message13 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#13 [phi:main::@28->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = -1 [phi:main::@28->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = -1 [phi:main::@28->assert_cmp#2] -- vbsz1=vbsc1 lda #-1 sta.z assert_cmp.expect jsr assert_cmp @@ -9810,7 +9810,7 @@ main: { sta.z memcmp.str2 lda #>str13 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::str13 [phi:main::@29->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::str13 [phi:main::@29->memcmp#2] -- pvoz1=pvoc1 lda #str13 @@ -9831,7 +9831,7 @@ main: { lda #>message14 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#14 [phi:main::@30->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@30->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@30->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -9850,7 +9850,7 @@ main: { sta.z memcmp.str2 lda #>__39 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::$38 [phi:main::@31->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::$38 [phi:main::@31->memcmp#2] -- pvoz1=pvoc1 lda #<__38 sta.z memcmp.str1 lda #>__38 @@ -9871,7 +9871,7 @@ main: { lda #>message15 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#15 [phi:main::@32->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 0 [phi:main::@32->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 0 [phi:main::@32->assert_cmp#2] -- vbsz1=vbsc1 lda #0 sta.z assert_cmp.expect jsr assert_cmp @@ -9890,7 +9890,7 @@ main: { sta.z memcmp.str2 lda #>str111 sta.z memcmp.str2+1 - // [193] phi memcmp::str1#4 = (const void *)main::str14 [phi:main::@33->memcmp#2] -- call_phi_near + // [193] phi memcmp::str1#4 = (const void *)main::str14 [phi:main::@33->memcmp#2] -- pvoz1=pvoc1 lda #str14 @@ -9911,7 +9911,7 @@ main: { lda #>message16 sta.z assert_cmp.message+1 // [144] phi assert_cmp::actual#17 = assert_cmp::actual#16 [phi:main::@34->assert_cmp#1] -- register_copy - // [144] phi assert_cmp::expect#17 = 1 [phi:main::@34->assert_cmp#2] -- call_phi_near + // [144] phi assert_cmp::expect#17 = 1 [phi:main::@34->assert_cmp#2] -- vbsz1=vbsc1 lda #1 sta.z assert_cmp.expect jsr assert_cmp @@ -10128,7 +10128,7 @@ cputln: { // [131] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [132] call cscroll -- call_phi_near + // [132] call cscroll jsr cscroll // cputln::@return // } @@ -10275,7 +10275,7 @@ assert_cmp: { // textcolor(RED) // [153] call textcolor // [219] phi from assert_cmp::@8 to textcolor [phi:assert_cmp::@8->textcolor] - // [219] phi textcolor::color#2 = RED [phi:assert_cmp::@8->textcolor#0] -- call_phi_near + // [219] phi textcolor::color#2 = RED [phi:assert_cmp::@8->textcolor#0] -- vbuaa=vbuc1 lda #RED jsr textcolor // [154] phi from assert_cmp::@8 to assert_cmp::@12 [phi:assert_cmp::@8->assert_cmp::@12] @@ -10288,7 +10288,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s2 [phi:assert_cmp::@12->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s2 [phi:assert_cmp::@12->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -10300,7 +10300,7 @@ assert_cmp: { ldx.z expect // [157] call printf_schar // [231] phi from assert_cmp::@13 to printf_schar [phi:assert_cmp::@13->printf_schar] - // [231] phi printf_schar::value#3 = printf_schar::value#1 [phi:assert_cmp::@13->printf_schar#0] -- call_phi_near + // [231] phi printf_schar::value#3 = printf_schar::value#1 [phi:assert_cmp::@13->printf_schar#0] -- register_copy jsr printf_schar // [158] phi from assert_cmp::@13 to assert_cmp::@14 [phi:assert_cmp::@13->assert_cmp::@14] // assert_cmp::@14 @@ -10312,7 +10312,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s3 [phi:assert_cmp::@14->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s3 [phi:assert_cmp::@14->printf_str#1] -- pbuz1=pbuc1 lda #s3 @@ -10324,7 +10324,7 @@ assert_cmp: { ldx.z actual // [161] call printf_schar // [231] phi from assert_cmp::@15 to printf_schar [phi:assert_cmp::@15->printf_schar] - // [231] phi printf_schar::value#3 = printf_schar::value#2 [phi:assert_cmp::@15->printf_schar#0] -- call_phi_near + // [231] phi printf_schar::value#3 = printf_schar::value#2 [phi:assert_cmp::@15->printf_schar#0] -- register_copy jsr printf_schar // [162] phi from assert_cmp::@15 to assert_cmp::@16 [phi:assert_cmp::@15->assert_cmp::@16] // assert_cmp::@16 @@ -10336,7 +10336,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s4 [phi:assert_cmp::@16->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s4 [phi:assert_cmp::@16->printf_str#1] -- pbuz1=pbuc1 lda #s4 @@ -10347,7 +10347,7 @@ assert_cmp: { // [164] printf_string::str#1 = assert_cmp::message#17 // [165] call printf_string // [242] phi from assert_cmp::@17 to printf_string [phi:assert_cmp::@17->printf_string] - // [242] phi printf_string::str#2 = printf_string::str#1 [phi:assert_cmp::@17->printf_string#0] -- call_phi_near + // [242] phi printf_string::str#2 = printf_string::str#1 [phi:assert_cmp::@17->printf_string#0] -- register_copy jsr printf_string // [166] phi from assert_cmp::@17 to assert_cmp::@18 [phi:assert_cmp::@17->assert_cmp::@18] // assert_cmp::@18 @@ -10359,7 +10359,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@18->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@18->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -10375,7 +10375,7 @@ assert_cmp: { // textcolor(GREEN) // [170] call textcolor // [219] phi from assert_cmp::@1 to textcolor [phi:assert_cmp::@1->textcolor] - // [219] phi textcolor::color#2 = GREEN [phi:assert_cmp::@1->textcolor#0] -- call_phi_near + // [219] phi textcolor::color#2 = GREEN [phi:assert_cmp::@1->textcolor#0] -- vbuaa=vbuc1 lda #GREEN jsr textcolor // [171] phi from assert_cmp::@1 to assert_cmp::@9 [phi:assert_cmp::@1->assert_cmp::@9] @@ -10388,7 +10388,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s [phi:assert_cmp::@9->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s [phi:assert_cmp::@9->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -10399,7 +10399,7 @@ assert_cmp: { // [173] printf_string::str#0 = assert_cmp::message#17 // [174] call printf_string // [242] phi from assert_cmp::@10 to printf_string [phi:assert_cmp::@10->printf_string] - // [242] phi printf_string::str#2 = printf_string::str#0 [phi:assert_cmp::@10->printf_string#0] -- call_phi_near + // [242] phi printf_string::str#2 = printf_string::str#0 [phi:assert_cmp::@10->printf_string#0] -- register_copy jsr printf_string // [175] phi from assert_cmp::@10 to assert_cmp::@11 [phi:assert_cmp::@10->assert_cmp::@11] // assert_cmp::@11 @@ -10411,7 +10411,7 @@ assert_cmp: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@11->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = assert_cmp::s1 [phi:assert_cmp::@11->printf_str#1] -- pbuz1=pbuc1 lda #s1 @@ -10650,7 +10650,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [246] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [246] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -10666,7 +10666,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [246] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [246] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -10679,7 +10679,7 @@ cscroll: { // [256] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [256] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [256] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [256] 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 @@ -10692,7 +10692,7 @@ cscroll: { // [214] call memset // [256] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [256] phi memset::c#4 = memset::c#1 [phi:cscroll::@4->memset#0] -- register_copy - // [256] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [256] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -10812,7 +10812,7 @@ printf_schar: { // uctoa(uvalue, printf_buffer.digits, format.radix) // [237] uctoa::value#1 = (char)printf_schar::value#5 // [238] call uctoa - // [264] phi from printf_schar::@2 to uctoa [phi:printf_schar::@2->uctoa] -- call_phi_near + // [264] phi from printf_schar::@2 to uctoa [phi:printf_schar::@2->uctoa] jsr uctoa // printf_schar::@3 // printf_number_buffer(putc, printf_buffer, format) @@ -10820,7 +10820,7 @@ printf_schar: { lda printf_buffer // [240] call printf_number_buffer // Print using format - // [283] phi from printf_schar::@3 to printf_number_buffer [phi:printf_schar::@3->printf_number_buffer] -- call_phi_near + // [283] phi from printf_schar::@3 to printf_number_buffer [phi:printf_schar::@3->printf_number_buffer] jsr printf_number_buffer // printf_schar::@return // } @@ -10847,7 +10847,7 @@ printf_string: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- register_copy jsr printf_str // printf_string::@return // } @@ -11050,7 +11050,7 @@ uctoa: { // [277] uctoa_append::value#0 = uctoa::value#2 // [278] uctoa_append::sub#0 = uctoa::digit_value#0 // [279] call uctoa_append - // [291] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] -- call_phi_near + // [291] phi from uctoa::@5 to uctoa_append [phi:uctoa::@5->uctoa_append] jsr uctoa_append // uctoa_append(buffer++, value, digit_value) // [280] uctoa_append::return#0 = uctoa_append::value#2 @@ -11102,7 +11102,7 @@ printf_number_buffer: { sta.z printf_str.putc lda #>putc sta.z printf_str.putc+1 - // [222] phi printf_str::s#10 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near + // [222] phi printf_str::s#10 = 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/strcpy-0.log b/src/test/ref/strcpy-0.log index aaa3b83f8..9303adf6e 100644 --- a/src/test/ref/strcpy-0.log +++ b/src/test/ref/strcpy-0.log @@ -223,7 +223,7 @@ main: { sta.z str_cpy.dst lda #>dst1 sta.z str_cpy.dst+1 - // [5] phi str_cpy::src#4 = main::src [phi:main->str_cpy#1] -- call_phi_near + // [5] phi str_cpy::src#4 = main::src [phi:main->str_cpy#1] -- pbuz1=pbuc1 lda #src @@ -242,7 +242,7 @@ main: { sta.z str_cpy.dst lda #>dst2 sta.z str_cpy.dst+1 - // [5] phi str_cpy::src#4 = main::src1 [phi:main::@1->str_cpy#1] -- call_phi_near + // [5] phi str_cpy::src#4 = main::src1 [phi:main::@1->str_cpy#1] -- pbuz1=pbuc1 lda #src1 @@ -372,7 +372,7 @@ main: { sta.z str_cpy.dst lda #>dst1 sta.z str_cpy.dst+1 - // [5] phi str_cpy::src#4 = main::src [phi:main->str_cpy#1] -- call_phi_near + // [5] phi str_cpy::src#4 = main::src [phi:main->str_cpy#1] -- pbuz1=pbuc1 lda #src @@ -388,7 +388,7 @@ main: { sta.z str_cpy.dst lda #>dst2 sta.z str_cpy.dst+1 - // [5] phi str_cpy::src#4 = main::src1 [phi:main::@1->str_cpy#1] -- call_phi_near + // [5] phi str_cpy::src#4 = main::src1 [phi:main::@1->str_cpy#1] -- pbuz1=pbuc1 lda #src1 diff --git a/src/test/ref/string-const-consolidation-noroot.log b/src/test/ref/string-const-consolidation-noroot.log index 5c73a3a86..3595bcc09 100644 --- a/src/test/ref/string-const-consolidation-noroot.log +++ b/src/test/ref/string-const-consolidation-noroot.log @@ -272,7 +272,7 @@ main: { // [1] call print // [7] phi from main to print [phi:main->print] print_from_main: - // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- call_phi_near + // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -286,7 +286,7 @@ main: { // [3] call print // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@1->print#0] -- register_copy jsr print // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -296,7 +296,7 @@ main: { // [5] call print // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@2->print#0] -- register_copy jsr print jmp __breturn // main::@return @@ -419,7 +419,7 @@ main: { // print(rex1) // [1] call print // [7] phi from main to print [phi:main->print] - // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- call_phi_near + // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -430,14 +430,14 @@ main: { // print(rex2) // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@1->print#0] -- register_copy jsr print // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // print("rex") // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@2->print#0] -- register_copy jsr print // main::@return // } diff --git a/src/test/ref/string-const-consolidation-root.log b/src/test/ref/string-const-consolidation-root.log index fde1b3fb2..6a83cad43 100644 --- a/src/test/ref/string-const-consolidation-root.log +++ b/src/test/ref/string-const-consolidation-root.log @@ -419,7 +419,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call print1 - // [5] phi from main to print1 [phi:main->print1] -- call_phi_near + // [5] phi from main to print1 [phi:main->print1] print1_from_main: jsr print1 // [2] phi from main to main::@1 [phi:main->main::@1] @@ -428,7 +428,7 @@ main: { // main::@1 __b1: // [3] call print2 - // [12] phi from main::@1 to print2 [phi:main::@1->print2] -- call_phi_near + // [12] phi from main::@1 to print2 [phi:main::@1->print2] print2_from___b1: jsr print2 jmp __breturn @@ -447,7 +447,7 @@ print1: { sta.z screen lda #>$400 sta.z screen+1 - // [19] phi print::s#9 = string_0 [phi:print1->print#1] -- call_phi_near + // [19] phi print::s#9 = string_0 [phi:print1->print#1] -- pbuz1=pbuc1 lda #string_0 @@ -462,7 +462,7 @@ print1: { // [19] phi from print1::@1 to print [phi:print1::@1->print] print_from___b1: // [19] phi screen#36 = screen#12 [phi:print1::@1->print#0] -- register_copy - // [19] phi print::s#9 = string_1 [phi:print1::@1->print#1] -- call_phi_near + // [19] phi print::s#9 = string_1 [phi:print1::@1->print#1] -- pbuz1=pbuc1 lda #string_1 @@ -477,7 +477,7 @@ print1: { // [19] phi from print1::@2 to print [phi:print1::@2->print] print_from___b2: // [19] phi screen#36 = screen#12 [phi:print1::@2->print#0] -- register_copy - // [19] phi print::s#9 = s [phi:print1::@2->print#1] -- call_phi_near + // [19] phi print::s#9 = s [phi:print1::@2->print#1] -- pbuz1=pbuc1 lda #s @@ -495,7 +495,7 @@ print2: { // [19] phi from print2 to print [phi:print2->print] print_from_print2: // [19] phi screen#36 = screen#12 [phi:print2->print#0] -- register_copy - // [19] phi print::s#9 = string_0 [phi:print2->print#1] -- call_phi_near + // [19] phi print::s#9 = string_0 [phi:print2->print#1] -- pbuz1=pbuc1 lda #string_0 @@ -510,7 +510,7 @@ print2: { // [19] phi from print2::@1 to print [phi:print2::@1->print] print_from___b1: // [19] phi screen#36 = screen#12 [phi:print2::@1->print#0] -- register_copy - // [19] phi print::s#9 = string_1 [phi:print2::@1->print#1] -- call_phi_near + // [19] phi print::s#9 = string_1 [phi:print2::@1->print#1] -- pbuz1=pbuc1 lda #string_1 @@ -525,7 +525,7 @@ print2: { // [19] phi from print2::@2 to print [phi:print2::@2->print] print_from___b2: // [19] phi screen#36 = screen#12 [phi:print2::@2->print#0] -- register_copy - // [19] phi print::s#9 = s1 [phi:print2::@2->print#1] -- call_phi_near + // [19] phi print::s#9 = s1 [phi:print2::@2->print#1] -- pbuz1=pbuc1 lda #s1 @@ -674,13 +674,13 @@ Score: 677 main: { // print1() // [1] call print1 - // [5] phi from main to print1 [phi:main->print1] -- call_phi_near + // [5] phi from main to print1 [phi:main->print1] jsr print1 // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // print2() // [3] call print2 - // [12] phi from main::@1 to print2 [phi:main::@1->print2] -- call_phi_near + // [12] phi from main::@1 to print2 [phi:main::@1->print2] jsr print2 // main::@return // } @@ -697,7 +697,7 @@ print1: { sta.z screen lda #>$400 sta.z screen+1 - // [19] phi print::s#9 = string_0 [phi:print1->print#1] -- call_phi_near + // [19] phi print::s#9 = string_0 [phi:print1->print#1] -- pbuz1=pbuc1 lda #string_0 @@ -709,7 +709,7 @@ print1: { // [8] call print // [19] phi from print1::@1 to print [phi:print1::@1->print] // [19] phi screen#36 = screen#12 [phi:print1::@1->print#0] -- register_copy - // [19] phi print::s#9 = string_1 [phi:print1::@1->print#1] -- call_phi_near + // [19] phi print::s#9 = string_1 [phi:print1::@1->print#1] -- pbuz1=pbuc1 lda #string_1 @@ -721,7 +721,7 @@ print1: { // [10] call print // [19] phi from print1::@2 to print [phi:print1::@2->print] // [19] phi screen#36 = screen#12 [phi:print1::@2->print#0] -- register_copy - // [19] phi print::s#9 = s [phi:print1::@2->print#1] -- call_phi_near + // [19] phi print::s#9 = s [phi:print1::@2->print#1] -- pbuz1=pbuc1 lda #s @@ -738,7 +738,7 @@ print2: { // [13] call print // [19] phi from print2 to print [phi:print2->print] // [19] phi screen#36 = screen#12 [phi:print2->print#0] -- register_copy - // [19] phi print::s#9 = string_0 [phi:print2->print#1] -- call_phi_near + // [19] phi print::s#9 = string_0 [phi:print2->print#1] -- pbuz1=pbuc1 lda #string_0 @@ -750,7 +750,7 @@ print2: { // [15] call print // [19] phi from print2::@1 to print [phi:print2::@1->print] // [19] phi screen#36 = screen#12 [phi:print2::@1->print#0] -- register_copy - // [19] phi print::s#9 = string_1 [phi:print2::@1->print#1] -- call_phi_near + // [19] phi print::s#9 = string_1 [phi:print2::@1->print#1] -- pbuz1=pbuc1 lda #string_1 @@ -762,7 +762,7 @@ print2: { // [17] call print // [19] phi from print2::@2 to print [phi:print2::@2->print] // [19] phi screen#36 = screen#12 [phi:print2::@2->print#0] -- register_copy - // [19] phi print::s#9 = s1 [phi:print2::@2->print#1] -- call_phi_near + // [19] phi print::s#9 = s1 [phi:print2::@2->print#1] -- pbuz1=pbuc1 lda #s1 diff --git a/src/test/ref/string-const-consolidation.log b/src/test/ref/string-const-consolidation.log index 3a4a13034..6861b8596 100644 --- a/src/test/ref/string-const-consolidation.log +++ b/src/test/ref/string-const-consolidation.log @@ -272,7 +272,7 @@ main: { // [1] call print // [7] phi from main to print [phi:main->print] print_from_main: - // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- call_phi_near + // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -286,7 +286,7 @@ main: { // [3] call print // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@1->print#0] -- register_copy jsr print // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -296,7 +296,7 @@ main: { // [5] call print // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@2->print#0] -- register_copy jsr print jmp __breturn // main::@return @@ -418,7 +418,7 @@ main: { // print(rex1) // [1] call print // [7] phi from main to print [phi:main->print] - // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- call_phi_near + // [7] phi screen#20 = (char *) 1024 [phi:main->print#0] -- pbuz1=pbuc1 lda #<$400 sta.z screen lda #>$400 @@ -429,14 +429,14 @@ main: { // print(rex2) // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@1->print#0] -- register_copy jsr print // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // print("rex") // [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] -- call_phi_near + // [7] phi screen#20 = screen#13 [phi:main::@2->print#0] -- register_copy jsr print // main::@return // } diff --git a/src/test/ref/string-escapes-2.log b/src/test/ref/string-escapes-2.log index 084de2ae1..7c799cfa5 100644 --- a/src/test/ref/string-escapes-2.log +++ b/src/test/ref/string-escapes-2.log @@ -206,7 +206,7 @@ main: { // [4] chrout::c#0 = MESSAGE[main::i#2] -- vbuaa=pbuc1_derefidx_vbuz1 ldy.z i lda MESSAGE,y - // [5] call chrout -- call_phi_near + // [5] call chrout jsr chrout jmp __b3 // main::@3 @@ -311,7 +311,7 @@ main: { // [4] chrout::c#0 = MESSAGE[main::i#2] -- vbuaa=pbuc1_derefidx_vbuz1 ldy.z i lda MESSAGE,y - // [5] call chrout -- call_phi_near + // [5] call chrout jsr chrout // main::@3 // chrout(MESSAGE[i++]); diff --git a/src/test/ref/string-escapes-4.log b/src/test/ref/string-escapes-4.log index 45c3b0f47..d3c3418c1 100644 --- a/src/test/ref/string-escapes-4.log +++ b/src/test/ref/string-escapes-4.log @@ -244,7 +244,7 @@ main: { // [5] chrout::petscii = MSG1[main::i#2] -- vbuz1=pbuc1_derefidx_vbuxx lda MSG1,x sta.z chrout.petscii - // [6] call chrout -- call_phi_near + // [6] call chrout jsr chrout jmp __b4 // main::@4 @@ -366,7 +366,7 @@ main: { // [5] chrout::petscii = MSG1[main::i#2] -- vbuz1=pbuc1_derefidx_vbuxx lda MSG1,x sta.z chrout.petscii - // [6] call chrout -- call_phi_near + // [6] call chrout jsr chrout // main::@4 // SCREEN1[i] = MSG2[i] diff --git a/src/test/ref/string-pointer-problem.log b/src/test/ref/string-pointer-problem.log index a696bea92..4d68344cc 100644 --- a/src/test/ref/string-pointer-problem.log +++ b/src/test/ref/string-pointer-problem.log @@ -199,7 +199,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call set_process_name - // [3] phi from main to set_process_name [phi:main->set_process_name] -- call_phi_near + // [3] phi from main to set_process_name [phi:main->set_process_name] set_process_name_from_main: jsr set_process_name jmp __breturn @@ -332,7 +332,7 @@ Score: 948 main: { // set_process_name("keyboard") // [1] call set_process_name - // [3] phi from main to set_process_name [phi:main->set_process_name] -- call_phi_near + // [3] phi from main to set_process_name [phi:main->set_process_name] jsr set_process_name // main::@return // } diff --git a/src/test/ref/strip.log b/src/test/ref/strip.log index 6e81e0dd7..5cea80c20 100644 --- a/src/test/ref/strip.log +++ b/src/test/ref/strip.log @@ -443,7 +443,7 @@ main: { strip_from_main: // [9] phi strip::c#3 = ' ' [phi:main->strip#0] -- vbuxx=vbuc1 ldx #' ' - // [9] phi strip::dest#0 = msg1 [phi:main->strip#1] -- call_phi_near + // [9] phi strip::dest#0 = msg1 [phi:main->strip#1] -- pbuz1=pbuc1 lda #msg1 @@ -462,7 +462,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [20] phi print::msg#4 = msg1 [phi:main::@1->print#1] -- call_phi_near + // [20] phi print::msg#4 = msg1 [phi:main::@1->print#1] -- pbuz1=pbuc1 lda #msg1 @@ -478,7 +478,7 @@ main: { strip_from___b2: // [9] phi strip::c#3 = 'y' [phi:main::@2->strip#0] -- vbuxx=vbuc1 ldx #'y' - // [9] phi strip::dest#0 = msg2 [phi:main::@2->strip#1] -- call_phi_near + // [9] phi strip::dest#0 = msg2 [phi:main::@2->strip#1] -- pbuz1=pbuc1 lda #msg2 @@ -493,7 +493,7 @@ main: { // [20] phi from main::@3 to print [phi:main::@3->print] print_from___b3: // [20] phi screen#17 = screen#12 [phi:main::@3->print#0] -- register_copy - // [20] phi print::msg#4 = msg2 [phi:main::@3->print#1] -- call_phi_near + // [20] phi print::msg#4 = msg2 [phi:main::@3->print#1] -- pbuz1=pbuc1 lda #msg2 @@ -722,7 +722,7 @@ main: { // [9] phi from main to strip [phi:main->strip] // [9] phi strip::c#3 = ' ' [phi:main->strip#0] -- vbuxx=vbuc1 ldx #' ' - // [9] phi strip::dest#0 = msg1 [phi:main->strip#1] -- call_phi_near + // [9] phi strip::dest#0 = msg1 [phi:main->strip#1] -- pbuz1=pbuc1 lda #msg1 @@ -738,7 +738,7 @@ main: { sta.z screen lda #>$400 sta.z screen+1 - // [20] phi print::msg#4 = msg1 [phi:main::@1->print#1] -- call_phi_near + // [20] phi print::msg#4 = msg1 [phi:main::@1->print#1] -- pbuz1=pbuc1 lda #msg1 @@ -751,7 +751,7 @@ main: { // [9] phi from main::@2 to strip [phi:main::@2->strip] // [9] phi strip::c#3 = 'y' [phi:main::@2->strip#0] -- vbuxx=vbuc1 ldx #'y' - // [9] phi strip::dest#0 = msg2 [phi:main::@2->strip#1] -- call_phi_near + // [9] phi strip::dest#0 = msg2 [phi:main::@2->strip#1] -- pbuz1=pbuc1 lda #msg2 @@ -763,7 +763,7 @@ main: { // [7] call print // [20] phi from main::@3 to print [phi:main::@3->print] // [20] phi screen#17 = screen#12 [phi:main::@3->print#0] -- register_copy - // [20] phi print::msg#4 = msg2 [phi:main::@3->print#1] -- call_phi_near + // [20] phi print::msg#4 = msg2 [phi:main::@3->print#1] -- pbuz1=pbuc1 lda #msg2 diff --git a/src/test/ref/strncat-0.log b/src/test/ref/strncat-0.log index 7b681effa..0e88b069b 100644 --- a/src/test/ref/strncat-0.log +++ b/src/test/ref/strncat-0.log @@ -446,7 +446,7 @@ main: { // [1] call strncat // [11] phi from main to strncat [phi:main->strncat] strncat_from_main: - // [11] phi strncat::source#7 = hello [phi:main->strncat#0] -- call_phi_near + // [11] phi strncat::source#7 = hello [phi:main->strncat#0] -- pbuz1=pbuc1 lda #hello @@ -460,7 +460,7 @@ main: { // [3] call strncat // [11] phi from main::@3 to strncat [phi:main::@3->strncat] strncat_from___b3: - // [11] phi strncat::source#7 = space [phi:main::@3->strncat#0] -- call_phi_near + // [11] phi strncat::source#7 = space [phi:main::@3->strncat#0] -- pbuz1=pbuc1 lda #space @@ -474,7 +474,7 @@ main: { // [5] call strncat // [11] phi from main::@4 to strncat [phi:main::@4->strncat] strncat_from___b4: - // [11] phi strncat::source#7 = world [phi:main::@4->strncat#0] -- call_phi_near + // [11] phi strncat::source#7 = world [phi:main::@4->strncat#0] -- pbuz1=pbuc1 lda #world @@ -709,7 +709,7 @@ main: { // strncat(build, hello, 5) // [1] call strncat // [11] phi from main to strncat [phi:main->strncat] - // [11] phi strncat::source#7 = hello [phi:main->strncat#0] -- call_phi_near + // [11] phi strncat::source#7 = hello [phi:main->strncat#0] -- pbuz1=pbuc1 lda #hello @@ -720,7 +720,7 @@ main: { // strncat(build, space, 5) // [3] call strncat // [11] phi from main::@3 to strncat [phi:main::@3->strncat] - // [11] phi strncat::source#7 = space [phi:main::@3->strncat#0] -- call_phi_near + // [11] phi strncat::source#7 = space [phi:main::@3->strncat#0] -- pbuz1=pbuc1 lda #space @@ -731,7 +731,7 @@ main: { // strncat(build, world, 5) // [5] call strncat // [11] phi from main::@4 to strncat [phi:main::@4->strncat] - // [11] phi strncat::source#7 = world [phi:main::@4->strncat#0] -- call_phi_near + // [11] phi strncat::source#7 = world [phi:main::@4->strncat#0] -- pbuz1=pbuc1 lda #world diff --git a/src/test/ref/struct-11.log b/src/test/ref/struct-11.log index a13b51663..a876813e0 100644 --- a/src/test/ref/struct-11.log +++ b/src/test/ref/struct-11.log @@ -368,7 +368,7 @@ main: { sta.z print_person.person_name+1 // [5] phi idx#14 = 0 [phi:main->print_person#1] -- vbuyy=vbuc1 ldy #0 - // [5] phi print_person::person_id#2 = print_person::person_id#0 [phi:main->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = print_person::person_id#0 [phi:main->print_person#2] -- register_copy jsr print_person jmp __b1 // main::@1 @@ -384,7 +384,7 @@ main: { lda #>henriette+OFFSET_STRUCT_PERSON_NAME sta.z print_person.person_name+1 // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#1] -- register_copy - // [5] phi print_person::person_id#2 = print_person::person_id#1 [phi:main::@1->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = print_person::person_id#1 [phi:main::@1->print_person#2] -- register_copy jsr print_person jmp __breturn // main::@return @@ -548,7 +548,7 @@ main: { sta.z print_person.person_name+1 // [5] phi idx#14 = 0 [phi:main->print_person#1] -- vbuyy=vbuc1 ldy #0 - // [5] phi print_person::person_id#2 = print_person::person_id#0 [phi:main->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = print_person::person_id#0 [phi:main->print_person#2] -- register_copy jsr print_person // main::@1 // print_person(henriette) @@ -562,7 +562,7 @@ main: { lda #>henriette+OFFSET_STRUCT_PERSON_NAME sta.z print_person.person_name+1 // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#1] -- register_copy - // [5] phi print_person::person_id#2 = print_person::person_id#1 [phi:main::@1->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = print_person::person_id#1 [phi:main::@1->print_person#2] -- register_copy jsr print_person // main::@return // } diff --git a/src/test/ref/struct-11b.log b/src/test/ref/struct-11b.log index 4ab349f17..6f04d1233 100644 --- a/src/test/ref/struct-11b.log +++ b/src/test/ref/struct-11b.log @@ -306,7 +306,7 @@ main: { print_person_from_main: // [5] phi idx#20 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person_initials#4 = jesper_initials [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person_initials#4 = jesper_initials [phi:main->print_person#1] -- pbuz1=pbuc1 lda #jesper_initials @@ -321,7 +321,7 @@ main: { // [5] phi from main::@1 to print_person [phi:main::@1->print_person] print_person_from___b1: // [5] phi idx#20 = idx#14 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person_initials#4 = henry_initials [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person_initials#4 = henry_initials [phi:main::@1->print_person#1] -- pbuz1=pbuc1 lda #henry_initials @@ -452,7 +452,7 @@ main: { // [5] phi from main to print_person [phi:main->print_person] // [5] phi idx#20 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person_initials#4 = jesper_initials [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person_initials#4 = jesper_initials [phi:main->print_person#1] -- pbuz1=pbuc1 lda #jesper_initials @@ -464,7 +464,7 @@ main: { // [3] call print_person // [5] phi from main::@1 to print_person [phi:main::@1->print_person] // [5] phi idx#20 = idx#14 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person_initials#4 = henry_initials [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person_initials#4 = henry_initials [phi:main::@1->print_person#1] -- pbuz1=pbuc1 lda #henry_initials diff --git a/src/test/ref/struct-12.log b/src/test/ref/struct-12.log index 9f897fa31..7a8731e6a 100644 --- a/src/test/ref/struct-12.log +++ b/src/test/ref/struct-12.log @@ -378,7 +378,7 @@ main: { // [5] phi idx#14 = 0 [phi:main->print_person#1] -- vbuz1=vbuc1 lda #0 sta.z idx - // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- vbuxx=vbuc1 ldx #jesper_id jsr print_person jmp __b1 @@ -400,7 +400,7 @@ main: { lda #>henriette_name sta.z print_person.person_name+1 // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#1] -- register_copy - // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- vbuxx=vbuc1 ldx #henriette_id jsr print_person jmp __breturn @@ -575,7 +575,7 @@ main: { // [5] phi idx#14 = 0 [phi:main->print_person#1] -- vbuz1=vbuc1 lda #0 sta.z idx - // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- vbuxx=vbuc1 ldx #jesper_id jsr print_person // main::@1 @@ -596,7 +596,7 @@ main: { lda #>henriette_name sta.z print_person.person_name+1 // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#1] -- register_copy - // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- vbuxx=vbuc1 ldx #henriette_id jsr print_person // main::@return diff --git a/src/test/ref/struct-22.log b/src/test/ref/struct-22.log index cd1a81ea7..d064fca8f 100644 --- a/src/test/ref/struct-22.log +++ b/src/test/ref/struct-22.log @@ -224,7 +224,7 @@ main: { // [9] phi from main to print [phi:main->print] print_from_main: // [9] phi print::p_y#2 = print::p_y#0 [phi:main->print#0] -- register_copy - // [9] phi print::p_x#2 = print::p_x#0 [phi:main->print#1] -- call_phi_near + // [9] phi print::p_x#2 = print::p_x#0 [phi:main->print#1] -- register_copy jsr print jmp __b1 // main::@1 @@ -237,7 +237,7 @@ main: { // [9] phi from main::@1 to print [phi:main::@1->print] print_from___b1: // [9] phi print::p_y#2 = print::p_y#1 [phi:main::@1->print#0] -- register_copy - // [9] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#1] -- call_phi_near + // [9] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#1] -- register_copy jsr print jmp __breturn // main::@return @@ -348,7 +348,7 @@ main: { // [4] call print // [9] phi from main to print [phi:main->print] // [9] phi print::p_y#2 = print::p_y#0 [phi:main->print#0] -- register_copy - // [9] phi print::p_x#2 = print::p_x#0 [phi:main->print#1] -- call_phi_near + // [9] phi print::p_x#2 = print::p_x#0 [phi:main->print#1] -- register_copy jsr print // main::@1 // print(point2) @@ -359,7 +359,7 @@ main: { // [7] call print // [9] phi from main::@1 to print [phi:main::@1->print] // [9] phi print::p_y#2 = print::p_y#1 [phi:main::@1->print#0] -- register_copy - // [9] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#1] -- call_phi_near + // [9] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#1] -- register_copy jsr print // main::@return // } diff --git a/src/test/ref/struct-23.log b/src/test/ref/struct-23.log index 963dfa9ad..2dac27139 100644 --- a/src/test/ref/struct-23.log +++ b/src/test/ref/struct-23.log @@ -329,7 +329,7 @@ main: { getPoint_from_main: // [16] phi getPoint::return_y#2 = 3 [phi:main->getPoint#0] -- vbuaa=vbuc1 lda #3 - // [16] phi getPoint::return_x#2 = 2 [phi:main->getPoint#1] -- call_phi_near + // [16] phi getPoint::return_x#2 = 2 [phi:main->getPoint#1] -- vbuxx=vbuc1 ldx #2 jsr getPoint // [2] getPoint::return_x#0 = getPoint::return_x#2 @@ -352,7 +352,7 @@ main: { getPoint_from___b1: // [16] phi getPoint::return_y#2 = 5 [phi:main::@1->getPoint#0] -- vbuaa=vbuc1 lda #5 - // [16] phi getPoint::return_x#2 = 4 [phi:main::@1->getPoint#1] -- call_phi_near + // [16] phi getPoint::return_x#2 = 4 [phi:main::@1->getPoint#1] -- vbuxx=vbuc1 ldx #4 jsr getPoint // [9] getPoint::return_x#1 = getPoint::return_x#2 @@ -461,7 +461,7 @@ main: { // [16] phi from main to getPoint [phi:main->getPoint] // [16] phi getPoint::return_y#2 = 3 [phi:main->getPoint#0] -- vbuaa=vbuc1 lda #3 - // [16] phi getPoint::return_x#2 = 2 [phi:main->getPoint#1] -- call_phi_near + // [16] phi getPoint::return_x#2 = 2 [phi:main->getPoint#1] -- vbuxx=vbuc1 ldx #2 jsr getPoint // __ma struct Point point1 = getPoint(2, 3) @@ -485,7 +485,7 @@ main: { // [16] phi from main::@1 to getPoint [phi:main::@1->getPoint] // [16] phi getPoint::return_y#2 = 5 [phi:main::@1->getPoint#0] -- vbuaa=vbuc1 lda #5 - // [16] phi getPoint::return_x#2 = 4 [phi:main::@1->getPoint#1] -- call_phi_near + // [16] phi getPoint::return_x#2 = 4 [phi:main::@1->getPoint#1] -- vbuxx=vbuc1 ldx #4 jsr getPoint // __ma struct Point point2 = getPoint(4, 5) diff --git a/src/test/ref/struct-3.log b/src/test/ref/struct-3.log index 5918d9eca..c55db1bdc 100644 --- a/src/test/ref/struct-3.log +++ b/src/test/ref/struct-3.log @@ -286,7 +286,7 @@ main: { print_from_main: // [5] phi idx#12 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print::p_x#2 = 1 [phi:main->print#1] -- call_phi_near + // [5] phi print::p_x#2 = 1 [phi:main->print#1] -- vbuaa=vbuc1 lda #1 jsr print // [2] phi from main to main::@1 [phi:main->main::@1] @@ -298,7 +298,7 @@ main: { // [5] phi from main::@1 to print [phi:main::@1->print] print_from___b1: // [5] phi idx#12 = idx#13 [phi:main::@1->print#0] -- register_copy - // [5] phi print::p_x#2 = 2 [phi:main::@1->print#1] -- call_phi_near + // [5] phi print::p_x#2 = 2 [phi:main::@1->print#1] -- vbuaa=vbuc1 lda #2 jsr print jmp __breturn @@ -387,7 +387,7 @@ main: { // [5] phi from main to print [phi:main->print] // [5] phi idx#12 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print::p_x#2 = 1 [phi:main->print#1] -- call_phi_near + // [5] phi print::p_x#2 = 1 [phi:main->print#1] -- vbuaa=vbuc1 lda #1 jsr print // [2] phi from main to main::@1 [phi:main->main::@1] @@ -396,7 +396,7 @@ main: { // [3] call print // [5] phi from main::@1 to print [phi:main::@1->print] // [5] phi idx#12 = idx#13 [phi:main::@1->print#0] -- register_copy - // [5] phi print::p_x#2 = 2 [phi:main::@1->print#1] -- call_phi_near + // [5] phi print::p_x#2 = 2 [phi:main::@1->print#1] -- vbuaa=vbuc1 lda #2 jsr print // main::@return diff --git a/src/test/ref/struct-44.log b/src/test/ref/struct-44.log index f8aac3cdb..da5547970 100644 --- a/src/test/ref/struct-44.log +++ b/src/test/ref/struct-44.log @@ -1316,7 +1316,7 @@ main: { // [13] phi print_circle::c_center_y#2 = print_circle::c_center_y#0 [phi:main->print_circle#1] -- register_copy // [13] phi print_circle::c_center_x#2 = print_circle::c_center_x#0 [phi:main->print_circle#2] -- register_copy // [13] phi print_circle::c_radius#2 = print_circle::c_radius#0 [phi:main->print_circle#3] -- register_copy - // [13] phi screen_line#61 = (char *) 1024+(unsigned int)$28*$a [phi:main->print_circle#4] -- call_phi_near + // [13] phi screen_line#61 = (char *) 1024+(unsigned int)$28*$a [phi:main->print_circle#4] -- pbuz1=pbuc1 lda #<$400+$28*$a sta.z screen_line lda #>$400+$28*$a @@ -1330,7 +1330,7 @@ main: { // [6] call print_ln // [30] phi from main::@1 to print_ln [phi:main::@1->print_ln] print_ln_from___b1: - // [30] phi screen_line#56 = screen_line#24 [phi:main::@1->print_ln#0] -- call_phi_near + // [30] phi screen_line#56 = screen_line#24 [phi:main::@1->print_ln#0] -- register_copy jsr print_ln jmp __b2 // main::@2 @@ -1360,7 +1360,7 @@ main: { // [13] phi print_circle::c_center_y#2 = print_circle::c_center_y#1 [phi:main::@2->print_circle#1] -- register_copy // [13] phi print_circle::c_center_x#2 = print_circle::c_center_x#1 [phi:main::@2->print_circle#2] -- register_copy // [13] phi print_circle::c_radius#2 = print_circle::c_radius#1 [phi:main::@2->print_circle#3] -- register_copy - // [13] phi screen_line#61 = screen_line#25 [phi:main::@2->print_circle#4] -- call_phi_near + // [13] phi screen_line#61 = screen_line#25 [phi:main::@2->print_circle#4] -- register_copy jsr print_circle jmp __breturn // main::@return @@ -1381,7 +1381,7 @@ print_circle: { // [33] phi screen_line#68 = screen_line#61 [phi:print_circle->print_str#0] -- register_copy // [33] phi screen_idx#68 = 0 [phi:print_circle->print_str#1] -- vbuxx=vbuc1 ldx #0 - // [33] phi print_str::str#8 = print_circle::str [phi:print_circle->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str [phi:print_circle->print_str#2] -- pbuz1=pbuc1 lda #str @@ -1394,7 +1394,7 @@ print_circle: { // [16] call print_uint // [40] phi from print_circle::@1 to print_uint [phi:print_circle::@1->print_uint] print_uint_from___b1: - // [40] phi print_uint::i#3 = print_uint::i#0 [phi:print_circle::@1->print_uint#0] -- call_phi_near + // [40] phi print_uint::i#3 = print_uint::i#0 [phi:print_circle::@1->print_uint#0] -- register_copy jsr print_uint // [17] phi from print_circle::@1 to print_circle::@2 [phi:print_circle::@1->print_circle::@2] __b2_from___b1: @@ -1406,7 +1406,7 @@ print_circle: { print_str_from___b2: // [33] phi screen_line#68 = screen_line#24 [phi:print_circle::@2->print_str#0] -- register_copy // [33] phi screen_idx#68 = screen_idx#25 [phi:print_circle::@2->print_str#1] -- register_copy - // [33] phi print_str::str#8 = print_circle::str1 [phi:print_circle::@2->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str1 [phi:print_circle::@2->print_str#2] -- pbuz1=pbuc1 lda #str1 @@ -1423,7 +1423,7 @@ print_circle: { // [20] call print_uint // [40] phi from print_circle::@3 to print_uint [phi:print_circle::@3->print_uint] print_uint_from___b3: - // [40] phi print_uint::i#3 = print_uint::i#1 [phi:print_circle::@3->print_uint#0] -- call_phi_near + // [40] phi print_uint::i#3 = print_uint::i#1 [phi:print_circle::@3->print_uint#0] -- register_copy jsr print_uint // [21] phi from print_circle::@3 to print_circle::@4 [phi:print_circle::@3->print_circle::@4] __b4_from___b3: @@ -1435,7 +1435,7 @@ print_circle: { print_str_from___b4: // [33] phi screen_line#68 = screen_line#24 [phi:print_circle::@4->print_str#0] -- register_copy // [33] phi screen_idx#68 = screen_idx#25 [phi:print_circle::@4->print_str#1] -- register_copy - // [33] phi print_str::str#8 = print_circle::str2 [phi:print_circle::@4->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str2 [phi:print_circle::@4->print_str#2] -- pbuz1=pbuc1 lda #str2 @@ -1452,7 +1452,7 @@ print_circle: { // [24] call print_uint // [40] phi from print_circle::@5 to print_uint [phi:print_circle::@5->print_uint] print_uint_from___b5: - // [40] phi print_uint::i#3 = print_uint::i#2 [phi:print_circle::@5->print_uint#0] -- call_phi_near + // [40] phi print_uint::i#3 = print_uint::i#2 [phi:print_circle::@5->print_uint#0] -- register_copy jsr print_uint // [25] phi from print_circle::@5 to print_circle::@6 [phi:print_circle::@5->print_circle::@6] __b6_from___b5: @@ -1464,7 +1464,7 @@ print_circle: { print_str_from___b6: // [33] phi screen_line#68 = screen_line#24 [phi:print_circle::@6->print_str#0] -- register_copy // [33] phi screen_idx#68 = screen_idx#25 [phi:print_circle::@6->print_str#1] -- register_copy - // [33] phi print_str::str#8 = print_circle::str3 [phi:print_circle::@6->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str3 [phi:print_circle::@6->print_str#2] -- pbuz1=pbuc1 lda #str3 @@ -1474,7 +1474,7 @@ print_circle: { // print_circle::@7 __b7: // [27] print_uchar::c#0 = print_circle::c_color#2 - // [28] call print_uchar -- call_phi_near + // [28] call print_uchar jsr print_uchar jmp __breturn // print_circle::@return @@ -1541,7 +1541,7 @@ print_str: { print_char_from___b2: // [65] phi screen_idx#54 = screen_idx#22 [phi:print_str::@2->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#22 [phi:print_str::@2->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#6 [phi:print_str::@2->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#6 [phi:print_str::@2->print_char#2] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -1572,7 +1572,7 @@ print_uint: { print_char_from_print_uint: // [65] phi screen_idx#54 = screen_idx#22 [phi:print_uint->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#22 [phi:print_uint->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#0 [phi:print_uint->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#0 [phi:print_uint->print_char#2] -- register_copy jsr print_char jmp __b1 // print_uint::@1 @@ -1589,7 +1589,7 @@ print_uint: { print_char_from___b1: // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uint::@1->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uint::@1->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#1 [phi:print_uint::@1->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#1 [phi:print_uint::@1->print_char#2] -- register_copy jsr print_char jmp __b2 // print_uint::@2 @@ -1609,7 +1609,7 @@ print_uint: { print_char_from___b2: // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uint::@2->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uint::@2->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#2 [phi:print_uint::@2->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#2 [phi:print_uint::@2->print_char#2] -- register_copy jsr print_char jmp __b3 // print_uint::@3 @@ -1626,7 +1626,7 @@ print_uint: { print_char_from___b3: // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uint::@3->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uint::@3->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#3 [phi:print_uint::@3->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#3 [phi:print_uint::@3->print_char#2] -- register_copy jsr print_char jmp __breturn // print_uint::@return @@ -1652,7 +1652,7 @@ print_uchar: { print_char_from_print_uchar: // [65] phi screen_idx#54 = screen_idx#22 [phi:print_uchar->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#22 [phi:print_uchar->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#4 [phi:print_uchar->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#4 [phi:print_uchar->print_char#2] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1668,7 +1668,7 @@ print_uchar: { print_char_from___b1: // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uchar::@1->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uchar::@1->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#5 [phi:print_uchar::@1->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#5 [phi:print_uchar::@1->print_char#2] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1696,7 +1696,7 @@ print_char: { // [70] call print_ln // [30] phi from print_char::@1 to print_ln [phi:print_char::@1->print_ln] print_ln_from___b1: - // [30] phi screen_line#56 = screen_line#53 [phi:print_char::@1->print_ln#0] -- call_phi_near + // [30] phi screen_line#56 = screen_line#53 [phi:print_char::@1->print_ln#0] -- register_copy jsr print_ln // [71] phi from print_char::@1 to print_char::@return [phi:print_char::@1->print_char::@return] __breturn_from___b1: @@ -1957,7 +1957,7 @@ main: { // [13] phi print_circle::c_center_y#2 = print_circle::c_center_y#0 [phi:main->print_circle#1] -- register_copy // [13] phi print_circle::c_center_x#2 = print_circle::c_center_x#0 [phi:main->print_circle#2] -- register_copy // [13] phi print_circle::c_radius#2 = print_circle::c_radius#0 [phi:main->print_circle#3] -- register_copy - // [13] phi screen_line#61 = (char *) 1024+(unsigned int)$28*$a [phi:main->print_circle#4] -- call_phi_near + // [13] phi screen_line#61 = (char *) 1024+(unsigned int)$28*$a [phi:main->print_circle#4] -- pbuz1=pbuc1 lda #<$400+$28*$a sta.z screen_line lda #>$400+$28*$a @@ -1968,7 +1968,7 @@ main: { // print_ln() // [6] call print_ln // [30] phi from main::@1 to print_ln [phi:main::@1->print_ln] - // [30] phi screen_line#56 = screen_line#24 [phi:main::@1->print_ln#0] -- call_phi_near + // [30] phi screen_line#56 = screen_line#24 [phi:main::@1->print_ln#0] -- register_copy jsr print_ln // main::@2 // print_circle(c2) @@ -1996,7 +1996,7 @@ main: { // [13] phi print_circle::c_center_y#2 = print_circle::c_center_y#1 [phi:main::@2->print_circle#1] -- register_copy // [13] phi print_circle::c_center_x#2 = print_circle::c_center_x#1 [phi:main::@2->print_circle#2] -- register_copy // [13] phi print_circle::c_radius#2 = print_circle::c_radius#1 [phi:main::@2->print_circle#3] -- register_copy - // [13] phi screen_line#61 = screen_line#25 [phi:main::@2->print_circle#4] -- call_phi_near + // [13] phi screen_line#61 = screen_line#25 [phi:main::@2->print_circle#4] -- register_copy jsr print_circle // main::@return // } @@ -2016,7 +2016,7 @@ print_circle: { // [33] phi screen_line#68 = screen_line#61 [phi:print_circle->print_str#0] -- register_copy // [33] phi screen_idx#68 = 0 [phi:print_circle->print_str#1] -- vbuxx=vbuc1 ldx #0 - // [33] phi print_str::str#8 = print_circle::str [phi:print_circle->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str [phi:print_circle->print_str#2] -- pbuz1=pbuc1 lda #str @@ -2027,7 +2027,7 @@ print_circle: { // [15] print_uint::i#0 = print_circle::c_radius#2 // [16] call print_uint // [40] phi from print_circle::@1 to print_uint [phi:print_circle::@1->print_uint] - // [40] phi print_uint::i#3 = print_uint::i#0 [phi:print_circle::@1->print_uint#0] -- call_phi_near + // [40] phi print_uint::i#3 = print_uint::i#0 [phi:print_circle::@1->print_uint#0] -- register_copy jsr print_uint // [17] phi from print_circle::@1 to print_circle::@2 [phi:print_circle::@1->print_circle::@2] // print_circle::@2 @@ -2036,7 +2036,7 @@ print_circle: { // [33] phi from print_circle::@2 to print_str [phi:print_circle::@2->print_str] // [33] phi screen_line#68 = screen_line#24 [phi:print_circle::@2->print_str#0] -- register_copy // [33] phi screen_idx#68 = screen_idx#25 [phi:print_circle::@2->print_str#1] -- register_copy - // [33] phi print_str::str#8 = print_circle::str1 [phi:print_circle::@2->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str1 [phi:print_circle::@2->print_str#2] -- pbuz1=pbuc1 lda #str1 @@ -2051,7 +2051,7 @@ print_circle: { sta.z print_uint.i+1 // [20] call print_uint // [40] phi from print_circle::@3 to print_uint [phi:print_circle::@3->print_uint] - // [40] phi print_uint::i#3 = print_uint::i#1 [phi:print_circle::@3->print_uint#0] -- call_phi_near + // [40] phi print_uint::i#3 = print_uint::i#1 [phi:print_circle::@3->print_uint#0] -- register_copy jsr print_uint // [21] phi from print_circle::@3 to print_circle::@4 [phi:print_circle::@3->print_circle::@4] // print_circle::@4 @@ -2060,7 +2060,7 @@ print_circle: { // [33] phi from print_circle::@4 to print_str [phi:print_circle::@4->print_str] // [33] phi screen_line#68 = screen_line#24 [phi:print_circle::@4->print_str#0] -- register_copy // [33] phi screen_idx#68 = screen_idx#25 [phi:print_circle::@4->print_str#1] -- register_copy - // [33] phi print_str::str#8 = print_circle::str2 [phi:print_circle::@4->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str2 [phi:print_circle::@4->print_str#2] -- pbuz1=pbuc1 lda #str2 @@ -2075,7 +2075,7 @@ print_circle: { sta.z print_uint.i+1 // [24] call print_uint // [40] phi from print_circle::@5 to print_uint [phi:print_circle::@5->print_uint] - // [40] phi print_uint::i#3 = print_uint::i#2 [phi:print_circle::@5->print_uint#0] -- call_phi_near + // [40] phi print_uint::i#3 = print_uint::i#2 [phi:print_circle::@5->print_uint#0] -- register_copy jsr print_uint // [25] phi from print_circle::@5 to print_circle::@6 [phi:print_circle::@5->print_circle::@6] // print_circle::@6 @@ -2084,7 +2084,7 @@ print_circle: { // [33] phi from print_circle::@6 to print_str [phi:print_circle::@6->print_str] // [33] phi screen_line#68 = screen_line#24 [phi:print_circle::@6->print_str#0] -- register_copy // [33] phi screen_idx#68 = screen_idx#25 [phi:print_circle::@6->print_str#1] -- register_copy - // [33] phi print_str::str#8 = print_circle::str3 [phi:print_circle::@6->print_str#2] -- call_phi_near + // [33] phi print_str::str#8 = print_circle::str3 [phi:print_circle::@6->print_str#2] -- pbuz1=pbuc1 lda #str3 @@ -2093,7 +2093,7 @@ print_circle: { // print_circle::@7 // print_uchar(c.color) // [27] print_uchar::c#0 = print_circle::c_color#2 - // [28] call print_uchar -- call_phi_near + // [28] call print_uchar jsr print_uchar // print_circle::@return // } @@ -2156,7 +2156,7 @@ print_str: { // [65] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [65] phi screen_idx#54 = screen_idx#22 [phi:print_str::@2->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#22 [phi:print_str::@2->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#6 [phi:print_str::@2->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#6 [phi:print_str::@2->print_char#2] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); @@ -2188,7 +2188,7 @@ print_uint: { // [65] phi from print_uint to print_char [phi:print_uint->print_char] // [65] phi screen_idx#54 = screen_idx#22 [phi:print_uint->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#22 [phi:print_uint->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#0 [phi:print_uint->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#0 [phi:print_uint->print_char#2] -- register_copy jsr print_char // print_uint::@1 // BYTE1(i) @@ -2205,7 +2205,7 @@ print_uint: { // [65] phi from print_uint::@1 to print_char [phi:print_uint::@1->print_char] // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uint::@1->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uint::@1->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#1 [phi:print_uint::@1->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#1 [phi:print_uint::@1->print_char#2] -- register_copy jsr print_char // print_uint::@2 // BYTE0(i) @@ -2225,7 +2225,7 @@ print_uint: { // [65] phi from print_uint::@2 to print_char [phi:print_uint::@2->print_char] // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uint::@2->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uint::@2->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#2 [phi:print_uint::@2->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#2 [phi:print_uint::@2->print_char#2] -- register_copy jsr print_char // print_uint::@3 // BYTE0(i) @@ -2242,7 +2242,7 @@ print_uint: { // [65] phi from print_uint::@3 to print_char [phi:print_uint::@3->print_char] // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uint::@3->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uint::@3->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#3 [phi:print_uint::@3->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#3 [phi:print_uint::@3->print_char#2] -- register_copy jsr print_char // print_uint::@return // } @@ -2268,7 +2268,7 @@ print_uchar: { // [65] phi from print_uchar to print_char [phi:print_uchar->print_char] // [65] phi screen_idx#54 = screen_idx#22 [phi:print_uchar->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#22 [phi:print_uchar->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#4 [phi:print_uchar->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#4 [phi:print_uchar->print_char#2] -- register_copy jsr print_char // print_uchar::@1 // c&0x0f @@ -2283,7 +2283,7 @@ print_uchar: { // [65] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [65] phi screen_idx#54 = screen_idx#25 [phi:print_uchar::@1->print_char#0] -- register_copy // [65] phi screen_line#53 = screen_line#24 [phi:print_uchar::@1->print_char#1] -- register_copy - // [65] phi print_char::c#7 = print_char::c#5 [phi:print_uchar::@1->print_char#2] -- call_phi_near + // [65] phi print_char::c#7 = print_char::c#5 [phi:print_uchar::@1->print_char#2] -- register_copy jsr print_char // print_uchar::@return // } @@ -2310,7 +2310,7 @@ print_char: { // print_ln() // [70] call print_ln // [30] phi from print_char::@1 to print_ln [phi:print_char::@1->print_ln] - // [30] phi screen_line#56 = screen_line#53 [phi:print_char::@1->print_ln#0] -- call_phi_near + // [30] phi screen_line#56 = screen_line#53 [phi:print_char::@1->print_ln#0] -- register_copy jsr print_ln // [71] phi from print_char::@1 to print_char::@return [phi:print_char::@1->print_char::@return] // [71] phi screen_line#24 = screen_line#25 [phi:print_char::@1->print_char::@return#0] -- register_copy diff --git a/src/test/ref/struct-5.log b/src/test/ref/struct-5.log index 160d184c7..562daa3bc 100644 --- a/src/test/ref/struct-5.log +++ b/src/test/ref/struct-5.log @@ -205,7 +205,7 @@ ASSEMBLER BEFORE OPTIMIZATION main: { .label SCREEN = $400 // [1] call point - // [5] phi from main to point [phi:main->point] -- call_phi_near + // [5] phi from main to point [phi:main->point] point_from_main: jsr point jmp __b1 @@ -281,7 +281,7 @@ main: { .label SCREEN = $400 // point() // [1] call point - // [5] phi from main to point [phi:main->point] -- call_phi_near + // [5] phi from main to point [phi:main->point] jsr point // main::@1 // SCREEN[0] = q.x diff --git a/src/test/ref/struct-pointer-ints.log b/src/test/ref/struct-pointer-ints.log index 929f043f6..439c9747a 100644 --- a/src/test/ref/struct-pointer-ints.log +++ b/src/test/ref/struct-pointer-ints.log @@ -198,7 +198,7 @@ main: { dey sta s,y bne !- - // [1] call update -- call_phi_near + // [1] call update jsr update jmp __breturn // main::@return @@ -279,7 +279,7 @@ main: { sta s,y bne !- // update(&s, 1000) - // [1] call update -- call_phi_near + // [1] call update jsr update // main::@return // } diff --git a/src/test/ref/struct-ptr-14.log b/src/test/ref/struct-ptr-14.log index 62e3627d2..f3667e527 100644 --- a/src/test/ref/struct-ptr-14.log +++ b/src/test/ref/struct-ptr-14.log @@ -219,7 +219,7 @@ main: { sta p-1,y dey bne !- - // [1] call set -- call_phi_near + // [1] call set jsr set jmp __b1 // main::@1 @@ -311,7 +311,7 @@ main: { dey bne !- // set(q) - // [1] call set -- call_phi_near + // [1] call set jsr set // main::@1 // SCREEN[0] = q->x diff --git a/src/test/ref/struct-ptr-16.log b/src/test/ref/struct-ptr-16.log index ae180a3ec..efca071e2 100644 --- a/src/test/ref/struct-ptr-16.log +++ b/src/test/ref/struct-ptr-16.log @@ -510,7 +510,7 @@ main: { // [1] call get // [21] phi from main to get [phi:main->get] get_from_main: - // [21] phi get::i#2 = 0 [phi:main->get#0] -- call_phi_near + // [21] phi get::i#2 = 0 [phi:main->get#0] -- vbuaa=vbuc1 lda #0 jsr get // [2] get::return_x#0 = get::return_x#7 @@ -540,7 +540,7 @@ main: { // [10] call get // [21] phi from main::@1 to get [phi:main::@1->get] get_from___b1: - // [21] phi get::i#2 = get::i#1 [phi:main::@1->get#0] -- call_phi_near + // [21] phi get::i#2 = get::i#1 [phi:main::@1->get#0] -- register_copy jsr get // [11] get::return_x#1 = get::return_x#7 // [12] get::return_y#1 = get::return_y#7 @@ -731,7 +731,7 @@ main: { // get(0) // [1] call get // [21] phi from main to get [phi:main->get] - // [21] phi get::i#2 = 0 [phi:main->get#0] -- call_phi_near + // [21] phi get::i#2 = 0 [phi:main->get#0] -- vbuaa=vbuc1 lda #0 jsr get // get(0) @@ -757,7 +757,7 @@ main: { tya // [10] call get // [21] phi from main::@1 to get [phi:main::@1->get] - // [21] phi get::i#2 = get::i#1 [phi:main::@1->get#0] -- call_phi_near + // [21] phi get::i#2 = get::i#1 [phi:main::@1->get#0] -- register_copy jsr get // get(i) // [11] get::return_x#1 = get::return_x#7 diff --git a/src/test/ref/struct-ptr-17.log b/src/test/ref/struct-ptr-17.log index 21ef57152..25a9edc1e 100644 --- a/src/test/ref/struct-ptr-17.log +++ b/src/test/ref/struct-ptr-17.log @@ -337,7 +337,7 @@ main: { // [1] call get // [17] phi from main to get [phi:main->get] get_from_main: - // [17] phi get::return_x#2 = 0 [phi:main->get#0] -- call_phi_near + // [17] phi get::return_x#2 = 0 [phi:main->get#0] -- vbuaa=vbuc1 lda #0 jsr get // [2] get::return_x#0 = get::return_x#2 @@ -366,7 +366,7 @@ main: { // [8] call get // [17] phi from main::@1 to get [phi:main::@1->get] get_from___b1: - // [17] phi get::return_x#2 = get::i#1 [phi:main::@1->get#0] -- call_phi_near + // [17] phi get::return_x#2 = get::i#1 [phi:main::@1->get#0] -- register_copy jsr get // [9] get::return_x#1 = get::return_x#2 jmp __b3 @@ -483,7 +483,7 @@ main: { // get(0) // [1] call get // [17] phi from main to get [phi:main->get] - // [17] phi get::return_x#2 = 0 [phi:main->get#0] -- call_phi_near + // [17] phi get::return_x#2 = 0 [phi:main->get#0] -- vbuaa=vbuc1 lda #0 jsr get // get(0) @@ -508,7 +508,7 @@ main: { tya // [8] call get // [17] phi from main::@1 to get [phi:main::@1->get] - // [17] phi get::return_x#2 = get::i#1 [phi:main::@1->get#0] -- call_phi_near + // [17] phi get::return_x#2 = get::i#1 [phi:main::@1->get#0] -- register_copy jsr get // get(i) // [9] get::return_x#1 = get::return_x#2 diff --git a/src/test/ref/struct-ptr-18.log b/src/test/ref/struct-ptr-18.log index aef25a7ae..01cd484ed 100644 --- a/src/test/ref/struct-ptr-18.log +++ b/src/test/ref/struct-ptr-18.log @@ -366,7 +366,7 @@ main: { // [5] print::p_y#0 = ((char *)points+OFFSET_STRUCT_POINT_Y)[main::$4] -- vbuyy=pbuc1_derefidx_vbuyy lda points+OFFSET_STRUCT_POINT_Y,y tay - // [6] call print -- call_phi_near + // [6] call print jsr print jmp __b2 // main::@2 @@ -518,7 +518,7 @@ main: { // [5] print::p_y#0 = ((char *)points+OFFSET_STRUCT_POINT_Y)[main::$4] -- vbuyy=pbuc1_derefidx_vbuyy lda points+OFFSET_STRUCT_POINT_Y,y tay - // [6] call print -- call_phi_near + // [6] call print jsr print // main::@2 // for ( char i: 0..1) diff --git a/src/test/ref/struct-ptr-19.log b/src/test/ref/struct-ptr-19.log index 1ce20220d..7fedae1e8 100644 --- a/src/test/ref/struct-ptr-19.log +++ b/src/test/ref/struct-ptr-19.log @@ -302,7 +302,7 @@ main: { // [8] phi idx#12 = 0 [phi:main->print#1] -- vbuz1=vbuc1 lda #0 sta.z idx - // [8] phi print::p_x#2 = print::p_x#0 [phi:main->print#2] -- call_phi_near + // [8] phi print::p_x#2 = print::p_x#0 [phi:main->print#2] -- register_copy jsr print jmp __b1 // main::@1 @@ -316,7 +316,7 @@ main: { print_from___b1: // [8] phi print::p_y#2 = print::p_y#1 [phi:main::@1->print#0] -- register_copy // [8] phi idx#12 = idx#13 [phi:main::@1->print#1] -- register_copy - // [8] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#2] -- call_phi_near + // [8] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#2] -- register_copy jsr print jmp __breturn // main::@return @@ -437,7 +437,7 @@ main: { // [8] phi idx#12 = 0 [phi:main->print#1] -- vbuz1=vbuc1 lda #0 sta.z idx - // [8] phi print::p_x#2 = print::p_x#0 [phi:main->print#2] -- call_phi_near + // [8] phi print::p_x#2 = print::p_x#0 [phi:main->print#2] -- register_copy jsr print // main::@1 // print(*ptr) @@ -449,7 +449,7 @@ main: { // [8] phi from main::@1 to print [phi:main::@1->print] // [8] phi print::p_y#2 = print::p_y#1 [phi:main::@1->print#0] -- register_copy // [8] phi idx#12 = idx#13 [phi:main::@1->print#1] -- register_copy - // [8] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#2] -- call_phi_near + // [8] phi print::p_x#2 = print::p_x#1 [phi:main::@1->print#2] -- register_copy jsr print // main::@return // } diff --git a/src/test/ref/struct-ptr-22.log b/src/test/ref/struct-ptr-22.log index 4c11521d2..a2ca0c0e0 100644 --- a/src/test/ref/struct-ptr-22.log +++ b/src/test/ref/struct-ptr-22.log @@ -1039,7 +1039,7 @@ main: { sta (__13),y // [4] call print_cls // writes address 0x4004 (right!) - // [18] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [18] phi from main to print_cls [phi:main->print_cls] print_cls_from_main: jsr print_cls // [5] phi from main to main::@1 [phi:main->main::@1] @@ -1055,7 +1055,7 @@ main: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [21] phi print_str::str#6 = main::str [phi:main::@1->print_str#1] -- call_phi_near + // [21] phi print_str::str#6 = main::str [phi:main::@1->print_str#1] -- pbuz1=pbuc1 lda #str @@ -1069,7 +1069,7 @@ main: { // [8] call print_uchar // [28] phi from main::@2 to print_uchar [phi:main::@2->print_uchar] print_uchar_from___b2: - // [28] phi print_uchar::b#2 = print_uchar::b#0 [phi:main::@2->print_uchar#0] -- call_phi_near + // [28] phi print_uchar::b#2 = print_uchar::b#0 [phi:main::@2->print_uchar#0] -- register_copy jsr print_uchar // [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -1079,7 +1079,7 @@ main: { // [10] call print_ln // [36] phi from main::@3 to print_ln [phi:main::@3->print_ln] print_ln_from___b3: - // [36] phi print_line_cursor#21 = print_screen#0 [phi:main::@3->print_ln#0] -- call_phi_near + // [36] phi print_line_cursor#21 = print_screen#0 [phi:main::@3->print_ln#0] -- pbuz1=pbuc1 lda #print_screen @@ -1097,7 +1097,7 @@ main: { // [21] phi from main::@4 to print_str [phi:main::@4->print_str] print_str_from___b4: // [21] phi print_char_cursor#48 = print_char_cursor#49 [phi:main::@4->print_str#0] -- register_copy - // [21] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- call_phi_near + // [21] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -1111,7 +1111,7 @@ main: { // [14] call print_uchar // [28] phi from main::@5 to print_uchar [phi:main::@5->print_uchar] print_uchar_from___b5: - // [28] phi print_uchar::b#2 = print_uchar::b#1 [phi:main::@5->print_uchar#0] -- call_phi_near + // [28] phi print_uchar::b#2 = print_uchar::b#1 [phi:main::@5->print_uchar#0] -- register_copy jsr print_uchar // [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6] __b6_from___b5: @@ -1121,7 +1121,7 @@ main: { // [16] call print_ln // [36] phi from main::@6 to print_ln [phi:main::@6->print_ln] print_ln_from___b6: - // [36] phi print_line_cursor#21 = print_line_cursor#0 [phi:main::@6->print_ln#0] -- call_phi_near + // [36] phi print_line_cursor#21 = print_line_cursor#0 [phi:main::@6->print_ln#0] -- register_copy jsr print_ln jmp __breturn // main::@return @@ -1139,7 +1139,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [19] call memset - // [41] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [41] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -1180,7 +1180,7 @@ print_str: { // [47] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [47] phi print_char_cursor#29 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [47] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [47] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -1210,7 +1210,7 @@ print_uchar: { // [47] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [47] phi print_char_cursor#29 = print_char_cursor#1 [phi:print_uchar->print_char#0] -- register_copy - // [47] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [47] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1224,7 +1224,7 @@ print_uchar: { // [47] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [47] phi print_char_cursor#29 = print_char_cursor#30 [phi:print_uchar::@1->print_char#0] -- register_copy - // [47] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [47] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1516,7 +1516,7 @@ main: { // print_cls() // [4] call print_cls // writes address 0x4004 (right!) - // [18] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [18] phi from main to print_cls [phi:main->print_cls] jsr print_cls // [5] phi from main to main::@1 [phi:main->main::@1] // main::@1 @@ -1528,7 +1528,7 @@ main: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [21] phi print_str::str#6 = main::str [phi:main::@1->print_str#1] -- call_phi_near + // [21] phi print_str::str#6 = main::str [phi:main::@1->print_str#1] -- pbuz1=pbuc1 lda #str @@ -1540,14 +1540,14 @@ main: { ldx.z 0 // [8] call print_uchar // [28] phi from main::@2 to print_uchar [phi:main::@2->print_uchar] - // [28] phi print_uchar::b#2 = print_uchar::b#0 [phi:main::@2->print_uchar#0] -- call_phi_near + // [28] phi print_uchar::b#2 = print_uchar::b#0 [phi:main::@2->print_uchar#0] -- register_copy jsr print_uchar // [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // print_ln() // [10] call print_ln // [36] phi from main::@3 to print_ln [phi:main::@3->print_ln] - // [36] phi print_line_cursor#21 = print_screen#0 [phi:main::@3->print_ln#0] -- call_phi_near + // [36] phi print_line_cursor#21 = print_screen#0 [phi:main::@3->print_ln#0] -- pbuz1=pbuc1 lda #print_screen @@ -1563,7 +1563,7 @@ main: { // [12] call print_str // [21] phi from main::@4 to print_str [phi:main::@4->print_str] // [21] phi print_char_cursor#48 = print_char_cursor#49 [phi:main::@4->print_str#0] -- register_copy - // [21] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- call_phi_near + // [21] phi print_str::str#6 = main::str1 [phi:main::@4->print_str#1] -- pbuz1=pbuc1 lda #str1 @@ -1575,14 +1575,14 @@ main: { ldx $4004 // [14] call print_uchar // [28] phi from main::@5 to print_uchar [phi:main::@5->print_uchar] - // [28] phi print_uchar::b#2 = print_uchar::b#1 [phi:main::@5->print_uchar#0] -- call_phi_near + // [28] phi print_uchar::b#2 = print_uchar::b#1 [phi:main::@5->print_uchar#0] -- register_copy jsr print_uchar // [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6] // main::@6 // print_ln() // [16] call print_ln // [36] phi from main::@6 to print_ln [phi:main::@6->print_ln] - // [36] phi print_line_cursor#21 = print_line_cursor#0 [phi:main::@6->print_ln#0] -- call_phi_near + // [36] phi print_line_cursor#21 = print_line_cursor#0 [phi:main::@6->print_ln#0] -- register_copy jsr print_ln // main::@return // } @@ -1600,7 +1600,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [19] call memset - // [41] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [41] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -1636,7 +1636,7 @@ print_str: { // [26] call print_char // [47] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [47] phi print_char_cursor#29 = print_char_cursor#1 [phi:print_str::@2->print_char#0] -- register_copy - // [47] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [47] phi print_char::ch#3 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); @@ -1666,7 +1666,7 @@ print_uchar: { // Table of hexadecimal digits // [47] phi from print_uchar to print_char [phi:print_uchar->print_char] // [47] phi print_char_cursor#29 = print_char_cursor#1 [phi:print_uchar->print_char#0] -- register_copy - // [47] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [47] phi print_char::ch#3 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -1679,7 +1679,7 @@ print_uchar: { // [34] call print_char // [47] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [47] phi print_char_cursor#29 = print_char_cursor#30 [phi:print_uchar::@1->print_char#0] -- register_copy - // [47] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [47] phi print_char::ch#3 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/struct-ptr-23.log b/src/test/ref/struct-ptr-23.log index 670db72d5..cbf14967f 100644 --- a/src/test/ref/struct-ptr-23.log +++ b/src/test/ref/struct-ptr-23.log @@ -391,7 +391,7 @@ main: { print_person_from_main: // [5] phi idx#16 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- pssz1=pssc1 lda #persons @@ -406,7 +406,7 @@ main: { // [5] phi from main::@1 to print_person [phi:main::@1->print_person] print_person_from___b1: // [5] phi idx#16 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = main::person#1 [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = main::person#1 [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #person @@ -567,7 +567,7 @@ main: { // [5] phi from main to print_person [phi:main->print_person] // [5] phi idx#16 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- pssz1=pssc1 lda #persons @@ -579,7 +579,7 @@ main: { // [3] call print_person // [5] phi from main::@1 to print_person [phi:main::@1->print_person] // [5] phi idx#16 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = main::person#1 [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = main::person#1 [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #person diff --git a/src/test/ref/struct-ptr-24.log b/src/test/ref/struct-ptr-24.log index 86e8070b3..612b6a134 100644 --- a/src/test/ref/struct-ptr-24.log +++ b/src/test/ref/struct-ptr-24.log @@ -227,7 +227,7 @@ main: { // main::@2 __b2: // [4] PrintName::file#0 = main::file#2 - // [5] call PrintName -- call_phi_near + // [5] call PrintName jsr PrintName jmp __b3 // main::@3 @@ -345,7 +345,7 @@ main: { __b2: // PrintName(file) // [4] PrintName::file#0 = main::file#2 - // [5] call PrintName -- call_phi_near + // [5] call PrintName jsr PrintName // main::@3 // ++file; diff --git a/src/test/ref/struct-ptr-26.log b/src/test/ref/struct-ptr-26.log index 00c214918..883b54c3a 100644 --- a/src/test/ref/struct-ptr-26.log +++ b/src/test/ref/struct-ptr-26.log @@ -501,7 +501,7 @@ main: { lda ($fe),y sta.z uSize+1 // [2] print_uint::w#0 = main::uSize#1 - // [3] call print_uint -- call_phi_near + // [3] call print_uint jsr print_uint jmp __breturn // main::@return @@ -524,7 +524,7 @@ print_uint: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [10] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [10] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -535,7 +535,7 @@ print_uint: { // [10] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [10] phi print_char_cursor#26 = print_char_cursor#20 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [10] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [10] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -561,7 +561,7 @@ print_uchar: { // [18] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [18] phi print_char_cursor#19 = print_char_cursor#26 [phi:print_uchar->print_char#0] -- register_copy - // [18] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [18] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -575,7 +575,7 @@ print_uchar: { // [18] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [18] phi print_char_cursor#19 = print_char_cursor#20 [phi:print_uchar::@1->print_char#0] -- register_copy - // [18] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [18] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -713,7 +713,7 @@ main: { sta.z uSize+1 // print_uint(uSize) // [2] print_uint::w#0 = main::uSize#1 - // [3] call print_uint -- call_phi_near + // [3] call print_uint jsr print_uint // main::@return // } @@ -735,7 +735,7 @@ print_uint: { sta.z print_char_cursor lda #>print_screen sta.z print_char_cursor+1 - // [10] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [10] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -744,7 +744,7 @@ print_uint: { // [8] call print_uchar // [10] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [10] phi print_char_cursor#26 = print_char_cursor#20 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [10] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [10] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -770,7 +770,7 @@ print_uchar: { // Table of hexadecimal digits // [18] phi from print_uchar to print_char [phi:print_uchar->print_char] // [18] phi print_char_cursor#19 = print_char_cursor#26 [phi:print_uchar->print_char#0] -- register_copy - // [18] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [18] phi print_char::ch#2 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -783,7 +783,7 @@ print_uchar: { // [16] call print_char // [18] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [18] phi print_char_cursor#19 = print_char_cursor#20 [phi:print_uchar::@1->print_char#0] -- register_copy - // [18] phi print_char::ch#2 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [18] phi print_char::ch#2 = 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/struct-ptr-28.log b/src/test/ref/struct-ptr-28.log index b55726613..16f789147 100644 --- a/src/test/ref/struct-ptr-28.log +++ b/src/test/ref/struct-ptr-28.log @@ -406,7 +406,7 @@ main: { print_person_from_main: // [5] phi idx#14 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = &main::jesper [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = &main::jesper [phi:main->print_person#1] -- pssz1=pssc1 lda #jesper @@ -426,7 +426,7 @@ main: { // [5] phi from main::@1 to print_person [phi:main::@1->print_person] print_person_from___b1: // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = &main::henriette [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = &main::henriette [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #henriette @@ -618,7 +618,7 @@ main: { // [5] phi from main to print_person [phi:main->print_person] // [5] phi idx#14 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = &main::jesper [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = &main::jesper [phi:main->print_person#1] -- pssz1=pssc1 lda #jesper @@ -637,7 +637,7 @@ main: { // [3] call print_person // [5] phi from main::@1 to print_person [phi:main::@1->print_person] // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = &main::henriette [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = &main::henriette [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #henriette diff --git a/src/test/ref/struct-ptr-29.log b/src/test/ref/struct-ptr-29.log index f5178c5fa..0851f3245 100644 --- a/src/test/ref/struct-ptr-29.log +++ b/src/test/ref/struct-ptr-29.log @@ -372,7 +372,7 @@ main: { print_person_from_main: // [5] phi idx#14 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- pssz1=pssc1 lda #persons @@ -387,7 +387,7 @@ main: { // [5] phi from main::@1 to print_person [phi:main::@1->print_person] print_person_from___b1: // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #persons+1*SIZEOF_STRUCT_PERSON @@ -559,7 +559,7 @@ main: { // [5] phi from main to print_person [phi:main->print_person] // [5] phi idx#14 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- pssz1=pssc1 lda #persons @@ -571,7 +571,7 @@ main: { // [3] call print_person // [5] phi from main::@1 to print_person [phi:main::@1->print_person] // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #persons+1*SIZEOF_STRUCT_PERSON diff --git a/src/test/ref/struct-ptr-30.log b/src/test/ref/struct-ptr-30.log index f5c1e15fd..ac2bddd57 100644 --- a/src/test/ref/struct-ptr-30.log +++ b/src/test/ref/struct-ptr-30.log @@ -375,7 +375,7 @@ main: { sta.z print.p_y lda points+OFFSET_STRUCT_POINT_Y+1,y sta.z print.p_y+1 - // [6] call print -- call_phi_near + // [6] call print jsr print jmp __b2 // main::@2 @@ -543,7 +543,7 @@ main: { sta.z print.p_y lda points+OFFSET_STRUCT_POINT_Y+1,y sta.z print.p_y+1 - // [6] call print -- call_phi_near + // [6] call print jsr print // main::@2 // for ( char i: 0..3) diff --git a/src/test/ref/struct-ptr-31.log b/src/test/ref/struct-ptr-31.log index 40b5b2919..6a4043e79 100644 --- a/src/test/ref/struct-ptr-31.log +++ b/src/test/ref/struct-ptr-31.log @@ -378,7 +378,7 @@ main: { print_person_from_main: // [5] phi idx#14 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- pssz1=pssc1 lda #persons @@ -393,7 +393,7 @@ main: { // [5] phi from main::@1 to print_person [phi:main::@1->print_person] print_person_from___b1: // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #persons+1*SIZEOF_STRUCT_PERSON @@ -570,7 +570,7 @@ main: { // [5] phi from main to print_person [phi:main->print_person] // [5] phi idx#14 = 0 [phi:main->print_person#0] -- vbuxx=vbuc1 ldx #0 - // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons [phi:main->print_person#1] -- pssz1=pssc1 lda #persons @@ -582,7 +582,7 @@ main: { // [3] call print_person // [5] phi from main::@1 to print_person [phi:main::@1->print_person] // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#0] -- register_copy - // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- call_phi_near + // [5] phi print_person::person#2 = persons+1*SIZEOF_STRUCT_PERSON [phi:main::@1->print_person#1] -- pssz1=pssc1 lda #persons+1*SIZEOF_STRUCT_PERSON diff --git a/src/test/ref/struct-ptr-34.log b/src/test/ref/struct-ptr-34.log index a40dc698b..7c8268e35 100644 --- a/src/test/ref/struct-ptr-34.log +++ b/src/test/ref/struct-ptr-34.log @@ -377,7 +377,7 @@ main: { // [5] phi idx#14 = 0 [phi:main->print_person#1] -- vbuz1=vbuc1 lda #0 sta.z idx - // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- vbuxx=vbuc1 ldx #jesper_id jsr print_person jmp __b1 @@ -399,7 +399,7 @@ main: { lda #>henriette_name sta.z print_person.person_name+1 // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#1] -- register_copy - // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- vbuxx=vbuc1 ldx #henriette_id jsr print_person jmp __breturn @@ -573,7 +573,7 @@ main: { // [5] phi idx#14 = 0 [phi:main->print_person#1] -- vbuz1=vbuc1 lda #0 sta.z idx - // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::jesper_id [phi:main->print_person#2] -- vbuxx=vbuc1 ldx #jesper_id jsr print_person // main::@1 @@ -594,7 +594,7 @@ main: { lda #>henriette_name sta.z print_person.person_name+1 // [5] phi idx#14 = idx#17 [phi:main::@1->print_person#1] -- register_copy - // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- call_phi_near + // [5] phi print_person::person_id#2 = main::henriette_id [phi:main::@1->print_person#2] -- vbuxx=vbuc1 ldx #henriette_id jsr print_person // main::@return diff --git a/src/test/ref/struct-unwinding-2.log b/src/test/ref/struct-unwinding-2.log index bd3ca1afc..57b719231 100644 --- a/src/test/ref/struct-unwinding-2.log +++ b/src/test/ref/struct-unwinding-2.log @@ -391,7 +391,7 @@ main: { print1_from_main: // [12] phi print1::p_y#2 = print1::p_y#0 [phi:main->print1#0] -- register_copy // [12] phi print1::p_x#2 = print1::p_x#0 [phi:main->print1#1] -- register_copy - // [12] phi print1::idx#2 = 0 [phi:main->print1#2] -- call_phi_near + // [12] phi print1::idx#2 = 0 [phi:main->print1#2] -- vbuaa=vbuc1 lda #0 jsr print1 jmp __b1 @@ -407,7 +407,7 @@ main: { print2_from___b1: // [17] phi print2::p_y#2 = print2::p_y#0 [phi:main::@1->print2#0] -- register_copy // [17] phi print2::p_x#2 = print2::p_x#0 [phi:main::@1->print2#1] -- register_copy - // [17] phi print2::idx#2 = 2 [phi:main::@1->print2#2] -- call_phi_near + // [17] phi print2::idx#2 = 2 [phi:main::@1->print2#2] -- vbuaa=vbuc1 lda #2 jsr print2 // [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -423,7 +423,7 @@ main: { ldx #p2_y // [12] phi print1::p_x#2 = main::p2_x [phi:main::@2->print1#1] -- vbuyy=vbuc1 ldy #p2_x - // [12] phi print1::idx#2 = 4 [phi:main::@2->print1#2] -- call_phi_near + // [12] phi print1::idx#2 = 4 [phi:main::@2->print1#2] -- vbuaa=vbuc1 lda #4 jsr print1 // [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -439,7 +439,7 @@ main: { ldx #p2_y // [17] phi print2::p_x#2 = main::p2_x [phi:main::@3->print2#1] -- vbuyy=vbuc1 ldy #p2_x - // [17] phi print2::idx#2 = 6 [phi:main::@3->print2#2] -- call_phi_near + // [17] phi print2::idx#2 = 6 [phi:main::@3->print2#2] -- vbuaa=vbuc1 lda #6 jsr print2 jmp __breturn @@ -607,7 +607,7 @@ main: { // [12] phi from main to print1 [phi:main->print1] // [12] phi print1::p_y#2 = print1::p_y#0 [phi:main->print1#0] -- register_copy // [12] phi print1::p_x#2 = print1::p_x#0 [phi:main->print1#1] -- register_copy - // [12] phi print1::idx#2 = 0 [phi:main->print1#2] -- call_phi_near + // [12] phi print1::idx#2 = 0 [phi:main->print1#2] -- vbuaa=vbuc1 lda #0 jsr print1 // main::@1 @@ -621,7 +621,7 @@ main: { // [17] phi from main::@1 to print2 [phi:main::@1->print2] // [17] phi print2::p_y#2 = print2::p_y#0 [phi:main::@1->print2#0] -- register_copy // [17] phi print2::p_x#2 = print2::p_x#0 [phi:main::@1->print2#1] -- register_copy - // [17] phi print2::idx#2 = 2 [phi:main::@1->print2#2] -- call_phi_near + // [17] phi print2::idx#2 = 2 [phi:main::@1->print2#2] -- vbuaa=vbuc1 lda #2 jsr print2 // [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -634,7 +634,7 @@ main: { ldx #p2_y // [12] phi print1::p_x#2 = main::p2_x [phi:main::@2->print1#1] -- vbuyy=vbuc1 ldy #p2_x - // [12] phi print1::idx#2 = 4 [phi:main::@2->print1#2] -- call_phi_near + // [12] phi print1::idx#2 = 4 [phi:main::@2->print1#2] -- vbuaa=vbuc1 lda #4 jsr print1 // [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -647,7 +647,7 @@ main: { ldx #p2_y // [17] phi print2::p_x#2 = main::p2_x [phi:main::@3->print2#1] -- vbuyy=vbuc1 ldy #p2_x - // [17] phi print2::idx#2 = 6 [phi:main::@3->print2#2] -- call_phi_near + // [17] phi print2::idx#2 = 6 [phi:main::@3->print2#2] -- vbuaa=vbuc1 lda #6 jsr print2 // main::@return diff --git a/src/test/ref/summin.log b/src/test/ref/summin.log index fed3ac18d..72960af5a 100644 --- a/src/test/ref/summin.log +++ b/src/test/ref/summin.log @@ -344,7 +344,7 @@ main: { sum_from_main: // [14] phi sum::b#3 = 2 [phi:main->sum#0] -- vbuaa=vbuc1 lda #2 - // [14] phi sum::a#3 = 1 [phi:main->sum#1] -- call_phi_near + // [14] phi sum::a#3 = 1 [phi:main->sum#1] -- vbuxx=vbuc1 ldx #1 jsr sum // [2] sum::return#0 = sum::return#3 @@ -358,7 +358,7 @@ main: { sum_from___b1: // [14] phi sum::b#3 = 4 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #4 - // [14] phi sum::a#3 = 3 [phi:main::@1->sum#1] -- call_phi_near + // [14] phi sum::a#3 = 3 [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #3 jsr sum // [5] sum::return#1 = sum::return#3 @@ -372,7 +372,7 @@ main: { sum_from___b2: // [14] phi sum::b#3 = $d [phi:main::@2->sum#0] -- vbuaa=vbuc1 lda #$d - // [14] phi sum::a#3 = 9 [phi:main::@2->sum#1] -- call_phi_near + // [14] phi sum::a#3 = 9 [phi:main::@2->sum#1] -- vbuxx=vbuc1 ldx #9 jsr sum // [8] sum::return#2 = sum::return#3 @@ -489,7 +489,7 @@ main: { // [14] phi from main to sum [phi:main->sum] // [14] phi sum::b#3 = 2 [phi:main->sum#0] -- vbuaa=vbuc1 lda #2 - // [14] phi sum::a#3 = 1 [phi:main->sum#1] -- call_phi_near + // [14] phi sum::a#3 = 1 [phi:main->sum#1] -- vbuxx=vbuc1 ldx #1 jsr sum // byte s1=sum(1,2) @@ -502,7 +502,7 @@ main: { // [14] phi from main::@1 to sum [phi:main::@1->sum] // [14] phi sum::b#3 = 4 [phi:main::@1->sum#0] -- vbuaa=vbuc1 lda #4 - // [14] phi sum::a#3 = 3 [phi:main::@1->sum#1] -- call_phi_near + // [14] phi sum::a#3 = 3 [phi:main::@1->sum#1] -- vbuxx=vbuc1 ldx #3 jsr sum // byte s2=sum(3,4) @@ -515,7 +515,7 @@ main: { // [14] phi from main::@2 to sum [phi:main::@2->sum] // [14] phi sum::b#3 = $d [phi:main::@2->sum#0] -- vbuaa=vbuc1 lda #$d - // [14] phi sum::a#3 = 9 [phi:main::@2->sum#1] -- call_phi_near + // [14] phi sum::a#3 = 9 [phi:main::@2->sum#1] -- vbuxx=vbuc1 ldx #9 jsr sum // byte s3=sum(9,13) diff --git a/src/test/ref/ternary-3.log b/src/test/ref/ternary-3.log index 9d783e981..e59a43842 100644 --- a/src/test/ref/ternary-3.log +++ b/src/test/ref/ternary-3.log @@ -413,7 +413,7 @@ main: { __b1: // [2] cond::b#0 = main::i#2 -- vbuaa=vbuxx txa - // [3] call cond -- call_phi_near + // [3] call cond jsr cond // [4] cond::return#0 = cond::return#1 jmp __b5 @@ -428,7 +428,7 @@ main: { __b3: // [7] m2::i#0 = main::i#2 -- vbuaa=vbuxx txa - // [8] call m2 -- call_phi_near + // [8] call m2 jsr m2 // [9] m2::return#0 = m2::return#1 jmp __b7 @@ -458,7 +458,7 @@ main: { __b2: // [16] m1::i#0 = main::i#2 -- vbuaa=vbuxx txa - // [17] call m1 -- call_phi_near + // [17] call m1 jsr m1 // [18] m1::return#0 = m1::return#1 jmp __b6 @@ -610,7 +610,7 @@ main: { // cond(i) // [2] cond::b#0 = main::i#2 -- vbuaa=vbuxx txa - // [3] call cond -- call_phi_near + // [3] call cond jsr cond // [4] cond::return#0 = cond::return#1 // main::@5 @@ -623,7 +623,7 @@ main: { // m2(i) // [7] m2::i#0 = main::i#2 -- vbuaa=vbuxx txa - // [8] call m2 -- call_phi_near + // [8] call m2 jsr m2 // [9] m2::return#0 = m2::return#1 // main::@7 @@ -651,7 +651,7 @@ main: { // m1(i) // [16] m1::i#0 = main::i#2 -- vbuaa=vbuxx txa - // [17] call m1 -- call_phi_near + // [17] call m1 jsr m1 // [18] m1::return#0 = m1::return#1 // main::@6 diff --git a/src/test/ref/test-comments-block.log b/src/test/ref/test-comments-block.log index fdd1384b5..39b585c7f 100644 --- a/src/test/ref/test-comments-block.log +++ b/src/test/ref/test-comments-block.log @@ -268,7 +268,7 @@ main: { __b1: // [2] sum::b#0 = main::b#2 -- vbuaa=vbuyy tya - // [3] call sum -- call_phi_near + // [3] call sum jsr sum // [4] sum::return#0 = sum::return#1 jmp __b2 @@ -395,7 +395,7 @@ main: { // sum(a, b) // [2] sum::b#0 = main::b#2 -- vbuaa=vbuyy tya - // [3] call sum -- call_phi_near + // [3] call sum jsr sum // [4] sum::return#0 = sum::return#1 // main::@2 diff --git a/src/test/ref/test-comments-global.log b/src/test/ref/test-comments-global.log index 593c45e1e..dd2286dbf 100644 --- a/src/test/ref/test-comments-global.log +++ b/src/test/ref/test-comments-global.log @@ -130,7 +130,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -215,7 +215,7 @@ __start: { sta.z screen+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/test-comments-single.log b/src/test/ref/test-comments-single.log index 438b8bb10..991fbf8ef 100644 --- a/src/test/ref/test-comments-single.log +++ b/src/test/ref/test-comments-single.log @@ -267,7 +267,7 @@ main: { __b1: // [2] sum::b#0 = main::b#2 -- vbuaa=vbuyy tya - // [3] call sum -- call_phi_near + // [3] call sum jsr sum // [4] sum::return#0 = sum::return#1 jmp __b2 @@ -392,7 +392,7 @@ main: { // sum(a, b) // [2] sum::b#0 = main::b#2 -- vbuaa=vbuyy tya - // [3] call sum -- call_phi_near + // [3] call sum jsr sum // [4] sum::return#0 = sum::return#1 // main::@2 diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log index c9e36d50b..8ca79b5a4 100644 --- a/src/test/ref/test-comparisons-sword.log +++ b/src/test/ref/test-comparisons-sword.log @@ -2186,7 +2186,7 @@ main: { .label j = $f .label i = $12 // [1] call print_cls - // [26] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [26] 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] @@ -2279,7 +2279,7 @@ main: { // [10] compare::w2#0 = main::w2#0 // [11] compare::op#0 = main::op#2 -- vbuaa=vbuz1 lda.z op - // [12] call compare -- call_phi_near + // [12] call compare jsr compare jmp __b9 // main::@9 @@ -2296,7 +2296,7 @@ main: { // main::@5 __b5: // [16] call print_ln - // [63] phi from main::@5 to print_ln [phi:main::@5->print_ln] -- call_phi_near + // [63] phi from main::@5 to print_ln [phi:main::@5->print_ln] print_ln_from___b5: jsr print_ln jmp __b10 @@ -2360,7 +2360,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [27] call memset - // [68] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [68] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -2467,14 +2467,14 @@ compare: { // [74] phi from compare::@6 to print_sint [phi:compare::@6->print_sint] print_sint_from___b6: // [74] phi print_char_cursor#61 = print_char_cursor#67 [phi:compare::@6->print_sint#0] -- register_copy - // [74] phi print_sint::w#3 = print_sint::w#1 [phi:compare::@6->print_sint#1] -- call_phi_near + // [74] phi print_sint::w#3 = print_sint::w#1 [phi:compare::@6->print_sint#1] -- register_copy jsr print_sint jmp __b25 // compare::@25 __b25: // [41] print_str::str#1 = compare::ops#7 // [42] call print_str - // [85] phi from compare::@25 to print_str [phi:compare::@25->print_str] -- call_phi_near + // [85] phi from compare::@25 to print_str [phi:compare::@25->print_str] print_str_from___b25: jsr print_str jmp __b26 @@ -2489,7 +2489,7 @@ compare: { // [74] phi from compare::@26 to print_sint [phi:compare::@26->print_sint] print_sint_from___b26: // [74] phi print_char_cursor#61 = print_char_cursor#14 [phi:compare::@26->print_sint#0] -- register_copy - // [74] phi print_sint::w#3 = print_sint::w#2 [phi:compare::@26->print_sint#1] -- call_phi_near + // [74] phi print_sint::w#3 = print_sint::w#2 [phi:compare::@26->print_sint#1] -- register_copy jsr print_sint jmp __b27 // compare::@27 @@ -2500,7 +2500,7 @@ compare: { // [92] phi from compare::@27 to print_char [phi:compare::@27->print_char] print_char_from___b27: // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:compare::@27->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#5 [phi:compare::@27->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#5 [phi:compare::@27->print_char#1] -- register_copy jsr print_char jmp __breturn // compare::@return @@ -2812,7 +2812,7 @@ print_sint: { // [92] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] print_char_from___b3: // [92] phi print_char_cursor#44 = print_char_cursor#61 [phi:print_sint::@3->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [78] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -2823,7 +2823,7 @@ print_sint: { // print_sint::@2 __b2: // [79] print_uint::w#0 = (unsigned int)print_sint::w#5 - // [80] call print_uint -- call_phi_near + // [80] call print_uint jsr print_uint jmp __breturn // print_sint::@return @@ -2839,7 +2839,7 @@ print_sint: { // [92] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] print_char_from___b1: // [92] phi print_char_cursor#44 = print_char_cursor#61 [phi:print_sint::@1->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char jmp __b4 @@ -2886,7 +2886,7 @@ print_str: { // [92] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:print_str::@2->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char jmp __b3 // print_str::@3 @@ -2926,7 +2926,7 @@ print_uint: { // [97] call print_uchar // [101] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: - // [101] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [101] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -2936,7 +2936,7 @@ print_uint: { // [99] call print_uchar // [101] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: - // [101] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [101] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -2962,7 +2962,7 @@ print_uchar: { // [92] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:print_uchar->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#3 [phi:print_uchar->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#3 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -2976,7 +2976,7 @@ print_uchar: { // [92] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:print_uchar::@1->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -3344,7 +3344,7 @@ main: { .label i = $12 // print_cls() // [1] call print_cls - // [26] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [26] 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 print_line_cursor#30 = print_screen#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 @@ -3427,7 +3427,7 @@ main: { // [10] compare::w2#0 = main::w2#0 // [11] compare::op#0 = main::op#2 -- vbuaa=vbuz1 lda.z op - // [12] call compare -- call_phi_near + // [12] call compare jsr compare // main::@9 // if(++s==3) @@ -3441,7 +3441,7 @@ main: { // main::@5 // print_ln() // [16] call print_ln - // [63] phi from main::@5 to print_ln [phi:main::@5->print_ln] -- call_phi_near + // [63] phi from main::@5 to print_ln [phi:main::@5->print_ln] jsr print_ln // main::@10 // [17] print_char_cursor#117 = print_line_cursor#0 -- pbuz1=pbuz2 @@ -3494,7 +3494,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [27] call memset - // [68] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [68] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -3592,13 +3592,13 @@ compare: { // [40] call print_sint // [74] phi from compare::@6 to print_sint [phi:compare::@6->print_sint] // [74] phi print_char_cursor#61 = print_char_cursor#67 [phi:compare::@6->print_sint#0] -- register_copy - // [74] phi print_sint::w#3 = print_sint::w#1 [phi:compare::@6->print_sint#1] -- call_phi_near + // [74] phi print_sint::w#3 = print_sint::w#1 [phi:compare::@6->print_sint#1] -- register_copy jsr print_sint // compare::@25 // print_str(ops) // [41] print_str::str#1 = compare::ops#7 // [42] call print_str - // [85] phi from compare::@25 to print_str [phi:compare::@25->print_str] -- call_phi_near + // [85] phi from compare::@25 to print_str [phi:compare::@25->print_str] jsr print_str // compare::@26 // print_sint(w2) @@ -3610,7 +3610,7 @@ compare: { // [44] call print_sint // [74] phi from compare::@26 to print_sint [phi:compare::@26->print_sint] // [74] phi print_char_cursor#61 = print_char_cursor#14 [phi:compare::@26->print_sint#0] -- register_copy - // [74] phi print_sint::w#3 = print_sint::w#2 [phi:compare::@26->print_sint#1] -- call_phi_near + // [74] phi print_sint::w#3 = print_sint::w#2 [phi:compare::@26->print_sint#1] -- register_copy jsr print_sint // compare::@27 // print_char(r) @@ -3619,7 +3619,7 @@ compare: { // [46] call print_char // [92] phi from compare::@27 to print_char [phi:compare::@27->print_char] // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:compare::@27->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#5 [phi:compare::@27->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#5 [phi:compare::@27->print_char#1] -- register_copy jsr print_char // compare::@return // } @@ -3900,7 +3900,7 @@ print_sint: { // [77] call print_char // [92] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] // [92] phi print_char_cursor#44 = print_char_cursor#61 [phi:print_sint::@3->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [78] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -3909,7 +3909,7 @@ print_sint: { __b2: // print_uint((unsigned int)w) // [79] print_uint::w#0 = (unsigned int)print_sint::w#5 - // [80] call print_uint -- call_phi_near + // [80] call print_uint jsr print_uint // print_sint::@return // } @@ -3922,7 +3922,7 @@ print_sint: { // [83] call print_char // [92] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] // [92] phi print_char_cursor#44 = print_char_cursor#61 [phi:print_sint::@1->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char // print_sint::@4 @@ -3965,7 +3965,7 @@ print_str: { // [90] call print_char // [92] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:print_str::@2->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- register_copy jsr print_char // print_str::@3 // print_char(*(str++)); @@ -4005,7 +4005,7 @@ print_uint: { ldx.z w+1 // [97] call print_uchar // [101] phi from print_uint to print_uchar [phi:print_uint->print_uchar] - // [101] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [101] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -4013,7 +4013,7 @@ print_uint: { ldx.z w // [99] call print_uchar // [101] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] - // [101] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [101] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@return // } @@ -4039,7 +4039,7 @@ print_uchar: { // Table of hexadecimal digits // [92] phi from print_uchar to print_char [phi:print_uchar->print_char] // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:print_uchar->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#3 [phi:print_uchar->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = print_char::ch#3 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -4052,7 +4052,7 @@ print_uchar: { // [107] call print_char // [92] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [92] phi print_char_cursor#44 = print_char_cursor#14 [phi:print_uchar::@1->print_char#0] -- register_copy - // [92] phi print_char::ch#6 = print_char::ch#4 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [92] phi print_char::ch#6 = 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/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log index fc913e3fb..993118abf 100644 --- a/src/test/ref/test-comparisons-word.log +++ b/src/test/ref/test-comparisons-word.log @@ -2072,7 +2072,7 @@ main: { .label j = $f .label i = $12 // [1] call print_cls - // [26] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [26] 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] @@ -2165,7 +2165,7 @@ main: { // [10] compare::w2#0 = main::w2#0 // [11] compare::op#0 = main::op#2 -- vbuaa=vbuz1 lda.z op - // [12] call compare -- call_phi_near + // [12] call compare jsr compare jmp __b9 // main::@9 @@ -2182,7 +2182,7 @@ main: { // main::@5 __b5: // [16] call print_ln - // [65] phi from main::@5 to print_ln [phi:main::@5->print_ln] -- call_phi_near + // [65] phi from main::@5 to print_ln [phi:main::@5->print_ln] print_ln_from___b5: jsr print_ln jmp __b10 @@ -2246,7 +2246,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [27] call memset - // [70] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [70] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -2353,14 +2353,14 @@ compare: { // [76] phi from compare::@6 to print_uint [phi:compare::@6->print_uint] print_uint_from___b6: // [76] phi print_char_cursor#55 = print_char_cursor#58 [phi:compare::@6->print_uint#0] -- register_copy - // [76] phi print_uint::w#2 = print_uint::w#0 [phi:compare::@6->print_uint#1] -- call_phi_near + // [76] phi print_uint::w#2 = print_uint::w#0 [phi:compare::@6->print_uint#1] -- register_copy jsr print_uint jmp __b25 // compare::@25 __b25: // [41] print_str::str#1 = compare::ops#7 // [42] call print_str - // [82] phi from compare::@25 to print_str [phi:compare::@25->print_str] -- call_phi_near + // [82] phi from compare::@25 to print_str [phi:compare::@25->print_str] print_str_from___b25: jsr print_str jmp __b26 @@ -2375,7 +2375,7 @@ compare: { // [76] phi from compare::@26 to print_uint [phi:compare::@26->print_uint] print_uint_from___b26: // [76] phi print_char_cursor#55 = print_char_cursor#10 [phi:compare::@26->print_uint#0] -- register_copy - // [76] phi print_uint::w#2 = print_uint::w#1 [phi:compare::@26->print_uint#1] -- call_phi_near + // [76] phi print_uint::w#2 = print_uint::w#1 [phi:compare::@26->print_uint#1] -- register_copy jsr print_uint jmp __b27 // compare::@27 @@ -2386,7 +2386,7 @@ compare: { // [89] phi from compare::@27 to print_char [phi:compare::@27->print_char] print_char_from___b27: // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:compare::@27->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#3 [phi:compare::@27->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = print_char::ch#3 [phi:compare::@27->print_char#1] -- register_copy jsr print_char // [47] phi from compare::@27 to compare::@28 [phi:compare::@27->compare::@28] __b28_from___b27: @@ -2397,7 +2397,7 @@ compare: { // [89] phi from compare::@28 to print_char [phi:compare::@28->print_char] print_char_from___b28: // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:compare::@28->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = ' ' [phi:compare::@28->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = ' ' [phi:compare::@28->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __breturn @@ -2704,7 +2704,7 @@ print_uint: { // [93] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [93] phi print_char_cursor#56 = print_char_cursor#55 [phi:print_uint->print_uchar#0] -- register_copy - // [93] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [93] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -2715,7 +2715,7 @@ print_uint: { // [93] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [93] phi print_char_cursor#56 = print_char_cursor#10 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [93] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [93] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -2754,7 +2754,7 @@ print_str: { // [89] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] print_char_from___b2: // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:print_str::@2->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [89] 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 @@ -2802,7 +2802,7 @@ print_uchar: { // [89] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [89] phi print_char_cursor#37 = print_char_cursor#56 [phi:print_uchar->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -2816,7 +2816,7 @@ print_uchar: { // [89] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:print_uchar::@1->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -3161,7 +3161,7 @@ main: { .label i = $12 // print_cls() // [1] call print_cls - // [26] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [26] 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 print_line_cursor#30 = print_screen#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 @@ -3244,7 +3244,7 @@ main: { // [10] compare::w2#0 = main::w2#0 // [11] compare::op#0 = main::op#2 -- vbuaa=vbuz1 lda.z op - // [12] call compare -- call_phi_near + // [12] call compare jsr compare // main::@9 // if(++s==3) @@ -3258,7 +3258,7 @@ main: { // main::@5 // print_ln() // [16] call print_ln - // [65] phi from main::@5 to print_ln [phi:main::@5->print_ln] -- call_phi_near + // [65] phi from main::@5 to print_ln [phi:main::@5->print_ln] jsr print_ln // main::@10 // [17] print_char_cursor#108 = print_line_cursor#0 -- pbuz1=pbuz2 @@ -3311,7 +3311,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [27] call memset - // [70] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [70] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -3409,13 +3409,13 @@ compare: { // [40] call print_uint // [76] phi from compare::@6 to print_uint [phi:compare::@6->print_uint] // [76] phi print_char_cursor#55 = print_char_cursor#58 [phi:compare::@6->print_uint#0] -- register_copy - // [76] phi print_uint::w#2 = print_uint::w#0 [phi:compare::@6->print_uint#1] -- call_phi_near + // [76] phi print_uint::w#2 = print_uint::w#0 [phi:compare::@6->print_uint#1] -- register_copy jsr print_uint // compare::@25 // print_str(ops) // [41] print_str::str#1 = compare::ops#7 // [42] call print_str - // [82] phi from compare::@25 to print_str [phi:compare::@25->print_str] -- call_phi_near + // [82] phi from compare::@25 to print_str [phi:compare::@25->print_str] jsr print_str // compare::@26 // print_uint(w2) @@ -3427,7 +3427,7 @@ compare: { // [44] call print_uint // [76] phi from compare::@26 to print_uint [phi:compare::@26->print_uint] // [76] phi print_char_cursor#55 = print_char_cursor#10 [phi:compare::@26->print_uint#0] -- register_copy - // [76] phi print_uint::w#2 = print_uint::w#1 [phi:compare::@26->print_uint#1] -- call_phi_near + // [76] phi print_uint::w#2 = print_uint::w#1 [phi:compare::@26->print_uint#1] -- register_copy jsr print_uint // compare::@27 // print_char(r) @@ -3436,7 +3436,7 @@ compare: { // [46] call print_char // [89] phi from compare::@27 to print_char [phi:compare::@27->print_char] // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:compare::@27->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#3 [phi:compare::@27->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = print_char::ch#3 [phi:compare::@27->print_char#1] -- register_copy jsr print_char // [47] phi from compare::@27 to compare::@28 [phi:compare::@27->compare::@28] // compare::@28 @@ -3444,7 +3444,7 @@ compare: { // [48] call print_char // [89] phi from compare::@28 to print_char [phi:compare::@28->print_char] // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:compare::@28->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = ' ' [phi:compare::@28->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = ' ' [phi:compare::@28->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // compare::@return @@ -3722,7 +3722,7 @@ print_uint: { // [78] call print_uchar // [93] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [93] phi print_char_cursor#56 = print_char_cursor#55 [phi:print_uint->print_uchar#0] -- register_copy - // [93] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [93] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -3731,7 +3731,7 @@ print_uint: { // [80] call print_uchar // [93] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [93] phi print_char_cursor#56 = print_char_cursor#10 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [93] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [93] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -3766,7 +3766,7 @@ print_str: { // [87] call print_char // [89] phi from print_str::@2 to print_char [phi:print_str::@2->print_char] // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:print_str::@2->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#0 [phi:print_str::@2->print_char#1] -- call_phi_near + // [89] 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++)); @@ -3815,7 +3815,7 @@ print_uchar: { // Table of hexadecimal digits // [89] phi from print_uchar to print_char [phi:print_uchar->print_char] // [89] phi print_char_cursor#37 = print_char_cursor#56 [phi:print_uchar->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#1 [phi:print_uchar->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = print_char::ch#1 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -3828,7 +3828,7 @@ print_uchar: { // [99] call print_char // [89] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [89] phi print_char_cursor#37 = print_char_cursor#10 [phi:print_uchar::@1->print_char#0] -- register_copy - // [89] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [89] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/test-interrupt-volatile-write.log b/src/test/ref/test-interrupt-volatile-write.log index a984678bb..630c0dbb0 100644 --- a/src/test/ref/test-interrupt-volatile-write.log +++ b/src/test/ref/test-interrupt-volatile-write.log @@ -229,7 +229,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -356,7 +356,7 @@ __start: { sta.z col // [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/test-interrupt-volatile.log b/src/test/ref/test-interrupt-volatile.log index c651e9cbc..20611a737 100644 --- a/src/test/ref/test-interrupt-volatile.log +++ b/src/test/ref/test-interrupt-volatile.log @@ -166,7 +166,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -258,7 +258,7 @@ __start: { sta.z col // [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/test-keyboard-space.log b/src/test/ref/test-keyboard-space.log index 7fee032ec..d07a3e81f 100644 --- a/src/test/ref/test-keyboard-space.log +++ b/src/test/ref/test-keyboard-space.log @@ -421,7 +421,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call keyboard_init -- call_phi_near + // [1] call keyboard_init jsr keyboard_init jmp __b1 // main::@1 @@ -436,7 +436,7 @@ main: { // main::@2 __b2: // [4] call keyboard_key_pressed - // [13] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed] -- call_phi_near + // [13] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed] keyboard_key_pressed_from___b2: jsr keyboard_key_pressed // [5] keyboard_key_pressed::return#2 = keyboard_key_pressed::return#0 @@ -487,7 +487,7 @@ keyboard_init: { keyboard_key_pressed: { .const colidx = KEY_SPACE&7 .label rowidx = KEY_SPACE>>3 - // [14] call keyboard_matrix_read -- call_phi_near + // [14] call keyboard_matrix_read jsr keyboard_matrix_read // [15] keyboard_matrix_read::return#2 = keyboard_matrix_read::return#0 jmp __b1 @@ -641,7 +641,7 @@ Score: 1141 // main main: { // keyboard_init() - // [1] call keyboard_init -- call_phi_near + // [1] call keyboard_init jsr keyboard_init // main::@1 __b1: @@ -654,7 +654,7 @@ main: { // main::@2 // keyboard_key_pressed(KEY_SPACE) // [4] call keyboard_key_pressed - // [13] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed] -- call_phi_near + // [13] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed] jsr keyboard_key_pressed // keyboard_key_pressed(KEY_SPACE) // [5] keyboard_key_pressed::return#2 = keyboard_key_pressed::return#0 @@ -706,7 +706,7 @@ keyboard_key_pressed: { .const colidx = KEY_SPACE&7 .label rowidx = KEY_SPACE>>3 // keyboard_matrix_read(rowidx) - // [14] call keyboard_matrix_read -- call_phi_near + // [14] call keyboard_matrix_read jsr keyboard_matrix_read // [15] keyboard_matrix_read::return#2 = keyboard_matrix_read::return#0 // keyboard_key_pressed::@1 diff --git a/src/test/ref/test-keyboard.log b/src/test/ref/test-keyboard.log index af2450073..8ac6f08aa 100644 --- a/src/test/ref/test-keyboard.log +++ b/src/test/ref/test-keyboard.log @@ -1139,7 +1139,7 @@ main: { jmp __b3 // main::@3 __b3: - // [4] call keyboard_init -- call_phi_near + // [4] call keyboard_init // Init keyboard jsr keyboard_init jmp __b4 @@ -1173,7 +1173,7 @@ main: { // [8] call keyboard_matrix_read // [48] phi from main::@5 to keyboard_matrix_read [phi:main::@5->keyboard_matrix_read] keyboard_matrix_read_from___b5: - // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#1 [phi:main::@5->keyboard_matrix_read#0] -- call_phi_near + // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#1 [phi:main::@5->keyboard_matrix_read#0] -- register_copy jsr keyboard_matrix_read // [9] keyboard_matrix_read::return#3 = keyboard_matrix_read::return#0 jmp __b17 @@ -1264,7 +1264,7 @@ main: { __b12: // [23] keyboard_get_keycode::ch#0 = main::ch#2 -- vbuxx=vbuz1 ldx.z ch - // [24] call keyboard_get_keycode -- call_phi_near + // [24] call keyboard_get_keycode jsr keyboard_get_keycode // [25] keyboard_get_keycode::return#2 = keyboard_get_keycode::return#0 jmp __b18 @@ -1279,7 +1279,7 @@ main: { __b14: // [28] keyboard_key_pressed::key#0 = main::key#0 -- vbuxx=vbuaa tax - // [29] call keyboard_key_pressed -- call_phi_near + // [29] call keyboard_key_pressed jsr keyboard_key_pressed // [30] keyboard_key_pressed::return#2 = keyboard_key_pressed::return#0 jmp __b19 @@ -1426,7 +1426,7 @@ keyboard_key_pressed: { // [57] call keyboard_matrix_read // [48] phi from keyboard_key_pressed to keyboard_matrix_read [phi:keyboard_key_pressed->keyboard_matrix_read] keyboard_matrix_read_from_keyboard_key_pressed: - // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#0 [phi:keyboard_key_pressed->keyboard_matrix_read#0] -- call_phi_near + // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#0 [phi:keyboard_key_pressed->keyboard_matrix_read#0] -- register_copy jsr keyboard_matrix_read // [58] keyboard_matrix_read::return#2 = keyboard_matrix_read::return#0 jmp __b1 @@ -1774,7 +1774,7 @@ main: { // [3] phi from main::@1 to main::@3 [phi:main::@1->main::@3] // main::@3 // keyboard_init() - // [4] call keyboard_init -- call_phi_near + // [4] call keyboard_init // Init keyboard jsr keyboard_init // main::@4 @@ -1804,7 +1804,7 @@ main: { ldx.z row // [8] call keyboard_matrix_read // [48] phi from main::@5 to keyboard_matrix_read [phi:main::@5->keyboard_matrix_read] - // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#1 [phi:main::@5->keyboard_matrix_read#0] -- call_phi_near + // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#1 [phi:main::@5->keyboard_matrix_read#0] -- register_copy jsr keyboard_matrix_read // byte row_pressed_bits = keyboard_matrix_read(row) // [9] keyboard_matrix_read::return#3 = keyboard_matrix_read::return#0 @@ -1887,7 +1887,7 @@ main: { // byte key = keyboard_get_keycode(ch) // [23] keyboard_get_keycode::ch#0 = main::ch#2 -- vbuxx=vbuz1 ldx.z ch - // [24] call keyboard_get_keycode -- call_phi_near + // [24] call keyboard_get_keycode jsr keyboard_get_keycode // [25] keyboard_get_keycode::return#2 = keyboard_get_keycode::return#0 // main::@18 @@ -1900,7 +1900,7 @@ main: { // keyboard_key_pressed(key) // [28] keyboard_key_pressed::key#0 = main::key#0 -- vbuxx=vbuaa tax - // [29] call keyboard_key_pressed -- call_phi_near + // [29] call keyboard_key_pressed jsr keyboard_key_pressed // [30] keyboard_key_pressed::return#2 = keyboard_key_pressed::return#0 // main::@19 @@ -2049,7 +2049,7 @@ keyboard_key_pressed: { tax // [57] call keyboard_matrix_read // [48] phi from keyboard_key_pressed to keyboard_matrix_read [phi:keyboard_key_pressed->keyboard_matrix_read] - // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#0 [phi:keyboard_key_pressed->keyboard_matrix_read#0] -- call_phi_near + // [48] phi keyboard_matrix_read::rowid#2 = keyboard_matrix_read::rowid#0 [phi:keyboard_key_pressed->keyboard_matrix_read#0] -- register_copy jsr keyboard_matrix_read // keyboard_matrix_read(rowidx) // [58] keyboard_matrix_read::return#2 = keyboard_matrix_read::return#0 diff --git a/src/test/ref/test-lowhigh.log b/src/test/ref/test-lowhigh.log index a719270ef..3bbd8dc31 100644 --- a/src/test/ref/test-lowhigh.log +++ b/src/test/ref/test-lowhigh.log @@ -1373,7 +1373,7 @@ main: { .label dw2 = $a .label dw = $e // [1] call print_cls - // [41] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [41] 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] @@ -1461,7 +1461,7 @@ main: { lda.z __29+1 sta.z dw2+1 // [11] print_ulong::dw#0 = main::dw2#10 - // [12] call print_ulong -- call_phi_near + // [12] call print_ulong // Test set/get low word of dword jsr print_ulong // [13] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -1473,7 +1473,7 @@ main: { // [50] phi from main::@3 to print_char [phi:main::@3->print_char] print_char_from___b3: // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@3->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@3->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b4 @@ -1488,7 +1488,7 @@ main: { // [54] phi from main::@4 to print_uint [phi:main::@4->print_uint] print_uint_from___b4: // [54] phi print_char_cursor#67 = print_char_cursor#11 [phi:main::@4->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#2 [phi:main::@4->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#2 [phi:main::@4->print_uint#1] -- register_copy jsr print_uint // [17] phi from main::@4 to main::@5 [phi:main::@4->main::@5] __b5_from___b4: @@ -1500,7 +1500,7 @@ main: { // [50] phi from main::@5 to print_char [phi:main::@5->print_char] print_char_from___b5: // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@5->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@5->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@5->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b6 @@ -1515,7 +1515,7 @@ main: { // [54] phi from main::@6 to print_uint [phi:main::@6->print_uint] print_uint_from___b6: // [54] phi print_char_cursor#67 = print_char_cursor#11 [phi:main::@6->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#3 [phi:main::@6->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#3 [phi:main::@6->print_uint#1] -- register_copy jsr print_uint // [21] phi from main::@6 to main::@7 [phi:main::@6->main::@7] __b7_from___b6: @@ -1527,7 +1527,7 @@ main: { // [50] phi from main::@7 to print_char [phi:main::@7->print_char] print_char_from___b7: // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@7->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@7->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@7->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b8 @@ -1539,7 +1539,7 @@ main: { // [60] phi from main::@8 to print_uchar [phi:main::@8->print_uchar] print_uchar_from___b8: // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@8->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#2 [phi:main::@8->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#2 [phi:main::@8->print_uchar#1] -- register_copy jsr print_uchar // [25] phi from main::@8 to main::@9 [phi:main::@8->main::@9] __b9_from___b8: @@ -1551,7 +1551,7 @@ main: { // [50] phi from main::@9 to print_char [phi:main::@9->print_char] print_char_from___b9: // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@9->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@9->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@9->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b10 @@ -1563,7 +1563,7 @@ main: { // [60] phi from main::@10 to print_uchar [phi:main::@10->print_uchar] print_uchar_from___b10: // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@10->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#3 [phi:main::@10->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#3 [phi:main::@10->print_uchar#1] -- register_copy jsr print_uchar // [29] phi from main::@10 to main::@11 [phi:main::@10->main::@11] __b11_from___b10: @@ -1575,7 +1575,7 @@ main: { // [50] phi from main::@11 to print_char [phi:main::@11->print_char] print_char_from___b11: // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@11->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@11->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@11->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b12 @@ -1587,7 +1587,7 @@ main: { // [60] phi from main::@12 to print_uchar [phi:main::@12->print_uchar] print_uchar_from___b12: // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@12->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#4 [phi:main::@12->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#4 [phi:main::@12->print_uchar#1] -- register_copy jsr print_uchar // [33] phi from main::@12 to main::@13 [phi:main::@12->main::@13] __b13_from___b12: @@ -1599,7 +1599,7 @@ main: { // [50] phi from main::@13 to print_char [phi:main::@13->print_char] print_char_from___b13: // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@13->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@13->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@13->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b14 @@ -1611,7 +1611,7 @@ main: { // [60] phi from main::@14 to print_uchar [phi:main::@14->print_uchar] print_uchar_from___b14: // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@14->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#5 [phi:main::@14->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#5 [phi:main::@14->print_uchar#1] -- register_copy jsr print_uchar // [37] phi from main::@14 to main::@15 [phi:main::@14->main::@15] __b15_from___b14: @@ -1620,7 +1620,7 @@ main: { __b15: // [38] call print_ln // Test get low low byte of dword - // [68] phi from main::@15 to print_ln [phi:main::@15->print_ln] -- call_phi_near + // [68] phi from main::@15 to print_ln [phi:main::@15->print_ln] print_ln_from___b15: jsr print_ln jmp __b16 @@ -1651,7 +1651,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [42] 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 @@ -1679,7 +1679,7 @@ print_ulong: { // [54] phi from print_ulong to print_uint [phi:print_ulong->print_uint] print_uint_from_print_ulong: // [54] phi print_char_cursor#67 = print_char_cursor#76 [phi:print_ulong->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- register_copy jsr print_uint jmp __b1 // print_ulong::@1 @@ -1693,7 +1693,7 @@ print_ulong: { // [54] phi from print_ulong::@1 to print_uint [phi:print_ulong::@1->print_uint] print_uint_from___b1: // [54] phi print_char_cursor#67 = print_char_cursor#11 [phi:print_ulong::@1->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- register_copy jsr print_uint jmp __breturn // print_ulong::@return @@ -1730,7 +1730,7 @@ print_uint: { // [60] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: // [60] phi print_char_cursor#69 = print_char_cursor#67 [phi:print_uint->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1741,7 +1741,7 @@ print_uint: { // [60] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1767,7 +1767,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#45 = print_char_cursor#69 [phi:print_uchar->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1781,7 +1781,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#45 = print_char_cursor#11 [phi:print_uchar::@1->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -2096,7 +2096,7 @@ main: { .label dw = $e // print_cls() // [1] call print_cls - // [41] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [41] 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 print_char_cursor#30 = print_screen#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 @@ -2186,7 +2186,7 @@ main: { sta.z dw2+1 // print_ulong(dw2) // [11] print_ulong::dw#0 = main::dw2#10 - // [12] call print_ulong -- call_phi_near + // [12] call print_ulong // Test set/get low word of dword jsr print_ulong // [13] phi from main::@2 to main::@3 [phi:main::@2->main::@3] @@ -2195,7 +2195,7 @@ main: { // [14] call print_char // [50] phi from main::@3 to print_char [phi:main::@3->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@3->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@3->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@4 @@ -2208,7 +2208,7 @@ main: { // [16] call print_uint // [54] phi from main::@4 to print_uint [phi:main::@4->print_uint] // [54] phi print_char_cursor#67 = print_char_cursor#11 [phi:main::@4->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#2 [phi:main::@4->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#2 [phi:main::@4->print_uint#1] -- register_copy jsr print_uint // [17] phi from main::@4 to main::@5 [phi:main::@4->main::@5] // main::@5 @@ -2217,7 +2217,7 @@ main: { // Test get high word of dword // [50] phi from main::@5 to print_char [phi:main::@5->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@5->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@5->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@5->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@6 @@ -2230,7 +2230,7 @@ main: { // [20] call print_uint // [54] phi from main::@6 to print_uint [phi:main::@6->print_uint] // [54] phi print_char_cursor#67 = print_char_cursor#11 [phi:main::@6->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#3 [phi:main::@6->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#3 [phi:main::@6->print_uint#1] -- register_copy jsr print_uint // [21] phi from main::@6 to main::@7 [phi:main::@6->main::@7] // main::@7 @@ -2239,7 +2239,7 @@ main: { // Test get low word of dword // [50] phi from main::@7 to print_char [phi:main::@7->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@7->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@7->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@7->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@8 @@ -2249,7 +2249,7 @@ main: { // [24] call print_uchar // [60] phi from main::@8 to print_uchar [phi:main::@8->print_uchar] // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@8->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#2 [phi:main::@8->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#2 [phi:main::@8->print_uchar#1] -- register_copy jsr print_uchar // [25] phi from main::@8 to main::@9 [phi:main::@8->main::@9] // main::@9 @@ -2258,7 +2258,7 @@ main: { // Test get high high byte of dword // [50] phi from main::@9 to print_char [phi:main::@9->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@9->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@9->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@9->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@10 @@ -2268,7 +2268,7 @@ main: { // [28] call print_uchar // [60] phi from main::@10 to print_uchar [phi:main::@10->print_uchar] // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@10->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#3 [phi:main::@10->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#3 [phi:main::@10->print_uchar#1] -- register_copy jsr print_uchar // [29] phi from main::@10 to main::@11 [phi:main::@10->main::@11] // main::@11 @@ -2277,7 +2277,7 @@ main: { // Test get low high byte of dword // [50] phi from main::@11 to print_char [phi:main::@11->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@11->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@11->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@11->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@12 @@ -2287,7 +2287,7 @@ main: { // [32] call print_uchar // [60] phi from main::@12 to print_uchar [phi:main::@12->print_uchar] // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@12->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#4 [phi:main::@12->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#4 [phi:main::@12->print_uchar#1] -- register_copy jsr print_uchar // [33] phi from main::@12 to main::@13 [phi:main::@12->main::@13] // main::@13 @@ -2296,7 +2296,7 @@ main: { // Test get high low byte of dword // [50] phi from main::@13 to print_char [phi:main::@13->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:main::@13->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = ' ' [phi:main::@13->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = ' ' [phi:main::@13->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@14 @@ -2306,14 +2306,14 @@ main: { // [36] call print_uchar // [60] phi from main::@14 to print_uchar [phi:main::@14->print_uchar] // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:main::@14->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#5 [phi:main::@14->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#5 [phi:main::@14->print_uchar#1] -- register_copy jsr print_uchar // [37] phi from main::@14 to main::@15 [phi:main::@14->main::@15] // main::@15 // print_ln() // [38] call print_ln // Test get low low byte of dword - // [68] phi from main::@15 to print_ln [phi:main::@15->print_ln] -- call_phi_near + // [68] phi from main::@15 to print_ln [phi:main::@15->print_ln] jsr print_ln // main::@16 // for( dword dw = $12345678; dw != $12345690; dw++ ) @@ -2342,7 +2342,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [42] 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 // } @@ -2369,7 +2369,7 @@ print_ulong: { // [46] call print_uint // [54] phi from print_ulong to print_uint [phi:print_ulong->print_uint] // [54] phi print_char_cursor#67 = print_char_cursor#76 [phi:print_ulong->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#0 [phi:print_ulong->print_uint#1] -- register_copy jsr print_uint // print_ulong::@1 // print_uint(WORD0(dw)) @@ -2381,7 +2381,7 @@ print_ulong: { // [48] call print_uint // [54] phi from print_ulong::@1 to print_uint [phi:print_ulong::@1->print_uint] // [54] phi print_char_cursor#67 = print_char_cursor#11 [phi:print_ulong::@1->print_uint#0] -- register_copy - // [54] phi print_uint::w#4 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- call_phi_near + // [54] phi print_uint::w#4 = print_uint::w#1 [phi:print_ulong::@1->print_uint#1] -- register_copy jsr print_uint // print_ulong::@return // } @@ -2418,7 +2418,7 @@ print_uint: { // [56] call print_uchar // [60] phi from print_uint to print_uchar [phi:print_uint->print_uchar] // [60] phi print_char_cursor#69 = print_char_cursor#67 [phi:print_uint->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#0 [phi:print_uint->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -2427,7 +2427,7 @@ print_uint: { // [58] call print_uchar // [60] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] // [60] phi print_char_cursor#69 = print_char_cursor#11 [phi:print_uint::@1->print_uchar#0] -- register_copy - // [60] phi print_uchar::b#6 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- call_phi_near + // [60] phi print_uchar::b#6 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#1] -- register_copy jsr print_uchar // print_uint::@return // } @@ -2453,7 +2453,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#45 = print_char_cursor#69 [phi:print_uchar->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = print_char::ch#0 [phi:print_uchar->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = print_char::ch#0 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -2466,7 +2466,7 @@ print_uchar: { // [66] call print_char // [50] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [50] phi print_char_cursor#45 = print_char_cursor#11 [phi:print_uchar::@1->print_char#0] -- register_copy - // [50] phi print_char::ch#8 = print_char::ch#1 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [50] phi print_char::ch#8 = 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/test-scroll-up.log b/src/test/ref/test-scroll-up.log index 59c9e835e..cbfe562da 100644 --- a/src/test/ref/test-scroll-up.log +++ b/src/test/ref/test-scroll-up.log @@ -650,7 +650,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call scrollup1 - // [7] phi from main to scrollup1 [phi:main->scrollup1] -- call_phi_near + // [7] phi from main to scrollup1 [phi:main->scrollup1] scrollup1_from_main: jsr scrollup1 // [2] phi from main to main::@1 [phi:main->main::@1] @@ -659,7 +659,7 @@ main: { // main::@1 __b1: // [3] call scrollup2 - // [19] phi from main::@1 to scrollup2 [phi:main::@1->scrollup2] -- call_phi_near + // [19] phi from main::@1 to scrollup2 [phi:main::@1->scrollup2] scrollup2_from___b1: jsr scrollup2 // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -668,7 +668,7 @@ main: { // main::@2 __b2: // [5] call scrollup3 - // [30] phi from main::@2 to scrollup3 [phi:main::@2->scrollup3] -- call_phi_near + // [30] phi from main::@2 to scrollup3 [phi:main::@2->scrollup3] scrollup3_from___b2: jsr scrollup3 jmp __breturn @@ -1081,19 +1081,19 @@ Score: 21407 main: { // scrollup1() // [1] call scrollup1 - // [7] phi from main to scrollup1 [phi:main->scrollup1] -- call_phi_near + // [7] phi from main to scrollup1 [phi:main->scrollup1] jsr scrollup1 // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // scrollup2() // [3] call scrollup2 - // [19] phi from main::@1 to scrollup2 [phi:main::@1->scrollup2] -- call_phi_near + // [19] phi from main::@1 to scrollup2 [phi:main::@1->scrollup2] jsr scrollup2 // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // scrollup3() // [5] call scrollup3 - // [30] phi from main::@2 to scrollup3 [phi:main::@2->scrollup3] -- call_phi_near + // [30] phi from main::@2 to scrollup3 [phi:main::@2->scrollup3] jsr scrollup3 // main::@return // } diff --git a/src/test/ref/test-signed-word-minus-byte.log b/src/test/ref/test-signed-word-minus-byte.log index da47eae51..ae2da3cb4 100644 --- a/src/test/ref/test-signed-word-minus-byte.log +++ b/src/test/ref/test-signed-word-minus-byte.log @@ -1105,7 +1105,7 @@ main: { .label w1 = 8 .label i = $a // [1] call print_cls - // [17] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [17] 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] @@ -1156,7 +1156,7 @@ main: { // [20] phi from main::@1 to print_sint [phi:main::@1->print_sint] print_sint_from___b1: // [20] phi print_char_cursor#49 = print_char_cursor#55 [phi:main::@1->print_sint#0] -- register_copy - // [20] phi print_sint::w#3 = print_sint::w#1 [phi:main::@1->print_sint#1] -- call_phi_near + // [20] phi print_sint::w#3 = print_sint::w#1 [phi:main::@1->print_sint#1] -- register_copy jsr print_sint // [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -1167,7 +1167,7 @@ main: { // [31] phi from main::@2 to print_char [phi:main::@2->print_char] print_char_from___b2: // [31] phi print_char_cursor#37 = print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = ' ' [phi:main::@2->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = ' ' [phi:main::@2->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char jmp __b3 @@ -1182,7 +1182,7 @@ main: { // [20] phi from main::@3 to print_sint [phi:main::@3->print_sint] print_sint_from___b3: // [20] phi print_char_cursor#49 = print_char_cursor#12 [phi:main::@3->print_sint#0] -- register_copy - // [20] phi print_sint::w#3 = print_sint::w#2 [phi:main::@3->print_sint#1] -- call_phi_near + // [20] phi print_sint::w#3 = print_sint::w#2 [phi:main::@3->print_sint#1] -- register_copy jsr print_sint // [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4] __b4_from___b3: @@ -1190,7 +1190,7 @@ main: { // main::@4 __b4: // [12] call print_ln - // [35] phi from main::@4 to print_ln [phi:main::@4->print_ln] -- call_phi_near + // [35] phi from main::@4 to print_ln [phi:main::@4->print_ln] print_ln_from___b4: jsr print_ln jmp __b5 @@ -1226,7 +1226,7 @@ main: { // Clear the screen. Also resets current line/char cursor. print_cls: { // [18] call memset - // [40] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [40] phi from print_cls to memset [phi:print_cls->memset] memset_from_print_cls: jsr memset jmp __breturn @@ -1252,7 +1252,7 @@ print_sint: { // [31] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] print_char_from___b3: // [31] phi print_char_cursor#37 = print_char_cursor#49 [phi:print_sint::@3->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [24] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -1263,7 +1263,7 @@ print_sint: { // print_sint::@2 __b2: // [25] print_uint::w#0 = (unsigned int)print_sint::w#5 - // [26] call print_uint -- call_phi_near + // [26] call print_uint jsr print_uint jmp __breturn // print_sint::@return @@ -1279,7 +1279,7 @@ print_sint: { // [31] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] print_char_from___b1: // [31] phi print_char_cursor#37 = print_char_cursor#49 [phi:print_sint::@1->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char jmp __b4 @@ -1403,7 +1403,7 @@ print_uint: { // [47] call print_uchar // [51] phi from print_uint to print_uchar [phi:print_uint->print_uchar] print_uchar_from_print_uint: - // [51] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [51] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar jmp __b1 // print_uint::@1 @@ -1413,7 +1413,7 @@ print_uint: { // [49] call print_uchar // [51] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] print_uchar_from___b1: - // [51] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [51] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar jmp __breturn // print_uint::@return @@ -1439,7 +1439,7 @@ print_uchar: { // [31] phi from print_uchar to print_char [phi:print_uchar->print_char] print_char_from_print_uchar: // [31] phi print_char_cursor#37 = print_char_cursor#12 [phi:print_uchar->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar->print_char#1] -- register_copy jsr print_char jmp __b1 // print_uchar::@1 @@ -1453,7 +1453,7 @@ print_uchar: { // [31] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] print_char_from___b1: // [31] phi print_char_cursor#37 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char jmp __breturn // print_uchar::@return @@ -1638,7 +1638,7 @@ main: { .label i = $a // print_cls() // [1] call print_cls - // [17] phi from main to print_cls [phi:main->print_cls] -- call_phi_near + // [17] 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] -- vbuz1=vbuc1 @@ -1688,7 +1688,7 @@ main: { // [6] call print_sint // [20] phi from main::@1 to print_sint [phi:main::@1->print_sint] // [20] phi print_char_cursor#49 = print_char_cursor#55 [phi:main::@1->print_sint#0] -- register_copy - // [20] phi print_sint::w#3 = print_sint::w#1 [phi:main::@1->print_sint#1] -- call_phi_near + // [20] phi print_sint::w#3 = print_sint::w#1 [phi:main::@1->print_sint#1] -- register_copy jsr print_sint // [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 @@ -1696,7 +1696,7 @@ main: { // [8] call print_char // [31] phi from main::@2 to print_char [phi:main::@2->print_char] // [31] phi print_char_cursor#37 = print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = ' ' [phi:main::@2->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = ' ' [phi:main::@2->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // main::@3 @@ -1709,13 +1709,13 @@ main: { // [10] call print_sint // [20] phi from main::@3 to print_sint [phi:main::@3->print_sint] // [20] phi print_char_cursor#49 = print_char_cursor#12 [phi:main::@3->print_sint#0] -- register_copy - // [20] phi print_sint::w#3 = print_sint::w#2 [phi:main::@3->print_sint#1] -- call_phi_near + // [20] phi print_sint::w#3 = print_sint::w#2 [phi:main::@3->print_sint#1] -- register_copy jsr print_sint // [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4] // main::@4 // print_ln() // [12] call print_ln - // [35] phi from main::@4 to print_ln [phi:main::@4->print_ln] -- call_phi_near + // [35] phi from main::@4 to print_ln [phi:main::@4->print_ln] jsr print_ln // main::@5 // for( byte i: 0..10 ) @@ -1748,7 +1748,7 @@ main: { print_cls: { // memset(print_screen, ' ', 1000) // [18] call memset - // [40] phi from print_cls to memset [phi:print_cls->memset] -- call_phi_near + // [40] phi from print_cls to memset [phi:print_cls->memset] jsr memset // print_cls::@return // } @@ -1770,7 +1770,7 @@ print_sint: { // [23] call print_char // [31] phi from print_sint::@3 to print_char [phi:print_sint::@3->print_char] // [31] phi print_char_cursor#37 = print_char_cursor#49 [phi:print_sint::@3->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = ' ' [phi:print_sint::@3->print_char#1] -- vbuaa=vbuc1 lda #' ' jsr print_char // [24] phi from print_sint::@3 print_sint::@4 to print_sint::@2 [phi:print_sint::@3/print_sint::@4->print_sint::@2] @@ -1779,7 +1779,7 @@ print_sint: { __b2: // print_uint((unsigned int)w) // [25] print_uint::w#0 = (unsigned int)print_sint::w#5 - // [26] call print_uint -- call_phi_near + // [26] call print_uint jsr print_uint // print_sint::@return // } @@ -1792,7 +1792,7 @@ print_sint: { // [29] call print_char // [31] phi from print_sint::@1 to print_char [phi:print_sint::@1->print_char] // [31] phi print_char_cursor#37 = print_char_cursor#49 [phi:print_sint::@1->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = '-' [phi:print_sint::@1->print_char#1] -- vbuaa=vbuc1 lda #'-' jsr print_char // print_sint::@4 @@ -1913,7 +1913,7 @@ print_uint: { ldx.z w+1 // [47] call print_uchar // [51] phi from print_uint to print_uchar [phi:print_uint->print_uchar] - // [51] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- call_phi_near + // [51] phi print_uchar::b#2 = print_uchar::b#0 [phi:print_uint->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@1 // print_uchar(BYTE0(w)) @@ -1921,7 +1921,7 @@ print_uint: { ldx.z w // [49] call print_uchar // [51] phi from print_uint::@1 to print_uchar [phi:print_uint::@1->print_uchar] - // [51] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- call_phi_near + // [51] phi print_uchar::b#2 = print_uchar::b#1 [phi:print_uint::@1->print_uchar#0] -- register_copy jsr print_uchar // print_uint::@return // } @@ -1947,7 +1947,7 @@ print_uchar: { // Table of hexadecimal digits // [31] phi from print_uchar to print_char [phi:print_uchar->print_char] // [31] phi print_char_cursor#37 = print_char_cursor#12 [phi:print_uchar->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = print_char::ch#2 [phi:print_uchar->print_char#1] -- register_copy jsr print_char // print_uchar::@1 // b&$f @@ -1960,7 +1960,7 @@ print_uchar: { // [57] call print_char // [31] phi from print_uchar::@1 to print_char [phi:print_uchar::@1->print_char] // [31] phi print_char_cursor#37 = print_char_cursor#12 [phi:print_uchar::@1->print_char#0] -- register_copy - // [31] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- call_phi_near + // [31] phi print_char::ch#5 = print_char::ch#3 [phi:print_uchar::@1->print_char#1] -- register_copy jsr print_char // print_uchar::@return // } diff --git a/src/test/ref/tod-1.log b/src/test/ref/tod-1.log index d41b4ed6f..2a06ad9f5 100644 --- a/src/test/ref/tod-1.log +++ b/src/test/ref/tod-1.log @@ -2127,14 +2127,14 @@ __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: jmp __b1 // __start::@1 __b1: - // [7] call main -- call_phi_near + // [7] call main jsr main jmp __breturn // __start::@return @@ -2172,7 +2172,7 @@ conio_c64_init: { // [14] call gotoxy // [36] phi from conio_c64_init::@1 to gotoxy [phi:conio_c64_init::@1->gotoxy] gotoxy_from___b1: - // [36] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- call_phi_near + // [36] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- register_copy jsr gotoxy jmp __breturn // conio_c64_init::@return @@ -2192,7 +2192,7 @@ main: { ldx TOD_ZERO+OFFSET_STRUCT_TIME_OF_DAY_MIN // [19] tod_init::tod_HOURS#0 = *((char *)&TOD_ZERO+OFFSET_STRUCT_TIME_OF_DAY_HOURS) -- vbuyy=_deref_pbuc1 ldy TOD_ZERO+OFFSET_STRUCT_TIME_OF_DAY_HOURS - // [20] call tod_init -- call_phi_near + // [20] call tod_init jsr tod_init // [21] phi from main main::@4 to main::@1 [phi:main/main::@4->main::@1] __b1_from_main: @@ -2203,7 +2203,7 @@ main: { // [22] call gotoxy // [36] phi from main::@1 to gotoxy [phi:main::@1->gotoxy] gotoxy_from___b1: - // [36] phi gotoxy::y#4 = 0 [phi:main::@1->gotoxy#0] -- call_phi_near + // [36] phi gotoxy::y#4 = 0 [phi:main::@1->gotoxy#0] -- vbuxx=vbuc1 ldx #0 jsr gotoxy // [23] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -2211,7 +2211,7 @@ main: { jmp __b2 // main::@2 __b2: - // [24] call tod_read -- call_phi_near + // [24] call tod_read jsr tod_read // [25] tod_read::return_TENTHS#1 = tod_read::return_TENTHS#0 // [26] tod_read::return_SEC#1 = tod_read::return_SEC#0 @@ -2230,7 +2230,7 @@ main: { ldy.z tod_read.return_MIN // [32] tod_str::tod_HOURS#0 = tod_read::return_HOURS#1 -- vbuxx=vbuaa tax - // [33] call tod_str -- call_phi_near + // [33] call tod_str jsr tod_str // [34] phi from main::@3 to main::@4 [phi:main::@3->main::@4] __b4_from___b3: @@ -2238,7 +2238,7 @@ main: { // main::@4 __b4: // [35] call cputs - // [88] phi from main::@4 to cputs [phi:main::@4->cputs] -- call_phi_near + // [88] phi from main::@4 to cputs [phi:main::@4->cputs] cputs_from___b4: jsr cputs jmp __b1_from___b4 @@ -2519,7 +2519,7 @@ cputs: { // cputs::@2 __b2: // [94] cputc::c#0 = cputs::c#1 - // [95] call cputc -- call_phi_near + // [95] call cputc jsr cputc // [89] phi from cputs::@2 to cputs::@1 [phi:cputs::@2->cputs::@1] __b1_from___b2: @@ -2555,7 +2555,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [102] call cputln -- call_phi_near + // [102] call cputln jsr cputln jmp __breturn // cputc::@return @@ -2567,7 +2567,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [105] call cputln -- call_phi_near + // [105] call cputln jsr cputln jmp __breturn } @@ -2595,7 +2595,7 @@ cputln: { sta.z conio_cursor_x // [109] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [110] call cscroll -- call_phi_near + // [110] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -2623,7 +2623,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [125] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [125] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -2642,7 +2642,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [125] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [125] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -2658,7 +2658,7 @@ cscroll: { memset_from___b3: // [135] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [135] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [135] 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 @@ -2674,7 +2674,7 @@ cscroll: { memset_from___b4: // [135] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [135] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [135] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -3197,11 +3197,11 @@ __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 -- call_phi_near + // [7] call main jsr main // __start::@return // [8] return @@ -3232,7 +3232,7 @@ conio_c64_init: { // [13] gotoxy::y#2 = conio_c64_init::line#2 // [14] call gotoxy // [36] phi from conio_c64_init::@1 to gotoxy [phi:conio_c64_init::@1->gotoxy] - // [36] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- call_phi_near + // [36] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- register_copy jsr gotoxy // conio_c64_init::@return // } @@ -3252,7 +3252,7 @@ main: { ldx TOD_ZERO+OFFSET_STRUCT_TIME_OF_DAY_MIN // [19] tod_init::tod_HOURS#0 = *((char *)&TOD_ZERO+OFFSET_STRUCT_TIME_OF_DAY_HOURS) -- vbuyy=_deref_pbuc1 ldy TOD_ZERO+OFFSET_STRUCT_TIME_OF_DAY_HOURS - // [20] call tod_init -- call_phi_near + // [20] call tod_init jsr tod_init // [21] phi from main main::@4 to main::@1 [phi:main/main::@4->main::@1] // main::@1 @@ -3260,13 +3260,13 @@ main: { // gotoxy(0,0) // [22] call gotoxy // [36] phi from main::@1 to gotoxy [phi:main::@1->gotoxy] - // [36] phi gotoxy::y#4 = 0 [phi:main::@1->gotoxy#0] -- call_phi_near + // [36] phi gotoxy::y#4 = 0 [phi:main::@1->gotoxy#0] -- vbuxx=vbuc1 ldx #0 jsr gotoxy // [23] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // tod_read() - // [24] call tod_read -- call_phi_near + // [24] call tod_read jsr tod_read // [25] tod_read::return_TENTHS#1 = tod_read::return_TENTHS#0 // [26] tod_read::return_SEC#1 = tod_read::return_SEC#0 @@ -3284,13 +3284,13 @@ main: { ldy.z tod_read.return_MIN // [32] tod_str::tod_HOURS#0 = tod_read::return_HOURS#1 -- vbuxx=vbuaa tax - // [33] call tod_str -- call_phi_near + // [33] call tod_str jsr tod_str // [34] phi from main::@3 to main::@4 [phi:main::@3->main::@4] // main::@4 // cputs(tod_str(tod_read())) // [35] call cputs - // [88] phi from main::@4 to cputs [phi:main::@4->cputs] -- call_phi_near + // [88] phi from main::@4 to cputs [phi:main::@4->cputs] jsr cputs jmp __b1 } @@ -3598,7 +3598,7 @@ cputs: { __b2: // cputc(c) // [94] cputc::c#0 = cputs::c#1 - // [95] call cputc -- call_phi_near + // [95] call cputc jsr cputc // [89] phi from cputs::@2 to cputs::@1 [phi:cputs::@2->cputs::@1] // [89] phi cputs::s#2 = cputs::s#0 [phi:cputs::@2->cputs::@1#0] -- register_copy @@ -3632,7 +3632,7 @@ cputc: { // [101] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3] // cputc::@3 // cputln() - // [102] call cputln -- call_phi_near + // [102] call cputln jsr cputln // cputc::@return __breturn: @@ -3643,7 +3643,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [105] call cputln -- call_phi_near + // [105] call cputln jsr cputln rts } @@ -3676,7 +3676,7 @@ cputln: { // [109] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [110] call cscroll -- call_phi_near + // [110] call cscroll jsr cscroll // cputln::@return // } @@ -3701,7 +3701,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [125] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [125] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -3717,7 +3717,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [125] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [125] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -3730,7 +3730,7 @@ cscroll: { // [135] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [135] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [135] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [135] 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 @@ -3743,7 +3743,7 @@ cscroll: { // [135] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [135] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [135] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [135] 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/toupper-1.log b/src/test/ref/toupper-1.log index cb5c3a047..a3c406731 100644 --- a/src/test/ref/toupper-1.log +++ b/src/test/ref/toupper-1.log @@ -1780,14 +1780,14 @@ __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: jmp __b1 // __start::@1 __b1: - // [7] call main -- call_phi_near + // [7] call main jsr main jmp __breturn // __start::@return @@ -1825,7 +1825,7 @@ conio_c64_init: { // [14] call gotoxy // [35] phi from conio_c64_init::@1 to gotoxy [phi:conio_c64_init::@1->gotoxy] gotoxy_from___b1: - // [35] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- call_phi_near + // [35] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- register_copy jsr gotoxy jmp __breturn // conio_c64_init::@return @@ -1843,7 +1843,7 @@ main: { sta $d018 // [17] call clrscr // Clear screen - // [50] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [50] phi from main to clrscr [phi:main->clrscr] clrscr_from_main: jsr clrscr // [18] phi from main to main::@1 [phi:main->main::@1] @@ -1864,7 +1864,7 @@ main: { // [20] call cputc // [66] phi from main::@1 to cputc [phi:main::@1->cputc] cputc_from___b1: - // [66] phi cputc::c#2 = cputc::c#0 [phi:main::@1->cputc#0] -- call_phi_near + // [66] phi cputc::c#2 = cputc::c#0 [phi:main::@1->cputc#0] -- register_copy jsr cputc jmp __b4 // main::@4 @@ -1888,7 +1888,7 @@ main: { // [25] call gotoxy // [35] phi from main::@3 to gotoxy [phi:main::@3->gotoxy] gotoxy_from___b3: - // [35] phi gotoxy::y#4 = gotoxy::y#3 [phi:main::@3->gotoxy#0] -- call_phi_near + // [35] phi gotoxy::y#4 = gotoxy::y#3 [phi:main::@3->gotoxy#0] -- register_copy jsr gotoxy // [26] phi from main::@3 to main::@2 [phi:main::@3->main::@2] __b2_from___b3: @@ -1905,7 +1905,7 @@ main: { __b2: // [27] toupper::ch#0 = main::c1#2 -- vbuaa=vbuz1 lda.z c1 - // [28] call toupper -- call_phi_near + // [28] call toupper jsr toupper // [29] toupper::return#3 = toupper::return#2 jmp __b5 @@ -1915,7 +1915,7 @@ main: { // [31] call cputc // [66] phi from main::@5 to cputc [phi:main::@5->cputc] cputc_from___b5: - // [66] phi cputc::c#2 = cputc::c#1 [phi:main::@5->cputc#0] -- call_phi_near + // [66] phi cputc::c#2 = cputc::c#1 [phi:main::@5->cputc#0] -- register_copy jsr cputc jmp __b6 // main::@6 @@ -2159,7 +2159,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [73] call cputln -- call_phi_near + // [73] call cputln jsr cputln jmp __breturn // cputc::@return @@ -2171,7 +2171,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [76] call cputln -- call_phi_near + // [76] call cputln jsr cputln jmp __breturn } @@ -2231,7 +2231,7 @@ cputln: { sta.z conio_cursor_x // [85] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [86] call cscroll -- call_phi_near + // [86] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -2259,7 +2259,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [101] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [101] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -2278,7 +2278,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [101] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [101] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -2294,7 +2294,7 @@ cscroll: { memset_from___b3: // [111] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [111] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [111] 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 @@ -2310,7 +2310,7 @@ cscroll: { memset_from___b4: // [111] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [111] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [111] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -2766,11 +2766,11 @@ __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 -- call_phi_near + // [7] call main jsr main // __start::@return // [8] return @@ -2801,7 +2801,7 @@ conio_c64_init: { // [13] gotoxy::y#2 = conio_c64_init::line#2 // [14] call gotoxy // [35] phi from conio_c64_init::@1 to gotoxy [phi:conio_c64_init::@1->gotoxy] - // [35] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- call_phi_near + // [35] phi gotoxy::y#4 = gotoxy::y#2 [phi:conio_c64_init::@1->gotoxy#0] -- register_copy jsr gotoxy // conio_c64_init::@return // } @@ -2820,7 +2820,7 @@ main: { // clrscr() // [17] call clrscr // Clear screen - // [50] phi from main to clrscr [phi:main->clrscr] -- call_phi_near + // [50] phi from main to clrscr [phi:main->clrscr] jsr clrscr // [18] phi from main to main::@1 [phi:main->main::@1] // [18] phi main::c#2 = 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 @@ -2836,7 +2836,7 @@ main: { lda.z c // [20] call cputc // [66] phi from main::@1 to cputc [phi:main::@1->cputc] - // [66] phi cputc::c#2 = cputc::c#0 [phi:main::@1->cputc#0] -- call_phi_near + // [66] phi cputc::c#2 = cputc::c#0 [phi:main::@1->cputc#0] -- register_copy jsr cputc // main::@4 // for(char c:0..0xff) @@ -2856,7 +2856,7 @@ main: { inx // [25] call gotoxy // [35] phi from main::@3 to gotoxy [phi:main::@3->gotoxy] - // [35] phi gotoxy::y#4 = gotoxy::y#3 [phi:main::@3->gotoxy#0] -- call_phi_near + // [35] phi gotoxy::y#4 = gotoxy::y#3 [phi:main::@3->gotoxy#0] -- register_copy jsr gotoxy // [26] phi from main::@3 to main::@2 [phi:main::@3->main::@2] // [26] phi main::c1#2 = 0 [phi:main::@3->main::@2#0] -- vbuz1=vbuc1 @@ -2870,7 +2870,7 @@ main: { // toupper(c) // [27] toupper::ch#0 = main::c1#2 -- vbuaa=vbuz1 lda.z c1 - // [28] call toupper -- call_phi_near + // [28] call toupper jsr toupper // [29] toupper::return#3 = toupper::return#2 // main::@5 @@ -2878,7 +2878,7 @@ main: { // [30] cputc::c#1 = toupper::return#3 // [31] call cputc // [66] phi from main::@5 to cputc [phi:main::@5->cputc] - // [66] phi cputc::c#2 = cputc::c#1 [phi:main::@5->cputc#0] -- call_phi_near + // [66] phi cputc::c#2 = cputc::c#1 [phi:main::@5->cputc#0] -- register_copy jsr cputc // main::@6 // for(char c:0..0xff) @@ -3118,7 +3118,7 @@ cputc: { // [72] phi from cputc::@2 to cputc::@3 [phi:cputc::@2->cputc::@3] // cputc::@3 // cputln() - // [73] call cputln -- call_phi_near + // [73] call cputln jsr cputln // cputc::@return __breturn: @@ -3129,7 +3129,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [76] call cputln -- call_phi_near + // [76] call cputln jsr cputln rts } @@ -3191,7 +3191,7 @@ cputln: { // [85] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [86] call cscroll -- call_phi_near + // [86] call cscroll jsr cscroll // cputln::@return // } @@ -3216,7 +3216,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [101] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [101] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -3232,7 +3232,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [101] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [101] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -3245,7 +3245,7 @@ cscroll: { // [111] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [111] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [111] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [111] 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 @@ -3258,7 +3258,7 @@ cscroll: { // [111] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [111] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [111] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [111] 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/travis1.log b/src/test/ref/travis1.log index 1d1caf5d6..3097d73f5 100644 --- a/src/test/ref/travis1.log +++ b/src/test/ref/travis1.log @@ -866,7 +866,7 @@ main: { jmp __b1 // main::@1 __b1: - // [2] call game_ready -- call_phi_near + // [2] call game_ready jsr game_ready // [3] game_ready::return#0 = game_ready::return#1 jmp __b4 @@ -889,7 +889,7 @@ main: { print_str_ln_from___b3: // [19] phi print_line_cursor#24 = print_line_cursor#15 [phi:main::@3->print_str_ln#0] -- register_copy // [19] phi print_char_cursor#33 = print_char_cursor#47 [phi:main::@3->print_str_ln#1] -- register_copy - // [19] phi print_str_ln::str#2 = main::str [phi:main::@3->print_str_ln#2] -- call_phi_near + // [19] phi print_str_ln::str#2 = main::str [phi:main::@3->print_str_ln#2] -- pbuz1=pbuc1 lda #str @@ -954,7 +954,7 @@ game_ready: { print_str_ln_from___b1: // [19] phi print_line_cursor#24 = print_line_cursor#26 [phi:game_ready::@1->print_str_ln#0] -- register_copy // [19] phi print_char_cursor#33 = print_char_cursor#37 [phi:game_ready::@1->print_str_ln#1] -- register_copy - // [19] phi print_str_ln::str#2 = game_ready::str [phi:game_ready::@1->print_str_ln#2] -- call_phi_near + // [19] phi print_str_ln::str#2 = game_ready::str [phi:game_ready::@1->print_str_ln#2] -- pbuz1=pbuc1 lda #str @@ -988,7 +988,7 @@ print_str_ln: { .label str = 4 // [20] print_str::str#0 = print_str_ln::str#2 // [21] call print_str - // [25] phi from print_str_ln to print_str [phi:print_str_ln->print_str] -- call_phi_near + // [25] phi from print_str_ln to print_str [phi:print_str_ln->print_str] print_str_from_print_str_ln: jsr print_str // [22] phi from print_str_ln to print_str_ln::@1 [phi:print_str_ln->print_str_ln::@1] @@ -997,7 +997,7 @@ print_str_ln: { // print_str_ln::@1 __b1: // [23] call print_ln - // [32] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln] -- call_phi_near + // [32] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln] print_ln_from___b1: jsr print_ln jmp __breturn @@ -1034,7 +1034,7 @@ print_str: { // [29] print_char::ch#0 = *print_str::str#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (str),y - // [30] call print_char -- call_phi_near + // [30] call print_char jsr print_char jmp __b3 // print_str::@3 @@ -1253,7 +1253,7 @@ main: { // main::@1 __b1: // game_ready() - // [2] call game_ready -- call_phi_near + // [2] call game_ready jsr game_ready // [3] game_ready::return#0 = game_ready::return#1 // main::@4 @@ -1275,7 +1275,7 @@ main: { // [19] phi from main::@3 to print_str_ln [phi:main::@3->print_str_ln] // [19] phi print_line_cursor#24 = print_line_cursor#15 [phi:main::@3->print_str_ln#0] -- register_copy // [19] phi print_char_cursor#33 = print_char_cursor#47 [phi:main::@3->print_str_ln#1] -- register_copy - // [19] phi print_str_ln::str#2 = main::str [phi:main::@3->print_str_ln#2] -- call_phi_near + // [19] phi print_str_ln::str#2 = main::str [phi:main::@3->print_str_ln#2] -- pbuz1=pbuc1 lda #str @@ -1332,7 +1332,7 @@ game_ready: { // [19] phi from game_ready::@1 to print_str_ln [phi:game_ready::@1->print_str_ln] // [19] phi print_line_cursor#24 = print_line_cursor#26 [phi:game_ready::@1->print_str_ln#0] -- register_copy // [19] phi print_char_cursor#33 = print_char_cursor#37 [phi:game_ready::@1->print_str_ln#1] -- register_copy - // [19] phi print_str_ln::str#2 = game_ready::str [phi:game_ready::@1->print_str_ln#2] -- call_phi_near + // [19] phi print_str_ln::str#2 = game_ready::str [phi:game_ready::@1->print_str_ln#2] -- pbuz1=pbuc1 lda #str @@ -1366,13 +1366,13 @@ print_str_ln: { // print_str(str) // [20] print_str::str#0 = print_str_ln::str#2 // [21] call print_str - // [25] phi from print_str_ln to print_str [phi:print_str_ln->print_str] -- call_phi_near + // [25] phi from print_str_ln to print_str [phi:print_str_ln->print_str] jsr print_str // [22] phi from print_str_ln to print_str_ln::@1 [phi:print_str_ln->print_str_ln::@1] // print_str_ln::@1 // print_ln() // [23] call print_ln - // [32] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln] -- call_phi_near + // [32] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln] jsr print_ln // print_str_ln::@return // } @@ -1405,7 +1405,7 @@ print_str: { // [29] print_char::ch#0 = *print_str::str#2 -- vbuaa=_deref_pbuz1 ldy #0 lda (str),y - // [30] call print_char -- call_phi_near + // [30] call print_char jsr print_char // print_str::@3 // print_char(*(str++)); diff --git a/src/test/ref/typedef-2.log b/src/test/ref/typedef-2.log index b687fafe3..b0794ff9f 100644 --- a/src/test/ref/typedef-2.log +++ b/src/test/ref/typedef-2.log @@ -161,7 +161,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -234,7 +234,7 @@ __start: { sta.z ptr+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/typedef-4.log b/src/test/ref/typedef-4.log index 6f11f1843..a7149e8a3 100644 --- a/src/test/ref/typedef-4.log +++ b/src/test/ref/typedef-4.log @@ -143,7 +143,7 @@ __start: { jmp __b1 // __start::@1 __b1: - // [3] call main -- call_phi_near + // [3] call main jsr main jmp __breturn // __start::@return @@ -219,7 +219,7 @@ __start: { sta.z v // [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/typeid-plus-bytes.log b/src/test/ref/typeid-plus-bytes.log index e8c0b9553..178f9f3fd 100644 --- a/src/test/ref/typeid-plus-bytes.log +++ b/src/test/ref/typeid-plus-bytes.log @@ -1214,28 +1214,28 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call testUnsigned -- call_phi_near + // [1] call testUnsigned jsr testUnsigned // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: jmp __b1 // main::@1 __b1: - // [3] call testUnsignedVals -- call_phi_near + // [3] call testUnsignedVals jsr testUnsignedVals // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: jmp __b2 // main::@2 __b2: - // [5] call testSigned -- call_phi_near + // [5] call testSigned jsr testSigned // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: jmp __b3 // main::@3 __b3: - // [7] call testSignedVals -- call_phi_near + // [7] call testSignedVals jsr testSignedVals jmp __breturn // main::@return @@ -1547,22 +1547,22 @@ Score: 336 // main main: { // testUnsigned() - // [1] call testUnsigned -- call_phi_near + // [1] call testUnsigned jsr testUnsigned // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // testUnsignedVals() - // [3] call testUnsignedVals -- call_phi_near + // [3] call testUnsignedVals jsr testUnsignedVals // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // testSigned() - // [5] call testSigned -- call_phi_near + // [5] call testSigned jsr testSigned // [6] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // testSignedVals() - // [7] call testSignedVals -- call_phi_near + // [7] call testSignedVals jsr testSignedVals // main::@return // } diff --git a/src/test/ref/union-7.log b/src/test/ref/union-7.log index 7c32c5599..03cd69c4e 100644 --- a/src/test/ref/union-7.log +++ b/src/test/ref/union-7.log @@ -264,7 +264,7 @@ main: { // [1] call print // [5] phi from main to print [phi:main->print] print_from_main: - // [5] phi idx#13 = 0 [phi:main->print#0] -- call_phi_near + // [5] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 jsr print jmp __b1 @@ -280,7 +280,7 @@ main: { // [3] call print // [5] phi from main::@1 to print [phi:main::@1->print] print_from___b1: - // [5] phi idx#13 = idx#14 [phi:main::@1->print#0] -- call_phi_near + // [5] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy jsr print jmp __breturn // main::@return @@ -387,7 +387,7 @@ main: { bne !- // [1] call print // [5] phi from main to print [phi:main->print] - // [5] phi idx#13 = 0 [phi:main->print#0] -- call_phi_near + // [5] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 jsr print // main::@1 @@ -401,7 +401,7 @@ main: { bne !- // [3] call print // [5] phi from main::@1 to print [phi:main::@1->print] - // [5] phi idx#13 = idx#14 [phi:main::@1->print#0] -- call_phi_near + // [5] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy jsr print // main::@return // } diff --git a/src/test/ref/union-8.log b/src/test/ref/union-8.log index 719799d32..2293bd594 100644 --- a/src/test/ref/union-8.log +++ b/src/test/ref/union-8.log @@ -262,7 +262,7 @@ main: { // [1] call data // [8] phi from main to data [phi:main->data] data_from_main: - // [8] phi data::i#2 = $1234 [phi:main->data#0] -- call_phi_near + // [8] phi data::i#2 = $1234 [phi:main->data#0] -- vwuz1=vwuc1 lda #<$1234 sta.z data.i lda #>$1234 @@ -284,7 +284,7 @@ main: { // [4] call data // [8] phi from main::@1 to data [phi:main::@1->data] data_from___b1: - // [8] phi data::i#2 = $5678 [phi:main::@1->data#0] -- call_phi_near + // [8] phi data::i#2 = $5678 [phi:main::@1->data#0] -- vwuz1=vwuc1 lda #<$5678 sta.z data.i lda #>$5678 @@ -384,7 +384,7 @@ main: { // union Data d1 = data(0x1234) // [1] call data // [8] phi from main to data [phi:main->data] - // [8] phi data::i#2 = $1234 [phi:main->data#0] -- call_phi_near + // [8] phi data::i#2 = $1234 [phi:main->data#0] -- vwuz1=vwuc1 lda #<$1234 sta.z data.i lda #>$1234 @@ -406,7 +406,7 @@ main: { // union Data d2 = data(0x5678) // [4] call data // [8] phi from main::@1 to data [phi:main::@1->data] - // [8] phi data::i#2 = $5678 [phi:main::@1->data#0] -- call_phi_near + // [8] phi data::i#2 = $5678 [phi:main::@1->data#0] -- vwuz1=vwuc1 lda #<$5678 sta.z data.i lda #>$5678 diff --git a/src/test/ref/var-register-zp-3.log b/src/test/ref/var-register-zp-3.log index 6d05b64b9..7515037a5 100644 --- a/src/test/ref/var-register-zp-3.log +++ b/src/test/ref/var-register-zp-3.log @@ -351,7 +351,7 @@ main: { sta.z print2.at lda #>screen sta.z print2.at+1 - // [5] phi print2::msg#4 = main::msg [phi:main->print2#1] -- call_phi_near + // [5] phi print2::msg#4 = main::msg [phi:main->print2#1] -- pbuz1=pbuc1 lda #msg @@ -370,7 +370,7 @@ main: { sta.z print2.at lda #>screen+$50 sta.z print2.at+1 - // [5] phi print2::msg#4 = main::msg1 [phi:main::@1->print2#1] -- call_phi_near + // [5] phi print2::msg#4 = main::msg1 [phi:main::@1->print2#1] -- pbuz1=pbuc1 lda #msg1 @@ -421,7 +421,7 @@ print2: { // [11] print_char::ch#0 = print2::msg#4[print2::i#2] -- vbuaa=pbuz1_derefidx_vbuz2 ldy.z i lda (msg),y - // [12] call print_char -- call_phi_near + // [12] call print_char jsr print_char jmp __b3 // print2::@3 @@ -534,7 +534,7 @@ main: { sta.z print2.at lda #>screen sta.z print2.at+1 - // [5] phi print2::msg#4 = main::msg [phi:main->print2#1] -- call_phi_near + // [5] phi print2::msg#4 = main::msg [phi:main->print2#1] -- pbuz1=pbuc1 lda #msg @@ -550,7 +550,7 @@ main: { sta.z print2.at lda #>screen+$50 sta.z print2.at+1 - // [5] phi print2::msg#4 = main::msg1 [phi:main::@1->print2#1] -- call_phi_near + // [5] phi print2::msg#4 = main::msg1 [phi:main::@1->print2#1] -- pbuz1=pbuc1 lda #msg1 @@ -599,7 +599,7 @@ print2: { // [11] print_char::ch#0 = print2::msg#4[print2::i#2] -- vbuaa=pbuz1_derefidx_vbuz2 ldy.z i lda (msg),y - // [12] call print_char -- call_phi_near + // [12] call print_char jsr print_char // print2::@3 // j += 2 diff --git a/src/test/ref/var-register.log b/src/test/ref/var-register.log index c188609ed..104745bbf 100644 --- a/src/test/ref/var-register.log +++ b/src/test/ref/var-register.log @@ -340,7 +340,7 @@ main: { adc.z x // [5] print::idx#0 = main::y#4 // [6] print::val#0 = main::val1#0 - // [7] call print -- call_phi_near + // [7] call print jsr print jmp __b6 // main::@6 @@ -494,7 +494,7 @@ main: { // print(y, val1) // [5] print::idx#0 = main::y#4 // [6] print::val#0 = main::val1#0 - // [7] call print -- call_phi_near + // [7] call print jsr print // main::@6 // for( byte a: 0..100 ) diff --git a/src/test/ref/varmodel-ma_mem-3.log b/src/test/ref/varmodel-ma_mem-3.log index 1acef1711..d685aab73 100644 --- a/src/test/ref/varmodel-ma_mem-3.log +++ b/src/test/ref/varmodel-ma_mem-3.log @@ -248,7 +248,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call model_ma_mem -- call_phi_near + // [1] call model_ma_mem jsr model_ma_mem // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -256,7 +256,7 @@ main: { // main::@1 __b1: // [3] call model_ssa_zp - // [12] phi from main::@1 to model_ssa_zp [phi:main::@1->model_ssa_zp] -- call_phi_near + // [12] phi from main::@1 to model_ssa_zp [phi:main::@1->model_ssa_zp] model_ssa_zp_from___b1: jsr model_ssa_zp jmp __breturn @@ -413,13 +413,13 @@ Score: 988 // main main: { // model_ma_mem() - // [1] call model_ma_mem -- call_phi_near + // [1] call model_ma_mem jsr model_ma_mem // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // model_ssa_zp() // [3] call model_ssa_zp - // [12] phi from main::@1 to model_ssa_zp [phi:main::@1->model_ssa_zp] -- call_phi_near + // [12] phi from main::@1 to model_ssa_zp [phi:main::@1->model_ssa_zp] jsr model_ssa_zp // main::@return // } diff --git a/src/test/ref/varmodel-mem-1.log b/src/test/ref/varmodel-mem-1.log index f7fb80684..b7d15ea15 100644 --- a/src/test/ref/varmodel-mem-1.log +++ b/src/test/ref/varmodel-mem-1.log @@ -306,7 +306,7 @@ main: { // [17] phi from main::@1 to sum [phi:main::@1->sum] sum_from___b1: // [17] phi sum::b#2 = sum::b#0 [phi:main::@1->sum#0] -- register_copy - // [17] phi sum::a#2 = sum::a#0 [phi:main::@1->sum#1] -- call_phi_near + // [17] phi sum::a#2 = sum::a#0 [phi:main::@1->sum#1] -- register_copy jsr sum // [5] sum::return#0 = sum::return#2 jmp __b2 @@ -321,7 +321,7 @@ main: { // [17] phi from main::@2 to sum [phi:main::@2->sum] sum_from___b2: // [17] phi sum::b#2 = sum::b#1 [phi:main::@2->sum#0] -- register_copy - // [17] phi sum::a#2 = sum::a#1 [phi:main::@2->sum#1] -- call_phi_near + // [17] phi sum::a#2 = sum::a#1 [phi:main::@2->sum#1] -- register_copy jsr sum // [10] sum::return#1 = sum::return#2 jmp __b3 @@ -453,7 +453,7 @@ main: { // [4] call sum // [17] phi from main::@1 to sum [phi:main::@1->sum] // [17] phi sum::b#2 = sum::b#0 [phi:main::@1->sum#0] -- register_copy - // [17] phi sum::a#2 = sum::a#0 [phi:main::@1->sum#1] -- call_phi_near + // [17] phi sum::a#2 = sum::a#0 [phi:main::@1->sum#1] -- register_copy jsr sum // sum(i,i) // [5] sum::return#0 = sum::return#2 @@ -466,7 +466,7 @@ main: { // [9] call sum // [17] phi from main::@2 to sum [phi:main::@2->sum] // [17] phi sum::b#2 = sum::b#1 [phi:main::@2->sum#0] -- register_copy - // [17] phi sum::a#2 = sum::a#1 [phi:main::@2->sum#1] -- call_phi_near + // [17] phi sum::a#2 = sum::a#1 [phi:main::@2->sum#1] -- register_copy jsr sum // sum(i,i) // [10] sum::return#1 = sum::return#2 diff --git a/src/test/ref/void-parameter.log b/src/test/ref/void-parameter.log index bb2e46799..874323b60 100644 --- a/src/test/ref/void-parameter.log +++ b/src/test/ref/void-parameter.log @@ -204,7 +204,7 @@ main: { // [1] call print // [7] phi from main to print [phi:main->print] print_from_main: - // [7] phi idx#13 = 0 [phi:main->print#0] -- call_phi_near + // [7] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 jsr print // [2] phi from main to main::@1 [phi:main->main::@1] @@ -215,7 +215,7 @@ main: { // [3] call print // [7] phi from main::@1 to print [phi:main::@1->print] print_from___b1: - // [7] phi idx#13 = idx#14 [phi:main::@1->print#0] -- call_phi_near + // [7] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy jsr print // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: @@ -225,7 +225,7 @@ main: { // [5] call print // [7] phi from main::@2 to print [phi:main::@2->print] print_from___b2: - // [7] phi idx#13 = idx#14 [phi:main::@2->print#0] -- call_phi_near + // [7] phi idx#13 = idx#14 [phi:main::@2->print#0] -- register_copy jsr print jmp __breturn // main::@return @@ -300,7 +300,7 @@ main: { // print() // [1] call print // [7] phi from main to print [phi:main->print] - // [7] phi idx#13 = 0 [phi:main->print#0] -- call_phi_near + // [7] phi idx#13 = 0 [phi:main->print#0] -- vbuxx=vbuc1 ldx #0 jsr print // [2] phi from main to main::@1 [phi:main->main::@1] @@ -308,14 +308,14 @@ main: { // print() // [3] call print // [7] phi from main::@1 to print [phi:main::@1->print] - // [7] phi idx#13 = idx#14 [phi:main::@1->print#0] -- call_phi_near + // [7] phi idx#13 = idx#14 [phi:main::@1->print#0] -- register_copy jsr print // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // print() // [5] call print // [7] phi from main::@2 to print [phi:main::@2->print] - // [7] phi idx#13 = idx#14 [phi:main::@2->print#0] -- call_phi_near + // [7] phi idx#13 = idx#14 [phi:main::@2->print#0] -- register_copy jsr print // main::@return // } diff --git a/src/test/ref/volatile-0.log b/src/test/ref/volatile-0.log index 94f5e8e54..d95bbac39 100644 --- a/src/test/ref/volatile-0.log +++ b/src/test/ref/volatile-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 @@ -240,7 +240,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/volatile-2.log b/src/test/ref/volatile-2.log index ededfb26d..49b880883 100644 --- a/src/test/ref/volatile-2.log +++ b/src/test/ref/volatile-2.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 @@ -278,7 +278,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/voronoi.log b/src/test/ref/voronoi.log index 9a71eb20b..cac577834 100644 --- a/src/test/ref/voronoi.log +++ b/src/test/ref/voronoi.log @@ -1349,7 +1349,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main main: { // [1] call initscreen - // [6] phi from main to initscreen [phi:main->initscreen] -- call_phi_near + // [6] phi from main to initscreen [phi:main->initscreen] initscreen_from_main: jsr initscreen // [2] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1] @@ -1359,7 +1359,7 @@ main: { // main::@1 __b1: // [3] call render - // [12] phi from main::@1 to render [phi:main::@1->render] -- call_phi_near + // [12] phi from main::@1 to render [phi:main::@1->render] render_from___b1: jsr render // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] @@ -1367,7 +1367,7 @@ main: { jmp __b2 // main::@2 __b2: - // [5] call animate -- call_phi_near + // [5] call animate jsr animate jmp __b1_from___b2 } @@ -1452,7 +1452,7 @@ render: { // [15] findcol::x#0 = render::x#2 // [16] findcol::y#0 = render::y#4 // [17] call findcol - // [53] phi from render::@2 to findcol [phi:render::@2->findcol] -- call_phi_near + // [53] phi from render::@2 to findcol [phi:render::@2->findcol] findcol_from___b2: jsr findcol // [18] findcol::return#0 = findcol::return#3 -- vbuaa=vbuxx @@ -1976,19 +1976,19 @@ Score: 1568620 main: { // initscreen() // [1] call initscreen - // [6] phi from main to initscreen [phi:main->initscreen] -- call_phi_near + // [6] phi from main to initscreen [phi:main->initscreen] jsr initscreen // [2] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1] // main::@1 __b1: // render() // [3] call render - // [12] phi from main::@1 to render [phi:main::@1->render] -- call_phi_near + // [12] phi from main::@1 to render [phi:main::@1->render] jsr render // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // animate() - // [5] call animate -- call_phi_near + // [5] call animate jsr animate jmp __b1 } @@ -2065,7 +2065,7 @@ render: { // [15] findcol::x#0 = render::x#2 // [16] findcol::y#0 = render::y#4 // [17] call findcol - // [53] phi from render::@2 to findcol [phi:render::@2->findcol] -- call_phi_near + // [53] phi from render::@2 to findcol [phi:render::@2->findcol] jsr findcol // byte col = findcol(x, y) // [18] findcol::return#0 = findcol::return#3 -- vbuaa=vbuxx diff --git a/src/test/ref/weeip-bbslist.log b/src/test/ref/weeip-bbslist.log index 943137694..b8f240724 100644 --- a/src/test/ref/weeip-bbslist.log +++ b/src/test/ref/weeip-bbslist.log @@ -4093,14 +4093,14 @@ __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: jmp __b1 // __start::@1 __b1: - // [7] call main -- call_phi_near + // [7] call main jsr main jmp __breturn // __start::@return @@ -4135,7 +4135,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 @@ -4176,7 +4176,7 @@ cputc: { jmp __b3 // cputc::@3 __b3: - // [23] call cputln -- call_phi_near + // [23] call cputln jsr cputln jmp __breturn // cputc::@return @@ -4188,7 +4188,7 @@ cputc: { jmp __b1 // cputc::@1 __b1: - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln jmp __breturn } @@ -4234,7 +4234,7 @@ main: { // [32] call printf_string // [64] phi from main::@2 to printf_string [phi:main::@2->printf_string] printf_string_from___b2: - // [64] phi printf_string::str#2 = printf_string::str#0 [phi:main::@2->printf_string#0] -- call_phi_near + // [64] phi printf_string::str#2 = printf_string::str#0 [phi:main::@2->printf_string#0] -- register_copy jsr printf_string // [33] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: @@ -4249,7 +4249,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = main::s [phi:main::@3->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = main::s [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -4268,7 +4268,7 @@ main: { // [36] call printf_string // [64] phi from main::@4 to printf_string [phi:main::@4->printf_string] printf_string_from___b4: - // [64] phi printf_string::str#2 = printf_string::str#1 [phi:main::@4->printf_string#0] -- call_phi_near + // [64] phi printf_string::str#2 = printf_string::str#1 [phi:main::@4->printf_string#0] -- register_copy jsr printf_string // [37] phi from main::@4 to main::@5 [phi:main::@4->main::@5] __b5_from___b4: @@ -4283,7 +4283,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = main::s [phi:main::@5->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = main::s [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -4300,7 +4300,7 @@ main: { lda (bbs),y sta.z printf_uint.uvalue+1 // [40] call printf_uint - // [77] phi from main::@6 to printf_uint [phi:main::@6->printf_uint] -- call_phi_near + // [77] phi from main::@6 to printf_uint [phi:main::@6->printf_uint] printf_uint_from___b6: jsr printf_uint // [41] phi from main::@6 to main::@7 [phi:main::@6->main::@7] @@ -4316,7 +4316,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = main::s2 [phi:main::@7->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = main::s2 [phi:main::@7->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -4467,7 +4467,7 @@ cputln: { sta.z conio_cursor_x // [61] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y - // [62] call cscroll -- call_phi_near + // [62] call cscroll jsr cscroll jmp __breturn // cputln::@return @@ -4493,7 +4493,7 @@ printf_string: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- register_copy jsr printf_str jmp __breturn // printf_string::@return @@ -4559,7 +4559,7 @@ printf_uint: { // [79] utoa::value#1 = printf_uint::uvalue#0 // [80] call utoa // Format number into buffer - // [97] phi from printf_uint::@1 to utoa [phi:printf_uint::@1->utoa] -- call_phi_near + // [97] phi from printf_uint::@1 to utoa [phi:printf_uint::@1->utoa] utoa_from___b1: jsr utoa jmp __b2 @@ -4569,7 +4569,7 @@ printf_uint: { lda printf_buffer // [82] call printf_number_buffer // Print using format - // [118] phi from printf_uint::@2 to printf_number_buffer [phi:printf_uint::@2->printf_number_buffer] -- call_phi_near + // [118] phi from printf_uint::@2 to printf_number_buffer [phi:printf_uint::@2->printf_number_buffer] printf_number_buffer_from___b2: jsr printf_number_buffer jmp __breturn @@ -4598,7 +4598,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [126] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [126] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -4617,7 +4617,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [126] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [126] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -4633,7 +4633,7 @@ cscroll: { memset_from___b3: // [136] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [136] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [136] 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 @@ -4649,7 +4649,7 @@ cscroll: { memset_from___b4: // [136] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [136] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [136] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -4787,7 +4787,7 @@ utoa: { // [112] utoa_append::value#0 = utoa::value#2 // [113] utoa_append::sub#0 = utoa::digit_value#0 // [114] call utoa_append - // [144] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near + // [144] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] utoa_append_from___b5: jsr utoa_append // [115] utoa_append::return#0 = utoa_append::value#2 @@ -4843,7 +4843,7 @@ printf_number_buffer: { sta.z printf_str.putc lda #>printf_uint.putc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- pbuz1=pbuc1 lda #buffer_digits @@ -5622,11 +5622,11 @@ __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 -- call_phi_near + // [7] call main jsr main // __start::@return // [8] return @@ -5655,7 +5655,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 // } @@ -5694,7 +5694,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: @@ -5705,7 +5705,7 @@ cputc: { // cputc::@1 __b1: // cputln() - // [26] call cputln -- call_phi_near + // [26] call cputln jsr cputln rts } @@ -5749,7 +5749,7 @@ main: { sta.z printf_string.str+1 // [32] call printf_string // [64] phi from main::@2 to printf_string [phi:main::@2->printf_string] - // [64] phi printf_string::str#2 = printf_string::str#0 [phi:main::@2->printf_string#0] -- call_phi_near + // [64] phi printf_string::str#2 = printf_string::str#0 [phi:main::@2->printf_string#0] -- register_copy jsr printf_string // [33] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 @@ -5761,7 +5761,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = main::s [phi:main::@3->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = main::s [phi:main::@3->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -5778,7 +5778,7 @@ main: { sta.z printf_string.str+1 // [36] call printf_string // [64] phi from main::@4 to printf_string [phi:main::@4->printf_string] - // [64] phi printf_string::str#2 = printf_string::str#1 [phi:main::@4->printf_string#0] -- call_phi_near + // [64] phi printf_string::str#2 = printf_string::str#1 [phi:main::@4->printf_string#0] -- register_copy jsr printf_string // [37] phi from main::@4 to main::@5 [phi:main::@4->main::@5] // main::@5 @@ -5790,7 +5790,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = main::s [phi:main::@5->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = main::s [phi:main::@5->printf_str#1] -- pbuz1=pbuc1 lda #s @@ -5806,7 +5806,7 @@ main: { lda (bbs),y sta.z printf_uint.uvalue+1 // [40] call printf_uint - // [77] phi from main::@6 to printf_uint [phi:main::@6->printf_uint] -- call_phi_near + // [77] phi from main::@6 to printf_uint [phi:main::@6->printf_uint] jsr printf_uint // [41] phi from main::@6 to main::@7 [phi:main::@6->main::@7] // main::@7 @@ -5818,7 +5818,7 @@ main: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = main::s2 [phi:main::@7->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = main::s2 [phi:main::@7->printf_str#1] -- pbuz1=pbuc1 lda #s2 @@ -5970,7 +5970,7 @@ cputln: { // [61] conio_cursor_y = ++ conio_cursor_y -- vbuz1=_inc_vbuz1 inc.z conio_cursor_y // cscroll() - // [62] call cscroll -- call_phi_near + // [62] call cscroll jsr cscroll // cputln::@return // } @@ -5993,7 +5993,7 @@ printf_string: { sta.z printf_str.putc lda #>cputc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = printf_str::s#2 [phi:printf_string::@1->printf_str#1] -- register_copy jsr printf_str // printf_string::@return // } @@ -6056,7 +6056,7 @@ printf_uint: { // [79] utoa::value#1 = printf_uint::uvalue#0 // [80] call utoa // Format number into buffer - // [97] phi from printf_uint::@1 to utoa [phi:printf_uint::@1->utoa] -- call_phi_near + // [97] phi from printf_uint::@1 to utoa [phi:printf_uint::@1->utoa] jsr utoa // printf_uint::@2 // printf_number_buffer(putc, printf_buffer, format) @@ -6064,7 +6064,7 @@ printf_uint: { lda printf_buffer // [82] call printf_number_buffer // Print using format - // [118] phi from printf_uint::@2 to printf_number_buffer [phi:printf_uint::@2->printf_number_buffer] -- call_phi_near + // [118] phi from printf_uint::@2 to printf_number_buffer [phi:printf_uint::@2->printf_number_buffer] jsr printf_number_buffer // printf_uint::@return // } @@ -6089,7 +6089,7 @@ cscroll: { sta.z memcpy.destination lda #>DEFAULT_SCREEN sta.z memcpy.destination+1 - // [126] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- call_phi_near + // [126] phi memcpy::source#2 = (void *)DEFAULT_SCREEN+$28 [phi:cscroll::@1->memcpy#1] -- pvoz1=pvoc1 lda #DEFAULT_SCREEN+$28 @@ -6105,7 +6105,7 @@ cscroll: { sta.z memcpy.destination lda #>COLORRAM sta.z memcpy.destination+1 - // [126] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- call_phi_near + // [126] phi memcpy::source#2 = (void *)COLORRAM+$28 [phi:cscroll::@2->memcpy#1] -- pvoz1=pvoc1 lda #COLORRAM+$28 @@ -6118,7 +6118,7 @@ cscroll: { // [136] phi from cscroll::@3 to memset [phi:cscroll::@3->memset] // [136] phi memset::c#4 = ' ' [phi:cscroll::@3->memset#0] -- vbuxx=vbuc1 ldx #' ' - // [136] phi memset::str#3 = (void *)DEFAULT_SCREEN+(unsigned int)$19*$28-$28 [phi:cscroll::@3->memset#1] -- call_phi_near + // [136] 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 @@ -6131,7 +6131,7 @@ cscroll: { // [136] phi from cscroll::@4 to memset [phi:cscroll::@4->memset] // [136] phi memset::c#4 = LIGHT_BLUE [phi:cscroll::@4->memset#0] -- vbuxx=vbuc1 ldx #LIGHT_BLUE - // [136] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- call_phi_near + // [136] phi memset::str#3 = (void *)COLORRAM+(unsigned int)$19*$28-$28 [phi:cscroll::@4->memset#1] -- pvoz1=pvoc1 lda #COLORRAM+$19*$28-$28 @@ -6267,7 +6267,7 @@ utoa: { // [112] utoa_append::value#0 = utoa::value#2 // [113] utoa_append::sub#0 = utoa::digit_value#0 // [114] call utoa_append - // [144] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] -- call_phi_near + // [144] phi from utoa::@5 to utoa_append [phi:utoa::@5->utoa_append] jsr utoa_append // utoa_append(buffer++, value, digit_value) // [115] utoa_append::return#0 = utoa_append::value#2 @@ -6317,7 +6317,7 @@ printf_number_buffer: { sta.z printf_str.putc lda #>printf_uint.putc sta.z printf_str.putc+1 - // [68] phi printf_str::s#7 = printf_number_buffer::buffer_digits#0 [phi:printf_number_buffer::@2->printf_str#1] -- call_phi_near + // [68] phi printf_str::s#7 = 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/weeip-checksum.log b/src/test/ref/weeip-checksum.log index d1766bac7..000ab670d 100644 --- a/src/test/ref/weeip-checksum.log +++ b/src/test/ref/weeip-checksum.log @@ -729,7 +729,7 @@ main: { // [1] call add_checksum // [8] phi from main to add_checksum [phi:main->add_checksum] add_checksum_from_main: - // [8] phi add_checksum::v#3 = $1234 [phi:main->add_checksum#0] -- call_phi_near + // [8] phi add_checksum::v#3 = $1234 [phi:main->add_checksum#0] -- vwuz1=vwuc1 lda #<$1234 sta.z add_checksum.v lda #>$1234 @@ -746,7 +746,7 @@ main: { // [3] call add_checksum // [8] phi from main::@1 to add_checksum [phi:main::@1->add_checksum] add_checksum_from___b1: - // [8] phi add_checksum::v#3 = $2345 [phi:main::@1->add_checksum#0] -- call_phi_near + // [8] phi add_checksum::v#3 = $2345 [phi:main::@1->add_checksum#0] -- vwuz1=vwuc1 lda #<$2345 sta.z add_checksum.v lda #>$2345 @@ -763,7 +763,7 @@ main: { // [5] call add_checksum // [8] phi from main::@2 to add_checksum [phi:main::@2->add_checksum] add_checksum_from___b2: - // [8] phi add_checksum::v#3 = $3456 [phi:main::@2->add_checksum#0] -- call_phi_near + // [8] phi add_checksum::v#3 = $3456 [phi:main::@2->add_checksum#0] -- vwuz1=vwuc1 lda #<$3456 sta.z add_checksum.v lda #>$3456 @@ -991,7 +991,7 @@ main: { // add_checksum(0x1234) // [1] call add_checksum // [8] phi from main to add_checksum [phi:main->add_checksum] - // [8] phi add_checksum::v#3 = $1234 [phi:main->add_checksum#0] -- call_phi_near + // [8] phi add_checksum::v#3 = $1234 [phi:main->add_checksum#0] -- vwuz1=vwuc1 lda #<$1234 sta.z add_checksum.v lda #>$1234 @@ -1007,7 +1007,7 @@ main: { // add_checksum(0x2345) // [3] call add_checksum // [8] phi from main::@1 to add_checksum [phi:main::@1->add_checksum] - // [8] phi add_checksum::v#3 = $2345 [phi:main::@1->add_checksum#0] -- call_phi_near + // [8] phi add_checksum::v#3 = $2345 [phi:main::@1->add_checksum#0] -- vwuz1=vwuc1 lda #<$2345 sta.z add_checksum.v lda #>$2345 @@ -1023,7 +1023,7 @@ main: { // add_checksum(0x3456) // [5] call add_checksum // [8] phi from main::@2 to add_checksum [phi:main::@2->add_checksum] - // [8] phi add_checksum::v#3 = $3456 [phi:main::@2->add_checksum#0] -- call_phi_near + // [8] phi add_checksum::v#3 = $3456 [phi:main::@2->add_checksum#0] -- vwuz1=vwuc1 lda #<$3456 sta.z add_checksum.v lda #>$3456 diff --git a/src/test/ref/wfragment1.log b/src/test/ref/wfragment1.log index 7010c4f71..cb6bee255 100644 --- a/src/test/ref/wfragment1.log +++ b/src/test/ref/wfragment1.log @@ -238,7 +238,7 @@ main: { __b1: // [2] move_enemy::obj_slot#0 = main::i#2 -- vbuaa=vbuyy tya - // [3] call move_enemy -- call_phi_near + // [3] call move_enemy jsr move_enemy jmp __b2 // main::@2 @@ -344,7 +344,7 @@ main: { // move_enemy(i) // [2] move_enemy::obj_slot#0 = main::i#2 -- vbuaa=vbuyy tya - // [3] call move_enemy -- call_phi_near + // [3] call move_enemy jsr move_enemy // main::@2 // for(byte i:0..5) diff --git a/src/test/ref/zeropage-sinus.log b/src/test/ref/zeropage-sinus.log index 58a5e6075..c0c2ed378 100644 --- a/src/test/ref/zeropage-sinus.log +++ b/src/test/ref/zeropage-sinus.log @@ -323,28 +323,28 @@ main: { // [4] *(SCREEN+OFFSET_SPRITE_PTRS) = (char)SPRITE/$40 -- _deref_pbuc1=vbuc2 lda #$ff&SPRITE/$40 sta SCREEN+OFFSET_SPRITE_PTRS - // [5] call saveZeropage -- call_phi_near + // [5] call saveZeropage jsr saveZeropage // [6] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: jmp __b1 // main::@1 __b1: - // [7] call sinZeropage -- call_phi_near + // [7] call sinZeropage jsr sinZeropage // [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2] __b2_from___b1: jmp __b2 // main::@2 __b2: - // [9] call animSprite -- call_phi_near + // [9] call animSprite jsr animSprite // [10] phi from main::@2 to main::@3 [phi:main::@2->main::@3] __b3_from___b2: jmp __b3 // main::@3 __b3: - // [11] call restoreZeropage -- call_phi_near + // [11] call restoreZeropage jsr restoreZeropage jmp __breturn // main::@return @@ -541,22 +541,22 @@ main: { lda #$ff&SPRITE/$40 sta SCREEN+OFFSET_SPRITE_PTRS // saveZeropage() - // [5] call saveZeropage -- call_phi_near + // [5] call saveZeropage jsr saveZeropage // [6] phi from main to main::@1 [phi:main->main::@1] // main::@1 // sinZeropage() - // [7] call sinZeropage -- call_phi_near + // [7] call sinZeropage jsr sinZeropage // [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2] // main::@2 // animSprite() - // [9] call animSprite -- call_phi_near + // [9] call animSprite jsr animSprite // [10] phi from main::@2 to main::@3 [phi:main::@2->main::@3] // main::@3 // restoreZeropage() - // [11] call restoreZeropage -- call_phi_near + // [11] call restoreZeropage jsr restoreZeropage // main::@return // } diff --git a/src/test/ref/zp-reserve-coalesce-problem.log b/src/test/ref/zp-reserve-coalesce-problem.log index c32198dec..8eb06440f 100644 --- a/src/test/ref/zp-reserve-coalesce-problem.log +++ b/src/test/ref/zp-reserve-coalesce-problem.log @@ -663,7 +663,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segment Code // main main: { - // [1] call benchmarkCountdownFor -- call_phi_near + // [1] call benchmarkCountdownFor jsr benchmarkCountdownFor // [2] phi from main to main::@1 [phi:main->main::@1] __b1_from_main: @@ -671,7 +671,7 @@ main: { // main::@1 __b1: // [3] call benchmarkLandscape - // [14] phi from main::@1 to benchmarkLandscape [phi:main::@1->benchmarkLandscape] -- call_phi_near + // [14] phi from main::@1 to benchmarkLandscape [phi:main::@1->benchmarkLandscape] benchmarkLandscape_from___b1: jsr benchmarkLandscape jmp __breturn @@ -1022,13 +1022,13 @@ Score: 649273 // main main: { // benchmarkCountdownFor() - // [1] call benchmarkCountdownFor -- call_phi_near + // [1] call benchmarkCountdownFor jsr benchmarkCountdownFor // [2] phi from main to main::@1 [phi:main->main::@1] // main::@1 // benchmarkLandscape() // [3] call benchmarkLandscape - // [14] phi from main::@1 to benchmarkLandscape [phi:main::@1->benchmarkLandscape] -- call_phi_near + // [14] phi from main::@1 to benchmarkLandscape [phi:main::@1->benchmarkLandscape] jsr benchmarkLandscape // main::@return // } diff --git a/src/test/ref/zpparammin.log b/src/test/ref/zpparammin.log index 9e7ddaf99..93b37706c 100644 --- a/src/test/ref/zpparammin.log +++ b/src/test/ref/zpparammin.log @@ -440,7 +440,7 @@ main: { inx // [4] sum::a#0 = main::i#2 -- vbuyy=vbuz1 ldy.z i - // [5] call sum -- call_phi_near + // [5] call sum jsr sum // [6] sum::return#0 = sum::return#1 jmp __b2 @@ -460,7 +460,7 @@ main: { inx // [11] sum2::a#0 = main::i#2 -- vbuyy=vbuz1 ldy.z i - // [12] call sum2 -- call_phi_near + // [12] call sum2 jsr sum2 // [13] sum2::return#0 = sum2::return#1 jmp __b3 @@ -630,7 +630,7 @@ main: { inx // [4] sum::a#0 = main::i#2 -- vbuyy=vbuz1 ldy.z i - // [5] call sum -- call_phi_near + // [5] call sum jsr sum // [6] sum::return#0 = sum::return#1 // main::@2 @@ -649,7 +649,7 @@ main: { inx inx // [11] sum2::a#0 = main::i#2 -- vbuyy=vbuz1 - // [12] call sum2 -- call_phi_near + // [12] call sum2 jsr sum2 // [13] sum2::return#0 = sum2::return#1 // main::@3