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

correct decendant/decendent/descendent in identifiers, errors, and comments

Browse source
This commit is contained in:
hippietrail 2024-10-27 12:02:51 +07:00
parent 7ddd8665b7
commit d28b139933
16 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/DecisionNode.java
View file

@ -107,7 +107,7 @@ public class DecisionNode {
(startbit + bitsize - 1) + "), value=0x" + Integer.toHexString(val) + ", context=");
debug.append(walker.getParserContext().getContextBytes(), startbit, bitsize);
debug.append("\n");
debugDumpDecendentConstructors(debug, children[val]);
debugDumpDescendantConstructors(debug, children[val]);
}
private void debugInstructionBitsDecision(SleighDebugLogger debug, ParserWalker walker,
@ -135,15 +135,15 @@ public class DecisionNode {
(startbit + bitsize - 1) + "), value=0x" + Integer.toHexString(val) + ", bytes=");
debug.append(bytes, (offset * 8) + startbit, bitsize);
debug.append("\n");
debugDumpDecendentConstructors(debug, children[val]);
debugDumpDescendantConstructors(debug, children[val]);
}
private void debugDumpDecendentConstructors(SleighDebugLogger debug, DecisionNode child) {
private void debugDumpDescendantConstructors(SleighDebugLogger debug, DecisionNode child) {
debug.indent();
debug.append(
"decendent constructors for decision node (complete tree dump ordered by line number):\n");
"descendant constructors for decision node (complete tree dump ordered by line number):\n");
List<Constructor> clist = new ArrayList<>();
child.dumpDecendentConstructors(clist);
child.dumpDescendantConstructors(clist);
for (Constructor c : clist) {
debug.dumpConstructor(null, c);
}
@ -158,7 +158,7 @@ public class DecisionNode {
}
};
private void dumpDecendentConstructors(List<Constructor> clist) {
private void dumpDescendantConstructors(List<Constructor> clist) {
if (bitsize == 0) { // The node is terminal
for (Constructor c : constructlist) {
int index = Collections.binarySearch(clist, c, debugInstructionComparator);
@ -171,7 +171,7 @@ public class DecisionNode {
}
else {
for (DecisionNode child : children) {
child.dumpDecendentConstructors(clist);
child.dumpDescendantConstructors(clist);
}
}
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleManager.java
View file

@ -522,9 +522,9 @@ class ModuleManager {
}
/**
* Perform recursive check to determine if specified id is a child or decendant
* Perform recursive check to determine if specified id is a child or descendant
* of the specified module.
* @param id descendent child id (positive for module, negative for fragment)
* @param id descendant child id (positive for module, negative for fragment)
* @param moduleID module id (positive)
* @return true if specified id is a descendant of moduleID.
* @throws IOException if database IO error occurs

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Namespace.java
View file

@ -110,7 +110,7 @@ public interface Namespace {
* this namespace.
* @throws DuplicateNameException if another symbol exists in the parent namespace with
* the same name as this namespace
* @throws CircularDependencyException if the parent namespace is a descendent of this
* @throws CircularDependencyException if the parent namespace is a descendant of this
* namespace.
*/
public void setParentNamespace(Namespace parentNamespace)

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/GroupPath.java
View file

@ -152,7 +152,7 @@ public class GroupPath implements Serializable {
}
/**
* Return true if the indicated group path is a descendent of this group path.
* Return true if the indicated group path is a descendant of this group path.
* @param grpPath the group path
*/
public boolean isDescendant(GroupPath grpPath) {