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

GP-3067: Changes in anticipation of GP-2038.

Browse source
This commit is contained in:
Dan 2023-01-30 14:59:49 -05:00
parent 9014d10edf
commit b8e1808cb8
7 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueHoverService.java
View file

@ -310,7 +310,7 @@ public class VariableValueHoverService extends AbstractConfigurableHover
}
if (variable != null) {
return fillFrameStorage(frame, variable.getName(), variable.getDataType(),
variable.getVariableStorage());
variable.getProgram(), variable.getVariableStorage());
}
Address dynAddr = frame.getBasePointer().add(stackAddress.getOffset());
TraceCodeUnit unit = current.getTrace()
@ -377,7 +377,7 @@ public class VariableValueHoverService extends AbstractConfigurableHover
if (variable != null) {
return fillFrameStorage(frame, variable.getName(), variable.getDataType(),
variable.getVariableStorage());
variable.getProgram(), variable.getVariableStorage());
}
if (frame.getLevel() == 0) {
@ -418,16 +418,17 @@ public class VariableValueHoverService extends AbstractConfigurableHover
}
public CompletableFuture<VariableValueTable> fillStorage(Function function, String name,
DataType type, VariableStorage storage, AddressSetView symbolStorage) {
DataType type, Program program, VariableStorage storage,
AddressSetView symbolStorage) {
return executeBackground(monitor -> {
UnwoundFrame<WatchValue> frame =
VariableValueUtils.requiresFrame(storage, symbolStorage)
VariableValueUtils.requiresFrame(program, storage, symbolStorage)
? eval.getStackFrame(function, warnings, monitor)
: eval.getGlobalsFakeFrame();
if (frame == null) {
throw new UnwindException("Cannot find frame for " + function);
}
return fillFrameStorage(frame, name, type, storage);
return fillFrameStorage(frame, name, type, program, storage);
});
}
@ -459,14 +460,14 @@ public class VariableValueHoverService extends AbstractConfigurableHover
}
public VariableValueTable fillFrameStorage(UnwoundFrame<WatchValue> frame, String name,
DataType type, VariableStorage storage) {
DataType type, Program program, VariableStorage storage) {
table.add(new NameRow(name));
if (!frame.isFake()) {
table.add(new FrameRow(frame));
}
table.add(new StorageRow(storage));
table.add(new TypeRow(type));
WatchValue value = frame.getValue(storage);
WatchValue value = frame.getValue(program, storage);
return fillWatchValue(frame, storage.getMinAddress(), type, value);
}
@ -486,8 +487,7 @@ public class VariableValueHoverService extends AbstractConfigurableHover
}
public CompletableFuture<VariableValueTable> fillHighVariable(HighVariable hVar,
String name,
AddressSetView symbolStorage) {
String name, AddressSetView symbolStorage) {
Function function = hVar.getHighFunction().getFunction();
VariableStorage storage = VariableValueUtils.fabricateStorage(hVar);
if (storage.isUniqueStorage()) {
@ -496,7 +496,8 @@ public class VariableValueHoverService extends AbstractConfigurableHover
table.add(new ValueRow("(Unique)", TraceMemoryState.KNOWN));
return CompletableFuture.completedFuture(table);
}
return fillStorage(function, name, hVar.getDataType(), storage, symbolStorage);
return fillStorage(function, name, hVar.getDataType(), function.getProgram(), storage,
symbolStorage);
}
public CompletableFuture<VariableValueTable> fillHighVariable(HighVariable hVar,
@ -521,7 +522,7 @@ public class VariableValueHoverService extends AbstractConfigurableHover
public CompletableFuture<VariableValueTable> fillComposite(HighSymbol hSym,
HighVariable hVar, AddressSetView symbolStorage) {
return fillStorage(hVar.getHighFunction().getFunction(), hSym.getName(),
hSym.getDataType(), hSym.getStorage(), symbolStorage);
hSym.getDataType(), hSym.getProgram(), hSym.getStorage(), symbolStorage);
}
public CompletableFuture<VariableValueTable> fillToken(ClangToken token) {
@ -582,7 +583,7 @@ public class VariableValueHoverService extends AbstractConfigurableHover
throw new UnwindException("Cannot find frame for " + function);
}
return fillFrameStorage(frame, variable.getName(), variable.getDataType(),
variable.getVariableStorage());
variable.getProgram(), variable.getVariableStorage());
});
}
}

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java
View file

