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

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2022-11-17-1'

Browse source
This commit is contained in:
Ryan Kurtz 2022-11-17 10:40:50 -05:00
commit 709adf291b
2 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProviderGuestTest.java
View file

@ -34,12 +34,9 @@ import ghidra.app.services.TraceRecorder;
import ghidra.dbg.target.TargetObject;
import ghidra.program.model.data.*;
import ghidra.program.model.lang.*;
import ghidra.program.model.util.CodeUnitInsertionException;
import ghidra.trace.model.Lifespan;
import ghidra.trace.model.Trace;
import ghidra.trace.model.guest.TraceGuestPlatform;
import ghidra.trace.model.guest.TracePlatform;
import ghidra.trace.model.listing.TraceCodeSpace;
import ghidra.trace.model.memory.TraceMemorySpace;
import ghidra.trace.model.thread.TraceThread;
import ghidra.util.database.UndoableTransaction;
@ -141,16 +138,6 @@ public class DebuggerRegistersProviderGuestTest extends DebuggerRegistersProvide
regVals.putBytes(toy, 0, r0, tb.buf(1, 2, 3, 4, 5, 6, 7, 8));
}
@Override
protected void addRegisterTypes(TraceThread thread, UndoableTransaction tid)
throws CodeUnitInsertionException {
TraceCodeSpace regCode =
tb.trace.getCodeManager().getCodeRegisterSpace(thread, true);
regCode.definedData().create(toy, Lifespan.nowOn(0), pc, PointerDataType.dataType);
// TODO: Pointer needs to be to ram, not register space
regCode.definedData().create(toy, Lifespan.nowOn(0), r0, r0Struct);
}
@Override
public void testDefaultSelection() throws Exception {
traceManager.openTrace(tb.trace);

4
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProviderTest.java
View file

@ -143,8 +143,8 @@ public class DebuggerRegistersProviderTest extends AbstractGhidraHeadedDebuggerG
DataTypeManager dtm = tb.trace.getDataTypeManager();
AddressSpace space = tb.host.getAddressFactory().getDefaultAddressSpace();
PointerTypedef ramPtr = new PointerTypedef(null, VoidDataType.dataType, -1, dtm, space);
regCode.definedData().create(Lifespan.nowOn(0), pc, ramPtr);
regCode.definedData().create(Lifespan.nowOn(0), r0, r0Struct);
regCode.definedData().create(getPlatform(), Lifespan.nowOn(0), pc, ramPtr);
regCode.definedData().create(getPlatform(), Lifespan.nowOn(0), r0, r0Struct);
}
protected void addRegisterTypes(TraceThread thread) throws CodeUnitInsertionException {