Skip to content

Ghidra is a software reverse engineering (SRE) framework

Merge remote-tracking branch 'origin/GP-6642_ghidorahrex_HCS12_BRN_fix--SQUASHED' into patch (Closes #9001)

Ryan Kurtzc1b34a9ec17c
diff --cc Ghidra/Processors/HCS12/src/main/java/ghidra/app/plugin/core/analysis/HCS12ConventionAnalyzer.java
index 5ef162ae20,79d649fd1f..5e04ff9c4a
--- a/Ghidra/Processors/HCS12/src/main/java/ghidra/app/plugin/core/analysis/HCS12ConventionAnalyzer.java
+++ b/Ghidra/Processors/HCS12/src/main/java/ghidra/app/plugin/core/analysis/HCS12ConventionAnalyzer.java
@@@ -17,19 -17,19 +17,11 @@@ package ghidra.app.plugin.core.analysis
import java.math.BigInteger;
--import ghidra.app.services.AbstractAnalyzer;
--import ghidra.app.services.AnalysisPriority;
--import ghidra.app.services.AnalyzerType;
++import ghidra.app.services.*;
import ghidra.app.util.importer.MessageLog;
import ghidra.program.model.address.AddressSetView;
--import ghidra.program.model.lang.Processor;
--import ghidra.program.model.lang.Register;
--import ghidra.program.model.lang.RegisterValue;
--import ghidra.program.model.listing.Function;
--import ghidra.program.model.listing.FunctionIterator;
--import ghidra.program.model.listing.Instruction;
--import ghidra.program.model.listing.InstructionIterator;
--import ghidra.program.model.listing.Program;
++import ghidra.program.model.lang.*;
++import ghidra.program.model.listing.*;
import ghidra.program.model.symbol.SourceType;
import ghidra.util.Msg;
import ghidra.util.exception.CancelledException;
@@@ -51,11 -51,10 +43,10 @@@ public class HCS12ConventionAnalyzer ex
@Override
public boolean canAnalyze(Program program) {
- // Only analyze HCS12 Programs
+ // Only analyze HCS-12 / HCS-12X Programs
Processor processor = program.getLanguage().getProcessor();
- boolean canDo = "HCS-12".equals(processor.toString()) ||
- "HCS-12X".equals(processor.toString());
-
+ String procName = processor.toString();
+ boolean canDo = "HCS-12".equals(procName) || "HCS-12X".equals(procName);
if (canDo) {
xgate = program.getRegister("XGATE");
}