Skip to content

Commit

Permalink
Merge remote-tracking branch
Browse files Browse the repository at this point in the history
'origin/GT-3510_dragonmacher_PR-1478_io12_spelling-fix-2'

Fixes #1478
  • Loading branch information
GhidorahRex committed Jan 29, 2020
2 parents 885392d + 74fae2f commit dc16f29
Show file tree
Hide file tree
Showing 73 changed files with 93 additions and 105 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -97,7 +96,7 @@ private void processProgram(Program program) throws CancelledException, IOExcept
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();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -43,7 +42,7 @@ public void run() throws Exception {
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ <H2>Tips:</H2>
CParserPlugin.out file produced in your home directory.<BR>
</P>

<P>Use the Line numbers to determine where in the file the parse error occured.<BR>
<P>Use the Line numbers to determine where in the file the parse error occurred.<BR>
</P>

<P>The <SPAN style="font-style: italic; font-weight: bold;">last valid data parsed</SPAN>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <H1><A name="Export"></A>Exporting Files</H1>

<P>Some of the formats the <I>Exporter</I> supports are:</P>
<A name="Exporter_Formats">


<UL>
<LI><A href="#ascii">ASCII</A></LI>
Expand Down Expand Up @@ -147,7 +147,7 @@ <H4>Advanced</H4>
<TD><I><B>Comment Prefix</B></I><BR>
</TD>

<TD valign="top">the string to append on the begining of comments<BR>
<TD valign="top">the string to prepend to the beginning of comments<BR>
</TD>
</TR>
</TBODY>
Expand Down Expand Up @@ -306,11 +306,11 @@ <H4>Intel Hex Options</H4>
<LI><B>Address Space</B> - Specifies which address space to export as Intel Hex format
only supports one address space. This option will be intialized to the "default"
address space.</LI>
<LI><B>Record Size</B> - Specifies the size (in bytes) of each record in the
<LI><B>Record Size</B> - Specifies the size (in bytes) of each record in the
output file. The default 16.</LI>
<LI><B>Align To Record Size</B> - If checked, this will ensure that <b>only</b> records matching
the record size will be output. eg: if you set the record size to 16 but there are
18 bytes selected, you will see only one line of 16 bytes in the output; the remaining
the record size will be output. eg: if you set the record size to 16 but there are
18 bytes selected, you will see only one line of 16 bytes in the output; the remaining
2 bytes will be dropped.</LI>
</UL>
</BLOCKQUOTE>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ <H2><A name="refSymbols"></A>Reference Destination Symbols</H2>

<TD valign="top">A memory address "label" identifying a memory reference destination
which is located at an offcut address within a code unit. &nbsp;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.
&nbsp;Double-clicking the corresponding offcut XRef will take you to the code unit
which has the offcut reference,<BR>
</TD>
Expand Down Expand Up @@ -1343,7 +1343,7 @@ <H2><A name="dragNDrop"></A>Adding Memory References from a Selection</H2>

<P>A code unit selection from the CodeBrowser Listing may be dragged and dropped onto the
<B><I>References Editor</I></B> panel to create <A href="#memRefs">Memory References</A> in bulk
for the current Source. &nbsp;This capability must be used carefully since a seperate reference
for the current Source. &nbsp;This capability must be used carefully since a separate reference
will be created "to" every code unit contained within the selection. &nbsp;<BR>
</P>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -99,7 +98,7 @@ DataType initializeStructureData( Program program, Structure localStructure ){
}
Structure originalStructure = (Structure) parentDataType;

// clear and initialize the orignal structure and then get the new
// clear and initialize the original structure and then get the new
// data
clearStruct(originalStructure, comp1.getParentOffset(), dataLength );
originalStructure.replace(comp1.getComponentIndex(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public boolean makeTable(Program program, int start, int end, boolean createInde
Address currentAddress = topAddress.addWrap(start * addrSize);

// make sure this pointer is in the data type manager
// since we are going to use it alot
// since we are going to use it a lot
DataType adt;

//TODO: Do I need to do something special for the 3 byte pointers or will it know
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public boolean added(Program program, AddressSetView addressSet, TaskMonitor mon

/**
* Process the items on the do later set. If doing block analysis, then this is the initial
* analysis of the program, so schedule the do later set after some analysis has occured.
* analysis of the program, so schedule the do later set after some analysis has occurred.
*
* @param program - this program
* @param monitor - monitor
Expand Down Expand Up @@ -313,7 +313,7 @@ private void moveSuspectSymbolsToDoLaterSet(Program program, TaskMonitor monitor
}

// It isn't smart enough to pick up
// valid wierd code. Need to look at things that are marked as an entry point
// valid weird code. Need to look at things that are marked as an entry point
// to see if we should disassemble...
// Save the bad ones to do last.
Symbol symbol = symbolTable.getPrimarySymbol(entry);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ private void openFile(final DomainFile file) {
catch (InvocationTargetException e) {
Throwable t = e.getCause();
Msg.showError(this, tool.getToolFrame(), "Tool Launch Failed",
"An error occured while attempting to launch your default tool!", t);
"An error occurred while attempting to launch your default tool!", t);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ public String getColumnName() {

@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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public void actionPerformed(ActionEvent evt) {
}
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);
}
}
});
Expand Down Expand Up @@ -317,7 +317,7 @@ public void actionPerformed(ActionEvent evt) {
}
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();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,7 +45,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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Symbol createSymbol(Address addr, String name, boolean isPrimary, boolean pinAbs
* 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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ else if (options.commit && !domFile.isCheckedOutExclusive()) {
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())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private void readLibraryHints(ResourceFile hintsFile) {
}
}
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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ DataType extractReturnType(String signatureText) throws ParseException, Cancelle
}

// 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).
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public boolean fieldElementClicked(Object clickedObject, Navigatable sourceNavig
}
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ public final Function getFunctionBefore(Function function) {
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;
Expand Down Expand Up @@ -1074,7 +1074,7 @@ public final Function getFunctionAfter(Function function) {
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ public final void runTest() {

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);
}

Expand Down Expand Up @@ -1243,8 +1243,8 @@ public final void runTest() {

}
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) {
Expand Down Expand Up @@ -1390,7 +1390,7 @@ private void checkInstructionDecodeFailure(EmulatorTestRunner testRunner) {
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ private void assertTable(AutoTableDisassemblerModel model, String... addrs) {
}

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));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ private void assertDataStringNotInScalarTable() {
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);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void testTransactionWaitForSnapshotLock() throws Exception {
// 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);

}

Expand Down Expand Up @@ -146,7 +146,7 @@ public void testTransactionWaitForLock() throws Exception {
// 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);

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
public class Face extends DittedBitSequence implements Comparable<Face> {
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<Face> children; //A set of faces this face contains. (Used in the heirarchy of ditted pattern finding.)
private HashSet<Face> 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<Face, Face> joinOf; //Keep track of what pair of faces made this face (if it was created as a join).

Expand All @@ -47,7 +47,7 @@ public Face(Face f1, Face f2, HashSet<Face> patterns, int maxDim, boolean addf1)
this.children = new HashSet<Face>();
this.joinOf = new Pair<Face, Face>(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.
Expand Down
2 changes: 1 addition & 1 deletion Ghidra/Features/Decompiler/src/decompile/cpp/heritage.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Ghidra/Features/Decompiler/src/decompile/cpp/varnode.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private boolean hasInconsistentResults(DecompileResults decompRes) {

// TODO: should unaff_ be checked?

// TODO: should wierd stack references be checked?
// TODO: should weird stack references be checked?
}

return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ private DemangledDataType parseFunction(String functionString, int offset) {
}

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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ private void verifyPdbSignature() throws IOException, PdbException {
}
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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public boolean applyTo(DomainObject obj, TaskMonitor monitor) {
}
}
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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ else if (functionNameChoice == FunctionNameChoices.REPLACE_ALWAYS) {
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
// }
}
}
Expand Down

0 comments on commit dc16f29

Please sign in to comment.