From 239cfdb48e96798d2e7ebbf41d1e9b1ef34a4b4f Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Mon, 11 May 2020 02:36:37 +0200 Subject: [PATCH] Implemented #platform target() functionality configured by a TGT-file in JSON. --- ...Maven__javax_json_javax_json_api_1_1_4.xml | 13 ++ ...Maven__org_glassfish_javax_json_1_1_4.xml} | 8 +- kickc.iml | 3 +- pom.xml | 10 ++ src/main/assembly/assembly.xml | 8 +- .../java/dk/camelot64/kickc/Compiler.java | 26 +--- src/main/java/dk/camelot64/kickc/KickC.java | 86 ++++++------ .../java/dk/camelot64/kickc/SourceLoader.java | 45 ++++--- .../java/dk/camelot64/kickc/asm/AsmChunk.java | 9 +- .../camelot64/kickc/model/CompileError.java | 4 +- .../dk/camelot64/kickc/model/Program.java | 54 +++----- .../dk/camelot64/kickc/model/TargetCpu.java | 13 +- .../camelot64/kickc/model/TargetPlatform.java | 126 +++++++++++++++--- .../Pass0GenerateStatementSequence.java | 28 ++-- .../kickc/passes/Pass4CodeGeneration.java | 52 ++++---- .../kickc/passes/Pass5SkipBegin.java | 15 ++- .../passes/Pass5UnusedLabelElimination.java | 2 +- src/main/kc/include/c64.ld | 9 -- src/main/kc/include/plus4.ld | 9 -- src/main/script/kickc.bat | 6 +- src/main/script/kickc.sh | 6 +- .../dk/camelot64/kickc/test/TestPrograms.java | 8 +- src/test/kc/examples/plus4walk/plus4walk.c | 3 +- src/test/kc/platform-asm6502.c | 1 + src/test/ref/address-1.log | 8 +- src/test/ref/address-3.log | 8 +- src/test/ref/address-4.log | 8 +- src/test/ref/address-of-0.log | 8 +- src/test/ref/address-of-1.log | 8 +- src/test/ref/address-of-3.log | 8 +- src/test/ref/array-16bit-lookup.log | 8 +- src/test/ref/array-length-symbolic-min.log | 8 +- src/test/ref/array-length-symbolic.log | 8 +- src/test/ref/arrays-init-kasm-0.log | 8 +- src/test/ref/arrays-init-short.log | 8 +- src/test/ref/arrays-init.log | 8 +- src/test/ref/asm-culling-jmp.log | 8 +- src/test/ref/asm-mnemonic-names.log | 8 +- src/test/ref/asm-uses-0.log | 8 +- src/test/ref/assignment-chained.log | 8 +- src/test/ref/assignment-compound.log | 7 +- src/test/ref/bgblack.log | 8 +- src/test/ref/bitmap-circle-2.log | 8 +- src/test/ref/bitmap-circle.log | 8 +- src/test/ref/bitmap-line-anim-1.log | 7 +- src/test/ref/bitmap-line-anim-2.log | 7 +- src/test/ref/bitmap-plot-3.log | 7 +- src/test/ref/bitmap-plotter.log | 8 +- src/test/ref/bitwise-not.log | 8 +- src/test/ref/bool-const.log | 8 +- src/test/ref/bool-function.log | 8 +- src/test/ref/bool-ifs-min.log | 8 +- src/test/ref/bool-ifs.log | 8 +- src/test/ref/bool-nullpointer-exception.log | 8 +- src/test/ref/bool-pointer.log | 7 +- src/test/ref/bool-vars.log | 8 +- src/test/ref/bresenham.log | 8 +- src/test/ref/bresenhamarr.log | 8 +- src/test/ref/c-types.log | 8 +- src/test/ref/c64dtv-8bppcharstretch.log | 8 +- src/test/ref/c64dtv-8bppchunkystretch.log | 8 +- src/test/ref/c64dtv-blitter-box.log | 8 +- src/test/ref/c64dtv-blittermin.log | 8 +- src/test/ref/c64dtv-color.log | 8 +- src/test/ref/c64dtv-gfxexplorer.log | 7 +- src/test/ref/c64dtv-gfxmodes.log | 7 +- src/test/ref/call-parameter-autocast.log | 8 +- src/test/ref/callconstparam.log | 8 +- src/test/ref/cast-deref.log | 8 +- src/test/ref/cast-not-needed-2.log | 8 +- src/test/ref/cast-not-needed-3.log | 8 +- src/test/ref/cast-not-needed.log | 8 +- src/test/ref/cast-precedence-problem.log | 7 +- src/test/ref/casting.log | 8 +- src/test/ref/chargen.log | 8 +- src/test/ref/chessboard.log | 8 +- src/test/ref/cia-timer-cyclecount.log | 8 +- src/test/ref/cia-timer-simple.log | 8 +- src/test/ref/coalesce-assignment.log | 8 +- src/test/ref/code-after-return-1.log | 8 +- src/test/ref/code-after-return.log | 8 +- src/test/ref/comma-decl-2.log | 8 +- src/test/ref/comma-decl-for.log | 8 +- src/test/ref/comma-decl.log | 8 +- src/test/ref/comma-expr-1.log | 8 +- src/test/ref/comma-expr-2.log | 8 +- src/test/ref/comma-expr-for.log | 8 +- src/test/ref/comparison-rewriting-pointer.log | 8 +- src/test/ref/comparison-rewriting.log | 8 +- src/test/ref/complex-conditional-problem.log | 8 +- .../ref/complex/ataritempest/ataritempest.asm | 1 - .../ref/complex/ataritempest/ataritempest.log | 4 +- src/test/ref/complex/includes/includes-1.log | 8 +- src/test/ref/complex/includes/includes-2.log | 8 +- src/test/ref/complex/includes/includes-3.log | 8 +- src/test/ref/complex/medusa/medusa.log | 8 +- src/test/ref/complex/prebob/grid-bobs.log | 7 +- src/test/ref/complex/prebob/vogel-bobs.log | 7 +- .../ref/complex/splines/truetype-splines.log | 7 +- src/test/ref/complex/xmega65/xmega65.asm | 1 - src/test/ref/complex/xmega65/xmega65.log | 4 +- src/test/ref/complex/xmega65/xmega65logo.log | 8 +- src/test/ref/condition-integer-0.log | 8 +- src/test/ref/condition-integer-1.log | 8 +- src/test/ref/condition-integer-2.log | 8 +- src/test/ref/condition-integer-3.log | 8 +- src/test/ref/condition-integer-4.log | 8 +- src/test/ref/condition-type-mismatch.log | 8 +- .../ref/consolidate-array-index-problem.log | 8 +- src/test/ref/consolidate-constant-problem.log | 8 +- src/test/ref/const-condition.log | 8 +- src/test/ref/const-declaration.log | 8 +- src/test/ref/const-identification.log | 8 +- src/test/ref/const-if-problem.log | 8 +- src/test/ref/const-int-cast-problem.log | 8 +- src/test/ref/const-mult-div.log | 8 +- src/test/ref/const-param.log | 8 +- src/test/ref/const-pointer.log | 8 +- src/test/ref/const-signed-promotion.log | 8 +- src/test/ref/const-word-pointer.log | 8 +- src/test/ref/constabsmin.log | 8 +- src/test/ref/constant-string-concat-0.log | 8 +- src/test/ref/constant-string-concat.log | 8 +- src/test/ref/constantmin.log | 8 +- src/test/ref/constants.log | 8 +- src/test/ref/cordic-atan2-16-ref.log | 7 +- src/test/ref/cordic-atan2-16.log | 8 +- src/test/ref/cordic-atan2-clear.log | 8 +- src/test/ref/cordic-atan2.log | 8 +- src/test/ref/cpu-6502.log | 8 +- .../ref/cstyle-decl-function-intrinsic.log | 8 +- src/test/ref/cstyle-decl-function.log | 8 +- src/test/ref/cstyle-decl-var-multiple.log | 8 +- src/test/ref/cstyle-decl-var.log | 8 +- src/test/ref/danny-joystick-problem.log | 8 +- src/test/ref/declared-memory-var-0.log | 8 +- src/test/ref/declared-memory-var-1.log | 8 +- src/test/ref/declared-memory-var-2.log | 8 +- src/test/ref/declared-memory-var-3.log | 8 +- src/test/ref/declared-memory-var-4.log | 8 +- src/test/ref/declared-memory-var-5.log | 8 +- src/test/ref/declared-memory-var-6.log | 8 +- src/test/ref/deep-nesting.log | 8 +- src/test/ref/default-font.log | 8 +- src/test/ref/deref-to-derefidx-2.log | 8 +- src/test/ref/deref-to-derefidx.log | 8 +- src/test/ref/derefidx-word-0.log | 8 +- src/test/ref/derefidx-word-1.log | 8 +- src/test/ref/derefidx-word-2.log | 8 +- src/test/ref/divide-2s.log | 8 +- src/test/ref/double-assignment.log | 8 +- src/test/ref/double-import.log | 8 +- src/test/ref/double-indexing-arrays.log | 8 +- src/test/ref/duplicate-loop-problem.log | 7 +- src/test/ref/dword.log | 8 +- src/test/ref/emptyblock-error.log | 8 +- src/test/ref/encoding-literal-char.log | 8 +- src/test/ref/enum-0.log | 8 +- src/test/ref/enum-1.log | 8 +- src/test/ref/enum-2.log | 8 +- src/test/ref/enum-3.log | 8 +- src/test/ref/enum-4.log | 8 +- src/test/ref/enum-5.log | 8 +- src/test/ref/enum-6.log | 8 +- src/test/ref/enum-7.log | 8 +- src/test/ref/enum-8.log | 8 +- src/test/ref/euclid-3.log | 8 +- src/test/ref/euclid-problem-2.log | 8 +- src/test/ref/euclid-problem.log | 7 +- src/test/ref/examples/3d/3d.log | 8 +- src/test/ref/examples/3d/perspective.log | 8 +- .../examples/bresenham/bitmap-bresenham.log | 7 +- .../ref/examples/chargen/chargen-analysis.log | 8 +- .../examples/fastmultiply/fastmultiply8.log | 8 +- src/test/ref/examples/fire/fire.log | 8 +- src/test/ref/examples/font-2x2/font-2x2.log | 7 +- src/test/ref/examples/irq/irq-hyperscreen.log | 8 +- .../ref/examples/kernalload/kernalload.asm | 3 +- .../ref/examples/kernalload/kernalload.log | 10 +- src/test/ref/examples/linking/linking.asm | 3 +- src/test/ref/examples/linking/linking.log | 10 +- src/test/ref/examples/music/music.log | 8 +- src/test/ref/examples/music/music_irq.log | 8 +- .../ref/examples/plasma/plasma-unroll.log | 8 +- src/test/ref/examples/plasma/plasma.log | 8 +- src/test/ref/examples/plus4walk/plus4walk.asm | 3 +- src/test/ref/examples/plus4walk/plus4walk.log | 11 +- .../ref/examples/rasterbars/raster-bars.log | 8 +- src/test/ref/examples/rotate/rotate.log | 8 +- src/test/ref/examples/scroll/scroll.log | 8 +- src/test/ref/examples/scrollbig/scrollbig.log | 8 +- .../ref/examples/scrolllogo/scrolllogo.log | 7 +- src/test/ref/examples/showlogo/showlogo.log | 8 +- .../ref/examples/sinplotter/sine-plotter.log | 7 +- .../ref/examples/sinsprites/sinus-sprites.log | 8 +- src/test/ref/examples/zpcode/zpcode.asm | 3 +- src/test/ref/examples/zpcode/zpcode.log | 10 +- src/test/ref/fastmultiply-127.log | 7 +- src/test/ref/fibmem.log | 8 +- src/test/ref/fill-square.log | 8 +- src/test/ref/fillscreen-1.log | 8 +- src/test/ref/fillscreen-2.log | 8 +- src/test/ref/fillscreen-3.log | 8 +- src/test/ref/flipper-rex2.log | 8 +- src/test/ref/font-hex-show.log | 8 +- src/test/ref/for-empty-increment.log | 8 +- src/test/ref/for-empty-init.log | 8 +- src/test/ref/for-two-vars.log | 8 +- src/test/ref/forced-zeropage.log | 8 +- src/test/ref/forclassicmin.log | 8 +- src/test/ref/forincrementassign.log | 8 +- src/test/ref/forrangedwords.log | 8 +- src/test/ref/forrangemin.log | 8 +- src/test/ref/forrangesymbolic.log | 8 +- src/test/ref/fragment-synth.log | 8 +- src/test/ref/fragment-variations.log | 8 +- src/test/ref/function-pointer-noarg-2.log | 7 +- src/test/ref/function-pointer-noarg-3.log | 8 +- .../ref/function-pointer-noarg-call-2.log | 8 +- .../ref/function-pointer-noarg-call-3.log | 7 +- .../ref/function-pointer-noarg-call-4.log | 8 +- .../ref/function-pointer-noarg-call-5.log | 8 +- .../ref/function-pointer-noarg-call-6.log | 8 +- src/test/ref/function-pointer-noarg-call.log | 8 +- src/test/ref/function-pointer-noarg.log | 8 +- src/test/ref/function-pointer-return.log | 8 +- src/test/ref/gfxbank.log | 8 +- src/test/ref/global-pc-multiple.log | 8 +- src/test/ref/global-pc.log | 8 +- src/test/ref/halfscii.log | 8 +- src/test/ref/helloworld0.log | 8 +- src/test/ref/helloworld2-inline.log | 8 +- src/test/ref/helloworld2.log | 8 +- src/test/ref/hex2dec-ptrptr.log | 8 +- src/test/ref/hex2dec.log | 8 +- src/test/ref/ifmin.log | 8 +- src/test/ref/immzero.log | 8 +- src/test/ref/importing.log | 8 +- src/test/ref/incd020.log | 8 +- src/test/ref/incrementinarray.log | 8 +- src/test/ref/infloop-error.log | 8 +- src/test/ref/initializer-0.log | 8 +- src/test/ref/initializer-1.log | 8 +- src/test/ref/initializer-2.log | 8 +- src/test/ref/initializer-3.log | 8 +- src/test/ref/inline-asm-clobber-none.log | 8 +- src/test/ref/inline-asm-clobber.log | 8 +- src/test/ref/inline-asm-jsr-clobber.log | 8 +- src/test/ref/inline-asm-label.log | 8 +- src/test/ref/inline-asm-optimized.log | 8 +- src/test/ref/inline-asm-param.log | 8 +- src/test/ref/inline-asm-ref-scoped.log | 8 +- src/test/ref/inline-asm-refout-const.log | 8 +- src/test/ref/inline-asm-refout.log | 8 +- src/test/ref/inline-asm.log | 8 +- src/test/ref/inline-assignment.log | 8 +- src/test/ref/inline-dword-0.log | 8 +- src/test/ref/inline-function-if.log | 8 +- src/test/ref/inline-function-level2.log | 8 +- src/test/ref/inline-function-min.log | 8 +- src/test/ref/inline-function-print.log | 8 +- src/test/ref/inline-function.log | 8 +- src/test/ref/inline-kasm-clobber.log | 8 +- src/test/ref/inline-kasm-data.log | 8 +- src/test/ref/inline-kasm-loop.log | 8 +- src/test/ref/inline-kasm-refout.log | 8 +- src/test/ref/inline-kasm-resource.log | 8 +- src/test/ref/inline-pointer-0.log | 8 +- src/test/ref/inline-pointer-1.log | 8 +- src/test/ref/inline-pointer-2.log | 8 +- src/test/ref/inline-string-2.log | 8 +- src/test/ref/inline-string-3.log | 8 +- src/test/ref/inline-string-4.log | 8 +- src/test/ref/inline-string.log | 8 +- src/test/ref/inline-word-0.log | 8 +- src/test/ref/inline-word-1.log | 8 +- src/test/ref/inline-word-2.log | 8 +- src/test/ref/inline-word.log | 8 +- src/test/ref/inlinearrayproblem.log | 8 +- src/test/ref/inmem-const-array.log | 8 +- src/test/ref/inmemarray.log | 8 +- src/test/ref/inmemstring.log | 8 +- src/test/ref/inner-increment-problem.log | 8 +- src/test/ref/int-conversion.log | 8 +- src/test/ref/int-literals.log | 8 +- src/test/ref/irq-hardware-clobber-jsr.log | 8 +- src/test/ref/irq-hardware-clobber.log | 8 +- src/test/ref/irq-hardware-stack.log | 8 +- src/test/ref/irq-hardware.log | 8 +- src/test/ref/irq-kernel-minimal.log | 8 +- src/test/ref/irq-kernel.log | 8 +- .../ref/irq-local-var-overlap-problem.log | 7 +- src/test/ref/irq-raster.log | 8 +- src/test/ref/irq-volatile-bool-problem.log | 7 +- src/test/ref/iterarray.log | 8 +- src/test/ref/kc-ka-string-encoding.log | 8 +- src/test/ref/keyboard-glitch.log | 7 +- .../ref/kickasm-uses-prevent-deletion.log | 8 +- src/test/ref/line-anim.log | 7 +- src/test/ref/linegen.log | 8 +- src/test/ref/literal-char-minus-number.log | 8 +- src/test/ref/literal-strings.log | 8 +- src/test/ref/literal-word-pointer-0.log | 8 +- src/test/ref/literals.log | 8 +- src/test/ref/liverange-1.log | 8 +- src/test/ref/liverange-10.log | 8 +- src/test/ref/liverange-2.log | 8 +- src/test/ref/liverange-3.log | 8 +- src/test/ref/liverange-4.log | 8 +- src/test/ref/liverange-5.log | 8 +- src/test/ref/liverange-6.log | 8 +- src/test/ref/liverange-7.log | 8 +- src/test/ref/liverange-8.log | 8 +- src/test/ref/liverange-9.log | 8 +- src/test/ref/liverange-call-problem.log | 8 +- src/test/ref/liverange.log | 8 +- src/test/ref/local-string.log | 8 +- src/test/ref/localscope-loops.log | 8 +- src/test/ref/localscope-simple.log | 8 +- src/test/ref/long-pointer-0.log | 8 +- src/test/ref/long-pointer-1.log | 8 +- src/test/ref/longjump.log | 8 +- src/test/ref/longjump2.log | 8 +- src/test/ref/loop-break-continue.log | 8 +- src/test/ref/loop-break-nested.log | 8 +- src/test/ref/loop-break.log | 8 +- src/test/ref/loop-continue.log | 8 +- src/test/ref/loop-for-continue.log | 8 +- src/test/ref/loop-for-empty-body.log | 8 +- src/test/ref/loop-for-sideeffect.log | 8 +- src/test/ref/loop-memset-min.log | 8 +- src/test/ref/loop-problem.log | 8 +- src/test/ref/loop-problem2.log | 8 +- src/test/ref/loop-while-continue.log | 8 +- src/test/ref/loop-while-min.log | 8 +- src/test/ref/loop-while-sideeffect.log | 8 +- src/test/ref/loop100.log | 8 +- src/test/ref/loophead-problem-2.log | 8 +- src/test/ref/loophead-problem-3.log | 8 +- src/test/ref/loophead-problem.log | 8 +- src/test/ref/loopmin.log | 8 +- src/test/ref/loopnest.log | 8 +- src/test/ref/loopnest2.log | 8 +- src/test/ref/loopnest3.log | 8 +- src/test/ref/loopsplit.log | 7 +- src/test/ref/ma_coalesce_problem.log | 8 +- src/test/ref/mem-alignment.log | 8 +- src/test/ref/memcpy-0.log | 8 +- src/test/ref/memcpy-1.log | 8 +- src/test/ref/memory-heap.log | 8 +- src/test/ref/min-fmul-16.log | 8 +- src/test/ref/mixed-array-0.log | 8 +- src/test/ref/mixed-array-1.log | 8 +- src/test/ref/modglobal.log | 8 +- src/test/ref/modglobalmin.log | 8 +- src/test/ref/mul8u-min.log | 8 +- src/test/ref/multiply-1.log | 8 +- src/test/ref/multiply-16bit-const.log | 8 +- src/test/ref/multiply-2.log | 8 +- src/test/ref/multiply-2s.log | 8 +- src/test/ref/multiply-ns.log | 8 +- src/test/ref/nes-array.log | 8 +- src/test/ref/no-recursion-heavy.log | 7 +- src/test/ref/nomodify-4.log | 8 +- src/test/ref/noop-cast-elimination.log | 8 +- src/test/ref/norom-charset.log | 8 +- src/test/ref/number-conversion.log | 8 +- src/test/ref/number-inference-sum.log | 8 +- src/test/ref/number-type.log | 8 +- src/test/ref/operator-lohi-problem-1.log | 8 +- src/test/ref/operator-lohi-problem.log | 8 +- .../ref/optimize-unsigned-comparisons.log | 8 +- src/test/ref/overlap-allocation-2.log | 8 +- src/test/ref/overlap-allocation.log | 8 +- src/test/ref/parse-negated-struct-ref.log | 7 +- src/test/ref/plus-0.log | 8 +- src/test/ref/pointer-anding.log | 8 +- src/test/ref/pointer-cast-2.log | 8 +- src/test/ref/pointer-cast-3.log | 8 +- src/test/ref/pointer-cast-4.log | 8 +- src/test/ref/pointer-cast.log | 8 +- src/test/ref/pointer-const-typedef.log | 8 +- src/test/ref/pointer-const.log | 8 +- src/test/ref/pointer-plus-0.log | 8 +- src/test/ref/pointer-plus-signed-word.log | 8 +- src/test/ref/pointer-pointer-1.log | 8 +- src/test/ref/pointer-pointer-2.log | 7 +- src/test/ref/pointer-void-0.log | 8 +- src/test/ref/pointer-void-1.log | 8 +- src/test/ref/pointer-void-2.log | 8 +- src/test/ref/pointer-void-3.log | 8 +- src/test/ref/post-increment-problem-2.log | 8 +- src/test/ref/post-increment-problem.log | 8 +- src/test/ref/preprocessor-0.log | 8 +- src/test/ref/preprocessor-1.log | 8 +- src/test/ref/preprocessor-2.log | 8 +- src/test/ref/preprocessor-3.log | 8 +- src/test/ref/preprocessor-4.log | 8 +- src/test/ref/preprocessor-5.log | 8 +- src/test/ref/preprocessor-6.log | 8 +- src/test/ref/preprocessor-7.log | 8 +- src/test/ref/preprocessor-8.log | 8 +- src/test/ref/preprocessor-9.log | 8 +- src/test/ref/primes-1000-2.log | 8 +- src/test/ref/primes-1000.log | 7 +- src/test/ref/print-problem.log | 8 +- src/test/ref/printf-10.log | 8 +- src/test/ref/printf-11.log | 8 +- src/test/ref/printmsg.log | 8 +- src/test/ref/problem-negate-const.log | 8 +- src/test/ref/problem-negative-word-const.log | 8 +- .../ref/problem-struct-inline-parameter-1.log | 8 +- .../ref/problem-struct-inline-parameter.log | 8 +- .../procedure-callingconvention-stack-0.log | 8 +- .../procedure-callingconvention-stack-1.log | 8 +- .../procedure-callingconvention-stack-13.log | 8 +- .../procedure-callingconvention-stack-2.log | 8 +- .../procedure-callingconvention-stack-3.log | 8 +- .../procedure-callingconvention-stack-7.log | 8 +- src/test/ref/processor-port-test.log | 8 +- src/test/ref/ptr-complex.log | 8 +- src/test/ref/ptrptr-optimize-0.log | 8 +- src/test/ref/ptrptr-optimize-1.log | 8 +- src/test/ref/ptrptr-optimize-2.log | 8 +- src/test/ref/ptrtest.log | 8 +- src/test/ref/ptrtestmin.log | 8 +- src/test/ref/reserve-zp-global.log | 8 +- src/test/ref/reserve-zp-procedure-1.log | 8 +- src/test/ref/reserve-zp-procedure-2.log | 8 +- src/test/ref/reserve-zp-procedure-3.log | 8 +- src/test/ref/robozzle64-label-problem.log | 8 +- src/test/ref/roll-sprite-msb.log | 7 +- src/test/ref/roll-variable.log | 8 +- src/test/ref/runtime-unused-procedure.log | 8 +- src/test/ref/sandbox-ternary-error.log | 7 +- src/test/ref/sandbox.log | 7 +- src/test/ref/scan-desire-problem.log | 8 +- src/test/ref/screen-center-angle.log | 8 +- src/test/ref/screen-center-distance.log | 8 +- src/test/ref/scroll-clobber.log | 8 +- src/test/ref/scrollbig-clobber.log | 8 +- src/test/ref/semi-struct-1.log | 8 +- src/test/ref/semi-struct-2.log | 8 +- src/test/ref/sequence-locality-0.log | 8 +- src/test/ref/sequence-locality-1.log | 8 +- src/test/ref/sieve-min.log | 8 +- src/test/ref/sieve.log | 8 +- src/test/ref/signed-bytes.log | 8 +- src/test/ref/signed-char-comparison.log | 8 +- src/test/ref/signed-indexed-subtract.log | 8 +- src/test/ref/signed-word-minus-byte-2.log | 8 +- src/test/ref/signed-words.log | 8 +- src/test/ref/simple-loop.log | 8 +- src/test/ref/sinus-basic.log | 8 +- src/test/ref/sinusgen16.log | 7 +- src/test/ref/sinusgen16b.log | 7 +- src/test/ref/sinusgen8.log | 7 +- src/test/ref/sinusgen8b.log | 7 +- src/test/ref/sinusgenscale8.log | 7 +- src/test/ref/sizeof-arrays.log | 8 +- src/test/ref/sizeof-expr.log | 8 +- src/test/ref/sizeof-in-const-pointer.log | 8 +- src/test/ref/sizeof-struct.log | 8 +- src/test/ref/sizeof-types.log | 8 +- src/test/ref/sqr-delta.log | 8 +- src/test/ref/stack-relative-addressing.log | 8 +- src/test/ref/statement-sequence-1.log | 8 +- .../static-register-optimization-problem.log | 8 +- .../ref/string-const-consolidation-noroot.log | 8 +- src/test/ref/string-const-consolidation.log | 8 +- src/test/ref/string-encoding-literals.log | 8 +- src/test/ref/string-encoding-pragma.log | 8 +- src/test/ref/string-escapes-0.log | 8 +- src/test/ref/string-escapes-1.log | 8 +- src/test/ref/string-escapes-2.log | 8 +- src/test/ref/string-escapes-3.log | 8 +- src/test/ref/string-escapes-4.log | 8 +- src/test/ref/string-escapes-5.log | 8 +- src/test/ref/string-pointer-problem.log | 8 +- src/test/ref/strip.log | 8 +- src/test/ref/strncat-0.log | 8 +- src/test/ref/struct-0.log | 8 +- src/test/ref/struct-1.log | 8 +- src/test/ref/struct-10.log | 8 +- 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-13.log | 8 +- src/test/ref/struct-14.log | 8 +- src/test/ref/struct-15.log | 8 +- src/test/ref/struct-16.log | 8 +- src/test/ref/struct-17.log | 8 +- src/test/ref/struct-18.log | 8 +- src/test/ref/struct-19.log | 8 +- src/test/ref/struct-2.log | 8 +- src/test/ref/struct-20.log | 8 +- src/test/ref/struct-21.log | 8 +- src/test/ref/struct-22.log | 8 +- src/test/ref/struct-23.log | 8 +- src/test/ref/struct-24.log | 8 +- src/test/ref/struct-25.log | 8 +- src/test/ref/struct-26.log | 8 +- src/test/ref/struct-27.log | 8 +- src/test/ref/struct-28.log | 8 +- src/test/ref/struct-29.log | 8 +- src/test/ref/struct-3.log | 8 +- src/test/ref/struct-30.log | 8 +- src/test/ref/struct-31.log | 8 +- src/test/ref/struct-32.log | 8 +- src/test/ref/struct-33.log | 8 +- src/test/ref/struct-34.log | 8 +- src/test/ref/struct-35.log | 8 +- src/test/ref/struct-36.log | 8 +- src/test/ref/struct-37.log | 8 +- src/test/ref/struct-38.log | 8 +- src/test/ref/struct-39.log | 8 +- src/test/ref/struct-4.log | 8 +- src/test/ref/struct-40.log | 8 +- src/test/ref/struct-41.log | 8 +- src/test/ref/struct-42.log | 8 +- src/test/ref/struct-5.log | 8 +- src/test/ref/struct-6.log | 8 +- src/test/ref/struct-7.log | 8 +- src/test/ref/struct-8.log | 8 +- src/test/ref/struct-9.log | 8 +- src/test/ref/struct-directives.log | 8 +- src/test/ref/struct-pointer-to-member-2.log | 8 +- src/test/ref/struct-pointer-to-member.log | 8 +- src/test/ref/struct-pos-fill.log | 8 +- src/test/ref/struct-ptr-0.log | 8 +- src/test/ref/struct-ptr-1.log | 8 +- src/test/ref/struct-ptr-10.log | 8 +- src/test/ref/struct-ptr-11.log | 8 +- src/test/ref/struct-ptr-12-ref.log | 8 +- src/test/ref/struct-ptr-12.log | 8 +- src/test/ref/struct-ptr-13.log | 8 +- src/test/ref/struct-ptr-14.log | 8 +- src/test/ref/struct-ptr-15.log | 8 +- src/test/ref/struct-ptr-16.log | 7 +- src/test/ref/struct-ptr-17.log | 8 +- src/test/ref/struct-ptr-18.log | 8 +- src/test/ref/struct-ptr-19.log | 8 +- src/test/ref/struct-ptr-2.log | 8 +- src/test/ref/struct-ptr-20.log | 8 +- src/test/ref/struct-ptr-21.log | 8 +- src/test/ref/struct-ptr-22.log | 8 +- src/test/ref/struct-ptr-23.log | 8 +- src/test/ref/struct-ptr-24.log | 8 +- src/test/ref/struct-ptr-25.log | 8 +- src/test/ref/struct-ptr-26.log | 8 +- src/test/ref/struct-ptr-28.log | 8 +- src/test/ref/struct-ptr-3.log | 8 +- src/test/ref/struct-ptr-30.log | 8 +- src/test/ref/struct-ptr-31.log | 8 +- src/test/ref/struct-ptr-32.log | 8 +- src/test/ref/struct-ptr-33.log | 8 +- src/test/ref/struct-ptr-34.log | 8 +- src/test/ref/struct-ptr-4.log | 8 +- src/test/ref/struct-ptr-5.log | 8 +- src/test/ref/struct-ptr-6.log | 8 +- src/test/ref/struct-ptr-7.log | 8 +- src/test/ref/struct-ptr-8.log | 8 +- src/test/ref/struct-ptr-9.log | 8 +- src/test/ref/subexpr-optimize-0.log | 8 +- src/test/ref/subexpr-optimize-1.log | 8 +- src/test/ref/subexpr-optimize-2.log | 8 +- src/test/ref/subexpr-optimize-3.log | 8 +- src/test/ref/subexpr-optimize-4.log | 8 +- src/test/ref/summin.log | 8 +- src/test/ref/switch-0.log | 8 +- src/test/ref/switch-1.log | 8 +- src/test/ref/switch-2.log | 8 +- src/test/ref/switch-4.log | 8 +- src/test/ref/ternary-1.log | 8 +- src/test/ref/ternary-2.log | 8 +- src/test/ref/ternary-3.log | 8 +- src/test/ref/ternary-inference.log | 8 +- src/test/ref/test-comments-block.log | 8 +- src/test/ref/test-comments-loop.log | 8 +- src/test/ref/test-comments-single.log | 8 +- src/test/ref/test-comments-usage.log | 8 +- src/test/ref/test-comparisons-sword.log | 8 +- src/test/ref/test-comparisons-word.log | 8 +- src/test/ref/test-comparisons.log | 8 +- src/test/ref/test-division.log | 7 +- src/test/ref/test-interrupt-notype.log | 8 +- src/test/ref/test-interrupt.log | 8 +- src/test/ref/test-kasm-pc.log | 8 +- src/test/ref/test-kasm.log | 8 +- src/test/ref/test-keyboard-space.log | 8 +- src/test/ref/test-keyboard.log | 8 +- src/test/ref/test-lohiconst.log | 8 +- src/test/ref/test-lowhigh.log | 8 +- src/test/ref/test-multiply-16bit.log | 7 +- src/test/ref/test-multiply-8bit.log | 7 +- src/test/ref/test-scroll-up.log | 8 +- src/test/ref/test-signed-word-minus-byte.log | 8 +- src/test/ref/test-word-size-arrays.log | 8 +- src/test/ref/tetris-npe.log | 8 +- src/test/ref/textbox.log | 8 +- src/test/ref/tod018-problem.log | 8 +- src/test/ref/travis1.log | 8 +- src/test/ref/true-inline-words.log | 7 +- src/test/ref/type-inference.log | 8 +- src/test/ref/type-mix.log | 8 +- src/test/ref/type-signed.log | 8 +- src/test/ref/typedef-0.log | 8 +- src/test/ref/typedef-1.log | 8 +- src/test/ref/typedef-3.log | 8 +- src/test/ref/typedef-5.log | 8 +- src/test/ref/typedef-6.log | 8 +- src/test/ref/typedef-7.log | 8 +- src/test/ref/typeid-plus-byte-problem.log | 8 +- src/test/ref/typeid-plus-bytes.log | 8 +- src/test/ref/typeid-simple.log | 8 +- src/test/ref/typeinference-problem.log | 8 +- src/test/ref/unary-plus.log | 8 +- src/test/ref/uninitialized.log | 8 +- src/test/ref/unroll-for-min.log | 8 +- src/test/ref/unroll-loop-modifyvar.log | 8 +- src/test/ref/unroll-screenfill-for-double.log | 8 +- src/test/ref/unroll-screenfill-for.log | 8 +- src/test/ref/unroll-screenfill-while.log | 8 +- src/test/ref/unroll-while-min.log | 8 +- src/test/ref/unused-irq.log | 8 +- src/test/ref/unused-method.log | 8 +- src/test/ref/unused-vars.log | 8 +- src/test/ref/unusedblockproblem.log | 8 +- src/test/ref/useglobal.log | 8 +- src/test/ref/useuninitialized.log | 8 +- src/test/ref/var-export.log | 8 +- src/test/ref/var-forward-problem.log | 8 +- src/test/ref/var-forward-problem2.log | 8 +- src/test/ref/var-init-problem.log | 8 +- src/test/ref/var-register-noarg.log | 8 +- src/test/ref/var-register-zp-3.log | 8 +- src/test/ref/var-register-zp.log | 8 +- src/test/ref/var-register.log | 8 +- src/test/ref/varmodel-ma_mem-2.log | 8 +- src/test/ref/varmodel-ma_mem-3.log | 8 +- src/test/ref/varmodel-ma_mem-4.log | 8 +- src/test/ref/varmodel-ma_mem-5.log | 8 +- src/test/ref/varmodel-ma_mem.log | 8 +- src/test/ref/void-parameter.log | 8 +- src/test/ref/volatile-1.log | 8 +- src/test/ref/voronoi.log | 7 +- src/test/ref/wfragment1.log | 8 +- src/test/ref/word-array-0.log | 8 +- src/test/ref/word-array-1.log | 8 +- src/test/ref/word-array-2.log | 8 +- src/test/ref/word-pointer-compound.log | 8 +- src/test/ref/word-pointer-iteration-0.log | 8 +- src/test/ref/word-pointer-iteration.log | 8 +- src/test/ref/word-pointer-math-0.log | 8 +- src/test/ref/word-pointer-math-1.log | 8 +- src/test/ref/word-pointer-math.log | 8 +- src/test/ref/wordexpr.log | 8 +- src/test/ref/zeropage-detect-advanced.log | 8 +- src/test/ref/zeropage-sinus.log | 8 +- src/test/ref/zpparammin.log | 8 +- src/test/ref/zpptr.log | 8 +- 661 files changed, 2222 insertions(+), 3341 deletions(-) create mode 100644 .idea/libraries/Maven__javax_json_javax_json_api_1_1_4.xml rename .idea/libraries/{Maven__org_glassfish_javax_json_1_0_4.xml => Maven__org_glassfish_javax_json_1_1_4.xml} (64%) delete mode 100644 src/main/kc/include/c64.ld delete mode 100644 src/main/kc/include/plus4.ld diff --git a/.idea/libraries/Maven__javax_json_javax_json_api_1_1_4.xml b/.idea/libraries/Maven__javax_json_javax_json_api_1_1_4.xml new file mode 100644 index 000000000..e5a98fc21 --- /dev/null +++ b/.idea/libraries/Maven__javax_json_javax_json_api_1_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_javax_json_1_0_4.xml b/.idea/libraries/Maven__org_glassfish_javax_json_1_1_4.xml similarity index 64% rename from .idea/libraries/Maven__org_glassfish_javax_json_1_0_4.xml rename to .idea/libraries/Maven__org_glassfish_javax_json_1_1_4.xml index 7fbea5f63..1c5bf113e 100644 --- a/.idea/libraries/Maven__org_glassfish_javax_json_1_0_4.xml +++ b/.idea/libraries/Maven__org_glassfish_javax_json_1_1_4.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/kickc.iml b/kickc.iml index 7d0746679..195d176c1 100644 --- a/kickc.iml +++ b/kickc.iml @@ -17,12 +17,13 @@ - + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 15f425f42..8db74c25c 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,16 @@ picocli 4.2.0 + + javax.json + javax.json-api + 1.1.4 + + + org.glassfish + javax.json + 1.1.4 + diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml index e9657185e..3ae36b60f 100644 --- a/src/main/assembly/assembly.xml +++ b/src/main/assembly/assembly.xml @@ -17,7 +17,6 @@ *.c *.h - *.ld @@ -26,6 +25,13 @@ *.c *.h + + + + src/main/kc/target + target + + *.tgt *.ld diff --git a/src/main/java/dk/camelot64/kickc/Compiler.java b/src/main/java/dk/camelot64/kickc/Compiler.java index 68eab56c2..8bd2e363e 100644 --- a/src/main/java/dk/camelot64/kickc/Compiler.java +++ b/src/main/java/dk/camelot64/kickc/Compiler.java @@ -43,9 +43,6 @@ public class Compiler { */ private boolean enableLoopHeadConstant = false; - /** File name of link script to use (from command line parameter). */ - private String linkScriptFileName; - /** Variable optimization/memory area configuration to use (from command line parameter). */ private VariableBuilderConfig variableBuilderConfig; @@ -72,10 +69,6 @@ public class Compiler { program.setWarnArrayType(warnArrayType); } - public void setLinkScriptFileName(String linkScript) { - this.linkScriptFileName = linkScript; - } - public void setVariableBuilderConfig(VariableBuilderConfig variableBuilderConfig) { this.variableBuilderConfig = variableBuilderConfig; } @@ -104,14 +97,6 @@ public class Compiler { this.program.setEnableLiveRangeCallPath(enableLiveRangeCallPath); } - void setTargetPlatform(TargetPlatform targetPlatform) { - program.setTargetPlatform(targetPlatform); - } - - public void setTargetCpu(TargetCpu targetCpu) { - program.setTargetCpu(targetCpu); - } - public void setAsmFragmentBaseFolder(Path asmFragmentBaseFolder) { program.setAsmFragmentBaseFolder(asmFragmentBaseFolder); } @@ -120,10 +105,6 @@ public class Compiler { program.setAsmFragmentCacheFolder(asmFragmentcacheDir); } - public void initAsmFragmentSynthesizer() { - program.initAsmFragmentSynthesizer(); - } - public void initAsmFragmentSynthesizer(AsmFragmentTemplateSynthesizer synthesizer) { program.initAsmFragmentSynthesizer(synthesizer); } @@ -148,6 +129,10 @@ public class Compiler { program.getLibraryPaths().add(path); } + public void addTargetPlatformPath(String path) { + program.getTargetPlatformPaths().add(path); + } + /** * Create a CParser and initialize it by adding any command-line defines and loading the files. * @@ -196,9 +181,6 @@ public class Compiler { try { Path currentPath = new File(".").toPath(); - if(this.linkScriptFileName != null) { - SourceLoader.loadLinkScriptFile(linkScriptFileName, currentPath, program); - } program.setStatementSequence(new StatementSequence()); CParser cParser = initializeParser(defines, cFiles, currentPath); diff --git a/src/main/java/dk/camelot64/kickc/KickC.java b/src/main/java/dk/camelot64/kickc/KickC.java index 9b8ba4b08..e096c4cb4 100644 --- a/src/main/java/dk/camelot64/kickc/KickC.java +++ b/src/main/java/dk/camelot64/kickc/KickC.java @@ -71,6 +71,9 @@ public class KickC implements Callable { @CommandLine.Option(names = {"-F", "-fragmentdir"}, description = "Path to the ASM fragment folder, where the compiler looks for ASM fragments.") private Path fragmentDir = null; + @CommandLine.Option(names = {"-P", "-platformdir", "-targetdir"}, description = "Path to a target platform folder, where the compiler looks for target platform files. This option can be repeated to add multiple target platform folders.") + private List targetPlatformDir = null; + @CommandLine.Option(names = {"-Ouplift"}, description = "Optimization Option. Number of combinations to test when uplifting variables to registers in a scope. By default 100 combinations are tested.") private Integer optimizeUpliftCombinations = null; @@ -152,11 +155,11 @@ public class KickC implements Callable { @CommandLine.Option(names = {"-Si"}, description = "Interleave comments with intermediate language code and ASM fragment names in the generated ASM.") private boolean interleaveIclFile = false; - @CommandLine.Option(names = {"-t", "-target"}, description = "The target system. Default is C64 with BASIC upstart. See #pragma target") - private String target = TargetPlatform.C64BASIC.getName(); + @CommandLine.Option(names = {"-p", "-t", "-target", "-platform"}, description = "The target platform. Default is C64 with BASIC upstart. See #pragma target") + private String targetPlatform = null; @CommandLine.Option(names = {"-cpu"}, description = "The target CPU. Default is 6502 with illegal opcodes. See #pragma cpu") - private String cpu = TargetCpu.MOS6502X.getName(); + private String cpu = null; @CommandLine.Option(names = {"-T", "-link"}, description = "Link using a linker script in KickAss segment format. See #pragma link") private String linkScript = null; @@ -184,36 +187,6 @@ public class KickC implements Callable { Compiler compiler = new Compiler(); - if(target != null) { - TargetPlatform targetPlatform = TargetPlatform.getTargetPlatform(target); - if(targetPlatform == null) { - System.err.println("Unknown target platform " + target); - StringBuffer supported = new StringBuffer(); - supported.append("The supported target platforms are: "); - for(TargetPlatform value : TargetPlatform.values()) { - supported.append(value.getName()).append(" "); - } - System.err.println(supported); - return COMPILE_ERROR; - } - compiler.setTargetPlatform(targetPlatform); - } - - if(cpu != null) { - TargetCpu targetCpu = TargetCpu.getTargetCpu(cpu); - if(targetCpu == null) { - System.err.println("Unknown target CPU " + cpu); - StringBuffer supported = new StringBuffer(); - supported.append("The supported target CPUs are: "); - for(TargetCpu value : TargetCpu.values()) { - supported.append(value.getName()).append(" "); - } - System.err.println(supported); - return COMPILE_ERROR; - } - compiler.setTargetCpu(targetCpu); - } - if(includeDir != null) { for(Path includePath : includeDir) { compiler.addIncludePath(includePath.toString()); @@ -226,6 +199,12 @@ public class KickC implements Callable { } } + if(targetPlatformDir != null) { + for(Path platformPath : targetPlatformDir) { + compiler.addTargetPlatformPath(platformPath.toString()); + } + } + if(fragmentDir == null) { fragmentDir = new File("fragment/").toPath(); } @@ -243,7 +222,35 @@ public class KickC implements Callable { compiler.setAsmFragmentBaseFolder(fragmentDir); compiler.setAsmFragmentCacheFolder(fragmentCacheDir); - compiler.initAsmFragmentSynthesizer(); + + Program program = compiler.getProgram(); + Path currentPath = new File(".").toPath(); + + // Set up Target Platform + try { + if(targetPlatform != null) { + TargetPlatform.setTargetPlatform(targetPlatform, currentPath, program, null); + } else { + TargetPlatform.setTargetPlatform(TargetPlatform.DEFAULT_NAME, currentPath, program, null); + } + } catch(CompileError e) { + // Print the error and exit with compile error + System.err.println(e.getMessage()); + return COMPILE_ERROR; + } + + + // Update link script + if(linkScript != null) { + program.getTargetPlatform().setLinkScriptFile(SourceLoader.loadFile(linkScript, currentPath, program.getTargetPlatformPaths())); + } + + // Update CPU + if(cpu != null) { + TargetCpu targetCpu = TargetCpu.getTargetCpu(cpu, false); + program.getTargetPlatform().setCpu(targetCpu); + } + program.initAsmFragmentSynthesizer(); if(fragment != null) { if(verbose) { @@ -312,10 +319,6 @@ public class KickC implements Callable { compiler.setWarnArrayType(true); } - if(linkScript != null) { - compiler.setLinkScriptFileName(linkScript); - } - if(varModel != null) { List settings = Arrays.asList(varModel.split(",")); settings = settings.stream().map(String::trim).collect(Collectors.toList()); @@ -359,7 +362,6 @@ public class KickC implements Callable { } System.out.println("Compiling " + CFileNames); - Program program = compiler.getProgram(); try { compiler.compile(cFiles, defines); } catch(CompileError e) { @@ -399,8 +401,8 @@ public class KickC implements Callable { // Find emulator - if set by #pragma if(emulator == null) { - if(program.getEmulatorCommand() != null && (debug || execute)) - emulator = program.getEmulatorCommand(); + if(program.getTargetPlatform().getEmulatorCommand() != null && (debug || execute)) + emulator = program.getTargetPlatform().getEmulatorCommand(); else if(debug) emulator = "C64Debugger"; else if(execute) @@ -564,7 +566,7 @@ public class KickC implements Callable { ? keyValue[1] : "1"; Map map = argSpec.getValue(); - if(map==null) { + if(map == null) { map = new LinkedHashMap<>(); argSpec.setValue(map); } diff --git a/src/main/java/dk/camelot64/kickc/SourceLoader.java b/src/main/java/dk/camelot64/kickc/SourceLoader.java index 1af052c04..989a0676c 100644 --- a/src/main/java/dk/camelot64/kickc/SourceLoader.java +++ b/src/main/java/dk/camelot64/kickc/SourceLoader.java @@ -1,12 +1,6 @@ package dk.camelot64.kickc; -import dk.camelot64.kickc.model.CompileError; -import dk.camelot64.kickc.model.Program; -import dk.camelot64.kickc.model.TargetPlatform; - import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -18,6 +12,7 @@ public class SourceLoader { /** * Locate a file and load it. Looks through the current path and a set of search folder. + * * @param fileName The file to look for. * @param currentPath The current path. May be null. * @param searchPaths The search paths to look through if the file is not found in the current path. @@ -44,18 +39,34 @@ public class SourceLoader { return null; } - public static void loadLinkScriptFile(String fileName, Path currentPath, Program program) { - try { - File file = loadFile(fileName, currentPath, program.getIncludePaths()); - if(file==null) - throw new CompileError("File not found " + fileName); - Path filePath = file.toPath(); - String linkScript = new String(Files.readAllBytes(filePath)); - program.setLinkScript(filePath, linkScript); - program.setTargetPlatform(TargetPlatform.CUSTOM); - } catch(IOException e) { - throw new CompileError("Error loading link script file " + fileName, e); + /** + * Find all files with a specific extension + * + * @param currentPath The current folder + * @param searchPaths The folders to search + * @param extension The extension to look for (excluding the dot) + * @return All files in the folders with the given extension. + */ + public static List listFiles(Path currentPath, List searchPaths, String extension) { + List allFiles = new ArrayList<>(); + List allSearchPaths = new ArrayList<>(); + if(currentPath != null) + allSearchPaths.add(currentPath.toString()); + allSearchPaths.addAll(searchPaths); + for(String searchPath : allSearchPaths) { + if(!searchPath.endsWith("/")) { + searchPath += "/"; + } + final File searchFolder = new File(searchPath); + if(searchFolder.exists() && searchFolder.isDirectory()) { + final String[] files = searchFolder.list((dir, name) -> name.endsWith("." + extension)); + if(files != null) + for(String file : files) { + allFiles.add(new File(file)); + } + } } + return allFiles; } } diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmChunk.java b/src/main/java/dk/camelot64/kickc/asm/AsmChunk.java index d73d71e6e..a3367cc55 100644 --- a/src/main/java/dk/camelot64/kickc/asm/AsmChunk.java +++ b/src/main/java/dk/camelot64/kickc/asm/AsmChunk.java @@ -307,7 +307,14 @@ public class AsmChunk { * @return true if the line is an instruction or similar. */ private boolean shouldIndentAsm(AsmLine line) { - return line instanceof AsmInstruction || line instanceof AsmLabelDecl || line instanceof AsmConstant || line instanceof AsmDataNumeric || line instanceof AsmDataFill || line instanceof AsmDataString || line instanceof AsmDataAlignment || line instanceof AsmInlineKickAsm; + return line instanceof AsmInstruction || + line instanceof AsmLabelDecl || + line instanceof AsmConstant || + line instanceof AsmDataNumeric || + line instanceof AsmDataFill || + line instanceof AsmDataString || + line instanceof AsmDataAlignment || + (line instanceof AsmInlineKickAsm && !line.getAsm().contains(".pc")); } @Override diff --git a/src/main/java/dk/camelot64/kickc/model/CompileError.java b/src/main/java/dk/camelot64/kickc/model/CompileError.java index e1ab59825..3160e084c 100644 --- a/src/main/java/dk/camelot64/kickc/model/CompileError.java +++ b/src/main/java/dk/camelot64/kickc/model/CompileError.java @@ -14,8 +14,8 @@ public class CompileError extends RuntimeException { } public CompileError(String message, StatementSource source) { - super(message+"\n"+source.toString()); - this.source = source.toString(); + super(message+"\n"+(source==null?"":source.toString())); + this.source = (source==null?"":source.toString()); } public CompileError(String message, Token token) { diff --git a/src/main/java/dk/camelot64/kickc/model/Program.java b/src/main/java/dk/camelot64/kickc/model/Program.java index 88d488080..e3c59358d 100644 --- a/src/main/java/dk/camelot64/kickc/model/Program.java +++ b/src/main/java/dk/camelot64/kickc/model/Program.java @@ -25,13 +25,13 @@ public class Program { private List includePaths; /** Paths used for library files. PASS 0 (STATIC) */ private List libraryPaths; + /** Paths used for target files. PASS 0 (STATIC) */ + private List targetPlatformPaths; /** All loaded H/C-files. PASS 0 (STATIC) */ private List loadedFiles; /** The target platform that the program is being build for. PASS 0-5 (STATIC) */ - private TargetPlatform targetPlatform = TargetPlatform.DEFAULT; - /** The target CPU that the program is being build for. PASS 0-5 (STATIC) */ - private TargetCpu targetCpu = TargetCpu.DEFAULT; + private TargetPlatform targetPlatform; /** Base folder for finding ASM fragment files. (STATIC) */ private Path asmFragmentBaseFolder; @@ -45,13 +45,6 @@ public class Program { /** Array syntax used on types (eg. char[8] x; ) produce a warning instead of an error (STATIC) */ private boolean warnArrayType = false; - /** Path to any custom link script file used for linking (STATIC) */ - private Path linkScriptFilePath; - /** Body to any custom link script file used for linking (STATIC) */ - private String linkScriptBody; - /** The program name for the emulator to pass the compiled program to. */ - private String emulatorCommand; - /** Absolute start address of the code. Null to start ad 0x080d. PASS 0-5 (STATIC) */ private Number programPc; /** Reserved ZP addresses that the compiler cannot use. PASS 0-5 (STATIC) */ @@ -112,6 +105,7 @@ public class Program { this.log = new CompileLog(); this.includePaths = new ArrayList<>(); this.libraryPaths = new ArrayList<>(); + this.targetPlatformPaths = new ArrayList<>(); this.loadedFiles = new ArrayList<>(); this.asmResourceFiles = new ArrayList<>(); this.reservedZps = new ArrayList<>(); @@ -123,6 +117,7 @@ public class Program { public void endPass1() { this.includePaths = null; this.libraryPaths = null; + this.targetPlatformPaths = null; this.loadedFiles = null; this.statementSequence = null; this.procedureModifiedVars = null; @@ -216,21 +211,13 @@ public class Program { } public void initAsmFragmentSynthesizer() { - this.asmFragmentSynthesizer = new AsmFragmentTemplateSynthesizer(asmFragmentBaseFolder, targetCpu, asmFragmentCacheFolder, getLog()); + this.asmFragmentSynthesizer = new AsmFragmentTemplateSynthesizer(asmFragmentBaseFolder, targetPlatform.getCpu(), asmFragmentCacheFolder, getLog()); } public void initAsmFragmentSynthesizer(AsmFragmentTemplateSynthesizer synthesizer) { this.asmFragmentSynthesizer = synthesizer; } - public TargetCpu getTargetCpu() { - return targetCpu; - } - - public void setTargetCpu(TargetCpu targetCpu) { - this.targetCpu = targetCpu; - } - public TargetPlatform getTargetPlatform() { return targetPlatform; } @@ -239,6 +226,11 @@ public class Program { this.targetPlatform = targetPlatform; } + public TargetCpu getTargetCpu() { + return getTargetPlatform().getCpu(); + } + + public StructVariableMemberUnwinding getStructVariableMemberUnwinding() { return structVariableMemberUnwinding; } @@ -263,6 +255,10 @@ public class Program { return libraryPaths; } + public List getTargetPlatformPaths() { + return targetPlatformPaths; + } + public List getLoadedFiles() { return loadedFiles; } @@ -508,14 +504,6 @@ public class Program { return programPc; } - public void setEmulatorCommand(String emulatorCommand) { - this.emulatorCommand = emulatorCommand; - } - - public String getEmulatorCommand() { - return emulatorCommand; - } - public CompileLog getLog() { return log; } @@ -524,18 +512,6 @@ public class Program { this.log = log; } - public void setLinkScript(Path linkScriptFilePath, String linkScriptBody) { - this.linkScriptFilePath = linkScriptFilePath; - this.linkScriptBody = linkScriptBody; - } - - public Path getLinkScriptFilePath() { - return linkScriptFilePath; - } - - public String getLinkScriptBody() { - return linkScriptBody; - } /** * Get information about the size of the program diff --git a/src/main/java/dk/camelot64/kickc/model/TargetCpu.java b/src/main/java/dk/camelot64/kickc/model/TargetCpu.java index 1a7c755e2..1cb257ce3 100644 --- a/src/main/java/dk/camelot64/kickc/model/TargetCpu.java +++ b/src/main/java/dk/camelot64/kickc/model/TargetCpu.java @@ -66,7 +66,7 @@ public enum TargetCpu { } /** - * Get the features of the CPU decising which fragments is usable + * Get the features of the CPU deciding which fragments is usable * @return The features */ public List getFeatures() { @@ -74,14 +74,19 @@ public enum TargetCpu { } /** Get a target CPU by name. */ - public static TargetCpu getTargetCpu(String name) { + public static TargetCpu getTargetCpu(String name, boolean missingOk) { for(TargetCpu value : TargetCpu.values()) { if(value.getName().equalsIgnoreCase(name)) { return value; } } - return null; + if(missingOk) + return null; + StringBuilder supported = new StringBuilder(); + for(TargetCpu value : TargetCpu.values()) { + supported.append(value.getName()).append(" "); + } + throw new CompileError("Unknown CPU. Supported: " + supported.toString()); } - } diff --git a/src/main/java/dk/camelot64/kickc/model/TargetPlatform.java b/src/main/java/dk/camelot64/kickc/model/TargetPlatform.java index b85bdee60..83fd59d50 100644 --- a/src/main/java/dk/camelot64/kickc/model/TargetPlatform.java +++ b/src/main/java/dk/camelot64/kickc/model/TargetPlatform.java @@ -1,23 +1,50 @@ package dk.camelot64.kickc.model; +import dk.camelot64.kickc.SourceLoader; +import dk.camelot64.kickc.model.statements.StatementSource; + +import javax.json.Json; +import javax.json.JsonObject; +import javax.json.JsonReader; +import javax.json.stream.JsonParsingException; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; +import java.util.Map; + /** * The target platform the compiler is creating a program for. + *

+ * The target platform is represented by a .tgt-file in the target-folder, which typically sets up + * link script, cpu, emulator and some platform #defines */ -public enum TargetPlatform { - /** Commodore 64 with BASIC upstart SYS-command. */ - C64BASIC("c64basic"), - /** 6502 assembler (with no upstart code.)*/ - ASM6502("asm6502"), - /** Custom target platform specified in a separate linker file passed using -T option or using #pragma link() */ - CUSTOM("custom"); +public class TargetPlatform { - /** The default target platform. */ - public static final TargetPlatform DEFAULT = C64BASIC; + /** The name of the default target platform. */ + public static String DEFAULT_NAME = "c64basic"; + + /** The file extension used for target platform files. */ + public static final String FILE_EXTENSION = "tgt"; /** The platform name. */ private String name; - TargetPlatform(String name) { + /** The target CPU. */ + private TargetCpu cpu; + + /** The link script file. */ + private File linkScriptFile; + + /** The command to use for starting an emulator. */ + private String emulatorCommand; + + /** A number of preprocessor macro defines. */ + private Map defines = null; + + public TargetPlatform(String name) { this.name = name; } @@ -25,14 +52,81 @@ public enum TargetPlatform { return name; } - /** Get a target platform by name. */ - public static TargetPlatform getTargetPlatform(String name) { - for(TargetPlatform value : TargetPlatform.values()) { - if(value.getName().equalsIgnoreCase(name)) { - return value; + public void setName(String name) { + this.name = name; + } + + public TargetCpu getCpu() { + return cpu; + } + + public void setCpu(TargetCpu cpu) { + this.cpu = cpu; + } + + public File getLinkScriptFile() { + return linkScriptFile; + } + + public void setLinkScriptFile(File linkScriptFile) { + this.linkScriptFile = linkScriptFile; + } + + public String getEmulatorCommand() { + return emulatorCommand; + } + + public void setEmulatorCommand(String emulatorCommand) { + this.emulatorCommand = emulatorCommand; + } + + public Map getDefines() { + return defines; + } + + public void setDefines(Map defines) { + this.defines = defines; + } + + /** + * Set the target platform from a platform name + * + * @param platformName The platform name + * @param currentFolder The current folder (added to the search path) + * @param program The program. + * @param statementSource The source file & line used for errors + */ + public static void setTargetPlatform(String platformName, Path currentFolder, Program program, StatementSource statementSource) { + final File platformFile = SourceLoader.loadFile(platformName + "." + FILE_EXTENSION, currentFolder, program.getTargetPlatformPaths()); + if(platformFile != null) { + // Set the target platform + try { + final JsonReader jsonReader = Json.createReader(new BufferedInputStream(new FileInputStream(platformFile))); + final JsonObject platformJson = jsonReader.readObject(); + TargetPlatform targetPlatform = new TargetPlatform(platformName); + final String cpuName = platformJson.getString("cpu", null); + if(cpuName != null) + targetPlatform.setCpu(TargetCpu.getTargetCpu(cpuName, false)); + final String linkScriptName = platformJson.getString("link", null); + if(linkScriptName != null) + targetPlatform.setLinkScriptFile(SourceLoader.loadFile(linkScriptName, currentFolder, program.getTargetPlatformPaths())); + final String emulatorCommand = platformJson.getString("emulator", null); + if(emulatorCommand != null) + targetPlatform.setEmulatorCommand(emulatorCommand); + program.setTargetPlatform(targetPlatform); + } catch(CompileError | IOException | JsonParsingException e) { + throw new CompileError("Error parsing target platform file " + platformFile.getAbsolutePath() + "\n"+e.getMessage(), statementSource); } + } else { + StringBuilder supported = new StringBuilder(); + final List platformFiles = SourceLoader.listFiles(currentFolder, program.getTargetPlatformPaths(), FILE_EXTENSION); + for(File file : platformFiles) { + String name = file.getName(); + name = name.substring(0, name.length()- FILE_EXTENSION.length()-1); + supported.append(name).append(" "); + } + throw new CompileError("Unknown target platform '"+platformName+"'. Supported: " + supported.toString(), statementSource); } - return null; } } diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java index 2f998cb97..13ae7b2ca 100644 --- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java +++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java @@ -129,10 +129,11 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor 0) { @@ -83,8 +88,8 @@ public class Pass5SkipBegin extends Pass5AsmOptimization { return false; } if(block.getDefaultSuccessor() != null) { - ControlFlowBlock successor = getProgram().getGraph().getBlock(block.getDefaultSuccessor()); - return canSkipBegin(successor); + ControlFlowBlock successor = graph.getBlock(block.getDefaultSuccessor()); + return canSkipBegin(successor, graph); } return true; } diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java b/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java index 4b6412d72..eef0ae388 100644 --- a/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java +++ b/src/main/java/dk/camelot64/kickc/passes/Pass5UnusedLabelElimination.java @@ -51,7 +51,7 @@ public class Pass5UnusedLabelElimination extends Pass5AsmOptimization { } } } - if(getProgram().getLinkScriptBody()!=null) { + if(!Pass5SkipBegin.canSkipBegin(getProgram().getGraph())) { usedLabels.add("::__bbegin"); } return usedLabels; diff --git a/src/main/kc/include/c64.ld b/src/main/kc/include/c64.ld deleted file mode 100644 index a66015cac..000000000 --- a/src/main/kc/include/c64.ld +++ /dev/null @@ -1,9 +0,0 @@ -.file [name="%O.prg", type="prg", segments="Program"] -.segmentdef Program [segments="Basic, Code, Data"] -.segmentdef Basic [start=$0801] -.segmentdef Code [start=$080d] -.segmentdef Data [startAfter="Code"] -.segment Basic -:BasicUpstart(%E) -.segment Code - diff --git a/src/main/kc/include/plus4.ld b/src/main/kc/include/plus4.ld deleted file mode 100644 index cd18c7d93..000000000 --- a/src/main/kc/include/plus4.ld +++ /dev/null @@ -1,9 +0,0 @@ -.file [name="%O.prg", type="prg", segments="Program"] -.segmentdef Program [segments="Basic, Code, Data"] -.segmentdef Basic [start=$1001] -.segmentdef Code [start=$100d] -.segmentdef Data [startAfter="Code"] -.segment Basic -:BasicUpstart(%E) -.segment Code - diff --git a/src/main/script/kickc.bat b/src/main/script/kickc.bat index e037502a0..574f7d250 100644 --- a/src/main/script/kickc.bat +++ b/src/main/script/kickc.bat @@ -10,11 +10,13 @@ echo KICKC_STDLIB=%KICKC_STDINCLUDE% echo KICKC_STDINCLUDE=%KICKC_STDINCLUDE% set KICKC_FRAGMENT_HOME=%KICKC_HOME%\fragment echo KICKC_FRAGMENT_HOME=%KICKC_FRAGMENT_HOME% +set KICKC_PLATFORM_HOME=%KICKC_HOME%\target +echo KICKC_PLATFORM_HOME=%KICKC_PLATFORM_HOME% REM KICKASSEMBLER HOME REM VICE HOME REM KICKC_JAR for %%I in ( %KICKC_HOME%\jar\kickc-*.jar ) do set KICKC_JAR=%%I echo KICKC_JAR=%KICKC_JAR% -echo java -jar %KICKC_JAR% -I %KICKC_STDINCLUDE% -L %KICKC_STDLIB% -F %KICKC_FRAGMENT_HOME% %* -java -jar %KICKC_JAR% -I %KICKC_STDINCLUDE% -L %KICKC_STDLIB% -F %KICKC_FRAGMENT_HOME% %* \ No newline at end of file +echo java -jar %KICKC_JAR% -I %KICKC_STDINCLUDE% -L %KICKC_STDLIB% -F %KICKC_FRAGMENT_HOME% -P %KICKC_PLATFORM_HOME% %* +java -jar %KICKC_JAR% -I %KICKC_STDINCLUDE% -L %KICKC_STDLIB% -F %KICKC_FRAGMENT_HOME% -P %KICKC_PLATFORM_HOME% %* \ No newline at end of file diff --git a/src/main/script/kickc.sh b/src/main/script/kickc.sh index 66ba9daad..32ca5b077 100755 --- a/src/main/script/kickc.sh +++ b/src/main/script/kickc.sh @@ -9,6 +9,8 @@ export KICKC_STDINCLUDE="$KICKC_HOME/include" export KICKC_STDLIB="$KICKC_HOME/lib" # FRAGMENTS HOME export KICKC_FRAGMENT_HOME="$KICKC_HOME/fragment" +# STANDARD PLATFORM +export KICKC_PLATFORM="$KICKC_HOME/target" # KICKASSEMBLER HOME # VICE HOME # KICKC_JAR @@ -21,5 +23,5 @@ while [[ "$#" -gt 0 ]]; do case $1 in *) export PARAM="$PARAM $1"; shift;; esac; done -echo java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STDINCLUDE -L $KICKC_STDLIB -java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STDINCLUDE -L $KICKC_STDLIB \ No newline at end of file +echo java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STDINCLUDE -L $KICKC_STDLIB -P $KICKC_PLATFORM +java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STDINCLUDE -L $KICKC_STDLIB -P $KICKC_PLATFORM \ No newline at end of file diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java index 136b2cb43..7396ce557 100644 --- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java +++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java @@ -7,6 +7,7 @@ import dk.camelot64.kickc.fragment.AsmFragmentTemplateSynthesizer; import dk.camelot64.kickc.model.CompileError; import dk.camelot64.kickc.model.Program; import dk.camelot64.kickc.model.TargetCpu; +import dk.camelot64.kickc.model.TargetPlatform; import kickass.KickAssembler; import kickass.nonasm.c64.CharToPetsciiConverter; import org.junit.AfterClass; @@ -34,6 +35,7 @@ public class TestPrograms { final String stdIncludePath = "src/main/kc/include"; final String stdLibPath = "src/main/kc/lib"; + final String stdPlatformPath = "src/main/kc/target"; final String testPath = "src/test/kc"; final String refPath = "src/test/ref/"; @@ -4294,9 +4296,10 @@ public class TestPrograms { if(compileLog != null) { compiler.setLog(compileLog); } - compiler.addIncludePath(stdIncludePath); compiler.addIncludePath(testPath); + compiler.addIncludePath(stdIncludePath); compiler.addLibraryPath(stdLibPath); + compiler.addTargetPlatformPath(stdPlatformPath); compiler.initAsmFragmentSynthesizer(asmFragmentSynthesizer); if(upliftCombinations != null) { compiler.setUpliftCombinations(upliftCombinations); @@ -4304,8 +4307,9 @@ public class TestPrograms { final ArrayList files = new ArrayList<>(); final Path filePath = Paths.get(fileName); files.add(filePath); - compiler.compile(files, null); Program program = compiler.getProgram(); + TargetPlatform.setTargetPlatform(TargetPlatform.DEFAULT_NAME, filePath, program, null); + compiler.compile(files, null); compileAsm(fileName, program); boolean success = true; ReferenceHelper helper = new ReferenceHelperFolder(refPath); diff --git a/src/test/kc/examples/plus4walk/plus4walk.c b/src/test/kc/examples/plus4walk/plus4walk.c index 2e231424b..8598b99ab 100644 --- a/src/test/kc/examples/plus4walk/plus4walk.c +++ b/src/test/kc/examples/plus4walk/plus4walk.c @@ -1,6 +1,5 @@ // Random walk with color fading for Commodore Plus/4 / C16 -#pragma link("plus4.ld") -#pragma emulator("xplus4") +#pragma target(plus4) #include #include diff --git a/src/test/kc/platform-asm6502.c b/src/test/kc/platform-asm6502.c index 47c080a44..d6f0572b7 100644 --- a/src/test/kc/platform-asm6502.c +++ b/src/test/kc/platform-asm6502.c @@ -1,6 +1,7 @@ // Tests the target platform ASM6502 #pragma target(asm6502) +#pragma pc(0x2000) unsigned char TABLE[10]; diff --git a/src/test/ref/address-1.log b/src/test/ref/address-1.log index 13ffacffd..a235cbaec 100644 --- a/src/test/ref/address-1.log +++ b/src/test/ref/address-1.log @@ -104,7 +104,7 @@ Target platform is c64basic / MOS6502X // Hard-coded zero-page address - local variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -173,7 +173,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Hard-coded zero-page address - local variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/address-3.log b/src/test/ref/address-3.log index 1f675e62e..22ee4defe 100644 --- a/src/test/ref/address-3.log +++ b/src/test/ref/address-3.log @@ -104,7 +104,7 @@ Target platform is c64basic / MOS6502X // Hard-coded mainmem address - local variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -173,7 +173,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Hard-coded mainmem address - local variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/address-4.log b/src/test/ref/address-4.log index 478ff2079..05812695a 100644 --- a/src/test/ref/address-4.log +++ b/src/test/ref/address-4.log @@ -129,7 +129,7 @@ Target platform is c64basic / MOS6502X // Incrementing a load/store variable will result in cause two *SIZEOF's // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -224,7 +224,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Incrementing a load/store variable will result in cause two *SIZEOF's // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -299,14 +299,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/address-of-0.log b/src/test/ref/address-of-0.log index a73f15f14..993618616 100644 --- a/src/test/ref/address-of-0.log +++ b/src/test/ref/address-of-0.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // Test address-of - use the pointer to get the value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -196,7 +196,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test address-of - use the pointer to get the value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -255,14 +255,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/address-of-1.log b/src/test/ref/address-of-1.log index 4e844b90a..827b7938b 100644 --- a/src/test/ref/address-of-1.log +++ b/src/test/ref/address-of-1.log @@ -215,7 +215,7 @@ Target platform is c64basic / MOS6502X // Test address-of - pass the pointer as parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -366,7 +366,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test address-of - pass the pointer as parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -495,6 +495,7 @@ Removing instruction setByte_from___b1: Removing instruction __b2_from___b1: Removing instruction setByte_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction setByte_from_main: Removing instruction __b1: @@ -503,11 +504,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/address-of-3.log b/src/test/ref/address-of-3.log index c7b13fd8e..a336abd1e 100644 --- a/src/test/ref/address-of-3.log +++ b/src/test/ref/address-of-3.log @@ -291,7 +291,7 @@ Target platform is c64basic / MOS6502X // Test address-of an array element // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -454,7 +454,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test address-of an array element // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -593,6 +593,7 @@ Removing instruction __b2_from_main: Removing instruction print_from___b2: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b2: @@ -602,13 +603,10 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/array-16bit-lookup.log b/src/test/ref/array-16bit-lookup.log index c24ccf0e6..1b0c7a22a 100644 --- a/src/test/ref/array-16bit-lookup.log +++ b/src/test/ref/array-16bit-lookup.log @@ -254,7 +254,7 @@ Target platform is c64basic / MOS6502X // http://8bitworkshop.com/blog/compilers/2019/03/17/cc65-optimization.html // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -427,7 +427,7 @@ ASSEMBLER BEFORE OPTIMIZATION // http://8bitworkshop.com/blog/compilers/2019/03/17/cc65-optimization.html // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -537,19 +537,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/array-length-symbolic-min.log b/src/test/ref/array-length-symbolic-min.log index 4b470f220..4e2e57fad 100644 --- a/src/test/ref/array-length-symbolic-min.log +++ b/src/test/ref/array-length-symbolic-min.log @@ -122,7 +122,7 @@ Target platform is c64basic / MOS6502X // Illustrates symbolic array lengths // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SZ = $f @@ -192,7 +192,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates symbolic array lengths // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SZ = $f @@ -256,17 +256,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/array-length-symbolic.log b/src/test/ref/array-length-symbolic.log index 74b7d95f4..6872b51a3 100644 --- a/src/test/ref/array-length-symbolic.log +++ b/src/test/ref/array-length-symbolic.log @@ -229,7 +229,7 @@ Target platform is c64basic / MOS6502X // Illustrates symbolic array lengths // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const ITEM_COUNT = 3 @@ -362,7 +362,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates symbolic array lengths // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const ITEM_COUNT = 3 @@ -474,19 +474,17 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/arrays-init-kasm-0.log b/src/test/ref/arrays-init-kasm-0.log index f3baad3c7..a790d6535 100644 --- a/src/test/ref/arrays-init-kasm-0.log +++ b/src/test/ref/arrays-init-kasm-0.log @@ -87,7 +87,7 @@ Target platform is c64basic / MOS6502X // Test initializing array using KickAssembler // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -137,7 +137,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test initializing array using KickAssembler // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -181,14 +181,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/arrays-init-short.log b/src/test/ref/arrays-init-short.log index 31a447eb7..9cbd82e36 100644 --- a/src/test/ref/arrays-init-short.log +++ b/src/test/ref/arrays-init-short.log @@ -177,7 +177,7 @@ Target platform is c64basic / MOS6502X // Test a short array initializer - the rest should be zero-filled // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -290,7 +290,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a short array initializer - the rest should be zero-filled // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -381,6 +381,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_from___b1: @@ -388,11 +389,8 @@ Removing instruction __breturn: Removing instruction __b3_from___b4: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/arrays-init.log b/src/test/ref/arrays-init.log index b00d2c941..144b93a19 100644 --- a/src/test/ref/arrays-init.log +++ b/src/test/ref/arrays-init.log @@ -121,7 +121,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -181,7 +181,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -235,14 +235,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/asm-culling-jmp.log b/src/test/ref/asm-culling-jmp.log index a8f4bd63c..3803858cd 100644 --- a/src/test/ref/asm-culling-jmp.log +++ b/src/test/ref/asm-culling-jmp.log @@ -76,7 +76,7 @@ Target platform is c64basic / MOS6502X // https://gitlab.com/camelot/kickc/issues/302 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -128,7 +128,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://gitlab.com/camelot/kickc/issues/302 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -172,14 +172,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/asm-mnemonic-names.log b/src/test/ref/asm-mnemonic-names.log index 523359599..a32c4af6a 100644 --- a/src/test/ref/asm-mnemonic-names.log +++ b/src/test/ref/asm-mnemonic-names.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // Works if the C-lexer and the ASM-lexer are separated properly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label lda = $400 @@ -198,7 +198,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Works if the C-lexer and the ASM-lexer are separated properly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label lda = $400 @@ -265,17 +265,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp a Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/asm-uses-0.log b/src/test/ref/asm-uses-0.log index c7a193f13..6f1639f26 100644 --- a/src/test/ref/asm-uses-0.log +++ b/src/test/ref/asm-uses-0.log @@ -101,7 +101,7 @@ Target platform is c64basic / MOS6502X // Tests that inline asm uses clause makes the compiler not cull a procedure referenced // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d020 @@ -161,7 +161,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that inline asm uses clause makes the compiler not cull a procedure referenced // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d020 @@ -213,15 +213,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/assignment-chained.log b/src/test/ref/assignment-chained.log index f095532aa..83a401589 100644 --- a/src/test/ref/assignment-chained.log +++ b/src/test/ref/assignment-chained.log @@ -151,7 +151,7 @@ Target platform is c64basic / MOS6502X // Tests that chained assignments work as intended // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -222,7 +222,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that chained assignments work as intended // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -282,14 +282,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/assignment-compound.log b/src/test/ref/assignment-compound.log index 1ae3a74cc..c6bdbb617 100644 --- a/src/test/ref/assignment-compound.log +++ b/src/test/ref/assignment-compound.log @@ -696,7 +696,7 @@ Target platform is c64basic / MOS6502X // Test compound assignment operators // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const GREEN = 5 @@ -971,7 +971,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test compound assignment operators // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const GREEN = 5 @@ -1230,6 +1230,7 @@ Removing instruction __b8_from___b7: Removing instruction __b9_from___b8: Removing instruction __b10_from___b9: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction test_from_main: Removing instruction __b1: @@ -1255,12 +1256,10 @@ Removing instruction test_from___b10: Removing instruction __breturn: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/bgblack.log b/src/test/ref/bgblack.log index e6fd441ea..cf0d3149c 100644 --- a/src/test/ref/bgblack.log +++ b/src/test/ref/bgblack.log @@ -74,7 +74,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BLACK = 0 @@ -120,7 +120,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BLACK = 0 @@ -161,14 +161,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bitmap-circle-2.log b/src/test/ref/bitmap-circle-2.log index fa66efc80..14460a229 100644 --- a/src/test/ref/bitmap-circle-2.log +++ b/src/test/ref/bitmap-circle-2.log @@ -1298,7 +1298,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -2178,7 +2178,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -2896,6 +2896,7 @@ Removing instruction __b4_from___b5: Removing instruction __b1_from_fill: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fill_from_main: Removing instruction __b4: @@ -2929,11 +2930,8 @@ Removing instruction __b2: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [112] bmi __b3 to bpl Fixing long branch [309] bmi __breturn to bpl Fixing long branch [319] bmi __breturn to bpl diff --git a/src/test/ref/bitmap-circle.log b/src/test/ref/bitmap-circle.log index 9ee61cc7b..fe7c130cc 100644 --- a/src/test/ref/bitmap-circle.log +++ b/src/test/ref/bitmap-circle.log @@ -1195,7 +1195,7 @@ Target platform is c64basic / MOS6502X // Original Source https://bcaorganizer.blogspot.com/p/c-program-for_21.html?fbclid=IwAR0iL8pYcCqhCPa6LmtQ9qej-YonYVepY2cBegYRIWO0l8RPeOnTVniMAac // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -1972,7 +1972,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Original Source https://bcaorganizer.blogspot.com/p/c-program-for_21.html?fbclid=IwAR0iL8pYcCqhCPa6LmtQ9qej-YonYVepY2cBegYRIWO0l8RPeOnTVniMAac // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -2599,6 +2599,7 @@ Removing instruction __b4_from___b5: Removing instruction __b1_from_fill: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fill_from_main: Removing instruction __b2: @@ -2627,11 +2628,8 @@ Removing instruction __b1_from___b13: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [81] bmi __b3 to bpl FINAL SYMBOL TABLE diff --git a/src/test/ref/bitmap-line-anim-1.log b/src/test/ref/bitmap-line-anim-1.log index e82307927..15e74bfc0 100644 --- a/src/test/ref/bitmap-line-anim-1.log +++ b/src/test/ref/bitmap-line-anim-1.log @@ -2569,7 +2569,7 @@ Target platform is c64basic / MOS6502X // Reported by Janne Johansson // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -3698,7 +3698,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Reported by Janne Johansson // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -4549,6 +4549,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bitmap_init_from_main: Removing instruction __b2: @@ -4596,7 +4597,6 @@ Removing instruction __b3_from___b2: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -4615,7 +4615,6 @@ Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Replacing instruction lda.z e with TXA Replacing instruction lda.z e with TXA -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/bitmap-line-anim-2.log b/src/test/ref/bitmap-line-anim-2.log index d5a08bdaf..8f426fa6e 100644 --- a/src/test/ref/bitmap-line-anim-2.log +++ b/src/test/ref/bitmap-line-anim-2.log @@ -2286,7 +2286,7 @@ Target platform is c64basic / MOS6502X // See bitmap-line-anim-1.kc // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -3396,7 +3396,7 @@ ASSEMBLER BEFORE OPTIMIZATION // See bitmap-line-anim-1.kc // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -4301,6 +4301,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bitmap_init_from_main: Removing instruction __b3: @@ -4338,7 +4339,6 @@ Removing instruction __b3_from___b2: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b1 in bne __b2 @@ -4358,7 +4358,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: diff --git a/src/test/ref/bitmap-plot-3.log b/src/test/ref/bitmap-plot-3.log index 4e93820b1..4e91a8c2a 100644 --- a/src/test/ref/bitmap-plot-3.log +++ b/src/test/ref/bitmap-plot-3.log @@ -2436,7 +2436,7 @@ Target platform is c64basic / MOS6502X // Plots a few lines using the bresenham line algorithm // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -3660,7 +3660,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Plots a few lines using the bresenham line algorithm // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -4582,6 +4582,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bitmap_init_from_main: Removing instruction __b5: @@ -4620,7 +4621,6 @@ Removing instruction __b3_from___b2: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -4635,7 +4635,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __breturn: Removing instruction __b2: diff --git a/src/test/ref/bitmap-plotter.log b/src/test/ref/bitmap-plotter.log index f7f97d4a2..34fa7147c 100644 --- a/src/test/ref/bitmap-plotter.log +++ b/src/test/ref/bitmap-plotter.log @@ -857,7 +857,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BMM = $20 @@ -1397,7 +1397,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BMM = $20 @@ -1815,6 +1815,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_screen_from_main: Removing instruction __b3: @@ -1837,15 +1838,12 @@ Removing instruction __breturn: Removing instruction __b3_from___b4: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bitwise-not.log b/src/test/ref/bitwise-not.log index 0159247f0..95dc9603f 100644 --- a/src/test/ref/bitwise-not.log +++ b/src/test/ref/bitwise-not.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -203,7 +203,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -267,17 +267,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bool-const.log b/src/test/ref/bool-const.log index 97c681911..b8ad7052b 100644 --- a/src/test/ref/bool-const.log +++ b/src/test/ref/bool-const.log @@ -373,7 +373,7 @@ Target platform is c64basic / MOS6502X // A Minimal test of boolean constants. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -493,7 +493,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A Minimal test of boolean constants. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -612,6 +612,7 @@ Removing instruction bool_const_vars_from___b1: Removing instruction __b2_from___b1: Removing instruction bool_const_inline_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bool_const_if_from_main: Removing instruction __b1: @@ -624,11 +625,8 @@ Removing instruction __breturn: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bool-function.log b/src/test/ref/bool-function.log index b43a7e730..1a20c147b 100644 --- a/src/test/ref/bool-function.log +++ b/src/test/ref/bool-function.log @@ -275,7 +275,7 @@ Target platform is c64basic / MOS6502X // Test a function taking boolean parameter and returning boolean result // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -448,7 +448,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a function taking boolean parameter and returning boolean result // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -569,6 +569,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b5: @@ -576,13 +577,10 @@ Removing instruction __b4: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bool-ifs-min.log b/src/test/ref/bool-ifs-min.log index 3c9a4dfe1..044220c37 100644 --- a/src/test/ref/bool-ifs-min.log +++ b/src/test/ref/bool-ifs-min.log @@ -179,7 +179,7 @@ Target platform is c64basic / MOS6502X // A test of boolean conditions using && || and ! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -274,7 +274,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A test of boolean conditions using && || and ! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -357,19 +357,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bool-ifs.log b/src/test/ref/bool-ifs.log index d668e8fdb..b66167ee3 100644 --- a/src/test/ref/bool-ifs.log +++ b/src/test/ref/bool-ifs.log @@ -635,7 +635,7 @@ Target platform is c64basic / MOS6502X // A test of boolean conditions using && || and ! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1007,7 +1007,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A test of boolean conditions using && || and ! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1336,6 +1336,7 @@ Removing instruction __b1_from___b3: Removing instruction __b1_from___b3: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bool_and_from_main: Removing instruction __b1: @@ -1358,7 +1359,6 @@ Removing instruction __b1_from_bool_and: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -1366,8 +1366,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bool-nullpointer-exception.log b/src/test/ref/bool-nullpointer-exception.log index 85425ff97..69125480b 100644 --- a/src/test/ref/bool-nullpointer-exception.log +++ b/src/test/ref/bool-nullpointer-exception.log @@ -138,7 +138,7 @@ Target platform is c64basic / MOS6502X // Some bool code that causes a NullPointerException // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label framedone = 2 @@ -200,7 +200,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Some bool code that causes a NullPointerException // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -256,16 +256,14 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b1_from___b2 to __b1 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bool-pointer.log b/src/test/ref/bool-pointer.log index 6f6d35a23..36775ad4b 100644 --- a/src/test/ref/bool-pointer.log +++ b/src/test/ref/bool-pointer.log @@ -138,7 +138,7 @@ Target platform is c64basic / MOS6502X // Tests a pointer to a boolean // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -203,7 +203,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a pointer to a boolean // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -260,14 +260,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/bool-vars.log b/src/test/ref/bool-vars.log index e4d934a52..75b579867 100644 --- a/src/test/ref/bool-vars.log +++ b/src/test/ref/bool-vars.log @@ -688,7 +688,7 @@ Target platform is c64basic / MOS6502X // A test of boolean conditions using && || and ! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1086,7 +1086,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A test of boolean conditions using && || and ! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1426,6 +1426,7 @@ Removing instruction __b1_from___b3: Removing instruction __b1_from___b3: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bool_and_from_main: Removing instruction __b1: @@ -1447,7 +1448,6 @@ Removing instruction __b1_from_bool_and: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -1455,8 +1455,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bresenham.log b/src/test/ref/bresenham.log index d8c2a90af..8c5e29295 100644 --- a/src/test/ref/bresenham.log +++ b/src/test/ref/bresenham.log @@ -351,7 +351,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STAR = $51 @@ -507,7 +507,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STAR = $51 @@ -636,18 +636,16 @@ Removing instruction __b1_from___b2: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/bresenhamarr.log b/src/test/ref/bresenhamarr.log index fcd702ef6..7df496bd8 100644 --- a/src/test/ref/bresenhamarr.log +++ b/src/test/ref/bresenhamarr.log @@ -362,7 +362,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -529,7 +529,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -669,18 +669,16 @@ Removing instruction __b1_from___b2: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c-types.log b/src/test/ref/c-types.log index 65e10ed4d..212ccd362 100644 --- a/src/test/ref/c-types.log +++ b/src/test/ref/c-types.log @@ -2178,7 +2178,7 @@ Target platform is c64basic / MOS6502X // Tests the different standard C types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 2 @@ -3248,7 +3248,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the different standard C types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 2 @@ -4323,6 +4323,7 @@ Removing instruction print_char_from___b1: Removing instruction __b2_from___b1: Removing instruction print_uchar_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -4394,11 +4395,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c64dtv-8bppcharstretch.log b/src/test/ref/c64dtv-8bppcharstretch.log index f08ae1153..e320af66a 100644 --- a/src/test/ref/c64dtv-8bppcharstretch.log +++ b/src/test/ref/c64dtv-8bppcharstretch.log @@ -1300,7 +1300,7 @@ Target platform is c64basic / MOS6502X // C64DTV 8bpp charmode stretcher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -2090,7 +2090,7 @@ ASSEMBLER BEFORE OPTIMIZATION // C64DTV 8bpp charmode stretcher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -2730,6 +2730,7 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction gfx_init_from_main: Removing instruction __b6: @@ -2754,7 +2755,6 @@ Removing instruction __b1_from_gfx_init_screen0: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b4_from___b3 to __b5 @@ -2766,8 +2766,6 @@ Removing instruction jmp __b3 Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c64dtv-8bppchunkystretch.log b/src/test/ref/c64dtv-8bppchunkystretch.log index 62f71ed29..6d1df357d 100644 --- a/src/test/ref/c64dtv-8bppchunkystretch.log +++ b/src/test/ref/c64dtv-8bppchunkystretch.log @@ -895,7 +895,7 @@ Target platform is c64basic / MOS6502X // C64DTV 8bpp charmode stretcher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -1457,7 +1457,7 @@ ASSEMBLER BEFORE OPTIMIZATION // C64DTV 8bpp charmode stretcher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -1925,6 +1925,7 @@ Removing instruction __b2_from___b3: Removing instruction __b3_from___b2: Removing instruction __b6_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction gfx_init_chunky_from_main: Removing instruction __b6: @@ -1942,7 +1943,6 @@ Removing instruction dtvSetCpuBankSegment1_from___b6: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -1951,8 +1951,6 @@ Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Replacing instruction ldx #0 with TAX -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c64dtv-blitter-box.log b/src/test/ref/c64dtv-blitter-box.log index ae0a33488..65d57e281 100644 --- a/src/test/ref/c64dtv-blitter-box.log +++ b/src/test/ref/c64dtv-blitter-box.log @@ -473,7 +473,7 @@ Target platform is c64basic / MOS6502X // Fill a box on the screen using the blitter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DTV_FEATURE_ENABLE = 1 @@ -741,7 +741,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fill a box on the screen using the blitter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DTV_FEATURE_ENABLE = 1 @@ -969,14 +969,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c64dtv-blittermin.log b/src/test/ref/c64dtv-blittermin.log index f3523f604..7bacaccda 100644 --- a/src/test/ref/c64dtv-blittermin.log +++ b/src/test/ref/c64dtv-blittermin.log @@ -510,7 +510,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DTV_FEATURE_ENABLE = 1 @@ -838,7 +838,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DTV_FEATURE_ENABLE = 1 @@ -1096,18 +1096,16 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c64dtv-color.log b/src/test/ref/c64dtv-color.log index fee857041..b7ad1b97f 100644 --- a/src/test/ref/c64dtv-color.log +++ b/src/test/ref/c64dtv-color.log @@ -389,7 +389,7 @@ Target platform is c64basic / MOS6502X // Test C64DTV v2 256-colors and the 16-color redefinable palette // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DTV_FEATURE_ENABLE = 1 @@ -554,7 +554,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test C64DTV v2 256-colors and the 16-color redefinable palette // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DTV_FEATURE_ENABLE = 1 @@ -694,19 +694,17 @@ Removing instruction __bend_from___b1: Removing instruction __b3_from___b3: Removing instruction __b4_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __b3_from___b2: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b3 Removing instruction jmp __b4 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log index 3c377cffc..e593e0bf7 100644 --- a/src/test/ref/c64dtv-gfxexplorer.log +++ b/src/test/ref/c64dtv-gfxexplorer.log @@ -13031,7 +13031,7 @@ Target platform is c64basic / MOS6502X // Interactive Explorer for C64DTV Screen Modes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -20330,7 +20330,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Interactive Explorer for C64DTV Screen Modes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -26260,6 +26260,7 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Removing instruction __b1_from___b3: @@ -26552,7 +26553,6 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -26681,7 +26681,6 @@ Removing instruction ldy.z form_field_idx Removing instruction ldy.z form_field_idx Removing instruction lda.z x0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __b5: Removing instruction __breturn: diff --git a/src/test/ref/c64dtv-gfxmodes.log b/src/test/ref/c64dtv-gfxmodes.log index 10112ba92..baa29a8a8 100644 --- a/src/test/ref/c64dtv-gfxmodes.log +++ b/src/test/ref/c64dtv-gfxmodes.log @@ -11986,7 +11986,7 @@ Target platform is c64basic / MOS6502X // Exploring C64DTV Screen Modes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -18965,7 +18965,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Exploring C64DTV Screen Modes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_ECM = $40 @@ -24362,6 +24362,7 @@ Removing instruction print_ln_from___b5: Removing instruction __b1_from_print_ln: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_menu: Removing instruction __b2_from___b1: @@ -24587,7 +24588,6 @@ Removing instruction __breturn: Removing instruction __b1_from___b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -24678,7 +24678,6 @@ Replacing instruction ldx #0 with TAX Replacing instruction ldx #0 with TAX Removing instruction lda.z x0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/call-parameter-autocast.log b/src/test/ref/call-parameter-autocast.log index f1b126aa0..df2eac7c8 100644 --- a/src/test/ref/call-parameter-autocast.log +++ b/src/test/ref/call-parameter-autocast.log @@ -253,7 +253,7 @@ Target platform is c64basic / MOS6502X // Test auto-casting of call-parameters // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -375,7 +375,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test auto-casting of call-parameters // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -485,6 +485,7 @@ Removing instruction print_from___b1: Removing instruction __b2_from___b1: Removing instruction print_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -492,11 +493,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/callconstparam.log b/src/test/ref/callconstparam.log index e8da7eada..7180ddf08 100644 --- a/src/test/ref/callconstparam.log +++ b/src/test/ref/callconstparam.log @@ -273,7 +273,7 @@ Target platform is c64basic / MOS6502X // Reason: Multiple versioned parameter constants x0#0, x0#1 are only output as a single constant in the ASM .const x0 = 0 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 3 @@ -398,7 +398,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Reason: Multiple versioned parameter constants x0#0, x0#1 are only output as a single constant in the ASM .const x0 = 0 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 3 @@ -510,17 +510,15 @@ Removing instruction line_from___b1: Removing instruction __b1_from_line: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction line_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cast-deref.log b/src/test/ref/cast-deref.log index 1131a9ffd..130a229c3 100644 --- a/src/test/ref/cast-deref.log +++ b/src/test/ref/cast-deref.log @@ -120,7 +120,7 @@ Target platform is c64basic / MOS6502X // Example of NOP-casting a dereferenced signed byte to a byte // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -192,7 +192,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of NOP-casting a dereferenced signed byte to a byte // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -255,17 +255,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cast-not-needed-2.log b/src/test/ref/cast-not-needed-2.log index 728d61df7..85c0ac9f1 100644 --- a/src/test/ref/cast-not-needed-2.log +++ b/src/test/ref/cast-not-needed-2.log @@ -204,7 +204,7 @@ Target platform is c64basic / MOS6502X // Tests a cast that is not needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -282,7 +282,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a cast that is not needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -353,17 +353,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction getScreen1: Removing instruction spritePtr1: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cast-not-needed-3.log b/src/test/ref/cast-not-needed-3.log index dcc642570..d53607acd 100644 --- a/src/test/ref/cast-not-needed-3.log +++ b/src/test/ref/cast-not-needed-3.log @@ -203,7 +203,7 @@ Target platform is c64basic / MOS6502X // Tests a cast that is not needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -287,7 +287,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a cast that is not needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -360,17 +360,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction getScreen1: Removing instruction spritePtr1: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cast-not-needed.log b/src/test/ref/cast-not-needed.log index 0ac63703f..26ea17204 100644 --- a/src/test/ref/cast-not-needed.log +++ b/src/test/ref/cast-not-needed.log @@ -109,7 +109,7 @@ Target platform is c64basic / MOS6502X // Tests a cast that is not needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label sprite = $5000 @@ -157,7 +157,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a cast that is not needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label sprite = $5000 @@ -199,14 +199,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cast-precedence-problem.log b/src/test/ref/cast-precedence-problem.log index f749934a3..698d97feb 100644 --- a/src/test/ref/cast-precedence-problem.log +++ b/src/test/ref/cast-precedence-problem.log @@ -204,7 +204,7 @@ Target platform is c64basic / MOS6502X // Tests that casting inside constants in the output handles precedence between cast and + correctly - should generate the following KA-expression ($ff & sumw>>1)+1 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -280,7 +280,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that casting inside constants in the output handles precedence between cast and + correctly - should generate the following KA-expression ($ff & sumw>>1)+1 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -347,15 +347,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/casting.log b/src/test/ref/casting.log index 87202b051..9eb5d915e 100644 --- a/src/test/ref/casting.log +++ b/src/test/ref/casting.log @@ -330,7 +330,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -487,7 +487,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -616,6 +616,7 @@ Removing instruction __b2_from___b1: Removing instruction w_from___b2: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -623,14 +624,11 @@ Removing instruction __breturn: Removing instruction __b1_from_w: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/chargen.log b/src/test/ref/chargen.log index 875da4ef7..5a7cdc725 100644 --- a/src/test/ref/chargen.log +++ b/src/test/ref/chargen.log @@ -369,7 +369,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label PROCPORT = 1 @@ -554,7 +554,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label PROCPORT = 1 @@ -714,6 +714,7 @@ Removing instruction __b2_from___b3: Removing instruction __b4_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: @@ -722,7 +723,6 @@ Removing instruction __b5: Removing instruction __b6: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b3_from___b2 to __b4 @@ -730,8 +730,6 @@ Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/chessboard.log b/src/test/ref/chessboard.log index 2fa285dd9..eb2f2d645 100644 --- a/src/test/ref/chessboard.log +++ b/src/test/ref/chessboard.log @@ -286,7 +286,7 @@ Target platform is c64basic / MOS6502X // Draws a chess board in the upper left corner of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -445,7 +445,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Draws a chess board in the upper left corner of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -579,19 +579,17 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cia-timer-cyclecount.log b/src/test/ref/cia-timer-cyclecount.log index e28ffe970..c1022920e 100644 --- a/src/test/ref/cia-timer-cyclecount.log +++ b/src/test/ref/cia-timer-cyclecount.log @@ -745,7 +745,7 @@ Target platform is c64basic / MOS6502X // Counting cycles using a CIA timer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -1174,7 +1174,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Counting cycles using a CIA timer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -1493,6 +1493,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __b3: @@ -1512,11 +1513,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cia-timer-simple.log b/src/test/ref/cia-timer-simple.log index 36f1dc224..960db0539 100644 --- a/src/test/ref/cia-timer-simple.log +++ b/src/test/ref/cia-timer-simple.log @@ -725,7 +725,7 @@ Target platform is c64basic / MOS6502X // Setup and run a simple CIA-timer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -1112,7 +1112,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Setup and run a simple CIA-timer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -1404,6 +1404,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction print_uint_at_from_print_ulong_at: @@ -1422,11 +1423,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/coalesce-assignment.log b/src/test/ref/coalesce-assignment.log index c563eeb42..b7295e4e9 100644 --- a/src/test/ref/coalesce-assignment.log +++ b/src/test/ref/coalesce-assignment.log @@ -241,7 +241,7 @@ Target platform is c64basic / MOS6502X // Tests variable coalescing over assignments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -380,7 +380,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests variable coalescing over assignments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -489,19 +489,17 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/code-after-return-1.log b/src/test/ref/code-after-return-1.log index bfeee9991..f8a0bdba4 100644 --- a/src/test/ref/code-after-return-1.log +++ b/src/test/ref/code-after-return-1.log @@ -154,7 +154,7 @@ Target platform is c64basic / MOS6502X // Test code after return in main() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 0 @@ -201,7 +201,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test code after return in main() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 0 @@ -242,14 +242,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/code-after-return.log b/src/test/ref/code-after-return.log index 05126238d..67ec719ba 100644 --- a/src/test/ref/code-after-return.log +++ b/src/test/ref/code-after-return.log @@ -90,7 +90,7 @@ Target platform is c64basic / MOS6502X // Test code after return in main() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -136,7 +136,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test code after return in main() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -176,14 +176,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comma-decl-2.log b/src/test/ref/comma-decl-2.log index 8ee47d7ed..88ee92cc0 100644 --- a/src/test/ref/comma-decl-2.log +++ b/src/test/ref/comma-decl-2.log @@ -101,7 +101,7 @@ Target platform is c64basic / MOS6502X // Tests comma-separated declarations with different array-ness // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -158,7 +158,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests comma-separated declarations with different array-ness // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -207,14 +207,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comma-decl-for.log b/src/test/ref/comma-decl-for.log index 6013a3448..d1871b855 100644 --- a/src/test/ref/comma-decl-for.log +++ b/src/test/ref/comma-decl-for.log @@ -145,7 +145,7 @@ Target platform is c64basic / MOS6502X // Tests comma-separated declarations inside for() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests comma-separated declarations inside for() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -290,16 +290,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comma-decl.log b/src/test/ref/comma-decl.log index 738023a36..3d66a4596 100644 --- a/src/test/ref/comma-decl.log +++ b/src/test/ref/comma-decl.log @@ -128,7 +128,7 @@ Target platform is c64basic / MOS6502X // Tests comma-separated declarations // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -185,7 +185,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests comma-separated declarations // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -234,14 +234,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comma-expr-1.log b/src/test/ref/comma-expr-1.log index eccdfe46f..ac30f2fa7 100644 --- a/src/test/ref/comma-expr-1.log +++ b/src/test/ref/comma-expr-1.log @@ -99,7 +99,7 @@ Target platform is c64basic / MOS6502X // Tests simple comma-expression (in parenthesis) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -147,7 +147,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple comma-expression (in parenthesis) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -189,14 +189,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comma-expr-2.log b/src/test/ref/comma-expr-2.log index f44f8004e..5492bcc7d 100644 --- a/src/test/ref/comma-expr-2.log +++ b/src/test/ref/comma-expr-2.log @@ -97,7 +97,7 @@ Target platform is c64basic / MOS6502X // Tests simple comma-expressions (without parenthesis) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -144,7 +144,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple comma-expressions (without parenthesis) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -185,14 +185,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comma-expr-for.log b/src/test/ref/comma-expr-for.log index 8d5274db7..157b779fc 100644 --- a/src/test/ref/comma-expr-for.log +++ b/src/test/ref/comma-expr-for.log @@ -145,7 +145,7 @@ Target platform is c64basic / MOS6502X // Tests comma-expressions in for()-statement // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests comma-expressions in for()-statement // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -290,16 +290,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comparison-rewriting-pointer.log b/src/test/ref/comparison-rewriting-pointer.log index b794ad547..753d91aca 100644 --- a/src/test/ref/comparison-rewriting-pointer.log +++ b/src/test/ref/comparison-rewriting-pointer.log @@ -182,7 +182,7 @@ Target platform is c64basic / MOS6502X // Test rewriting of constant comparisons for pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -305,7 +305,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test rewriting of constant comparisons for pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -419,6 +419,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_from___b1: @@ -426,11 +427,8 @@ Removing instruction __breturn: Removing instruction __b3_from___b4: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/comparison-rewriting.log b/src/test/ref/comparison-rewriting.log index 8afa880c6..6aee0c942 100644 --- a/src/test/ref/comparison-rewriting.log +++ b/src/test/ref/comparison-rewriting.log @@ -473,7 +473,7 @@ Target platform is c64basic / MOS6502X // Test rewriting of constant comparisons // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -724,7 +724,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test rewriting of constant comparisons // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -940,6 +940,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: @@ -953,13 +954,10 @@ Removing instruction __b15: Removing instruction __b4_from___b10: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/complex-conditional-problem.log b/src/test/ref/complex-conditional-problem.log index 0c30f4c84..838bfbb5f 100644 --- a/src/test/ref/complex-conditional-problem.log +++ b/src/test/ref/complex-conditional-problem.log @@ -174,7 +174,7 @@ Target platform is c64basic / MOS6502X // Test to provoke Exception when using complex || condition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -255,7 +255,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test to provoke Exception when using complex || condition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -334,18 +334,16 @@ Removing instruction __b4_from___b3: Removing instruction __b4: Removing instruction __b2_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b2_from___b3 to __b3 Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/complex/ataritempest/ataritempest.asm b/src/test/ref/complex/ataritempest/ataritempest.asm index a4e2000aa..c669d60be 100644 --- a/src/test/ref/complex/ataritempest/ataritempest.asm +++ b/src/test/ref/complex/ataritempest/ataritempest.asm @@ -10,7 +10,6 @@ .segment Code init: .label BG_COLOR = $c01a -__bbegin: .segment Code main: { // (*BG_COLOR)++; diff --git a/src/test/ref/complex/ataritempest/ataritempest.log b/src/test/ref/complex/ataritempest/ataritempest.log index d05ff3424..641ab38c8 100644 --- a/src/test/ref/complex/ataritempest/ataritempest.log +++ b/src/test/ref/complex/ataritempest/ataritempest.log @@ -156,7 +156,7 @@ Complete equivalence classes Allocated zp[1]:2 [ entryPoint::i#2 entryPoint::i#1 ] INITIAL ASM -Target platform is custom / MOS6502X +Target platform is c64basic / MOS6502X // File Comments // Atari Tempest ROM Development Template // Each function of the kernal is a no-args function @@ -388,6 +388,7 @@ Removing instruction __bend_from___b1: Removing instruction __breturn: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __b1_from_entryPoint: @@ -439,7 +440,6 @@ init: // Global Constants & labels .label BG_COLOR = $c01a // @begin -__bbegin: // [1] phi from @begin to @1 [phi:@begin->@1] // @1 // [2] call main diff --git a/src/test/ref/complex/includes/includes-1.log b/src/test/ref/complex/includes/includes-1.log index 9c28c0cb3..8b620659e 100644 --- a/src/test/ref/complex/includes/includes-1.log +++ b/src/test/ref/complex/includes/includes-1.log @@ -215,7 +215,7 @@ Target platform is c64basic / MOS6502X // Includes a system library - ignores the local file with the same name // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -344,7 +344,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Includes a system library - ignores the local file with the same name // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -454,6 +454,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction strlen_from_main: Removing instruction __b1: @@ -462,11 +463,8 @@ Removing instruction __b1_from_strlen: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/complex/includes/includes-2.log b/src/test/ref/complex/includes/includes-2.log index e1276bdd5..829ee805b 100644 --- a/src/test/ref/complex/includes/includes-2.log +++ b/src/test/ref/complex/includes/includes-2.log @@ -151,7 +151,7 @@ Target platform is c64basic / MOS6502X // Includes a local file with the same name as a system library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -218,7 +218,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Includes a local file with the same name as a system library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -280,17 +280,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction strlen_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/complex/includes/includes-3.log b/src/test/ref/complex/includes/includes-3.log index e37519510..9d7f4d5ff 100644 --- a/src/test/ref/complex/includes/includes-3.log +++ b/src/test/ref/complex/includes/includes-3.log @@ -134,7 +134,7 @@ Target platform is c64basic / MOS6502X // A file using a library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -184,7 +184,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A file using a library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -227,14 +227,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/complex/medusa/medusa.log b/src/test/ref/complex/medusa/medusa.log index dd843569e..2b8a98617 100644 --- a/src/test/ref/complex/medusa/medusa.log +++ b/src/test/ref/complex/medusa/medusa.log @@ -502,7 +502,7 @@ Target platform is c64basic / MOS6502X // https://csdb.dk/release/?id=178673 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The colors of the C64 @@ -687,7 +687,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://csdb.dk/release/?id=178673 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The colors of the C64 @@ -845,16 +845,14 @@ Removing instruction memcpy_from___b2: Removing instruction __b1_from_memcpy: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction memcpy_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/complex/prebob/grid-bobs.log b/src/test/ref/complex/prebob/grid-bobs.log index 06ebc2468..2c6259d8d 100644 --- a/src/test/ref/complex/prebob/grid-bobs.log +++ b/src/test/ref/complex/prebob/grid-bobs.log @@ -4577,7 +4577,7 @@ Target platform is c64basic / MOS6502X // Pre-calculated bobs inside a charset (pre-moved to all x/y-combinations) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -6687,7 +6687,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Pre-calculated bobs inside a charset (pre-moved to all x/y-combinations) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -8382,6 +8382,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mulf_init_from_main: Removing instruction __b11: @@ -8467,7 +8468,6 @@ Removing instruction __b5_from___b8: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -8483,7 +8483,6 @@ Removing instruction jmp __b2 Removing instruction jmp __b1 Removing instruction jmp __b8 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/complex/prebob/vogel-bobs.log b/src/test/ref/complex/prebob/vogel-bobs.log index abe453e00..3f647ed80 100644 --- a/src/test/ref/complex/prebob/vogel-bobs.log +++ b/src/test/ref/complex/prebob/vogel-bobs.log @@ -4929,7 +4929,7 @@ Target platform is c64basic / MOS6502X // Pre-calculated bobs inside a charset (pre-moved to all x/y-combinations) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -7413,7 +7413,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Pre-calculated bobs inside a charset (pre-moved to all x/y-combinations) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -9247,6 +9247,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mulf_init_from_main: Removing instruction __b9: @@ -9342,7 +9343,6 @@ Removing instruction __b5_from___b8: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -9357,7 +9357,6 @@ Removing instruction jmp __b2 Removing instruction jmp __b1 Removing instruction jmp __b8 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/complex/splines/truetype-splines.log b/src/test/ref/complex/splines/truetype-splines.log index 7b63eda6b..5322a39eb 100644 --- a/src/test/ref/complex/splines/truetype-splines.log +++ b/src/test/ref/complex/splines/truetype-splines.log @@ -5225,7 +5225,7 @@ Target platform is c64basic / MOS6502X // Show a few simple splines using the splines library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -8699,7 +8699,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Show a few simple splines using the splines library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -11118,6 +11118,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mulf_init_from_main: Removing instruction __b8: @@ -11200,7 +11201,6 @@ Removing instruction __b5_from___b8: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -11220,7 +11220,6 @@ Removing instruction jmp __b3 Removing instruction jmp __b8 Succesful ASM optimization Pass5NextJumpElimination Replacing instruction ldy #0 with TAY -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __breturn: Removing instruction __b2: diff --git a/src/test/ref/complex/xmega65/xmega65.asm b/src/test/ref/complex/xmega65/xmega65.asm index 6c5c09c36..0864d53e6 100644 --- a/src/test/ref/complex/xmega65/xmega65.asm +++ b/src/test/ref/complex/xmega65/xmega65.asm @@ -17,7 +17,6 @@ .label SCREEN = $400 .label BG_COLOR = $d021 .label COLS = $d800 -__bbegin: .segment Code main: { // Print message diff --git a/src/test/ref/complex/xmega65/xmega65.log b/src/test/ref/complex/xmega65/xmega65.log index 1d3406fd2..72010ddf6 100644 --- a/src/test/ref/complex/xmega65/xmega65.log +++ b/src/test/ref/complex/xmega65/xmega65.log @@ -492,7 +492,7 @@ Allocated zp[2]:9 [ memset::dst#2 memset::dst#4 memset::dst#1 ] Allocated zp[2]:11 [ memset::end#0 ] INITIAL ASM -Target platform is custom / MOS6502X +Target platform is c64basic / MOS6502X // File Comments // XMega65 Kernal Development Template // Each function of the kernal is a no-args function @@ -1043,6 +1043,7 @@ Removing instruction memset_from___b6: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction memset_from_main: Removing instruction __b6: @@ -1146,7 +1147,6 @@ Score: 1600 .label BG_COLOR = $d021 .label COLS = $d800 // @begin -__bbegin: // [1] phi from @begin to @1 [phi:@begin->@1] // @1 // [2] call main diff --git a/src/test/ref/complex/xmega65/xmega65logo.log b/src/test/ref/complex/xmega65/xmega65logo.log index 0b3955496..bfe1831d1 100644 --- a/src/test/ref/complex/xmega65/xmega65logo.log +++ b/src/test/ref/complex/xmega65/xmega65logo.log @@ -192,7 +192,7 @@ Target platform is c64basic / MOS6502X // Fill the palette values into // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Create pointers to the palette RGBs in the logo (assumes dimensions are 128x128) @@ -295,7 +295,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fill the palette values into // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Create pointers to the palette RGBs in the logo (assumes dimensions are 128x128) @@ -382,17 +382,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/condition-integer-0.log b/src/test/ref/condition-integer-0.log index e1b0199bf..c7be85183 100644 --- a/src/test/ref/condition-integer-0.log +++ b/src/test/ref/condition-integer-0.log @@ -377,7 +377,7 @@ Target platform is c64basic / MOS6502X // This should produce '+ ++ ++' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -567,7 +567,7 @@ ASSEMBLER BEFORE OPTIMIZATION // This should produce '+ ++ ++' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -740,6 +740,7 @@ Removing instruction __b7_from___b8: Removing instruction __b8_from___b7: Removing instruction __b8_from___b9: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __b1: @@ -750,14 +751,11 @@ Removing instruction __b7_from___b6: Removing instruction __b9: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b3 Removing instruction jmp __b7 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/condition-integer-1.log b/src/test/ref/condition-integer-1.log index 7eb572ec2..c876ef0db 100644 --- a/src/test/ref/condition-integer-1.log +++ b/src/test/ref/condition-integer-1.log @@ -379,7 +379,7 @@ Target platform is c64basic / MOS6502X // This should produce '0 0 0' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -568,7 +568,7 @@ ASSEMBLER BEFORE OPTIMIZATION // This should produce '0 0 0' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -741,6 +741,7 @@ Removing instruction __b7_from___b8: Removing instruction __b8_from___b7: Removing instruction __b8_from___b9: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __b1: @@ -751,14 +752,11 @@ Removing instruction __b7_from___b6: Removing instruction __b9: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b3 Removing instruction jmp __b7 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/condition-integer-2.log b/src/test/ref/condition-integer-2.log index 377e4b279..5adf12385 100644 --- a/src/test/ref/condition-integer-2.log +++ b/src/test/ref/condition-integer-2.log @@ -297,7 +297,7 @@ Target platform is c64basic / MOS6502X // This should produce 'ba ba ba' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -469,7 +469,7 @@ ASSEMBLER BEFORE OPTIMIZATION // This should produce 'ba ba ba' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -607,6 +607,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b7_from___b7: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -617,13 +618,10 @@ Removing instruction __breturn: Removing instruction __b4_from___b5: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b7 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/condition-integer-3.log b/src/test/ref/condition-integer-3.log index 00654757e..d9b4115a1 100644 --- a/src/test/ref/condition-integer-3.log +++ b/src/test/ref/condition-integer-3.log @@ -206,7 +206,7 @@ Target platform is c64basic / MOS6502X // This should produce '++0++' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -308,7 +308,7 @@ ASSEMBLER BEFORE OPTIMIZATION // This should produce '++0++' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -399,18 +399,16 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b3_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/condition-integer-4.log b/src/test/ref/condition-integer-4.log index 28405363c..5b29bd75d 100644 --- a/src/test/ref/condition-integer-4.log +++ b/src/test/ref/condition-integer-4.log @@ -382,7 +382,7 @@ Target platform is c64basic / MOS6502X // This should produce '01010101', '00110011', '00010001', '01110111' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -597,7 +597,7 @@ ASSEMBLER BEFORE OPTIMIZATION // This should produce '01010101', '00110011', '00010001', '01110111' at the top of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -761,6 +761,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -770,7 +771,6 @@ Removing instruction __b8: Removing instruction __b11: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -778,8 +778,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #0 Removing instruction lda #0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/condition-type-mismatch.log b/src/test/ref/condition-type-mismatch.log index 4f8f209d7..6e15f70e8 100644 --- a/src/test/ref/condition-type-mismatch.log +++ b/src/test/ref/condition-type-mismatch.log @@ -101,7 +101,7 @@ Target platform is c64basic / MOS6502X // Tests a condition type mismatch (not boolean) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -152,7 +152,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a condition type mismatch (not boolean) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -199,15 +199,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/consolidate-array-index-problem.log b/src/test/ref/consolidate-array-index-problem.log index 3001d569a..bd12334d2 100644 --- a/src/test/ref/consolidate-array-index-problem.log +++ b/src/test/ref/consolidate-array-index-problem.log @@ -143,7 +143,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -229,7 +229,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -300,17 +300,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/consolidate-constant-problem.log b/src/test/ref/consolidate-constant-problem.log index 438551cf5..e81dfbab3 100644 --- a/src/test/ref/consolidate-constant-problem.log +++ b/src/test/ref/consolidate-constant-problem.log @@ -228,7 +228,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -293,7 +293,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -356,18 +356,16 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b1_1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction lda #0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-condition.log b/src/test/ref/const-condition.log index d0da3612a..c7f6fc0a5 100644 --- a/src/test/ref/const-condition.log +++ b/src/test/ref/const-condition.log @@ -103,7 +103,7 @@ Target platform is c64basic / MOS6502X // Ensure that if()'s with constant comparisons are identified and eliminated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -154,7 +154,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Ensure that if()'s with constant comparisons are identified and eliminated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -201,15 +201,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-declaration.log b/src/test/ref/const-declaration.log index dbe9161ed..3a898b26a 100644 --- a/src/test/ref/const-declaration.log +++ b/src/test/ref/const-declaration.log @@ -82,7 +82,7 @@ Target platform is c64basic / MOS6502X // Tests a number of constant declarations // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const LINE_LEN = $28 @@ -138,7 +138,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a number of constant declarations // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const LINE_LEN = $28 @@ -189,14 +189,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-identification.log b/src/test/ref/const-identification.log index 3d0113ecf..cc4d7b01d 100644 --- a/src/test/ref/const-identification.log +++ b/src/test/ref/const-identification.log @@ -341,7 +341,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label plots = $1000 @@ -495,7 +495,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label plots = $1000 @@ -626,6 +626,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Removing instruction line_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b1_from_line: @@ -634,13 +635,10 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-if-problem.log b/src/test/ref/const-if-problem.log index 6442b308d..99643953b 100644 --- a/src/test/ref/const-if-problem.log +++ b/src/test/ref/const-if-problem.log @@ -142,7 +142,7 @@ Target platform is c64basic / MOS6502X // Constant if() contains call to (unused) function - should be optimized away // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Constant if() contains call to (unused) function - should be optimized away // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -240,15 +240,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-int-cast-problem.log b/src/test/ref/const-int-cast-problem.log index dbb5d5e2a..5c4d04e12 100644 --- a/src/test/ref/const-int-cast-problem.log +++ b/src/test/ref/const-int-cast-problem.log @@ -131,7 +131,7 @@ Target platform is c64basic / MOS6502X // Test a problem with converting casted constant numbers to fixed type constant integers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -211,7 +211,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a problem with converting casted constant numbers to fixed type constant integers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -278,17 +278,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-mult-div.log b/src/test/ref/const-mult-div.log index ec2da174a..16ec897de 100644 --- a/src/test/ref/const-mult-div.log +++ b/src/test/ref/const-mult-div.log @@ -82,7 +82,7 @@ Target platform is c64basic / MOS6502X // Test a constant with multiplication and division // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -129,7 +129,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a constant with multiplication and division // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -170,14 +170,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-param.log b/src/test/ref/const-param.log index 35d09c992..9d317a488 100644 --- a/src/test/ref/const-param.log +++ b/src/test/ref/const-param.log @@ -252,7 +252,7 @@ Target platform is c64basic / MOS6502X // Test that the compiler optimizes when the same parameter value is passed into a function in all calls // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -388,7 +388,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that the compiler optimizes when the same parameter value is passed into a function in all calls // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -484,6 +484,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sum_from_main: Removing instruction __b1: @@ -494,11 +495,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-pointer.log b/src/test/ref/const-pointer.log index 1b60ecdf4..eade55156 100644 --- a/src/test/ref/const-pointer.log +++ b/src/test/ref/const-pointer.log @@ -113,7 +113,7 @@ Target platform is c64basic / MOS6502X //Test that constant pointers are detected correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -164,7 +164,7 @@ ASSEMBLER BEFORE OPTIMIZATION //Test that constant pointers are detected correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -211,15 +211,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-signed-promotion.log b/src/test/ref/const-signed-promotion.log index ce3c57d4b..e62d31228 100644 --- a/src/test/ref/const-signed-promotion.log +++ b/src/test/ref/const-signed-promotion.log @@ -162,7 +162,7 @@ Target platform is c64basic / MOS6502X // Test fragment promotion of a constant (400) to signed word even if it also matches an unsigned word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -254,7 +254,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test fragment promotion of a constant (400) to signed word even if it also matches an unsigned word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -332,18 +332,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/const-word-pointer.log b/src/test/ref/const-word-pointer.log index 2d3982496..ca0264a92 100644 --- a/src/test/ref/const-word-pointer.log +++ b/src/test/ref/const-word-pointer.log @@ -145,7 +145,7 @@ Target platform is c64basic / MOS6502X // The result when running is "CML!" on the screen. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -236,7 +236,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The result when running is "CML!" on the screen. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -301,14 +301,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/constabsmin.log b/src/test/ref/constabsmin.log index a1378ca8d..c70e4cc75 100644 --- a/src/test/ref/constabsmin.log +++ b/src/test/ref/constabsmin.log @@ -80,7 +80,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -125,7 +125,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -165,14 +165,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/constant-string-concat-0.log b/src/test/ref/constant-string-concat-0.log index 6ff9459df..e01766456 100644 --- a/src/test/ref/constant-string-concat-0.log +++ b/src/test/ref/constant-string-concat-0.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // Concatenates string constants in different ways // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -202,7 +202,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Concatenates string constants in different ways // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -267,16 +267,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/constant-string-concat.log b/src/test/ref/constant-string-concat.log index 346ee86e7..8c88f4297 100644 --- a/src/test/ref/constant-string-concat.log +++ b/src/test/ref/constant-string-concat.log @@ -120,7 +120,7 @@ Target platform is c64basic / MOS6502X // Concatenates string constants in different ways // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Concatenates string constants in different ways // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -257,17 +257,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/constantmin.log b/src/test/ref/constantmin.log index 21b8d69f0..054ed57b6 100644 --- a/src/test/ref/constantmin.log +++ b/src/test/ref/constantmin.log @@ -162,7 +162,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STAR = $51 @@ -243,7 +243,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STAR = $51 @@ -311,17 +311,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log index 0106a5ceb..905bb45ad 100644 --- a/src/test/ref/constants.log +++ b/src/test/ref/constants.log @@ -1591,7 +1591,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const GREEN = 5 @@ -2288,7 +2288,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const GREEN = 5 @@ -2940,6 +2940,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Removing instruction print_ln_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -2980,11 +2981,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cordic-atan2-16-ref.log b/src/test/ref/cordic-atan2-16-ref.log index 7e0c4f328..c18e432df 100644 --- a/src/test/ref/cordic-atan2-16-ref.log +++ b/src/test/ref/cordic-atan2-16-ref.log @@ -2288,7 +2288,7 @@ Target platform is c64basic / MOS6502X // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 16-bit CORDIC atan2 calculation @@ -3429,7 +3429,7 @@ ASSEMBLER BEFORE OPTIMIZATION // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 16-bit CORDIC atan2 calculation @@ -4344,6 +4344,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_font_hex_from_main: Removing instruction __b6: @@ -4376,7 +4377,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __b3 @@ -4387,7 +4387,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b3: Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [279] beq __b12 to bne diff --git a/src/test/ref/cordic-atan2-16.log b/src/test/ref/cordic-atan2-16.log index 172bfffbc..b31bf8320 100644 --- a/src/test/ref/cordic-atan2-16.log +++ b/src/test/ref/cordic-atan2-16.log @@ -1757,7 +1757,7 @@ Target platform is c64basic / MOS6502X // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 16-bit CORDIC atan2 calculation @@ -2621,7 +2621,7 @@ ASSEMBLER BEFORE OPTIMIZATION // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 16-bit CORDIC atan2 calculation @@ -3332,6 +3332,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_font_hex_from_main: Removing instruction __b5: @@ -3352,7 +3353,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -3361,8 +3361,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [191] beq __b12 to bne Fixing long branch [85] bpl __b1 to bmi Fixing long branch [97] bpl __b4 to bmi diff --git a/src/test/ref/cordic-atan2-clear.log b/src/test/ref/cordic-atan2-clear.log index f56b9ad96..99893525c 100644 --- a/src/test/ref/cordic-atan2-clear.log +++ b/src/test/ref/cordic-atan2-clear.log @@ -2002,7 +2002,7 @@ Target platform is c64basic / MOS6502X // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 16-bit CORDIC atan2 calculation @@ -3051,7 +3051,7 @@ ASSEMBLER BEFORE OPTIMIZATION // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 16-bit CORDIC atan2 calculation @@ -3887,6 +3887,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_font_hex_from_main: Removing instruction __b5: @@ -3913,7 +3914,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 @@ -3922,8 +3922,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [261] beq __b12 to bne Fixing long branch [155] bpl __b1 to bmi Fixing long branch [167] bpl __b4 to bmi diff --git a/src/test/ref/cordic-atan2.log b/src/test/ref/cordic-atan2.log index 588324a88..fa124155a 100644 --- a/src/test/ref/cordic-atan2.log +++ b/src/test/ref/cordic-atan2.log @@ -1472,7 +1472,7 @@ Target platform is c64basic / MOS6502X // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 8-bit CORDIC atan2 calculation @@ -2186,7 +2186,7 @@ ASSEMBLER BEFORE OPTIMIZATION // See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The number of iterations performed during 8-bit CORDIC atan2 calculation @@ -2779,6 +2779,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_font_hex_from_main: Removing instruction __b5: @@ -2797,7 +2798,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -2806,8 +2806,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [66] bpl __b1 to bmi Fixing long branch [79] bpl __b4 to bmi diff --git a/src/test/ref/cpu-6502.log b/src/test/ref/cpu-6502.log index b9b7f9349..d61c48e15 100644 --- a/src/test/ref/cpu-6502.log +++ b/src/test/ref/cpu-6502.log @@ -175,7 +175,7 @@ Target platform is c64basic / MOS6502 // By a program that normally uses illegal opcodes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -278,7 +278,7 @@ ASSEMBLER BEFORE OPTIMIZATION // By a program that normally uses illegal opcodes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -366,17 +366,15 @@ Removing instruction __bend_from___b1: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cstyle-decl-function-intrinsic.log b/src/test/ref/cstyle-decl-function-intrinsic.log index 3400b639a..8caa0aeac 100644 --- a/src/test/ref/cstyle-decl-function-intrinsic.log +++ b/src/test/ref/cstyle-decl-function-intrinsic.log @@ -72,7 +72,7 @@ Target platform is c64basic / MOS6502X // Test declaration of intrinsic without body // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -116,7 +116,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declaration of intrinsic without body // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -156,14 +156,12 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cstyle-decl-function.log b/src/test/ref/cstyle-decl-function.log index 4fecd87d6..115d5c14f 100644 --- a/src/test/ref/cstyle-decl-function.log +++ b/src/test/ref/cstyle-decl-function.log @@ -223,7 +223,7 @@ Target platform is c64basic / MOS6502X // Test declarations without body // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -347,7 +347,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declarations without body // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -435,6 +435,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sum_from_main: Removing instruction __b1: @@ -443,11 +444,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cstyle-decl-var-multiple.log b/src/test/ref/cstyle-decl-var-multiple.log index 8f85334b3..4b96c985d 100644 --- a/src/test/ref/cstyle-decl-var-multiple.log +++ b/src/test/ref/cstyle-decl-var-multiple.log @@ -212,7 +212,7 @@ Target platform is c64basic / MOS6502X // Test legal definition of multiple local variables with the same name // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -321,7 +321,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test legal definition of multiple local variables with the same name // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -419,19 +419,17 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/cstyle-decl-var.log b/src/test/ref/cstyle-decl-var.log index fc458eb06..3355bb539 100644 --- a/src/test/ref/cstyle-decl-var.log +++ b/src/test/ref/cstyle-decl-var.log @@ -136,7 +136,7 @@ Target platform is c64basic / MOS6502X // Test declarations of variables without definition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The actual declarations @@ -192,7 +192,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declarations of variables without definition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The actual declarations @@ -240,14 +240,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/danny-joystick-problem.log b/src/test/ref/danny-joystick-problem.log index dff6aaf50..b3ddbb368 100644 --- a/src/test/ref/danny-joystick-problem.log +++ b/src/test/ref/danny-joystick-problem.log @@ -265,7 +265,7 @@ Target platform is c64basic / MOS6502X // https://www.protovision.games/hardw/build4player.php?language=en&fbclid=IwAR1MJLgQjOU0zVa0ax2aNeGa-xVbE9IGY9zC6b6eInTV4HQzoUAoCPoXu14 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6526_CIA_PORT_B = 1 @@ -333,7 +333,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://www.protovision.games/hardw/build4player.php?language=en&fbclid=IwAR1MJLgQjOU0zVa0ax2aNeGa-xVbE9IGY9zC6b6eInTV4HQzoUAoCPoXu14 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6526_CIA_PORT_B = 1 @@ -383,14 +383,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-0.log b/src/test/ref/declared-memory-var-0.log index e660244ba..e0bdb6083 100644 --- a/src/test/ref/declared-memory-var-0.log +++ b/src/test/ref/declared-memory-var-0.log @@ -126,7 +126,7 @@ Target platform is c64basic / MOS6502X // Test declaring a variable as "__mem __notssa", meaning it will be stored in memory and accessed through an implicit pointer (using load/store) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -208,7 +208,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declaring a variable as "__mem __notssa", meaning it will be stored in memory and accessed through an implicit pointer (using load/store) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -276,17 +276,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-1.log b/src/test/ref/declared-memory-var-1.log index 6dff6ba18..86a1e73b1 100644 --- a/src/test/ref/declared-memory-var-1.log +++ b/src/test/ref/declared-memory-var-1.log @@ -129,7 +129,7 @@ Target platform is c64basic / MOS6502X // Test a pointer to a memory variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -213,7 +213,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a pointer to a memory variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -282,17 +282,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-2.log b/src/test/ref/declared-memory-var-2.log index bd18a179d..bee6aa6e8 100644 --- a/src/test/ref/declared-memory-var-2.log +++ b/src/test/ref/declared-memory-var-2.log @@ -132,7 +132,7 @@ Target platform is c64basic / MOS6502X // Test a memory variable containing a pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -221,7 +221,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a memory variable containing a pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -297,17 +297,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-3.log b/src/test/ref/declared-memory-var-3.log index 65e647c85..9c19c0051 100644 --- a/src/test/ref/declared-memory-var-3.log +++ b/src/test/ref/declared-memory-var-3.log @@ -141,7 +141,7 @@ Target platform is c64basic / MOS6502X // Test a memory variable struct value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_FOO_THING2 = 1 @@ -198,7 +198,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a memory variable struct value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_FOO_THING2 = 1 @@ -244,14 +244,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-4.log b/src/test/ref/declared-memory-var-4.log index 92a12ad9c..5060b3ef1 100644 --- a/src/test/ref/declared-memory-var-4.log +++ b/src/test/ref/declared-memory-var-4.log @@ -219,7 +219,7 @@ Target platform is c64basic / MOS6502X // Test a memory variable struct value - containing a fixed size array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_FOO_THING2 = 1 @@ -319,7 +319,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a memory variable struct value - containing a fixed size array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_FOO_THING2 = 1 @@ -396,17 +396,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-5.log b/src/test/ref/declared-memory-var-5.log index 7bc35cea8..fa5080aab 100644 --- a/src/test/ref/declared-memory-var-5.log +++ b/src/test/ref/declared-memory-var-5.log @@ -117,7 +117,7 @@ Target platform is c64basic / MOS6502X // Test a memory variable struct value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_FOO_THING2 = 1 @@ -173,7 +173,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a memory variable struct value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_FOO_THING2 = 1 @@ -218,14 +218,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/declared-memory-var-6.log b/src/test/ref/declared-memory-var-6.log index 54de491c5..acda1cc82 100644 --- a/src/test/ref/declared-memory-var-6.log +++ b/src/test/ref/declared-memory-var-6.log @@ -364,7 +364,7 @@ Target platform is c64basic / MOS6502X // Test declaring a variable as "memory", meaning it will be stored in memory and accessed through an implicit pointer (using load/store) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -566,7 +566,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declaring a variable as "memory", meaning it will be stored in memory and accessed through an implicit pointer (using load/store) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -773,6 +773,7 @@ Removing instruction out_from___b8: Removing instruction __b9_from___b8: Removing instruction out_from___b9: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction out_from_main: Removing instruction __b1: @@ -787,11 +788,8 @@ Removing instruction __b9: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/deep-nesting.log b/src/test/ref/deep-nesting.log index e3933828e..02302be5d 100644 --- a/src/test/ref/deep-nesting.log +++ b/src/test/ref/deep-nesting.log @@ -7381,7 +7381,7 @@ Target platform is c64basic / MOS6502X // Test that the compiler handles deep nesting well -- mainly a performance issue. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -8931,7 +8931,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that the compiler handles deep nesting well -- mainly a performance issue. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -10377,6 +10377,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction f1_from_main: Removing instruction __b1: @@ -10581,11 +10582,8 @@ Removing instruction f100_from_f99: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/default-font.log b/src/test/ref/default-font.log index a58b73edf..54c27861b 100644 --- a/src/test/ref/default-font.log +++ b/src/test/ref/default-font.log @@ -431,7 +431,7 @@ Target platform is c64basic / MOS6502X // Show default font on screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -631,7 +631,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Show default font on screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -804,6 +804,7 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction memset_from_main: Removing instruction __b1_from_main: @@ -813,14 +814,11 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/deref-to-derefidx-2.log b/src/test/ref/deref-to-derefidx-2.log index 24c63c2bc..b6e434b5e 100644 --- a/src/test/ref/deref-to-derefidx-2.log +++ b/src/test/ref/deref-to-derefidx-2.log @@ -217,7 +217,7 @@ Target platform is c64basic / MOS6502X // Tests optimizing derefs of *(ptr+b) to ptr[b - even when a noop-cast is needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -329,7 +329,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimizing derefs of *(ptr+b) to ptr[b - even when a noop-cast is needed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -426,17 +426,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/deref-to-derefidx.log b/src/test/ref/deref-to-derefidx.log index bf575986b..170e81c1d 100644 --- a/src/test/ref/deref-to-derefidx.log +++ b/src/test/ref/deref-to-derefidx.log @@ -205,7 +205,7 @@ Target platform is c64basic / MOS6502X // Tests optimizing derefs of *(ptr+b) to ptr[b] // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -304,7 +304,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimizing derefs of *(ptr+b) to ptr[b] // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -392,17 +392,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/derefidx-word-0.log b/src/test/ref/derefidx-word-0.log index b7e234cd5..9ff78fc18 100644 --- a/src/test/ref/derefidx-word-0.log +++ b/src/test/ref/derefidx-word-0.log @@ -133,7 +133,7 @@ Target platform is c64basic / MOS6502X // Tests that array-indexing by a word variable is turned into pointer addition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -230,7 +230,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that array-indexing by a word variable is turned into pointer addition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -320,16 +320,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/derefidx-word-1.log b/src/test/ref/derefidx-word-1.log index d00b9891f..8b977a073 100644 --- a/src/test/ref/derefidx-word-1.log +++ b/src/test/ref/derefidx-word-1.log @@ -84,7 +84,7 @@ Target platform is c64basic / MOS6502X // Tests that array-indexing by a constant word is turned into a constant pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -130,7 +130,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that array-indexing by a constant word is turned into a constant pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -170,14 +170,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/derefidx-word-2.log b/src/test/ref/derefidx-word-2.log index 1057bf4dc..23b0555fc 100644 --- a/src/test/ref/derefidx-word-2.log +++ b/src/test/ref/derefidx-word-2.log @@ -135,7 +135,7 @@ Target platform is c64basic / MOS6502X // Tests that array-indexing by a word variable that is a sum of a constant word and a byte is turned back into derefidx // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -206,7 +206,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that array-indexing by a word variable that is a sum of a constant word and a byte is turned back into derefidx // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -268,17 +268,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/divide-2s.log b/src/test/ref/divide-2s.log index 28619f33f..b7a4d9c70 100644 --- a/src/test/ref/divide-2s.log +++ b/src/test/ref/divide-2s.log @@ -214,7 +214,7 @@ Target platform is c64basic / MOS6502X // Check that division by factors of 2 is converted to shifts // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -351,7 +351,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Check that division by factors of 2 is converted to shifts // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -441,17 +441,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/double-assignment.log b/src/test/ref/double-assignment.log index fd7013cb4..1aadd414f 100644 --- a/src/test/ref/double-assignment.log +++ b/src/test/ref/double-assignment.log @@ -114,7 +114,7 @@ Target platform is c64basic / MOS6502X // Test that a double-assignment works. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -165,7 +165,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that a double-assignment works. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -211,14 +211,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/double-import.log b/src/test/ref/double-import.log index d4655c2d0..0b51904a1 100644 --- a/src/test/ref/double-import.log +++ b/src/test/ref/double-import.log @@ -74,7 +74,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -120,7 +120,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -161,14 +161,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/double-indexing-arrays.log b/src/test/ref/double-indexing-arrays.log index 825cad83d..c8b8f33c3 100644 --- a/src/test/ref/double-indexing-arrays.log +++ b/src/test/ref/double-indexing-arrays.log @@ -314,7 +314,7 @@ Target platform is c64basic / MOS6502X // Tests that constant offset indexing into arrays is handled correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -448,7 +448,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that constant offset indexing into arrays is handled correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -546,17 +546,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/duplicate-loop-problem.log b/src/test/ref/duplicate-loop-problem.log index 20d1c3486..91acd492e 100644 --- a/src/test/ref/duplicate-loop-problem.log +++ b/src/test/ref/duplicate-loop-problem.log @@ -162,7 +162,7 @@ Target platform is c64basic / MOS6502X // Resulted in infinite loop in loop depth analysis // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label DC00 = $dc00 @@ -234,7 +234,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Resulted in infinite loop in loop depth analysis // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label DC00 = $dc00 @@ -298,15 +298,14 @@ Removing instruction __bend_from___b1: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b1 in bne __b2 Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/dword.log b/src/test/ref/dword.log index 2e7a36b0b..8ebdd9324 100644 --- a/src/test/ref/dword.log +++ b/src/test/ref/dword.log @@ -141,7 +141,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -236,7 +236,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -315,17 +315,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/emptyblock-error.log b/src/test/ref/emptyblock-error.log index f9b47a718..e6a59957d 100644 --- a/src/test/ref/emptyblock-error.log +++ b/src/test/ref/emptyblock-error.log @@ -198,7 +198,7 @@ Target platform is c64basic / MOS6502X // Error cleaning up unused blocks // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label B = $1000 @@ -286,7 +286,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Error cleaning up unused blocks // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label B = $1000 @@ -376,16 +376,14 @@ Removing instruction __b1_from_menu: Removing instruction mode_from___b1: Removing instruction __b2_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/encoding-literal-char.log b/src/test/ref/encoding-literal-char.log index 5079dc2b3..01e3ebe51 100644 --- a/src/test/ref/encoding-literal-char.log +++ b/src/test/ref/encoding-literal-char.log @@ -204,7 +204,7 @@ Target platform is c64basic / MOS6502X // Tests encoding of literal chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .encoding "petscii_mixed" @@ -298,7 +298,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests encoding of literal chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .encoding "petscii_mixed" @@ -379,14 +379,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-0.log b/src/test/ref/enum-0.log index 1e3926135..31855a232 100644 --- a/src/test/ref/enum-0.log +++ b/src/test/ref/enum-0.log @@ -80,7 +80,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - two-value enum // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const ON = 1 @@ -129,7 +129,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - two-value enum // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const ON = 1 @@ -170,14 +170,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-1.log b/src/test/ref/enum-1.log index 90458d280..6de3a5347 100644 --- a/src/test/ref/enum-1.log +++ b/src/test/ref/enum-1.log @@ -81,7 +81,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - three-value enum with specified integer values and increment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BROKEN = 9 @@ -130,7 +130,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - three-value enum with specified integer values and increment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BROKEN = 9 @@ -171,14 +171,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-2.log b/src/test/ref/enum-2.log index f36da5f97..7b5c86be1 100644 --- a/src/test/ref/enum-2.log +++ b/src/test/ref/enum-2.log @@ -81,7 +81,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - char values with increment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const B = 'b' @@ -130,7 +130,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - char values with increment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const B = 'b' @@ -171,14 +171,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-3.log b/src/test/ref/enum-3.log index cd2de7e84..334446cce 100644 --- a/src/test/ref/enum-3.log +++ b/src/test/ref/enum-3.log @@ -83,7 +83,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - value with complex calculation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BROKEN = 4*4+2+1 @@ -132,7 +132,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - value with complex calculation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BROKEN = 4*4+2+1 @@ -173,14 +173,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-4.log b/src/test/ref/enum-4.log index ae6a3fe0b..ae6ad9306 100644 --- a/src/test/ref/enum-4.log +++ b/src/test/ref/enum-4.log @@ -78,7 +78,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - inline enum definitions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -125,7 +125,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - inline enum definitions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -166,14 +166,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-5.log b/src/test/ref/enum-5.log index 817bef260..7c09707eb 100644 --- a/src/test/ref/enum-5.log +++ b/src/test/ref/enum-5.log @@ -110,7 +110,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - multiple inline enum definitions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -175,7 +175,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - multiple inline enum definitions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -232,15 +232,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-6.log b/src/test/ref/enum-6.log index a1fdc068f..80340ebc6 100644 --- a/src/test/ref/enum-6.log +++ b/src/test/ref/enum-6.log @@ -102,7 +102,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - anonymous enum definition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -154,7 +154,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - anonymous enum definition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -199,14 +199,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-7.log b/src/test/ref/enum-7.log index 96d9183ba..ca2c0f8d0 100644 --- a/src/test/ref/enum-7.log +++ b/src/test/ref/enum-7.log @@ -99,7 +99,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - struct with enum // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 0 @@ -155,7 +155,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - struct with enum // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 0 @@ -200,14 +200,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/enum-8.log b/src/test/ref/enum-8.log index 3cc115253..ad252308c 100644 --- a/src/test/ref/enum-8.log +++ b/src/test/ref/enum-8.log @@ -101,7 +101,7 @@ Target platform is c64basic / MOS6502X // Test of simple enum - struct with inline anonymous enum // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -157,7 +157,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test of simple enum - struct with inline anonymous enum // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -202,14 +202,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/euclid-3.log b/src/test/ref/euclid-3.log index 90ef6a633..a555c1fc7 100644 --- a/src/test/ref/euclid-3.log +++ b/src/test/ref/euclid-3.log @@ -1210,7 +1210,7 @@ Target platform is c64basic / MOS6502X */ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 4 @@ -1765,7 +1765,7 @@ ASSEMBLER BEFORE OPTIMIZATION */ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 4 @@ -2258,6 +2258,7 @@ Removing instruction __b1_from_euclid: Removing instruction __b1_from___b3: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -2297,11 +2298,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/euclid-problem-2.log b/src/test/ref/euclid-problem-2.log index e73767b84..40582e9ba 100644 --- a/src/test/ref/euclid-problem-2.log +++ b/src/test/ref/euclid-problem-2.log @@ -462,7 +462,7 @@ Target platform is c64basic / MOS6502X // The compiler does not realize that A is alive in the statement b=b-a - and thus can clobber it. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -677,7 +677,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The compiler does not realize that A is alive in the statement b=b-a - and thus can clobber it. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -843,6 +843,7 @@ Removing instruction __b1_from_euclid: Removing instruction __b1_from___b3: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction euclid_from_main: Removing instruction __b1: @@ -856,11 +857,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/euclid-problem.log b/src/test/ref/euclid-problem.log index 327db5d98..e97b577b8 100644 --- a/src/test/ref/euclid-problem.log +++ b/src/test/ref/euclid-problem.log @@ -179,7 +179,7 @@ Target platform is c64basic / MOS6502X // The compiler does not realize that A is alive in the statement b=b-a - and thus can clobber it. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -285,7 +285,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The compiler does not realize that A is alive in the statement b=b-a - and thus can clobber it. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -378,20 +378,19 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b5: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b1 in jmp __b1_from___b5 Succesful ASM optimization Pass5DoubleJumpElimination Relabelling long label __b1_from___b5 to __b3 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: Removing instruction __b3: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log index ab39d445b..487d5705a 100644 --- a/src/test/ref/examples/3d/3d.log +++ b/src/test/ref/examples/3d/3d.log @@ -4339,7 +4339,7 @@ Target platform is c64basic / MOS6502X // - Codebase64 Article http://codebase64.org/doku.php?id=base:3d_rotation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const GREEN = 5 @@ -7005,7 +7005,7 @@ ASSEMBLER BEFORE OPTIMIZATION // - Codebase64 Article http://codebase64.org/doku.php?id=base:3d_rotation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const GREEN = 5 @@ -9005,6 +9005,7 @@ Removing instruction __b1_from_print_str_at: Removing instruction __b1_from___b2: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction debug_print_init_from___b1: @@ -9108,7 +9109,6 @@ Removing instruction __b1_from___b2: Removing instruction __b1_from_sprites_init: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b6 @@ -9117,8 +9117,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [317] bne __b1 to beq Fixing long branch [923] bne __b2 to beq Fixing long branch [932] bne __b1 to beq diff --git a/src/test/ref/examples/3d/perspective.log b/src/test/ref/examples/3d/perspective.log index d7e34fcee..b094fb1be 100644 --- a/src/test/ref/examples/3d/perspective.log +++ b/src/test/ref/examples/3d/perspective.log @@ -1747,7 +1747,7 @@ Target platform is c64basic / MOS6502X // - Codebase64 Article http://codebase64.org/doku.php?id=base:3d_rotation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The rotated point - updated by calling rotate() @@ -2592,7 +2592,7 @@ ASSEMBLER BEFORE OPTIMIZATION // - Codebase64 Article http://codebase64.org/doku.php?id=base:3d_rotation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The rotated point - updated by calling rotate() @@ -3360,6 +3360,7 @@ Removing instruction __b1_from_print_schar: Removing instruction print_char_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mulf_init_from_main: Removing instruction __b1: @@ -3404,14 +3405,11 @@ Removing instruction __b1_from___b2: Removing instruction __b1_from_mulf_init: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.log b/src/test/ref/examples/bresenham/bitmap-bresenham.log index d1c1ac225..4d98eeb62 100644 --- a/src/test/ref/examples/bresenham/bitmap-bresenham.log +++ b/src/test/ref/examples/bresenham/bitmap-bresenham.log @@ -2688,7 +2688,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -4124,7 +4124,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -5195,6 +5195,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction bitmap_init_from_main: Removing instruction __b2: @@ -5247,7 +5248,6 @@ Removing instruction __b3_from___b2: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -5266,7 +5266,6 @@ Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda.z x0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/examples/chargen/chargen-analysis.log b/src/test/ref/examples/chargen/chargen-analysis.log index 9f5fa64f3..8d118b55a 100644 --- a/src/test/ref/examples/chargen/chargen-analysis.log +++ b/src/test/ref/examples/chargen/chargen-analysis.log @@ -1971,7 +1971,7 @@ Target platform is c64basic / MOS6502X // Allows analysis of the CHARGEN ROM font // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_F7 = 3 @@ -3062,7 +3062,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Allows analysis of the CHARGEN ROM font // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_F7 = 3 @@ -3953,6 +3953,7 @@ Removing instruction __b5_from___b6: Removing instruction __b1_from_print_str_at: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -3995,7 +3996,6 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b13_from___b26 to __b3 @@ -4010,8 +4010,6 @@ Removing instruction jmp __b12 Removing instruction jmp __b3 Removing instruction jmp __b4 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [83] bcc __b2 to bcs Fixing long branch [89] bcc __b2 to bcs diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.log b/src/test/ref/examples/fastmultiply/fastmultiply8.log index bdb1462dd..dfec0555e 100644 --- a/src/test/ref/examples/fastmultiply/fastmultiply8.log +++ b/src/test/ref/examples/fastmultiply/fastmultiply8.log @@ -1188,7 +1188,7 @@ Target platform is c64basic / MOS6502X // - http://codebase64.org/doku.php?id=magazines:chacking16 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Pointers to a, b and c=a*b @@ -1940,7 +1940,7 @@ ASSEMBLER BEFORE OPTIMIZATION // - http://codebase64.org/doku.php?id=magazines:chacking16 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Pointers to a, b and c=a*b @@ -2514,6 +2514,7 @@ Removing instruction print_char_at_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_screen_from_main: Removing instruction __b1_from_main: @@ -2547,7 +2548,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -2558,8 +2558,6 @@ Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #9 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/fire/fire.log b/src/test/ref/examples/fire/fire.log index 97c881bd1..e04e8c2a9 100644 --- a/src/test/ref/examples/fire/fire.log +++ b/src/test/ref/examples/fire/fire.log @@ -1679,7 +1679,7 @@ Target platform is c64basic / MOS6502X // Original source https://github.com/cc65/cc65/blob/master/samples/fire.c // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // SID Channel Control Register Noise Waveform @@ -2514,7 +2514,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Original source https://github.com/cc65/cc65/blob/master/samples/fire.c // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // SID Channel Control Register Noise Waveform @@ -3197,6 +3197,7 @@ Removing instruction __b11_from___b12: Removing instruction __b11_from___b9: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fillscreen_from_main: Removing instruction __b5: @@ -3230,7 +3231,6 @@ Removing instruction __b1_from___b2: Removing instruction __b1_from_fillscreen: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b6_from___b5 to __b7 @@ -3238,8 +3238,6 @@ Relabelling long label __b8_from___b6 to __b10 Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [196] bne __b2 to beq Fixing long branch [201] bne __b2 to beq Fixing long branch [211] bne __b4 to beq diff --git a/src/test/ref/examples/font-2x2/font-2x2.log b/src/test/ref/examples/font-2x2/font-2x2.log index 7491d45eb..cabb1cddf 100644 --- a/src/test/ref/examples/font-2x2/font-2x2.log +++ b/src/test/ref/examples/font-2x2/font-2x2.log @@ -2299,7 +2299,7 @@ Target platform is c64basic / MOS6502X // Creates a 2x2 font from the system CHARGEN font and compress it by identifying identical chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // RAM in 0xA000, 0xE000 CHAR ROM in 0xD000 @@ -3382,7 +3382,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Creates a 2x2 font from the system CHARGEN font and compress it by identifying identical chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // RAM in 0xA000, 0xE000 CHAR ROM in 0xD000 @@ -4204,6 +4204,7 @@ Removing instruction __b4_from___b3: Removing instruction __b5_from___b4: Removing instruction __b8_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction font_2x2_from_main: Removing instruction __b6: @@ -4239,7 +4240,6 @@ Removing instruction __b8_from___b7: Removing instruction __b9: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -4258,7 +4258,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #8 Removing instruction lda #8 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [396] bne __b1 to beq diff --git a/src/test/ref/examples/irq/irq-hyperscreen.log b/src/test/ref/examples/irq/irq-hyperscreen.log index 380be6e80..fd05393e3 100644 --- a/src/test/ref/examples/irq/irq-hyperscreen.log +++ b/src/test/ref/examples/irq/irq-hyperscreen.log @@ -361,7 +361,7 @@ Target platform is c64basic / MOS6502X // A raster IRQ that opens the top/bottom border. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Value that disables all CIA interrupts when stored to the CIA Interrupt registers @@ -547,7 +547,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A raster IRQ that opens the top/bottom border. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Value that disables all CIA interrupts when stored to the CIA Interrupt registers @@ -702,16 +702,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/kernalload/kernalload.asm b/src/test/ref/examples/kernalload/kernalload.asm index 3d6e22f94..09599ffc0 100644 --- a/src/test/ref/examples/kernalload/kernalload.asm +++ b/src/test/ref/examples/kernalload/kernalload.asm @@ -13,7 +13,7 @@ .segmentdef Data [startAfter="Code"] .segmentdef Sprite .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code // The offset of the sprite pointers from the screen start address .const SPRITE_PTRS = $3f8 @@ -29,7 +29,6 @@ .label LOAD_SPRITE = $3000 .label SCREEN = $400 .label SPRITES_PTR = SCREEN+SPRITE_PTRS -__bbegin: .segment Code main: { .const toSpritePtr1_return = LOAD_SPRITE/$40 diff --git a/src/test/ref/examples/kernalload/kernalload.log b/src/test/ref/examples/kernalload/kernalload.log index 857044c6b..e2aca129a 100644 --- a/src/test/ref/examples/kernalload/kernalload.log +++ b/src/test/ref/examples/kernalload/kernalload.log @@ -848,7 +848,7 @@ Allocated zp[2]:12 [ strlen::return#2 ] Allocated zp[2]:14 [ setnam::$0 ] INITIAL ASM -Target platform is custom / MOS6502X +Target platform is c64basic / MOS6502X // File Comments // Load a file to memory using the C64 KERNAL LOAD functions // The kernalload.ld link file creates a D64 disk image containing the executable and the sprite. @@ -866,7 +866,7 @@ Target platform is custom / MOS6502X .segmentdef Data [startAfter="Code"] .segmentdef Sprite .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code // Global Constants & labels // The offset of the sprite pointers from the screen start address @@ -1279,7 +1279,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segmentdef Data [startAfter="Code"] .segmentdef Sprite .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code // Global Constants & labels // The offset of the sprite pointers from the screen start address @@ -1610,6 +1610,7 @@ Removing instruction __b1_from_loadFileToMemory: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction loadFileToMemory_from_main: Removing instruction __b4: @@ -1831,7 +1832,7 @@ Score: 811 .segmentdef Data [startAfter="Code"] .segmentdef Sprite .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code // Global Constants & labels // The offset of the sprite pointers from the screen start address @@ -1849,7 +1850,6 @@ Score: 811 .label SCREEN = $400 .label SPRITES_PTR = SCREEN+SPRITE_PTRS // @begin -__bbegin: // [1] phi from @begin to @1 [phi:@begin->@1] // @1 // [2] call main diff --git a/src/test/ref/examples/linking/linking.asm b/src/test/ref/examples/linking/linking.asm index 69167e16c..44fb63a16 100644 --- a/src/test/ref/examples/linking/linking.asm +++ b/src/test/ref/examples/linking/linking.asm @@ -11,13 +11,12 @@ .segmentdef CodeHigh [start=$4000] .segmentdef DataHigh [startAfter="CodeHigh"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code .label BG_COLOR = $d021 .label SCREEN = $400 -__bbegin: .segment Code main: { ldx #0 diff --git a/src/test/ref/examples/linking/linking.log b/src/test/ref/examples/linking/linking.log index 5b321fcd2..45ab456be 100644 --- a/src/test/ref/examples/linking/linking.log +++ b/src/test/ref/examples/linking/linking.log @@ -263,7 +263,7 @@ Allocated zp[1]:6 [ fillscreen::c#0 ] Allocated zp[1]:7 [ fillscreen::$2 ] INITIAL ASM -Target platform is custom / MOS6502X +Target platform is c64basic / MOS6502X // File Comments // Example showing how to perform linking using a linker-file // The linker file is created using KickAssembler segments. @@ -279,7 +279,7 @@ Target platform is custom / MOS6502X .segmentdef CodeHigh [start=$4000] .segmentdef DataHigh [startAfter="CodeHigh"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -455,7 +455,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segmentdef CodeHigh [start=$4000] .segmentdef DataHigh [startAfter="CodeHigh"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -591,6 +591,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction fillscreen_from___b2: @@ -657,7 +658,7 @@ Score: 6777 .segmentdef CodeHigh [start=$4000] .segmentdef DataHigh [startAfter="CodeHigh"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -665,7 +666,6 @@ Score: 6777 .label BG_COLOR = $d021 .label SCREEN = $400 // @begin -__bbegin: // [1] phi from @begin to @1 [phi:@begin->@1] // @1 // [2] call main diff --git a/src/test/ref/examples/music/music.log b/src/test/ref/examples/music/music.log index c7b57f926..3d172ec13 100644 --- a/src/test/ref/examples/music/music.log +++ b/src/test/ref/examples/music/music.log @@ -289,7 +289,7 @@ Target platform is c64basic / MOS6502X // A simple SID music player playing music in the main loop. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -374,7 +374,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A simple SID music player playing music in the main loop. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -447,15 +447,13 @@ Removing instruction __b1: Removing instruction __b2_from___b1: Removing instruction __bend_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __b2: Removing instruction __bend: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/music/music_irq.log b/src/test/ref/examples/music/music_irq.log index 88530746b..d524260a0 100644 --- a/src/test/ref/examples/music/music_irq.log +++ b/src/test/ref/examples/music/music_irq.log @@ -318,7 +318,7 @@ Target platform is c64basic / MOS6502X // A simple SID music player using RASTER IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Value that disables all CIA interrupts when stored to the CIA Interrupt registers @@ -453,7 +453,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A simple SID music player using RASTER IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Value that disables all CIA interrupts when stored to the CIA Interrupt registers @@ -569,16 +569,14 @@ Removing instruction __b1: Removing instruction __b2_from___b1: Removing instruction __bend_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __b2: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/plasma/plasma-unroll.log b/src/test/ref/examples/plasma/plasma-unroll.log index f18fe24e0..bbdb6f98b 100644 --- a/src/test/ref/examples/plasma/plasma-unroll.log +++ b/src/test/ref/examples/plasma/plasma-unroll.log @@ -3257,7 +3257,7 @@ Target platform is c64basic / MOS6502X // Original source https://github.com/cc65/cc65/blob/master/samples/plasma.c // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // SID Channel Control Register Noise Waveform @@ -4535,7 +4535,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Original source https://github.com/cc65/cc65/blob/master/samples/plasma.c // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // SID Channel Control Register Noise Waveform @@ -5418,6 +5418,7 @@ Removing instruction __b10_from___b9: Removing instruction __b7_from___b12: Removing instruction __b7_from___b8: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -5479,15 +5480,12 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b5_from___b3 to __b4 Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [94] bcc __b2 to bcs Fixing long branch [112] bcc __b5 to bcs diff --git a/src/test/ref/examples/plasma/plasma.log b/src/test/ref/examples/plasma/plasma.log index 3a4367adc..b43888f43 100644 --- a/src/test/ref/examples/plasma/plasma.log +++ b/src/test/ref/examples/plasma/plasma.log @@ -2503,7 +2503,7 @@ Target platform is c64basic / MOS6502X // Original source https://github.com/cc65/cc65/blob/master/samples/plasma.c // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // SID Channel Control Register Noise Waveform @@ -3385,7 +3385,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Original source https://github.com/cc65/cc65/blob/master/samples/plasma.c // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // SID Channel Control Register Noise Waveform @@ -4103,6 +4103,7 @@ Removing instruction __b10_from___b9: Removing instruction __b7_from___b12: Removing instruction __b7_from___b8: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -4142,7 +4143,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b8_from___b7 to __b3 @@ -4150,8 +4150,6 @@ Relabelling long label __b5_from___b3 to __b4 Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/plus4walk/plus4walk.asm b/src/test/ref/examples/plus4walk/plus4walk.asm index d12795090..33001323f 100644 --- a/src/test/ref/examples/plus4walk/plus4walk.asm +++ b/src/test/ref/examples/plus4walk/plus4walk.asm @@ -5,7 +5,7 @@ .segmentdef Code [start=$100d] .segmentdef Data [startAfter="Code"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -20,7 +20,6 @@ .label DEFAULT_SCREEN = $c00 // The random state variable .label rand_state = 3 -__bbegin: .segment Code main: { .label __3 = 5 diff --git a/src/test/ref/examples/plus4walk/plus4walk.log b/src/test/ref/examples/plus4walk/plus4walk.log index 235f17be8..387aa6f34 100644 --- a/src/test/ref/examples/plus4walk/plus4walk.log +++ b/src/test/ref/examples/plus4walk/plus4walk.log @@ -1,4 +1,3 @@ -Loading link script "plus4.ld" Fixing struct type size struct MOS7360_TED to 63 Fixing struct type SIZE_OF struct MOS7360_TED to 63 Fixing struct type SIZE_OF struct MOS7360_TED to 63 @@ -1096,7 +1095,7 @@ Allocated zp[2]:47 [ rand::return#0 ] Allocated zp[2]:49 [ memset::end#0 ] INITIAL ASM -Target platform is custom / MOS6502X +Target platform is plus4 / MOS6502X // File Comments // Random walk with color fading for Commodore Plus/4 / C16 // Upstart @@ -1106,7 +1105,7 @@ Target platform is custom / MOS6502X .segmentdef Code [start=$100d] .segmentdef Data [startAfter="Code"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -1749,7 +1748,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segmentdef Code [start=$100d] .segmentdef Data [startAfter="Code"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -2258,6 +2257,7 @@ Removing instruction __b17_from___b5: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction memset_from_main: Removing instruction __b10: @@ -2451,7 +2451,7 @@ Score: 6721 .segmentdef Code [start=$100d] .segmentdef Data [startAfter="Code"] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -2468,7 +2468,6 @@ Score: 6721 // The random state variable .label rand_state = 3 // @begin -__bbegin: // [1] phi from @begin to @1 [phi:@begin->@1] // @1 // [2] call main diff --git a/src/test/ref/examples/rasterbars/raster-bars.log b/src/test/ref/examples/rasterbars/raster-bars.log index bff5ff5ef..89ddd57d8 100644 --- a/src/test/ref/examples/rasterbars/raster-bars.log +++ b/src/test/ref/examples/rasterbars/raster-bars.log @@ -375,7 +375,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -538,7 +538,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -683,18 +683,16 @@ Removing instruction __bend_from___b1: Removing instruction __b3_from___b2: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Removing instruction __b1_from_raster: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/rotate/rotate.log b/src/test/ref/examples/rotate/rotate.log index a9947ba63..63d695818 100644 --- a/src/test/ref/examples/rotate/rotate.log +++ b/src/test/ref/examples/rotate/rotate.log @@ -2385,7 +2385,7 @@ Target platform is c64basic / MOS6502X // 2D rotattion of 8 sprites // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -3858,7 +3858,7 @@ ASSEMBLER BEFORE OPTIMIZATION // 2D rotattion of 8 sprites // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -4905,6 +4905,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_from_main: Removing instruction __b1: @@ -4964,15 +4965,12 @@ Removing instruction __b5_from___b8: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b4 Removing instruction jmp __b1 Removing instruction jmp __b8 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [153] bne __b4 to beq FINAL SYMBOL TABLE diff --git a/src/test/ref/examples/scroll/scroll.log b/src/test/ref/examples/scroll/scroll.log index ab83880f6..9fe204874 100644 --- a/src/test/ref/examples/scroll/scroll.log +++ b/src/test/ref/examples/scroll/scroll.log @@ -652,7 +652,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -908,7 +908,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -1136,6 +1136,7 @@ Removing instruction __b1_from___b4: Removing instruction __b9_from___b7: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fillscreen_from_main: Removing instruction __b1_from_main: @@ -1150,15 +1151,12 @@ Removing instruction __b1_from_fillscreen: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b9 Removing instruction jmp __b4 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/scrollbig/scrollbig.log b/src/test/ref/examples/scrollbig/scrollbig.log index aff15d7b7..7ab40cfeb 100644 --- a/src/test/ref/examples/scrollbig/scrollbig.log +++ b/src/test/ref/examples/scrollbig/scrollbig.log @@ -1511,7 +1511,7 @@ Target platform is c64basic / MOS6502X // An 8x8 char letter scroller // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -2071,7 +2071,7 @@ ASSEMBLER BEFORE OPTIMIZATION // An 8x8 char letter scroller // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6569_VICII_RASTER = $12 @@ -2537,6 +2537,7 @@ Removing instruction __b5_from___b3: Removing instruction __b4_from___b5: Removing instruction __b1_from_next_char: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fillscreen_from_main: Removing instruction __b1_from_main: @@ -2563,7 +2564,6 @@ Removing instruction __b1_from_fillscreen: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b4_from___b3 to __b2 @@ -2574,8 +2574,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b3 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.log b/src/test/ref/examples/scrolllogo/scrolllogo.log index 072fd64e6..d3b80df13 100644 --- a/src/test/ref/examples/scrolllogo/scrolllogo.log +++ b/src/test/ref/examples/scrolllogo/scrolllogo.log @@ -4196,7 +4196,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_MCM = $10 @@ -6345,7 +6345,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_MCM = $10 @@ -7932,6 +7932,7 @@ Removing instruction __breturn: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Removing instruction memset_from___b3: @@ -8016,7 +8017,6 @@ Removing instruction __b6: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -8041,7 +8041,6 @@ Removing instruction lda #0 Removing instruction lda #0 Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __b12: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/examples/showlogo/showlogo.log b/src/test/ref/examples/showlogo/showlogo.log index bf14f8332..eb3c92ff8 100644 --- a/src/test/ref/examples/showlogo/showlogo.log +++ b/src/test/ref/examples/showlogo/showlogo.log @@ -719,7 +719,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_MCM = $10 @@ -964,7 +964,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_MCM = $10 @@ -1176,6 +1176,7 @@ Removing instruction __b1_from___b1: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Removing instruction memset_from___b3: @@ -1184,13 +1185,10 @@ Removing instruction __b1_from___b4: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/sinplotter/sine-plotter.log b/src/test/ref/examples/sinplotter/sine-plotter.log index da8205166..83cfa63ff 100644 --- a/src/test/ref/examples/sinplotter/sine-plotter.log +++ b/src/test/ref/examples/sinplotter/sine-plotter.log @@ -3826,7 +3826,7 @@ Target platform is c64basic / MOS6502X // Generate a big sinus and plot it on a bitmap // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -5991,7 +5991,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Generate a big sinus and plot it on a bitmap // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -7626,6 +7626,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction vicSelectGfxBank1: Removing instruction vicSelectGfxBank1___b1: @@ -7698,7 +7699,6 @@ Removing instruction __b3_from___b2: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b3 in beq __b12 @@ -7714,7 +7714,6 @@ Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b12: Succesful ASM optimization Pass5UnusedLabelElimination Removing unreachable instruction rts diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.log b/src/test/ref/examples/sinsprites/sinus-sprites.log index 5b9e07318..73f5822ed 100644 --- a/src/test/ref/examples/sinsprites/sinus-sprites.log +++ b/src/test/ref/examples/sinsprites/sinus-sprites.log @@ -3493,7 +3493,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const sinlen_x = $dd @@ -5378,7 +5378,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const sinlen_x = $dd @@ -6956,6 +6956,7 @@ Removing instruction __b4_from___b5: Removing instruction __b5_from___b4: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_from_main: Removing instruction __b1_from_main: @@ -7057,7 +7058,6 @@ Removing instruction __breturn: Removing instruction __b1_from_place_sprites: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b3_from___b2 to __b6 @@ -7079,8 +7079,6 @@ Removing instruction lda memHi Replacing instruction ldy memHi with TAY Removing instruction lda.z s_gen Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/examples/zpcode/zpcode.asm b/src/test/ref/examples/zpcode/zpcode.asm index 1ef6b7f1a..cab057b3c 100644 --- a/src/test/ref/examples/zpcode/zpcode.asm +++ b/src/test/ref/examples/zpcode/zpcode.asm @@ -8,13 +8,12 @@ .segmentdef Data [startAfter="Code"] .segmentdef ZpCode [start=$80] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code .label RASTER = $d012 .label BG_COLOR = $d020 -__bbegin: .segment Code main: { // Transfer ZP-code to zeropage diff --git a/src/test/ref/examples/zpcode/zpcode.log b/src/test/ref/examples/zpcode/zpcode.log index 12cf2d33a..edfd9a164 100644 --- a/src/test/ref/examples/zpcode/zpcode.log +++ b/src/test/ref/examples/zpcode/zpcode.log @@ -301,7 +301,7 @@ Allocated zp[1]:3 [ zpLoop::i#2 zpLoop::i#1 ] Allocated zp[1]:4 [ loop::i#2 loop::i#1 ] INITIAL ASM -Target platform is custom / MOS6502X +Target platform is c64basic / MOS6502X // File Comments // Example showing how to use KickAsm segments to compile meant to be transfered to zeropage before execution. // The linker-file defines the ZpCode segment to be on zeropage and does not include it directly in the PRG-file (by excluding it from the Program segment). @@ -314,7 +314,7 @@ Target platform is custom / MOS6502X .segmentdef Data [startAfter="Code"] .segmentdef ZpCode [start=$80] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -506,7 +506,7 @@ ASSEMBLER BEFORE OPTIMIZATION .segmentdef Data [startAfter="Code"] .segmentdef ZpCode [start=$80] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -675,6 +675,7 @@ Removing instruction __b5_from___b4: Removing instruction __b1_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: @@ -746,7 +747,7 @@ Score: 4076 .segmentdef Data [startAfter="Code"] .segmentdef ZpCode [start=$80] .segment Basic -:BasicUpstart(__bbegin) +:BasicUpstart(main) .segment Code @@ -754,7 +755,6 @@ Score: 4076 .label RASTER = $d012 .label BG_COLOR = $d020 // @begin -__bbegin: // [1] phi from @begin to @1 [phi:@begin->@1] // @1 // [2] call main diff --git a/src/test/ref/fastmultiply-127.log b/src/test/ref/fastmultiply-127.log index 28adba38f..613189d9f 100644 --- a/src/test/ref/fastmultiply-127.log +++ b/src/test/ref/fastmultiply-127.log @@ -2733,7 +2733,7 @@ Target platform is c64basic / MOS6502X // Utilizes the fact that a*b = ((a+b)/2)^2 - ((a-b)/2)^2 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 4 @@ -4112,7 +4112,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Utilizes the fact that a*b = ((a+b)/2)^2 - ((a-b)/2)^2 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 3 @@ -5379,6 +5379,7 @@ Removing instruction print_uint_from___b5: Removing instruction __b6_from___b5: Removing instruction print_ln_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -5456,7 +5457,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b1 in bpl __b9 @@ -5465,7 +5465,6 @@ Replacing jump to rts with rts in jmp __b3 Succesful ASM optimization Pass5DoubleJumpElimination Relabelling long label __b3_from___b6 to __b4 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: Removing instruction __b4: Removing instruction __b9: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/fibmem.log b/src/test/ref/fibmem.log index 2c3a67349..4094216c2 100644 --- a/src/test/ref/fibmem.log +++ b/src/test/ref/fibmem.log @@ -159,7 +159,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -245,7 +245,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -313,17 +313,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/fill-square.log b/src/test/ref/fill-square.log index fa5c8a76d..623c1ce45 100644 --- a/src/test/ref/fill-square.log +++ b/src/test/ref/fill-square.log @@ -224,7 +224,7 @@ Target platform is c64basic / MOS6502X // Fill a square on the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -394,7 +394,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fill a square on the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -527,20 +527,18 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/fillscreen-1.log b/src/test/ref/fillscreen-1.log index ac6cea7d6..708edc38e 100644 --- a/src/test/ref/fillscreen-1.log +++ b/src/test/ref/fillscreen-1.log @@ -154,7 +154,7 @@ Target platform is c64basic / MOS6502X // Fill screen using an efficient char-based index // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -245,7 +245,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fill screen using an efficient char-based index // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -320,16 +320,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/fillscreen-2.log b/src/test/ref/fillscreen-2.log index 32aaaddcf..c509aef05 100644 --- a/src/test/ref/fillscreen-2.log +++ b/src/test/ref/fillscreen-2.log @@ -130,7 +130,7 @@ Target platform is c64basic / MOS6502X // Fill screen using an word-based index // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fill screen using an word-based index // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -310,16 +310,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/fillscreen-3.log b/src/test/ref/fillscreen-3.log index 812d9032e..52aa03cc0 100644 --- a/src/test/ref/fillscreen-3.log +++ b/src/test/ref/fillscreen-3.log @@ -129,7 +129,7 @@ Target platform is c64basic / MOS6502X // Fill screen using a pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -209,7 +209,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fill screen using a pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -283,16 +283,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/flipper-rex2.log b/src/test/ref/flipper-rex2.log index 5913e8af9..88ce03606 100644 --- a/src/test/ref/flipper-rex2.log +++ b/src/test/ref/flipper-rex2.log @@ -668,7 +668,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -1031,7 +1031,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -1351,6 +1351,7 @@ Removing instruction __b2_from___b2: Removing instruction __b4_from___b4: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction prepare_from_main: Removing instruction __b3: @@ -1367,7 +1368,6 @@ Removing instruction __breturn: Removing instruction __b1_from_prepare: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b1_from___b5 to __b3 @@ -1379,8 +1379,6 @@ Removing instruction jmp __b2 Removing instruction jmp __b4 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/font-hex-show.log b/src/test/ref/font-hex-show.log index adfd165d4..6baae2639 100644 --- a/src/test/ref/font-hex-show.log +++ b/src/test/ref/font-hex-show.log @@ -780,7 +780,7 @@ Target platform is c64basic / MOS6502X // Shows a font where each char contains the number of the char (00-ff) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label D018 = $d018 @@ -1099,7 +1099,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Shows a font where each char contains the number of the char (00-ff) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label D018 = $d018 @@ -1361,6 +1361,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction init_font_hex_from___b2: @@ -1372,7 +1373,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -1380,8 +1380,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/for-empty-increment.log b/src/test/ref/for-empty-increment.log index 713b70617..db7421f71 100644 --- a/src/test/ref/for-empty-increment.log +++ b/src/test/ref/for-empty-increment.log @@ -123,7 +123,7 @@ Target platform is c64basic / MOS6502X // Tests that for()-loops can have empty increments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that for()-loops can have empty increments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -255,16 +255,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/for-empty-init.log b/src/test/ref/for-empty-init.log index fe7ebd42d..af9fd6285 100644 --- a/src/test/ref/for-empty-init.log +++ b/src/test/ref/for-empty-init.log @@ -123,7 +123,7 @@ Target platform is c64basic / MOS6502X // Tests that for()-loops can have empty inits // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that for()-loops can have empty inits // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -255,16 +255,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/for-two-vars.log b/src/test/ref/for-two-vars.log index 56e90a4cb..cb80dfe04 100644 --- a/src/test/ref/for-two-vars.log +++ b/src/test/ref/for-two-vars.log @@ -149,7 +149,7 @@ Target platform is c64basic / MOS6502X // Illustrates that for()-loops currently cannot contain two variable declarations. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -241,7 +241,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates that for()-loops currently cannot contain two variable declarations. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -317,16 +317,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/forced-zeropage.log b/src/test/ref/forced-zeropage.log index 746610adb..6df82fcca 100644 --- a/src/test/ref/forced-zeropage.log +++ b/src/test/ref/forced-zeropage.log @@ -110,7 +110,7 @@ Target platform is c64basic / MOS6502X // Test some forced zeropage access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -185,7 +185,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test some forced zeropage access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -249,14 +249,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/forclassicmin.log b/src/test/ref/forclassicmin.log index f55df132f..ed23d774d 100644 --- a/src/test/ref/forclassicmin.log +++ b/src/test/ref/forclassicmin.log @@ -123,7 +123,7 @@ Target platform is c64basic / MOS6502X // Minimal classic for() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal classic for() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -255,16 +255,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/forincrementassign.log b/src/test/ref/forincrementassign.log index 019248114..81f5f03d9 100644 --- a/src/test/ref/forincrementassign.log +++ b/src/test/ref/forincrementassign.log @@ -132,7 +132,7 @@ Target platform is c64basic / MOS6502X // The following should give a program rendering a char on every second char of the first line - but results in a syntax error // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -206,7 +206,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The following should give a program rendering a char on every second char of the first line - but results in a syntax error // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -269,16 +269,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/forrangedwords.log b/src/test/ref/forrangedwords.log index a64cacad1..e921e4157 100644 --- a/src/test/ref/forrangedwords.log +++ b/src/test/ref/forrangedwords.log @@ -214,7 +214,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -346,7 +346,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -464,19 +464,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/forrangemin.log b/src/test/ref/forrangemin.log index 6bfe6e75f..d03fba357 100644 --- a/src/test/ref/forrangemin.log +++ b/src/test/ref/forrangemin.log @@ -177,7 +177,7 @@ Target platform is c64basic / MOS6502X // Minimal range based for() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN1 = $400 @@ -270,7 +270,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal range based for() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN1 = $400 @@ -355,19 +355,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/forrangesymbolic.log b/src/test/ref/forrangesymbolic.log index bdac91007..3cf7b3c66 100644 --- a/src/test/ref/forrangesymbolic.log +++ b/src/test/ref/forrangesymbolic.log @@ -131,7 +131,7 @@ Target platform is c64basic / MOS6502X // The following should work but gives a not-constant exception // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -212,7 +212,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The following should work but gives a not-constant exception // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -288,17 +288,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/fragment-synth.log b/src/test/ref/fragment-synth.log index 0f9a6d2e9..dccd60403 100644 --- a/src/test/ref/fragment-synth.log +++ b/src/test/ref/fragment-synth.log @@ -286,7 +286,7 @@ Target platform is c64basic / MOS6502X // vbuaa=vbuxx_band_pbuz1_derefidx_vbuc1 < vbuaa=pbuz1_derefidx_vbuc1_band_vbuxx < vbuaa=pbuz1_derefidx_vbuaa_band_vbuxx < vbuaa=pbuz1_derefidx_vbuyy_band_vbuxx < vbuaa=pbuz1_derefidx_vbuyy_band_vbuaa < vbuaa=vbuaa_band_pbuz1_derefidx_vbuyy - clobber:A Y cycles:11.5 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -413,7 +413,7 @@ ASSEMBLER BEFORE OPTIMIZATION // vbuaa=vbuxx_band_pbuz1_derefidx_vbuc1 < vbuaa=pbuz1_derefidx_vbuc1_band_vbuxx < vbuaa=pbuz1_derefidx_vbuaa_band_vbuxx < vbuaa=pbuz1_derefidx_vbuyy_band_vbuxx < vbuaa=pbuz1_derefidx_vbuyy_band_vbuaa < vbuaa=vbuaa_band_pbuz1_derefidx_vbuyy - clobber:A Y cycles:11.5 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -509,6 +509,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fct_from_main: Removing instruction __b1: @@ -517,11 +518,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/fragment-variations.log b/src/test/ref/fragment-variations.log index cf238e0f6..29c264eaa 100644 --- a/src/test/ref/fragment-variations.log +++ b/src/test/ref/fragment-variations.log @@ -261,7 +261,7 @@ Target platform is c64basic / MOS6502X // ASM fragment variations "cast" constants to different types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_DWORD = 4 @@ -457,7 +457,7 @@ ASSEMBLER BEFORE OPTIMIZATION // ASM fragment variations "cast" constants to different types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_DWORD = 4 @@ -594,6 +594,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mul16u_from_main: Removing instruction __b1: @@ -602,11 +603,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg-2.log b/src/test/ref/function-pointer-noarg-2.log index 0a24c1285..28149505a 100644 --- a/src/test/ref/function-pointer-noarg-2.log +++ b/src/test/ref/function-pointer-noarg-2.log @@ -191,7 +191,7 @@ Target platform is c64basic / MOS6502X // Tests creating and assigning pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -272,7 +272,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating and assigning pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -348,17 +348,16 @@ Removing instruction __b1_from___b2: Removing instruction __b3_from___b1: Removing instruction __b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction beq __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/function-pointer-noarg-3.log b/src/test/ref/function-pointer-noarg-3.log index f710c754c..dd59e332b 100644 --- a/src/test/ref/function-pointer-noarg-3.log +++ b/src/test/ref/function-pointer-noarg-3.log @@ -243,7 +243,7 @@ Target platform is c64basic / MOS6502X // Tests creating and assigning pointers to non-args no-return functions - plus inline kickasm-based calling // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -372,7 +372,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating and assigning pointers to non-args no-return functions - plus inline kickasm-based calling // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -495,6 +495,7 @@ Removing instruction __b1: Removing instruction __b3_from___b2: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __b2: Removing instruction __bend: Removing instruction __b1_from_main: @@ -503,11 +504,8 @@ Removing instruction __b1_from___b4: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg-call-2.log b/src/test/ref/function-pointer-noarg-call-2.log index 38b8cb304..ef06a2cc4 100644 --- a/src/test/ref/function-pointer-noarg-call-2.log +++ b/src/test/ref/function-pointer-noarg-call-2.log @@ -230,7 +230,7 @@ Target platform is c64basic / MOS6502X // Tests creating, assigning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -360,7 +360,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating, assigning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -478,6 +478,7 @@ Removing instruction __b1: Removing instruction __b3_from___b2: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4_from___b2: @@ -485,11 +486,8 @@ Removing instruction __b1_from___b4: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg-call-3.log b/src/test/ref/function-pointer-noarg-call-3.log index c32d0dba3..d5cd585d9 100644 --- a/src/test/ref/function-pointer-noarg-call-3.log +++ b/src/test/ref/function-pointer-noarg-call-3.log @@ -272,7 +272,7 @@ Target platform is c64basic / MOS6502X // Tests creating, assigning returning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -439,7 +439,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating, assigning returning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -573,6 +573,7 @@ Removing instruction __b1: Removing instruction __b1_from_getfn: Removing instruction __breturn_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -581,12 +582,10 @@ Removing instruction __breturn_from_getfn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/function-pointer-noarg-call-4.log b/src/test/ref/function-pointer-noarg-call-4.log index 60b4629ab..9091d4805 100644 --- a/src/test/ref/function-pointer-noarg-call-4.log +++ b/src/test/ref/function-pointer-noarg-call-4.log @@ -202,7 +202,7 @@ Target platform is c64basic / MOS6502X // Tests creating, assigning returning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -293,7 +293,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating, assigning returning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -380,6 +380,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1: Removing instruction __b3_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction getfn_from___b2: @@ -388,11 +389,8 @@ Removing instruction __b1_from___b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg-call-5.log b/src/test/ref/function-pointer-noarg-call-5.log index 75aea69f0..247bb45cb 100644 --- a/src/test/ref/function-pointer-noarg-call-5.log +++ b/src/test/ref/function-pointer-noarg-call-5.log @@ -192,7 +192,7 @@ Target platform is c64basic / MOS6502X // Tests calling into arrays of pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -313,7 +313,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests calling into arrays of pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -409,17 +409,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b1_from___b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg-call-6.log b/src/test/ref/function-pointer-noarg-call-6.log index 69cc49fd8..35d2d5a44 100644 --- a/src/test/ref/function-pointer-noarg-call-6.log +++ b/src/test/ref/function-pointer-noarg-call-6.log @@ -191,7 +191,7 @@ Target platform is c64basic / MOS6502X // Tests calling into a function pointer with local variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -333,7 +333,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests calling into a function pointer with local variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -474,6 +474,7 @@ Removing instruction __bend_from___b1: Removing instruction __b2_from___b1: Removing instruction fn1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: @@ -482,11 +483,8 @@ Removing instruction __b1_from_fn1: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg-call.log b/src/test/ref/function-pointer-noarg-call.log index d94f5d9e0..9b64a459a 100644 --- a/src/test/ref/function-pointer-noarg-call.log +++ b/src/test/ref/function-pointer-noarg-call.log @@ -102,7 +102,7 @@ Target platform is c64basic / MOS6502X // Tests creating, assigning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -160,7 +160,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating, assigning and calling pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -213,15 +213,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-noarg.log b/src/test/ref/function-pointer-noarg.log index 06cdce84e..4ca861a98 100644 --- a/src/test/ref/function-pointer-noarg.log +++ b/src/test/ref/function-pointer-noarg.log @@ -190,7 +190,7 @@ Target platform is c64basic / MOS6502X // Tests creating pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -274,7 +274,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating pointers to non-args no-return functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -347,16 +347,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/function-pointer-return.log b/src/test/ref/function-pointer-return.log index abac296c9..ad8b44f13 100644 --- a/src/test/ref/function-pointer-return.log +++ b/src/test/ref/function-pointer-return.log @@ -257,7 +257,7 @@ Target platform is c64basic / MOS6502X // Tests creating and assigning pointers to non-args return with function value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -384,7 +384,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating and assigning pointers to non-args return with function value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -500,6 +500,7 @@ Removing instruction __b1: Removing instruction __b3_from___b2: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4_from___b2: @@ -507,11 +508,8 @@ Removing instruction __b1_from___b4: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/gfxbank.log b/src/test/ref/gfxbank.log index 9f450b537..b796fec46 100644 --- a/src/test/ref/gfxbank.log +++ b/src/test/ref/gfxbank.log @@ -355,7 +355,7 @@ Target platform is c64basic / MOS6502X // Test minimization of constants // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6526_CIA_PORT_A_DDR = 2 @@ -427,7 +427,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test minimization of constants // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_MOS6526_CIA_PORT_A_DDR = 2 @@ -492,16 +492,14 @@ Removing instruction __bend_from___b1: Removing instruction vicSelectGfxBank1_toDd001_from_vicSelectGfxBank1: Removing instruction vicSelectGfxBank1_toDd001: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction vicSelectGfxBank1: Removing instruction vicSelectGfxBank1___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/global-pc-multiple.log b/src/test/ref/global-pc-multiple.log index f25da0bfa..16daf9ffb 100644 --- a/src/test/ref/global-pc-multiple.log +++ b/src/test/ref/global-pc-multiple.log @@ -149,7 +149,7 @@ Target platform is c64basic / MOS6502X // Test setting the program PC through a #pc directive // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $2000 "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -227,7 +227,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test setting the program PC through a #pc directive // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $2000 "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -300,15 +300,13 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b2_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/global-pc.log b/src/test/ref/global-pc.log index ae819ca7f..43099f0f3 100644 --- a/src/test/ref/global-pc.log +++ b/src/test/ref/global-pc.log @@ -100,7 +100,7 @@ Target platform is c64basic / MOS6502X // Test setting the program PC through a #pc directive // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $1000 "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -152,7 +152,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test setting the program PC through a #pc directive // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $1000 "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -195,13 +195,11 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/halfscii.log b/src/test/ref/halfscii.log index b9a680b74..ce67985a0 100644 --- a/src/test/ref/halfscii.log +++ b/src/test/ref/halfscii.log @@ -818,7 +818,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -1352,7 +1352,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -1680,6 +1680,7 @@ Removing instruction __b5_from___b4: Removing instruction __b5_from___b9: Removing instruction __b11_from___b11: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -1691,7 +1692,6 @@ Removing instruction __b11_from___b10: Removing instruction __b12: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b2_from___b1 to __b6 @@ -1699,8 +1699,6 @@ Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Removing instruction jmp __b11 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [127] bcc __b1 to bcs Fixing long branch [133] bcc __b1 to bcs diff --git a/src/test/ref/helloworld0.log b/src/test/ref/helloworld0.log index b0cc606f2..7629c43c3 100644 --- a/src/test/ref/helloworld0.log +++ b/src/test/ref/helloworld0.log @@ -120,7 +120,7 @@ Target platform is c64basic / MOS6502X // Tests minimal hello world // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests minimal hello world // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -257,17 +257,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/helloworld2-inline.log b/src/test/ref/helloworld2-inline.log index ca85cee2a..4a0053b5b 100644 --- a/src/test/ref/helloworld2-inline.log +++ b/src/test/ref/helloworld2-inline.log @@ -305,7 +305,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -451,7 +451,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -568,6 +568,7 @@ Removing instruction print21___b1_from_print21: Removing instruction print22_from_print21___b1: Removing instruction print22___b1_from_print22: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print21: Removing instruction print22: @@ -575,13 +576,10 @@ Removing instruction __breturn: Removing instruction print22___b1_from_print22___b2: Removing instruction print21___b1_from_print21___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing instruction ldx #0 with TAX Replacing instruction ldy #0 with TAY -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/helloworld2.log b/src/test/ref/helloworld2.log index cf6732825..0bc030a14 100644 --- a/src/test/ref/helloworld2.log +++ b/src/test/ref/helloworld2.log @@ -239,7 +239,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -365,7 +365,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -473,6 +473,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print2_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print2_from_main: Removing instruction __b1: @@ -481,11 +482,8 @@ Removing instruction __b1_from_print2: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/hex2dec-ptrptr.log b/src/test/ref/hex2dec-ptrptr.log index f6f861f0f..668c4a164 100644 --- a/src/test/ref/hex2dec-ptrptr.log +++ b/src/test/ref/hex2dec-ptrptr.log @@ -721,7 +721,7 @@ Target platform is c64basic / MOS6502X // Testing binary to hex conversion using pointer to pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1120,7 +1120,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Testing binary to hex conversion using pointer to pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1448,6 +1448,7 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction cls_from_main: Removing instruction __b1: @@ -1475,14 +1476,11 @@ Removing instruction __b2: Removing instruction __b1_from_cls: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/hex2dec.log b/src/test/ref/hex2dec.log index 4c6d1b49b..83ef7cbda 100644 --- a/src/test/ref/hex2dec.log +++ b/src/test/ref/hex2dec.log @@ -1310,7 +1310,7 @@ Target platform is c64basic / MOS6502X // Testing hex to decimal conversion // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label control = $d011 @@ -2068,7 +2068,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Testing hex to decimal conversion // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label control = $d011 @@ -2651,6 +2651,7 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction cls_from_main: Removing instruction __b2: @@ -2688,7 +2689,6 @@ Removing instruction __b2: Removing instruction __b1_from_cls: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -2696,8 +2696,6 @@ Removing instruction jmp __b6 Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ifmin.log b/src/test/ref/ifmin.log index 696b7c304..35c08b71a 100644 --- a/src/test/ref/ifmin.log +++ b/src/test/ref/ifmin.log @@ -146,7 +146,7 @@ Target platform is c64basic / MOS6502X // Minimal if() test // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal if() test // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -295,18 +295,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/immzero.log b/src/test/ref/immzero.log index aee66cb3c..dbcbbbb8c 100644 --- a/src/test/ref/immzero.log +++ b/src/test/ref/immzero.log @@ -139,7 +139,7 @@ Target platform is c64basic / MOS6502X // Tests that immediate zero values are reused - even when assigning to words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -221,7 +221,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that immediate zero values are reused - even when assigning to words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -297,17 +297,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/importing.log b/src/test/ref/importing.log index 836644c2e..c69d8ea8f 100644 --- a/src/test/ref/importing.log +++ b/src/test/ref/importing.log @@ -85,7 +85,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -136,7 +136,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -181,14 +181,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/incd020.log b/src/test/ref/incd020.log index 722ad17c1..4e7dd068e 100644 --- a/src/test/ref/incd020.log +++ b/src/test/ref/incd020.log @@ -87,7 +87,7 @@ Target platform is c64basic / MOS6502X // Currently it does not but instead leads to just reading the value a few times. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d020 @@ -135,7 +135,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Currently it does not but instead leads to just reading the value a few times. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d020 @@ -178,13 +178,11 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log index ce6ec0eae..3f4db8438 100644 --- a/src/test/ref/incrementinarray.log +++ b/src/test/ref/incrementinarray.log @@ -709,7 +709,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 3 @@ -1015,7 +1015,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 2 @@ -1291,6 +1291,7 @@ Removing instruction print_ln_from___b2: Removing instruction __b1_from_print_ln: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -1310,11 +1311,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/infloop-error.log b/src/test/ref/infloop-error.log index 04c81ca8d..01b52eb37 100644 --- a/src/test/ref/infloop-error.log +++ b/src/test/ref/infloop-error.log @@ -259,7 +259,7 @@ Target platform is c64basic / MOS6502X // Results in infinite compile loop as the compiler keeps trying to remove the same (empty) alias // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -372,7 +372,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Results in infinite compile loop as the compiler keeps trying to remove the same (empty) alias // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -482,17 +482,15 @@ Removing instruction __b3_from___b5: Removing instruction __b4_from___b3: Removing instruction __b4_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b5: Removing instruction __b6: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/initializer-0.log b/src/test/ref/initializer-0.log index 26663e884..823ede105 100644 --- a/src/test/ref/initializer-0.log +++ b/src/test/ref/initializer-0.log @@ -140,7 +140,7 @@ Target platform is c64basic / MOS6502X // Array of chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Array of chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -291,17 +291,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/initializer-1.log b/src/test/ref/initializer-1.log index 5440f11ba..19864f04f 100644 --- a/src/test/ref/initializer-1.log +++ b/src/test/ref/initializer-1.log @@ -181,7 +181,7 @@ Target platform is c64basic / MOS6502X // Array of words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -306,7 +306,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Array of words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -389,17 +389,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/initializer-2.log b/src/test/ref/initializer-2.log index 7df05879e..29261a637 100644 --- a/src/test/ref/initializer-2.log +++ b/src/test/ref/initializer-2.log @@ -177,7 +177,7 @@ Target platform is c64basic / MOS6502X // Array of structs containing chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -290,7 +290,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Array of structs containing chars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -372,17 +372,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/initializer-3.log b/src/test/ref/initializer-3.log index b66d0c5bb..38c87a813 100644 --- a/src/test/ref/initializer-3.log +++ b/src/test/ref/initializer-3.log @@ -209,7 +209,7 @@ Target platform is c64basic / MOS6502X // Array of structs containing words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -371,7 +371,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Array of structs containing words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -476,17 +476,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-clobber-none.log b/src/test/ref/inline-asm-clobber-none.log index d71f1b677..dde5008d2 100644 --- a/src/test/ref/inline-asm-clobber-none.log +++ b/src/test/ref/inline-asm-clobber-none.log @@ -218,7 +218,7 @@ Target platform is c64basic / MOS6502X // Tests that inline ASM JSR clobbers all registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -339,7 +339,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that inline ASM JSR clobbers all registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -458,21 +458,19 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-clobber.log b/src/test/ref/inline-asm-clobber.log index c8bc36abc..086c543d0 100644 --- a/src/test/ref/inline-asm-clobber.log +++ b/src/test/ref/inline-asm-clobber.log @@ -263,7 +263,7 @@ Target platform is c64basic / MOS6502X // Tests that inline ASM clobbering is taken into account when assigning registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -417,7 +417,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that inline ASM clobbering is taken into account when assigning registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -557,6 +557,7 @@ Removing instruction __b4_from___b6: Removing instruction __b5_from___b4: Removing instruction __b5_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -564,7 +565,6 @@ Removing instruction __b4_from___b3: Removing instruction __b6: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -572,8 +572,6 @@ Removing instruction jmp __b2 Removing instruction jmp __b4 Removing instruction jmp __b5 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-jsr-clobber.log b/src/test/ref/inline-asm-jsr-clobber.log index d166a286e..3f5660220 100644 --- a/src/test/ref/inline-asm-jsr-clobber.log +++ b/src/test/ref/inline-asm-jsr-clobber.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // Tests that inline ASM JSR clobbers all registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -190,7 +190,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that inline ASM JSR clobbers all registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -253,17 +253,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-label.log b/src/test/ref/inline-asm-label.log index 34594e22b..86a0a5cbb 100644 --- a/src/test/ref/inline-asm-label.log +++ b/src/test/ref/inline-asm-label.log @@ -75,7 +75,7 @@ Target platform is c64basic / MOS6502X // Illustrates how inline assembler use internal labels and external references // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -127,7 +127,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates how inline assembler use internal labels and external references // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -173,14 +173,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-optimized.log b/src/test/ref/inline-asm-optimized.log index dba002f27..285691d86 100644 --- a/src/test/ref/inline-asm-optimized.log +++ b/src/test/ref/inline-asm-optimized.log @@ -96,7 +96,7 @@ Target platform is c64basic / MOS6502X // Tests that inline assembler is optimized // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -156,7 +156,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that inline assembler is optimized // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -212,14 +212,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-param.log b/src/test/ref/inline-asm-param.log index 585f94e01..5d874c8e2 100644 --- a/src/test/ref/inline-asm-param.log +++ b/src/test/ref/inline-asm-param.log @@ -118,7 +118,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -187,7 +187,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -249,17 +249,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-ref-scoped.log b/src/test/ref/inline-asm-ref-scoped.log index 0dd070272..d855e6bae 100644 --- a/src/test/ref/inline-asm-ref-scoped.log +++ b/src/test/ref/inline-asm-ref-scoped.log @@ -98,7 +98,7 @@ Target platform is c64basic / MOS6502X // Tests that references to labels in other scopes is possible from inline ASM // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -160,7 +160,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that references to labels in other scopes is possible from inline ASM // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -214,15 +214,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-refout-const.log b/src/test/ref/inline-asm-refout-const.log index 5e34f9ff6..36cfafbef 100644 --- a/src/test/ref/inline-asm-refout-const.log +++ b/src/test/ref/inline-asm-refout-const.log @@ -75,7 +75,7 @@ Target platform is c64basic / MOS6502X // Illustrates how inline assembler can reference data from the outside program without the data being optimized away as unused // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -127,7 +127,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates how inline assembler can reference data from the outside program without the data being optimized away as unused // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -173,14 +173,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm-refout.log b/src/test/ref/inline-asm-refout.log index 0024493f7..a10b1255e 100644 --- a/src/test/ref/inline-asm-refout.log +++ b/src/test/ref/inline-asm-refout.log @@ -87,7 +87,7 @@ Target platform is c64basic / MOS6502X // Illustrates how inline assembler can reference data from the outside program // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -143,7 +143,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates how inline assembler can reference data from the outside program // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -192,14 +192,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-asm.log b/src/test/ref/inline-asm.log index d80c54551..82d9232a5 100644 --- a/src/test/ref/inline-asm.log +++ b/src/test/ref/inline-asm.log @@ -70,7 +70,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -121,7 +121,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -167,14 +167,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-assignment.log b/src/test/ref/inline-assignment.log index c7e48fd35..2cd490012 100644 --- a/src/test/ref/inline-assignment.log +++ b/src/test/ref/inline-assignment.log @@ -136,7 +136,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -208,7 +208,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -273,17 +273,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-dword-0.log b/src/test/ref/inline-dword-0.log index 43f49b71b..a07151b95 100644 --- a/src/test/ref/inline-dword-0.log +++ b/src/test/ref/inline-dword-0.log @@ -96,7 +96,7 @@ Target platform is c64basic / MOS6502X // Tests minimal inline dword // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -149,7 +149,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests minimal inline dword // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -196,14 +196,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-function-if.log b/src/test/ref/inline-function-if.log index de651f1d6..b0e2580f7 100644 --- a/src/test/ref/inline-function-if.log +++ b/src/test/ref/inline-function-if.log @@ -261,7 +261,7 @@ Target platform is c64basic / MOS6502X // Test inlining a slightly complex print function (containing an if) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -332,7 +332,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test inlining a slightly complex print function (containing an if) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -405,16 +405,14 @@ Removing instruction toUpper1: Removing instruction toUpper2_from___b1: Removing instruction toUpper2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-function-level2.log b/src/test/ref/inline-function-level2.log index d95ce0c78..a2cbe51c7 100644 --- a/src/test/ref/inline-function-level2.log +++ b/src/test/ref/inline-function-level2.log @@ -627,7 +627,7 @@ Target platform is c64basic / MOS6502X // Inline functions in two levels // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label cur_line = 7 @@ -886,7 +886,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Inline functions in two levels // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label cur_line = 2 @@ -1110,6 +1110,7 @@ Removing instruction line1___b1_from_line1: Removing instruction line2_from_line1___b1: Removing instruction line2___b1_from_line2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction line1: @@ -1123,11 +1124,8 @@ Removing instruction __b3: Removing instruction line1___b1_from___b3: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-function-min.log b/src/test/ref/inline-function-min.log index e2c8f9e99..e04cf8c0a 100644 --- a/src/test/ref/inline-function-min.log +++ b/src/test/ref/inline-function-min.log @@ -282,7 +282,7 @@ Target platform is c64basic / MOS6502X // Test minimal inline function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -371,7 +371,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test minimal inline function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -465,17 +465,15 @@ Removing instruction sum2: Removing instruction sum3_from___b2: Removing instruction sum3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-function-print.log b/src/test/ref/inline-function-print.log index 013720659..36548406b 100644 --- a/src/test/ref/inline-function-print.log +++ b/src/test/ref/inline-function-print.log @@ -304,7 +304,7 @@ Target platform is c64basic / MOS6502X // TEst inlining a slightly complex print function (containing a loop) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -451,7 +451,7 @@ ASSEMBLER BEFORE OPTIMIZATION // TEst inlining a slightly complex print function (containing a loop) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -568,6 +568,7 @@ Removing instruction print1___b1_from_print1: Removing instruction print2_from_print1___b1: Removing instruction print2___b1_from_print2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print1: Removing instruction print2: @@ -575,13 +576,10 @@ Removing instruction __breturn: Removing instruction print2___b1_from_print2___b2: Removing instruction print1___b1_from_print1___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing instruction ldx #0 with TAX Replacing instruction ldy #0 with TAY -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-function.log b/src/test/ref/inline-function.log index 1a9005716..88c7fd646 100644 --- a/src/test/ref/inline-function.log +++ b/src/test/ref/inline-function.log @@ -333,7 +333,7 @@ Target platform is c64basic / MOS6502X // Splits screen so upper half is lower case and lower half lower case // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -429,7 +429,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Splits screen so upper half is lower case and lower half lower case // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -522,15 +522,13 @@ Removing instruction toD0181: Removing instruction toD0182_from___b2: Removing instruction toD0182: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b3: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-kasm-clobber.log b/src/test/ref/inline-kasm-clobber.log index 0727d3d62..fb93d63b5 100644 --- a/src/test/ref/inline-kasm-clobber.log +++ b/src/test/ref/inline-kasm-clobber.log @@ -227,7 +227,7 @@ Target platform is c64basic / MOS6502X // Tests that inline kickasm supports the clobbering directive // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -360,7 +360,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that inline kickasm supports the clobbering directive // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -478,13 +478,13 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -493,8 +493,6 @@ Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #$b Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-kasm-data.log b/src/test/ref/inline-kasm-data.log index cdeb64c4b..cc1cfca7f 100644 --- a/src/test/ref/inline-kasm-data.log +++ b/src/test/ref/inline-kasm-data.log @@ -184,7 +184,7 @@ Target platform is c64basic / MOS6502X // Example of inline kickasm data // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label sintab = $1000 @@ -310,7 +310,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of inline kickasm data // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label sintab = $1000 @@ -411,17 +411,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-kasm-loop.log b/src/test/ref/inline-kasm-loop.log index 82702b0c2..e5a827ada 100644 --- a/src/test/ref/inline-kasm-loop.log +++ b/src/test/ref/inline-kasm-loop.log @@ -94,7 +94,7 @@ Target platform is c64basic / MOS6502X // Example of inline kickasm in a function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -146,7 +146,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of inline kickasm in a function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -192,14 +192,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-kasm-refout.log b/src/test/ref/inline-kasm-refout.log index c26cf0205..3b00658a4 100644 --- a/src/test/ref/inline-kasm-refout.log +++ b/src/test/ref/inline-kasm-refout.log @@ -89,7 +89,7 @@ Target platform is c64basic / MOS6502X // Illustrates how inline kickassembler can reference data from the outside program // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -141,7 +141,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates how inline kickassembler can reference data from the outside program // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -188,14 +188,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-kasm-resource.log b/src/test/ref/inline-kasm-resource.log index dd33d6796..c035e081d 100644 --- a/src/test/ref/inline-kasm-resource.log +++ b/src/test/ref/inline-kasm-resource.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // Example of inline kickasm resource data // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SPRITE = $c00 @@ -185,7 +185,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of inline kickasm resource data // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SPRITE = $c00 @@ -247,14 +247,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-pointer-0.log b/src/test/ref/inline-pointer-0.log index ef7836d0f..0bedca3c5 100644 --- a/src/test/ref/inline-pointer-0.log +++ b/src/test/ref/inline-pointer-0.log @@ -105,7 +105,7 @@ Target platform is c64basic / MOS6502X // Tests creating a literal pointer from two bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -151,7 +151,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating a literal pointer from two bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -191,14 +191,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-pointer-1.log b/src/test/ref/inline-pointer-1.log index 39a1f620d..0cc7fcd5a 100644 --- a/src/test/ref/inline-pointer-1.log +++ b/src/test/ref/inline-pointer-1.log @@ -190,7 +190,7 @@ Target platform is c64basic / MOS6502X // Tests creating a literal pointer from two bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -286,7 +286,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating a literal pointer from two bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -367,17 +367,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction puta_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction puta_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-pointer-2.log b/src/test/ref/inline-pointer-2.log index eb3f779fb..f10f718dd 100644 --- a/src/test/ref/inline-pointer-2.log +++ b/src/test/ref/inline-pointer-2.log @@ -127,7 +127,7 @@ Target platform is c64basic / MOS6502X // Tests creating a literal pointer from two bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -173,7 +173,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating a literal pointer from two bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -213,14 +213,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log index 154bb5239..2d89ca96e 100644 --- a/src/test/ref/inline-string-2.log +++ b/src/test/ref/inline-string-2.log @@ -359,7 +359,7 @@ Target platform is c64basic / MOS6502X // Inline Strings in assignments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 3 @@ -534,7 +534,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Inline Strings in assignments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -700,6 +700,7 @@ Removing instruction print_from___b2: Removing instruction __b1_from_print: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_msg_from_main: Removing instruction __b1: @@ -708,11 +709,8 @@ Removing instruction __b2_from_print_msg: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-string-3.log b/src/test/ref/inline-string-3.log index 0d9c4a408..3569cdd0f 100644 --- a/src/test/ref/inline-string-3.log +++ b/src/test/ref/inline-string-3.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Erroneously tries to inline the string completely leading to a CompileError // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -179,7 +179,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Erroneously tries to inline the string completely leading to a CompileError // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -234,14 +234,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-string-4.log b/src/test/ref/inline-string-4.log index 4a3a74f3f..72d04a931 100644 --- a/src/test/ref/inline-string-4.log +++ b/src/test/ref/inline-string-4.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // Test casting the address of an inline string to a dword. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -185,7 +185,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test casting the address of an inline string to a dword. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -248,15 +248,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-string.log b/src/test/ref/inline-string.log index 1f1ebcce4..c5236d09a 100644 --- a/src/test/ref/inline-string.log +++ b/src/test/ref/inline-string.log @@ -257,7 +257,7 @@ Target platform is c64basic / MOS6502X // Inline Strings in method calls are automatically converted to local constant variables byte st[] = "..."; - generating an ASM .text). // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -398,7 +398,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Inline Strings in method calls are automatically converted to local constant variables byte st[] = "..."; - generating an ASM .text). // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -542,6 +542,7 @@ Removing instruction print_from___b2: Removing instruction __b1_from_print: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -549,11 +550,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-word-0.log b/src/test/ref/inline-word-0.log index 3cbcf780e..85ae3a9f8 100644 --- a/src/test/ref/inline-word-0.log +++ b/src/test/ref/inline-word-0.log @@ -96,7 +96,7 @@ Target platform is c64basic / MOS6502X // Tests minimal inline word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -145,7 +145,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests minimal inline word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -188,14 +188,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-word-1.log b/src/test/ref/inline-word-1.log index 49d283b06..8bc13cf45 100644 --- a/src/test/ref/inline-word-1.log +++ b/src/test/ref/inline-word-1.log @@ -96,7 +96,7 @@ Target platform is c64basic / MOS6502X // Tests minimal inline word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -145,7 +145,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests minimal inline word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -188,14 +188,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-word-2.log b/src/test/ref/inline-word-2.log index 49d283b06..8bc13cf45 100644 --- a/src/test/ref/inline-word-2.log +++ b/src/test/ref/inline-word-2.log @@ -96,7 +96,7 @@ Target platform is c64basic / MOS6502X // Tests minimal inline word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -145,7 +145,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests minimal inline word // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -188,14 +188,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inline-word.log b/src/test/ref/inline-word.log index 7b85822ee..1451072c6 100644 --- a/src/test/ref/inline-word.log +++ b/src/test/ref/inline-word.log @@ -196,7 +196,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -307,7 +307,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -405,19 +405,17 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inlinearrayproblem.log b/src/test/ref/inlinearrayproblem.log index 5bfe83467..31af5d2a5 100644 --- a/src/test/ref/inlinearrayproblem.log +++ b/src/test/ref/inlinearrayproblem.log @@ -125,7 +125,7 @@ Target platform is c64basic / MOS6502X // The following places the text at the start of the main-function - and JSR's straight into the text - not the code. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -206,7 +206,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The following places the text at the start of the main-function - and JSR's straight into the text - not the code. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -274,17 +274,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inmem-const-array.log b/src/test/ref/inmem-const-array.log index 2c28438f7..d7b893c68 100644 --- a/src/test/ref/inmem-const-array.log +++ b/src/test/ref/inmem-const-array.log @@ -198,7 +198,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const WHITE = 1 @@ -310,7 +310,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const WHITE = 1 @@ -410,19 +410,17 @@ Removing instruction __b3_from___b1: Removing instruction __b3: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inmemarray.log b/src/test/ref/inmemarray.log index dfa5f1a85..b24bd8f4b 100644 --- a/src/test/ref/inmemarray.log +++ b/src/test/ref/inmemarray.log @@ -191,7 +191,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -293,7 +293,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -386,19 +386,17 @@ Removing instruction __b3_from___b1: Removing instruction __b3: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inmemstring.log b/src/test/ref/inmemstring.log index 9397dea95..346d5182b 100644 --- a/src/test/ref/inmemstring.log +++ b/src/test/ref/inmemstring.log @@ -192,7 +192,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -307,7 +307,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -415,19 +415,17 @@ Removing instruction __b3_from___b1: Removing instruction __b3: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/inner-increment-problem.log b/src/test/ref/inner-increment-problem.log index 98be78ed3..35a984138 100644 --- a/src/test/ref/inner-increment-problem.log +++ b/src/test/ref/inner-increment-problem.log @@ -150,7 +150,7 @@ Target platform is c64basic / MOS6502X // Inner increment is not being done properly (screen++) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -251,7 +251,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Inner increment is not being done properly (screen++) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -347,17 +347,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/int-conversion.log b/src/test/ref/int-conversion.log index 525dca83b..53454b809 100644 --- a/src/test/ref/int-conversion.log +++ b/src/test/ref/int-conversion.log @@ -1633,7 +1633,7 @@ Target platform is c64basic / MOS6502X // Tests different integer literal types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -2497,7 +2497,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests different integer literal types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -3447,6 +3447,7 @@ Removing instruction assertType_from___b4: Removing instruction __b5_from___b4: Removing instruction assertType_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -3505,11 +3506,8 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/int-literals.log b/src/test/ref/int-literals.log index f2a802153..cd21b7529 100644 --- a/src/test/ref/int-literals.log +++ b/src/test/ref/int-literals.log @@ -750,7 +750,7 @@ Target platform is c64basic / MOS6502X // Tests different integer literal types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -1158,7 +1158,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests different integer literal types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RED = 2 @@ -1557,6 +1557,7 @@ Removing instruction assertType_from___b13: Removing instruction __b14_from___b13: Removing instruction assertType_from___b14: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -1581,11 +1582,8 @@ Removing instruction __breturn: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-hardware-clobber-jsr.log b/src/test/ref/irq-hardware-clobber-jsr.log index 2be5390f9..838c8f103 100644 --- a/src/test/ref/irq-hardware-clobber-jsr.log +++ b/src/test/ref/irq-hardware-clobber-jsr.log @@ -361,7 +361,7 @@ Target platform is c64basic / MOS6502X // A minimal working raster hardware IRQ with clobber-based register savings // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Value that disables all CIA interrupts when stored to the CIA Interrupt registers @@ -531,7 +531,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working raster hardware IRQ with clobber-based register savings // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Value that disables all CIA interrupts when stored to the CIA Interrupt registers @@ -665,14 +665,12 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-hardware-clobber.log b/src/test/ref/irq-hardware-clobber.log index 75c8e07a6..a8cdcd5bb 100644 --- a/src/test/ref/irq-hardware-clobber.log +++ b/src/test/ref/irq-hardware-clobber.log @@ -163,7 +163,7 @@ Target platform is c64basic / MOS6502X // A minimal working raster hardware IRQ with clobber-based register savings // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -308,7 +308,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working raster hardware IRQ with clobber-based register savings // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -424,13 +424,11 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-hardware-stack.log b/src/test/ref/irq-hardware-stack.log index 647535c1f..85dc4b981 100644 --- a/src/test/ref/irq-hardware-stack.log +++ b/src/test/ref/irq-hardware-stack.log @@ -163,7 +163,7 @@ Target platform is c64basic / MOS6502X // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -302,7 +302,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -424,14 +424,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-hardware.log b/src/test/ref/irq-hardware.log index 6f8355687..78dd660b5 100644 --- a/src/test/ref/irq-hardware.log +++ b/src/test/ref/irq-hardware.log @@ -163,7 +163,7 @@ Target platform is c64basic / MOS6502X // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -301,7 +301,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -423,13 +423,11 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-kernel-minimal.log b/src/test/ref/irq-kernel-minimal.log index f48863833..a8441c14d 100644 --- a/src/test/ref/irq-kernel-minimal.log +++ b/src/test/ref/irq-kernel-minimal.log @@ -273,7 +273,7 @@ Target platform is c64basic / MOS6502X // A minimal working IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The colors of the C64 @@ -357,7 +357,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The colors of the C64 @@ -426,15 +426,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-kernel.log b/src/test/ref/irq-kernel.log index b30faac60..9327738f9 100644 --- a/src/test/ref/irq-kernel.log +++ b/src/test/ref/irq-kernel.log @@ -136,7 +136,7 @@ Target platform is c64basic / MOS6502X // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -244,7 +244,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -338,15 +338,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-local-var-overlap-problem.log b/src/test/ref/irq-local-var-overlap-problem.log index 4185c96ab..90a82dd81 100644 --- a/src/test/ref/irq-local-var-overlap-problem.log +++ b/src/test/ref/irq-local-var-overlap-problem.log @@ -846,7 +846,7 @@ Target platform is c64basic / MOS6502X // Illustrates a problem where local variables inside an IRQ are assigned the same zeropage as a variable outside the IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -1376,7 +1376,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates a problem where local variables inside an IRQ are assigned the same zeropage as a variable outside the IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -1837,6 +1837,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sub_main_from___b3: Removing instruction __b6: @@ -1858,7 +1859,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b1 in bne __b7 @@ -1882,7 +1882,6 @@ Removing instruction lda #$b Removing instruction lda #$b Removing instruction lda #$b Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b7: Succesful ASM optimization Pass5UnusedLabelElimination Removing unreachable instruction jmp __b1 diff --git a/src/test/ref/irq-raster.log b/src/test/ref/irq-raster.log index d311a009e..b57cfd68b 100644 --- a/src/test/ref/irq-raster.log +++ b/src/test/ref/irq-raster.log @@ -136,7 +136,7 @@ Target platform is c64basic / MOS6502X // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -244,7 +244,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A minimal working raster IRQ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -338,15 +338,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/irq-volatile-bool-problem.log b/src/test/ref/irq-volatile-bool-problem.log index d6a602398..3ee13723a 100644 --- a/src/test/ref/irq-volatile-bool-problem.log +++ b/src/test/ref/irq-volatile-bool-problem.log @@ -204,7 +204,7 @@ Target platform is c64basic / MOS6502X // because it is assigned to the A register // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -327,7 +327,7 @@ ASSEMBLER BEFORE OPTIMIZATION // because it is assigned to the A register // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const IRQ_RASTER = 1 @@ -441,16 +441,15 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from_irq: Removing instruction __b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction bcc __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/iterarray.log b/src/test/ref/iterarray.log index b34547224..7b697fc6a 100644 --- a/src/test/ref/iterarray.log +++ b/src/test/ref/iterarray.log @@ -147,7 +147,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -220,7 +220,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -285,17 +285,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/kc-ka-string-encoding.log b/src/test/ref/kc-ka-string-encoding.log index 8d392f750..1246cb3c2 100644 --- a/src/test/ref/kc-ka-string-encoding.log +++ b/src/test/ref/kc-ka-string-encoding.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -177,7 +177,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -233,13 +233,11 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/keyboard-glitch.log b/src/test/ref/keyboard-glitch.log index 36dcf5646..11b1771b6 100644 --- a/src/test/ref/keyboard-glitch.log +++ b/src/test/ref/keyboard-glitch.log @@ -755,7 +755,7 @@ Target platform is c64basic / MOS6502X // but never when they are disabled (red border) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_E = $e @@ -1113,7 +1113,7 @@ ASSEMBLER BEFORE OPTIMIZATION // but never when they are disabled (red border) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_E = $e @@ -1387,6 +1387,7 @@ Removing instruction __b1_from_pressed: Removing instruction __b1_from___b2: Removing instruction keyboard_key_pressed_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b8: Removing instruction __b5: @@ -1399,13 +1400,11 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/kickasm-uses-prevent-deletion.log b/src/test/ref/kickasm-uses-prevent-deletion.log index 5009ea399..862b3778a 100644 --- a/src/test/ref/kickasm-uses-prevent-deletion.log +++ b/src/test/ref/kickasm-uses-prevent-deletion.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Ensure that an inline kickasm uses-clause is anough to prevent a function from being deleted // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BLACK = 0 @@ -186,7 +186,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Ensure that an inline kickasm uses-clause is anough to prevent a function from being deleted // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const BLACK = 0 @@ -252,15 +252,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/line-anim.log b/src/test/ref/line-anim.log index eda09cca0..b198aee4d 100644 --- a/src/test/ref/line-anim.log +++ b/src/test/ref/line-anim.log @@ -2549,7 +2549,7 @@ Target platform is c64basic / MOS6502X // Animated lines drawn on a single color bitmap // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -3907,7 +3907,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Animated lines drawn on a single color bitmap // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const VIC_BMM = $20 @@ -4959,6 +4959,7 @@ Removing instruction __b3_from___b4: Removing instruction __b4_from___b3: Removing instruction __b4_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction vicSelectGfxBank1: Removing instruction vicSelectGfxBank1___b1: @@ -4998,7 +4999,6 @@ Removing instruction __b3_from___b2: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __breturn in beq __b5 @@ -5014,7 +5014,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b5: Succesful ASM optimization Pass5UnusedLabelElimination Removing unreachable instruction rts diff --git a/src/test/ref/linegen.log b/src/test/ref/linegen.log index 922e4cb41..727997a08 100644 --- a/src/test/ref/linegen.log +++ b/src/test/ref/linegen.log @@ -2343,7 +2343,7 @@ Target platform is c64basic / MOS6502X // Work in progress towards a sinus generator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -3515,7 +3515,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Work in progress towards a sinus generator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -4593,6 +4593,7 @@ Removing instruction __b3_from___b2: Removing instruction __b3_from___b5: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction lin16u_gen_from_main: Removing instruction __b4: @@ -4658,13 +4659,10 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __b6: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/literal-char-minus-number.log b/src/test/ref/literal-char-minus-number.log index 045172b3d..a2b7b552f 100644 --- a/src/test/ref/literal-char-minus-number.log +++ b/src/test/ref/literal-char-minus-number.log @@ -85,7 +85,7 @@ Target platform is c64basic / MOS6502X // Tests subtracting a number from a literal char // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -131,7 +131,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests subtracting a number from a literal char // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -171,14 +171,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/literal-strings.log b/src/test/ref/literal-strings.log index 5302fbc05..6d441fab1 100644 --- a/src/test/ref/literal-strings.log +++ b/src/test/ref/literal-strings.log @@ -128,7 +128,7 @@ Target platform is c64basic / MOS6502X // Tests literal strings with and without zero-termination // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -208,7 +208,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests literal strings with and without zero-termination // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -276,17 +276,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/literal-word-pointer-0.log b/src/test/ref/literal-word-pointer-0.log index 70cdd32d1..f6021cc2a 100644 --- a/src/test/ref/literal-word-pointer-0.log +++ b/src/test/ref/literal-word-pointer-0.log @@ -115,7 +115,7 @@ Target platform is c64basic / MOS6502X // Tests assigning a literal word pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -178,7 +178,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests assigning a literal word pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -235,15 +235,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/literals.log b/src/test/ref/literals.log index ed494165e..d704f6f41 100644 --- a/src/test/ref/literals.log +++ b/src/test/ref/literals.log @@ -155,7 +155,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const ch = 'a' @@ -244,7 +244,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const ch = 'a' @@ -317,17 +317,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-1.log b/src/test/ref/liverange-1.log index ead0d6f71..eeaa190a0 100644 --- a/src/test/ref/liverange-1.log +++ b/src/test/ref/liverange-1.log @@ -193,7 +193,7 @@ Target platform is c64basic / MOS6502X // The idx-variable is alive between the two calls to out() - but not before the first call. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -282,7 +282,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The idx-variable is alive between the two calls to out() - but not before the first call. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -359,17 +359,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction out_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction out_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-10.log b/src/test/ref/liverange-10.log index 331deb20a..6ce3b3b71 100644 --- a/src/test/ref/liverange-10.log +++ b/src/test/ref/liverange-10.log @@ -603,7 +603,7 @@ Target platform is c64basic / MOS6502X // Here outsw::sw and outw::w should have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -956,7 +956,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here outsw::sw and outw::w should have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -1244,6 +1244,7 @@ Removing instruction __b1_from_outsw: Removing instruction __b1_from___b3: Removing instruction outw_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -1263,14 +1264,11 @@ Removing instruction __b2: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-2.log b/src/test/ref/liverange-2.log index 39d13e907..c1733df46 100644 --- a/src/test/ref/liverange-2.log +++ b/src/test/ref/liverange-2.log @@ -290,7 +290,7 @@ Target platform is c64basic / MOS6502X // main::b and main::c should be allocated to hardware registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -446,7 +446,7 @@ ASSEMBLER BEFORE OPTIMIZATION // main::b and main::c should be allocated to hardware registers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -580,6 +580,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -588,15 +589,12 @@ Removing instruction __b5: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-3.log b/src/test/ref/liverange-3.log index 21ee9013d..21a95c69d 100644 --- a/src/test/ref/liverange-3.log +++ b/src/test/ref/liverange-3.log @@ -297,7 +297,7 @@ Target platform is c64basic / MOS6502X // Here main::b should be allocated to the same register as print::b and main::ca to the same register as print::ca // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -455,7 +455,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here main::b should be allocated to the same register as print::b and main::ca to the same register as print::ca // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -591,6 +591,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -599,15 +600,12 @@ Removing instruction __b5: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-4.log b/src/test/ref/liverange-4.log index decf4c862..8f92ed4a5 100644 --- a/src/test/ref/liverange-4.log +++ b/src/test/ref/liverange-4.log @@ -339,7 +339,7 @@ Target platform is c64basic / MOS6502X // Here out::b, print::b and main::b can have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -518,7 +518,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here out::b, print::b and main::b can have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -666,6 +666,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -675,15 +676,12 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-5.log b/src/test/ref/liverange-5.log index 0bfe2d283..b1d065c78 100644 --- a/src/test/ref/liverange-5.log +++ b/src/test/ref/liverange-5.log @@ -346,7 +346,7 @@ Target platform is c64basic / MOS6502X // Here out::b, print::b and main::b can have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -527,7 +527,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here out::b, print::b and main::b can have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -677,6 +677,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -686,15 +687,12 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-6.log b/src/test/ref/liverange-6.log index d502be442..cb180a8e5 100644 --- a/src/test/ref/liverange-6.log +++ b/src/test/ref/liverange-6.log @@ -212,7 +212,7 @@ Target platform is c64basic / MOS6502X // out::c should be a hardware register, main::i should be a hardware register, global idx should be a hardware register // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -313,7 +313,7 @@ ASSEMBLER BEFORE OPTIMIZATION // out::c should be a hardware register, main::i should be a hardware register, global idx should be a hardware register // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -399,19 +399,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-7.log b/src/test/ref/liverange-7.log index 843cbc8e7..e18b879bf 100644 --- a/src/test/ref/liverange-7.log +++ b/src/test/ref/liverange-7.log @@ -261,7 +261,7 @@ Target platform is c64basic / MOS6502X // Here main::c, out2::c and out::c can all have the same allocation - and the global idx can be allocated to a hardware register. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -377,7 +377,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here main::c, out2::c and out::c can all have the same allocation - and the global idx can be allocated to a hardware register. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -475,6 +475,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -482,13 +483,10 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-8.log b/src/test/ref/liverange-8.log index 7d55fb566..a4180e45a 100644 --- a/src/test/ref/liverange-8.log +++ b/src/test/ref/liverange-8.log @@ -287,7 +287,7 @@ Target platform is c64basic / MOS6502X // Here main::c, out2::c and out::c can all have the same allocation - and the global idx can be allocated to a hardware register. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -419,7 +419,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here main::c, out2::c and out::c can all have the same allocation - and the global idx can be allocated to a hardware register. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -533,6 +533,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Removing instruction out_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -542,13 +543,10 @@ Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-9.log b/src/test/ref/liverange-9.log index 9c8010e71..b563a30b3 100644 --- a/src/test/ref/liverange-9.log +++ b/src/test/ref/liverange-9.log @@ -377,7 +377,7 @@ Target platform is c64basic / MOS6502X // Here main::c, outsw::c and outw::c can all have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -552,7 +552,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Here main::c, outsw::c and outw::c can all have the same allocation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -697,6 +697,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Removing instruction outsw_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -710,13 +711,10 @@ Removing instruction out_from___b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange-call-problem.log b/src/test/ref/liverange-call-problem.log index 34c575116..15d0d6bfe 100644 --- a/src/test/ref/liverange-call-problem.log +++ b/src/test/ref/liverange-call-problem.log @@ -298,7 +298,7 @@ Target platform is c64basic / MOS6502X // w1 and w2 ended up having the same zero-page register as their live range was not propagated properly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -436,7 +436,7 @@ ASSEMBLER BEFORE OPTIMIZATION // w1 and w2 ended up having the same zero-page register as their live range was not propagated properly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -576,6 +576,7 @@ Removing instruction incw1_from___b2: Removing instruction __b3_from___b2: Removing instruction incw2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction incw1_from_main: Removing instruction __b1: @@ -586,11 +587,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/liverange.log b/src/test/ref/liverange.log index 0e4781972..ddb2189fd 100644 --- a/src/test/ref/liverange.log +++ b/src/test/ref/liverange.log @@ -264,7 +264,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label i = 2 @@ -395,7 +395,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -486,6 +486,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction inci_from_main: Removing instruction __b1: @@ -494,11 +495,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/local-string.log b/src/test/ref/local-string.log index 0e979ea4f..21d8a3e6f 100644 --- a/src/test/ref/local-string.log +++ b/src/test/ref/local-string.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // Local constant strings are placed at the start of the method. This means the generated ASM jumps / calls straignt into the constant string // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -202,7 +202,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Local constant strings are placed at the start of the method. This means the generated ASM jumps / calls straignt into the constant string // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -267,16 +267,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/localscope-loops.log b/src/test/ref/localscope-loops.log index 1039226a9..aa8e0192a 100644 --- a/src/test/ref/localscope-loops.log +++ b/src/test/ref/localscope-loops.log @@ -176,7 +176,7 @@ Target platform is c64basic / MOS6502X // Illustrates introducing local scopes inside loops etc // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -274,7 +274,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates introducing local scopes inside loops etc // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -358,19 +358,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/localscope-simple.log b/src/test/ref/localscope-simple.log index 8a4707f69..8ab4809c4 100644 --- a/src/test/ref/localscope-simple.log +++ b/src/test/ref/localscope-simple.log @@ -78,7 +78,7 @@ Target platform is c64basic / MOS6502X // Tests anonymous scopes inside functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -130,7 +130,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests anonymous scopes inside functions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -175,14 +175,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/long-pointer-0.log b/src/test/ref/long-pointer-0.log index 69f079430..26561d174 100644 --- a/src/test/ref/long-pointer-0.log +++ b/src/test/ref/long-pointer-0.log @@ -80,7 +80,7 @@ Target platform is c64basic / MOS6502X // Tests creating a long (32bit) pointer on zeropage for 45GS02 flat memory access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -139,7 +139,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating a long (32bit) pointer on zeropage for 45GS02 flat memory access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -190,14 +190,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/long-pointer-1.log b/src/test/ref/long-pointer-1.log index 5dbc441d0..6faa0b885 100644 --- a/src/test/ref/long-pointer-1.log +++ b/src/test/ref/long-pointer-1.log @@ -80,7 +80,7 @@ Target platform is c64basic / MOS6502X // Tests creating a long (32bit) pointer on zeropage for 45GS02 flat memory access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -139,7 +139,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests creating a long (32bit) pointer on zeropage for 45GS02 flat memory access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -190,14 +190,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/longjump.log b/src/test/ref/longjump.log index 5d6fb6e38..596d31445 100644 --- a/src/test/ref/longjump.log +++ b/src/test/ref/longjump.log @@ -121,7 +121,7 @@ Target platform is c64basic / MOS6502X // Minimal example program generating a long jump // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -446,7 +446,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal example program generating a long jump // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -765,17 +765,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [268] bne __b1 to beq FINAL SYMBOL TABLE diff --git a/src/test/ref/longjump2.log b/src/test/ref/longjump2.log index 6f2bf8da3..37d47213e 100644 --- a/src/test/ref/longjump2.log +++ b/src/test/ref/longjump2.log @@ -221,7 +221,7 @@ Target platform is c64basic / MOS6502X // Minimal example program generating two long jumps // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -861,7 +861,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal example program generating two long jumps // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1494,6 +1494,7 @@ Removing instruction long2_from___b1: Removing instruction __b1_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction long1_from_main: Removing instruction __b1: @@ -1503,14 +1504,11 @@ Removing instruction __breturn: Removing instruction __b1_from_long1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [273] bne __b1 to beq Fixing long branch [542] bne __b1 to beq diff --git a/src/test/ref/loop-break-continue.log b/src/test/ref/loop-break-continue.log index 125ac1238..af269c0e2 100644 --- a/src/test/ref/loop-break-continue.log +++ b/src/test/ref/loop-break-continue.log @@ -202,7 +202,7 @@ Target platform is c64basic / MOS6502X // Prints a message ending at NUL skipping all spaces // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -317,7 +317,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Prints a message ending at NUL skipping all spaces // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -416,16 +416,14 @@ Removing instruction __bend_from___b1: Removing instruction __b4_from___b2: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-break-nested.log b/src/test/ref/loop-break-nested.log index 3ed28ec84..3bb3eb479 100644 --- a/src/test/ref/loop-break-nested.log +++ b/src/test/ref/loop-break-nested.log @@ -216,7 +216,7 @@ Target platform is c64basic / MOS6502X // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -346,7 +346,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -461,13 +461,13 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __b4: Removing instruction __b1_from___b5: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b3_from___b2 to __b2 @@ -476,8 +476,6 @@ Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #'a' Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-break.log b/src/test/ref/loop-break.log index 3585506b7..e2a8c348f 100644 --- a/src/test/ref/loop-break.log +++ b/src/test/ref/loop-break.log @@ -135,7 +135,7 @@ Target platform is c64basic / MOS6502X // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -216,7 +216,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -286,17 +286,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-continue.log b/src/test/ref/loop-continue.log index f011996ef..1cec92738 100644 --- a/src/test/ref/loop-continue.log +++ b/src/test/ref/loop-continue.log @@ -144,7 +144,7 @@ Target platform is c64basic / MOS6502X // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -225,7 +225,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -298,18 +298,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-for-continue.log b/src/test/ref/loop-for-continue.log index 75c851aad..39c4ce914 100644 --- a/src/test/ref/loop-for-continue.log +++ b/src/test/ref/loop-for-continue.log @@ -183,7 +183,7 @@ Target platform is c64basic / MOS6502X // Tests continue statement in a simple for()-loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -288,7 +288,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests continue statement in a simple for()-loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -377,17 +377,15 @@ Removing instruction __bend_from___b1: Removing instruction __b4_from___b2: Removing instruction __b4_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b3: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-for-empty-body.log b/src/test/ref/loop-for-empty-body.log index 997bb8f04..133d39ac0 100644 --- a/src/test/ref/loop-for-empty-body.log +++ b/src/test/ref/loop-for-empty-body.log @@ -143,7 +143,7 @@ Target platform is c64basic / MOS6502X // Test a for-loop with an empty body // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -230,7 +230,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a for-loop with an empty body // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -302,17 +302,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-for-sideeffect.log b/src/test/ref/loop-for-sideeffect.log index a68ac2c9b..792a43c0b 100644 --- a/src/test/ref/loop-for-sideeffect.log +++ b/src/test/ref/loop-for-sideeffect.log @@ -148,7 +148,7 @@ Target platform is c64basic / MOS6502X // Currently not standard C compliant (since the condition is not evaluated before the body) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -235,7 +235,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Currently not standard C compliant (since the condition is not evaluated before the body) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -308,17 +308,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-memset-min.log b/src/test/ref/loop-memset-min.log index 39877a824..278bab5bf 100644 --- a/src/test/ref/loop-memset-min.log +++ b/src/test/ref/loop-memset-min.log @@ -267,7 +267,7 @@ Target platform is c64basic / MOS6502X // Minimal classic for() loop - coded using while() to test optimization of loop heads // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -366,7 +366,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal classic for() loop - coded using while() to test optimization of loop heads // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -458,6 +458,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction memset_from_main: Removing instruction __breturn: @@ -465,11 +466,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-problem.log b/src/test/ref/loop-problem.log index f176959ce..18d44ba84 100644 --- a/src/test/ref/loop-problem.log +++ b/src/test/ref/loop-problem.log @@ -186,7 +186,7 @@ Target platform is c64basic / MOS6502X // A simple loop results in NullPointerException during loop analysis // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -290,7 +290,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A simple loop results in NullPointerException during loop analysis // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -389,6 +389,7 @@ Removing instruction __b1_from_main: Removing instruction b_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: @@ -397,13 +398,10 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-problem2.log b/src/test/ref/loop-problem2.log index d2cb5d4a6..f22c31f91 100644 --- a/src/test/ref/loop-problem2.log +++ b/src/test/ref/loop-problem2.log @@ -237,7 +237,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BORDER_COLOR = $d020 @@ -372,7 +372,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BORDER_COLOR = $d020 @@ -498,6 +498,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction mode_ctrl_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -507,11 +508,8 @@ Removing instruction __b1_from_print_cls: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-while-continue.log b/src/test/ref/loop-while-continue.log index cbc046f4f..3d00a07e2 100644 --- a/src/test/ref/loop-while-continue.log +++ b/src/test/ref/loop-while-continue.log @@ -141,7 +141,7 @@ Target platform is c64basic / MOS6502X // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests break statement in a simple loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -298,18 +298,16 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-while-min.log b/src/test/ref/loop-while-min.log index f19f49a4e..cdce41709 100644 --- a/src/test/ref/loop-while-min.log +++ b/src/test/ref/loop-while-min.log @@ -123,7 +123,7 @@ Target platform is c64basic / MOS6502X // Minimal classic while() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal classic while() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -255,16 +255,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop-while-sideeffect.log b/src/test/ref/loop-while-sideeffect.log index d2369bd37..169c41dbe 100644 --- a/src/test/ref/loop-while-sideeffect.log +++ b/src/test/ref/loop-while-sideeffect.log @@ -137,7 +137,7 @@ Target platform is c64basic / MOS6502X // Test a while()-loop where the condition has a side-effect // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a while()-loop where the condition has a side-effect // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -296,17 +296,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loop100.log b/src/test/ref/loop100.log index 256aae46b..d8fbe35d8 100644 --- a/src/test/ref/loop100.log +++ b/src/test/ref/loop100.log @@ -118,7 +118,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -182,7 +182,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -240,16 +240,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loophead-problem-2.log b/src/test/ref/loophead-problem-2.log index 7a92ad864..375a0119c 100644 --- a/src/test/ref/loophead-problem-2.log +++ b/src/test/ref/loophead-problem-2.log @@ -343,7 +343,7 @@ Target platform is c64basic / MOS6502X // Caused by constant loop head unroll // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -547,7 +547,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Caused by constant loop head unroll // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -692,6 +692,7 @@ Removing instruction __bend_from___b1: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction scan_for_lowest_from_main: Removing instruction __b1: @@ -701,11 +702,8 @@ Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loophead-problem-3.log b/src/test/ref/loophead-problem-3.log index fcabcf7f1..00cfc92d1 100644 --- a/src/test/ref/loophead-problem-3.log +++ b/src/test/ref/loophead-problem-3.log @@ -526,7 +526,7 @@ Target platform is c64basic / MOS6502X // Reported by Richard-William Loerakker // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BORDER_COLOR = $d020 @@ -744,7 +744,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Reported by Richard-William Loerakker // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BORDER_COLOR = $d020 @@ -913,6 +913,7 @@ Removing instruction __bend_from___b1: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mul16u_from_main: Removing instruction __b1: @@ -922,11 +923,8 @@ Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loophead-problem.log b/src/test/ref/loophead-problem.log index 512152c22..62c809bdf 100644 --- a/src/test/ref/loophead-problem.log +++ b/src/test/ref/loophead-problem.log @@ -223,7 +223,7 @@ Target platform is c64basic / MOS6502X // The Unroller gets the verwions for opcode wrong because it misses the fact that it is modified inside call to popup_selector() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -331,7 +331,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The Unroller gets the verwions for opcode wrong because it misses the fact that it is modified inside call to popup_selector() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -417,6 +417,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction popup_selector_from_main: Removing instruction __b1: @@ -425,13 +426,10 @@ Removing instruction __b1_from_popup_selector: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction lda #'b' Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loopmin.log b/src/test/ref/loopmin.log index 43c64762d..fc152a893 100644 --- a/src/test/ref/loopmin.log +++ b/src/test/ref/loopmin.log @@ -183,7 +183,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -272,7 +272,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -355,18 +355,16 @@ Removing instruction __b1_from___b2: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loopnest.log b/src/test/ref/loopnest.log index 40252651c..d94849f4d 100644 --- a/src/test/ref/loopnest.log +++ b/src/test/ref/loopnest.log @@ -181,7 +181,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -282,7 +282,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -380,6 +380,7 @@ Removing instruction __b1_from___b2: Removing instruction nest_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -387,14 +388,11 @@ Removing instruction __breturn: Removing instruction __b1_from_nest: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loopnest2.log b/src/test/ref/loopnest2.log index 5ec645db6..97c7b5538 100644 --- a/src/test/ref/loopnest2.log +++ b/src/test/ref/loopnest2.log @@ -386,7 +386,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -595,7 +595,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -809,6 +809,7 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: @@ -822,7 +823,6 @@ Removing instruction __b1_from_nest2: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -832,8 +832,6 @@ Removing instruction jmp __b2 Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loopnest3.log b/src/test/ref/loopnest3.log index 77c3085f8..b8408233a 100644 --- a/src/test/ref/loopnest3.log +++ b/src/test/ref/loopnest3.log @@ -239,7 +239,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -367,7 +367,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -480,6 +480,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -489,14 +490,11 @@ Removing instruction __breturn: Removing instruction __b1_from_c: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/loopsplit.log b/src/test/ref/loopsplit.log index 6bd902ba1..54336a427 100644 --- a/src/test/ref/loopsplit.log +++ b/src/test/ref/loopsplit.log @@ -192,7 +192,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -283,7 +283,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -368,20 +368,19 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b5: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b1 in jmp __b1_from___b5 Succesful ASM optimization Pass5DoubleJumpElimination Relabelling long label __b1_from___b5 to __b3 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: Removing instruction __b3: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/ma_coalesce_problem.log b/src/test/ref/ma_coalesce_problem.log index 9d6b2609b..b936b5767 100644 --- a/src/test/ref/ma_coalesce_problem.log +++ b/src/test/ref/ma_coalesce_problem.log @@ -155,7 +155,7 @@ Target platform is c64basic / MOS6502X // c1a is erroneously zp-coalesced with c1A // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -257,7 +257,7 @@ ASSEMBLER BEFORE OPTIMIZATION // c1a is erroneously zp-coalesced with c1A // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -341,14 +341,12 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/mem-alignment.log b/src/test/ref/mem-alignment.log index bf80c2636..e8c35767e 100644 --- a/src/test/ref/mem-alignment.log +++ b/src/test/ref/mem-alignment.log @@ -181,7 +181,7 @@ Target platform is c64basic / MOS6502X // Test that memory alignment of arrays work // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -289,7 +289,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that memory alignment of arrays work // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -381,19 +381,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/memcpy-0.log b/src/test/ref/memcpy-0.log index bdf9fc834..24fcf22d5 100644 --- a/src/test/ref/memcpy-0.log +++ b/src/test/ref/memcpy-0.log @@ -607,7 +607,7 @@ Target platform is c64basic / MOS6502X // Test memcpy - copy charset and screen using memcpy() from stdlib string // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // RAM in 0xA000, 0xE000 CHAR ROM in 0xD000 @@ -821,7 +821,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test memcpy - copy charset and screen using memcpy() from stdlib string // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // RAM in 0xA000, 0xE000 CHAR ROM in 0xD000 @@ -1011,6 +1011,7 @@ Removing instruction toD0181: Removing instruction __b1_from_memcpy: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction memcpy_from___b1: @@ -1020,11 +1021,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/memcpy-1.log b/src/test/ref/memcpy-1.log index ebdfb9ef4..81ebfa9a2 100644 --- a/src/test/ref/memcpy-1.log +++ b/src/test/ref/memcpy-1.log @@ -481,7 +481,7 @@ Target platform is c64basic / MOS6502X // Test memcpy on strings ( // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -784,7 +784,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test memcpy on strings ( // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -1050,6 +1050,7 @@ Removing instruction memcpy_from___b4: Removing instruction __b1_from_memcpy: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: @@ -1058,14 +1059,11 @@ Removing instruction __b4: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/memory-heap.log b/src/test/ref/memory-heap.log index 501cc38ef..590ce53f8 100644 --- a/src/test/ref/memory-heap.log +++ b/src/test/ref/memory-heap.log @@ -424,7 +424,7 @@ Target platform is c64basic / MOS6502X // Experiments with malloc() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Top of the heap used by malloc() @@ -632,7 +632,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Experiments with malloc() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Top of the heap used by malloc() @@ -810,6 +810,7 @@ Removing instruction free_from___b2: Removing instruction __b5_from___b2: Removing instruction free_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction malloc_from_main: Removing instruction __b3: @@ -822,13 +823,10 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/min-fmul-16.log b/src/test/ref/min-fmul-16.log index 08a6b89e8..6b944cd12 100644 --- a/src/test/ref/min-fmul-16.log +++ b/src/test/ref/min-fmul-16.log @@ -1192,7 +1192,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -1947,7 +1947,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label RASTER = $d012 @@ -2566,6 +2566,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction mulf_init_from_main: Removing instruction __b4: @@ -2598,13 +2599,10 @@ Removing instruction __b5_from___b8: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b8 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/mixed-array-0.log b/src/test/ref/mixed-array-0.log index 181fd698f..fd54c8b75 100644 --- a/src/test/ref/mixed-array-0.log +++ b/src/test/ref/mixed-array-0.log @@ -107,7 +107,7 @@ Target platform is c64basic / MOS6502X // Test an array with mixed byte/number types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -162,7 +162,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test an array with mixed byte/number types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -209,14 +209,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/mixed-array-1.log b/src/test/ref/mixed-array-1.log index e06f2fc9e..2100ecf48 100644 --- a/src/test/ref/mixed-array-1.log +++ b/src/test/ref/mixed-array-1.log @@ -107,7 +107,7 @@ Target platform is c64basic / MOS6502X // Test an array with mixed byte/number types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -162,7 +162,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test an array with mixed byte/number types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -209,14 +209,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/modglobal.log b/src/test/ref/modglobal.log index 20c9e8b39..5590c97d3 100644 --- a/src/test/ref/modglobal.log +++ b/src/test/ref/modglobal.log @@ -349,7 +349,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -489,7 +489,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -593,6 +593,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction inccnt_from_main: Removing instruction __b1: @@ -601,11 +602,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/modglobalmin.log b/src/test/ref/modglobalmin.log index c81868064..c401425c7 100644 --- a/src/test/ref/modglobalmin.log +++ b/src/test/ref/modglobalmin.log @@ -193,7 +193,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -288,7 +288,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -366,6 +366,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction inccnt_from_main: Removing instruction __b1: @@ -374,11 +375,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/mul8u-min.log b/src/test/ref/mul8u-min.log index b9f30a098..9f19f0c0c 100644 --- a/src/test/ref/mul8u-min.log +++ b/src/test/ref/mul8u-min.log @@ -446,7 +446,7 @@ Target platform is c64basic / MOS6502X // Minimal test of mul8u // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -690,7 +690,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal test of mul8u // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -888,6 +888,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: @@ -898,7 +899,6 @@ Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -906,8 +906,6 @@ Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/multiply-1.log b/src/test/ref/multiply-1.log index aba1a4e43..7c50a8ca3 100644 --- a/src/test/ref/multiply-1.log +++ b/src/test/ref/multiply-1.log @@ -132,7 +132,7 @@ Target platform is c64basic / MOS6502X // Compile-time multiplication // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -181,7 +181,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Compile-time multiplication // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -223,14 +223,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/multiply-16bit-const.log b/src/test/ref/multiply-16bit-const.log index 040662620..fdc363678 100644 --- a/src/test/ref/multiply-16bit-const.log +++ b/src/test/ref/multiply-16bit-const.log @@ -1498,7 +1498,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 6 @@ -2387,7 +2387,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 6 @@ -3079,6 +3079,7 @@ Removing instruction __b1_from_print_ulong_decimal: Removing instruction __b4_from___b7: Removing instruction ultoa_append_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -3112,11 +3113,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/multiply-2.log b/src/test/ref/multiply-2.log index 90aa0eb0c..815b3609c 100644 --- a/src/test/ref/multiply-2.log +++ b/src/test/ref/multiply-2.log @@ -179,7 +179,7 @@ Target platform is c64basic / MOS6502X // var*const multiplication - converted to shift/add // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -299,7 +299,7 @@ ASSEMBLER BEFORE OPTIMIZATION // var*const multiplication - converted to shift/add // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -378,16 +378,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/multiply-2s.log b/src/test/ref/multiply-2s.log index 6edd0452d..5c9863fc1 100644 --- a/src/test/ref/multiply-2s.log +++ b/src/test/ref/multiply-2s.log @@ -214,7 +214,7 @@ Target platform is c64basic / MOS6502X // Check that multiplication by factors of 2 is converted to shifts // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -350,7 +350,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Check that multiplication by factors of 2 is converted to shifts // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -439,17 +439,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/multiply-ns.log b/src/test/ref/multiply-ns.log index b4d6f1b48..4e8a0e920 100644 --- a/src/test/ref/multiply-ns.log +++ b/src/test/ref/multiply-ns.log @@ -468,7 +468,7 @@ Target platform is c64basic / MOS6502X // Check that multiplication by constants is converted to shift/add // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -923,7 +923,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Check that multiplication by constants is converted to shift/add // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1124,17 +1124,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [102] bne __b1 to beq FINAL SYMBOL TABLE diff --git a/src/test/ref/nes-array.log b/src/test/ref/nes-array.log index 62d388879..74da1e195 100644 --- a/src/test/ref/nes-array.log +++ b/src/test/ref/nes-array.log @@ -262,7 +262,7 @@ Target platform is c64basic / MOS6502X // https://forums.nesdev.com/viewtopic.php?f=2&t=18735 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -441,7 +441,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://forums.nesdev.com/viewtopic.php?f=2&t=18735 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -566,6 +566,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction foo_from_main: Removing instruction __b1: @@ -574,11 +575,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/no-recursion-heavy.log b/src/test/ref/no-recursion-heavy.log index d52f73ed1..5c236a09b 100644 --- a/src/test/ref/no-recursion-heavy.log +++ b/src/test/ref/no-recursion-heavy.log @@ -2779,7 +2779,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label ba = 2 @@ -3819,7 +3819,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label ba = 2 @@ -4998,6 +4998,7 @@ Removing instruction __b18: Removing instruction __b19_from___b9: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -5063,7 +5064,6 @@ Removing instruction fc_from___b18: Removing instruction __b19: Removing instruction __breturn_from___b19: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -5081,7 +5081,6 @@ Removing instruction bne __b8 Removing instruction bne __b9 Removing instruction bne __b19 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b1: Removing instruction __b2: Removing instruction __b3: diff --git a/src/test/ref/nomodify-4.log b/src/test/ref/nomodify-4.log index 20e1c489e..affaaf87b 100644 --- a/src/test/ref/nomodify-4.log +++ b/src/test/ref/nomodify-4.log @@ -133,7 +133,7 @@ Target platform is c64basic / MOS6502X // Test that a nomodify parameter works // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -212,7 +212,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that a nomodify parameter works // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -284,17 +284,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/noop-cast-elimination.log b/src/test/ref/noop-cast-elimination.log index 9d554bb4d..eb8f20422 100644 --- a/src/test/ref/noop-cast-elimination.log +++ b/src/test/ref/noop-cast-elimination.log @@ -154,7 +154,7 @@ Target platform is c64basic / MOS6502X // Test elimination of noop-casts (signed byte to byte) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -261,7 +261,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test elimination of noop-casts (signed byte to byte) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -351,17 +351,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/norom-charset.log b/src/test/ref/norom-charset.log index cbf5249ed..f8f739a37 100644 --- a/src/test/ref/norom-charset.log +++ b/src/test/ref/norom-charset.log @@ -524,7 +524,7 @@ Target platform is c64basic / MOS6502X // Generate a charset based on a 5x3 pattern stored in 2 bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label VIC_MEMORY = $d018 @@ -771,7 +771,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Generate a charset based on a 5x3 pattern stored in 2 bytes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label VIC_MEMORY = $d018 @@ -982,6 +982,7 @@ Removing instruction __b2_from___b3: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -994,14 +995,11 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/number-conversion.log b/src/test/ref/number-conversion.log index ac7394108..c86498a55 100644 --- a/src/test/ref/number-conversion.log +++ b/src/test/ref/number-conversion.log @@ -1383,7 +1383,7 @@ Target platform is c64basic / MOS6502X // See https://gitlab.com/camelot/kickc/issues/181 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const TYPEID_SIGNED_BYTE = 2 @@ -2070,7 +2070,7 @@ ASSEMBLER BEFORE OPTIMIZATION // See https://gitlab.com/camelot/kickc/issues/181 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const TYPEID_SIGNED_BYTE = 2 @@ -2818,6 +2818,7 @@ Removing instruction assertType_from___b33: Removing instruction __b34_from___b33: Removing instruction assertType_from___b34: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction assertType_from_main: Removing instruction __b1: @@ -2858,11 +2859,8 @@ Removing instruction __breturn: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/number-inference-sum.log b/src/test/ref/number-inference-sum.log index a4093e3e7..b130552b4 100644 --- a/src/test/ref/number-inference-sum.log +++ b/src/test/ref/number-inference-sum.log @@ -152,7 +152,7 @@ Target platform is c64basic / MOS6502X // Currently fails - because the compiler does not handle byte+byte correctly (not truncating the result to 8 bits) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -213,7 +213,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Currently fails - because the compiler does not handle byte+byte correctly (not truncating the result to 8 bits) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -267,15 +267,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/number-type.log b/src/test/ref/number-type.log index 203e02d58..bbbf82c68 100644 --- a/src/test/ref/number-type.log +++ b/src/test/ref/number-type.log @@ -512,7 +512,7 @@ Target platform is c64basic / MOS6502X // Tests the number type used for constant expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -688,7 +688,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the number type used for constant expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -835,17 +835,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/operator-lohi-problem-1.log b/src/test/ref/operator-lohi-problem-1.log index f3ceb89ca..97707e745 100644 --- a/src/test/ref/operator-lohi-problem-1.log +++ b/src/test/ref/operator-lohi-problem-1.log @@ -101,7 +101,7 @@ Target platform is c64basic / MOS6502X // - enabling the lo/hi to know that their operand is a word (from the cast). // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DVAL = $20000 @@ -156,7 +156,7 @@ ASSEMBLER BEFORE OPTIMIZATION // - enabling the lo/hi to know that their operand is a word (from the cast). // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const DVAL = $20000 @@ -200,14 +200,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/operator-lohi-problem.log b/src/test/ref/operator-lohi-problem.log index 0b0ee6f0d..4ec7fe0c0 100644 --- a/src/test/ref/operator-lohi-problem.log +++ b/src/test/ref/operator-lohi-problem.log @@ -165,7 +165,7 @@ Target platform is c64basic / MOS6502X // - enabling the lo/hi to know that their operand is a word (from the cast). // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -230,7 +230,7 @@ ASSEMBLER BEFORE OPTIMIZATION // - enabling the lo/hi to know that their operand is a word (from the cast). // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -282,14 +282,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/optimize-unsigned-comparisons.log b/src/test/ref/optimize-unsigned-comparisons.log index eaff5b5fe..85f61cf05 100644 --- a/src/test/ref/optimize-unsigned-comparisons.log +++ b/src/test/ref/optimize-unsigned-comparisons.log @@ -196,7 +196,7 @@ Target platform is c64basic / MOS6502X // These should be optimized to constants // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -263,7 +263,7 @@ ASSEMBLER BEFORE OPTIMIZATION // These should be optimized to constants // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -327,17 +327,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/overlap-allocation-2.log b/src/test/ref/overlap-allocation-2.log index adce96bb7..7143d381d 100644 --- a/src/test/ref/overlap-allocation-2.log +++ b/src/test/ref/overlap-allocation-2.log @@ -285,7 +285,7 @@ Target platform is c64basic / MOS6502X // Two levels of functions to test that register allocation handles live ranges and call-ranges optimally to allocate the fewest possible ZP-variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -447,7 +447,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Two levels of functions to test that register allocation handles live ranges and call-ranges optimally to allocate the fewest possible ZP-variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -590,6 +590,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Removing instruction __b2_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction line_from___b1: @@ -604,14 +605,11 @@ Removing instruction plot_from___b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/overlap-allocation.log b/src/test/ref/overlap-allocation.log index 12c148578..87b56fbf8 100644 --- a/src/test/ref/overlap-allocation.log +++ b/src/test/ref/overlap-allocation.log @@ -280,7 +280,7 @@ Target platform is c64basic / MOS6502X // Reason: Pass4RegisterUpliftCombinations.isAllocationOverlapping() believes i/j/k variables overlaps insode plot() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -440,7 +440,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Reason: Pass4RegisterUpliftCombinations.isAllocationOverlapping() believes i/j/k variables overlaps insode plot() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -583,6 +583,7 @@ Removing instruction plot_from___b2: Removing instruction __b3_from___b6: Removing instruction plot_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: @@ -593,15 +594,12 @@ Removing instruction __b6: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/parse-negated-struct-ref.log b/src/test/ref/parse-negated-struct-ref.log index 345c02605..48c88ae30 100644 --- a/src/test/ref/parse-negated-struct-ref.log +++ b/src/test/ref/parse-negated-struct-ref.log @@ -133,7 +133,7 @@ Target platform is c64basic / MOS6502X // https://gitlab.com/camelot/kickc/issues/266 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -202,7 +202,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://gitlab.com/camelot/kickc/issues/266 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -260,16 +260,15 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to !a+ in bne __b1 Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/plus-0.log b/src/test/ref/plus-0.log index aa9e1088d..a9e75b49c 100644 --- a/src/test/ref/plus-0.log +++ b/src/test/ref/plus-0.log @@ -346,7 +346,7 @@ Target platform is c64basic / MOS6502X // Tests elimination of plus 0 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -510,7 +510,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests elimination of plus 0 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -654,6 +654,7 @@ Removing instruction fill_from___b1: Removing instruction __b1_from___b3: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fill_from_main: Removing instruction __b1: @@ -664,13 +665,10 @@ Removing instruction __b2_2: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-anding.log b/src/test/ref/pointer-anding.log index 0cba5f6af..3fbb507ff 100644 --- a/src/test/ref/pointer-anding.log +++ b/src/test/ref/pointer-anding.log @@ -192,7 +192,7 @@ Target platform is c64basic / MOS6502X // Test binary ANDing pointers by Clay Cowgill // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -356,7 +356,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test binary ANDing pointers by Clay Cowgill // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -476,17 +476,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-cast-2.log b/src/test/ref/pointer-cast-2.log index 977262253..db4d76d0c 100644 --- a/src/test/ref/pointer-cast-2.log +++ b/src/test/ref/pointer-cast-2.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Tests casting pointer types to other pointer types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -189,7 +189,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests casting pointer types to other pointer types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -249,14 +249,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-cast-3.log b/src/test/ref/pointer-cast-3.log index ebeb961ac..18a4b8505 100644 --- a/src/test/ref/pointer-cast-3.log +++ b/src/test/ref/pointer-cast-3.log @@ -76,7 +76,7 @@ Target platform is c64basic / MOS6502X // Tests casting pointer types to other pointer types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -123,7 +123,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests casting pointer types to other pointer types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -164,14 +164,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-cast-4.log b/src/test/ref/pointer-cast-4.log index d1198a660..33d47967f 100644 --- a/src/test/ref/pointer-cast-4.log +++ b/src/test/ref/pointer-cast-4.log @@ -138,7 +138,7 @@ Target platform is c64basic / MOS6502X // Tests casting pointer types to other pointer types does not produce any ASM code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -220,7 +220,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests casting pointer types to other pointer types does not produce any ASM code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -289,17 +289,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-cast.log b/src/test/ref/pointer-cast.log index c6a1f1412..d93fee2e3 100644 --- a/src/test/ref/pointer-cast.log +++ b/src/test/ref/pointer-cast.log @@ -341,7 +341,7 @@ Target platform is c64basic / MOS6502X // Tests casting pointer types to other pointer types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -472,7 +472,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests casting pointer types to other pointer types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -582,14 +582,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-const-typedef.log b/src/test/ref/pointer-const-typedef.log index 5def332a3..9b0af7cc2 100644 --- a/src/test/ref/pointer-const-typedef.log +++ b/src/test/ref/pointer-const-typedef.log @@ -213,7 +213,7 @@ Target platform is c64basic / MOS6502X // Test pointer to const and const pointer combined with typedef // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Const pointer @@ -303,7 +303,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test pointer to const and const pointer combined with typedef // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Const pointer @@ -379,14 +379,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-const.log b/src/test/ref/pointer-const.log index 2b3e3f0df..27b16083d 100644 --- a/src/test/ref/pointer-const.log +++ b/src/test/ref/pointer-const.log @@ -198,7 +198,7 @@ Target platform is c64basic / MOS6502X // Test pointer to const and const pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Const pointer @@ -319,7 +319,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test pointer to const and const pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Const pointer @@ -413,6 +413,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_from___b1: @@ -420,11 +421,8 @@ Removing instruction __breturn: Removing instruction __b3_from___b4: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-plus-0.log b/src/test/ref/pointer-plus-0.log index b37f4c89f..4a7ecb091 100644 --- a/src/test/ref/pointer-plus-0.log +++ b/src/test/ref/pointer-plus-0.log @@ -217,7 +217,7 @@ Target platform is c64basic / MOS6502X // Tests pointer plus 0 elimination // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -347,7 +347,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests pointer plus 0 elimination // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -441,6 +441,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction first_from_main: Removing instruction __b1: @@ -449,11 +450,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-plus-signed-word.log b/src/test/ref/pointer-plus-signed-word.log index b20fadd18..eb86de3aa 100644 --- a/src/test/ref/pointer-plus-signed-word.log +++ b/src/test/ref/pointer-plus-signed-word.log @@ -131,7 +131,7 @@ Target platform is c64basic / MOS6502X // Fragment pbuz1=pbuc1_plus_vwsz1.asm supplied by Richard-William Loerakker // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400+$28*$a @@ -221,7 +221,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fragment pbuz1=pbuc1_plus_vwsz1.asm supplied by Richard-William Loerakker // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400+$28*$a @@ -305,17 +305,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-pointer-1.log b/src/test/ref/pointer-pointer-1.log index 4e1d682d0..f3748666a 100644 --- a/src/test/ref/pointer-pointer-1.log +++ b/src/test/ref/pointer-pointer-1.log @@ -91,7 +91,7 @@ Target platform is c64basic / MOS6502X // Tests a simple pointer to a pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -159,7 +159,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a simple pointer to a pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -215,14 +215,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-pointer-2.log b/src/test/ref/pointer-pointer-2.log index e0ad7a3f6..fcf1c8b51 100644 --- a/src/test/ref/pointer-pointer-2.log +++ b/src/test/ref/pointer-pointer-2.log @@ -339,7 +339,7 @@ Target platform is c64basic / MOS6502X // Tests pointer to pointer in a more complex setup // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label textid = 2 @@ -519,7 +519,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests pointer to pointer in a more complex setup // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label textid = 2 @@ -676,13 +676,13 @@ Removing instruction __b1_from___b4: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __breturn: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -690,7 +690,6 @@ Succesful ASM optimization Pass5DoubleJumpElimination Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Replacing instruction ldx #0 with TAX -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/pointer-void-0.log b/src/test/ref/pointer-void-0.log index 56bde5f29..21b9d66e0 100644 --- a/src/test/ref/pointer-void-0.log +++ b/src/test/ref/pointer-void-0.log @@ -100,7 +100,7 @@ Target platform is c64basic / MOS6502X // Test simple void pointer (conversion without casting) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -157,7 +157,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test simple void pointer (conversion without casting) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -206,14 +206,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-void-1.log b/src/test/ref/pointer-void-1.log index 0c7e8b7d0..b43260395 100644 --- a/src/test/ref/pointer-void-1.log +++ b/src/test/ref/pointer-void-1.log @@ -237,7 +237,7 @@ Target platform is c64basic / MOS6502X // Test simple void pointer - void pointer function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -384,7 +384,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test simple void pointer - void pointer function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -508,6 +508,7 @@ Removing instruction print_from___b1: Removing instruction __b2_from___b1: Removing instruction print_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -515,11 +516,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-void-2.log b/src/test/ref/pointer-void-2.log index 1a362f96b..797010f83 100644 --- a/src/test/ref/pointer-void-2.log +++ b/src/test/ref/pointer-void-2.log @@ -234,7 +234,7 @@ Target platform is c64basic / MOS6502X // Test simple void pointer - void pointer function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -378,7 +378,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test simple void pointer - void pointer function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -499,6 +499,7 @@ Removing instruction print_from___b1: Removing instruction __b2_from___b1: Removing instruction print_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -506,11 +507,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/pointer-void-3.log b/src/test/ref/pointer-void-3.log index 68cf0b6f7..6d41fb28d 100644 --- a/src/test/ref/pointer-void-3.log +++ b/src/test/ref/pointer-void-3.log @@ -256,7 +256,7 @@ Target platform is c64basic / MOS6502X // Test void pointer - issues when assigning returns from malloc() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -401,7 +401,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test void pointer - issues when assigning returns from malloc() // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -516,6 +516,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction malloc_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction malloc_from_main: Removing instruction __b1: @@ -523,11 +524,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/post-increment-problem-2.log b/src/test/ref/post-increment-problem-2.log index 451d2d82a..5c736d425 100644 --- a/src/test/ref/post-increment-problem-2.log +++ b/src/test/ref/post-increment-problem-2.log @@ -214,7 +214,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -306,7 +306,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -395,6 +395,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b2_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: @@ -402,11 +403,8 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/post-increment-problem.log b/src/test/ref/post-increment-problem.log index 628a996ce..fe309fca6 100644 --- a/src/test/ref/post-increment-problem.log +++ b/src/test/ref/post-increment-problem.log @@ -196,7 +196,7 @@ Target platform is c64basic / MOS6502X // Illustrates a problem with post-incrementing a pointer used in a loop comparison // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -352,7 +352,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates a problem with post-incrementing a pointer used in a loop comparison // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -473,6 +473,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -480,14 +481,11 @@ Removing instruction __b3_from___b2: Removing instruction __breturn: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Replacing instruction ldx #0 with TAX -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-0.log b/src/test/ref/preprocessor-0.log index 7c16e42d3..2feb69a4d 100644 --- a/src/test/ref/preprocessor-0.log +++ b/src/test/ref/preprocessor-0.log @@ -75,7 +75,7 @@ Target platform is c64basic / MOS6502X // A simple #define // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -122,7 +122,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A simple #define // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -162,14 +162,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-1.log b/src/test/ref/preprocessor-1.log index 407d55ca6..b895f3ec5 100644 --- a/src/test/ref/preprocessor-1.log +++ b/src/test/ref/preprocessor-1.log @@ -73,7 +73,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -118,7 +118,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -158,14 +158,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-2.log b/src/test/ref/preprocessor-2.log index 5fed3f826..6ed65fc34 100644 --- a/src/test/ref/preprocessor-2.log +++ b/src/test/ref/preprocessor-2.log @@ -90,7 +90,7 @@ Target platform is c64basic / MOS6502X // #define and #undef - expected output on screen is xa // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -142,7 +142,7 @@ ASSEMBLER BEFORE OPTIMIZATION // #define and #undef - expected output on screen is xa // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -186,14 +186,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-3.log b/src/test/ref/preprocessor-3.log index fa228b44b..2e79d549d 100644 --- a/src/test/ref/preprocessor-3.log +++ b/src/test/ref/preprocessor-3.log @@ -82,7 +82,7 @@ Target platform is c64basic / MOS6502X // #define inside an #included file // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Test the preprocessor @@ -131,7 +131,7 @@ ASSEMBLER BEFORE OPTIMIZATION // #define inside an #included file // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Test the preprocessor @@ -173,14 +173,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-4.log b/src/test/ref/preprocessor-4.log index 0180a30f4..685f2feac 100644 --- a/src/test/ref/preprocessor-4.log +++ b/src/test/ref/preprocessor-4.log @@ -137,7 +137,7 @@ Target platform is c64basic / MOS6502X // Test #ifdef // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -192,7 +192,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test #ifdef // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -238,14 +238,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-5.log b/src/test/ref/preprocessor-5.log index eedcb90f0..3a5bcb46e 100644 --- a/src/test/ref/preprocessor-5.log +++ b/src/test/ref/preprocessor-5.log @@ -150,7 +150,7 @@ Target platform is c64basic / MOS6502X // Test multi-line macro // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -209,7 +209,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test multi-line macro // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -260,14 +260,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-6.log b/src/test/ref/preprocessor-6.log index 95a6b7864..cc664bc09 100644 --- a/src/test/ref/preprocessor-6.log +++ b/src/test/ref/preprocessor-6.log @@ -123,7 +123,7 @@ Target platform is c64basic / MOS6502X // Test macro recursion // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const A = 'a' @@ -171,7 +171,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test macro recursion // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const A = 'a' @@ -212,14 +212,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-7.log b/src/test/ref/preprocessor-7.log index 00c00231d..953eb4911 100644 --- a/src/test/ref/preprocessor-7.log +++ b/src/test/ref/preprocessor-7.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Macro generating inline ASM // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -163,7 +163,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Macro generating inline ASM // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -207,14 +207,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-8.log b/src/test/ref/preprocessor-8.log index a8c1c5b4c..dab544cf0 100644 --- a/src/test/ref/preprocessor-8.log +++ b/src/test/ref/preprocessor-8.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Macro generating inline kickasm // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -163,7 +163,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Macro generating inline kickasm // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -207,14 +207,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/preprocessor-9.log b/src/test/ref/preprocessor-9.log index 259f9678a..935fe0b80 100644 --- a/src/test/ref/preprocessor-9.log +++ b/src/test/ref/preprocessor-9.log @@ -127,7 +127,7 @@ Target platform is c64basic / MOS6502X // Macro with parameters // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -182,7 +182,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Macro with parameters // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -228,14 +228,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/primes-1000-2.log b/src/test/ref/primes-1000-2.log index 32a06a963..312ba917a 100644 --- a/src/test/ref/primes-1000-2.log +++ b/src/test/ref/primes-1000-2.log @@ -2298,7 +2298,7 @@ Target platform is c64basic / MOS6502X // http://csbruce.com/cbm/transactor/pdfs/trans_v7_i05.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -3380,7 +3380,7 @@ ASSEMBLER BEFORE OPTIMIZATION // http://csbruce.com/cbm/transactor/pdfs/trans_v7_i05.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -4203,6 +4203,7 @@ Removing instruction __breturn: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b8: @@ -4248,7 +4249,6 @@ Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -4259,8 +4259,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda.z digit_value+1 Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [119] bcc __b1 to bcs Fixing long branch [125] bcc __b1 to bcs diff --git a/src/test/ref/primes-1000.log b/src/test/ref/primes-1000.log index cf4ce0733..55c877fd6 100644 --- a/src/test/ref/primes-1000.log +++ b/src/test/ref/primes-1000.log @@ -3059,7 +3059,7 @@ Target platform is c64basic / MOS6502X // http://csbruce.com/cbm/transactor/pdfs/trans_v7_i05.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -4613,7 +4613,7 @@ ASSEMBLER BEFORE OPTIMIZATION // http://csbruce.com/cbm/transactor/pdfs/trans_v7_i05.pdf // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -5825,6 +5825,7 @@ Removing instruction __breturn: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b8: @@ -5875,7 +5876,6 @@ Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __breturn in beq __b5 @@ -5889,7 +5889,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda.z digit_value+1 Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b5: Succesful ASM optimization Pass5UnusedLabelElimination Removing unreachable instruction rts diff --git a/src/test/ref/print-problem.log b/src/test/ref/print-problem.log index 0fe60a0d2..24b5c0512 100644 --- a/src/test/ref/print-problem.log +++ b/src/test/ref/print-problem.log @@ -252,7 +252,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -348,7 +348,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -440,6 +440,7 @@ Removing instruction ln_from___b1: Removing instruction __b2_from___b1: Removing instruction ln_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction ln_from_main: Removing instruction __b1: @@ -448,11 +449,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/printf-10.log b/src/test/ref/printf-10.log index 0d8350042..3f503c8a6 100644 --- a/src/test/ref/printf-10.log +++ b/src/test/ref/printf-10.log @@ -324,7 +324,7 @@ Target platform is c64basic / MOS6502X // A simple string - with the printf-sub cuntions in the same file. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -484,7 +484,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A simple string - with the printf-sub cuntions in the same file. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -643,6 +643,7 @@ Removing instruction cputs_from___b2: Removing instruction __b1_from_cputs: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction cputs_from_main: Removing instruction __b1: @@ -652,11 +653,8 @@ Removing instruction __breturn: Removing instruction cputs_from_printf_string: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/printf-11.log b/src/test/ref/printf-11.log index ef7960c66..fed9afbde 100644 --- a/src/test/ref/printf-11.log +++ b/src/test/ref/printf-11.log @@ -444,7 +444,7 @@ Target platform is c64basic / MOS6502X // A simple number - with the printf-sub funtions in the same file. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 4 @@ -659,7 +659,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A simple number - with the printf-sub funtions in the same file. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 4 @@ -841,6 +841,7 @@ Removing instruction cputs_from___b2: Removing instruction __b1_from_cputs: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction cputs_from_main: Removing instruction __b1: @@ -849,11 +850,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log index 50a97217f..c8409256c 100644 --- a/src/test/ref/printmsg.log +++ b/src/test/ref/printmsg.log @@ -485,7 +485,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 2 @@ -732,7 +732,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 2 @@ -978,6 +978,7 @@ Removing instruction __b1_from___b1: Removing instruction __b1_from_print_str: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_str_from_main: Removing instruction __b1: @@ -993,11 +994,8 @@ Removing instruction __breturn: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/problem-negate-const.log b/src/test/ref/problem-negate-const.log index d9d3e9e56..3cc8212f2 100644 --- a/src/test/ref/problem-negate-const.log +++ b/src/test/ref/problem-negate-const.log @@ -140,7 +140,7 @@ Target platform is c64basic / MOS6502X // KickAsm requires parenthesis for double negation to work // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -201,7 +201,7 @@ ASSEMBLER BEFORE OPTIMIZATION // KickAsm requires parenthesis for double negation to work // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -255,15 +255,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/problem-negative-word-const.log b/src/test/ref/problem-negative-word-const.log index 836bb955a..bd7a3912e 100644 --- a/src/test/ref/problem-negative-word-const.log +++ b/src/test/ref/problem-negative-word-const.log @@ -205,7 +205,7 @@ Target platform is c64basic / MOS6502X // Problem with assigning negative word constant (vwuz1=vbuc1) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -327,7 +327,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Problem with assigning negative word constant (vwuz1=vbuc1) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -434,19 +434,17 @@ Removing instruction __b3_from___b1: Removing instruction __b3: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/problem-struct-inline-parameter-1.log b/src/test/ref/problem-struct-inline-parameter-1.log index 0bb1ae450..2d8cc2b4b 100644 --- a/src/test/ref/problem-struct-inline-parameter-1.log +++ b/src/test/ref/problem-struct-inline-parameter-1.log @@ -214,7 +214,7 @@ Target platform is c64basic / MOS6502X // Illustrates problem with passing an inline struct value as a parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -287,7 +287,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates problem with passing an inline struct value as a parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -350,15 +350,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/problem-struct-inline-parameter.log b/src/test/ref/problem-struct-inline-parameter.log index 59b0bf7a4..9200ba0eb 100644 --- a/src/test/ref/problem-struct-inline-parameter.log +++ b/src/test/ref/problem-struct-inline-parameter.log @@ -213,7 +213,7 @@ Target platform is c64basic / MOS6502X // Illustrates problem with passing an inline struct value as a parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -286,7 +286,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates problem with passing an inline struct value as a parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -349,15 +349,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/procedure-callingconvention-stack-0.log b/src/test/ref/procedure-callingconvention-stack-0.log index 9ed87f558..39a3ef8df 100644 --- a/src/test/ref/procedure-callingconvention-stack-0.log +++ b/src/test/ref/procedure-callingconvention-stack-0.log @@ -165,7 +165,7 @@ Target platform is c64basic / MOS6502X // Test a procedure with calling convention stack // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -284,7 +284,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a procedure with calling convention stack // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -363,15 +363,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/procedure-callingconvention-stack-1.log b/src/test/ref/procedure-callingconvention-stack-1.log index 9ed87f558..39a3ef8df 100644 --- a/src/test/ref/procedure-callingconvention-stack-1.log +++ b/src/test/ref/procedure-callingconvention-stack-1.log @@ -165,7 +165,7 @@ Target platform is c64basic / MOS6502X // Test a procedure with calling convention stack // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -284,7 +284,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a procedure with calling convention stack // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -363,15 +363,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/procedure-callingconvention-stack-13.log b/src/test/ref/procedure-callingconvention-stack-13.log index da7e6b6f9..b7591fbdd 100644 --- a/src/test/ref/procedure-callingconvention-stack-13.log +++ b/src/test/ref/procedure-callingconvention-stack-13.log @@ -214,7 +214,7 @@ Target platform is c64basic / MOS6502X // Recursion that works (no local variables) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -339,7 +339,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Recursion that works (no local variables) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -430,18 +430,16 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __b1: Removing instruction __breturn_from___b1: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __breturn_from_pow2 to __b1 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/procedure-callingconvention-stack-2.log b/src/test/ref/procedure-callingconvention-stack-2.log index 4a72455f4..f243efe71 100644 --- a/src/test/ref/procedure-callingconvention-stack-2.log +++ b/src/test/ref/procedure-callingconvention-stack-2.log @@ -183,7 +183,7 @@ Target platform is c64basic / MOS6502X // Test a procedure with calling convention stack - and enough parameters to use fast ASM for cleaning stack // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -309,7 +309,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a procedure with calling convention stack - and enough parameters to use fast ASM for cleaning stack // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -415,15 +415,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/procedure-callingconvention-stack-3.log b/src/test/ref/procedure-callingconvention-stack-3.log index 68ddf7449..a7a27e585 100644 --- a/src/test/ref/procedure-callingconvention-stack-3.log +++ b/src/test/ref/procedure-callingconvention-stack-3.log @@ -182,7 +182,7 @@ Target platform is c64basic / MOS6502X // https://gitlab.com/camelot/kickc/issues/319 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -311,7 +311,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://gitlab.com/camelot/kickc/issues/319 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const STACK_BASE = $103 @@ -417,15 +417,13 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/procedure-callingconvention-stack-7.log b/src/test/ref/procedure-callingconvention-stack-7.log index 8d627ceef..2cbdf64a1 100644 --- a/src/test/ref/procedure-callingconvention-stack-7.log +++ b/src/test/ref/procedure-callingconvention-stack-7.log @@ -162,7 +162,7 @@ Target platform is c64basic / MOS6502X // Illustrates live ranges for main::val and printline::i // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -255,7 +255,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates live ranges for main::val and printline::i // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -329,17 +329,15 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_printline: Removing instruction __breturn: Removing instruction __b1_from___b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/processor-port-test.log b/src/test/ref/processor-port-test.log index ebf2a0e7f..eac02f543 100644 --- a/src/test/ref/processor-port-test.log +++ b/src/test/ref/processor-port-test.log @@ -2573,7 +2573,7 @@ Target platform is c64basic / MOS6502X // Tests by setting the value of the processor port - and then printing out values of $00/$01/$a000/$d000/$e000 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Mask for PROCESSOR_PORT_DDR which allows only memory configuration to be written @@ -3688,7 +3688,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests by setting the value of the processor port - and then printing out values of $00/$01/$a000/$d000/$e000 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Mask for PROCESSOR_PORT_DDR which allows only memory configuration to be written @@ -4800,6 +4800,7 @@ Removing instruction __b1_from___b1: Removing instruction __b1_from_print_str: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b2: @@ -4868,11 +4869,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ptr-complex.log b/src/test/ref/ptr-complex.log index 7e92ec8a3..e832fa3ed 100644 --- a/src/test/ref/ptr-complex.log +++ b/src/test/ref/ptr-complex.log @@ -259,7 +259,7 @@ Target platform is c64basic / MOS6502X // Test some complex pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -386,7 +386,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test some complex pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -497,6 +497,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -504,14 +505,11 @@ Removing instruction __b3_from___b2: Removing instruction __b4: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ptrptr-optimize-0.log b/src/test/ref/ptrptr-optimize-0.log index 2ef0effe7..53eab9e6f 100644 --- a/src/test/ref/ptrptr-optimize-0.log +++ b/src/test/ref/ptrptr-optimize-0.log @@ -86,7 +86,7 @@ Target platform is c64basic / MOS6502X // Tests optimization of constant pointers to pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -159,7 +159,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimization of constant pointers to pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -223,14 +223,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ptrptr-optimize-1.log b/src/test/ref/ptrptr-optimize-1.log index e8daec861..c00225960 100644 --- a/src/test/ref/ptrptr-optimize-1.log +++ b/src/test/ref/ptrptr-optimize-1.log @@ -156,7 +156,7 @@ Target platform is c64basic / MOS6502X // Tests optimization of constant pointers to pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -253,7 +253,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimization of constant pointers to pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -338,17 +338,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction sub_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sub_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ptrptr-optimize-2.log b/src/test/ref/ptrptr-optimize-2.log index 806f59592..5ff270ca5 100644 --- a/src/test/ref/ptrptr-optimize-2.log +++ b/src/test/ref/ptrptr-optimize-2.log @@ -157,7 +157,7 @@ Target platform is c64basic / MOS6502X // The two examples of &screen is not detected as identical leading to ASM that could be optimized more // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -254,7 +254,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The two examples of &screen is not detected as identical leading to ASM that could be optimized more // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -338,17 +338,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction sub_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sub_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ptrtest.log b/src/test/ref/ptrtest.log index 0d2a7f2ed..230e8a559 100644 --- a/src/test/ref/ptrtest.log +++ b/src/test/ref/ptrtest.log @@ -498,7 +498,7 @@ Target platform is c64basic / MOS6502X // Test all types of pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -800,7 +800,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test all types of pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1059,6 +1059,7 @@ Removing instruction rvaluevar_from___b2: Removing instruction __b3_from___b2: Removing instruction lvaluevar_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2: @@ -1079,12 +1080,9 @@ Removing instruction __b1_from_lvalue: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing instruction ldx #2 with TAX -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ptrtestmin.log b/src/test/ref/ptrtestmin.log index 70dfb4aa9..1ed6d6529 100644 --- a/src/test/ref/ptrtestmin.log +++ b/src/test/ref/ptrtestmin.log @@ -160,7 +160,7 @@ Target platform is c64basic / MOS6502X // Test all types of pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -244,7 +244,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test all types of pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -315,17 +315,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/reserve-zp-global.log b/src/test/ref/reserve-zp-global.log index 505aea78b..a142e9432 100644 --- a/src/test/ref/reserve-zp-global.log +++ b/src/test/ref/reserve-zp-global.log @@ -174,7 +174,7 @@ Target platform is c64basic / MOS6502X // Demonstrates global directive reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -277,7 +277,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates global directive reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -353,16 +353,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/reserve-zp-procedure-1.log b/src/test/ref/reserve-zp-procedure-1.log index 6ad126c52..22ddadf00 100644 --- a/src/test/ref/reserve-zp-procedure-1.log +++ b/src/test/ref/reserve-zp-procedure-1.log @@ -174,7 +174,7 @@ Target platform is c64basic / MOS6502X // Demonstrates a procedure reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -277,7 +277,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates a procedure reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -353,16 +353,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/reserve-zp-procedure-2.log b/src/test/ref/reserve-zp-procedure-2.log index eeccec067..ae6f17157 100644 --- a/src/test/ref/reserve-zp-procedure-2.log +++ b/src/test/ref/reserve-zp-procedure-2.log @@ -257,7 +257,7 @@ Target platform is c64basic / MOS6502X // Demonstrates a procedure reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -420,7 +420,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates a procedure reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -526,6 +526,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __b3: @@ -533,11 +534,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/reserve-zp-procedure-3.log b/src/test/ref/reserve-zp-procedure-3.log index 6ad126c52..22ddadf00 100644 --- a/src/test/ref/reserve-zp-procedure-3.log +++ b/src/test/ref/reserve-zp-procedure-3.log @@ -174,7 +174,7 @@ Target platform is c64basic / MOS6502X // Demonstrates a procedure reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -277,7 +277,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates a procedure reserving addresses on zeropage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -353,16 +353,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/robozzle64-label-problem.log b/src/test/ref/robozzle64-label-problem.log index d1e95bd10..ee3726792 100644 --- a/src/test/ref/robozzle64-label-problem.log +++ b/src/test/ref/robozzle64-label-problem.log @@ -449,7 +449,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -699,7 +699,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -898,6 +898,7 @@ Removing instruction __b1_from___b3: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction mul8u_from___b1: @@ -910,13 +911,10 @@ Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/roll-sprite-msb.log b/src/test/ref/roll-sprite-msb.log index e8b4baa39..7360aa1d5 100644 --- a/src/test/ref/roll-sprite-msb.log +++ b/src/test/ref/roll-sprite-msb.log @@ -483,7 +483,7 @@ Target platform is c64basic / MOS6502X // Tests rolling sprite MSB by variable amount // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SPRITES_XPOS = $d000 @@ -704,7 +704,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests rolling sprite MSB by variable amount // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SPRITES_XPOS = $d000 @@ -856,20 +856,19 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/roll-variable.log b/src/test/ref/roll-variable.log index de7db6189..ec46078f6 100644 --- a/src/test/ref/roll-variable.log +++ b/src/test/ref/roll-variable.log @@ -133,7 +133,7 @@ Target platform is c64basic / MOS6502X // Rolling constants by a variable amount // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -219,7 +219,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Rolling constants by a variable amount // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -294,17 +294,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/runtime-unused-procedure.log b/src/test/ref/runtime-unused-procedure.log index 467419649..119a633d1 100644 --- a/src/test/ref/runtime-unused-procedure.log +++ b/src/test/ref/runtime-unused-procedure.log @@ -145,7 +145,7 @@ Target platform is c64basic / MOS6502X // Tests that a procedure that is never called, but requires static analysis is correctly eliminated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -191,7 +191,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that a procedure that is never called, but requires static analysis is correctly eliminated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sandbox-ternary-error.log b/src/test/ref/sandbox-ternary-error.log index 52b44d969..3976c207f 100644 --- a/src/test/ref/sandbox-ternary-error.log +++ b/src/test/ref/sandbox-ternary-error.log @@ -219,7 +219,7 @@ Target platform is c64basic / MOS6502X // Demonstrates error with nested ternary operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -331,7 +331,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates error with nested ternary operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -437,13 +437,13 @@ Removing instruction __b4_from___b2: Removing instruction __b5_from___b4: Removing instruction __b3_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __b5_from___b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b3 in jmp __b5 @@ -452,7 +452,6 @@ Relabelling long label __b3_from___b1 to __b2 Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b5: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/sandbox.log b/src/test/ref/sandbox.log index 00de3ae0a..ce05a3c7e 100644 --- a/src/test/ref/sandbox.log +++ b/src/test/ref/sandbox.log @@ -4309,7 +4309,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label zp1 = $61 @@ -6299,7 +6299,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label zp1 = $61 @@ -7876,6 +7876,7 @@ Removing instruction __b1_from___b9: Removing instruction __b1_from_append: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -7942,7 +7943,6 @@ Removing instruction __b9: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b27 in jmp __b27_from___b8 @@ -7976,7 +7976,6 @@ Removing instruction __b27: Removing instruction __b16: Removing instruction __b29: Succesful ASM optimization Pass5RedundantLabelElimination -Removing instruction __bbegin: Removing instruction __b24: Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [376] bcs __b3 to bcc diff --git a/src/test/ref/scan-desire-problem.log b/src/test/ref/scan-desire-problem.log index fb6633702..c6b4fb3b4 100644 --- a/src/test/ref/scan-desire-problem.log +++ b/src/test/ref/scan-desire-problem.log @@ -1369,7 +1369,7 @@ Target platform is c64basic / MOS6502X // Illustrates a problem with a missing fragment - pbuc1_derefidx_vwuz1=vbuz2 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The colors of the C64 @@ -2079,7 +2079,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates a problem with a missing fragment - pbuc1_derefidx_vwuz1=vbuz2 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The colors of the C64 @@ -2628,6 +2628,7 @@ Removing instruction toD0181: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_from_main: Removing instruction __b1_from_main: @@ -2650,13 +2651,10 @@ Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b2_from___b1 to __b4 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/screen-center-angle.log b/src/test/ref/screen-center-angle.log index e85bb54db..4b30bfa9d 100644 --- a/src/test/ref/screen-center-angle.log +++ b/src/test/ref/screen-center-angle.log @@ -2519,7 +2519,7 @@ Target platform is c64basic / MOS6502X // 4.65 million cycles // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -3916,7 +3916,7 @@ ASSEMBLER BEFORE OPTIMIZATION // 4.65 million cycles // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Timer Control - Start/stop timer (0:stop, 1: start) @@ -4997,6 +4997,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_font_hex_from_main: Removing instruction __b1: @@ -5039,7 +5040,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -5047,8 +5047,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [373] beq __b12 to bne Fixing long branch [267] bpl __b1 to bmi Fixing long branch [279] bpl __b4 to bmi diff --git a/src/test/ref/screen-center-distance.log b/src/test/ref/screen-center-distance.log index e158c3293..f0c450297 100644 --- a/src/test/ref/screen-center-distance.log +++ b/src/test/ref/screen-center-distance.log @@ -3046,7 +3046,7 @@ Target platform is c64basic / MOS6502X // Calculate the distance to the center of the screen - and show it using font-hex // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -4565,7 +4565,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Calculate the distance to the center of the screen - and show it using font-hex // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -5666,6 +5666,7 @@ Removing instruction __b2_from___b1: Removing instruction __b2_from___b4: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_font_hex_from_main: Removing instruction __b1: @@ -5720,7 +5721,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __b2 @@ -5730,8 +5730,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/scroll-clobber.log b/src/test/ref/scroll-clobber.log index 8bbebde02..64c7cf697 100644 --- a/src/test/ref/scroll-clobber.log +++ b/src/test/ref/scroll-clobber.log @@ -188,7 +188,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -298,7 +298,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -395,19 +395,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b2_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __b2_from___b3: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/scrollbig-clobber.log b/src/test/ref/scrollbig-clobber.log index 5ab77d249..b714dd7aa 100644 --- a/src/test/ref/scrollbig-clobber.log +++ b/src/test/ref/scrollbig-clobber.log @@ -286,7 +286,7 @@ Target platform is c64basic / MOS6502X // Clobber problem in next_char return value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label nxt = 3 @@ -434,7 +434,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Clobber problem in next_char return value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label nxt = 3 @@ -564,6 +564,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Removing instruction __b1_from_next_char: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -572,14 +573,11 @@ Removing instruction __b2: Removing instruction __b1_from___b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/semi-struct-1.log b/src/test/ref/semi-struct-1.log index 4a62aee37..fdc48154d 100644 --- a/src/test/ref/semi-struct-1.log +++ b/src/test/ref/semi-struct-1.log @@ -1453,7 +1453,7 @@ Target platform is c64basic / MOS6502X // Point points[NUM_POINTS]; // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The size of a point @@ -2037,7 +2037,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Point points[NUM_POINTS]; // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The size of a point @@ -2549,6 +2549,7 @@ Removing instruction pointXpos1: Removing instruction pointYpos1_from___b2: Removing instruction pointYpos1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction init_points_from_main: Removing instruction __b1: @@ -2585,13 +2586,10 @@ Removing instruction __b2: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/semi-struct-2.log b/src/test/ref/semi-struct-2.log index 246bd64d2..b995ab126 100644 --- a/src/test/ref/semi-struct-2.log +++ b/src/test/ref/semi-struct-2.log @@ -5066,7 +5066,7 @@ Target platform is c64basic / MOS6502X // ENTRY files[MAX_FILES]; // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -7213,7 +7213,7 @@ ASSEMBLER BEFORE OPTIMIZATION // ENTRY files[MAX_FILES]; // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -9158,6 +9158,7 @@ Removing instruction entryTLo1: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction fileEntry1: Removing instruction __b6: @@ -9311,11 +9312,8 @@ Removing instruction __b4: Removing instruction __b1_from___b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sequence-locality-0.log b/src/test/ref/sequence-locality-0.log index fd561ddeb..91ff6a127 100644 --- a/src/test/ref/sequence-locality-0.log +++ b/src/test/ref/sequence-locality-0.log @@ -208,7 +208,7 @@ Target platform is c64basic / MOS6502X // Tests statement sequence locality of if(cond) { stmt1; } else { stmt2; } // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -313,7 +313,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests statement sequence locality of if(cond) { stmt1; } else { stmt2; } // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -409,18 +409,16 @@ Removing instruction __b1_from___b3: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sequence-locality-1.log b/src/test/ref/sequence-locality-1.log index 37a5b0d5f..e0211f49d 100644 --- a/src/test/ref/sequence-locality-1.log +++ b/src/test/ref/sequence-locality-1.log @@ -207,7 +207,7 @@ Target platform is c64basic / MOS6502X // Tests statement sequence locality of if(cond) { stmt1; } else { stmt2; } // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -313,7 +313,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests statement sequence locality of if(cond) { stmt1; } else { stmt2; } // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -405,18 +405,16 @@ Removing instruction __b1_from___b2: Removing instruction __b2_from___b3: Removing instruction __b2_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sieve-min.log b/src/test/ref/sieve-min.log index dcef4ba01..f524439ed 100644 --- a/src/test/ref/sieve-min.log +++ b/src/test/ref/sieve-min.log @@ -1093,7 +1093,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const COUNT = $4000 @@ -1560,7 +1560,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const COUNT = $4000 @@ -1956,6 +1956,7 @@ Removing instruction __b9_from___b8: Removing instruction __b4_from___b5: Removing instruction __b4_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction memset_from_main: Removing instruction __b1_from_main: @@ -1978,11 +1979,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sieve.log b/src/test/ref/sieve.log index 61dcd70ab..dbd60218a 100644 --- a/src/test/ref/sieve.log +++ b/src/test/ref/sieve.log @@ -3949,7 +3949,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Clock cycles per frame (on a C64 PAL) @@ -5899,7 +5899,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Clock cycles per frame (on a C64 PAL) @@ -7441,6 +7441,7 @@ Removing instruction __breturn: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b14: Removing instruction print_cls_from___b14: @@ -7519,15 +7520,12 @@ Removing instruction __b1: Removing instruction memset_from_print_cls: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda.z digit_value+1 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [103] bcc __b2 to bcs Fixing long branch [109] bcc __b2 to bcs diff --git a/src/test/ref/signed-bytes.log b/src/test/ref/signed-bytes.log index 468e97367..aa9e2a57f 100644 --- a/src/test/ref/signed-bytes.log +++ b/src/test/ref/signed-bytes.log @@ -144,7 +144,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -231,7 +231,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -303,16 +303,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/signed-char-comparison.log b/src/test/ref/signed-char-comparison.log index a1a8bc9dd..5a57a7b3e 100644 --- a/src/test/ref/signed-char-comparison.log +++ b/src/test/ref/signed-char-comparison.log @@ -195,7 +195,7 @@ Target platform is c64basic / MOS6502X // Reported by Danny Spijksma // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -302,7 +302,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Reported by Danny Spijksma // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -394,19 +394,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/signed-indexed-subtract.log b/src/test/ref/signed-indexed-subtract.log index 513b5104e..a4dd15cce 100644 --- a/src/test/ref/signed-indexed-subtract.log +++ b/src/test/ref/signed-indexed-subtract.log @@ -1135,7 +1135,7 @@ Target platform is c64basic / MOS6502X // Tests that signed indexed subtract works as intended // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 4 @@ -1673,7 +1673,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that signed indexed subtract works as intended // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 3 @@ -2139,6 +2139,7 @@ Removing instruction __b2_from___b4: Removing instruction __b1_from_print_sint: Removing instruction print_char_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction sub_from___b1: @@ -2173,13 +2174,10 @@ Removing instruction __breturn: Removing instruction __b1_from___b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/signed-word-minus-byte-2.log b/src/test/ref/signed-word-minus-byte-2.log index 80ce65110..452e1af1e 100644 --- a/src/test/ref/signed-word-minus-byte-2.log +++ b/src/test/ref/signed-word-minus-byte-2.log @@ -161,7 +161,7 @@ Target platform is c64basic / MOS6502X // Tests subtracting bytes from signed words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -260,7 +260,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests subtracting bytes from signed words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -343,17 +343,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/signed-words.log b/src/test/ref/signed-words.log index 1d42eccea..d1ea5f2f0 100644 --- a/src/test/ref/signed-words.log +++ b/src/test/ref/signed-words.log @@ -1010,7 +1010,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const WHITE = 1 @@ -1465,7 +1465,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const WHITE = 1 @@ -1863,6 +1863,7 @@ Removing instruction __b3_from___b4: Removing instruction __b1_from_anim: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -1875,7 +1876,6 @@ Removing instruction __b3_from___b1: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -1883,8 +1883,6 @@ Removing instruction jmp __b3 Removing instruction jmp __b1 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/simple-loop.log b/src/test/ref/simple-loop.log index 73d82495f..cbfd5306f 100644 --- a/src/test/ref/simple-loop.log +++ b/src/test/ref/simple-loop.log @@ -133,7 +133,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -213,7 +213,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -279,16 +279,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sinus-basic.log b/src/test/ref/sinus-basic.log index 2f8360646..10cee66a0 100644 --- a/src/test/ref/sinus-basic.log +++ b/src/test/ref/sinus-basic.log @@ -1204,7 +1204,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Zeropage addresses used to hold lo/hi-bytes of addresses of float numbers in MEM @@ -1901,7 +1901,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // Zeropage addresses used to hold lo/hi-bytes of addresses of float numbers in MEM @@ -2515,6 +2515,7 @@ Removing instruction print_ln_from___b13: Removing instruction __b1_from_print_ln: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction setFAC_from_main: Removing instruction __b2: @@ -2563,14 +2564,11 @@ Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction lda memHi Replacing instruction ldy memHi with TAY Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sinusgen16.log b/src/test/ref/sinusgen16.log index 85af50c1b..5f8aea906 100644 --- a/src/test/ref/sinusgen16.log +++ b/src/test/ref/sinusgen16.log @@ -2663,7 +2663,7 @@ Target platform is c64basic / MOS6502X // Generates a 16-bit signed sinus // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.28] format @@ -4275,7 +4275,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Generates a 16-bit signed sinus // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.28] format @@ -5521,6 +5521,7 @@ Removing instruction __b3_from___b2: Removing instruction __b3_from___b5: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sin16s_gen_from_main: Removing instruction __b5: @@ -5584,7 +5585,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __b6: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b3 in beq __b12 @@ -5596,7 +5596,6 @@ Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b12: Succesful ASM optimization Pass5UnusedLabelElimination Removing unreachable instruction rts diff --git a/src/test/ref/sinusgen16b.log b/src/test/ref/sinusgen16b.log index f8bd7778f..a13cc4cdb 100644 --- a/src/test/ref/sinusgen16b.log +++ b/src/test/ref/sinusgen16b.log @@ -3496,7 +3496,7 @@ Target platform is c64basic / MOS6502X // Generates a 16-bit signed sinus // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.28] format @@ -5739,7 +5739,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Generates a 16-bit signed sinus // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.28] format @@ -7417,6 +7417,7 @@ Removing instruction __b3_from___b12: Removing instruction __b3_from___b6: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sin16s_gen_from_main: Removing instruction __b4: @@ -7498,7 +7499,6 @@ Removing instruction mulu16_sel_from___b10: Removing instruction __b11: Removing instruction __b6: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b3 in beq __b12 @@ -7514,7 +7514,6 @@ Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b12: Removing instruction __b12: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/sinusgen8.log b/src/test/ref/sinusgen8.log index f7db62c65..9738f909a 100644 --- a/src/test/ref/sinusgen8.log +++ b/src/test/ref/sinusgen8.log @@ -2340,7 +2340,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.12] format @@ -3603,7 +3603,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.12] format @@ -4617,6 +4617,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sin8s_gen_from_main: Removing instruction __b2: @@ -4675,7 +4676,6 @@ Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __b4 @@ -4687,7 +4687,6 @@ Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/sinusgen8b.log b/src/test/ref/sinusgen8b.log index 78ad81214..897b44c82 100644 --- a/src/test/ref/sinusgen8b.log +++ b/src/test/ref/sinusgen8b.log @@ -3735,7 +3735,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.28] format @@ -6053,7 +6053,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.28] format @@ -7790,6 +7790,7 @@ Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Removing instruction __breturn: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sin8s_gen_from_main: Removing instruction __b2: @@ -7878,7 +7879,6 @@ Removing instruction __b1_from___b3: Removing instruction divr16u_from_div16u: Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __b3 in beq __b12 @@ -7894,7 +7894,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b12: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/sinusgenscale8.log b/src/test/ref/sinusgenscale8.log index 5871209b7..f75793b3e 100644 --- a/src/test/ref/sinusgenscale8.log +++ b/src/test/ref/sinusgenscale8.log @@ -3664,7 +3664,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.12] format @@ -5449,7 +5449,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // PI*2 in u[4.12] format @@ -6974,6 +6974,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -7065,7 +7066,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __b4 @@ -7076,7 +7076,6 @@ Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/sizeof-arrays.log b/src/test/ref/sizeof-arrays.log index db35b6fe2..6ecf9b4c3 100644 --- a/src/test/ref/sizeof-arrays.log +++ b/src/test/ref/sizeof-arrays.log @@ -293,7 +293,7 @@ Target platform is c64basic / MOS6502X // Tests the sizeof() operator on arrays // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -362,7 +362,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the sizeof() operator on arrays // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -420,14 +420,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sizeof-expr.log b/src/test/ref/sizeof-expr.log index 0aed96cbe..ab6d2493c 100644 --- a/src/test/ref/sizeof-expr.log +++ b/src/test/ref/sizeof-expr.log @@ -290,7 +290,7 @@ Target platform is c64basic / MOS6502X // Tests the sizeof() operator on values/expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -368,7 +368,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the sizeof() operator on values/expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -437,14 +437,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sizeof-in-const-pointer.log b/src/test/ref/sizeof-in-const-pointer.log index aa2a97dfd..29111643a 100644 --- a/src/test/ref/sizeof-in-const-pointer.log +++ b/src/test/ref/sizeof-in-const-pointer.log @@ -88,7 +88,7 @@ Target platform is c64basic / MOS6502X // Support for sizeof() in const pointer definition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -136,7 +136,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Support for sizeof() in const pointer definition // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -178,14 +178,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sizeof-struct.log b/src/test/ref/sizeof-struct.log index d52c3728f..0956c5af4 100644 --- a/src/test/ref/sizeof-struct.log +++ b/src/test/ref/sizeof-struct.log @@ -303,7 +303,7 @@ Target platform is c64basic / MOS6502X // Tests the sizeof() operator on structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -387,7 +387,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the sizeof() operator on structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -454,14 +454,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sizeof-types.log b/src/test/ref/sizeof-types.log index 6822b1006..2021b4f7e 100644 --- a/src/test/ref/sizeof-types.log +++ b/src/test/ref/sizeof-types.log @@ -386,7 +386,7 @@ Target platform is c64basic / MOS6502X // Tests the sizeof() operator on types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -516,7 +516,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the sizeof() operator on types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_BYTE = 1 @@ -625,14 +625,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/sqr-delta.log b/src/test/ref/sqr-delta.log index d5e22cb6b..5f5e50921 100644 --- a/src/test/ref/sqr-delta.log +++ b/src/test/ref/sqr-delta.log @@ -281,7 +281,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -500,7 +500,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -685,6 +685,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction ifunc_from_main: Removing instruction __b1: @@ -694,11 +695,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/stack-relative-addressing.log b/src/test/ref/stack-relative-addressing.log index a944f60bd..0a1739ea4 100644 --- a/src/test/ref/stack-relative-addressing.log +++ b/src/test/ref/stack-relative-addressing.log @@ -105,7 +105,7 @@ Target platform is c64basic / MOS6502X // Test stack-relative addressing (for passing parameters through the stack) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels /** The hardware stack. The offset 3 is to skip the return address and the fact that the pointer is to the next free position. */ @@ -191,7 +191,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test stack-relative addressing (for passing parameters through the stack) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels /** The hardware stack. The offset 3 is to skip the return address and the fact that the pointer is to the next free position. */ @@ -269,16 +269,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/statement-sequence-1.log b/src/test/ref/statement-sequence-1.log index 5f9b1e330..b46e7a191 100644 --- a/src/test/ref/statement-sequence-1.log +++ b/src/test/ref/statement-sequence-1.log @@ -218,7 +218,7 @@ Target platform is c64basic / MOS6502X // Tests statement sequence generation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -321,7 +321,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests statement sequence generation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -417,18 +417,16 @@ Removing instruction __b1_from___b2: Removing instruction __b2_from___b3: Removing instruction __b2_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/static-register-optimization-problem.log b/src/test/ref/static-register-optimization-problem.log index 1d91fb82f..7b8c869f3 100644 --- a/src/test/ref/static-register-optimization-problem.log +++ b/src/test/ref/static-register-optimization-problem.log @@ -166,7 +166,7 @@ Target platform is c64basic / MOS6502X // ASM Static Register Value analysis erronously believes >-1 == 0 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -286,7 +286,7 @@ ASSEMBLER BEFORE OPTIMIZATION // ASM Static Register Value analysis erronously believes >-1 == 0 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -389,16 +389,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-const-consolidation-noroot.log b/src/test/ref/string-const-consolidation-noroot.log index 4bf329e61..d665676fb 100644 --- a/src/test/ref/string-const-consolidation-noroot.log +++ b/src/test/ref/string-const-consolidation-noroot.log @@ -254,7 +254,7 @@ Target platform is c64basic / MOS6502X // Tests that identical strings are consolidated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -383,7 +383,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that identical strings are consolidated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -512,6 +512,7 @@ Removing instruction print_from___b1: Removing instruction __b2_from___b1: Removing instruction print_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -521,11 +522,8 @@ Removing instruction __b1_from_print: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-const-consolidation.log b/src/test/ref/string-const-consolidation.log index 2aa9f590c..808a42ec7 100644 --- a/src/test/ref/string-const-consolidation.log +++ b/src/test/ref/string-const-consolidation.log @@ -254,7 +254,7 @@ Target platform is c64basic / MOS6502X // Tests that identical strings are consolidated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -383,7 +383,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that identical strings are consolidated // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -512,6 +512,7 @@ Removing instruction print_from___b1: Removing instruction __b2_from___b1: Removing instruction print_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -521,11 +522,8 @@ Removing instruction __b1_from_print: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-encoding-literals.log b/src/test/ref/string-encoding-literals.log index e890d08c4..a043e232b 100644 --- a/src/test/ref/string-encoding-literals.log +++ b/src/test/ref/string-encoding-literals.log @@ -186,7 +186,7 @@ Target platform is c64basic / MOS6502X // Test string encoding via literals // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -313,7 +313,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test string encoding via literals // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -413,17 +413,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-encoding-pragma.log b/src/test/ref/string-encoding-pragma.log index 31f082dd3..28c23ba25 100644 --- a/src/test/ref/string-encoding-pragma.log +++ b/src/test/ref/string-encoding-pragma.log @@ -177,7 +177,7 @@ Target platform is c64basic / MOS6502X // Test string encoding via literals // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -296,7 +296,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test string encoding via literals // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -391,17 +391,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-escapes-0.log b/src/test/ref/string-escapes-0.log index 7013718d7..40cc7dd7b 100644 --- a/src/test/ref/string-escapes-0.log +++ b/src/test/ref/string-escapes-0.log @@ -125,7 +125,7 @@ Target platform is c64basic / MOS6502X // Test using some simple supported string escapes \r \f \n \' \" // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -203,7 +203,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test using some simple supported string escapes \r \f \n \' \" // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -268,16 +268,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-escapes-1.log b/src/test/ref/string-escapes-1.log index b4519af6a..a749f12a5 100644 --- a/src/test/ref/string-escapes-1.log +++ b/src/test/ref/string-escapes-1.log @@ -219,7 +219,7 @@ Target platform is c64basic / MOS6502X // Test using some simple supported string escape \n in both string and char // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -356,7 +356,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test using some simple supported string escape \n in both string and char // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -488,19 +488,17 @@ Removing instruction __bend_from___b1: Removing instruction __b5_from___b3: Removing instruction __b5_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b5: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction ldy #0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-escapes-2.log b/src/test/ref/string-escapes-2.log index 69e926dc2..d5785ff75 100644 --- a/src/test/ref/string-escapes-2.log +++ b/src/test/ref/string-escapes-2.log @@ -167,7 +167,7 @@ Target platform is c64basic / MOS6502X // Test using some simple supported string escape characters in PETSCII // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label memA = $ff @@ -275,7 +275,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test using some simple supported string escape characters in PETSCII // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label memA = $ff @@ -367,6 +367,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: @@ -374,11 +375,8 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-escapes-3.log b/src/test/ref/string-escapes-3.log index 2cdb43452..9cf339770 100644 --- a/src/test/ref/string-escapes-3.log +++ b/src/test/ref/string-escapes-3.log @@ -248,7 +248,7 @@ Target platform is c64basic / MOS6502X // Uses encoding PETSCII mixed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .encoding "petscii_mixed" @@ -403,7 +403,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Uses encoding PETSCII mixed // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .encoding "petscii_mixed" @@ -547,6 +547,7 @@ Removing instruction __bend_from___b1: Removing instruction __b6_from___b4: Removing instruction __b6_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -554,13 +555,10 @@ Removing instruction __breturn: Removing instruction __b5: Removing instruction __b1_from___b6: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction ldy #0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-escapes-4.log b/src/test/ref/string-escapes-4.log index de80d0247..42388f4fa 100644 --- a/src/test/ref/string-escapes-4.log +++ b/src/test/ref/string-escapes-4.log @@ -190,7 +190,7 @@ Target platform is c64basic / MOS6502X // Uses \xnn to add chars by hex-code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .encoding "screencode_upper" @@ -316,7 +316,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Uses \xnn to add chars by hex-code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .encoding "screencode_upper" @@ -420,6 +420,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -429,11 +430,8 @@ Removing instruction __b4: Removing instruction __b1_from___b4: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-escapes-5.log b/src/test/ref/string-escapes-5.log index 49c4617a0..9c772ba56 100644 --- a/src/test/ref/string-escapes-5.log +++ b/src/test/ref/string-escapes-5.log @@ -138,7 +138,7 @@ Target platform is c64basic / MOS6502X // Uses \xnn to add chars by hex-code that do not exist with the encoding. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const CH = '\$ff' @@ -226,7 +226,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Uses \xnn to add chars by hex-code that do not exist with the encoding. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const CH = '\$ff' @@ -299,17 +299,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/string-pointer-problem.log b/src/test/ref/string-pointer-problem.log index 69717295b..d222918da 100644 --- a/src/test/ref/string-pointer-problem.log +++ b/src/test/ref/string-pointer-problem.log @@ -182,7 +182,7 @@ Target platform is c64basic / MOS6502X // https://gitlab.com/camelot/kickc/issues/315 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label process_name = $400 @@ -305,7 +305,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://gitlab.com/camelot/kickc/issues/315 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label process_name = $400 @@ -419,6 +419,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction set_process_name_from_main: Removing instruction __breturn: @@ -426,11 +427,8 @@ Removing instruction __b1_from_set_process_name: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/strip.log b/src/test/ref/strip.log index b55a805dd..73a69bece 100644 --- a/src/test/ref/strip.log +++ b/src/test/ref/strip.log @@ -406,7 +406,7 @@ Target platform is c64basic / MOS6502X // Tests of strip() function from https://news.ycombinator.com/item?id=12080871 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 4 @@ -660,7 +660,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests of strip() function from https://news.ycombinator.com/item?id=12080871 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = 2 @@ -901,6 +901,7 @@ Removing instruction __b1_from___b4: Removing instruction __b2_from___b1: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction strip_from_main: Removing instruction __b1: @@ -911,13 +912,10 @@ Removing instruction __breturn: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction ldy #0 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/strncat-0.log b/src/test/ref/strncat-0.log index e0e2e2bab..1e8771407 100644 --- a/src/test/ref/strncat-0.log +++ b/src/test/ref/strncat-0.log @@ -424,7 +424,7 @@ Target platform is c64basic / MOS6502X // Test strncat() implementation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -671,7 +671,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test strncat() implementation // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -899,6 +899,7 @@ Removing instruction strncat_from___b3: Removing instruction __b4_from___b3: Removing instruction strncat_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction strncat_from_main: Removing instruction __b3: @@ -913,12 +914,9 @@ Removing instruction __breturn: Removing instruction __b3_from___b4: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing instruction lda #>5 with TYA -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-0.log b/src/test/ref/struct-0.log index f364e17c1..bbbc1427b 100644 --- a/src/test/ref/struct-0.log +++ b/src/test/ref/struct-0.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -179,7 +179,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-1.log b/src/test/ref/struct-1.log index d70d7f97a..afcd910e0 100644 --- a/src/test/ref/struct-1.log +++ b/src/test/ref/struct-1.log @@ -127,7 +127,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - two instances being used. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -200,7 +200,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - two instances being used. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -261,14 +261,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-10.log b/src/test/ref/struct-10.log index 06d9e23eb..0a4d92dd3 100644 --- a/src/test/ref/struct-10.log +++ b/src/test/ref/struct-10.log @@ -126,7 +126,7 @@ Target platform is c64basic / MOS6502X // Illustrates a problem with pointer sizeof()-rewriting for pointers inside structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -184,7 +184,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates a problem with pointer sizeof()-rewriting for pointers inside structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -233,14 +233,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-11.log b/src/test/ref/struct-11.log index bcc13a988..5f158a4f0 100644 --- a/src/test/ref/struct-11.log +++ b/src/test/ref/struct-11.log @@ -323,7 +323,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_PERSON_NAME = 1 @@ -509,7 +509,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_PERSON_NAME = 1 @@ -649,6 +649,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: @@ -659,11 +660,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-11b.log b/src/test/ref/struct-11b.log index c0f30a8c8..ad9924536 100644 --- a/src/test/ref/struct-11b.log +++ b/src/test/ref/struct-11b.log @@ -281,7 +281,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -422,7 +422,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -544,6 +544,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_person_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: @@ -553,11 +554,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-12.log b/src/test/ref/struct-12.log index f0171ea97..0cb4550f7 100644 --- a/src/test/ref/struct-12.log +++ b/src/test/ref/struct-12.log @@ -317,7 +317,7 @@ Target platform is c64basic / MOS6502X // Works because the struct is only handled as a value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -523,7 +523,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Works because the struct is only handled as a value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -677,6 +677,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: @@ -687,11 +688,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const byte*) $0[(number) $40] = (byte*) "jesper" diff --git a/src/test/ref/struct-13.log b/src/test/ref/struct-13.log index 98c1bea34..bd9c121b7 100644 --- a/src/test/ref/struct-13.log +++ b/src/test/ref/struct-13.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -179,7 +179,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-14.log b/src/test/ref/struct-14.log index 9e315d42d..cd1a8df6f 100644 --- a/src/test/ref/struct-14.log +++ b/src/test/ref/struct-14.log @@ -165,7 +165,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -227,7 +227,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -278,14 +278,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-15.log b/src/test/ref/struct-15.log index 6fd968cdf..179e7732a 100644 --- a/src/test/ref/struct-15.log +++ b/src/test/ref/struct-15.log @@ -130,7 +130,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - copying // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -212,7 +212,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - copying // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -279,14 +279,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-16.log b/src/test/ref/struct-16.log index 8d41a7400..8ab98db52 100644 --- a/src/test/ref/struct-16.log +++ b/src/test/ref/struct-16.log @@ -108,7 +108,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -173,7 +173,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -227,14 +227,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-17.log b/src/test/ref/struct-17.log index eb9b32aa6..911d92213 100644 --- a/src/test/ref/struct-17.log +++ b/src/test/ref/struct-17.log @@ -158,7 +158,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - struct containing struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_VECTOR = 4 @@ -249,7 +249,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - struct containing struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_VECTOR = 4 @@ -321,14 +321,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-18.log b/src/test/ref/struct-18.log index f351333f1..609fb2f68 100644 --- a/src/test/ref/struct-18.log +++ b/src/test/ref/struct-18.log @@ -130,7 +130,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - struct containing struct with initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_VECTOR = 4 @@ -206,7 +206,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - struct containing struct with initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_VECTOR = 4 @@ -267,14 +267,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Vector) $0 = { p: { x: (byte) 2, y: (byte) 3 }, q: { x: (byte) 4, y: (byte) 5 } } diff --git a/src/test/ref/struct-19.log b/src/test/ref/struct-19.log index b1dee44db..c4fc5b030 100644 --- a/src/test/ref/struct-19.log +++ b/src/test/ref/struct-19.log @@ -155,7 +155,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - struct containing struct with assignment of sub-struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_VECTOR = 4 @@ -269,7 +269,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - struct containing struct with assignment of sub-struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_VECTOR = 4 @@ -362,14 +362,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-2.log b/src/test/ref/struct-2.log index 2a3bea2b5..e4f2641ed 100644 --- a/src/test/ref/struct-2.log +++ b/src/test/ref/struct-2.log @@ -146,7 +146,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - two instances being copied (using assignment) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -232,7 +232,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - two instances being copied (using assignment) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -301,14 +301,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-20.log b/src/test/ref/struct-20.log index db01f2b91..0f3acf08b 100644 --- a/src/test/ref/struct-20.log +++ b/src/test/ref/struct-20.log @@ -152,7 +152,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - struct containing struct with initializer using sub-struct value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -257,7 +257,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - struct containing struct with initializer using sub-struct value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -342,14 +342,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-21.log b/src/test/ref/struct-21.log index bf7c41d1e..a94158d51 100644 --- a/src/test/ref/struct-21.log +++ b/src/test/ref/struct-21.log @@ -134,7 +134,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - address-of // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -200,7 +200,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - address-of // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -255,14 +255,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-22.log b/src/test/ref/struct-22.log index 57ab355e2..e7fc66a74 100644 --- a/src/test/ref/struct-22.log +++ b/src/test/ref/struct-22.log @@ -191,7 +191,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - call parameter (not supported yet) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -309,7 +309,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - call parameter (not supported yet) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -404,6 +404,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -411,11 +412,8 @@ Removing instruction print_from___b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-23.log b/src/test/ref/struct-23.log index 6100af305..c0ee9c11b 100644 --- a/src/test/ref/struct-23.log +++ b/src/test/ref/struct-23.log @@ -335,7 +335,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - call return value (not supported yet) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -506,7 +506,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - call return value (not supported yet) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -612,6 +612,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction getPoint_from_main: Removing instruction __b1: @@ -620,11 +621,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-24.log b/src/test/ref/struct-24.log index c9fae33b8..3aad17e9a 100644 --- a/src/test/ref/struct-24.log +++ b/src/test/ref/struct-24.log @@ -143,7 +143,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - member array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - member array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -288,14 +288,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-25.log b/src/test/ref/struct-25.log index 1d5ee8b32..bb2ee1006 100644 --- a/src/test/ref/struct-25.log +++ b/src/test/ref/struct-25.log @@ -86,7 +86,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - member array sizeof // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 4 @@ -135,7 +135,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - member array sizeof // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 4 @@ -176,14 +176,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-26.log b/src/test/ref/struct-26.log index 64ed7cfef..7bc01d875 100644 --- a/src/test/ref/struct-26.log +++ b/src/test/ref/struct-26.log @@ -153,7 +153,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - member is array, copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -243,7 +243,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - member is array, copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -316,14 +316,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-27.log b/src/test/ref/struct-27.log index 479117653..4b29b0d2d 100644 --- a/src/test/ref/struct-27.log +++ b/src/test/ref/struct-27.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - member is array, copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 4 @@ -195,7 +195,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - member is array, copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 4 @@ -254,14 +254,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, initials: (byte*) "jg" } diff --git a/src/test/ref/struct-28.log b/src/test/ref/struct-28.log index fc996a7d7..c8431da1f 100644 --- a/src/test/ref/struct-28.log +++ b/src/test/ref/struct-28.log @@ -124,7 +124,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - member is array, copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - member is array, copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -250,14 +250,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, initials: { (byte) 'j', (byte) 'g' } } diff --git a/src/test/ref/struct-29.log b/src/test/ref/struct-29.log index 4d55ad440..8e2ad0d41 100644 --- a/src/test/ref/struct-29.log +++ b/src/test/ref/struct-29.log @@ -118,7 +118,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - global main-mem struct should be initialized in data, not code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_INITIALS = 1 @@ -177,7 +177,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - global main-mem struct should be initialized in data, not code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_INITIALS = 1 @@ -225,14 +225,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-3.log b/src/test/ref/struct-3.log index 73d1022d1..1d536d55a 100644 --- a/src/test/ref/struct-3.log +++ b/src/test/ref/struct-3.log @@ -268,7 +268,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - passing struct value parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -374,7 +374,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - passing struct value parameter // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -457,17 +457,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-30.log b/src/test/ref/struct-30.log index 9b17a6cee..a596febc4 100644 --- a/src/test/ref/struct-30.log +++ b/src/test/ref/struct-30.log @@ -113,7 +113,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with MemberUnwind behavior - array member and local initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -181,7 +181,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with MemberUnwind behavior - array member and local initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -238,14 +238,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const byte*) $0[(number) 3] = (byte*) "jg" diff --git a/src/test/ref/struct-31.log b/src/test/ref/struct-31.log index 2c7834c9b..9648d43e5 100644 --- a/src/test/ref/struct-31.log +++ b/src/test/ref/struct-31.log @@ -94,7 +94,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with MemberUnwind behavior - simple members and local initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -148,7 +148,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with MemberUnwind behavior - simple members and local initializer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -193,14 +193,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-32.log b/src/test/ref/struct-32.log index 9a12e2fa6..f155ac8cc 100644 --- a/src/test/ref/struct-32.log +++ b/src/test/ref/struct-32.log @@ -130,7 +130,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -212,7 +212,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - copy assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -279,14 +279,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-33.log b/src/test/ref/struct-33.log index 98c1bea34..bd9c121b7 100644 --- a/src/test/ref/struct-33.log +++ b/src/test/ref/struct-33.log @@ -116,7 +116,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -179,7 +179,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - declaration, instantiation and usage // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-34.log b/src/test/ref/struct-34.log index 08ce3e591..e241de4e8 100644 --- a/src/test/ref/struct-34.log +++ b/src/test/ref/struct-34.log @@ -151,7 +151,7 @@ Target platform is c64basic / MOS6502X // Struct - forced __ssa // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const point_x = 2 @@ -205,7 +205,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Struct - forced __ssa // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const point_x = 2 @@ -250,14 +250,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-35.log b/src/test/ref/struct-35.log index 297f21494..7fbe6f9ff 100644 --- a/src/test/ref/struct-35.log +++ b/src/test/ref/struct-35.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - copy assignment through struct pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -179,7 +179,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - copy assignment through struct pointer // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -234,14 +234,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-36.log b/src/test/ref/struct-36.log index 27fe972d3..f63290de5 100644 --- a/src/test/ref/struct-36.log +++ b/src/test/ref/struct-36.log @@ -118,7 +118,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - global main-mem struct should be initialized in data, not code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_INITIALS = 1 @@ -179,7 +179,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - global main-mem struct should be initialized in data, not code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_INITIALS = 1 @@ -229,14 +229,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-37.log b/src/test/ref/struct-37.log index ce1a32a4a..d20575d95 100644 --- a/src/test/ref/struct-37.log +++ b/src/test/ref/struct-37.log @@ -206,7 +206,7 @@ Target platform is c64basic / MOS6502X // Complex C-struct - copying a sub-struct from C-standard layout to Unwound layout // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MOVE_TO = 0 @@ -350,7 +350,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Complex C-struct - copying a sub-struct from C-standard layout to Unwound layout // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MOVE_TO = 0 @@ -453,17 +453,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-38.log b/src/test/ref/struct-38.log index cff425edf..3f3409682 100644 --- a/src/test/ref/struct-38.log +++ b/src/test/ref/struct-38.log @@ -225,7 +225,7 @@ Target platform is c64basic / MOS6502X // Complex C-struct - copying a sub-struct with 2-byte members from C-standard layout to Unwound layout // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MOVE_TO = 0 @@ -408,7 +408,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Complex C-struct - copying a sub-struct with 2-byte members from C-standard layout to Unwound layout // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MOVE_TO = 0 @@ -528,17 +528,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-39.log b/src/test/ref/struct-39.log index d1df2b9f0..a1fa18828 100644 --- a/src/test/ref/struct-39.log +++ b/src/test/ref/struct-39.log @@ -217,7 +217,7 @@ Target platform is c64basic / MOS6502X // Complex C-struct - copying a sub-struct with 2-byte members from C-standard layout to C-standard layout (expecting a memcpy) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MOVE_TO = 0 @@ -397,7 +397,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Complex C-struct - copying a sub-struct with 2-byte members from C-standard layout to C-standard layout (expecting a memcpy) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MOVE_TO = 0 @@ -521,17 +521,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-4.log b/src/test/ref/struct-4.log index 46d7a98b9..77b1141ae 100644 --- a/src/test/ref/struct-4.log +++ b/src/test/ref/struct-4.log @@ -118,7 +118,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - initializing using a value list // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -173,7 +173,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - initializing using a value list // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -219,14 +219,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-40.log b/src/test/ref/struct-40.log index 8ac6351d7..b5cacf55c 100644 --- a/src/test/ref/struct-40.log +++ b/src/test/ref/struct-40.log @@ -366,7 +366,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with Unwound behavior - struct containing struct copying // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -484,7 +484,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with Unwound behavior - struct containing struct copying // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -577,14 +577,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-41.log b/src/test/ref/struct-41.log index 9f3302187..90dd45c03 100644 --- a/src/test/ref/struct-41.log +++ b/src/test/ref/struct-41.log @@ -443,7 +443,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with Unwound behavior - struct containing struct copying // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -664,7 +664,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with Unwound behavior - struct containing struct copying // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -812,14 +812,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 6, y: (byte) 7 } diff --git a/src/test/ref/struct-42.log b/src/test/ref/struct-42.log index 5dc06aa92..3dfc98b88 100644 --- a/src/test/ref/struct-42.log +++ b/src/test/ref/struct-42.log @@ -185,7 +185,7 @@ Target platform is c64basic / MOS6502X // Minimal struct with C-Standard behavior - copying into a struct array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -295,7 +295,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct with C-Standard behavior - copying into a struct array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -384,18 +384,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-5.log b/src/test/ref/struct-5.log index 026a23f64..deb9e0738 100644 --- a/src/test/ref/struct-5.log +++ b/src/test/ref/struct-5.log @@ -204,7 +204,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - struct return value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -277,7 +277,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - struct return value // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -342,17 +342,15 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction point_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-6.log b/src/test/ref/struct-6.log index 3a6d1bf55..b90915049 100644 --- a/src/test/ref/struct-6.log +++ b/src/test/ref/struct-6.log @@ -121,7 +121,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - nesting structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -182,7 +182,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - nesting structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -231,14 +231,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-7.log b/src/test/ref/struct-7.log index c0e957688..5c472620e 100644 --- a/src/test/ref/struct-7.log +++ b/src/test/ref/struct-7.log @@ -138,7 +138,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - nesting structs 3 levels // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -216,7 +216,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - nesting structs 3 levels // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -277,14 +277,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-8.log b/src/test/ref/struct-8.log index f9093dd42..8b0a70a25 100644 --- a/src/test/ref/struct-8.log +++ b/src/test/ref/struct-8.log @@ -132,7 +132,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - nested struct where a sub-struct is assigned out // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - nested struct where a sub-struct is assigned out // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -242,14 +242,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-9.log b/src/test/ref/struct-9.log index 5dd85084e..7cafe96f4 100644 --- a/src/test/ref/struct-9.log +++ b/src/test/ref/struct-9.log @@ -143,7 +143,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - nesting structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -204,7 +204,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - nesting structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -253,14 +253,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-directives.log b/src/test/ref/struct-directives.log index 6035bd411..995cdaa35 100644 --- a/src/test/ref/struct-directives.log +++ b/src/test/ref/struct-directives.log @@ -103,7 +103,7 @@ Target platform is c64basic / MOS6502X // Test that struct variable and members can both have type directives // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -157,7 +157,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that struct variable and members can both have type directives // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -201,14 +201,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (nomodify byte) $0::x diff --git a/src/test/ref/struct-pointer-to-member-2.log b/src/test/ref/struct-pointer-to-member-2.log index 6eb2592c8..89294f8e7 100644 --- a/src/test/ref/struct-pointer-to-member-2.log +++ b/src/test/ref/struct-pointer-to-member-2.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // Support for pointer to struct member // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_SCREEN_COLORS_BG0 = 1 @@ -171,7 +171,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Support for pointer to struct member // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_SCREEN_COLORS_BG0 = 1 @@ -221,14 +221,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-pointer-to-member.log b/src/test/ref/struct-pointer-to-member.log index b5f76bd74..b25bc67a6 100644 --- a/src/test/ref/struct-pointer-to-member.log +++ b/src/test/ref/struct-pointer-to-member.log @@ -105,7 +105,7 @@ Target platform is c64basic / MOS6502X // Support for pointer to struct member // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_SCREEN_COLORS_BG0 = 1 @@ -161,7 +161,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Support for pointer to struct member // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_SCREEN_COLORS_BG0 = 1 @@ -208,14 +208,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-pos-fill.log b/src/test/ref/struct-pos-fill.log index fe99b9073..6c2d05c69 100644 --- a/src/test/ref/struct-pos-fill.log +++ b/src/test/ref/struct-pos-fill.log @@ -410,7 +410,7 @@ Target platform is c64basic / MOS6502X // https://cc65.github.io/mailarchive/2010-09/8593.html?fbclid=IwAR1IF_cTdyWcFeKU93VfL2Un1EuLjkGh7O7dQ4EVj4kpJzJAj01dbmEFQt8 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POS_Y = 1 @@ -582,7 +582,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://cc65.github.io/mailarchive/2010-09/8593.html?fbclid=IwAR1IF_cTdyWcFeKU93VfL2Un1EuLjkGh7O7dQ4EVj4kpJzJAj01dbmEFQt8 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POS_Y = 1 @@ -715,6 +715,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: @@ -723,11 +724,8 @@ Removing instruction __b5: Removing instruction __b1_from___b5: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-0.log b/src/test/ref/struct-ptr-0.log index cfe3dc5d9..535f92ccd 100644 --- a/src/test/ref/struct-ptr-0.log +++ b/src/test/ref/struct-ptr-0.log @@ -226,7 +226,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - array of struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -368,7 +368,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - array of struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -476,19 +476,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-1.log b/src/test/ref/struct-ptr-1.log index b318fed25..3c54af890 100644 --- a/src/test/ref/struct-ptr-1.log +++ b/src/test/ref/struct-ptr-1.log @@ -245,7 +245,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - array of struct - near pointer math indexing // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFS_Y = 1 @@ -390,7 +390,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - array of struct - near pointer math indexing // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFS_Y = 1 @@ -495,19 +495,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-10.log b/src/test/ref/struct-ptr-10.log index fd53f25e0..386b9c7f7 100644 --- a/src/test/ref/struct-ptr-10.log +++ b/src/test/ref/struct-ptr-10.log @@ -220,7 +220,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - array with 256+ structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -414,7 +414,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - array with 256+ structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -591,19 +591,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-11.log b/src/test/ref/struct-ptr-11.log index 23f32cf90..6b7d465dd 100644 --- a/src/test/ref/struct-ptr-11.log +++ b/src/test/ref/struct-ptr-11.log @@ -219,7 +219,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - array of 3-byte structs (required *3) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -399,7 +399,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - array of 3-byte structs (required *3) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 3 @@ -523,19 +523,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-12-ref.log b/src/test/ref/struct-ptr-12-ref.log index 52d660f1e..296875e83 100644 --- a/src/test/ref/struct-ptr-12-ref.log +++ b/src/test/ref/struct-ptr-12-ref.log @@ -111,7 +111,7 @@ Target platform is c64basic / MOS6502X // Reference file for Minimal struct - using address-of // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -178,7 +178,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Reference file for Minimal struct - using address-of // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -230,14 +230,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-12.log b/src/test/ref/struct-ptr-12.log index fc7260b4a..b79d9b6aa 100644 --- a/src/test/ref/struct-ptr-12.log +++ b/src/test/ref/struct-ptr-12.log @@ -134,7 +134,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - using address-of // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -200,7 +200,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - using address-of // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -255,14 +255,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-ptr-13.log b/src/test/ref/struct-ptr-13.log index 23147c538..8b96d3a8b 100644 --- a/src/test/ref/struct-ptr-13.log +++ b/src/test/ref/struct-ptr-13.log @@ -175,7 +175,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - modifying pointer to struct in memory using arrow operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -241,7 +241,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - modifying pointer to struct in memory using arrow operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -296,14 +296,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-14.log b/src/test/ref/struct-ptr-14.log index d1e3771aa..9aed18e8d 100644 --- a/src/test/ref/struct-ptr-14.log +++ b/src/test/ref/struct-ptr-14.log @@ -202,7 +202,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - using address-of and passing it to a function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -291,7 +291,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - using address-of and passing it to a function // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -367,16 +367,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 2, y: (byte) 3 } diff --git a/src/test/ref/struct-ptr-15.log b/src/test/ref/struct-ptr-15.log index 07eec0ddd..bc066f71f 100644 --- a/src/test/ref/struct-ptr-15.log +++ b/src/test/ref/struct-ptr-15.log @@ -353,7 +353,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - using pointers to nested structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_CIRCLE = 3 @@ -542,7 +542,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - using pointers to nested structs // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_CIRCLE = 3 @@ -671,17 +671,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-16.log b/src/test/ref/struct-ptr-16.log index f6632792d..e195fb041 100644 --- a/src/test/ref/struct-ptr-16.log +++ b/src/test/ref/struct-ptr-16.log @@ -463,7 +463,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem with returning a dereferenced pointer to a struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -703,7 +703,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem with returning a dereferenced pointer to a struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -866,6 +866,7 @@ Removing instruction __breturn_from___b1: Removing instruction __breturn_from___b2: Removing instruction __breturn_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction get_from_main: Removing instruction __b2: @@ -876,7 +877,6 @@ Removing instruction __breturn: Removing instruction __b3: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -884,7 +884,6 @@ Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/struct-ptr-17.log b/src/test/ref/struct-ptr-17.log index abd00c961..8e62b06a2 100644 --- a/src/test/ref/struct-ptr-17.log +++ b/src/test/ref/struct-ptr-17.log @@ -307,7 +307,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem with returning a struct into a dereferenced pointer to a struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -465,7 +465,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem with returning a struct into a dereferenced pointer to a struct // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -578,6 +578,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction get_from_main: Removing instruction __b2: @@ -587,13 +588,10 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-18.log b/src/test/ref/struct-ptr-18.log index 2bc363e79..63564546e 100644 --- a/src/test/ref/struct-ptr-18.log +++ b/src/test/ref/struct-ptr-18.log @@ -287,7 +287,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem with passing struct array element as parameter to call // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -443,7 +443,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem with passing struct array element as parameter to call // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -562,19 +562,17 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 1, y: (byte) 2 } diff --git a/src/test/ref/struct-ptr-19.log b/src/test/ref/struct-ptr-19.log index 9f923d094..e06895572 100644 --- a/src/test/ref/struct-ptr-19.log +++ b/src/test/ref/struct-ptr-19.log @@ -258,7 +258,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem with passing struct pointer deref as parameter to call // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -383,7 +383,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem with passing struct pointer deref as parameter to call // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -478,6 +478,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -485,11 +486,8 @@ Removing instruction print_from___b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Point) $0 = { x: (byte) 1, y: (byte) 2 } diff --git a/src/test/ref/struct-ptr-2.log b/src/test/ref/struct-ptr-2.log index 1be7ffe5f..6fc6851a9 100644 --- a/src/test/ref/struct-ptr-2.log +++ b/src/test/ref/struct-ptr-2.log @@ -280,7 +280,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - array of struct - far pointer math indexing // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFS_Y = 1 @@ -455,7 +455,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - array of struct - far pointer math indexing // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFS_Y = 1 @@ -580,19 +580,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-20.log b/src/test/ref/struct-ptr-20.log index 590aac5b9..fc3f3fc82 100644 --- a/src/test/ref/struct-ptr-20.log +++ b/src/test/ref/struct-ptr-20.log @@ -263,7 +263,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem with conditions using negated struct references // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_SETTING = 2 @@ -386,7 +386,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem with conditions using negated struct references // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_SETTING = 2 @@ -494,17 +494,15 @@ Removing instruction __bend_from___b1: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b4: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-21.log b/src/test/ref/struct-ptr-21.log index 8ca93dbd9..53a382c7f 100644 --- a/src/test/ref/struct-ptr-21.log +++ b/src/test/ref/struct-ptr-21.log @@ -188,7 +188,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem with conditions using negated struct references // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_SETTING_BUF = 1 @@ -283,7 +283,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem with conditions using negated struct references // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_SETTING_BUF = 1 @@ -360,16 +360,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-22.log b/src/test/ref/struct-ptr-22.log index 790ce2c87..91ed471f6 100644 --- a/src/test/ref/struct-ptr-22.log +++ b/src/test/ref/struct-ptr-22.log @@ -965,7 +965,7 @@ Target platform is c64basic / MOS6502X // https://gitlab.com/camelot/kickc/issues/270 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_char_cursor = 6 @@ -1391,7 +1391,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://gitlab.com/camelot/kickc/issues/270 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_char_cursor = 4 @@ -1769,6 +1769,7 @@ Removing instruction __b1_from___b1: Removing instruction __b1_from_print_str: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -1796,11 +1797,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-23.log b/src/test/ref/struct-ptr-23.log index 5e63ad129..3ce56883b 100644 --- a/src/test/ref/struct-ptr-23.log +++ b/src/test/ref/struct-ptr-23.log @@ -329,7 +329,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = 5 @@ -545,7 +545,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = 5 @@ -689,17 +689,15 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_person_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-24.log b/src/test/ref/struct-ptr-24.log index ab1e1353d..615649652 100644 --- a/src/test/ref/struct-ptr-24.log +++ b/src/test/ref/struct-ptr-24.log @@ -184,7 +184,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_FILEENTRY = 2 @@ -306,7 +306,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_FILEENTRY = 2 @@ -415,6 +415,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: @@ -422,11 +423,8 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-25.log b/src/test/ref/struct-ptr-25.log index 0ecf3df4a..fec42412f 100644 --- a/src/test/ref/struct-ptr-25.log +++ b/src/test/ref/struct-ptr-25.log @@ -229,7 +229,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -271,7 +271,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -310,14 +310,12 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-26.log b/src/test/ref/struct-ptr-26.log index 6ef83b75a..fbc965a23 100644 --- a/src/test/ref/struct-ptr-26.log +++ b/src/test/ref/struct-ptr-26.log @@ -432,7 +432,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_char_cursor = 4 @@ -637,7 +637,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_char_cursor = 2 @@ -793,6 +793,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction print_uchar_from_print_uint: @@ -805,11 +806,8 @@ Removing instruction print_char_from___b1: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-28.log b/src/test/ref/struct-ptr-28.log index 652aad5f5..7c77d80ba 100644 --- a/src/test/ref/struct-ptr-28.log +++ b/src/test/ref/struct-ptr-28.log @@ -346,7 +346,7 @@ Target platform is c64basic / MOS6502X // https://gitlab.com/camelot/kickc/issues/314 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $11 @@ -575,7 +575,7 @@ ASSEMBLER BEFORE OPTIMIZATION // https://gitlab.com/camelot/kickc/issues/314 // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $11 @@ -743,6 +743,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: @@ -753,11 +754,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const struct Person) $0 = { id: (byte) 4, name: (byte*) "jesper" } diff --git a/src/test/ref/struct-ptr-3.log b/src/test/ref/struct-ptr-3.log index 6bffe234c..dc16545d6 100644 --- a/src/test/ref/struct-ptr-3.log +++ b/src/test/ref/struct-ptr-3.log @@ -187,7 +187,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - accessing pointer to struct in memory // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -249,7 +249,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - accessing pointer to struct in memory // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -300,14 +300,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-30.log b/src/test/ref/struct-ptr-30.log index e8bda15be..3cb24e4d3 100644 --- a/src/test/ref/struct-ptr-30.log +++ b/src/test/ref/struct-ptr-30.log @@ -300,7 +300,7 @@ Target platform is c64basic / MOS6502X // Test a struct array initialized with to few members (zero-filled for the rest) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -490,7 +490,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test a struct array initialized with to few members (zero-filled for the rest) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -623,19 +623,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-31.log b/src/test/ref/struct-ptr-31.log index 82b428d93..8da850ebf 100644 --- a/src/test/ref/struct-ptr-31.log +++ b/src/test/ref/struct-ptr-31.log @@ -333,7 +333,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $11 @@ -540,7 +540,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $11 @@ -699,6 +699,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from_main: Removing instruction print_person_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: @@ -708,11 +709,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-32.log b/src/test/ref/struct-ptr-32.log index 7f426e2ea..f0b36e6a9 100644 --- a/src/test/ref/struct-ptr-32.log +++ b/src/test/ref/struct-ptr-32.log @@ -267,7 +267,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $10 @@ -352,7 +352,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $10 @@ -422,14 +422,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-33.log b/src/test/ref/struct-ptr-33.log index 16e83fd6d..60f0c74bb 100644 --- a/src/test/ref/struct-ptr-33.log +++ b/src/test/ref/struct-ptr-33.log @@ -145,7 +145,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $10 @@ -210,7 +210,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_PERSON = $10 @@ -266,14 +266,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-34.log b/src/test/ref/struct-ptr-34.log index 6cb29a697..b33692952 100644 --- a/src/test/ref/struct-ptr-34.log +++ b/src/test/ref/struct-ptr-34.log @@ -316,7 +316,7 @@ Target platform is c64basic / MOS6502X // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -521,7 +521,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Example of a struct containing an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -675,6 +675,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_person_from_main: Removing instruction __b1: @@ -685,11 +686,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (const byte*) $0[(number) $10] = (byte*) "jesper" diff --git a/src/test/ref/struct-ptr-4.log b/src/test/ref/struct-ptr-4.log index 7d74bea27..0a2eaa046 100644 --- a/src/test/ref/struct-ptr-4.log +++ b/src/test/ref/struct-ptr-4.log @@ -298,7 +298,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - accessing pointer to struct in memory in a loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -503,7 +503,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - accessing pointer to struct in memory in a loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -652,19 +652,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-5.log b/src/test/ref/struct-ptr-5.log index 15d1dec49..65a7fd638 100644 --- a/src/test/ref/struct-ptr-5.log +++ b/src/test/ref/struct-ptr-5.log @@ -366,7 +366,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - simple linked list implemented using pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_ENTRY = 3 @@ -576,7 +576,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - simple linked list implemented using pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_ENTRY = 3 @@ -710,16 +710,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-6.log b/src/test/ref/struct-ptr-6.log index 1bca8d8bd..12a15b42c 100644 --- a/src/test/ref/struct-ptr-6.log +++ b/src/test/ref/struct-ptr-6.log @@ -187,7 +187,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - accessing pointer to struct in memory using arrow operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -249,7 +249,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - accessing pointer to struct in memory using arrow operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -300,14 +300,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-7.log b/src/test/ref/struct-ptr-7.log index 647f7116f..30966b085 100644 --- a/src/test/ref/struct-ptr-7.log +++ b/src/test/ref/struct-ptr-7.log @@ -235,7 +235,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - direct (constant) array access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -314,7 +314,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - direct (constant) array access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -378,14 +378,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-8.log b/src/test/ref/struct-ptr-8.log index 427c3854e..eb1292424 100644 --- a/src/test/ref/struct-ptr-8.log +++ b/src/test/ref/struct-ptr-8.log @@ -270,7 +270,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - variable array access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -464,7 +464,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - variable array access // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINT_Y = 1 @@ -589,19 +589,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/struct-ptr-9.log b/src/test/ref/struct-ptr-9.log index 0782fb71c..ec2794a4a 100644 --- a/src/test/ref/struct-ptr-9.log +++ b/src/test/ref/struct-ptr-9.log @@ -195,7 +195,7 @@ Target platform is c64basic / MOS6502X // Minimal struct - array access with struct value copying (and initializing) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -333,7 +333,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal struct - array access with struct value copying (and initializing) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_STRUCT_POINT = 2 @@ -439,19 +439,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/subexpr-optimize-0.log b/src/test/ref/subexpr-optimize-0.log index 87861812c..595fd9b1e 100644 --- a/src/test/ref/subexpr-optimize-0.log +++ b/src/test/ref/subexpr-optimize-0.log @@ -174,7 +174,7 @@ Target platform is c64basic / MOS6502X // The two examples of i*2 is detected as identical leading to optimized ASM where *2 is only calculated once // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -297,7 +297,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The two examples of i*2 is detected as identical leading to optimized ASM where *2 is only calculated once // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -387,17 +387,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/subexpr-optimize-1.log b/src/test/ref/subexpr-optimize-1.log index af532f387..ea8c2c146 100644 --- a/src/test/ref/subexpr-optimize-1.log +++ b/src/test/ref/subexpr-optimize-1.log @@ -211,7 +211,7 @@ Target platform is c64basic / MOS6502X // A sub-expression that should not be optimized (+1 to a pointer) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -300,7 +300,7 @@ ASSEMBLER BEFORE OPTIMIZATION // A sub-expression that should not be optimized (+1 to a pointer) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -371,17 +371,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/subexpr-optimize-2.log b/src/test/ref/subexpr-optimize-2.log index 181a93a24..e568cb0d3 100644 --- a/src/test/ref/subexpr-optimize-2.log +++ b/src/test/ref/subexpr-optimize-2.log @@ -199,7 +199,7 @@ Target platform is c64basic / MOS6502X // Tests optimization of identical sub-expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -338,7 +338,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimization of identical sub-expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -434,17 +434,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/subexpr-optimize-3.log b/src/test/ref/subexpr-optimize-3.log index ac68721ae..1f6fb3e74 100644 --- a/src/test/ref/subexpr-optimize-3.log +++ b/src/test/ref/subexpr-optimize-3.log @@ -215,7 +215,7 @@ Target platform is c64basic / MOS6502X // Tests optimization of identical sub-expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -370,7 +370,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimization of identical sub-expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -470,17 +470,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/subexpr-optimize-4.log b/src/test/ref/subexpr-optimize-4.log index 9f659dc2b..71ba8fd93 100644 --- a/src/test/ref/subexpr-optimize-4.log +++ b/src/test/ref/subexpr-optimize-4.log @@ -336,7 +336,7 @@ Target platform is c64basic / MOS6502X // Tests optimization of identical sub-expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -531,7 +531,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests optimization of identical sub-expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -676,19 +676,17 @@ Removing instruction __b4_from___b3: Removing instruction __b7_from___b5: Removing instruction __b7_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __b6: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/summin.log b/src/test/ref/summin.log index 96ef2fb6d..0d35a4eb7 100644 --- a/src/test/ref/summin.log +++ b/src/test/ref/summin.log @@ -300,7 +300,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -474,7 +474,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -584,6 +584,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction sum_from_main: Removing instruction __b1: @@ -594,11 +595,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/switch-0.log b/src/test/ref/switch-0.log index c5a915886..c195f781d 100644 --- a/src/test/ref/switch-0.log +++ b/src/test/ref/switch-0.log @@ -212,7 +212,7 @@ Target platform is c64basic / MOS6502X // Expected output 'd1444d' // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -346,7 +346,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Expected output 'd1444d' // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -462,6 +462,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b7: @@ -470,13 +471,10 @@ Removing instruction __b9: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/switch-1.log b/src/test/ref/switch-1.log index 930ff2067..b43eb7a4b 100644 --- a/src/test/ref/switch-1.log +++ b/src/test/ref/switch-1.log @@ -181,7 +181,7 @@ Target platform is c64basic / MOS6502X // Expected output 'a1aa1a' (numbers should be inverted) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -291,7 +291,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Expected output 'a1aa1a' (numbers should be inverted) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -387,6 +387,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b5: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b6: @@ -394,13 +395,10 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/switch-2.log b/src/test/ref/switch-2.log index 2b11efa02..b91ccc996 100644 --- a/src/test/ref/switch-2.log +++ b/src/test/ref/switch-2.log @@ -126,7 +126,7 @@ Target platform is c64basic / MOS6502X // Tests simple switch()-statement - not inside a loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -178,7 +178,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple switch()-statement - not inside a loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -226,15 +226,13 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/switch-4.log b/src/test/ref/switch-4.log index 830e35a49..34f4837af 100644 --- a/src/test/ref/switch-4.log +++ b/src/test/ref/switch-4.log @@ -168,7 +168,7 @@ Target platform is c64basic / MOS6502X // Expected output " 1 4 " // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -260,7 +260,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Expected output " 1 4 " // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -343,18 +343,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ternary-1.log b/src/test/ref/ternary-1.log index c91487949..ade4d27bf 100644 --- a/src/test/ref/ternary-1.log +++ b/src/test/ref/ternary-1.log @@ -173,7 +173,7 @@ Target platform is c64basic / MOS6502X // Tests the ternary operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -266,7 +266,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the ternary operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -352,18 +352,16 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b3_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ternary-2.log b/src/test/ref/ternary-2.log index 4e015ff8b..bd61fc72d 100644 --- a/src/test/ref/ternary-2.log +++ b/src/test/ref/ternary-2.log @@ -155,7 +155,7 @@ Target platform is c64basic / MOS6502X // Tests the ternary operator - when the condition is constant // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -213,7 +213,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the ternary operator - when the condition is constant // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -267,16 +267,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ternary-3.log b/src/test/ref/ternary-3.log index 6b8937ac1..16327175c 100644 --- a/src/test/ref/ternary-3.log +++ b/src/test/ref/ternary-3.log @@ -385,7 +385,7 @@ Target platform is c64basic / MOS6502X // Tests the ternary operator - when the condition is constant // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -587,7 +587,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the ternary operator - when the condition is constant // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -741,6 +741,7 @@ Removing instruction __b7: Removing instruction __b4_from___b6: Removing instruction __b4_from___b7: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b5: @@ -751,13 +752,10 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/ternary-inference.log b/src/test/ref/ternary-inference.log index 765f534cd..007450cc0 100644 --- a/src/test/ref/ternary-inference.log +++ b/src/test/ref/ternary-inference.log @@ -195,7 +195,7 @@ Target platform is c64basic / MOS6502X // Type inference into the ternary operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -298,7 +298,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Type inference into the ternary operator // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -388,18 +388,16 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b3_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_from___b1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-comments-block.log b/src/test/ref/test-comments-block.log index 9ffc29e7f..04f80c2ad 100644 --- a/src/test/ref/test-comments-block.log +++ b/src/test/ref/test-comments-block.log @@ -232,7 +232,7 @@ Target platform is c64basic / MOS6502X */ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // One of the bytes used for addition @@ -358,7 +358,7 @@ ASSEMBLER BEFORE OPTIMIZATION */ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // One of the bytes used for addition @@ -458,19 +458,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-comments-loop.log b/src/test/ref/test-comments-loop.log index d0249ed92..e721529b5 100644 --- a/src/test/ref/test-comments-loop.log +++ b/src/test/ref/test-comments-loop.log @@ -118,7 +118,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -189,7 +189,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -252,17 +252,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-comments-single.log b/src/test/ref/test-comments-single.log index ee1a326c5..dc30847ce 100644 --- a/src/test/ref/test-comments-single.log +++ b/src/test/ref/test-comments-single.log @@ -231,7 +231,7 @@ Target platform is c64basic / MOS6502X // Has a bunch of comments that will be moved into the generated ASM // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // One of the bytes used for addition @@ -355,7 +355,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Has a bunch of comments that will be moved into the generated ASM // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // One of the bytes used for addition @@ -454,19 +454,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-comments-usage.log b/src/test/ref/test-comments-usage.log index ced2be3f2..0c7ddc0fe 100644 --- a/src/test/ref/test-comments-usage.log +++ b/src/test/ref/test-comments-usage.log @@ -74,7 +74,7 @@ Target platform is c64basic / MOS6502X // Tests that single-line comments are only included once in the output // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -121,7 +121,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that single-line comments are only included once in the output // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -162,14 +162,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log index 6390fc63d..27b090436 100644 --- a/src/test/ref/test-comparisons-sword.log +++ b/src/test/ref/test-comparisons-sword.log @@ -2239,7 +2239,7 @@ Target platform is c64basic / MOS6502X // Test signed word comparisons // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const LT = 0 @@ -3277,7 +3277,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test signed word comparisons // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const LT = 0 @@ -4226,6 +4226,7 @@ Removing instruction print_char_from___b1: Removing instruction __b1_from_print_str: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -4278,7 +4279,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b8_from___b8 to __b5 @@ -4297,8 +4297,6 @@ Removing instruction jmp __b4 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #3 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [118] beq __b1 to bne Fixing long branch [122] beq __b2 to bne Fixing long branch [126] beq __b3 to bne diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log index c2a580f83..54f730bdf 100644 --- a/src/test/ref/test-comparisons-word.log +++ b/src/test/ref/test-comparisons-word.log @@ -2129,7 +2129,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // empty circle @@ -3097,7 +3097,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // empty circle @@ -3982,6 +3982,7 @@ Removing instruction __b6_from___b24: Removing instruction __b1_from_print_str: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -4032,7 +4033,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b8_from___b8 to __b5 @@ -4051,8 +4051,6 @@ Removing instruction jmp __b4 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #3 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [111] beq __b1 to bne Fixing long branch [115] beq __b2 to bne Fixing long branch [119] beq __b3 to bne diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log index 65464e650..00d211f85 100644 --- a/src/test/ref/test-comparisons.log +++ b/src/test/ref/test-comparisons.log @@ -3364,7 +3364,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = $18 @@ -5075,7 +5075,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 5 @@ -6563,6 +6563,7 @@ Removing instruction print_char_from___b4: Removing instruction __b1_from_print_str: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -6656,7 +6657,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b2_from___b1 to __b22 @@ -6680,8 +6680,6 @@ Relabelling long label __b19_from___b63 to __b39 Relabelling long label __b20_from___b64 to __b40 Relabelling long label __b21_from___b65 to __b41 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-division.log b/src/test/ref/test-division.log index fec015a08..630528567 100644 --- a/src/test/ref/test-division.log +++ b/src/test/ref/test-division.log @@ -4787,7 +4787,7 @@ Target platform is c64basic / MOS6502X // Test the binary division library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 3 @@ -7155,7 +7155,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test the binary division library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 2 @@ -9036,6 +9036,7 @@ Removing instruction print_str_from___b7: Removing instruction __b9_from___b8: Removing instruction print_ln_from___b9: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -9153,7 +9154,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Skipping double jump to __breturn in beq __b5 @@ -9166,7 +9166,6 @@ Removing instruction jmp __b1 Removing instruction jmp __b1 Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/test-interrupt-notype.log b/src/test/ref/test-interrupt-notype.log index f220267fd..632446278 100644 --- a/src/test/ref/test-interrupt-notype.log +++ b/src/test/ref/test-interrupt-notype.log @@ -114,7 +114,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label KERNEL_IRQ = $314 @@ -180,7 +180,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label KERNEL_IRQ = $314 @@ -239,14 +239,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-interrupt.log b/src/test/ref/test-interrupt.log index f220267fd..632446278 100644 --- a/src/test/ref/test-interrupt.log +++ b/src/test/ref/test-interrupt.log @@ -114,7 +114,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label KERNEL_IRQ = $314 @@ -180,7 +180,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label KERNEL_IRQ = $314 @@ -239,14 +239,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-kasm-pc.log b/src/test/ref/test-kasm-pc.log index ba97d4126..6549ad4ae 100644 --- a/src/test/ref/test-kasm-pc.log +++ b/src/test/ref/test-kasm-pc.log @@ -117,7 +117,7 @@ Target platform is c64basic / MOS6502X // Test inline KickAssembler code with PC location specification // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label TABLE = $2000 @@ -185,7 +185,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test inline KickAssembler code with PC location specification // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label TABLE = $2000 @@ -244,15 +244,13 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-kasm.log b/src/test/ref/test-kasm.log index 2110834d2..609b371b7 100644 --- a/src/test/ref/test-kasm.log +++ b/src/test/ref/test-kasm.log @@ -90,7 +90,7 @@ Target platform is c64basic / MOS6502X // Test inline KickAssembler code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -136,7 +136,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test inline KickAssembler code // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -176,14 +176,12 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction main_from___b1: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-keyboard-space.log b/src/test/ref/test-keyboard-space.log index 31bc7d698..5cc489d12 100644 --- a/src/test/ref/test-keyboard-space.log +++ b/src/test/ref/test-keyboard-space.log @@ -537,7 +537,7 @@ Target platform is c64basic / MOS6502X // Test keyboard input - test the space bar // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -730,7 +730,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test keyboard input - test the space bar // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_SPACE = $3c @@ -885,6 +885,7 @@ Removing instruction __bend_from___b1: Removing instruction __b2_from___b1: Removing instruction keyboard_key_pressed_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Removing instruction __b5: @@ -894,11 +895,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-keyboard.log b/src/test/ref/test-keyboard.log index 4d5bc5e64..b6875e4c1 100644 --- a/src/test/ref/test-keyboard.log +++ b/src/test/ref/test-keyboard.log @@ -1141,7 +1141,7 @@ Target platform is c64basic / MOS6502X // Test keyboard input - in the keyboard matrix and mapping screen codes to key codes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_3 = 8 @@ -1720,7 +1720,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test keyboard input - in the keyboard matrix and mapping screen codes to key codes // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const KEY_3 = 8 @@ -2185,6 +2185,7 @@ Removing instruction __b13_from___b18: Removing instruction __b13_from___b19: Removing instruction __b16_from___b13: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -2209,7 +2210,6 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b16_from___b16 to __b3 @@ -2218,8 +2218,6 @@ Removing instruction jmp __b5 Removing instruction jmp __b6 Removing instruction jmp __b12 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [75] bcc __b2 to bcs Fixing long branch [81] bcc __b2 to bcs diff --git a/src/test/ref/test-lohiconst.log b/src/test/ref/test-lohiconst.log index 2e38734d1..81fd15889 100644 --- a/src/test/ref/test-lohiconst.log +++ b/src/test/ref/test-lohiconst.log @@ -101,7 +101,7 @@ Target platform is c64basic / MOS6502X // PI in u[4.28] format // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const PI_u4f28 = $3243f6a9 @@ -160,7 +160,7 @@ ASSEMBLER BEFORE OPTIMIZATION // PI in u[4.28] format // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const PI_u4f28 = $3243f6a9 @@ -210,14 +210,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-lowhigh.log b/src/test/ref/test-lowhigh.log index 451c54b2a..ba2924e30 100644 --- a/src/test/ref/test-lowhigh.log +++ b/src/test/ref/test-lowhigh.log @@ -1315,7 +1315,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 6 @@ -2028,7 +2028,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 6 @@ -2642,6 +2642,7 @@ Removing instruction __b15_from___b14: Removing instruction __b1_from_print_ln: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -2693,11 +2694,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log index fd8f4d054..f902af0ef 100644 --- a/src/test/ref/test-multiply-16bit.log +++ b/src/test/ref/test-multiply-16bit.log @@ -5055,7 +5055,7 @@ Target platform is c64basic / MOS6502X // Test the fast multiplication library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -8153,7 +8153,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test the fast multiplication library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -10636,6 +10636,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -10758,7 +10759,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -10785,7 +10785,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Removing instruction lda.z a+1 Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __b2: Removing instruction __breturn: diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log index f4287becd..22be0376f 100644 --- a/src/test/ref/test-multiply-8bit.log +++ b/src/test/ref/test-multiply-8bit.log @@ -5225,7 +5225,7 @@ Target platform is c64basic / MOS6502X // Test the fast multiplication library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -8048,7 +8048,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test the fast multiplication library // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label BG_COLOR = $d021 @@ -10430,6 +10430,7 @@ Removing instruction __b8_from___b9: Removing instruction __b3_from___b2: Removing instruction __b3_from___b4: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1: @@ -10568,7 +10569,6 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -10595,7 +10595,6 @@ Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #<0 Removing instruction lda.z a Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Removing instruction __b2: Removing instruction __breturn: diff --git a/src/test/ref/test-scroll-up.log b/src/test/ref/test-scroll-up.log index e67c65a89..914a6c592 100644 --- a/src/test/ref/test-scroll-up.log +++ b/src/test/ref/test-scroll-up.log @@ -593,7 +593,7 @@ Target platform is c64basic / MOS6502X // Tests different ways of scrolling up the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -1019,7 +1019,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests different ways of scrolling up the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -1390,6 +1390,7 @@ Removing instruction __b1_from___b3: Removing instruction __b2_from___b1: Removing instruction __b2_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction scrollup1_from_main: Removing instruction __b1: @@ -1410,7 +1411,6 @@ Removing instruction __b4: Removing instruction __b1_from___b4: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b2_from___b1 to __b4 @@ -1418,8 +1418,6 @@ Succesful ASM optimization Pass5RelabelLongLabels Removing instruction jmp __b1 Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-signed-word-minus-byte.log b/src/test/ref/test-signed-word-minus-byte.log index 84ebd9e25..28e478026 100644 --- a/src/test/ref/test-signed-word-minus-byte.log +++ b/src/test/ref/test-signed-word-minus-byte.log @@ -1040,7 +1040,7 @@ Target platform is c64basic / MOS6502X // Tests subtracting bytes from signed words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 5 @@ -1527,7 +1527,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests subtracting bytes from signed words // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 5 @@ -1958,6 +1958,7 @@ Removing instruction __b2_from___b4: Removing instruction __b1_from_print_sint: Removing instruction print_char_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_cls_from_main: Removing instruction __b1_from_main: @@ -1988,11 +1989,8 @@ Removing instruction __b1_from_memset: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/test-word-size-arrays.log b/src/test/ref/test-word-size-arrays.log index 77d9f380a..6aa96a686 100644 --- a/src/test/ref/test-word-size-arrays.log +++ b/src/test/ref/test-word-size-arrays.log @@ -298,7 +298,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -521,7 +521,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -703,6 +703,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b5_from___b1: @@ -712,13 +713,10 @@ Removing instruction __b4: Removing instruction __b1_from___b4: Removing instruction __b2_from___b3: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Relabelling long label __b2_from___b1 to __b4 Succesful ASM optimization Pass5RelabelLongLabels -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/tetris-npe.log b/src/test/ref/tetris-npe.log index a21b5ed36..06cb8a42d 100644 --- a/src/test/ref/tetris-npe.log +++ b/src/test/ref/tetris-npe.log @@ -223,7 +223,7 @@ Target platform is c64basic / MOS6502X // NullPointerException using current_movedown_rate in the main loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RATE = $32 @@ -319,7 +319,7 @@ ASSEMBLER BEFORE OPTIMIZATION // NullPointerException using current_movedown_rate in the main loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const RATE = $32 @@ -406,19 +406,17 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: Removing instruction __b4: Removing instruction __b1_from___b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/textbox.log b/src/test/ref/textbox.log index dec63e6d1..9120fe797 100644 --- a/src/test/ref/textbox.log +++ b/src/test/ref/textbox.log @@ -2085,7 +2085,7 @@ Target platform is c64basic / MOS6502X /* Textbox routine with word wrap for KickC by Scan/Desire */ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -3452,7 +3452,7 @@ ASSEMBLER BEFORE OPTIMIZATION /* Textbox routine with word wrap for KickC by Scan/Desire */ // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -4397,6 +4397,7 @@ Removing instruction __b8_from___b12: Removing instruction __b10_from___b11: Removing instruction __b10_from___b9: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3: @@ -4425,7 +4426,6 @@ Removing instruction __b13: Removing instruction __b8: Removing instruction __b12: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -4441,8 +4441,6 @@ Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination Removing instruction ldy.z i Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination Fixing long branch [228] bne __b1 to beq Fixing long branch [323] bcc __b2 to bcs Fixing long branch [366] bcc __b5 to bcs diff --git a/src/test/ref/tod018-problem.log b/src/test/ref/tod018-problem.log index 67e84eebf..c6aa9fcfb 100644 --- a/src/test/ref/tod018-problem.log +++ b/src/test/ref/tod018-problem.log @@ -84,7 +84,7 @@ Target platform is c64basic / MOS6502X // Tests a problem with tod018 not calculating types correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -132,7 +132,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a problem with tod018 not calculating types correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -174,14 +174,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/travis1.log b/src/test/ref/travis1.log index c683bfe0f..27240cc22 100644 --- a/src/test/ref/travis1.log +++ b/src/test/ref/travis1.log @@ -792,7 +792,7 @@ Target platform is c64basic / MOS6502X // Adding a missing word-fragment for Travis Fisher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const READY_FRAMES = 5 @@ -1149,7 +1149,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Adding a missing word-fragment for Travis Fisher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const READY_FRAMES = 5 @@ -1463,6 +1463,7 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction print_str_ln_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: @@ -1480,13 +1481,10 @@ Removing instruction __b1_from_game_ready: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/true-inline-words.log b/src/test/ref/true-inline-words.log index 8dc446b9f..f25c6a37d 100644 --- a/src/test/ref/true-inline-words.log +++ b/src/test/ref/true-inline-words.log @@ -197,7 +197,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -271,7 +271,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -338,15 +338,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn Succesful ASM optimization Pass5DoubleJumpElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/type-inference.log b/src/test/ref/type-inference.log index ea57ba468..535fc2c7b 100644 --- a/src/test/ref/type-inference.log +++ b/src/test/ref/type-inference.log @@ -145,7 +145,7 @@ Target platform is c64basic / MOS6502X // Test inference of integer types in expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -236,7 +236,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test inference of integer types in expressions // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -308,17 +308,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/type-mix.log b/src/test/ref/type-mix.log index 2f384b152..1712838f9 100644 --- a/src/test/ref/type-mix.log +++ b/src/test/ref/type-mix.log @@ -156,7 +156,7 @@ Target platform is c64basic / MOS6502X // Tests that mixing types can synthesize a fragment correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -248,7 +248,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests that mixing types can synthesize a fragment correctly // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -329,17 +329,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/type-signed.log b/src/test/ref/type-signed.log index 853f99d6e..e6867e2d8 100644 --- a/src/test/ref/type-signed.log +++ b/src/test/ref/type-signed.log @@ -791,7 +791,7 @@ Target platform is c64basic / MOS6502X // Tests the special "signed" / "unsigned" without a simple type name // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 7 @@ -1207,7 +1207,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests the special "signed" / "unsigned" without a simple type name // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label print_line_cursor = 7 @@ -1577,6 +1577,7 @@ Removing instruction print_uint_from___b2: Removing instruction __b1_from_print_sint: Removing instruction print_char_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -1600,11 +1601,8 @@ Removing instruction __b3: Removing instruction __breturn: Removing instruction __b4: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typedef-0.log b/src/test/ref/typedef-0.log index 5b64ec4ae..609419880 100644 --- a/src/test/ref/typedef-0.log +++ b/src/test/ref/typedef-0.log @@ -74,7 +74,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -120,7 +120,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -161,14 +161,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typedef-1.log b/src/test/ref/typedef-1.log index 6ddb87940..72b459093 100644 --- a/src/test/ref/typedef-1.log +++ b/src/test/ref/typedef-1.log @@ -112,7 +112,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINTDEF_Y = 1 @@ -166,7 +166,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const OFFSET_STRUCT_POINTDEF_Y = 1 @@ -212,14 +212,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typedef-3.log b/src/test/ref/typedef-3.log index e0fa8f5dc..fe5873162 100644 --- a/src/test/ref/typedef-3.log +++ b/src/test/ref/typedef-3.log @@ -120,7 +120,7 @@ Target platform is c64basic / MOS6502X // Typedef an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -194,7 +194,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Typedef an array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -259,17 +259,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typedef-5.log b/src/test/ref/typedef-5.log index 19bc2ccdb..8ea662fd9 100644 --- a/src/test/ref/typedef-5.log +++ b/src/test/ref/typedef-5.log @@ -92,7 +92,7 @@ Target platform is c64basic / MOS6502X // Typedef a const/volatile type and instantiate a pointer to it // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -144,7 +144,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Typedef a const/volatile type and instantiate a pointer to it // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -189,14 +189,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typedef-6.log b/src/test/ref/typedef-6.log index b9c879406..07df569e7 100644 --- a/src/test/ref/typedef-6.log +++ b/src/test/ref/typedef-6.log @@ -92,7 +92,7 @@ Target platform is c64basic / MOS6502X // Typedef pointer to const/volatile type and instantiate it // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -144,7 +144,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Typedef pointer to const/volatile type and instantiate it // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -189,14 +189,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typedef-7.log b/src/test/ref/typedef-7.log index 3812e0d26..4570635ce 100644 --- a/src/test/ref/typedef-7.log +++ b/src/test/ref/typedef-7.log @@ -92,7 +92,7 @@ Target platform is c64basic / MOS6502X // Typedef pointer to const/volatile type and instantiate it to const variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -144,7 +144,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Typedef pointer to const/volatile type and instantiate it to const variable // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -189,14 +189,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typeid-plus-byte-problem.log b/src/test/ref/typeid-plus-byte-problem.log index 41713bbc6..7cc1e447d 100644 --- a/src/test/ref/typeid-plus-byte-problem.log +++ b/src/test/ref/typeid-plus-byte-problem.log @@ -91,7 +91,7 @@ Target platform is c64basic / MOS6502X // Test that byte+byte creates a byte - even when there is a value overflow // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -139,7 +139,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that byte+byte creates a byte - even when there is a value overflow // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -181,14 +181,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typeid-plus-bytes.log b/src/test/ref/typeid-plus-bytes.log index 28c4bb793..5317bc061 100644 --- a/src/test/ref/typeid-plus-bytes.log +++ b/src/test/ref/typeid-plus-bytes.log @@ -1108,7 +1108,7 @@ Target platform is c64basic / MOS6502X // Test that plus creates the expected type for all legal combinations of bytes (signed/unsigned - constant/variable) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const TYPEID_BYTE = 1 @@ -1479,7 +1479,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that plus creates the expected type for all legal combinations of bytes (signed/unsigned - constant/variable) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const TYPEID_BYTE = 1 @@ -1772,6 +1772,7 @@ Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __b3_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2: @@ -1782,11 +1783,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typeid-simple.log b/src/test/ref/typeid-simple.log index 1fe8baa0d..ea863c9a0 100644 --- a/src/test/ref/typeid-simple.log +++ b/src/test/ref/typeid-simple.log @@ -454,7 +454,7 @@ Target platform is c64basic / MOS6502X // Test typeid() of the different types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const TYPEID_VOID = 0 @@ -634,7 +634,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test typeid() of the different types // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const TYPEID_VOID = 0 @@ -783,14 +783,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/typeinference-problem.log b/src/test/ref/typeinference-problem.log index c52dd43e7..3a57e5414 100644 --- a/src/test/ref/typeinference-problem.log +++ b/src/test/ref/typeinference-problem.log @@ -137,7 +137,7 @@ Target platform is c64basic / MOS6502X // java.lang.NullPointerException during Pass2TypeInference.java // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -218,7 +218,7 @@ ASSEMBLER BEFORE OPTIMIZATION // java.lang.NullPointerException during Pass2TypeInference.java // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -286,17 +286,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unary-plus.log b/src/test/ref/unary-plus.log index 47daf7e6a..0965eaa72 100644 --- a/src/test/ref/unary-plus.log +++ b/src/test/ref/unary-plus.log @@ -132,7 +132,7 @@ Target platform is c64basic / MOS6502X // Test unary plus // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -198,7 +198,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test unary plus // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_SIGNED_WORD = 2 @@ -255,14 +255,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/uninitialized.log b/src/test/ref/uninitialized.log index d3520a669..b1983a4bb 100644 --- a/src/test/ref/uninitialized.log +++ b/src/test/ref/uninitialized.log @@ -142,7 +142,7 @@ Target platform is c64basic / MOS6502X // Tests uninitialized values of variables. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 0 @@ -205,7 +205,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests uninitialized values of variables. // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 0 @@ -262,14 +262,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unroll-for-min.log b/src/test/ref/unroll-for-min.log index 1ff10f623..1bfbbd823 100644 --- a/src/test/ref/unroll-for-min.log +++ b/src/test/ref/unroll-for-min.log @@ -171,7 +171,7 @@ Target platform is c64basic / MOS6502X // Minimal unrolled ranged for() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -236,7 +236,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal unrolled ranged for() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -297,20 +297,18 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b1_1: Removing instruction __b1_2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction lda #'a' Removing instruction lda #'a' Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unroll-loop-modifyvar.log b/src/test/ref/unroll-loop-modifyvar.log index 68ae9cbaa..92c3877d2 100644 --- a/src/test/ref/unroll-loop-modifyvar.log +++ b/src/test/ref/unroll-loop-modifyvar.log @@ -385,7 +385,7 @@ Target platform is c64basic / MOS6502X // An unrolled loop modifying a var used later // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -513,7 +513,7 @@ ASSEMBLER BEFORE OPTIMIZATION // An unrolled loop modifying a var used later // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -637,6 +637,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b1_1: @@ -652,11 +653,8 @@ Removing instruction __b1_10: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unroll-screenfill-for-double.log b/src/test/ref/unroll-screenfill-for-double.log index d7e4a5507..14656d146 100644 --- a/src/test/ref/unroll-screenfill-for-double.log +++ b/src/test/ref/unroll-screenfill-for-double.log @@ -1332,7 +1332,7 @@ Target platform is c64basic / MOS6502X // Fills the screen using two unrolled ranged for()-loops // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -2223,7 +2223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fills the screen using two unrolled ranged for()-loops // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -3110,6 +3110,7 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2_1: @@ -3234,7 +3235,6 @@ Removing instruction __b2_119: Removing instruction __b2_120: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction lda #0 @@ -3348,8 +3348,6 @@ Removing instruction lda #$a Removing instruction lda #$a Removing instruction lda #$a Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unroll-screenfill-for.log b/src/test/ref/unroll-screenfill-for.log index 8c26acb05..c39bb2f95 100644 --- a/src/test/ref/unroll-screenfill-for.log +++ b/src/test/ref/unroll-screenfill-for.log @@ -849,7 +849,7 @@ Target platform is c64basic / MOS6502X // Fills the screen using an unrolled inner ranged for()-loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1091,7 +1091,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fills the screen using an unrolled inner ranged for()-loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1331,6 +1331,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2_1: @@ -1360,13 +1361,10 @@ Removing instruction __b2_24: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unroll-screenfill-while.log b/src/test/ref/unroll-screenfill-while.log index 52a228224..9bd3ef29f 100644 --- a/src/test/ref/unroll-screenfill-while.log +++ b/src/test/ref/unroll-screenfill-while.log @@ -877,7 +877,7 @@ Target platform is c64basic / MOS6502X // Fills the screen using an unrolled inner while()-loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1119,7 +1119,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Fills the screen using an unrolled inner while()-loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -1359,6 +1359,7 @@ Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Removing instruction __b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b3_1: @@ -1388,13 +1389,10 @@ Removing instruction __b3_24: Removing instruction __b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b2 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unroll-while-min.log b/src/test/ref/unroll-while-min.log index 538033a6b..67f7a1a04 100644 --- a/src/test/ref/unroll-while-min.log +++ b/src/test/ref/unroll-while-min.log @@ -171,7 +171,7 @@ Target platform is c64basic / MOS6502X // Minimal unrolled while() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -229,7 +229,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Minimal unrolled while() loop // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -283,18 +283,16 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2_1: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction lda #'a' Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unused-irq.log b/src/test/ref/unused-irq.log index 1ae22cdb9..8b851e0b5 100644 --- a/src/test/ref/unused-irq.log +++ b/src/test/ref/unused-irq.log @@ -115,7 +115,7 @@ Target platform is c64basic / MOS6502X // Unused interrupts pointing to each other but never used from main loop - should be optimized away // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -198,7 +198,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Unused interrupts pointing to each other but never used from main loop - should be optimized away // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -271,16 +271,14 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unused-method.log b/src/test/ref/unused-method.log index 033a4d443..2b7f92054 100644 --- a/src/test/ref/unused-method.log +++ b/src/test/ref/unused-method.log @@ -85,7 +85,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -130,7 +130,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -170,14 +170,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unused-vars.log b/src/test/ref/unused-vars.log index 400cd045a..4e4db120a 100644 --- a/src/test/ref/unused-vars.log +++ b/src/test/ref/unused-vars.log @@ -236,7 +236,7 @@ Target platform is c64basic / MOS6502X // used vars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -330,7 +330,7 @@ ASSEMBLER BEFORE OPTIMIZATION // used vars // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -411,19 +411,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction s_from_main: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/unusedblockproblem.log b/src/test/ref/unusedblockproblem.log index 4e4516986..42ca56d28 100644 --- a/src/test/ref/unusedblockproblem.log +++ b/src/test/ref/unusedblockproblem.log @@ -121,7 +121,7 @@ Target platform is c64basic / MOS6502X // Problem with eliminating unused blocks/vars after the infinite loop (symbol line#2 not removed from symbol table) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -166,7 +166,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Problem with eliminating unused blocks/vars after the infinite loop (symbol line#2 not removed from symbol table) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -207,13 +207,11 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/useglobal.log b/src/test/ref/useglobal.log index 3260e5572..ea6d85bf5 100644 --- a/src/test/ref/useglobal.log +++ b/src/test/ref/useglobal.log @@ -81,7 +81,7 @@ Target platform is c64basic / MOS6502X // Tests procedures using global variables (should not fail) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -127,7 +127,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests procedures using global variables (should not fail) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -167,14 +167,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/useuninitialized.log b/src/test/ref/useuninitialized.log index b9ee6bebb..38a282ab0 100644 --- a/src/test/ref/useuninitialized.log +++ b/src/test/ref/useuninitialized.log @@ -156,7 +156,7 @@ Target platform is c64basic / MOS6502X // Use an uninitialized variable - should use the default value (0)! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 3 @@ -208,7 +208,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Use an uninitialized variable - should use the default value (0)! // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 3 @@ -253,14 +253,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-export.log b/src/test/ref/var-export.log index 88ee75729..0b4b55d9d 100644 --- a/src/test/ref/var-export.log +++ b/src/test/ref/var-export.log @@ -82,7 +82,7 @@ Target platform is c64basic / MOS6502X // Test the export directive usable for ensuring a data variable is always added to the output - even if it is never used // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -130,7 +130,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test the export directive usable for ensuring a data variable is always added to the output - even if it is never used // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -172,14 +172,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-forward-problem.log b/src/test/ref/var-forward-problem.log index 3fc7ddc43..3f5c77a4c 100644 --- a/src/test/ref/var-forward-problem.log +++ b/src/test/ref/var-forward-problem.log @@ -77,7 +77,7 @@ Target platform is c64basic / MOS6502X // Illustrates the problem with variable forward references not working // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 'a' @@ -124,7 +124,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates the problem with variable forward references not working // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 'a' @@ -165,14 +165,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-forward-problem2.log b/src/test/ref/var-forward-problem2.log index 31e0c616c..f4f8f9d24 100644 --- a/src/test/ref/var-forward-problem2.log +++ b/src/test/ref/var-forward-problem2.log @@ -123,7 +123,7 @@ Target platform is c64basic / MOS6502X // Illustrates the problem with variable forward references not working // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 'a' @@ -170,7 +170,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Illustrates the problem with variable forward references not working // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const b = 'a' @@ -211,14 +211,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-init-problem.log b/src/test/ref/var-init-problem.log index 60a004a7e..4d7946945 100644 --- a/src/test/ref/var-init-problem.log +++ b/src/test/ref/var-init-problem.log @@ -102,7 +102,7 @@ Target platform is c64basic / MOS6502X // Variables without initialization causes problems when compiling // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -148,7 +148,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Variables without initialization causes problems when compiling // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -188,14 +188,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-register-noarg.log b/src/test/ref/var-register-noarg.log index 2ca0710e6..010badfce 100644 --- a/src/test/ref/var-register-noarg.log +++ b/src/test/ref/var-register-noarg.log @@ -134,7 +134,7 @@ Target platform is c64basic / MOS6502X // Test declaring a variable as register with no information about which register (for compatibility with standard C) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -218,7 +218,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declaring a variable as register with no information about which register (for compatibility with standard C) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -287,16 +287,14 @@ Removing instruction __b1: Removing instruction main_from___b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-register-zp-3.log b/src/test/ref/var-register-zp-3.log index d6e0a9c9a..b04cf6781 100644 --- a/src/test/ref/var-register-zp-3.log +++ b/src/test/ref/var-register-zp-3.log @@ -270,7 +270,7 @@ Target platform is c64basic / MOS6502X // Test declaring a variable as register on a specific ZP address // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -451,7 +451,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declaring a variable as register on a specific ZP address // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label screen = $400 @@ -596,6 +596,7 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print2_from_main: Removing instruction __b1: @@ -608,11 +609,8 @@ Removing instruction __b3: Removing instruction __b1_from___b3: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-register-zp.log b/src/test/ref/var-register-zp.log index 82789d7ab..3dae7d9b1 100644 --- a/src/test/ref/var-register-zp.log +++ b/src/test/ref/var-register-zp.log @@ -161,7 +161,7 @@ Target platform is c64basic / MOS6502X // Test declaring a variable as register on a specific ZP address // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -286,7 +286,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test declaring a variable as register on a specific ZP address // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -384,14 +384,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/var-register.log b/src/test/ref/var-register.log index e807b0b79..cd07d6114 100644 --- a/src/test/ref/var-register.log +++ b/src/test/ref/var-register.log @@ -292,7 +292,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -445,7 +445,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -586,6 +586,7 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b6: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction print_from___b3: @@ -595,15 +596,12 @@ Removing instruction __b5: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Removing instruction jmp __b2 Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/varmodel-ma_mem-2.log b/src/test/ref/varmodel-ma_mem-2.log index 90916abd1..7b2234757 100644 --- a/src/test/ref/varmodel-ma_mem-2.log +++ b/src/test/ref/varmodel-ma_mem-2.log @@ -110,7 +110,7 @@ Target platform is c64basic / MOS6502X // Test memory model multiple-assignment/main memory for all non-pointer variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -189,7 +189,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test memory model multiple-assignment/main memory for all non-pointer variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -256,14 +256,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/varmodel-ma_mem-3.log b/src/test/ref/varmodel-ma_mem-3.log index d1973c145..57af222a7 100644 --- a/src/test/ref/varmodel-ma_mem-3.log +++ b/src/test/ref/varmodel-ma_mem-3.log @@ -228,7 +228,7 @@ Target platform is c64basic / MOS6502X // Test two different memory models // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -391,7 +391,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test two different memory models // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -534,6 +534,7 @@ Removing instruction __b1_from_main: Removing instruction model_ssa_zp_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __breturn: @@ -541,13 +542,10 @@ Removing instruction __b1_from_model_ssa_zp: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/varmodel-ma_mem-4.log b/src/test/ref/varmodel-ma_mem-4.log index 88bb82b0f..201f930c7 100644 --- a/src/test/ref/varmodel-ma_mem-4.log +++ b/src/test/ref/varmodel-ma_mem-4.log @@ -164,7 +164,7 @@ Target platform is c64basic / MOS6502X // Constant memory variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const a = 'a' @@ -287,7 +287,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Constant memory variables // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const a = 'a' @@ -380,17 +380,15 @@ Removing instruction __b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/varmodel-ma_mem-5.log b/src/test/ref/varmodel-ma_mem-5.log index 3c2c6faec..cd8fb3dfc 100644 --- a/src/test/ref/varmodel-ma_mem-5.log +++ b/src/test/ref/varmodel-ma_mem-5.log @@ -107,7 +107,7 @@ Target platform is c64basic / MOS6502X // Demonstrates problem where post-increase on __ma memory variables is performed to early // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -177,7 +177,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Demonstrates problem where post-increase on __ma memory variables is performed to early // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -234,14 +234,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/varmodel-ma_mem.log b/src/test/ref/varmodel-ma_mem.log index 9d2bc256e..dcdb9648e 100644 --- a/src/test/ref/varmodel-ma_mem.log +++ b/src/test/ref/varmodel-ma_mem.log @@ -110,7 +110,7 @@ Target platform is c64basic / MOS6502X // Test memory model multiple-assignment/main memory for all variables (here local variables) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -193,7 +193,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test memory model multiple-assignment/main memory for all variables (here local variables) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -264,14 +264,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/void-parameter.log b/src/test/ref/void-parameter.log index b14ff7a0f..d837e65fd 100644 --- a/src/test/ref/void-parameter.log +++ b/src/test/ref/void-parameter.log @@ -190,7 +190,7 @@ Target platform is c64basic / MOS6502X // Output is "..." in the top left corner of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -283,7 +283,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Output is "..." in the top left corner of the screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -369,6 +369,7 @@ Removing instruction print_from___b1: Removing instruction __b2_from___b1: Removing instruction print_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction print_from_main: Removing instruction __b1: @@ -376,11 +377,8 @@ Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/volatile-1.log b/src/test/ref/volatile-1.log index 1760384d8..552c8c4dc 100644 --- a/src/test/ref/volatile-1.log +++ b/src/test/ref/volatile-1.log @@ -104,7 +104,7 @@ Target platform is c64basic / MOS6502X // Test that volatile vars are turned into load/store // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -172,7 +172,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test that volatile vars are turned into load/store // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -230,14 +230,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/voronoi.log b/src/test/ref/voronoi.log index 8e4718cd3..4c5439565 100644 --- a/src/test/ref/voronoi.log +++ b/src/test/ref/voronoi.log @@ -1248,7 +1248,7 @@ Target platform is c64basic / MOS6502X // The screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const FILL = $e6 @@ -1880,7 +1880,7 @@ ASSEMBLER BEFORE OPTIMIZATION // The screen // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const FILL = $e6 @@ -2391,6 +2391,7 @@ Removing instruction __b7_from___b6: Removing instruction __b8_from___b12: Removing instruction __b8_from___b13: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction initscreen_from_main: Removing instruction __b2: @@ -2415,7 +2416,6 @@ Removing instruction __b1_from_initscreen: Removing instruction __breturn: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Replacing jump to rts with rts in jmp __breturn @@ -2428,7 +2428,6 @@ Removing instruction lda #$28 Removing instruction lda.z x Removing instruction lda.z y Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination diff --git a/src/test/ref/wfragment1.log b/src/test/ref/wfragment1.log index 9c6831acb..2943bb335 100644 --- a/src/test/ref/wfragment1.log +++ b/src/test/ref/wfragment1.log @@ -200,7 +200,7 @@ Target platform is c64basic / MOS6502X // Adding a missing word-fragment for Travis Fisher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MAX_OBJECTS = $10 @@ -306,7 +306,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Adding a missing word-fragment for Travis Fisher // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const MAX_OBJECTS = $10 @@ -393,19 +393,17 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-array-0.log b/src/test/ref/word-array-0.log index e29acb4b1..3b91fd3fe 100644 --- a/src/test/ref/word-array-0.log +++ b/src/test/ref/word-array-0.log @@ -173,7 +173,7 @@ Target platform is c64basic / MOS6502X // Tests a simple word array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -267,7 +267,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a simple word array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -334,14 +334,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-array-1.log b/src/test/ref/word-array-1.log index a7b3d8079..6d862e305 100644 --- a/src/test/ref/word-array-1.log +++ b/src/test/ref/word-array-1.log @@ -190,7 +190,7 @@ Target platform is c64basic / MOS6502X // Tests a simple word array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -325,7 +325,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a simple word array // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -424,17 +424,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-array-2.log b/src/test/ref/word-array-2.log index 314bdaa2b..c7c4de07c 100644 --- a/src/test/ref/word-array-2.log +++ b/src/test/ref/word-array-2.log @@ -210,7 +210,7 @@ Target platform is c64basic / MOS6502X // Tests a word-array with 128+ elements // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -365,7 +365,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests a word-array with 128+ elements // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -482,18 +482,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-pointer-compound.log b/src/test/ref/word-pointer-compound.log index 582ed1776..236c92ee4 100644 --- a/src/test/ref/word-pointer-compound.log +++ b/src/test/ref/word-pointer-compound.log @@ -291,7 +291,7 @@ Target platform is c64basic / MOS6502X // Test word pointer compound assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -437,7 +437,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Test word pointer compound assignment // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -538,18 +538,16 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-pointer-iteration-0.log b/src/test/ref/word-pointer-iteration-0.log index 6c2d3c769..c8745d53e 100644 --- a/src/test/ref/word-pointer-iteration-0.log +++ b/src/test/ref/word-pointer-iteration-0.log @@ -188,7 +188,7 @@ Target platform is c64basic / MOS6502X // Tests simple word pointer iteration // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -284,7 +284,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple word pointer iteration // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -346,14 +346,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-pointer-iteration.log b/src/test/ref/word-pointer-iteration.log index af7a7af40..fbd52ca69 100644 --- a/src/test/ref/word-pointer-iteration.log +++ b/src/test/ref/word-pointer-iteration.log @@ -198,7 +198,7 @@ Target platform is c64basic / MOS6502X // Tests simple word pointer iteration // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -344,7 +344,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple word pointer iteration // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -456,17 +456,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-pointer-math-0.log b/src/test/ref/word-pointer-math-0.log index 1598e8a8a..c0a42c317 100644 --- a/src/test/ref/word-pointer-math-0.log +++ b/src/test/ref/word-pointer-math-0.log @@ -183,7 +183,7 @@ Target platform is c64basic / MOS6502X // Tests simple word pointer math // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -277,7 +277,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple word pointer math // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -344,14 +344,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-pointer-math-1.log b/src/test/ref/word-pointer-math-1.log index b935a0952..0cd88f461 100644 --- a/src/test/ref/word-pointer-math-1.log +++ b/src/test/ref/word-pointer-math-1.log @@ -99,7 +99,7 @@ Target platform is c64basic / MOS6502X // Tests word pointer math - subtracting two word pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -151,7 +151,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests word pointer math - subtracting two word pointers // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .const SIZEOF_WORD = 2 @@ -197,14 +197,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/word-pointer-math.log b/src/test/ref/word-pointer-math.log index 77b4ff612..49a8bcb2b 100644 --- a/src/test/ref/word-pointer-math.log +++ b/src/test/ref/word-pointer-math.log @@ -196,7 +196,7 @@ Target platform is c64basic / MOS6502X // Tests simple word pointer math // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -331,7 +331,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Tests simple word pointer math // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -429,17 +429,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/wordexpr.log b/src/test/ref/wordexpr.log index de9143e63..8297956aa 100644 --- a/src/test/ref/wordexpr.log +++ b/src/test/ref/wordexpr.log @@ -141,7 +141,7 @@ Target platform is c64basic / MOS6502X // Expressions based on bytes but resulting in words are as words - eg. b = b + 40*8; // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -223,7 +223,7 @@ ASSEMBLER BEFORE OPTIMIZATION // Expressions based on bytes but resulting in words are as words - eg. b = b + 40*8; // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -299,17 +299,15 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/zeropage-detect-advanced.log b/src/test/ref/zeropage-detect-advanced.log index 7aa233a9a..4d6d83e82 100644 --- a/src/test/ref/zeropage-detect-advanced.log +++ b/src/test/ref/zeropage-detect-advanced.log @@ -90,7 +90,7 @@ Target platform is c64basic / MOS6502X // This is caused by the compiler believing the pointer is into memory" (not knowing the upper part is 0x00 ) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -149,7 +149,7 @@ ASSEMBLER BEFORE OPTIMIZATION // This is caused by the compiler believing the pointer is into memory" (not knowing the upper part is 0x00 ) // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -201,14 +201,12 @@ Removing instruction __b1_from___bbegin: Removing instruction __b1: Removing instruction __bend_from___b1: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/zeropage-sinus.log b/src/test/ref/zeropage-sinus.log index 6d79bc3da..6411f67a6 100644 --- a/src/test/ref/zeropage-sinus.log +++ b/src/test/ref/zeropage-sinus.log @@ -445,7 +445,7 @@ Target platform is c64basic / MOS6502X // $00/$11 is carefully chosen to be $ff - which plays well with the processor port // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The offset of the sprite pointers from the screen start address @@ -645,7 +645,7 @@ ASSEMBLER BEFORE OPTIMIZATION // $00/$11 is carefully chosen to be $ff - which plays well with the processor port // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // The offset of the sprite pointers from the screen start address @@ -830,6 +830,7 @@ Removing instruction __b1_from_main: Removing instruction __b2_from___b1: Removing instruction __b3_from___b2: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1: Removing instruction __b2: @@ -840,11 +841,8 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/zpparammin.log b/src/test/ref/zpparammin.log index 92aabd107..c1bd3b346 100644 --- a/src/test/ref/zpparammin.log +++ b/src/test/ref/zpparammin.log @@ -363,7 +363,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -574,7 +574,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels .label SCREEN = $400 @@ -718,6 +718,7 @@ Removing instruction main_from___b1: Removing instruction __bend_from___b1: Removing instruction __b1_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b2: @@ -726,13 +727,10 @@ Removing instruction __breturn: Removing instruction __breturn: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 Succesful ASM optimization Pass5NextJumpElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1 diff --git a/src/test/ref/zpptr.log b/src/test/ref/zpptr.log index c2424b54b..2a252f1ca 100644 --- a/src/test/ref/zpptr.log +++ b/src/test/ref/zpptr.log @@ -251,7 +251,7 @@ Target platform is c64basic / MOS6502X // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -412,7 +412,7 @@ ASSEMBLER BEFORE OPTIMIZATION // File Comments // Upstart .pc = $801 "Basic" -:BasicUpstart(__bbegin) +:BasicUpstart(main) .pc = $80d "Program" // Global Constants & labels // @begin @@ -552,13 +552,13 @@ Removing instruction __b2_from___b4: Removing instruction __b3_from___b2: Removing instruction __b3_from___b3: Succesful ASM optimization Pass5RedundantLabelElimination +Removing instruction __bbegin: Removing instruction __bend: Removing instruction __b1_from_main: Removing instruction __b4: Removing instruction __b5: Removing instruction __breturn: Succesful ASM optimization Pass5UnusedLabelElimination -Updating BasicUpstart to call main directly Removing instruction jsr main Succesful ASM optimization Pass5SkipBegin Removing instruction jmp __b1 @@ -567,8 +567,6 @@ Removing instruction jmp __b3 Succesful ASM optimization Pass5NextJumpElimination Removing instruction lda #$b Succesful ASM optimization Pass5UnnecesaryLoadElimination -Removing instruction __bbegin: -Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE (label) @1