Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-23 04:39:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-7152_hippietrail_two-spellos'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-11-05 08:45:31 -05:00
commit 89198b3bf9
21 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GPL/DemanglerGnu/src/demangler_gnu_v2_24/c/cplus-dem.c
View File

@ -903,7 +903,7 @@ ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED)
goto unknown;
/* Most of the demangling will trivially remove chars. Operator names
may add one char but because they are always preceeded by '__' which is
may add one char but because they are always preceded by '__' which is
replaced by '.', they eventually never expand the size.
A few special names such as '___elabs' add a few chars (at most 7), but
they occur only once. */

2
GPL/DemanglerGnu/src/demangler_gnu_v2_41/c/cplus-dem.c
View File

@ -219,7 +219,7 @@ ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED)
goto unknown;
/* Most of the demangling will trivially remove chars. Operator names
may add one char but because they are always preceeded by '__' which is
may add one char but because they are always preceded by '__' which is
replaced by '.', they eventually never expand the size.
A few special names such as '___elabs' add a few chars (at most 7), but
they occur only once. */

2
Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm
View File

@ -306,7 +306,7 @@
<LI><SPAN style="font-weight: bold;">machine</SPAN> - Sets the minimum alignment to conform
to the machine alignment specified by the associated data organization (i.e., compiler specification).
This genrally corresponds to the largest alignment which is ever
used for any data type on the program's intended machine. If this is choosen and
used for any data type on the program's intended machine. If this is chosen and
the resulting alignment is larger, this is likely due to a component data type
having an alignment larger than the machine alignment.
<BR>

2
Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm
View File

@ -494,7 +494,7 @@
<BLOCKQUOTE>
<P>Enter <B>file(n)</B>, where <B>n</B> is a file offset of the program's source file bytes
(at time of import), into the text area of the dialog. The file offset entered will be
assumed to be in decimal unless it is preceeded by <B>0x</B>. That is, "file(0x1000)" and
assumed to be in decimal unless it is preceded by <B>0x</B>. That is, "file(0x1000)" and
"file(1000)" are different values.</P>
<P><I><IMG alt="" src="help/shared/note.png" border="0">Ghidra does not support storing

6
Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm
View File

