mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fix several tests from GP-5523.

Browse Source
This commit is contained in:
Dan
2025-04-18 13:12:13 +00:00
parent 712303165a
commit cdc32441b2
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TracePathLastLifespanColumn.java
View File

@@ -78,7 +78,7 @@ public class TracePathLastLifespanColumn
public SpanAndRadix getValue(PathRow rowObject, Settings settings, Trace data, public SpanAndRadix getValue(PathRow rowObject, Settings settings, Trace data,
ServiceProvider serviceProvider) throws IllegalArgumentException { ServiceProvider serviceProvider) throws IllegalArgumentException {
TraceObjectValue lastEntry = rowObject.getPath().getLastEntry(); TraceObjectValue lastEntry = rowObject.getPath().getLastEntry();
TimeRadix radix = data.getTimeManager().getTimeRadix(); TimeRadix radix = data == null ? TimeRadix.DEFAULT : data.getTimeManager().getTimeRadix();
if (lastEntry == null) { if (lastEntry == null) {
return new SpanAndRadix(Lifespan.ALL, radix); return new SpanAndRadix(Lifespan.ALL, radix);
} }

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TraceValueLifeColumn.java
View File

@@ -50,6 +50,7 @@ public class TraceValueLifeColumn
@Override @Override
public SetAndRadix getValue(ValueRow rowObject, Settings settings, Trace data, public SetAndRadix getValue(ValueRow rowObject, Settings settings, Trace data,
ServiceProvider serviceProvider) throws IllegalArgumentException { ServiceProvider serviceProvider) throws IllegalArgumentException {
return new SetAndRadix(rowObject.getLife(), data.getTimeManager().getTimeRadix()); return new SetAndRadix(rowObject.getLife(),
data == null ? TimeRadix.DEFAULT : data.getTimeManager().getTimeRadix());
} }
} }

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.java
View File

@@ -733,7 +733,8 @@ public class DebuggerPcodeStepperProvider extends ComponentProviderAdapter {
} }
protected void updateSubTitle() { protected void updateSubTitle() {
TimeRadix radix = current.getTrace().getTimeManager().getTimeRadix(); TimeRadix radix = current.getTrace() == null ? TimeRadix.DEFAULT
: current.getTrace().getTimeManager().getTimeRadix();
setSubTitle(current.getTime().toString(radix)); setSubTitle(current.getTime().toString(radix));
} }

8
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeProviderTest.java
View File

@@ -34,6 +34,7 @@ import ghidra.trace.database.time.DBTraceTimeManager;
import ghidra.trace.model.thread.TraceThread; import ghidra.trace.model.thread.TraceThread;
import ghidra.trace.model.time.TraceSnapshot; import ghidra.trace.model.time.TraceSnapshot;
import ghidra.trace.model.time.schedule.TraceSchedule; import ghidra.trace.model.time.schedule.TraceSchedule;
import ghidra.util.DateUtils;
public class DebuggerTimeProviderTest extends AbstractGhidraHeadedDebuggerTest { public class DebuggerTimeProviderTest extends AbstractGhidraHeadedDebuggerTest {
@@ -80,13 +81,14 @@ public class DebuggerTimeProviderTest extends AbstractGhidraHeadedDebuggerTest {
SnapshotRow firstRow = snapsDisplayed.get(0); SnapshotRow firstRow = snapsDisplayed.get(0);
assertEquals(0, firstRow.getSnap()); assertEquals(0, firstRow.getSnap());
assertEquals("First", firstRow.getDescription()); assertEquals("First", firstRow.getDescription());
assertEquals("0", firstRow.getSchedule()); // Snap 0 has "0" schedule assertEquals("0", firstRow.getSchedule().toString()); // Snap 0 has "0" schedule
assertEquals("Jan 01, 2020 09:00 AM", firstRow.getTimeStamp()); assertEquals("Jan 01, 2020 09:00 AM",
DateUtils.formatDateTimestamp(firstRow.getTimeStamp()));
SnapshotRow secondRow = snapsDisplayed.get(1); SnapshotRow secondRow = snapsDisplayed.get(1);
assertEquals(10, secondRow.getSnap()); assertEquals(10, secondRow.getSnap());
assertEquals("Snap 10", secondRow.getDescription()); assertEquals("Snap 10", secondRow.getDescription());
assertEquals("0:5;t1-5", secondRow.getSchedule()); assertEquals("0:5;t1-5", secondRow.getSchedule().toString());
// Timestamp is left unchecked, since default is current time // Timestamp is left unchecked, since default is current time
} }