yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

GT-3347 tweak hex formatting of out-of-range values

Browse source
This commit is contained in:
dev747368 2019-12-05 13:41:40 -05:00
parent 3faebfebe8
commit 4c57727282
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringRenderBuilder.java
View file

@ -121,7 +121,7 @@ public class StringRenderBuilder {
if (valStr.length() < 2) {
sb.append("0");
}
sb.append(valStr);
sb.append(valStr).append("h");
}
}

20
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/data/CharDataTypesRenderTest.java
View file

@ -157,33 +157,33 @@ public class CharDataTypesRenderTest extends AbstractGTest {
// wchar32
String result = wchar32DT.getRepresentation(buf32, normset, wchar32DT.getLength());
assertEquals("AA,AA,AA,AA", result);
assertEquals("AAh,AAh,AAh,AAh", result);
result = wchar32DT.getRepresentation(buf32, escseq, wchar32DT.getLength());
assertEquals("AA,AA,AA,AA", result);
assertEquals("AAh,AAh,AAh,AAh", result);
result = wchar32DT.getRepresentation(buf32, byteseq, wchar32DT.getLength());
assertEquals("AA,AA,AA,AA", result);
assertEquals("AAh,AAh,AAh,AAh", result);
// wchar16
result = wchar16DT.getRepresentation(buf16_be, normset, wchar16DT.getLength());
assertEquals("D8,00", result);
assertEquals("D8h,00h", result);
result = wchar16DT.getRepresentation(buf16_be, escseq, wchar16DT.getLength());
assertEquals("D8,00", result);
assertEquals("D8h,00h", result);
result = wchar16DT.getRepresentation(buf16_be, byteseq, wchar16DT.getLength());
assertEquals("D8,00", result);
assertEquals("D8h,00h", result);
// charDT
result = charDT.getRepresentation(buf8, normset, charDT.getLength());
assertEquals("85", result);
assertEquals("85h", result);
result = charDT.getRepresentation(buf8, escseq, charDT.getLength());
assertEquals("85", result);
assertEquals("85h", result);
result = charDT.getRepresentation(buf8, byteseq, charDT.getLength());
assertEquals("85", result);
assertEquals("85h", result);
}
@Test
@ -200,6 +200,6 @@ public class CharDataTypesRenderTest extends AbstractGTest {
result = wchar16DT.getRepresentation(mb(false, 0xfd, 0xff),
newset().set(RENDER_ENUM.BYTE_SEQ), wchar16DT.getLength());
assertEquals("FD,FF", result);
assertEquals("FDh,FFh", result);
}
}

30
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/model/data/StringDataTypeTest.java
View file

@ -366,7 +366,7 @@ public class StringDataTypeTest extends AbstractGTest {
public void testProbeGetStringRep_LeadingBinaryBytes() {
ByteMemBufferImpl buf = mb(false, 1, 2, 'x');
assertEquals("01,02,\"x\"",
assertEquals("01h,02h,\"x\"",
fixedlenString.getRepresentation(buf, newset(), buf.getLength()));
}
@ -375,7 +375,7 @@ public class StringDataTypeTest extends AbstractGTest {
ByteMemBufferImpl buf = mb(false, 'h', 'e', 'l', 'l', 'o', 0, 'a', '\n', 'b', 255, 0);
// US-ASCII charset doesn't map 0x80-0xff, they result in error characters
assertEquals("\"hello\\0a\\nb\",FF",
assertEquals("\"hello\\0a\\nb\",FFh",
fixedlenString.getRepresentation(buf, newset(), buf.getLength()));
}
@ -420,19 +420,19 @@ public class StringDataTypeTest extends AbstractGTest {
//@formatter:off
String expected =
"\"\\0\"," +
"01,02,03,04,05,06,"+
"\"\\a\\b\\t\\n\\v\\f\\r\",0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,\""+
"01h,02h,03h,04h,05h,06h,"+
"\"\\a\\b\\t\\n\\v\\f\\r\",0Eh,0Fh,10h,11h,12h,13h,14h,15h,16h,17h,18h,19h,1Ah,1Bh,1Ch,1Dh,1Eh,1Fh,\""+
" !\\\"#$%&'()*+,-./0123456789:;<=>?@"+
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`"+
"abcdefghijklmnopqrstuvwxyz{|}~\",7F,"+
"80,81,82,83,84,85,86,87,88,89,8A,8B,8C,8D,8E,8F,"+
"90,91,92,93,94,95,96,97,98,99,9A,9B,9C,9D,9E,9F,"+
"A0,A1,A2,A3,A4,A5,A6,A7,A8,A9,AA,AB,AC,AD,AE,AF,"+
"B0,B1,B2,B3,B4,B5,B6,B7,B8,B9,BA,BB,BC,BD,BE,BF,"+
"C0,C1,C2,C3,C4,C5,C6,C7,C8,C9,CA,CB,CC,CD,CE,CF,"+
"D0,D1,D2,D3,D4,D5,D6,D7,D8,D9,DA,DB,DC,DD,DE,DF,"+
"E0,E1,E2,E3,E4,E5,E6,E7,E8,E9,EA,EB,EC,ED,EE,EF,"+
"F0,F1,F2,F3,F4,F5,F6,F7,F8,F9,FA,FB,FC,FD,FE,FF";
"abcdefghijklmnopqrstuvwxyz{|}~\",7Fh,"+
"80h,81h,82h,83h,84h,85h,86h,87h,88h,89h,8Ah,8Bh,8Ch,8Dh,8Eh,8Fh,"+
"90h,91h,92h,93h,94h,95h,96h,97h,98h,99h,9Ah,9Bh,9Ch,9Dh,9Eh,9Fh,"+
"A0h,A1h,A2h,A3h,A4h,A5h,A6h,A7h,A8h,A9h,AAh,ABh,ACh,ADh,AEh,AFh,"+
"B0h,B1h,B2h,B3h,B4h,B5h,B6h,B7h,B8h,B9h,BAh,BBh,BCh,BDh,BEh,BFh,"+
"C0h,C1h,C2h,C3h,C4h,C5h,C6h,C7h,C8h,C9h,CAh,CBh,CCh,CDh,CEh,CFh,"+
"D0h,D1h,D2h,D3h,D4h,D5h,D6h,D7h,D8h,D9h,DAh,DBh,DCh,DDh,DEh,DFh,"+
"E0h,E1h,E2h,E3h,E4h,E5h,E6h,E7h,E8h,E9h,EAh,EBh,ECh,EDh,EEh,EFh,"+
"F0h,F1h,F2h,F3h,F4h,F5h,F6h,F7h,F8h,F9h,FAh,FBh,FCh,FDh,FEh,FFh";
//@formatter:on
assertEquals("String rep w/java US-ASCII charset mapping failed", expected, actual);
@ -465,8 +465,8 @@ public class StringDataTypeTest extends AbstractGTest {
assertEquals(e1, fixedUtf16String.getRepresentation(buf_be, newset(), buf_be.getLength()));
assertEquals(e1, fixedUtf16String.getRepresentation(buf_le, newset(), buf_le.getLength()));
String e2_be = "u\"ab\",CC,01,12,02";
String e2_le = "u\"ab\",01,CC,02,12";
String e2_be = "u\"ab\",CCh,01h,12h,02h";
String e2_le = "u\"ab\",01h,CCh,02h,12h";
assertEquals(e2_be, fixedUtf16String.getRepresentation(buf_be,
newset().set(RENDER_ENUM.BYTE_SEQ), buf_be.getLength()));
assertEquals(e2_le, fixedUtf16String.getRepresentation(buf_le,