Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 23:46:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-1545: De-guava the Debugger

Browse Source
This commit is contained in:
Dan
2023-02-27 12:26:21 -05:00
parent a2ae1f08ce
commit d43b9ead66
142 changed files with 1125 additions and 1889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/advanced/DebugAdvancedInternal.java
+4 -8
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.advanced;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -43,14 +42,11 @@ public interface DebugAdvancedInternal extends DebugAdvanced {
return DbgEngUtil.lazyWeakCache(CACHE, advanced, DebugAdvancedImpl3::new); return DbgEngUtil.lazyWeakCache(CACHE, advanced, DebugAdvancedImpl3::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugAdvanced>> PREFERRED_ADVANCED_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugAdvanced>> PREFERRED_ADVANCED_IIDS = Map<REFIID, Class<? extends WrapIDebugAdvanced>> PREFERRED_ADVANCED_IIDS =
PREFERRED_ADVANCED_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugAdvanced3.IID_IDEBUG_ADVANCED3), WrapIDebugAdvanced3.class) // Map.entry(new REFIID(IDebugAdvanced3.IID_IDEBUG_ADVANCED3), WrapIDebugAdvanced3.class),
.put(new REFIID(IDebugAdvanced2.IID_IDEBUG_ADVANCED2), WrapIDebugAdvanced2.class) // Map.entry(new REFIID(IDebugAdvanced2.IID_IDEBUG_ADVANCED2), WrapIDebugAdvanced2.class),
.put(new REFIID(IDebugAdvanced.IID_IDEBUG_ADVANCED), WrapIDebugAdvanced.class) // Map.entry(new REFIID(IDebugAdvanced.IID_IDEBUG_ADVANCED), WrapIDebugAdvanced.class));
.build();
static DebugAdvancedInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugAdvancedInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugAdvancedInternal.class, return DbgEngUtil.tryPreferredInterfaces(DebugAdvancedInternal.class,
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/breakpoint/DebugBreakpointInternal.java
+7 -10
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.breakpoint;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -43,16 +42,14 @@ public interface DebugBreakpointInternal extends DebugBreakpoint {
return DbgEngUtil.lazyWeakCache(CACHE, bp, DebugBreakpointImpl3::new); return DbgEngUtil.lazyWeakCache(CACHE, bp, DebugBreakpointImpl3::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugBreakpoint>> PREFERRED_BREAKPOINT_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugBreakpoint>> PREFERRED_BREAKPOINT_IIDS = Map<REFIID, Class<? extends WrapIDebugBreakpoint>> PREFERRED_BREAKPOINT_IIDS =
PREFERRED_BREAKPOINT_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugBreakpoint3.IID_IDEBUG_BREAKPOINT3), Map.entry(new REFIID(IDebugBreakpoint3.IID_IDEBUG_BREAKPOINT3),
WrapIDebugBreakpoint3.class) // WrapIDebugBreakpoint3.class),
.put(new REFIID(IDebugBreakpoint2.IID_IDEBUG_BREAKPOINT2), Map.entry(new REFIID(IDebugBreakpoint2.IID_IDEBUG_BREAKPOINT2),
WrapIDebugBreakpoint2.class) // WrapIDebugBreakpoint2.class),
.put(new REFIID(IDebugBreakpoint.IID_IDEBUG_BREAKPOINT), WrapIDebugBreakpoint.class) // Map.entry(new REFIID(IDebugBreakpoint.IID_IDEBUG_BREAKPOINT),
.build(); WrapIDebugBreakpoint.class));
static DebugBreakpointInternal tryPreferredInterfaces(DebugControlInternal control, static DebugBreakpointInternal tryPreferredInterfaces(DebugControlInternal control,
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/client/DebugClientInternal.java
+8 -12
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.client;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -67,18 +66,15 @@ public interface DebugClientInternal extends DebugClient {
return DbgEngUtil.lazyWeakCache(CACHE, client, DebugClientImpl7::new); return DbgEngUtil.lazyWeakCache(CACHE, client, DebugClientImpl7::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugClient>> PREFERRED_CLIENT_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugClient>> PREFERRED_CLIENT_IIDS = Map<REFIID, Class<? extends WrapIDebugClient>> PREFERRED_CLIENT_IIDS =
PREFERRED_CLIENT_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugClient7.IID_IDEBUG_CLIENT7), WrapIDebugClient7.class) // Map.entry(new REFIID(IDebugClient7.IID_IDEBUG_CLIENT7), WrapIDebugClient7.class),
.put(new REFIID(IDebugClient6.IID_IDEBUG_CLIENT6), WrapIDebugClient6.class) // Map.entry(new REFIID(IDebugClient6.IID_IDEBUG_CLIENT6), WrapIDebugClient6.class),
.put(new REFIID(IDebugClient5.IID_IDEBUG_CLIENT5), WrapIDebugClient5.class) // Map.entry(new REFIID(IDebugClient5.IID_IDEBUG_CLIENT5), WrapIDebugClient5.class),
.put(new REFIID(IDebugClient4.IID_IDEBUG_CLIENT4), WrapIDebugClient4.class) // Map.entry(new REFIID(IDebugClient4.IID_IDEBUG_CLIENT4), WrapIDebugClient4.class),
.put(new REFIID(IDebugClient3.IID_IDEBUG_CLIENT3), WrapIDebugClient3.class) // Map.entry(new REFIID(IDebugClient3.IID_IDEBUG_CLIENT3), WrapIDebugClient3.class),
.put(new REFIID(IDebugClient2.IID_IDEBUG_CLIENT2), WrapIDebugClient2.class) // Map.entry(new REFIID(IDebugClient2.IID_IDEBUG_CLIENT2), WrapIDebugClient2.class),
.put(new REFIID(IDebugClient.IID_IDEBUG_CLIENT), WrapIDebugClient.class) // Map.entry(new REFIID(IDebugClient.IID_IDEBUG_CLIENT), WrapIDebugClient.class));
.build();
static DebugClientInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugClientInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugClientInternal.class, PREFERRED_CLIENT_IIDS, return DbgEngUtil.tryPreferredInterfaces(DebugClientInternal.class, PREFERRED_CLIENT_IIDS,
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/control/DebugControlInternal.java
+8 -12
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.control;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -59,18 +58,15 @@ public interface DebugControlInternal extends DebugControl {
return DbgEngUtil.lazyWeakCache(CACHE, control, DebugControlImpl7::new); return DbgEngUtil.lazyWeakCache(CACHE, control, DebugControlImpl7::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugControl>> PREFERRED_CONTROL_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugControl>> PREFERRED_CONTROL_IIDS = Map<REFIID, Class<? extends WrapIDebugControl>> PREFERRED_CONTROL_IIDS =
PREFERRED_CONTROL_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugControl7.IID_IDEBUG_CONTROL7), WrapIDebugControl7.class) // Map.entry(new REFIID(IDebugControl7.IID_IDEBUG_CONTROL7), WrapIDebugControl7.class),
.put(new REFIID(IDebugControl6.IID_IDEBUG_CONTROL6), WrapIDebugControl6.class) // Map.entry(new REFIID(IDebugControl6.IID_IDEBUG_CONTROL6), WrapIDebugControl6.class),
.put(new REFIID(IDebugControl5.IID_IDEBUG_CONTROL5), WrapIDebugControl5.class) // Map.entry(new REFIID(IDebugControl5.IID_IDEBUG_CONTROL5), WrapIDebugControl5.class),
.put(new REFIID(IDebugControl4.IID_IDEBUG_CONTROL4), WrapIDebugControl4.class) // Map.entry(new REFIID(IDebugControl4.IID_IDEBUG_CONTROL4), WrapIDebugControl4.class),
.put(new REFIID(IDebugControl3.IID_IDEBUG_CONTROL3), WrapIDebugControl3.class) // Map.entry(new REFIID(IDebugControl3.IID_IDEBUG_CONTROL3), WrapIDebugControl3.class),
.put(new REFIID(IDebugControl2.IID_IDEBUG_CONTROL2), WrapIDebugControl2.class) // Map.entry(new REFIID(IDebugControl2.IID_IDEBUG_CONTROL2), WrapIDebugControl2.class),
.put(new REFIID(IDebugControl.IID_IDEBUG_CONTROL), WrapIDebugControl.class) // Map.entry(new REFIID(IDebugControl.IID_IDEBUG_CONTROL), WrapIDebugControl.class));
.build();
static DebugControlInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugControlInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugControlInternal.class, PREFERRED_CONTROL_IIDS, return DbgEngUtil.tryPreferredInterfaces(DebugControlInternal.class, PREFERRED_CONTROL_IIDS,
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/dataspaces/DebugDataSpacesInternal.java
+9 -13
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.dataspaces;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -46,19 +45,16 @@ public interface DebugDataSpacesInternal extends DebugDataSpaces {
return DbgEngUtil.lazyWeakCache(CACHE, data, DebugDataSpacesImpl4::new); return DbgEngUtil.lazyWeakCache(CACHE, data, DebugDataSpacesImpl4::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugDataSpaces>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugDataSpaces>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugDataSpaces>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugDataSpaces4.IID_IDEBUG_DATA_SPACES4), Map.entry(new REFIID(IDebugDataSpaces4.IID_IDEBUG_DATA_SPACES4),
WrapIDebugDataSpaces4.class) // WrapIDebugDataSpaces4.class),
.put(new REFIID(IDebugDataSpaces3.IID_IDEBUG_DATA_SPACES3), Map.entry(new REFIID(IDebugDataSpaces3.IID_IDEBUG_DATA_SPACES3),
WrapIDebugDataSpaces3.class) // WrapIDebugDataSpaces3.class),
.put(new REFIID(IDebugDataSpaces2.IID_IDEBUG_DATA_SPACES2), Map.entry(new REFIID(IDebugDataSpaces2.IID_IDEBUG_DATA_SPACES2),
WrapIDebugDataSpaces2.class) // WrapIDebugDataSpaces2.class),
.put(new REFIID(IDebugDataSpaces.IID_IDEBUG_DATA_SPACES), Map.entry(new REFIID(IDebugDataSpaces.IID_IDEBUG_DATA_SPACES),
WrapIDebugDataSpaces.class) // WrapIDebugDataSpaces.class));
.build();
static DebugDataSpacesInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugDataSpacesInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugDataSpacesInternal.class, return DbgEngUtil.tryPreferredInterfaces(DebugDataSpacesInternal.class,
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/registers/DebugRegistersInternal.java
+5 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.registers;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -38,13 +37,12 @@ public interface DebugRegistersInternal extends DebugRegisters {
return DbgEngUtil.lazyWeakCache(CACHE, registers, DebugRegistersImpl2::new); return DbgEngUtil.lazyWeakCache(CACHE, registers, DebugRegistersImpl2::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugRegisters>> PREFERRED_REGISTERS_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugRegisters>> PREFERRED_REGISTERS_IIDS = Map<REFIID, Class<? extends WrapIDebugRegisters>> PREFERRED_REGISTERS_IIDS =
PREFERRED_REGISTERS_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugRegisters2.IID_IDEBUG_REGISTERS2), WrapIDebugRegisters2.class) // Map.entry(new REFIID(IDebugRegisters2.IID_IDEBUG_REGISTERS2),
.put(new REFIID(IDebugRegisters.IID_IDEBUG_REGISTERS), WrapIDebugRegisters.class) // WrapIDebugRegisters2.class),
.build(); Map.entry(new REFIID(IDebugRegisters.IID_IDEBUG_REGISTERS),
WrapIDebugRegisters.class));
static DebugRegistersInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugRegistersInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugRegistersInternal.class, return DbgEngUtil.tryPreferredInterfaces(DebugRegistersInternal.class,
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/symbols/DebugSymbolsInternal.java
+7 -10
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.symbols;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -51,16 +50,13 @@ public interface DebugSymbolsInternal extends DebugSymbols {
return DbgEngUtil.lazyWeakCache(CACHE, symbols, DebugSymbolsImpl5::new); return DbgEngUtil.lazyWeakCache(CACHE, symbols, DebugSymbolsImpl5::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugSymbols>> PREFERRED_SYMBOLS_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugSymbols>> PREFFERED_SYMBOLS_IIDS = Map<REFIID, Class<? extends WrapIDebugSymbols>> PREFFERED_SYMBOLS_IIDS =
PREFERRED_SYMBOLS_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugSymbols5.IID_IDEBUG_SYMBOLS5), WrapIDebugSymbols5.class) // Map.entry(new REFIID(IDebugSymbols5.IID_IDEBUG_SYMBOLS5), WrapIDebugSymbols5.class),
.put(new REFIID(IDebugSymbols4.IID_IDEBUG_SYMBOLS4), WrapIDebugSymbols4.class) // Map.entry(new REFIID(IDebugSymbols4.IID_IDEBUG_SYMBOLS4), WrapIDebugSymbols4.class),
.put(new REFIID(IDebugSymbols3.IID_IDEBUG_SYMBOLS3), WrapIDebugSymbols3.class) // Map.entry(new REFIID(IDebugSymbols3.IID_IDEBUG_SYMBOLS3), WrapIDebugSymbols3.class),
.put(new REFIID(IDebugSymbols2.IID_IDEBUG_SYMBOLS2), WrapIDebugSymbols2.class) // Map.entry(new REFIID(IDebugSymbols2.IID_IDEBUG_SYMBOLS2), WrapIDebugSymbols2.class),
.put(new REFIID(IDebugSymbols.IID_IDEBUG_SYMBOLS), WrapIDebugSymbols.class) // Map.entry(new REFIID(IDebugSymbols.IID_IDEBUG_SYMBOLS), WrapIDebugSymbols.class));
.build();
static DebugSymbolsInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugSymbolsInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugSymbolsInternal.class, PREFFERED_SYMBOLS_IIDS, return DbgEngUtil.tryPreferredInterfaces(DebugSymbolsInternal.class, PREFFERED_SYMBOLS_IIDS,
@@ -69,6 +65,7 @@ public interface DebugSymbolsInternal extends DebugSymbols {
String getModuleName(DebugModuleName which, DebugModule module); String getModuleName(DebugModuleName which, DebugModule module);
@Override
DebugModuleInfo getModuleParameters(int count, int startIndex); DebugModuleInfo getModuleParameters(int count, int startIndex);
} }
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/sysobj/DebugSystemObjectsInternal.java
+9 -13
View File
@@ -17,7 +17,6 @@ package agent.dbgeng.impl.dbgeng.sysobj;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -46,19 +45,16 @@ public interface DebugSystemObjectsInternal extends DebugSystemObjects {
return DbgEngUtil.lazyWeakCache(CACHE, sysobj, DebugSystemObjectsImpl4::new); return DbgEngUtil.lazyWeakCache(CACHE, sysobj, DebugSystemObjectsImpl4::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugSystemObjects>> PREFERRED_SYSTEM_OBJECTS_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugSystemObjects>> PREFERRED_SYSTEM_OBJECTS_IIDS = Map<REFIID, Class<? extends WrapIDebugSystemObjects>> PREFERRED_SYSTEM_OBJECTS_IIDS =
PREFERRED_SYSTEM_OBJECTS_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugSystemObjects4.IID_IDEBUG_SYSTEM_OBJECTS4), Map.entry(new REFIID(IDebugSystemObjects4.IID_IDEBUG_SYSTEM_OBJECTS4),
WrapIDebugSystemObjects4.class) // WrapIDebugSystemObjects4.class),
.put(new REFIID(IDebugSystemObjects3.IID_IDEBUG_SYSTEM_OBJECTS3), Map.entry(new REFIID(IDebugSystemObjects3.IID_IDEBUG_SYSTEM_OBJECTS3),
WrapIDebugSystemObjects3.class) // WrapIDebugSystemObjects3.class),
.put(new REFIID(IDebugSystemObjects2.IID_IDEBUG_SYSTEM_OBJECTS2), Map.entry(new REFIID(IDebugSystemObjects2.IID_IDEBUG_SYSTEM_OBJECTS2),
WrapIDebugSystemObjects2.class) // WrapIDebugSystemObjects2.class),
.put(new REFIID(IDebugSystemObjects.IID_IDEBUG_SYSTEM_OBJECTS), Map.entry(new REFIID(IDebugSystemObjects.IID_IDEBUG_SYSTEM_OBJECTS),
WrapIDebugSystemObjects.class) // WrapIDebugSystemObjects.class));
.build();
static DebugSystemObjectsInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugSystemObjectsInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgEngUtil.tryPreferredInterfaces(DebugSystemObjectsInternal.class, return DbgEngUtil.tryPreferredInterfaces(DebugSystemObjectsInternal.class,
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetBreakpointSpecImpl.java
+4 -2
View File
@@ -26,6 +26,7 @@ import ghidra.dbg.target.TargetBreakpointSpec;
import ghidra.dbg.target.schema.TargetAttributeType; import ghidra.dbg.target.schema.TargetAttributeType;
import ghidra.dbg.target.schema.TargetObjectSchemaInfo; import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
import ghidra.dbg.util.PathUtils; import ghidra.dbg.util.PathUtils;
import ghidra.util.datastruct.ListenerMap.ListenerEntry;
import ghidra.util.datastruct.ListenerSet; import ghidra.util.datastruct.ListenerSet;
@TargetObjectSchemaInfo( @TargetObjectSchemaInfo(
@@ -84,8 +85,9 @@ public class DbgModelTargetBreakpointSpecImpl extends DbgModelTargetObjectImpl
private final ListenerSet<TargetBreakpointAction> actions = private final ListenerSet<TargetBreakpointAction> actions =
new ListenerSet<>(TargetBreakpointAction.class) { new ListenerSet<>(TargetBreakpointAction.class) {
// Use strong references on actions // Use strong references on actions
protected Map<TargetBreakpointAction, TargetBreakpointAction> createMap() { // The values may be weak, but the keys, which are the same objects, are strong
return Collections.synchronizedMap(new LinkedHashMap<>()); protected Map<TargetBreakpointAction, ListenerEntry<? extends TargetBreakpointAction>> createMap() {
return new LinkedHashMap<>();
} }
}; };
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/UnknownExInternal.java
+3 -9
View File
@@ -17,16 +17,13 @@ package agent.dbgmodel.impl.dbgmodel;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
import com.sun.jna.platform.win32.COM.IUnknown;
import agent.dbgmodel.dbgmodel.UnknownEx; import agent.dbgmodel.dbgmodel.UnknownEx;
import agent.dbgmodel.impl.dbgmodel.DbgModelUtil.InterfaceSupplier; import agent.dbgmodel.impl.dbgmodel.DbgModelUtil.InterfaceSupplier;
import agent.dbgmodel.jna.dbgmodel.WrapIUnknownEx; import agent.dbgmodel.jna.dbgmodel.WrapIUnknownEx;
import com.sun.jna.platform.win32.COM.IUnknown;
import ghidra.util.datastruct.WeakValueHashMap; import ghidra.util.datastruct.WeakValueHashMap;
public interface UnknownExInternal extends UnknownEx { public interface UnknownExInternal extends UnknownEx {
@@ -36,12 +33,9 @@ public interface UnknownExInternal extends UnknownEx {
return DbgModelUtil.lazyWeakCache(CACHE, data, UnknownExImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, UnknownExImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIUnknownEx>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIUnknownEx>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIUnknownEx>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IUnknown.IID_IUNKNOWN), WrapIUnknownEx.class) // Map.entry(new REFIID(IUnknown.IID_IUNKNOWN), WrapIUnknownEx.class));
.build();
static UnknownExInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static UnknownExInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(UnknownExInternal.class, return DbgModelUtil.tryPreferredInterfaces(UnknownExInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/bridge/HostDataModelAccessInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.bridge;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface HostDataModelAccessInternal extends HostDataModelAccess {
return DbgModelUtil.lazyWeakCache(CACHE, data, HostDataModelAccessImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, HostDataModelAccessImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIHostDataModelAccess>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIHostDataModelAccess>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIHostDataModelAccess>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IHostDataModelAccess.IID_IHOST_DATA_MODEL_ACCESS), Map.entry(new REFIID(IHostDataModelAccess.IID_IHOST_DATA_MODEL_ACCESS),
WrapIHostDataModelAccess.class) // WrapIHostDataModelAccess.class));
.build();
static HostDataModelAccessInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static HostDataModelAccessInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(HostDataModelAccessInternal.class, return DbgModelUtil.tryPreferredInterfaces(HostDataModelAccessInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/ComparableConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface ComparableConceptInternal extends ComparableConcept {
return DbgModelUtil.lazyWeakCache(CACHE, data, ComparableConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, ComparableConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIComparableConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIComparableConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIComparableConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IComparableConcept.IID_ICOMPARABLE_CONCEPT), Map.entry(new REFIID(IComparableConcept.IID_ICOMPARABLE_CONCEPT),
WrapIComparableConcept.class) // WrapIComparableConcept.class));
.build();
static ComparableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static ComparableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(ComparableConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(ComparableConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/DataModelConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelConceptInternal extends DataModelConcept {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelConcept.IID_IDATA_MODEL_CONCEPT), Map.entry(new REFIID(IDataModelConcept.IID_IDATA_MODEL_CONCEPT),
WrapIDataModelConcept.class) // WrapIDataModelConcept.class));
.build();
static DataModelConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/DynamicConceptProviderConceptInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -36,15 +35,12 @@ public interface DynamicConceptProviderConceptInternal extends DynamicConceptPro
return DbgModelUtil.lazyWeakCache(CACHE, data, DynamicConceptProviderConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DynamicConceptProviderConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDynamicConceptProviderConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDynamicConceptProviderConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDynamicConceptProviderConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID( new REFIID(
IDynamicConceptProviderConcept.IID_IDYNAMIC_CONCEPT_PROVIDER_CONCEPT), IDynamicConceptProviderConcept.IID_IDYNAMIC_CONCEPT_PROVIDER_CONCEPT),
WrapIDynamicConceptProviderConcept.class) // WrapIDynamicConceptProviderConcept.class));
.build();
static DynamicConceptProviderConceptInternal tryPreferredInterfaces( static DynamicConceptProviderConceptInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/DynamicKeyProviderConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DynamicKeyProviderConceptInternal extends DynamicKeyProviderCon
return DbgModelUtil.lazyWeakCache(CACHE, data, DynamicKeyProviderConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DynamicKeyProviderConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDynamicKeyProviderConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDynamicKeyProviderConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDynamicKeyProviderConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDynamicKeyProviderConcept.IID_IDYNAMIC_KEY_PROVIDER_CONCEPT), Map.entry(new REFIID(IDynamicKeyProviderConcept.IID_IDYNAMIC_KEY_PROVIDER_CONCEPT),
WrapIDynamicKeyProviderConcept.class) // WrapIDynamicKeyProviderConcept.class));
.build();
static DynamicKeyProviderConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DynamicKeyProviderConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DynamicKeyProviderConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(DynamicKeyProviderConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/EquatableConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface EquatableConceptInternal extends EquatableConcept {
return DbgModelUtil.lazyWeakCache(CACHE, data, EquatableConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, EquatableConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIEquatableConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIEquatableConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIEquatableConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IEquatableConcept.IID_IEQUATABLE_CONCEPT), Map.entry(new REFIID(IEquatableConcept.IID_IEQUATABLE_CONCEPT),
WrapIEquatableConcept.class) // WrapIEquatableConcept.class));
.build();
static EquatableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static EquatableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(EquatableConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(EquatableConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/IndexableConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface IndexableConceptInternal extends IndexableConcept {
return DbgModelUtil.lazyWeakCache(CACHE, data, IndexableConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, IndexableConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIIndexableConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIIndexableConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIIndexableConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IIndexableConcept.IID_IINDEXABLE_CONCEPT), Map.entry(new REFIID(IIndexableConcept.IID_IINDEXABLE_CONCEPT),
WrapIIndexableConcept.class) // WrapIIndexableConcept.class));
.build();
static IndexableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static IndexableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(IndexableConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(IndexableConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/IterableConceptInternal.java
+3 -6
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,12 +34,10 @@ public interface IterableConceptInternal extends IterableConcept {
return DbgModelUtil.lazyWeakCache(CACHE, data, IterableConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, IterableConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIIterableConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIIterableConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIIterableConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IIterableConcept.IID_IITERABLE_CONCEPT), WrapIIterableConcept.class) // Map.entry(new REFIID(IIterableConcept.IID_IITERABLE_CONCEPT),
.build(); WrapIIterableConcept.class));
static IterableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static IterableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(IterableConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(IterableConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/PreferredRuntimeTypeConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface PreferredRuntimeTypeConceptInternal extends PreferredRuntimeTyp
return DbgModelUtil.lazyWeakCache(CACHE, data, PreferredRuntimeTypeConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, PreferredRuntimeTypeConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIPreferredRuntimeTypeConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIPreferredRuntimeTypeConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIPreferredRuntimeTypeConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IPreferredRuntimeTypeConcept.IID_IPREFERRED_RUNTIME_TYPE_CONCEPT), Map.entry(new REFIID(IPreferredRuntimeTypeConcept.IID_IPREFERRED_RUNTIME_TYPE_CONCEPT),
WrapIPreferredRuntimeTypeConcept.class) // WrapIPreferredRuntimeTypeConcept.class));
.build();
static PreferredRuntimeTypeConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static PreferredRuntimeTypeConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(PreferredRuntimeTypeConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(PreferredRuntimeTypeConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/concept/StringDisplayableConceptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.concept;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface StringDisplayableConceptInternal extends StringDisplayableConce
return DbgModelUtil.lazyWeakCache(CACHE, data, StringDisplayableConceptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, StringDisplayableConceptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIStringDisplayableConcept>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIStringDisplayableConcept>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIStringDisplayableConcept>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IStringDisplayableConcept.IID_ISTRING_DISPLAYABLE_CONCEPT), Map.entry(new REFIID(IStringDisplayableConcept.IID_ISTRING_DISPLAYABLE_CONCEPT),
WrapIStringDisplayableConcept.class) // WrapIStringDisplayableConcept.class));
.build();
static StringDisplayableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static StringDisplayableConceptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(StringDisplayableConceptInternal.class, return DbgModelUtil.tryPreferredInterfaces(StringDisplayableConceptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/DataModelManagerInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -38,15 +37,12 @@ public interface DataModelManagerInternal extends DataModelManager1 {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelManagerImpl2::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelManagerImpl2::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelManager1>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelManager1>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelManager1>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelManager2.IID_IDATA_MODEL_MANAGER2), Map.entry(new REFIID(IDataModelManager2.IID_IDATA_MODEL_MANAGER2),
WrapIDataModelManager2.class) // WrapIDataModelManager2.class),
.put(new REFIID(IDataModelManager1.IID_IDATA_MODEL_MANAGER), Map.entry(new REFIID(IDataModelManager1.IID_IDATA_MODEL_MANAGER),
WrapIDataModelManager1.class) // WrapIDataModelManager1.class));
.build();
static DataModelManagerInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelManagerInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelManagerInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelManagerInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelNameBinderInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelNameBinderInternal extends DataModelNameBinder {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelNameBinderImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelNameBinderImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelNameBinder>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelNameBinder>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelNameBinder>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelNameBinder.IID_IDATA_MODEL_NAME_BINDER), Map.entry(new REFIID(IDataModelNameBinder.IID_IDATA_MODEL_NAME_BINDER),
WrapIDataModelNameBinder.class) // WrapIDataModelNameBinder.class));
.build();
static DataModelNameBinderInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelNameBinderInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelNameBinderInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelNameBinderInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptClientInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelScriptClientInternal extends DataModelScriptClient {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptClientImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptClientImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptClient>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptClient>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptClient>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScriptClient.IID_IDATA_MODEL_SCRIPT_CLIENT), Map.entry(new REFIID(IDataModelScriptClient.IID_IDATA_MODEL_SCRIPT_CLIENT),
WrapIDataModelScriptClient.class) // WrapIDataModelScriptClient.class));
.build();
static DataModelScriptClientInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptClientInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptClientInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptClientInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptHostContextInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelScriptHostContextInternal extends DataModelScriptHostC
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptHostContextImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptHostContextImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptHostContext>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptHostContext>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptHostContext>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScriptHostContext.IID_IDATA_MODEL_SCRIPT_HOST_CONTEXT), Map.entry(new REFIID(IDataModelScriptHostContext.IID_IDATA_MODEL_SCRIPT_HOST_CONTEXT),
WrapIDataModelScriptHostContext.class) // WrapIDataModelScriptHostContext.class));
.build();
static DataModelScriptHostContextInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptHostContextInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptHostContextInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptHostContextInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelScriptInternal extends DataModelScript {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScript>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScript>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScript>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScript.IID_IDATA_MODEL_SCRIPT), Map.entry(new REFIID(IDataModelScript.IID_IDATA_MODEL_SCRIPT),
WrapIDataModelScript.class) // WrapIDataModelScript.class));
.build();
static DataModelScriptInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptManagerInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelScriptManagerInternal extends DataModelScriptManager {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptManagerImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptManagerImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptManager>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptManager>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptManager>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScriptManager.IID_IDATA_MODEL_SCRIPT_MANAGER), Map.entry(new REFIID(IDataModelScriptManager.IID_IDATA_MODEL_SCRIPT_MANAGER),
WrapIDataModelScriptManager.class) // WrapIDataModelScriptManager.class));
.build();
static DataModelScriptManagerInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptManagerInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptManagerInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptManagerInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptProviderEnumeratorInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -37,15 +36,12 @@ public interface DataModelScriptProviderEnumeratorInternal
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptProviderEnumeratorImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptProviderEnumeratorImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptProviderEnumerator>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptProviderEnumerator>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptProviderEnumerator>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID( new REFIID(
IDataModelScriptProviderEnumerator.IID_IDATA_MODEL_SCRIPT_PROVIDER_ENUMERATOR), IDataModelScriptProviderEnumerator.IID_IDATA_MODEL_SCRIPT_PROVIDER_ENUMERATOR),
WrapIDataModelScriptProviderEnumerator.class) // WrapIDataModelScriptProviderEnumerator.class));
.build();
static DataModelScriptProviderEnumeratorInternal tryPreferredInterfaces( static DataModelScriptProviderEnumeratorInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptProviderInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelScriptProviderInternal extends DataModelScriptProvider
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptProviderImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptProviderImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptProvider>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptProvider>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptProvider>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScriptProvider.IID_IDATA_MODEL_SCRIPT_PROVIDER), Map.entry(new REFIID(IDataModelScriptProvider.IID_IDATA_MODEL_SCRIPT_PROVIDER),
WrapIDataModelScriptProvider.class) // WrapIDataModelScriptProvider.class));
.build();
static DataModelScriptProviderInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptProviderInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptProviderInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptProviderInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptTemplateEnumeratorInternal.java
+4 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -37,15 +36,11 @@ public interface DataModelScriptTemplateEnumeratorInternal
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptTemplateEnumeratorImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptTemplateEnumeratorImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptTemplateEnumerator>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptTemplateEnumerator>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptTemplateEnumerator>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(new REFIID(
new REFIID( IDataModelScriptTemplateEnumerator.IID_IDATA_MODEL_SCRIPT_TEMPLATE_ENUMERATOR),
IDataModelScriptTemplateEnumerator.IID_IDATA_MODEL_SCRIPT_TEMPLATE_ENUMERATOR), WrapIDataModelScriptTemplateEnumerator.class));
WrapIDataModelScriptTemplateEnumerator.class) //
.build();
static DataModelScriptTemplateEnumeratorInternal tryPreferredInterfaces( static DataModelScriptTemplateEnumeratorInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/DataModelScriptTemplateInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DataModelScriptTemplateInternal extends DataModelScriptTemplate
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptTemplateImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptTemplateImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptTemplate>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptTemplate>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptTemplate>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScriptTemplate.IID_IDATA_MODEL_SCRIPT_TEMPLATE), Map.entry(new REFIID(IDataModelScriptTemplate.IID_IDATA_MODEL_SCRIPT_TEMPLATE),
WrapIDataModelScriptTemplate.class) // WrapIDataModelScriptTemplate.class));
.build();
static DataModelScriptTemplateInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptTemplateInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptTemplateInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptTemplateInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugBreakpointEnumeratorInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -38,15 +37,12 @@ public interface DataModelScriptDebugBreakpointEnumeratorInternal
DataModelScriptDebugBreakpointEnumeratorImpl::new); DataModelScriptDebugBreakpointEnumeratorImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebugBreakpointEnumerator>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebugBreakpointEnumerator>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebugBreakpointEnumerator>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID( new REFIID(
IDataModelScriptDebugBreakpointEnumerator.IID_IDATA_MODEL_SCRIPT_DEBUG_BREAKPOINT_ENUMERATOR), IDataModelScriptDebugBreakpointEnumerator.IID_IDATA_MODEL_SCRIPT_DEBUG_BREAKPOINT_ENUMERATOR),
WrapIDataModelScriptDebugBreakpointEnumerator.class) // WrapIDataModelScriptDebugBreakpointEnumerator.class));
.build();
static DataModelScriptDebugBreakpointEnumeratorInternal tryPreferredInterfaces( static DataModelScriptDebugBreakpointEnumeratorInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugBreakpointInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -36,15 +35,12 @@ public interface DataModelScriptDebugBreakpointInternal extends DataModelScriptD
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugBreakpointImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugBreakpointImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebugBreakpoint>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebugBreakpoint>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebugBreakpoint>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID( new REFIID(
IDataModelScriptDebugBreakpoint.IID_IDATA_MODEL_SCRIPT_DEBUG_BREAKPOINT), IDataModelScriptDebugBreakpoint.IID_IDATA_MODEL_SCRIPT_DEBUG_BREAKPOINT),
WrapIDataModelScriptDebugBreakpoint.class) // WrapIDataModelScriptDebugBreakpoint.class));
.build();
static DataModelScriptDebugBreakpointInternal tryPreferredInterfaces( static DataModelScriptDebugBreakpointInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugClientInternal.java
+4 -8
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -36,14 +35,11 @@ public interface DataModelScriptDebugClientInternal extends DataModelScriptDebug
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugClientImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugClientImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebugClient>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebugClient>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebugClient>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID(IDataModelScriptDebugClient.IID_IDATA_MODEL_SCRIPT_DEBUG_CLIENT), new REFIID(IDataModelScriptDebugClient.IID_IDATA_MODEL_SCRIPT_DEBUG_CLIENT),
WrapIDataModelScriptDebugClient.class) // WrapIDataModelScriptDebugClient.class));
.build();
static DataModelScriptDebugClientInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptDebugClientInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptDebugClientInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptDebugClientInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -34,15 +33,12 @@ public interface DataModelScriptDebugInternal extends DataModelScriptDebug1 {
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebug>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebug>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebug>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDataModelScriptDebug2.IID_IDATA_MODEL_SCRIPT_DEBUG2), Map.entry(new REFIID(IDataModelScriptDebug2.IID_IDATA_MODEL_SCRIPT_DEBUG2),
WrapIDataModelScriptDebug.class) // WrapIDataModelScriptDebug.class),
.put(new REFIID(IDataModelScriptDebug.IID_IDATA_MODEL_SCRIPT_DEBUG), Map.entry(new REFIID(IDataModelScriptDebug.IID_IDATA_MODEL_SCRIPT_DEBUG),
WrapIDataModelScriptDebug.class) // WrapIDataModelScriptDebug.class));
.build();
static DataModelScriptDebugInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptDebugInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptDebugInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptDebugInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugStackFrameInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -36,15 +35,12 @@ public interface DataModelScriptDebugStackFrameInternal extends DataModelScriptD
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugStackFrameImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugStackFrameImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebugStackFrame>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebugStackFrame>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebugStackFrame>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID( new REFIID(
IDataModelScriptDebugStackFrame.IID_IDATA_MODEL_SCRIPT_DEBUG_STACK_FRAME), IDataModelScriptDebugStackFrame.IID_IDATA_MODEL_SCRIPT_DEBUG_STACK_FRAME),
WrapIDataModelScriptDebugStackFrame.class) // WrapIDataModelScriptDebugStackFrame.class));
.build();
static DataModelScriptDebugStackFrameInternal tryPreferredInterfaces( static DataModelScriptDebugStackFrameInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugStackInternal.java
+4 -8
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -36,14 +35,11 @@ public interface DataModelScriptDebugStackInternal extends DataModelScriptDebugS
return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugStackImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DataModelScriptDebugStackImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebugStack>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebugStack>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebugStack>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID(IDataModelScriptDebugStack.IID_IDATA_MODEL_SCRIPT_DEBUG_STACK), new REFIID(IDataModelScriptDebugStack.IID_IDATA_MODEL_SCRIPT_DEBUG_STACK),
WrapIDataModelScriptDebugStack.class) // WrapIDataModelScriptDebugStack.class));
.build();
static DataModelScriptDebugStackInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DataModelScriptDebugStackInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DataModelScriptDebugStackInternal.class, return DbgModelUtil.tryPreferredInterfaces(DataModelScriptDebugStackInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/datamodel/script/debug/DataModelScriptDebugVariableSetEnumeratorInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.datamodel.script.debug;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -39,15 +38,12 @@ public interface DataModelScriptDebugVariableSetEnumeratorInternal
DataModelScriptDebugVariableSetEnumeratorImpl::new); DataModelScriptDebugVariableSetEnumeratorImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDataModelScriptDebugVariableSetEnumerator>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDataModelScriptDebugVariableSetEnumerator>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDataModelScriptDebugVariableSetEnumerator>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put( Map.entry(
new REFIID( new REFIID(
IDataModelScriptDebugVariableSetEnumerator.IID_IDATA_MODEL_SCRIPT_DEBUG_VARIABLE_SET_ENUMERATOR), IDataModelScriptDebugVariableSetEnumerator.IID_IDATA_MODEL_SCRIPT_DEBUG_VARIABLE_SET_ENUMERATOR),
WrapIDataModelScriptDebugVariableSetEnumerator.class) // WrapIDataModelScriptDebugVariableSetEnumerator.class));
.build();
static DataModelScriptDebugVariableSetEnumeratorInternal tryPreferredInterfaces( static DataModelScriptDebugVariableSetEnumeratorInternal tryPreferredInterfaces(
InterfaceSupplier supplier) { InterfaceSupplier supplier) {
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostBaseClassInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -36,13 +35,10 @@ public interface DebugHostBaseClassInternal extends DebugHostBase {
return DbgModelUtil.lazyWeakCache(CACHE, data, X_DebugHostBaseClassImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, X_DebugHostBaseClassImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends X_WrapIDebugHostBaseClass>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends X_WrapIDebugHostBaseClass>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends X_WrapIDebugHostBaseClass>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(X_IDebugHostBaseClass.IID_IDEBUG_HOST_BASE_CLASS), Map.entry(new REFIID(X_IDebugHostBaseClass.IID_IDEBUG_HOST_BASE_CLASS),
X_WrapIDebugHostBaseClass.class) // X_WrapIDebugHostBaseClass.class));
.build();
static X_DebugHostBaseClassInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static X_DebugHostBaseClassInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(X_DebugHostBaseClassInternal.class, return DbgModelUtil.tryPreferredInterfaces(X_DebugHostBaseClassInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostConstantInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DebugHostConstantInternal extends DebugHostConstant {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostConstantImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostConstantImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostConstant>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostConstant>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostConstant>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostConstant.IID_IDEBUG_HOST_CONSTANT), Map.entry(new REFIID(IDebugHostConstant.IID_IDEBUG_HOST_CONSTANT),
WrapIDebugHostConstant.class) // WrapIDebugHostConstant.class));
.build();
static DebugHostConstantInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostConstantInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostConstantInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostConstantInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostContextInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DebugHostContextInternal extends DebugHostContext {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostContextImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostContextImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostContext>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostContext>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostContext>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostContext.IID_IDEBUG_HOST_CONTEXT), Map.entry(new REFIID(IDebugHostContext.IID_IDEBUG_HOST_CONTEXT),
WrapIDebugHostContext.class) // WrapIDebugHostContext.class));
.build();
static DebugHostContextInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostContextInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostContextInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostContextInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostDataInternal.java
+2 -6
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,12 +34,9 @@ public interface DebugHostDataInternal extends DebugHostData {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostDataImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostDataImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostData>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostData>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostData>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostData.IID_IDEBUG_HOST_DATA), WrapIDebugHostData.class) // Map.entry(new REFIID(IDebugHostData.IID_IDEBUG_HOST_DATA), WrapIDebugHostData.class));
.build();
static DebugHostDataInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostDataInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostDataInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostDataInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostErrorSinkInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DebugHostErrorSinkInternal extends DebugHostErrorSink {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostErrorSinkImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostErrorSinkImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostErrorSink>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostErrorSink>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostErrorSink>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostErrorSink.IID_IDEBUG_HOST_ERROR_SINK), Map.entry(new REFIID(IDebugHostErrorSink.IID_IDEBUG_HOST_ERROR_SINK),
WrapIDebugHostErrorSink.class) // WrapIDebugHostErrorSink.class));
.build();
static DebugHostErrorSinkInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostErrorSinkInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostErrorSinkInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostErrorSinkInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostEvaluatorInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -38,15 +37,12 @@ public interface DebugHostEvaluatorInternal extends DebugHostEvaluator1 {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostEvaluatorImpl2::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostEvaluatorImpl2::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostEvaluator1>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostEvaluator1>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostEvaluator1>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostEvaluator2.IID_IDEBUG_HOST_EVALUATOR2), Map.entry(new REFIID(IDebugHostEvaluator2.IID_IDEBUG_HOST_EVALUATOR2),
WrapIDebugHostEvaluator2.class) // WrapIDebugHostEvaluator2.class),
.put(new REFIID(IDebugHostEvaluator1.IID_IDEBUG_HOST_EVALUATOR), Map.entry(new REFIID(IDebugHostEvaluator1.IID_IDEBUG_HOST_EVALUATOR),
WrapIDebugHostEvaluator1.class) // WrapIDebugHostEvaluator1.class));
.build();
static DebugHostEvaluatorInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostEvaluatorInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostEvaluatorInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostEvaluatorInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostExtensabilityInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DebugHostExtensabilityInternal extends DebugHostExtensability {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostExtensabilityImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostExtensabilityImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostExtensability>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostExtensability>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostExtensability>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostExtensability.IID_IDEBUG_HOST_EXTENSABILITY), Map.entry(new REFIID(IDebugHostExtensability.IID_IDEBUG_HOST_EXTENSABILITY),
WrapIDebugHostExtensability.class) // WrapIDebugHostExtensability.class));
.build();
static DebugHostExtensabilityInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostExtensabilityInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostExtensabilityInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostExtensabilityInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostFieldInternal.java
+3 -6
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,12 +34,10 @@ public interface DebugHostFieldInternal extends DebugHostField {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostFieldImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostFieldImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostField>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostField>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostField>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostField.IID_IDEBUG_HOST_FIELD), WrapIDebugHostField.class) // Map.entry(new REFIID(IDebugHostField.IID_IDEBUG_HOST_FIELD),
.build(); WrapIDebugHostField.class));
static DebugHostFieldInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostFieldInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostFieldInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostFieldInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostInternal.java
+2 -6
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,12 +34,9 @@ public interface DebugHostInternal extends DebugHost {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHost>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHost>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHost>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHost.IID_IDEBUG_HOST), WrapIDebugHost.class) // Map.entry(new REFIID(IDebugHost.IID_IDEBUG_HOST), WrapIDebugHost.class));
.build();
static DebugHostInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostMemoryInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -38,15 +37,12 @@ public interface DebugHostMemoryInternal extends DebugHostMemory1 {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostMemoryImpl2::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostMemoryImpl2::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostMemory1>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostMemory1>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostMemory1>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostMemory2.IID_IDEBUG_HOST_MEMORY2), Map.entry(new REFIID(IDebugHostMemory2.IID_IDEBUG_HOST_MEMORY2),
WrapIDebugHostMemory2.class) // WrapIDebugHostMemory2.class),
.put(new REFIID(IDebugHostMemory1.IID_IDEBUG_HOST_MEMORY), Map.entry(new REFIID(IDebugHostMemory1.IID_IDEBUG_HOST_MEMORY),
WrapIDebugHostMemory1.class) // WrapIDebugHostMemory1.class));
.build();
static DebugHostMemoryInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostMemoryInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostMemoryInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostMemoryInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostModuleInternal.java
+5 -9
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -38,15 +37,12 @@ public interface DebugHostModuleInternal extends DebugHostModule1 {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostModuleImpl2::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostModuleImpl2::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostModule1>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostModule1>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostModule1>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostModule2.IID_IDEBUG_HOST_MODULE2), Map.entry(new REFIID(IDebugHostModule2.IID_IDEBUG_HOST_MODULE2),
WrapIDebugHostModule2.class) // WrapIDebugHostModule2.class),
.put(new REFIID(IDebugHostModule1.IID_IDEBUG_HOST_MODULE), Map.entry(new REFIID(IDebugHostModule1.IID_IDEBUG_HOST_MODULE),
WrapIDebugHostModule1.class) // WrapIDebugHostModule1.class));
.build();
static DebugHostModuleInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostModuleInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostModuleInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostModuleInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostModuleSignatureInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DebugHostModuleSignatureInternal extends DebugHostModuleSignatu
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostModuleSignatureImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostModuleSignatureImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostModuleSignature>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostModuleSignature>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostModuleSignature>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostModuleSignature.IID_IDEBUG_HOST_MODULE_SIGNATURE), Map.entry(new REFIID(IDebugHostModuleSignature.IID_IDEBUG_HOST_MODULE_SIGNATURE),
WrapIDebugHostModuleSignature.class) // WrapIDebugHostModuleSignature.class));
.build();
static DebugHostModuleSignatureInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostModuleSignatureInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostModuleSignatureInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostModuleSignatureInternal.class,
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/impl/dbgmodel/debughost/DebugHostPublicInternal.java
+3 -7
View File
@@ -17,7 +17,6 @@ package agent.dbgmodel.impl.dbgmodel.debughost;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Guid.REFIID; import com.sun.jna.platform.win32.Guid.REFIID;
@@ -35,13 +34,10 @@ public interface DebugHostPublicInternal extends DebugHostPublic {
return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostPublicImpl::new); return DbgModelUtil.lazyWeakCache(CACHE, data, DebugHostPublicImpl::new);
} }
ImmutableMap.Builder<REFIID, Class<? extends WrapIDebugHostPublic>> PREFERRED_DATA_SPACES_IIDS_BUILDER =
ImmutableMap.builder();
Map<REFIID, Class<? extends WrapIDebugHostPublic>> PREFERRED_DATA_SPACES_IIDS = Map<REFIID, Class<? extends WrapIDebugHostPublic>> PREFERRED_DATA_SPACES_IIDS =
PREFERRED_DATA_SPACES_IIDS_BUILDER // Map.ofEntries(
.put(new REFIID(IDebugHostPublic.IID_IDEBUG_HOST_PUBLIC), Map.entry(new REFIID(IDebugHostPublic.IID_IDEBUG_HOST_PUBLIC),
WrapIDebugHostPublic.class) // WrapIDebugHostPublic.class));
.build();
static DebugHostPublicInternal tryPreferredInterfaces(InterfaceSupplier supplier) { static DebugHostPublicInternal tryPreferredInterfaces(InterfaceSupplier supplier) {
return DbgModelUtil.tryPreferredInterfaces(DebugHostPublicInternal.class, return DbgModelUtil.tryPreferredInterfaces(DebugHostPublicInternal.class,

Some files were not shown because too many files have changed in this diff Show More