@ -159,8 +159,8 @@ public enum VariableValueUtils {
}
@Override
public Boolean evaluateStorage(VariableStorage storage) {
return evaluateStorage(storage, false);
public Boolean evaluateStorage(Program program, VariableStorage storage) {
return evaluateStorage(program, storage, false);
}
}
@ -347,13 +347,15 @@ public enum VariableValueUtils {
/**
* Check if evaluation of the given storage will require a frame
*
* @param program the program containing the variable storage
* @param storage the storage to evaluate
* @param symbolStorage the leaves of evaluation, usually storage used by symbols in scope. See
* {@link #collectSymbolStorage(ClangLine)}
* @return true if a frame is required, false otherwise
*/
public static boolean requiresFrame(VariableStorage storage, AddressSetView symbolStorage) {
return new RequiresFrameEvaluator(symbolStorage).evaluateStorage(storage);
public static boolean requiresFrame(Program program, VariableStorage storage,
AddressSetView symbolStorage) {
return new RequiresFrameEvaluator(symbolStorage).evaluateStorage(program, storage);
}
/**

18
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/AbstractUnwoundFrame.java
View file

@ -271,14 +271,14 @@ public abstract class AbstractUnwoundFrame<T> implements UnwoundFrame<T> {
protected abstract Address applyBase(long offset);
@Override
public T getValue(VariableStorage storage) {
public T getValue(Program program, VariableStorage storage) {
SavedRegisterMap registerMap = computeRegisterMap();
return new FrameVarnodeValueGetter<T>(state.getArithmetic()) {
@Override
protected T evaluateMemory(Address address, int size) {
return registerMap.getVar(state, address, size, Reason.INSPECT);
}
}.evaluateStorage(storage);
}.evaluateStorage(program, storage);
}
@Override
@ -289,14 +289,14 @@ public abstract class AbstractUnwoundFrame<T> implements UnwoundFrame<T> {
}
@Override
public T evaluate(VariableStorage storage, AddressSetView symbolStorage) {
public T evaluate(Program program, VariableStorage storage, AddressSetView symbolStorage) {
SavedRegisterMap registerMap = computeRegisterMap();
return new FrameVarnodeEvaluator<T>(state.getArithmetic(), symbolStorage) {
@Override
protected T evaluateMemory(Address address, int size) {
return registerMap.getVar(state, address, size, Reason.INSPECT);
}
}.evaluateStorage(storage);
}.evaluateStorage(program, storage);
}
@Override
@ -311,8 +311,8 @@ public abstract class AbstractUnwoundFrame<T> implements UnwoundFrame<T> {
}
@Override
public CompletableFuture<Void> setValue(StateEditor editor, VariableStorage storage,
BigInteger value) {
public CompletableFuture<Void> setValue(StateEditor editor, Program program,
VariableStorage storage, BigInteger value) {
SavedRegisterMap registerMap = computeRegisterMap();
ByteBuffer buf = ByteBuffer.wrap(Utils.bigIntegerToBytes(value, storage.size(), true));
AsyncFence fence = new AsyncFence();
@ -334,10 +334,10 @@ public abstract class AbstractUnwoundFrame<T> implements UnwoundFrame<T> {
}
@Override
public ByteBuffer evaluateStorage(VariableStorage storage) {
return evaluateStorage(storage, buf);
public ByteBuffer evaluateStorage(Program program, VariableStorage storage) {
return evaluateStorage(program, storage, buf);
}
}.evaluateStorage(storage);
}.evaluateStorage(program, storage);
return fence.ready();
}

14
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/UnwoundFrame.java
View file

@ -149,10 +149,11 @@ public interface UnwoundFrame<T> {
* <b>WARNING:</b> Never invoke this method from the Swing thread. The state could be associated
* with a live session, and this may block to retrieve live state.
*
* @param program the program containing the variable storage
* @param storage the storage
* @return the value
*/
T getValue(VariableStorage storage);
T getValue(Program program, VariableStorage storage);
/**
* Get the value of the variable from the frame
@ -166,7 +167,7 @@ public interface UnwoundFrame<T> {
* @return the value
*/
default T getValue(Variable variable) {
return getValue(variable.getVariableStorage());
return getValue(variable.getProgram(), variable.getVariableStorage());
}
/**
@ -198,11 +199,12 @@ public interface UnwoundFrame<T> {
* with a live session, and this may block to retrieve live state.
*
* @see VariableValueUtils#collectSymbolStorage(ClangLine)
* @param program the program containing the variable storage
* @param storage the storage to evaluate
* @param symbolStorage the terminal storage, usually that of symbols
* @return the value
*/
T evaluate(VariableStorage storage, AddressSetView symbolStorage);
T evaluate(Program program, VariableStorage storage, AddressSetView symbolStorage);
/**
* Evaluate the output for the given p-code op, ascending until symbol storage is reached
@ -227,11 +229,13 @@ public interface UnwoundFrame<T> {
* stack.
*
* @param editor the editor for setting values
* @param program the program containing the variable storage
* @param storage the storage to modify
* @param value the desired value
* @return a future which completes when the necessary commands have all completed
*/
CompletableFuture<Void> setValue(StateEditor editor, VariableStorage storage, BigInteger value);
CompletableFuture<Void> setValue(StateEditor editor, Program program, VariableStorage storage,
BigInteger value);
/**
* Set the value of the given variable
@ -244,7 +248,7 @@ public interface UnwoundFrame<T> {
*/
default CompletableFuture<Void> setValue(StateEditor editor, Variable variable,
BigInteger value) {
return setValue(editor, variable.getVariableStorage(), value);
return setValue(editor, variable.getProgram(), variable.getVariableStorage(), value);
}
/**