yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues 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
Download patch file Download diff file Expand all files Collapse all files

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