Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-12-03 17:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-3178_ghidragon_pinned_symbol_bug_on_rebase' (Closes #4290)
This commit is contained in:
Ryan Kurtz 2023-03-21 13:56:55 -04:00
commit 6660f9663b
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/symbol/PinnedSymbolTest.java
View File

@ -36,7 +36,6 @@ import ghidra.test.AbstractGhidraHeadlessIntegrationTest;
import ghidra.util.exception.InvalidInputException;
import ghidra.util.exception.NotFoundException;
import ghidra.util.task.TaskMonitor;
import ghidra.util.task.TaskMonitorAdapter;
public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
private static int EXPECTED_PROCESSOR_SYMBOLS = 9;
@ -63,11 +62,13 @@ public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
checkProcessorSymbolsInPlace(EXPECTED_PROCESSOR_SYMBOLS + EXPECTED_USER_SYMBOLS);
assertNotNull(symbolTable.getPrimarySymbol(addr(4)));
long imageBaseMove = 0x100;
Address movedBobAddress = originalBobAddress.add(imageBaseMove);
Address movedFunctionAddress = originalFunctionAddress.add(imageBaseMove);
Address originalImageBase = program.getImageBase();
Address newImageBase = addr(0x100);
long imageBaseMove = newImageBase.subtract(originalImageBase);
Address movedBobAddress = originalBobAddress.addWrap(imageBaseMove);
Address movedFunctionAddress = originalFunctionAddress.addWrap(imageBaseMove);
program.setImageBase(addr(imageBaseMove), true);
program.setImageBase(newImageBase, true);
// expect one new symbol for pinned function
checkProcessorSymbolsInPlace(EXPECTED_PROCESSOR_SYMBOLS + EXPECTED_USER_SYMBOLS + 1);
@ -192,7 +193,7 @@ public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
assertEquals(SymbolType.LABEL, target.getSymbolType());
assertTrue(target.isPinned());
Memory memory = program.getMemory();
MemoryBlock block = memory.getBlock(addr(0));
memory.moveBlock(block, addr(moveAmount), TaskMonitor.DUMMY);
@ -259,6 +260,7 @@ public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
program = new ProgramDB("z80", lang, lang.getDefaultCompilerSpec(), this);
symbolTable = program.getSymbolTable();
space = program.getAddressFactory().getDefaultAddressSpace();
program.setImageBase(addr(0xff00), BATCH_MODE);
originalBobAddress = addr(ORIGINAL_BOB_ADDRESS);
originalFunctionAddress = addr(ORIGINAL_FUNCTION_ADDRESS);
@ -269,7 +271,6 @@ public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
createBobSymbol();
createPinnedFunctionSymbol();
}
private void createProcessorSymbols(Language lang) throws InvalidInputException {
@ -290,8 +291,8 @@ public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
throws InvalidInputException, OverlappingFunctionException {
AddressSet set = new AddressSet(originalFunctionAddress);
Function fun = program.getFunctionManager()
.createFunction("MyFunction", originalFunctionAddress, set,
SourceType.USER_DEFINED);
.createFunction("MyFunction", originalFunctionAddress, set,
SourceType.USER_DEFINED);
Symbol symbol = fun.getSymbol();
symbol.setPinned(true);
}
@ -309,8 +310,9 @@ public class PinnedSymbolTest extends AbstractGhidraHeadlessIntegrationTest {
private void createMemBlock() throws Exception {
byte[] bytesOne = new byte[100];
TaskMonitor m = TaskMonitor.DUMMY;
program.getMemory().createInitializedBlock("B1", addr(0),
new ByteArrayInputStream(bytesOne), bytesOne.length, m, false);
program.getMemory()
.createInitializedBlock("B1", addr(0),
new ByteArrayInputStream(bytesOne), bytesOne.length, m, false);
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java
View File

@ -2448,7 +2448,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
Set<Address> primaryFixups = new HashSet<>();
for (SymbolDB symbol : fixupPinnedSymbols) {
Address currentAddress = symbol.getAddress();
Address beforeBaseChangeAddress = oldBase.add(currentAddress.subtract(base));
Address beforeBaseChangeAddress = oldBase.addWrap(currentAddress.subtract(base));
primaryFixups.add(currentAddress);
primaryFixups.add(beforeBaseChangeAddress);