@ -1037,7 +1037,7 @@ c<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
cause the <I><B>Add Reference Dialog</B></I> to be displayed for the current <I>Source</I> code
unit. &nbsp;Once displayed, the <I>Source</I> code unit mnemonic or operand may be selected by
clicking on it, as well as the <I>Type of Reference</I>. &nbsp;The available choices for Type
of Reference may be constrained based upon the choosen operand.</P>
of Reference may be constrained based upon the chosen operand.</P>
<P><IMG src="help/shared/note.png" alt=""> <I>In general, only flow references should be set
on an instruction mnemonic, unless of course the instruction has no operands. &nbsp;References
@ -1061,7 +1061,7 @@ c<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<P align="center"><IMG src="images/AddReferenceDialog.png" alt=""></P>
<P>Based upon the choosen <I>Type of Reference</I>, the lower portion of the dialog will
<P>Based upon the chosen <I>Type of Reference</I>, the lower portion of the dialog will
change. &nbsp;The following sections discuss the input panels for each of the four possible
choices:<BR>
</P>
@ -1238,7 +1238,7 @@ c<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<BLOCKQUOTE>
<P>This field identifies a namespace name corresponding to the <I>External Program</I> and
may be typed-in or choosen from the pull-down list of those previously defined. &nbsp; This
may be typed-in or chosen from the pull-down list of those previously defined. &nbsp; This
is a required input.<BR>
</P>
</BLOCKQUOTE>

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentUtils.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -202,8 +202,8 @@ public class CommentUtils {
int start = word.getStart();
if (offset != start) {
// text between annotations
String preceeding = text.substring(offset, start);
results.add(new StringCommentPart(preceeding, prototype));
String preceding = text.substring(offset, start);
results.add(new StringCommentPart(preceding, prototype));
}
String annotationText = word.getWord();

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/PreCommentFieldFactory.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -242,7 +242,7 @@ public class PreCommentFieldFactory extends FieldFactory {
}
/**
* A composite which immediately preceeds the current address may contain trailing zero-length
* A composite which immediately precedes the current address may contain trailing zero-length
* components which implicitly refer to this address and are not rendered by the opened composite.
* This comment is intended to convey the existence of such hidden components which correspond
* to addr.

8
Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemProbeConflictResolver.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -31,7 +31,7 @@ public interface FileSystemProbeConflictResolver {
* Picks a single {@link FileSystemInfoRec} to use when mounting a filesystem.
* <p>
* @param factories a {@link List} of {@link FileSystemInfoRec}s.
* @return the choosen FSIR, or null
* @return the chosen FSIR, or null
*/
default public FileSystemInfoRec resolveFSIR(List<FileSystemInfoRec> factories) {
switch (factories.size()) {
@ -51,7 +51,7 @@ public interface FileSystemProbeConflictResolver {
* This method will only be called if the list contains more than a single item.
* <p>
* @param factories {@link List} of {@link FileSystemInfoRec}, always more than 1 element.
* @return the choosen FSIR, or null
* @return the chosen FSIR, or null
*/
public FileSystemInfoRec chooseFSIR(List<FileSystemInfoRec> factories);

6
Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/tasks/ImportBatchTask.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -137,7 +137,7 @@ public class ImportBatchTask extends Task {
LoadSpec loadSpec = batchLoadConfig.getLoadSpec(selectedBatchGroupLoadSpec);
if (loadSpec == null) {
Msg.error(this,
"Failed to get load spec from application that matches choosen batch load spec " +
"Failed to get load spec from application that matches chosen batch load spec " +
selectedBatchGroupLoadSpec);
return;
}

2
Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java
View File

@ -1331,7 +1331,7 @@ public class FlatProgramAPI {
/**
* Returns the defined data after the specified data or null if no data exists.
* @param data preceeding data
* @param data preceding data
* @return the defined data after the specified data or null if no data exists
*/
public final Data getDataAfter(Data data) {

6
Ghidra/Features/BytePatterns/src/main/java/ghidra/closedpatternmining/ProjectedDatabase.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -237,7 +237,7 @@ public class ProjectedDatabase {
dittedPosition++;//advance past fixedPosition
}
//if all of the preceeding positions are filled, there can't be any backward
//if all of the preceding positions are filled, there can't be any backward
//extension items
if (positionsToSymbols.isEmpty()) {
return backwardExtensionItems;

2
Ghidra/Features/FileFormats/src/lzfse/c/lzvn_decode_base.c
View File

@ -429,7 +429,7 @@ copy_literal_and_match:
PTR_LEN_INC(dst_ptr, dst_len, L);
PTR_LEN_INC(src_ptr, src_len, L);
// Check if the match distance is valid; matches must not reference
// bytes that preceed the start of the output buffer, nor can the match
// bytes that precede the start of the output buffer, nor can the match
// distance be zero.
if (D > dst_ptr - state->dst_begin || D == 0)
goto invalid_match_distance;

6
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/MemoryRange64.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -32,7 +32,7 @@ public class MemoryRange64 implements StructConverter {
// MemoryRange64 is used for full-memory minidumps where
// all of the raw memory is laid out sequentially at the
// end of the dump. There is no need for individual RVAs
// as the RVA is the base RVA plus the sum of the preceeding
// as the RVA is the base RVA plus the sum of the preceding
// data blocks.
private DumpFileReader reader;

2
Ghidra/Features/GnuDemangler/ghidra_scripts/VxWorksSymTab_Finder.java
View File

@ -25,7 +25,7 @@
// table entries are deleted. Mangled C++ symbol names are demangled.
//
// The VxWorks symbol table is an array [0..n-1] of (struct SYMBOL) entries.
// The table may be immediately followed or preceeded by an (int) vxSymTblLen
// The table may be immediately followed or preceded by an (int) vxSymTblLen
// value.
//
// Prerequisites:

8
Ghidra/Framework/DB/src/main/java/db/Field.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -343,7 +343,7 @@ public abstract class Field implements Comparable<Field> {
/**
* Write the field to buf at the specified offset. When writing variable length
* fields, the length preceeds the actual data.
* fields, the length precedes the actual data.
* @param buf data buffer
* @param offset data offset
* @return next available Field offset within buffer, or -1 if end of buffer reached.
@ -354,7 +354,7 @@ public abstract class Field implements Comparable<Field> {
/**
* Read the field value from buf at the specified offset. When reading variable length
* fields, the length preceeds the actual data.
* fields, the length precedes the actual data.
* @param buf data buffer
* @param offset data offset
* @return next Field offset within buffer, or -1 if end of buffer reached.

7
Ghidra/Framework/Docking/src/main/java/docking/menu/MenuHandler.java
View File

@ -1,13 +1,12 @@
/* ###
* 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.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -59,7 +58,7 @@ public abstract class MenuHandler implements MenuListener, PopupMenuListener {
}
/**
* Invoked when a menu is no longer selected. This is always preceeded
* Invoked when a menu is no longer selected. This is always preceded
* by a menuSelected invocation. This is invoked prior to the processMenuAction
* if an action item is selected.
* @see javax.swing.event.MenuListener#menuDeselected(javax.swing.event.MenuEvent)

7
Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/DoubleAttribute.java
View File

@ -1,13 +1,12 @@
/* ###
* 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.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -150,7 +149,7 @@ public class DoubleAttribute<T extends KeyedObject> extends Attribute<T> {
catch (ghidra.util.exception.NoValueException exc) {
try {
value2 = getValue(ko2);
return 1; //ko2 is ok so it preceeds ko1
return 1; //ko2 is ok so it precedes ko1
}
catch (ghidra.util.exception.NoValueException exc2) {
if ((ko1.key() - ko2.key()) < 0) {

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/ToolTaskManager.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -217,7 +217,7 @@ public class ToolTaskManager implements Runnable {
taskThread.start();
try {
// Wait for background command task to start its transaction and notify us.
// This is done to ensure any preceeding foreground Command transaction
// This is done to ensure any preceding foreground Command transaction
// becomes entangled with the task execution.
wait(1000);
}

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/symbol/SubtableSymbol.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -32,7 +32,7 @@ import ghidra.program.model.pcode.DecoderException;
/**
* A collection of Constructors or a Symbol representing
* one out of a family of Constructors, choosen based on InstructionContext
* one out of a family of Constructors, chosen based on InstructionContext
*/
public class SubtableSymbol extends TripleSymbol {

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
View File

@ -1120,7 +1120,7 @@ public class Disassembler implements DisassemblerConflictHandler {
/**
* Perform parse of instruction bytes and context to produce an instruction prototype.
* @param instrMemBuffer memory buffer
* @param block fallthrough sequence of instructions preceeding current instruction
* @param block fallthrough sequence of instructions preceding current instruction
* required to facilitate potential crossbuilds for current instruction.
* @return instruction prototype
* @throws InsufficientBytesException

2
GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/JavadocConverter.java
View File

@ -308,7 +308,7 @@ public class JavadocConverter extends DocConverter {
* @return the converted tag
*/
private String convertSinceTag(Element el, SinceTree since) {
// NOTE: there must be a preceeding new line
// NOTE: there must be a preceding new line
String msg = convertTree(el, since.getBody());
return "\n.. versionadded:: " + msg + '\n';
}