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

GT-2845: Removing MemoryConflictHandler.

Browse source
This commit is contained in:
Ryan Kurtz 2019-07-16 14:08:25 -04:00
parent 07129cca77
commit 7617f30756
36 changed files with 103 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Processors/JVM/src/main/java/ghidra/app/util/opinion/JavaLoader.java
View file

@ -23,7 +23,6 @@ import ghidra.app.cmd.register.SetRegisterCmd;
import ghidra.app.util.Option;
import ghidra.app.util.bin.BinaryReader;
import ghidra.app.util.bin.ByteProvider;
import ghidra.app.util.importer.MemoryConflictHandler;
import ghidra.app.util.importer.MessageLog;
import ghidra.framework.store.LockException;
import ghidra.javaclass.format.*;
@ -91,8 +90,7 @@ public class JavaLoader extends AbstractLibrarySupportLoader {
@Override
public void load(ByteProvider provider, LoadSpec loadSpec, List<Option> options,
Program program, MemoryConflictHandler handler, TaskMonitor monitor, MessageLog log)
throws IOException {
Program program, TaskMonitor monitor, MessageLog log) throws IOException {
try {
doLoad(provider, program, monitor);
}
@ -115,7 +113,7 @@ public class JavaLoader extends AbstractLibrarySupportLoader {
public void load(ByteProvider provider, Program program, TaskMonitor monitor)
throws IOException {
load(provider, null, null, program, null, monitor, null);
load(provider, null, null, program, monitor, null);
}
private void doLoad(ByteProvider provider, Program program, TaskMonitor monitor)