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

Merge remote-tracking branch 'origin/GP-1545_Dan_noGuavaCache--SQUASHED'

Browse source 
Conflicts:
	Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DelegateDbgModel2TargetObject.java
This commit is contained in:
Ryan Kurtz 2023-02-28 13:06:36 -05:00
commit 2b20e32a78
142 changed files with 1135 additions and 1939 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/reason/GdbReason.java
View file

@ -18,8 +18,6 @@ package agent.gdb.manager.reason;
import java.util.Map;
import java.util.function.Function;
import com.google.common.collect.ImmutableMap;
import agent.gdb.manager.GdbState;
import agent.gdb.manager.parsing.GdbMiParser.GdbMiFieldList;
import ghidra.util.Msg;
@ -38,13 +36,12 @@ public interface GdbReason {
* A map of reason strings to reason classes
*/
static final Map<String, Function<GdbMiFieldList, ? extends GdbReason>> TYPES =
new ImmutableMap.Builder<String, Function<GdbMiFieldList, ? extends GdbReason>>()
.put("signal-received", GdbSignalReceivedReason::new)
.put("breakpoint-hit", GdbBreakpointHitReason::new)
.put("end-stepping-range", GdbEndSteppingRangeReason::new)
.put("exited", GdbExitedReason::new)
.put("exited-normally", GdbExitNormallyReason::new)
.build();
Map.ofEntries(
Map.entry("signal-received", GdbSignalReceivedReason::new),
Map.entry("breakpoint-hit", GdbBreakpointHitReason::new),
Map.entry("end-stepping-range", GdbEndSteppingRangeReason::new),
Map.entry("exited", GdbExitedReason::new),
Map.entry("exited-normally", GdbExitNormallyReason::new));
/**
* Reasons other than those given by GDB

5
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetBreakpointSpec.java
View file

@ -29,6 +29,7 @@ import ghidra.dbg.target.schema.TargetAttributeType;
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
import ghidra.dbg.util.PathUtils;
import ghidra.util.Msg;
import ghidra.util.datastruct.ListenerMap.ListenerEntry;
import ghidra.util.datastruct.ListenerSet;
import ghidra.util.datastruct.WeakValueHashMap;
@ -62,8 +63,8 @@ public class GdbModelTargetBreakpointSpec extends
protected final ListenerSet<TargetBreakpointAction> actions =
new ListenerSet<>(TargetBreakpointAction.class) {
// Use strong references on actions
protected Map<TargetBreakpointAction, TargetBreakpointAction> createMap() {
return Collections.synchronizedMap(new LinkedHashMap<>());
protected Map<TargetBreakpointAction, ListenerEntry<? extends TargetBreakpointAction>> createMap() {
return new LinkedHashMap<>();
};
};

16
Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/GdbTableTest.java
View file

@ -22,10 +22,6 @@ import java.util.function.Consumer;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import agent.gdb.manager.GdbTable;
import agent.gdb.manager.parsing.GdbMiParser.GdbMiFieldList;
public class GdbTableTest {
@ -35,16 +31,16 @@ public class GdbTableTest {
return builder.build();
}
protected <K, V> Map<K, V> buildMap(Consumer<ImmutableMap.Builder<K, V>> conf) {
ImmutableMap.Builder<K, V> builder = ImmutableMap.builder();
protected <K, V> Map<K, V> buildMap(Consumer<Map<K, V>> conf) {
Map<K, V> builder = new HashMap<>();
conf.accept(builder);
return builder.build();
return Map.copyOf(builder);
}
protected <E> List<E> buildList(Consumer<ImmutableList.Builder<E>> conf) {
ImmutableList.Builder<E> builder = ImmutableList.builder();
protected <E> List<E> buildList(Consumer<List<E>> conf) {
List<E> builder = new ArrayList<>();
conf.accept(builder);
return builder.build();
return List.copyOf(builder);
}
protected GdbTable buildTestTable() {