yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1984_Dan_RegisterAndWatchDataTypeSettings--SQUASHED'

Conflicts:
	Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
This commit is contained in:
Ryan Kurtz 2022-08-16 14:30:38 -04:00
commit e999a24433
18 changed files with 540 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/data/DBTraceDataSettingsAdapter.java
View file

@ -31,7 +31,6 @@ import ghidra.trace.database.map.*;
import ghidra.trace.database.map.DBTraceAddressSnapRangePropertyMapTree.AbstractDBTraceAddressSnapRangePropertyMapData;
import ghidra.trace.database.thread.DBTraceThreadManager;
import ghidra.trace.model.thread.TraceThread;
import ghidra.trace.util.TraceAddressSpace;
import ghidra.util.database.*;
import ghidra.util.database.annot.*;
import ghidra.util.exception.VersionException;
@ -224,11 +223,6 @@ public class DBTraceDataSettingsAdapter
dataFactory);
}
@Override
public DBTraceDataSettingsSpace get(TraceAddressSpace space, boolean createIfAbsent) {
return (DBTraceDataSettingsSpace) super.get(space, createIfAbsent);
}
@Override
public DBTraceDataSettingsSpace getForSpace(AddressSpace space, boolean createIfAbsent) {
return (DBTraceDataSettingsSpace) super.getForSpace(space, createIfAbsent);

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractDBTraceDataComponent.java
View file

@ -231,7 +231,7 @@ public abstract class AbstractDBTraceDataComponent implements DBTraceDefinedData
@Override
public DBTraceDataSettingsSpace getSettingsSpace(boolean createIfAbsent) {
return root.getSettingsSpace(createIfAbsent);
return (DBTraceDataSettingsSpace) root.getSettingsSpace(createIfAbsent);
}
@Override

7
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceData.java
View file

@ -25,7 +25,7 @@ import ghidra.program.model.address.AddressSpace;
import ghidra.program.model.data.*;
import ghidra.program.model.lang.Language;
import ghidra.trace.database.DBTraceUtils;
import ghidra.trace.database.data.DBTraceDataSettingsAdapter.DBTraceDataSettingsSpace;
import ghidra.trace.database.data.DBTraceDataSettingsOperations;
import ghidra.trace.database.guest.InternalTracePlatform;
import ghidra.trace.database.map.DBTraceAddressSnapRangePropertyMapTree;
import ghidra.trace.model.guest.TracePlatform;
@ -243,8 +243,9 @@ public class DBTraceData extends AbstractDBTraceCodeUnit<DBTraceData>
}
@Override
public DBTraceDataSettingsSpace getSettingsSpace(boolean createIfAbsent) {
return getTrace().getDataSettingsAdapter().get(space, createIfAbsent);
public DBTraceDataSettingsOperations getSettingsSpace(boolean createIfAbsent) {
return (DBTraceDataSettingsOperations) getTrace().getDataSettingsAdapter()
.get(space, createIfAbsent);
}
@Override

3
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/UndefinedDBTraceData.java
View file

@ -276,7 +276,8 @@ public class UndefinedDBTraceData implements DBTraceDataAdapter, DBTraceSpaceKey
@Override
public DBTraceDataSettingsOperations getSettingsSpace(boolean createIfAbsent) {
return getTrace().getDataSettingsAdapter().get(this, createIfAbsent);
return (DBTraceDataSettingsOperations) getTrace().getDataSettingsAdapter()
.get(this, createIfAbsent);
}
@Override