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

Merge remote-tracking branch 'origin/GP-25_emteere_StoredProgramRegisters'

Browse source
This commit is contained in:
ghidra1 2020-07-16 15:42:26 -04:00
commit 2e61ba2e46
2 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -354,7 +354,7 @@ public class ProgramRegisterContextDB extends AbstractStoredProgramContext imple
registers = newLanguage.getRegisters();
baseContextRegister = newLanguage.getContextBaseRegister();
initNameMap();
init();
registerValueMap.clear();
initializedCurrentValues();

38
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AbstractProgramContext.java
View file

@ -1,6 +1,5 @@
/* ###
* 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.
@ -16,19 +15,19 @@
*/
package ghidra.program.util;
import java.util.*;
import ghidra.program.model.address.Address;
import ghidra.program.model.lang.Register;
import ghidra.program.model.lang.RegisterValue;
import ghidra.program.model.listing.DefaultProgramContext;
import ghidra.program.model.listing.ProgramContext;
import java.util.*;
abstract public class AbstractProgramContext implements ProgramContext, DefaultProgramContext {
protected Map<String, Register> registerNameMap;
protected Register[] registers;
protected Register baseContextRegister;
private Map<String, Register> registerNameMap; // lazy initialized only when getRegister(name) called
private boolean hasNonFlowingContext = false;
private byte[] nonFlowingContextRegisterMask;
@ -39,8 +38,7 @@ abstract public class AbstractProgramContext implements ProgramContext, DefaultP
protected AbstractProgramContext(Register[] registers) {
this.registers = registers;
registerNameMap = new HashMap<String, Register>();
initNameMap();
init();
if (baseContextRegister != null) {
nonFlowingContextRegisterMask = baseContextRegister.getBaseMask().clone();
@ -111,15 +109,13 @@ abstract public class AbstractProgramContext implements ProgramContext, DefaultP
return value.clearBitValues(flowingContextRegisterMask);
}
protected void initNameMap() {
protected void init() {
registerNameMap = null;
baseContextRegister = null;
for (Register register : registers) {
registerNameMap.put(register.getName().toUpperCase(), register);
if (register.isProcessorContext()) {
baseContextRegister = register.getBaseRegister();
}
for (String alias : register.getAliases()) {
registerNameMap.put(alias.toUpperCase(), register);
break; // should only be one
}
}
if (baseContextRegister == null) {
@ -127,7 +123,23 @@ abstract public class AbstractProgramContext implements ProgramContext, DefaultP
new Register("DEFAULT_CONTEXT", "DEFAULT_CONTEXT", Address.NO_ADDRESS, 4, true, 0);
}
defaultDisassemblyContext = new RegisterValue(baseContextRegister);
}
private Map<String, Register> getRegisterNameMap() {
if (registerNameMap != null) {
return registerNameMap;
}
// if register map hasn't been initialized, initialize it
registerNameMap = new HashMap<String, Register>();
// NOTE: if you want upper case names recognized, override this method and add them
for (Register register : registers) {
registerNameMap.put(register.getName(), register);
for (String alias : register.getAliases()) {
registerNameMap.put(alias, register);
}
}
return registerNameMap;
}
@Override
@ -143,7 +155,7 @@ abstract public class AbstractProgramContext implements ProgramContext, DefaultP
@Override
public final Register getRegister(String name) {
return registerNameMap.get(name.toUpperCase());
return getRegisterNameMap().get(name);
}
@Override