diff --git a/GPL/DemanglerGnu/src/demangler_gnu/c/cp-demangle.c b/GPL/DemanglerGnu/src/demangler_gnu/c/cp-demangle.c index 479ea669c8..bbc8035dd8 100644 --- a/GPL/DemanglerGnu/src/demangler_gnu/c/cp-demangle.c +++ b/GPL/DemanglerGnu/src/demangler_gnu/c/cp-demangle.c @@ -93,7 +93,7 @@ This file was changed on July 4th, 2019. IN_GLIBCPP_V3 If defined, this file defines only __cxa_demangle() and - __gcclibcxx_demangle_callback(), and no other publically visible + __gcclibcxx_demangle_callback(), and no other publicly visible functions or variables. STANDALONE_DEMANGLER diff --git a/GPL/DemanglerGnu/src/demangler_gnu/c/cplus-dem.c b/GPL/DemanglerGnu/src/demangler_gnu/c/cplus-dem.c index 657fe438d5..8c59ad291e 100644 --- a/GPL/DemanglerGnu/src/demangler_gnu/c/cplus-dem.c +++ b/GPL/DemanglerGnu/src/demangler_gnu/c/cplus-dem.c @@ -2651,7 +2651,7 @@ iterate_demangle_function (struct work_stuff *work, const char **mangled, /* Iterate over occurrences of __, allowing names and types to have a "__" sequence in them. We must start with the first (not the last) occurrence, since "__" most often occur between independent mangled - parts, hence starting at the last occurence inside a signature + parts, hence starting at the last occurrence inside a signature might get us a "successful" demangling of the signature. */ while (scan[2]) diff --git a/Ghidra/Features/Base/ghidra_scripts/CallAnotherScriptForAllPrograms.java b/Ghidra/Features/Base/ghidra_scripts/CallAnotherScriptForAllPrograms.java index 2566df80c7..850175d5da 100644 --- a/Ghidra/Features/Base/ghidra_scripts/CallAnotherScriptForAllPrograms.java +++ b/Ghidra/Features/Base/ghidra_scripts/CallAnotherScriptForAllPrograms.java @@ -97,7 +97,7 @@ public class CallAnotherScriptForAllPrograms extends GhidraScript { runScript(SUBSCRIPT_NAME, newState); } catch (Exception e) { - printerr("ERROR! Exception occured while processing file: " + + printerr("ERROR! Exception occurred while processing file: " + program.getDomainFile().getPathname()); printerr(" " + e.getMessage()); e.printStackTrace(); diff --git a/Ghidra/Features/Base/ghidra_scripts/IterateFunctionsByAddressScript.java b/Ghidra/Features/Base/ghidra_scripts/IterateFunctionsByAddressScript.java index c744d078f1..3b187e54a2 100644 --- a/Ghidra/Features/Base/ghidra_scripts/IterateFunctionsByAddressScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/IterateFunctionsByAddressScript.java @@ -43,7 +43,7 @@ public class IterateFunctionsByAddressScript extends GhidraScript { private void iterateForward() { // Use the iterator, there is no easy way to use the function iterator on addresses // If the function begins at address zero, you won't get the function without - // alot of extra more complicated code. + // a lot of extra more complicated code. FunctionIterator fiter = currentProgram.getFunctionManager().getFunctions(true); int count = 0; diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CParserPlugin/CParser.htm b/Ghidra/Features/Base/src/main/help/help/topics/CParserPlugin/CParser.htm index 7ea5900442..2fd39b7695 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CParserPlugin/CParser.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CParserPlugin/CParser.htm @@ -179,7 +179,7 @@ CParserPlugin.out file produced in your home directory.

-

Use the Line numbers to determine where in the file the parse error occured.
+

Use the Line numbers to determine where in the file the parse error occurred.

The last valid data parsed diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm index 3c35967519..9661ec803c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm @@ -147,7 +147,7 @@ Comment Prefix
- the string to append on the begining of comments
+ the string to append on the beginning of comments
diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm index 8cd507e74f..79bd15e9dd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm @@ -295,7 +295,7 @@ A memory address "label" identifying a memory reference destination which is located at an offcut address within a code unit.  These labels only - appears within the listing to flag the existance of a hidden offcut label. + appears within the listing to flag the existence of a hidden offcut label.  Double-clicking the corresponding offcut XRef will take you to the code unit which has the offcut reference,
@@ -1343,7 +1343,7 @@

A code unit selection from the CodeBrowser Listing may be dragged and dropped onto the References Editor panel to create Memory References in bulk - for the current Source.  This capability must be used carefully since a seperate reference + for the current Source.  This capability must be used carefully since a separate reference will be created "to" every code unit contained within the selection.  

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html b/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html index e9b97fa0bc..55a8da90b1 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html @@ -65,7 +65,7 @@ snapshot view.

Snapshot views can be docked with normal views or they can live in their own windows.  Global menu and toolbar actions have been -changed to accomodate snapshot views.  Global actions now operate +changed to accommodate snapshot views.  Global actions now operate on whatever component has focus (the component whose header bar is colored blue).  For example, if you have the connected Listing View and a snapshot { @Override public String getColumnDescription() { - return "The orignal (pre-demangled) import name (External Symbols Only)"; + return "The original (pre-demangled) import name (External Symbols Only)"; } @Override diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java index 0392d752c7..9f1da8c523 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java @@ -216,7 +216,7 @@ public class GenerateOldLanguagePlugin extends Plugin implements FrontEndable { } catch (IOException e) { Msg.showError(this, panel, "IO Error", - "Error occured while generating old language file:\n" + file, e); + "Error occurred while generating old language file:\n" + file, e); } } }); @@ -317,7 +317,7 @@ public class GenerateOldLanguagePlugin extends Plugin implements FrontEndable { } catch (IOException e) { Msg.showError(this, panel, "IO Error", - "Error occured while generating translator file:\n" + transFile, e); + "Error occurred while generating translator file:\n" + transFile, e); } close(); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/ProgramDropProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/ProgramDropProvider.java index 2684e40f4d..cd1dd7daaa 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/ProgramDropProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/ProgramDropProvider.java @@ -46,7 +46,7 @@ public interface ProgramDropProvider { /** * Adds the dropped data to this drop service. - * @param contextObj The object where the drop occured + * @param contextObj The object where the drop occurred * @param data The actual data dropped * @param flavor The selected data flavor */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java index de0f3af5e1..7fedcbb31b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java @@ -156,7 +156,7 @@ public interface ElfLoadHelper { * Get the program image base offset adjustment. The value returned reflects the * actual program image base minus the default image base (see {@link ElfHeader#getImageBase()}. * This will generally be zero (0), unless the program image base differs from the - * default. It may be neccessary to add this value to any pre-linked address values + * default. It may be necessary to add this value to any pre-linked address values * such as those contained with the dynamic table. (Applies to default address space only) * @return image base adjustment value */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java index 6bfcb50b82..1090f51193 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java @@ -1214,7 +1214,7 @@ public class HeadlessAnalyzer { if (!readOnlyFile) { // can't change anything if read-only file // Undo checkout of it is still checked-out and either the file is to be - // deleted, or we just checked it out and file changes have been comitted + // deleted, or we just checked it out and file changes have been committed if (domFile.isCheckedOut()) { if (!keepFile || (terminateCheckoutWhenDone && !domFile.modifiedSinceCheckout())) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java index 7b5383fcb0..7306ccf26b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java @@ -162,7 +162,7 @@ class LibraryHints { } } catch (Exception e) { - Msg.error(this, "Error occured while parsing hints file: " + hintsFile, e); + Msg.error(this, "Error occurred while parsing hints file: " + hintsFile, e); } finally { if (is != null) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java index 4b6d26c670..8a74a413c9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java @@ -273,7 +273,7 @@ public class FunctionSignatureParser { } // The following regex pattern attempts to isolate the parameter name from - // the begining of a parameter specification. Since the name is optional, + // the beginning of a parameter specification. Since the name is optional, // additional steps must be taken in code to ensure that the trailing word of // a multi-word type-specified is not treated as a name (e.g., unsigned long). // diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java index 6712cfb74d..6ce1304f2a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java @@ -39,7 +39,7 @@ public class ErrorFieldMouseHandler implements FieldMouseHandlerExtension { } ErrorListingField errorField = (ErrorListingField) clickedObject; String fieldName = errorField.getFieldFactory().getFieldName(); - Msg.showError(this, null, "Listing Field Exception", "Exception occured while rendering '" + + Msg.showError(this, null, "Listing Field Exception", "Exception occurred while rendering '" + fieldName + "' field", errorField.getThrowable()); return true; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java b/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java index 84f319db77..a1e92422a7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java @@ -1034,7 +1034,7 @@ public class FlatProgramAPI { public final Function getFunctionBefore(Address address) { FunctionIterator iterator = currentProgram.getListing().getFunctions(address, false); // skip over this function. - // This is wierd, but if you have multiple overlay spaces or address spaces, + // This is weird, but if you have multiple overlay spaces or address spaces, // you WILL miss functions by not using the iterator and doing address math yourself. if (!iterator.hasNext()) { return null; @@ -1074,7 +1074,7 @@ public class FlatProgramAPI { public final Function getFunctionAfter(Address address) { FunctionIterator iterator = currentProgram.getListing().getFunctions(address, true); // skip over this function. - // This is wierd, but if you have multiple overlay spaces or address spaces, + // This is weird, but if you have multiple overlay spaces or address spaces, // you WILL miss functions by not using the iterator and doing address math yourself. if (!iterator.hasNext()) { return null; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java index a7dbe917dc..5919bd2895 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java @@ -1191,7 +1191,7 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E if (pass < 0 || fail < 0) { failTest(testRunner, - "ERROR Invalid pass/fail counts - test may not have run properly or improper TestInfo structure updates occured: pass " + + "ERROR Invalid pass/fail counts - test may not have run properly or improper TestInfo structure updates occurred: pass " + pass + " fail " + fail); } @@ -1243,8 +1243,8 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E } catch (Exception e) { - log(testGroup, "Exception occured during test", e); - fail("Exception occured during test: " + e.getMessage()); + log(testGroup, "Exception occurred during test", e); + fail("Exception occurred during test: " + e.getMessage()); } finally { if (testRunner != null) { @@ -1390,7 +1390,7 @@ public abstract class ProcessorEmulatorTestAdapter extends TestCase implements E catch (UsrException e) { if (inDelaySlot) { log(testRunner.getTestGroup(), - "Instruction parse error occured in delay-slot at: " + + "Instruction parse error occurred in delay-slot at: " + memBuf.getAddress().toString(true)); } // parse failed diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java index f8106aba1f..4dabed4b14 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java @@ -654,7 +654,7 @@ public class AutoTableDisassemblerTest extends AbstractGhidraHeadedIntegrationTe } for (String addr : addrs) { - assertTrue("Table model does not contain address table adress: " + addr, + assertTrue("Table model does not contain address table address: " + addr, modelAddresses.contains(addr)); } } diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/scalartable/ScalarSearchTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/scalartable/ScalarSearchTest.java index c01083d981..9bf6ee765a 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/scalartable/ScalarSearchTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/scalartable/ScalarSearchTest.java @@ -417,7 +417,7 @@ public class ScalarSearchTest extends AbstractGhidraHeadedIntegrationTest { Address codeUnitAddress = rowObject.getAddress(); if (codeUnitAddress.toString().equals(DATA_STRING_ADDRESS)) { Data stringData = program.getListing().getDataAt(codeUnitAddress); - fail("Table not created correctly: found the occurence of data string " + + fail("Table not created correctly: found the occurrence of data string " + stringData.getValue().toString() + " at address: " + codeUnitAddress); } } diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/data/TransactionLockingTaskMonitorTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/data/TransactionLockingTaskMonitorTest.java index 2fa1eea1ae..d6343b3b63 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/data/TransactionLockingTaskMonitorTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/framework/data/TransactionLockingTaskMonitorTest.java @@ -98,7 +98,7 @@ public class TransactionLockingTaskMonitorTest extends AbstractGhidraHeadedInteg // wait for all thread to terminate coordinationEndLatch.await(2, TimeUnit.SECONDS); - assertNull("Error occured in transaction thread", throwable); + assertNull("Error occurred in transaction thread", throwable); } @@ -146,7 +146,7 @@ public class TransactionLockingTaskMonitorTest extends AbstractGhidraHeadedInteg // wait for all thread to terminate coordinationEndLatch.await(2, TimeUnit.SECONDS); - assertNull("Error occured in transaction thread", throwable); + assertNull("Error occurred in transaction thread", throwable); } } diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bytepatterns/bitcluster/Face.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bytepatterns/bitcluster/Face.java index d28f884a35..d17a4d5d1e 100644 --- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bytepatterns/bitcluster/Face.java +++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bytepatterns/bitcluster/Face.java @@ -24,7 +24,7 @@ import java.util.HashSet; public class Face extends DittedBitSequence implements Comparable { private int weight; //Typically represents the number of data points this face contains. private double dit_ratio; // 1 / (2 to the number of dits) - private HashSet children; //A set of faces this face contains. (Used in the heirarchy of ditted pattern finding.) + private HashSet children; //A set of faces this face contains. (Used in the hierarchy of ditted pattern finding.) public String strID; //A unique string ID. Two faces with the same ID ought to be thought of as the same. private Pair joinOf; //Keep track of what pair of faces made this face (if it was created as a join). @@ -47,7 +47,7 @@ public class Face extends DittedBitSequence implements Comparable { this.children = new HashSet(); this.joinOf = new Pair(f1, f2); //We'll need to know *how* this edge was made. - //Set up the children for tracking heirarchy. + //Set up the children for tracking hierarchy. for (Face kid : patterns) { DittedBitSequence temp = new DittedBitSequence(this, kid); if (temp.getNumUncertainBits() == this.getNumUncertainBits()) { //Check to see if kid is a subface of this. diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.hh index 00db843979..7ee49ad8a9 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.hh @@ -35,7 +35,7 @@ struct SizePass { /// \brief Map object for keeping track of which address ranges have been heritaged /// /// We keep track of a fairly fine grained description of when each address range -/// was entered in SSA form, refered to as \b heritaged or, for Varnode objects, +/// was entered in SSA form, referred to as \b heritaged or, for Varnode objects, /// no longer \b free. An address range is added using the add() method, which includes /// the particular pass when it was entered. The map can be queried using findPass() /// that informs the caller whether the address has been heritaged and if so in which pass. diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/varnode.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/varnode.hh index 9aaca41aa6..0b2058e9e4 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/varnode.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/varnode.hh @@ -66,7 +66,7 @@ class Varnode { public: /// There are a large number of boolean attributes that can be placed on a Varnode. /// Some are calculated and maintained by the friend classes Funcdata and VarnodeBank, - /// and others can be set and cleared publically by separate subsystems. + /// and others can be set and cleared publicly by separate subsystems. enum varnode_flags { mark = 0x01, ///< Prevents infinite loops constant = 0x02, ///< The varnode is constant diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java index 820eb6c94a..8fe7ff0480 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java @@ -294,7 +294,7 @@ public class DecompilerParameterIdCmd extends BackgroundCommand { // TODO: should unaff_ be checked? - // TODO: should wierd stack references be checked? + // TODO: should weird stack references be checked? } return false; diff --git a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java index 651f19e842..7456000029 100644 --- a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java +++ b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java @@ -1055,7 +1055,7 @@ public class GnuDemanglerParser implements DemanglerParser { } private DemangledObject parseVariable(String demangled) { - // Are all of these neccessary? Many appear to be duplicated within doParse method + // Are all of these necessary? Many appear to be duplicated within doParse method if (demangled.startsWith(TYPEINFO_NAME_FOR)) { return parseTypeInfoName(demangled); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/PdbParser.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/PdbParser.java index a96af01f10..eea481969a 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/PdbParser.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/PdbParser.java @@ -575,7 +575,7 @@ public class PdbParser { } throw new PdbException("PDB Execution failure of " + PDB_EXE + ".\n" + "This was likely caused by severe execution failure which can occur if executed\n" + - "on an unsupported platform. It may be neccessary to rebuild the PDB executable\n" + + "on an unsupported platform. It may be necessary to rebuild the PDB executable\n" + "for your platform (see Ghidra/Features/PDB/src)."); } throw new PdbException("PDB parsing problem: " + e.getMessage()); diff --git a/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ApplyDiffCommand.java b/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ApplyDiffCommand.java index 247df6adad..67f646f417 100644 --- a/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ApplyDiffCommand.java +++ b/Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ApplyDiffCommand.java @@ -114,7 +114,7 @@ class ApplyDiffCommand extends BackgroundCommand implements AnalysisWorker { } } Msg.showError(this, plugin.getListingPanel(), "Error Applying Diff", - "An error occured while applying differences.\n" + "An error occurred while applying differences.\n" + "Only some of the differences may have been applied.", (t != null) ? t : e); applyMsg = message + diffControl.getApplyMessage(); diff --git a/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/markupitem/FunctionNameMarkupItemTest.java b/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/markupitem/FunctionNameMarkupItemTest.java index 1eebda5ee6..7f4ff751d8 100644 --- a/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/markupitem/FunctionNameMarkupItemTest.java +++ b/Ghidra/Features/VersionTracking/src/test.slow/java/ghidra/feature/vt/api/markupitem/FunctionNameMarkupItemTest.java @@ -570,7 +570,7 @@ public class FunctionNameMarkupItemTest extends AbstractVTMarkupItemTest { assertEquals("Function name should have been applied", sourceName, destinationFunction.getName()); // if (destinationFunction.isExternal()) { -// // orignal name may get set if symbol type was IMPORTED +// // original name may get set if symbol type was IMPORTED // } } } diff --git a/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java b/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java index a16da3e6e8..f6094a2c74 100644 --- a/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java +++ b/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java @@ -37,7 +37,7 @@ public class DBBuffer { } /** - * Split this DBBuffer object into two seperate DBBuffers. This DBBuffer remains + * Split this DBBuffer object into two separate DBBuffers. This DBBuffer remains * valid but its new size is equal offset. The newly created DBBuffer is * returned. * @param offset the split point. The byte at this offset becomes the first diff --git a/Ghidra/Framework/DB/src/main/java/db/Database.java b/Ghidra/Framework/DB/src/main/java/db/Database.java index bff131ccff..a8412bee92 100644 --- a/Ghidra/Framework/DB/src/main/java/db/Database.java +++ b/Ghidra/Framework/DB/src/main/java/db/Database.java @@ -261,7 +261,7 @@ public abstract class Database { protected void scanFiles(boolean repair) throws FileNotFoundException { synchronized (syncObject) { -// TODO: May need to make repair an option (may not have write priviledge) +// TODO: May need to make repair an option (may not have write privilege) ArrayList bufFiles = new ArrayList<>(); ArrayList verFiles = new ArrayList<>(); diff --git a/Ghidra/Framework/DB/src/main/java/db/NodeMgr.java b/Ghidra/Framework/DB/src/main/java/db/NodeMgr.java index 23124f562f..0f79c7e3bc 100644 --- a/Ghidra/Framework/DB/src/main/java/db/NodeMgr.java +++ b/Ghidra/Framework/DB/src/main/java/db/NodeMgr.java @@ -26,7 +26,7 @@ import db.buffers.DataBuffer; /** * The NodeMgr manages all database nodes associated with - * a table. Each table should use a seperate instance of a NodeMgr. + * a table. Each table should use a separate instance of a NodeMgr. * The NodeMgr is resposible for interacting with the BufferMgr performing * buffer allocations, retrievals and releases as required. The NodeMgr * also performs hard caching of all buffers until the releaseNodes diff --git a/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java b/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java index d56d279136..fe90e14929 100644 --- a/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java +++ b/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java @@ -357,7 +357,7 @@ class VarKeyInteriorNode extends VarKeyNode { /** * Update the child key associated with the specified key index. - * Other entries are shifted as necessary to accomodate the new key length for + * Other entries are shifted as necessary to accommodate the new key length for * the updated entry. * @param index child key index * @param updateKey updated child node key @@ -741,7 +741,7 @@ class VarKeyInteriorNode extends VarKeyNode { * @param leftNode * @param rightNode * @param count - * @return true if movement occured, else false + * @return true if movement occurred, else false */ private static boolean moveKeysRight(VarKeyInteriorNode leftNode, VarKeyInteriorNode rightNode, int count) { diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/ChangeMapFile.java b/Ghidra/Framework/DB/src/main/java/db/buffers/ChangeMapFile.java index 9980557041..0f7626af54 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/ChangeMapFile.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/ChangeMapFile.java @@ -28,7 +28,7 @@ import db.ChainedBuffer; /** * ChangeMapFile tracks which buffers within a LocalBufferFile * have been modified between an older and newer version. The older - * file is also refered to as the target file. + * file is also referred to as the target file. */ public class ChangeMapFile { diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java b/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java index dbdba45143..622106525f 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java @@ -130,7 +130,7 @@ public class LocalManagedBufferFile extends LocalBufferFile implements ManagedBu * saveChangeFile is a buffer file which contains application * specific change-data associated with a new version of this file. * saveChangeFile is instantiated when the getSaveFile method - * is successfully invoked. This file is commited when the saveCompleted + * is successfully invoked. This file is committed when the saveCompleted * method is invoked. */ private LocalBufferFile saveChangeFile; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java b/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java index fb8066396f..d7fa7a408b 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java @@ -104,7 +104,7 @@ public class WindowActionManager { placeHolderForScheduledActionUpdate = placeHolder; - // Buffer the events, as they tend to come in 3s. That might not sound like alot, but + // Buffer the events, as they tend to come in 3s. That might not sound like a lot, but // when you have hundreds of actions, it adds up. updateManager.updateLater(); } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java index 08e403051c..81af930229 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java @@ -76,7 +76,7 @@ public interface LayoutModel { * Returns an iterator that walks all the Layout items in this model, starting at the * specified index. * - * @param startIndex start index in the model to begining iterating + * @param startIndex start index in the model to beginning iterating * @return new iterator */ public default LayoutModelIterator iterator(BigInteger startIndex) { diff --git a/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/columnfilter/ColumnTableFilterTest.java b/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/columnfilter/ColumnTableFilterTest.java index 4845d36995..0715ab29f3 100644 --- a/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/columnfilter/ColumnTableFilterTest.java +++ b/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/columnfilter/ColumnTableFilterTest.java @@ -37,7 +37,7 @@ import mockit.Mock; import mockit.MockUp; /** - * This test performs operations on swing components in the test thread. I beleive this is ok + * This test performs operations on swing components in the test thread. I believe this is ok * since in this test, the widgets are never realized and the swing thread in generally not * involved. If this test has displays intermittent failures, then more work will be needed to * fix the threading when accessing swing components. diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java index 4d87877078..028f6f6311 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java @@ -182,7 +182,7 @@ public class RepositoryServerAdapter { cause = t; } Msg.showError(this, null, "Server Error", - "An error occured on the server (" + serverInfoStr + ").\n" + msg, e); + "An error occurred on the server (" + serverInfoStr + ").\n" + msg, e); } catch (IOException e) { String err = e.getMessage(); @@ -191,7 +191,7 @@ public class RepositoryServerAdapter { } String msg = err != null ? err : e.toString(); Msg.showError(this, null, "Server Error", - "An error occured while connecting to the server (" + serverInfoStr + ").\n" + msg, + "An error occurred while connecting to the server (" + serverInfoStr + ").\n" + msg, e); } throw new NotConnectedException("Not connected to repository server", cause); @@ -283,7 +283,7 @@ public class RepositoryServerAdapter { // serverHandle = null; // fireStateChanged(); // if (error != null) { -// Err.show(null, "Server Error", "A server communications error occured!", error); +// Err.show(null, "Server Error", "A server communications error occurred!", error); // error = null; // throw new NotConnectedException("Not connected to repository server"); // } diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java index e182d986c3..461595376d 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ServerConnectTask.java @@ -129,7 +129,7 @@ class ServerConnectTask extends Task { throw new IOException("User PKI Certificate not installed", e); } // assume user cancelled connect attempt when prompted for cert password - // or other cert error occured + // or other cert error occurred return true; } // TODO: Translate SSL exceptions to more meaningful errors diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java index 6db3bc7b8c..b0082c76a7 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java @@ -203,7 +203,7 @@ public interface FileSystem { * @param folderPath path of folder to be deleted * @throws FolderNotEmptyException Thrown if the folder is not empty. * @throws FileNotFoundException if there is no folder with the given path name. - * @throws IOException if error occured during delete. + * @throws IOException if error occurred during delete. */ public void deleteFolder(String folderPath) throws IOException; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java index b75d6e8992..b493812ae0 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java @@ -39,7 +39,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Construct FileSystemListenerList - * @param enableAsynchronousDispatching if true a seperate dispatch thread will be used + * @param enableAsynchronousDispatching if true a separate dispatch thread will be used * to notify listeners. If false, blocking notification will be performed. */ public FileSystemListenerList(boolean enableAsynchronousDispatching) { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFolderItem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFolderItem.java index e21c6d7d50..6e361d8a41 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFolderItem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFolderItem.java @@ -493,7 +493,7 @@ public abstract class LocalFolderItem implements FolderItem { // * If in-use files prevent renaming a FileInUseException will be thrown. // * @param name new name for this item // * @throws InvalidNameException invalid name was specified -// * @throws IOException an error occured +// * @throws IOException an error occurred // */ // void doSetName(String name) throws InvalidNameException, IOException { // synchronized (fileSystem) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java b/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java index 0d7d700279..ef4c27f540 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java @@ -156,7 +156,7 @@ public class ApplicationTrustManagerFactory { } /** - * Get trust managers after performing any neccessary initialization. + * Get trust managers after performing any necessary initialization. * @return trust managers */ static synchronized TrustManager[] getTrustManagers() { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntIntHashtable.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntIntHashtable.java index 76c61042d3..b7390643b0 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntIntHashtable.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntIntHashtable.java @@ -21,7 +21,7 @@ import ghidra.util.exception.NoValueException; * Class that implements a hashtable with int keys and int values. * Because this class uses array of primitives * to store the information, it serializes very fast. This implementation uses - * seperate chaining to resolve collisions. + * separate chaining to resolve collisions. * */ public class IntIntHashtable { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntKeyIndexer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntKeyIndexer.java index 37aa308aa0..bcd27627aa 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntKeyIndexer.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntKeyIndexer.java @@ -24,7 +24,7 @@ import ghidra.util.exception.AssertException; * the smallest unused index is allocated and associated with that key. * Basically hashes the keys into linked lists using the IntListIndexer class, * where all values in a list have - * the same hashcode. Does most of the work in implementing a seperate chaining + * the same hashcode. Does most of the work in implementing a separate chaining * version of a hashtable - the only thing missing is the values which are stored * in the individual implementations of the various hashtables. */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongDoubleHashtable.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongDoubleHashtable.java index d573fd10b4..62cdc1eb81 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongDoubleHashtable.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongDoubleHashtable.java @@ -25,7 +25,7 @@ import java.io.Serializable; * Class that implements a hashtable with long keys and double values. * Because this class uses array of primitives * to store the information, it serializes very fast. This implementation uses - * seperate chaining to resolve collisions. + * separate chaining to resolve collisions. * * My local change of LongShortHashtable (SCP 4/13/00) */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectKeyIndexer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectKeyIndexer.java index 43f648efae..cc85911c3c 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectKeyIndexer.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectKeyIndexer.java @@ -25,7 +25,7 @@ import java.util.Arrays; * the smallest unused index is allocated and associated with that key. * Basically hashes the keys into linked lists using the IntListIndexer class, * where all values in a list have - * the same hashcode. Does most of the work in implementing a seperate chaining + * the same hashcode. Does most of the work in implementing a separate chaining * version of a hashtable - the only thing missing is the values which are stored * in the individual implementations of the various hashtables. */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortKeyIndexer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortKeyIndexer.java index b5221f994c..8aca3ea0c9 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortKeyIndexer.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ShortKeyIndexer.java @@ -24,7 +24,7 @@ import ghidra.util.exception.AssertException; * the smallest unused index is allocated and associated with that key. * Basically hashes the keys into linked lists using the ShortListIndexer class, * where all values in a list have - * the same hashcode. Does most of the work in implementing a seperate chaining + * the same hashcode. Does most of the work in implementing a separate chaining * version of a hashtable - the only thing missing is the values which are stored * in the individual implementations of the various hashtables. */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.java index ee0830149e..173ea4b955 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/StringKeyIndexer.java @@ -26,7 +26,7 @@ import java.util.Iterator; * the smallest unused index is allocated and associated with that key. * Basically hashes the keys into linked lists using the IntListIndexer class, * where all values in a list have - * the same hashcode. Does most of the work in implementing a seperate chaining + * the same hashcode. Does most of the work in implementing a separate chaining * version of a hashtable - the only thing missing is the values which are stored * in the individual implementations of the various hashtables. */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java index a2e29ac282..8a253c8def 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java @@ -204,7 +204,7 @@ public class ExtensionFileFilter implements GhidraFileFilter { * Determines whether the extension list (.jpg, .gif, etc) should * show up in the human readable description. * - * Only relevent if a description was provided in the constructor + * Only relevant if a description was provided in the constructor * or using setDescription(); * * @see #getDescription @@ -220,7 +220,7 @@ public class ExtensionFileFilter implements GhidraFileFilter { * Returns whether the extension list (.jpg, .gif, etc) should * show up in the human readable description. * - * Only relevent if a description was provided in the constructor + * Only relevant if a description was provided in the constructor * or using setDescription(); * * @see #getDescription diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditActionManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditActionManager.java index 199936e771..18cd6d0c0f 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditActionManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditActionManager.java @@ -127,7 +127,7 @@ class EditActionManager { } catch (IOException e) { Msg.error(this, - "Error occured while clearing PKI certificate setting: " + e.getMessage()); + "Error occurred while clearing PKI certificate setting: " + e.getMessage()); } } diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java index a825f22190..2e022d81fd 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java @@ -124,7 +124,7 @@ public interface DomainFile extends Comparable { * out of date. * @param okToRecover if true, allows the system to recover unsaved file changes which * resulted from a crash. If false, any existing recovery data will be deleted. - * This flag is only relevent if project is open for update (isInProject) and the file can be + * This flag is only relevant if project is open for update (isInProject) and the file can be * opened for update. * @param monitor permits monitoring of open progress. * @return an open domain object can be modified and saved. (Not read-only) @@ -393,7 +393,7 @@ public interface DomainFile extends Comparable { /** * Forcefully terminate a checkout for the associated versioned file. - * The user must be the owner of the checkout or have admin priviledge + * The user must be the owner of the checkout or have admin privilege * on the versioned filesystem (i.e., repository). * @param checkoutId checkout ID * @throws IOException if an IO or access error occurs diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/Tool.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/Tool.java index 864e2ebd6d..c1e5b7dade 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/Tool.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/Tool.java @@ -139,7 +139,7 @@ public interface Tool extends DockingTool, ToolListener { /** * Removes a ToolListener from receiving any event generated by this Tool. - * The tool will still recieve specific events that it has registered for. + * The tool will still receive specific events that it has registered for. * * @param listener The ToolListener to be removed from receiving all events. */ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/TransactionListener.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/TransactionListener.java index acfe1bc601..bcbd85a029 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/TransactionListener.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/TransactionListener.java @@ -41,7 +41,7 @@ public interface TransactionListener { void undoStackChanged(DomainObjectAdapterDB domainObj); /** - * Notification that undo or redo has occured. + * Notification that undo or redo has occurred. * @param domainObj the affected domain object */ void undoRedoOccurred(DomainObjectAdapterDB domainObj); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/README.txt b/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/README.txt index 30e45ea38b..b954509ef8 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/README.txt +++ b/Ghidra/Framework/SoftwareModeling/src/main/antlr/ghidra/sleigh/grammar/README.txt @@ -60,7 +60,7 @@ when generating Java source. There are two benefits: 1) I can keep most Java sou source files instead of the grammar source, 2) The code is no longer duplicated among many parsers can lexers. -Second, I've split each sub-grammar into separate lexer and parser. This is required becuase ANTLR +Second, I've split each sub-grammar into separate lexer and parser. This is required because ANTLR does not allow a "combined lexer/parser" to be imported by another lexer, parser, or combination. Aside from avoiding situations that are difficult to define, ANTLR's restriction also enforces the practice of separating components out. Note that BooleanExpression.g is unaffected by all of this, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/pcoderaw/VarnodeData.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/pcoderaw/VarnodeData.java index 6f7c94d4c6..ddf98ad482 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/pcoderaw/VarnodeData.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/pcoderaw/VarnodeData.java @@ -70,7 +70,7 @@ public class VarnodeData { // Build this VarnodeData from an \b \ tag // \param el is the parsed tag - // \param trans is the relevent processor translator + // \param trans is the relevant processor translator public void restoreXml( Element el, Translate trans ) { String name = el.getAttributeValue( "name" ); if (name != null) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CategoryDBAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CategoryDBAdapter.java index ea4f6091ea..a3343c7f33 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CategoryDBAdapter.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CategoryDBAdapter.java @@ -36,7 +36,7 @@ abstract class CategoryDBAdapter { /** * Gets the category record for the given ID. - * @param categoryID the key into the catagory table + * @param categoryID the key into the category table * @return the record for the given ID or null if no record with that id exists. */ abstract Record getRecord(long categoryID) throws IOException; @@ -53,7 +53,7 @@ abstract class CategoryDBAdapter { /** * Returns a list of categoryIDs that have the given parent ID. - * @param categoryID the key into the catagory table + * @param categoryID the key into the category table * @return an array of categoryIDs that have the specified parent */ abstract long[] getRecordIdsWithParent(long categoryID) throws IOException; @@ -61,7 +61,7 @@ abstract class CategoryDBAdapter { /** * Creates a new category with the given name and parent ID. * @param name the name of the new category. - * @param categoryID the key into the catagory table + * @param categoryID the key into the category table * @return a new record for the new category. */ abstract Record createCategory(String name, long parentID) throws IOException; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java index 2acc0fbccf..9e28359eb3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java @@ -1313,7 +1313,7 @@ public class Disassembler implements DisassemblerConflictHandler { disassemblerContext.getRegisterValue(disassemblerContext.getBaseContextRegister()), instAddr, e.getMessage()); } - return null; // error occured + return null; // error occurred } /** diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java index fd139c2a54..e4ee7c7ee2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java @@ -879,7 +879,7 @@ public class DisassemblerContextImpl implements DisassemblerContext { } /** - * Returns the future register value at the specified address that occured because of a flow + * Returns the future register value at the specified address that occurred because of a flow * from the fromAddr. If no future value is stored, it will return the value stored in the program. * * @param register the register to get a value for. @@ -914,7 +914,7 @@ public class DisassemblerContextImpl implements DisassemblerContext { } /** - * Returns the future RegisterValue at the specified address that occured because of a flow from + * Returns the future RegisterValue at the specified address that occurred because of a flow from * the fromAddr. If no future value is stored, it will return the value stored in the program. * The value returned may not have a complete value for the requested register. * diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlock.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlock.java index 2331776d81..49e1eeefe6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlock.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlock.java @@ -109,7 +109,7 @@ public interface CodeBlock extends AddressSetView { * Get an Iterator over the CodeBlocks that are flowed to from this * CodeBlock. * @param monitor task monitor which allows user to cancel operation. - * @return An iterator over CodeBlocks refered to by this Block. + * @return An iterator over CodeBlocks referred to by this Block. * @throws CancelledException if the monitor cancels the operation. */ public CodeBlockReferenceIterator getDestinations(TaskMonitor monitor) throws CancelledException; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleBlockModel.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleBlockModel.java index 5d23da4de8..f01fdb7a30 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleBlockModel.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleBlockModel.java @@ -599,7 +599,7 @@ public class SimpleBlockModel implements CodeBlockModel { // return FlowType.INVALID; // } // -// // look at all refs to symbol, if not refered to by fallthrough +// // look at all refs to symbol, if not referred to by fallthrough // // instruction, must be flow, so return true. // Referent refs[] = sym.getReferences(); // if (refs == null) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.java index 4434325f2a..2b569ce0ee 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/RepeatedDynamicDataType.java @@ -29,7 +29,7 @@ import ghidra.util.Msg; * * Base abstract data type for a Dynamic structure data type that contains * some number of repeated data types. After each data type, including the header - * there is a terminator value which specifies wether there are any more data structures + * there is a terminator value which specifies weather there are any more data structures * following. TerminatorValue can be 1,2,4,or 8 bytes. * * The dynamic structure looks like this: diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ReferenceManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ReferenceManager.java index d8fdaebdba..8e313c853f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ReferenceManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ReferenceManager.java @@ -323,7 +323,7 @@ public interface ReferenceManager { /** * Return true if a memory reference exists with the given "to" address. - * @param toAddr address being refered to. + * @param toAddr address being referred to. */ public boolean hasReferencesTo(Address toAddr); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java index dffff2e3c2..a8a8a6aca3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java @@ -35,7 +35,7 @@ import ghidra.util.prop.PropertyVisitor; * For any long the property * manager can be used to tell if the property exists there and * what its value is. It also maintains information that allows it - * to efficiently search for the next and previous occurence of the + * to efficiently search for the next and previous occurrence of the * property relative to a given address. * The subclass provides the createPage() method that dictates * the type of PropertyPage that will be managed. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java index ca34ca2956..99a3397153 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractStoredProgramContext.java @@ -307,7 +307,7 @@ abstract public class AbstractStoredProgramContext extends AbstractProgramContex if (space.isOverlaySpace()) { address = ((OverlayAddressSpace) space).translateAddress(address, true); } - // there is a wierd deleted overlay case that the following code handles - sortof + // there is a weird deleted overlay case that the following code handles - sortof else if (space.getType() == AddressSpace.TYPE_UNKNOWN) { return new RegisterValue(register); } diff --git a/Ghidra/Processors/68000/data/languages/68000.sinc b/Ghidra/Processors/68000/data/languages/68000.sinc index f73088c2d4..a1703b1845 100644 --- a/Ghidra/Processors/68000/data/languages/68000.sinc +++ b/Ghidra/Processors/68000/data/languages/68000.sinc @@ -27,7 +27,7 @@ define register offset=0x140 size=4 [ SFC DFC TC ITT0 ITT1 DTT0 DTT1 MMUSR URP define register offset=0x180 size=4 [ BUSCR MBB RAMBAR0 RAMBAR1 ]; define register offset=0x200 size=2 [ SR ACUSR ]; # NOTE that SR overlaps XF, ZF, VF, CF -# NOTE that A7 refers to USP, ISP, or MSP depending on privelege level +# NOTE that A7 refers to USP, ISP, or MSP depending on privilege level define register offset=0x300 size=4 [ glbdenom movemptr ]; diff --git a/Ghidra/Processors/68000/src/main/java/ghidra/program/emulation/m68kEmulateInstructionStateModifier.java b/Ghidra/Processors/68000/src/main/java/ghidra/program/emulation/m68kEmulateInstructionStateModifier.java index 4836772f88..387c38fe93 100644 --- a/Ghidra/Processors/68000/src/main/java/ghidra/program/emulation/m68kEmulateInstructionStateModifier.java +++ b/Ghidra/Processors/68000/src/main/java/ghidra/program/emulation/m68kEmulateInstructionStateModifier.java @@ -99,7 +99,7 @@ public class m68kEmulateInstructionStateModifier extends EmulateInstructionState if ((currentAddress.getOffset() & 0x1) == 1) { throw new LowlevelError( - "Flow to odd address occured without setting ISM register (16-bit mode)"); + "Flow to odd address occurred without setting ISM register (16-bit mode)"); } // MIPS mode diff --git a/Ghidra/Processors/ARM/data/languages/ARMinstructions.sinc b/Ghidra/Processors/ARM/data/languages/ARMinstructions.sinc index a5c5a2e2f9..172f8e2689 100644 --- a/Ghidra/Processors/ARM/data/languages/ARMinstructions.sinc +++ b/Ghidra/Processors/ARM/data/languages/ARMinstructions.sinc @@ -1426,7 +1426,7 @@ with : ARMcondCk=1 { # other ARM instructions to avoid incorrect # constructor matching for those that use the # COND subconstructor. This also ensures -# that the various VFP instructions supercede the +# that the various VFP instructions supersede the # CDP/MCR/MRC general coprocessor instructions # ################################################# diff --git a/Ghidra/Processors/ARM/src/main/java/ghidra/program/emulation/ARMEmulateInstructionStateModifier.java b/Ghidra/Processors/ARM/src/main/java/ghidra/program/emulation/ARMEmulateInstructionStateModifier.java index 45c4d3b3a0..cb611c6ca0 100644 --- a/Ghidra/Processors/ARM/src/main/java/ghidra/program/emulation/ARMEmulateInstructionStateModifier.java +++ b/Ghidra/Processors/ARM/src/main/java/ghidra/program/emulation/ARMEmulateInstructionStateModifier.java @@ -160,7 +160,7 @@ public class ARMEmulateInstructionStateModifier extends EmulateInstructionStateM if ((currentAddress.getOffset() & 0x1) == 1) { throw new LowlevelError( - "Flow to odd address occured without setting TB register (Thumb mode)"); + "Flow to odd address occurred without setting TB register (Thumb mode)"); } // ARM mode diff --git a/Ghidra/Processors/Atmel/src/main/java/ghidra/app/util/bin/format/elf/relocation/AVR32_ElfRelocationHandler.java b/Ghidra/Processors/Atmel/src/main/java/ghidra/app/util/bin/format/elf/relocation/AVR32_ElfRelocationHandler.java index d85930bac6..1b9750087c 100644 --- a/Ghidra/Processors/Atmel/src/main/java/ghidra/app/util/bin/format/elf/relocation/AVR32_ElfRelocationHandler.java +++ b/Ghidra/Processors/Atmel/src/main/java/ghidra/app/util/bin/format/elf/relocation/AVR32_ElfRelocationHandler.java @@ -249,7 +249,7 @@ public class AVR32_ElfRelocationHandler extends ElfRelocationHandler { memory.setInt(relocationAddress, newValue); System.out.println(" HANDLED AVR relocation: R_AVR32_21S at "+relocationAddress + ", New = " + newValue); break; - case AVR32_ElfRelocationConstants.R_AVR32_16U: //Use long to accomodate the Unsignedness... + case AVR32_ElfRelocationConstants.R_AVR32_16U: //Use long to accommodate the Unsignedness... long newValueLong = ((symbolValue + addend) & 0x0000ffff); memory.setLong(relocationAddress, newValueLong); System.out.println(" HANDLED AVR relocation: R_AVR32_16U at "+relocationAddress + ", NewLong = " + newValueLong); diff --git a/Ghidra/Processors/MIPS/src/main/java/ghidra/program/emulation/MIPSEmulateInstructionStateModifier.java b/Ghidra/Processors/MIPS/src/main/java/ghidra/program/emulation/MIPSEmulateInstructionStateModifier.java index 5118b1a902..5301e44638 100644 --- a/Ghidra/Processors/MIPS/src/main/java/ghidra/program/emulation/MIPSEmulateInstructionStateModifier.java +++ b/Ghidra/Processors/MIPS/src/main/java/ghidra/program/emulation/MIPSEmulateInstructionStateModifier.java @@ -124,7 +124,7 @@ public class MIPSEmulateInstructionStateModifier extends EmulateInstructionState if ((currentAddress.getOffset() & 0x1) == 1) { throw new LowlevelError( - "Flow to odd address occured without setting ISM register (16-bit mode)"); + "Flow to odd address occurred without setting ISM register (16-bit mode)"); } // MIPS mode diff --git a/gradle/root/distribution.gradle b/gradle/root/distribution.gradle index 6ef5fa56c5..f1a6ed3d36 100644 --- a/gradle/root/distribution.gradle +++ b/gradle/root/distribution.gradle @@ -157,7 +157,7 @@ task zipJavadocs(type: Zip) { /********************************************************************************************** * - * Copies platform independant files to the distribution staging area in preparation + * Copies platform independent files to the distribution staging area in preparation * for the distribution zip * **********************************************************************************************/ diff --git a/gradle/root/test.gradle b/gradle/root/test.gradle index 02e538b5bc..a51bd874e5 100644 --- a/gradle/root/test.gradle +++ b/gradle/root/test.gradle @@ -153,7 +153,7 @@ def generateRandomDebugPort() { /********************************************************************************* * Loads application specific property file that contains info we need. - * Properties will be imediately added to the global System.properties file so we + * Properties will be immediately added to the global System.properties file so we * can readily access them from just one place. *********************************************************************************/ def loadApplicationProperties() {