diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java index 38d531faf6..3579e38a2b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java @@ -642,7 +642,7 @@ public class SleighDebugLogger { String partialMatch = childMatchValue.hasValue() ? "" : "*"; String matchStr = match.equals(actual) ? " Match" : (" Failed (=0x" + Long.toHexString(actual.longValue()) + ")"); - int msb = baseRegSize - reg.getLeastSignificatBitInBaseRegister() - 1; + int msb = baseRegSize - reg.getLeastSignificantBitInBaseRegister() - 1; int lsb = msb - reg.getBitLength() + 1; append(partialMatch + reg.getName() + "(" + lsb + "," + msb + ") == 0x" + Long.toHexString(match.longValue()) + matchStr); @@ -685,7 +685,7 @@ public class SleighDebugLogger { RegisterValue childActualValue = actualValue.getRegisterValue(reg); if (childActualValue.hasAnyValue()) { BigInteger actual = childActualValue.getUnsignedValueIgnoreMask(); - int msb = baseRegSize - reg.getLeastSignificatBitInBaseRegister() - 1; + int msb = baseRegSize - reg.getLeastSignificantBitInBaseRegister() - 1; int lsb = msb - reg.getBitLength() + 1; append("Set " + reg.getName() + "(" + lsb + "," + msb + ") = 0x" + Long.toHexString(actual.longValue()) + "\n"); @@ -737,7 +737,7 @@ public class SleighDebugLogger { RegisterValue childActualValue = actualValue.getRegisterValue(reg); if (childActualValue.hasAnyValue()) { BigInteger actual = childActualValue.getUnsignedValueIgnoreMask(); - int msb = baseRegSize - reg.getLeastSignificatBitInBaseRegister() - 1; + int msb = baseRegSize - reg.getLeastSignificantBitInBaseRegister() - 1; int lsb = msb - reg.getBitLength() + 1; append(msg + reg.getName() + "(" + lsb + "," + msb + ") = 0x" + diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ProcessorContextView.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ProcessorContextView.java index 51ab3a1f38..0037ba41a2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ProcessorContextView.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ProcessorContextView.java @@ -83,7 +83,7 @@ public interface ProcessorContextView { RegisterValue childValue = value.getRegisterValue(reg); if (childValue.hasAnyValue()) { BigInteger v = childValue.getUnsignedValueIgnoreMask(); - int msb = baseRegSize - reg.getLeastSignificatBitInBaseRegister() - 1; + int msb = baseRegSize - reg.getLeastSignificantBitInBaseRegister() - 1; int lsb = msb - reg.getBitLength() + 1; if (buf.length() != 0) { buf.append("\n"); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Register.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Register.java index aad9190d5f..7b5f3326a4 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Register.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Register.java @@ -366,7 +366,7 @@ public class Register implements java.io.Serializable, Comparable { return this; } - public int getLeastSignificatBitInBaseRegister() { + public int getLeastSignificantBitInBaseRegister() { return leastSigBitInBaseRegister; } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterValue.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterValue.java index 2e774512c7..3127d1f3b9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterValue.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterValue.java @@ -49,7 +49,7 @@ public class RegisterValue { */ public RegisterValue(Register register) { this.register = register; - startBit = (register.getLeastSignificatBitInBaseRegister()); + startBit = (register.getLeastSignificantBitInBaseRegister()); endBit = startBit + register.getBitLength() - 1; byte[] mask = register.getBaseMask(); bytes = new byte[mask.length * 2]; @@ -62,7 +62,7 @@ public class RegisterValue { public RegisterValue(Register register, BigInteger value) { this.register = register; byte[] mask = register.getBaseMask(); - startBit = register.getLeastSignificatBitInBaseRegister(); + startBit = register.getLeastSignificantBitInBaseRegister(); endBit = startBit + register.getBitLength() - 1; value = value.shiftLeft(startBit); byte[] valueBytes = value.toByteArray(); @@ -118,7 +118,7 @@ public class RegisterValue { this.register = register; this.bytes = adjustBytes(register.getBaseRegister(), bytes); applyRegisterMask(register.getBaseMask()); - startBit = register.getLeastSignificatBitInBaseRegister(); + startBit = register.getLeastSignificantBitInBaseRegister(); endBit = startBit + register.getBitLength() - 1; } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java index a05e71b03d..9a7aa409ec 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java @@ -191,7 +191,7 @@ public class InstructionUtils { if (childActualValue.hasAnyValue()) { int pad = paddedLen - reg.getName().length(); BigInteger actual = childActualValue.getUnsignedValueIgnoreMask(); - int msb = baseRegSize - reg.getLeastSignificatBitInBaseRegister() - 1; + int msb = baseRegSize - reg.getLeastSignificantBitInBaseRegister() - 1; int lsb = msb - reg.getBitLength() + 1; if (buf.length() != 0) { buf.append("\n"); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorAdapter.java index 5910e401b5..223252d285 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorAdapter.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorAdapter.java @@ -333,8 +333,8 @@ public abstract class LanguageTranslatorAdapter implements LanguageTranslator { } protected boolean isSameRegisterConstruction(Register oldReg, Register newReg) { - if (oldReg.getLeastSignificatBitInBaseRegister() != newReg - .getLeastSignificatBitInBaseRegister() || + if (oldReg.getLeastSignificantBitInBaseRegister() != newReg + .getLeastSignificantBitInBaseRegister() || oldReg.getBitLength() != newReg.getBitLength()) { return false; } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java index 91dd9a6494..43604345ce 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java @@ -279,7 +279,7 @@ public class OldLanguageFactory { Element fieldElement = new Element("field"); fieldElement.setAttribute("name", bitReg.getName()); int fieldBitLength = bitReg.getBitLength(); - int lsb = bitReg.getLeastSignificatBitInBaseRegister(); + int lsb = bitReg.getLeastSignificantBitInBaseRegister(); int msb = lsb + fieldBitLength - 1; // Transpose bit numbering to agree with Sleigh context bit numbering