yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GT-3530 update to single-char scalar rendering. Also corrected scalar

Browse source 
operand popup to be consistent with convert action.
This commit is contained in:
ghidra1 2020-02-13 13:28:04 -05:00
parent fc5c68bc2b
commit fe69d675d7
2 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataInstance.java
View file

@ -117,18 +117,8 @@ public class StringDataInstance {
return UNKNOWN;
}
// ignore leading 0 bytes
int lsbIndex = bytes.length - 1;
if (bytes[lsbIndex] >= 0 && bytes[lsbIndex] <= 0x7f) {
boolean isAsciiChar = true;
for (int i = 0; i < lsbIndex; i++) {
if (bytes[i] != 0) {
isAsciiChar = false;
}
}
if (isAsciiChar) {
bytes = new byte[] { bytes[lsbIndex] };
}
if (bytes.length != 1 && isSingleAsciiValue(bytes)) {
bytes = new byte[] { bytes[bytes.length - 1] };
}
MemBuffer memBuf = new ByteMemBufferImpl(null, bytes, true);
@ -136,6 +126,27 @@ public class StringDataInstance {
return sdi.getCharRepresentation();
}
/**
* Determine if bytes contain only a single ASCII value within
* least-significant-byte of big-endian byte array
* @param bytes value byte array in big-endian order
* @return true if bytes contain a single ASCII value within
* least-significant-byte
*/
private static boolean isSingleAsciiValue(byte[] bytes) {
int lsbIndex = bytes.length - 1;
if (bytes[lsbIndex] < 0) {
return false;
}
for (int i = 0; i < lsbIndex; i++) {
if (bytes[i] != 0) {
return false;
}
}
return true;
}
/**
* Returns a new {@link StringDataInstance} using the bytes in the data codeunit.
* <p>
@ -782,7 +793,7 @@ public class StringDataInstance {
// render settings. ISO control chars are forced to be
// escaped regardless of the render setting.
if (currentCharRenderSetting == RENDER_ENUM.ALL) {
if (codePoint <= 0x7f) {
if (codePoint <= ASCII_MAX) {
// render non-displayable, non-control-char ascii-ish bytes as bytes instead
// of as escape sequences
currentCharRenderSetting = RENDER_ENUM.BYTE_SEQ;