1
0
mirror of https://github.com/fadden/6502bench.git synced 2024-07-07 07:28:57 +00:00
6502bench/SourceGen/SGTestData/Expected
Andy McFadden d3670c48e8 Label rework, part 6
Correct handling of local variables.  We now correctly uniquify them
with regard to non-unique labels.  Because local vars can effectively
have global scope we mostly want to treat them as global, but they're
uniquified relative to other globals very late in the process, so we
can't just throw them in the symbol table and be done.  Fortunately
local variables exist in a separate namespace, so we just need to
uniquify the variables relative to the post-localization symbol table.
In other words, we take the symbol table, apply the label map, and
rename any variable that clashes.

This also fixes an older problem where we weren't masking the
leading '_' on variable labels when generating 64tass output.

The code list now makes non-unique labels obvious, but you can't tell
the difference between unique global and unique local.  What's more,
the default type value in Edit Label is now adjusted to Global for
unique locals that were auto-generated.  To make it a bit easier to
figure out what's what, the Info panel now has a "label type" line
that reports the type.

The 2023-non-unique-labels test had some additional tests added to
exercise conflicts with local variables.  The 2019-local-variables
test output changed slightly because the de-duplicated variable
naming convention was simplified.
2019-11-18 13:36:53 -08:00
..
1000-allops-value-65816_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1000-allops-value-65816_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1000-allops-value-65816_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
1000-allops-value-65816_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1000-allops-value-65816_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1001-allops-zero-65816_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1001-allops-zero-65816_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1001-allops-zero-65816_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
1001-allops-zero-65816_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1001-allops-zero-65816_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1002-embedded-instructions_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1002-embedded-instructions_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1002-embedded-instructions_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
1002-embedded-instructions_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1002-embedded-instructions_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1003-flags-and-branches_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1003-flags-and-branches_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1003-flags-and-branches_cc65.cfg Fix code tracing bug 2019-09-17 14:38:16 -07:00
1003-flags-and-branches_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1003-flags-and-branches_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
1004-data-recognition_64tass.S Change the way ASCII is handled for 64tass 2019-08-20 11:21:30 -07:00
1004-data-recognition_acme.S Finish ACME v0.96.4 support 2019-08-04 14:48:42 -07:00
1004-data-recognition_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
1004-data-recognition_cc65.S Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
1004-data-recognition_Merlin32.S Initial file commit 2018-09-28 10:05:11 -07:00
2000-allops-value-6502_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2000-allops-value-6502_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2000-allops-value-6502_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2000-allops-value-6502_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2000-allops-value-6502_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2001-allops-zero-6502_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2001-allops-zero-6502_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2001-allops-zero-6502_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2001-allops-zero-6502_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2001-allops-zero-6502_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2002-allops-value-65C02_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2002-allops-value-65C02_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2002-allops-value-65C02_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2002-allops-value-65C02_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2002-allops-value-65C02_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2003-allops-zero-65C02_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2003-allops-zero-65C02_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2003-allops-zero-65C02_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2003-allops-zero-65C02_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2003-allops-zero-65C02_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2004-numeric-types_64tass.S Add junk/align directives 2019-10-18 21:00:28 -07:00
2004-numeric-types_acme.S Add junk/align directives 2019-10-18 21:00:28 -07:00
2004-numeric-types_cc65.cfg Add junk/align directives 2019-10-18 21:00:28 -07:00
2004-numeric-types_cc65.S Add junk/align directives 2019-10-18 21:00:28 -07:00
2004-numeric-types_Merlin32.S Add junk/align directives 2019-10-18 21:00:28 -07:00
2005-string-types_64tass.S Improve multi-encoding output in 64tass 2019-08-21 13:46:05 -07:00
2005-string-types_acme.S Improve ACME high ASCII handling 2019-08-17 17:35:01 -07:00
2005-string-types_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2005-string-types_cc65.S Update expected output for test 2005-string-types 2019-08-09 16:41:05 -07:00
2005-string-types_Merlin32.S Update expected output for test 2005-string-types 2019-08-09 16:41:05 -07:00
2006-operand-formats_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2006-operand-formats_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2006-operand-formats_cc65.cfg Correctly handle delimiters in character operands 2019-08-14 17:31:15 -07:00
2006-operand-formats_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2006-operand-formats_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2007-labels-and-symbols_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2007-labels-and-symbols_acme.S Finish ACME v0.96.4 support 2019-08-04 14:48:42 -07:00
2007-labels-and-symbols_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2007-labels-and-symbols_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2007-labels-and-symbols_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2008-address-changes_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2008-address-changes_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2008-address-changes_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2008-address-changes_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2008-address-changes_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2009-branches-and-banks_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2009-branches-and-banks_acme.S Add a blank line between constants and addresses 2019-10-22 22:45:13 -07:00
2009-branches-and-banks_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2009-branches-and-banks_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2009-branches-and-banks_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2010-target-adjustment_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2010-target-adjustment_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2010-target-adjustment_cc65.cfg Tweak "nearby" label finder 2019-10-29 18:12:22 -07:00
2010-target-adjustment_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2010-target-adjustment_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2011-hinting_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2011-hinting_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2011-hinting_cc65.cfg Fix handling of data formatting that overlaps with code 2019-09-14 11:44:17 -07:00
2011-hinting_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2011-hinting_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2012-label-localizer_64tass.S Label rework, part 5 2019-11-17 16:05:51 -08:00
2012-label-localizer_acme.S Label rework, part 5 2019-11-17 16:05:51 -08:00
2012-label-localizer_cc65.cfg Remap labels that use opcode mnemonics 2019-09-20 15:29:34 -07:00
2012-label-localizer_cc65.S Label rework, part 5 2019-11-17 16:05:51 -08:00
2012-label-localizer_Merlin32.S Remap labels that use opcode mnemonics 2019-09-20 15:29:34 -07:00
2013-notes-and-comments_64tass.S Tweak line folding code 2019-11-01 19:47:56 -07:00
2013-notes-and-comments_acme.S Tweak line folding code 2019-11-01 19:47:56 -07:00
2013-notes-and-comments_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2013-notes-and-comments_cc65.S Tweak line folding code 2019-11-01 19:47:56 -07:00
2013-notes-and-comments_Merlin32.S Tweak line folding code 2019-11-01 19:47:56 -07:00
2014-label-dp_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2014-label-dp_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2014-label-dp_cc65.cfg Attempt to generate segment names for cc65 2018-11-18 15:11:29 -08:00
2014-label-dp_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2014-label-dp_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2015-64k-nops_64tass.S Improve multi-encoding output in 64tass 2019-08-21 13:46:05 -07:00
2015-64k-nops_acme.S Add 2015-64k-nops test 2019-08-04 16:54:01 -07:00
2015-64k-nops_cc65.cfg Add 2015-64k-nops test 2019-08-04 16:54:01 -07:00
2015-64k-nops_cc65.S Add 2015-64k-nops test 2019-08-04 16:54:01 -07:00
2015-64k-nops_Merlin32.S Add 2015-64k-nops test 2019-08-04 16:54:01 -07:00
2016-char-encoding-a_64tass.S Improve multi-encoding output in 64tass 2019-08-21 13:46:05 -07:00
2016-char-encoding-a_acme.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2016-char-encoding-a_cc65.cfg Add 2016-char-encoding-a and variations 2019-08-16 15:01:11 -07:00
2016-char-encoding-a_cc65.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2016-char-encoding-a_Merlin32.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2017-char-encoding-p_64tass.S Improve multi-encoding output in 64tass 2019-08-21 13:46:05 -07:00
2017-char-encoding-p_acme.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2017-char-encoding-p_cc65.cfg Add 2016-char-encoding-a and variations 2019-08-16 15:01:11 -07:00
2017-char-encoding-p_cc65.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2017-char-encoding-p_Merlin32.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2018-char-encoding-s_64tass.S Improve multi-encoding output in 64tass 2019-08-21 13:46:05 -07:00
2018-char-encoding-s_acme.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2018-char-encoding-s_cc65.cfg Add 2016-char-encoding-a and variations 2019-08-16 15:01:11 -07:00
2018-char-encoding-s_cc65.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2018-char-encoding-s_Merlin32.S PETSCII does DCI 2019-08-20 17:55:12 -07:00
2019-local-variables_64tass.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2019-local-variables_acme.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2019-local-variables_cc65.cfg Work around two assembler issues 2019-09-20 14:05:17 -07:00
2019-local-variables_cc65.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2019-local-variables_Merlin32.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2020-cycle-counts-65816_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2020-cycle-counts-65816_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2020-cycle-counts-65816_cc65.cfg Rename regression test 2020 to reflect the CPU configuration 2019-09-15 17:02:21 -07:00
2020-cycle-counts-65816_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2020-cycle-counts-65816_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2021-external-symbols_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2021-external-symbols_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2021-external-symbols_cc65.cfg External symbol I/O direction and address mask, part 3 (of 3) 2019-10-16 17:32:30 -07:00
2021-external-symbols_cc65.S Add a blank line between constants and addresses 2019-10-22 22:45:13 -07:00
2021-external-symbols_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2022-extension-scripts_64tass.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2022-extension-scripts_acme.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2022-extension-scripts_cc65.cfg Correctly handle embedded instruction edge case 2019-10-19 17:28:45 -07:00
2022-extension-scripts_cc65.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2022-extension-scripts_Merlin32.S Finish removal of "disable label localizer" feature 2019-11-16 17:15:03 -08:00
2023-non-unique-labels_64tass.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2023-non-unique-labels_acme.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2023-non-unique-labels_cc65.cfg Label rework, part 6 2019-11-18 13:36:53 -08:00
2023-non-unique-labels_cc65.S Label rework, part 6 2019-11-18 13:36:53 -08:00
2023-non-unique-labels_Merlin32.S Label rework, part 6 2019-11-18 13:36:53 -08:00