yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1772_correct_langauge_usage'

Browse source 
Conflicts:
	Ghidra/Features/Base/ghidra_scripts/ReloadSleighLangauge.java
This commit is contained in:
Ryan Kurtz 2022-05-06 14:30:24 -04:00
commit 5e6c267093
8 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java
View file

@ -274,7 +274,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData
/**
* Language specified by languageName was not found. Check for
* valid language translation/migration. Old langauge version specified by
* valid language translation/migration. Old language version specified by
* languageVersion.
* @param openMode one of:
* READ_ONLY: the original database will not be modified

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
View file

@ -1711,10 +1711,10 @@ public class Disassembler implements DisassemblerConflictHandler {
private static class InstructionContext implements ProcessorContext {
private RegisterValue contextValue;
private Language langauge;
private Language language;
InstructionContext(Language language, RegisterValue contextValue) {
this.langauge = language;
this.language = language;
this.contextValue = contextValue;
}
@ -1729,12 +1729,12 @@ public class Disassembler implements DisassemblerConflictHandler {
@Override
public List<Register> getRegisters() {
return langauge.getRegisters();
return language.getRegisters();
}
@Override
public Register getRegister(String name) {
return langauge.getRegister(name);
return language.getRegister(name);
}
@Override

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterBuilder.java
View file

@ -167,7 +167,7 @@ public class RegisterBuilder {
}
/**
* Rename a register. This allows generic register names declared within the langauge
* Rename a register. This allows generic register names declared within the language
* specification (*.slaspec) to be renamed for a processor variant specification (*.pspec).
* @param oldName original register name
* @param newName new register name

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java
View file

@ -214,7 +214,7 @@ public class OldLanguageFactory {
LanguageService languageService = DefaultLanguageService.getLanguageService();
if (lang instanceof OldLanguage) {
throw new LanguageNotFoundException(
"Can't create an Old Langauge file from an OldLanguage");
"Can't create an Old Language file from an OldLanguage");
}
LanguageDescription languageDescription =
languageService.getLanguageDescription(lang.getLanguageID());