6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-06-11 17:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Don't reject strings with "invalid" characters

Browse Source 
When formatting one or more strings with the Edit Data Operand dialog,
the code must determine which options to present.  If the selected
bytes appear to represent one or more null-terminated strings, that
option is enabled in the UI.

The "format recognizers" enforce some strict rules, e.g. null-
terminated strings must end in $00, and also try to confirm that the
data looks like a printable string.  The algorithm rejects strings
with "illegal" characters in them.  This is simpler on some systems
than others.  For example, C64 PETSCII defines quite a few control
characters in ways that make them useful for embedding in printable
strings.

The "recognizers" are only used by the operand edit feature, not as
part of an automated string detector, so there's no real upside in
overriding the user's desire to form a string with arbitrary bytes.

This removes the quick rejection from the four recognizers (null-term,
len8, len16, dci).  It does not alter the high-level code, which
still insists on a certain percentage of the string being printable;
that may be worth revisiting as well.

(issue #100)
This commit is contained in:
Andy McFadden 2021-08-01 17:36:05 -07:00
parent 8db554c1cd
commit d65ab59461
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SourceGen/DataAnalysis.cs
View File

@ -1031,8 +1031,6 @@ namespace SourceGen {
/// Counts the number of null-terminated strings in the buffer.
///
/// Zero-length strings are allowed but not included in the count.
///
/// If any bad data is found, the scan aborts and returns -1.
/// </summary>
/// <param name="fileData">Raw data.</param>
/// <param name="start">Offset of first byte in range.</param>
@ -1070,10 +1068,10 @@ namespace SourceGen {
return -1;
}
}
if (!charTest(val)) {
// Not a matching character, fail.
return -1;
}
//if (!charTest(val)) {
// // Not a matching character, fail.
// return -1;
//}
stringLen++;
}
}
@ -1120,10 +1118,10 @@ namespace SourceGen {
// Mixed ASCII, fail.
return -1;
}
if (!charTest(val)) {
// Not a matching character, fail.
return -1;
}
//if (!charTest(val)) {
// // Not a matching character, fail.
// return -1;
//}
}
}
@ -1175,10 +1173,10 @@ namespace SourceGen {
// Mixed ASCII, fail.
return -1;
}
if (!charTest(val)) {
// Not a matching character, fail.
return -1;
}
//if (!charTest(val)) {
// // Not a matching character, fail.
// return -1;
//}
}
}
@ -1226,15 +1224,16 @@ namespace SourceGen {
stringLen++;
}
if (!charTest((byte)(val & 0x7f))) {
// Not a matching character, fail.
return -1;
}
//if (!charTest((byte)(val & 0x7f))) {
// // Not a matching character, fail.
// return -1;
//}
}
return stringCount;
}
#if false
/// <summary>
/// Counts strings in reverse Dextral Character Inverted format, meaning the string is
/// stored in reverse order in memory, and the high bit on the first (last) byte is
@ -1280,6 +1279,7 @@ namespace SourceGen {
return stringCount;
}
#endif
/// <summary>
/// Verifies that the string data is what is expected. Does not attempt to check