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

GP-4347: PeLoader now pads initialized memory blocks with 0 instead of

Browse source 
creating an additional uninitialized block. Also improved Bytes Source
column of Memory Map.
This commit is contained in:
Ryan Kurtz 2024-02-22 07:33:45 -05:00
parent 5690528835
commit f9ce96fd6d
9 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/BitMappedSubMemoryBlock.java
View file

@ -179,7 +179,7 @@ class BitMappedSubMemoryBlock extends SubMemoryBlock {
@Override
protected String getDescription() {
return "Bit Mapped: " + mappedAddress;
return "bitmap[0x%x, 0x%x, %s]".formatted(subBlockOffset, subBlockLength, mappedAddress);
}
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/BufferSubMemoryBlock.java
View file

@ -117,6 +117,6 @@ class BufferSubMemoryBlock extends SubMemoryBlock {
@Override
protected String getDescription() {
return "";
return "init[0x%x]".formatted(subBlockLength);
}
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/ByteMappedSubMemoryBlock.java
View file

@ -199,7 +199,7 @@ class ByteMappedSubMemoryBlock extends SubMemoryBlock {
@Override
protected String getDescription() {
return "Byte Mapped: " + mappedAddress + ", " + byteMappingScheme;
return "bytemap[0x%x, 0x%x, %s]".formatted(subBlockOffset, subBlockLength, mappedAddress);
}
}

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/FileBytesSubMemoryBlock.java
View file

@ -112,10 +112,8 @@ class FileBytesSubMemoryBlock extends SubMemoryBlock {
@Override
protected String getDescription() {
String fileName = fileBytes.getFilename();
String hexString = Long.toHexString(fileBytesOffset + fileBytes.getFileOffset());
return "File: " + fileName + ": 0x" + hexString;
return "%s[0x%x, 0x%x]".formatted(fileBytes.getFilename(),
fileBytesOffset + fileBytes.getFileOffset(), subBlockLength);
}
@Override

3
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/UninitializedSubMemoryBlock.java
View file

@ -86,7 +86,6 @@ class UninitializedSubMemoryBlock extends SubMemoryBlock {
@Override
protected String getDescription() {
return "";
return "uninit[0x%x]".formatted(subBlockLength);
}
}