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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-12-28 09:02:06 -05:00
commit 55124ff249
120 changed files with 920 additions and 932 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DiffOverlayApplyTest.java
View file

@ -28,7 +28,7 @@ import ghidra.program.model.mem.Memory;
import ghidra.program.model.mem.MemoryBlock;
import ghidra.program.util.DiffUtility;
import ghidra.test.ClassicSampleX86ProgramBuilder;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
public class DiffOverlayApplyTest extends DiffApplyTestAdapter {
@ -50,7 +50,7 @@ public class DiffOverlayApplyTest extends DiffApplyTestAdapter {
MemoryBlock dataBlock1 = memory1.getBlock(".data");
MemoryBlock overlayBlock1 =
memory1.createInitializedBlock("OVL1", dataBlock1.getStart(), 0x20L, (byte) 0,
TaskMonitorAdapter.DUMMY_MONITOR, true);
TaskMonitor.DUMMY, true);
assertEquals(3, p1.getAddressFactory().getNumAddressSpaces()); // ram, OTHER, OVL1
AddressSet addressSet1 = new AddressSet(overlayBlock1.getStart(), overlayBlock1.getEnd());
@ -77,7 +77,7 @@ public class DiffOverlayApplyTest extends DiffApplyTestAdapter {
MemoryBlock dataBlock2 = memory2.getBlock(".data");
MemoryBlock overlayBlock2 =
memory2.createInitializedBlock("OVL1", dataBlock2.getStart(), 0x20L, (byte) 0,
TaskMonitorAdapter.DUMMY_MONITOR, true);
TaskMonitor.DUMMY, true);
assertEquals(3, p2.getAddressFactory().getNumAddressSpaces());
AddressSet addressSet2 = DiffUtility.getCompatibleAddressSet(addressSet1, p2);