mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-1768C: post-review fixes

Browse Source
This commit is contained in:
d-millar
2023-02-24 16:46:08 -05:00
parent 6b5d7a6ad6
commit 096b861896
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/dbgmodel/main/ModelObject.java
View File

@@ -113,14 +113,17 @@ public interface ModelObject extends UnknownEx {
void setIndexer(ModelObject indexer);
List<ModelObject> getElements();
ModelObject getElement(String key);
ModelObject getChild(DataModelManager1 manager, VARIANT v);
Map<String, ModelObject> getKeyValueMap();
ModelObject getKeyValueByEnum(String key);
Map<String, ModelObject> getRawValueMap();
ModelObject getRawValueByEnum(String key);
Object getValue();

11
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DelegateDbgModel2TargetObject.java
View File

@@ -178,14 +178,6 @@ public class DelegateDbgModel2TargetObject extends DbgModel2TargetObjectImpl imp
String lkey = key;
String pname = parent.getName();
/*
* if (object.getKind().equals(ModelObjectKind.OBJECT_METHOD) ||
* lkey.contains(")")) { mixins.add(DbgModelTargetMethod.class); // NB: We're
* passing the parent's mixin model to the method on the assumption // the init
* methods will need to know that the method's children have various //
* properties. lkey = pname; pname = ""; }
*/
if (object.getKind().equals(ModelObjectKind.OBJECT_METHOD)) {
mixins.add(DbgModelTargetMethod.class);
} else {
@@ -306,7 +298,8 @@ public class DelegateDbgModel2TargetObject extends DbgModel2TargetObjectImpl imp
if (state != DbgState.EXIT) {
setExecutionState(exec, "Refreshed");
}
} else {
}
else {
TargetExecutionState previous = this.getExecutionState();
if (!previous.equals(TargetExecutionState.INACTIVE)) {
setExecutionState(exec, "Refreshed");