From 7a40d7f9bf5123224c84583c4ad61d9243b5ec42 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Fri, 9 Aug 2019 16:41:05 -0700 Subject: [PATCH] Update expected output for test 2005-string-types This was the result of the earlier change to eliminate "reverse DCI" strings. On further examination, it doesn't seem like we can do much better than a hex dump without more work than the situation merits. So hex dump it is. --- SourceGen/ProjectFile.cs | 11 ++++- .../Expected/2005-string-types_64tass.S | 41 ++++++++++++++----- .../Expected/2005-string-types_Merlin32.S | 29 ++++++++----- .../Expected/2005-string-types_acme.S | 27 +++++++----- .../Expected/2005-string-types_cc65.S | 41 ++++++++++++++----- 5 files changed, 107 insertions(+), 42 deletions(-) diff --git a/SourceGen/ProjectFile.cs b/SourceGen/ProjectFile.cs index aa7bcf1..118fdf6 100644 --- a/SourceGen/ProjectFile.cs +++ b/SourceGen/ProjectFile.cs @@ -686,8 +686,17 @@ namespace SourceGen { format = FormatDescriptor.Type.StringL16; } else if ("Dci".Equals(sfd.SubFormat)) { format = FormatDescriptor.Type.StringDci; + } else if ("DciReverse".Equals(sfd.SubFormat)) { + // No longer supported. Treating it as a generic string works poorly, + // because the first byte will appear to be (say) high ASCII, but the rest + // of the string will be low ASCII and get output as hex data. If we + // explicitly differentiated high/low ASCII we could make this work right. + // We could also split the descriptor into two parts. Nobody ever used + // this but the regression tests, though, so we don't really care. + format = FormatDescriptor.Type.Dense; + subFormat = FormatDescriptor.SubType.None; } else { - // DciReverse no longer supported; output as dense hex + // No idea what this is; output as dense hex. format = FormatDescriptor.Type.Dense; subFormat = FormatDescriptor.SubType.None; } diff --git a/SourceGen/SGTestData/Expected/2005-string-types_64tass.S b/SourceGen/SGTestData/Expected/2005-string-types_64tass.S index 9a5811e..08537e8 100644 --- a/SourceGen/SGTestData/Expected/2005-string-types_64tass.S +++ b/SourceGen/SGTestData/Expected/2005-string-types_64tass.S @@ -134,18 +134,39 @@ .text "01234567890123456789012345678901234567890123456789012345678901" .text "23456789012345678",$b9 .byte $81 - .text $f2,"icd IICSA wol" + .byte $f2,$69,$63,$64,$20,$49,$49,$43,$53,$41,$20,$77,$6f,$6c .byte $80 .byte $72,$e9,$e3,$e4,$a0,$c9,$c9,$c3,$d3,$c1,$a0,$e8,$e7,$e9,$e8 .byte $80 - .text $b9,"8765432109876543210987654321098765432109876543210987654321" - .text "098765432109876543210" + .byte $b9,$38,$37,$36,$35,$34,$33,$32,$31,$30,$39,$38,$37,$36,$35,$34 + .byte $33,$32,$31,$30,$39,$38,$37,$36,$35,$34,$33,$32,$31,$30,$39,$38 + .byte $37,$36,$35,$34,$33,$32,$31,$30,$39,$38,$37,$36,$35,$34,$33,$32 + .byte $31,$30,$39,$38,$37,$36,$35,$34,$33,$32,$31,$30,$39,$38,$37,$36 + .byte $35,$34,$33,$32,$31,$30,$39,$38,$37,$36,$35,$34,$33,$32,$31,$30 .byte $80 - .text $ae,"eeht rof sllot ti ;sllot lleb eht mohw rof wonk ot dnes re" - .text "ven erofereht dna ,dniknam ni devlovni ma I esuaceb ,em sehsin" - .text "imid htaed snam ynA .erew nwo eniht fo ro sdneirf yht fo rona" - .text "m a fi sa llew sA .erew yrotnomorp a fi sa llew sA .ssel eht s" - .text "i eporuE ,aes eht yb yawa dehsaw eb dolc a fI .niam eht fo tr" - .text "ap a ,tnenitnoc eht fo eceip a si nam yreve ;flesti fo eritne " - .text ",dnalsi na si nam oN" + .byte $ae,$65,$65,$68,$74,$20,$72,$6f,$66,$20,$73,$6c,$6c,$6f,$74,$20 + .byte $74,$69,$20,$3b,$73,$6c,$6c,$6f,$74,$20,$6c,$6c,$65,$62,$20,$65 + .byte $68,$74,$20,$6d,$6f,$68,$77,$20,$72,$6f,$66,$20,$77,$6f,$6e,$6b + .byte $20,$6f,$74,$20,$64,$6e,$65,$73,$20,$72,$65,$76,$65,$6e,$20,$65 + .byte $72,$6f,$66,$65,$72,$65,$68,$74,$20,$64,$6e,$61,$20,$2c,$64,$6e + .byte $69,$6b,$6e,$61,$6d,$20,$6e,$69,$20,$64,$65,$76,$6c,$6f,$76,$6e + .byte $69,$20,$6d,$61,$20,$49,$20,$65,$73,$75,$61,$63,$65,$62,$20,$2c + .byte $65,$6d,$20,$73,$65,$68,$73,$69,$6e,$69,$6d,$69,$64,$20,$68,$74 + .byte $61,$65,$64,$20,$73,$6e,$61,$6d,$20,$79,$6e,$41,$20,$20,$2e,$65 + .byte $72,$65,$77,$20,$6e,$77,$6f,$20,$65,$6e,$69,$68,$74,$20,$66,$6f + .byte $20,$72,$6f,$20,$73,$64,$6e,$65,$69,$72,$66,$20,$79,$68,$74,$20 + .byte $66,$6f,$20,$72,$6f,$6e,$61,$6d,$20,$61,$20,$66,$69,$20,$73,$61 + .byte $20,$6c,$6c,$65,$77,$20,$73,$41,$20,$2e,$65,$72,$65,$77,$20,$79 + .byte $72,$6f,$74,$6e,$6f,$6d,$6f,$72,$70,$20,$61,$20,$66,$69,$20,$73 + .byte $61,$20,$6c,$6c,$65,$77,$20,$73,$41,$20,$2e,$73,$73,$65,$6c,$20 + .byte $65,$68,$74,$20,$73,$69,$20,$65,$70,$6f,$72,$75,$45,$20,$2c,$61 + .byte $65,$73,$20,$65,$68,$74,$20,$79,$62,$20,$79,$61,$77,$61,$20,$64 + .byte $65,$68,$73,$61,$77,$20,$65,$62,$20,$64,$6f,$6c,$63,$20,$61,$20 + .byte $66,$49,$20,$20,$2e,$6e,$69,$61,$6d,$20,$65,$68,$74,$20,$66,$6f + .byte $20,$74,$72,$61,$70,$20,$61,$20,$2c,$74,$6e,$65,$6e,$69,$74,$6e + .byte $6f,$63,$20,$65,$68,$74,$20,$66,$6f,$20,$65,$63,$65,$69,$70,$20 + .byte $61,$20,$73,$69,$20,$6e,$61,$6d,$20,$79,$72,$65,$76,$65,$20,$3b + .byte $66,$6c,$65,$73,$74,$69,$20,$66,$6f,$20,$65,$72,$69,$74,$6e,$65 + .byte $20,$2c,$64,$6e,$61,$6c,$73,$69,$20,$6e,$61,$20,$73,$69,$20,$6e + .byte $61,$6d,$20,$6f,$4e .byte $81 diff --git a/SourceGen/SGTestData/Expected/2005-string-types_Merlin32.S b/SourceGen/SGTestData/Expected/2005-string-types_Merlin32.S index 948fbf1..c641458 100644 --- a/SourceGen/SGTestData/Expected/2005-string-types_Merlin32.S +++ b/SourceGen/SGTestData/Expected/2005-string-types_Merlin32.S @@ -125,18 +125,25 @@ asc '01234567890123456789012345678901234567890123456789012345678901' asc '23456789012345678',b9 dfb $81 - asc f2,'icd IICSA wol' + hex f269636420494943534120776f6c dfb $80 - asc 72,"icd IICSA hgih" + hex 72e9e3e4a0c9c9c3d3c1a0e8e7e9e8 dfb $80 - asc b9,'87654321098765432109876543210987654321098765432109876543210' - asc '98765432109876543210' + hex b938373635343332313039383736353433323130393837363534333231303938 + hex 3736353433323130393837363534333231303938373635343332313039383736 + hex 35343332313039383736353433323130 dfb $80 - asc ae,'eeht rof sllot ti ;sllot lleb eht mohw rof wonk ot dnes rev' - asc 'en erofereht dna ,dniknam ni devlovni ma I esuaceb ,em sehsini' - asc 'mid htaed snam ynA .erew nwo eniht fo ro sdneirf yht fo ronam' - asc ' a fi sa llew sA .erew yrotnomorp a fi sa llew sA .ssel eht si' - asc ' eporuE ,aes eht yb yawa dehsaw eb dolc a fI .niam eht fo tra' - asc 'p a ,tnenitnoc eht fo eceip a si nam yreve ;flesti fo eritne ,' - asc 'dnalsi na si nam oN' + hex ae6565687420726f6620736c6c6f74207469203b736c6c6f74206c6c65622065 + hex 6874206d6f687720726f6620776f6e6b206f7420646e657320726576656e2065 + hex 726f66657265687420646e61202c646e696b6e616d206e69206465766c6f766e + hex 69206d6120492065737561636562202c656d2073656873696e696d6964206874 + hex 61656420736e616d20796e4120202e65726577206e776f20656e69687420666f + hex 20726f2073646e656972662079687420666f20726f6e616d2061206669207361 + hex 206c6c6577207341202e657265772079726f746e6f6d6f727020612066692073 + hex 61206c6c6577207341202e7373656c206568742073692065706f727545202c61 + hex 65732065687420796220796177612064656873617720656220646f6c63206120 + hex 664920202e6e69616d2065687420666f20747261702061202c746e656e69746e + hex 6f632065687420666f2065636569702061207369206e616d207972657665203b + hex 666c6573746920666f20657269746e65202c646e616c7369206e61207369206e + hex 616d206f4e dfb $81 diff --git a/SourceGen/SGTestData/Expected/2005-string-types_acme.S b/SourceGen/SGTestData/Expected/2005-string-types_acme.S index 63f27cc..8e82a71 100644 --- a/SourceGen/SGTestData/Expected/2005-string-types_acme.S +++ b/SourceGen/SGTestData/Expected/2005-string-types_acme.S @@ -128,18 +128,25 @@ !text "01234567890123456789012345678901234567890123456789012345678901" !text "23456789012345678",$b9 !byte $81 - !text $f2,"icd IICSA wol" + !hex f269636420494943534120776f6c !byte $80 !hex 72e9e3e4a0c9c9c3d3c1a0e8e7e9e8 !byte $80 - !text $b9,"8765432109876543210987654321098765432109876543210987654321" - !text "098765432109876543210" + !hex b938373635343332313039383736353433323130393837363534333231303938 + !hex 3736353433323130393837363534333231303938373635343332313039383736 + !hex 35343332313039383736353433323130 !byte $80 - !text $ae,"eeht rof sllot ti ;sllot lleb eht mohw rof wonk ot dnes re" - !text "ven erofereht dna ,dniknam ni devlovni ma I esuaceb ,em sehsin" - !text "imid htaed snam ynA .erew nwo eniht fo ro sdneirf yht fo rona" - !text "m a fi sa llew sA .erew yrotnomorp a fi sa llew sA .ssel eht s" - !text "i eporuE ,aes eht yb yawa dehsaw eb dolc a fI .niam eht fo tr" - !text "ap a ,tnenitnoc eht fo eceip a si nam yreve ;flesti fo eritne " - !text ",dnalsi na si nam oN" + !hex ae6565687420726f6620736c6c6f74207469203b736c6c6f74206c6c65622065 + !hex 6874206d6f687720726f6620776f6e6b206f7420646e657320726576656e2065 + !hex 726f66657265687420646e61202c646e696b6e616d206e69206465766c6f766e + !hex 69206d6120492065737561636562202c656d2073656873696e696d6964206874 + !hex 61656420736e616d20796e4120202e65726577206e776f20656e69687420666f + !hex 20726f2073646e656972662079687420666f20726f6e616d2061206669207361 + !hex 206c6c6577207341202e657265772079726f746e6f6d6f727020612066692073 + !hex 61206c6c6577207341202e7373656c206568742073692065706f727545202c61 + !hex 65732065687420796220796177612064656873617720656220646f6c63206120 + !hex 664920202e6e69616d2065687420666f20747261702061202c746e656e69746e + !hex 6f632065687420666f2065636569702061207369206e616d207972657665203b + !hex 666c6573746920666f20657269746e65202c646e616c7369206e61207369206e + !hex 616d206f4e !byte $81 diff --git a/SourceGen/SGTestData/Expected/2005-string-types_cc65.S b/SourceGen/SGTestData/Expected/2005-string-types_cc65.S index 186969d..83801a6 100644 --- a/SourceGen/SGTestData/Expected/2005-string-types_cc65.S +++ b/SourceGen/SGTestData/Expected/2005-string-types_cc65.S @@ -140,18 +140,39 @@ .byte "01234567890123456789012345678901234567890123456789012345678901" .byte "23456789012345678",$b9 .byte $81 - .byte $f2,"icd IICSA wol" + .byte $f2,$69,$63,$64,$20,$49,$49,$43,$53,$41,$20,$77,$6f,$6c .byte $80 .byte $72,$e9,$e3,$e4,$a0,$c9,$c9,$c3,$d3,$c1,$a0,$e8,$e7,$e9,$e8 .byte $80 - .byte $b9,"8765432109876543210987654321098765432109876543210987654321" - .byte "098765432109876543210" + .byte $b9,$38,$37,$36,$35,$34,$33,$32,$31,$30,$39,$38,$37,$36,$35,$34 + .byte $33,$32,$31,$30,$39,$38,$37,$36,$35,$34,$33,$32,$31,$30,$39,$38 + .byte $37,$36,$35,$34,$33,$32,$31,$30,$39,$38,$37,$36,$35,$34,$33,$32 + .byte $31,$30,$39,$38,$37,$36,$35,$34,$33,$32,$31,$30,$39,$38,$37,$36 + .byte $35,$34,$33,$32,$31,$30,$39,$38,$37,$36,$35,$34,$33,$32,$31,$30 .byte $80 - .byte $ae,"eeht rof sllot ti ;sllot lleb eht mohw rof wonk ot dnes re" - .byte "ven erofereht dna ,dniknam ni devlovni ma I esuaceb ,em sehsin" - .byte "imid htaed snam ynA .erew nwo eniht fo ro sdneirf yht fo rona" - .byte "m a fi sa llew sA .erew yrotnomorp a fi sa llew sA .ssel eht s" - .byte "i eporuE ,aes eht yb yawa dehsaw eb dolc a fI .niam eht fo tr" - .byte "ap a ,tnenitnoc eht fo eceip a si nam yreve ;flesti fo eritne " - .byte ",dnalsi na si nam oN" + .byte $ae,$65,$65,$68,$74,$20,$72,$6f,$66,$20,$73,$6c,$6c,$6f,$74,$20 + .byte $74,$69,$20,$3b,$73,$6c,$6c,$6f,$74,$20,$6c,$6c,$65,$62,$20,$65 + .byte $68,$74,$20,$6d,$6f,$68,$77,$20,$72,$6f,$66,$20,$77,$6f,$6e,$6b + .byte $20,$6f,$74,$20,$64,$6e,$65,$73,$20,$72,$65,$76,$65,$6e,$20,$65 + .byte $72,$6f,$66,$65,$72,$65,$68,$74,$20,$64,$6e,$61,$20,$2c,$64,$6e + .byte $69,$6b,$6e,$61,$6d,$20,$6e,$69,$20,$64,$65,$76,$6c,$6f,$76,$6e + .byte $69,$20,$6d,$61,$20,$49,$20,$65,$73,$75,$61,$63,$65,$62,$20,$2c + .byte $65,$6d,$20,$73,$65,$68,$73,$69,$6e,$69,$6d,$69,$64,$20,$68,$74 + .byte $61,$65,$64,$20,$73,$6e,$61,$6d,$20,$79,$6e,$41,$20,$20,$2e,$65 + .byte $72,$65,$77,$20,$6e,$77,$6f,$20,$65,$6e,$69,$68,$74,$20,$66,$6f + .byte $20,$72,$6f,$20,$73,$64,$6e,$65,$69,$72,$66,$20,$79,$68,$74,$20 + .byte $66,$6f,$20,$72,$6f,$6e,$61,$6d,$20,$61,$20,$66,$69,$20,$73,$61 + .byte $20,$6c,$6c,$65,$77,$20,$73,$41,$20,$2e,$65,$72,$65,$77,$20,$79 + .byte $72,$6f,$74,$6e,$6f,$6d,$6f,$72,$70,$20,$61,$20,$66,$69,$20,$73 + .byte $61,$20,$6c,$6c,$65,$77,$20,$73,$41,$20,$2e,$73,$73,$65,$6c,$20 + .byte $65,$68,$74,$20,$73,$69,$20,$65,$70,$6f,$72,$75,$45,$20,$2c,$61 + .byte $65,$73,$20,$65,$68,$74,$20,$79,$62,$20,$79,$61,$77,$61,$20,$64 + .byte $65,$68,$73,$61,$77,$20,$65,$62,$20,$64,$6f,$6c,$63,$20,$61,$20 + .byte $66,$49,$20,$20,$2e,$6e,$69,$61,$6d,$20,$65,$68,$74,$20,$66,$6f + .byte $20,$74,$72,$61,$70,$20,$61,$20,$2c,$74,$6e,$65,$6e,$69,$74,$6e + .byte $6f,$63,$20,$65,$68,$74,$20,$66,$6f,$20,$65,$63,$65,$69,$70,$20 + .byte $61,$20,$73,$69,$20,$6e,$61,$6d,$20,$79,$72,$65,$76,$65,$20,$3b + .byte $66,$6c,$65,$73,$74,$69,$20,$66,$6f,$20,$65,$72,$69,$74,$6e,$65 + .byte $20,$2c,$64,$6e,$61,$6c,$73,$69,$20,$6e,$61,$20,$73,$69,$20,$6e + .byte $61,$6d,$20,$6f,$4e .byte $81