Ghidra is a software reverse engineering (SRE) framework
GP-7334: Bento/TimeRadix -> Radix
d-millar2372c9670d2f
diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.javaindex 08b6450da0..5e10956547 100644--- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java+++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java@@ -41,9 +41,7 @@ import ghidra.trace.model.target.path.KeyPath;import ghidra.trace.model.thread.TraceThread;import ghidra.trace.model.time.TraceSnapshot;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;-import ghidra.util.Msg;-import ghidra.util.NotOwnerException;+import ghidra.util.*;import ghidra.util.exception.NotFoundException;public class DebuggerCoordinates {@@ -722,7 +720,7 @@ public class DebuggerCoordinates {coordState.putLong(KEY_THREAD_KEY, thread.getKey());}if (time != null) {- coordState.putString(KEY_TIME, time.toString(TimeRadix.DEC));+ coordState.putString(KEY_TIME, time.toString(Radix.DEC));}if (frame != null) {coordState.putInt(KEY_FRAME, frame);@@ -795,7 +793,7 @@ public class DebuggerCoordinates {String timeSpec = coordState.getString(KEY_TIME, null);TraceSchedule time;try {- time = TraceSchedule.parse(timeSpec, TimeRadix.DEC);+ time = TraceSchedule.parse(timeSpec, Radix.DEC);}catch (Exception e) {Msg.error(DebuggerCoordinates.class,diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.javaindex 696b92eff2..a6e4ce57bc 100644--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java@@ -64,7 +64,6 @@ import ghidra.trace.model.target.schema.TraceObjectSchema.SchemaName;import ghidra.trace.model.target.schema.XmlSchemaContext;import ghidra.trace.model.time.TraceSnapshot;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.util.*;import ghidra.util.exception.CancelledException;import ghidra.util.exception.DuplicateFileException;@@ -1187,7 +1186,7 @@ public class TraceRmiHandler extends AbstractTraceRmiConnection {case TIME_NOT_SET -> throw new TraceRmiError("snap or time required");case SNAP -> open.createSnapshot(req.getSnap().getSnap());case SCHEDULE -> open.createSnapshot(- TraceSchedule.parse(req.getSchedule().getSchedule(), TimeRadix.DEC));+ TraceSchedule.parse(req.getSchedule().getSchedule(), Radix.DEC));};snapshot.setDescription(req.getDescription());if (!"".equals(req.getDatetime())) {diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.javaindex 97df53479b..0ce3906707 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/DebuggerMemviewTraceListener.java@@ -17,7 +17,8 @@ package ghidra.app.plugin.core.debug.gui.memview;import java.util.*;-import ghidra.app.plugin.core.bento.*;+import ghidra.app.plugin.core.bento.BentoBox;+import ghidra.app.plugin.core.bento.BentoProvider;import ghidra.async.AsyncDebouncer;import ghidra.async.AsyncTimer;import ghidra.debug.api.tracemgr.DebuggerCoordinates;@@ -37,6 +38,7 @@ import ghidra.trace.model.thread.TraceThread;import ghidra.trace.model.thread.TraceThreadManager;import ghidra.trace.model.time.TraceTimeManager;import ghidra.trace.util.TraceEvents;+import ghidra.util.Radix;import ghidra.util.Swing;public class DebuggerMemviewTraceListener extends TraceDomainObjectListener {@@ -195,7 +197,7 @@ public class DebuggerMemviewTraceListener extends TraceDomainObjectListener {private void valueCreated(TraceObjectValue value) {if (value.getCanonicalPath().equals(KeyPath.of(TraceTimeManager.KEY_TIME_RADIX))) {provider.setRadix(0,- BentoRadix.fromStr(currentTrace.getTimeManager().getTimeRadix().name()));+ Radix.fromStr(currentTrace.getTimeManager().getTimeRadix().name()));provider.fireTableDataChanged();}}@@ -203,7 +205,7 @@ public class DebuggerMemviewTraceListener extends TraceDomainObjectListener {private void valueDeleted(TraceObjectValue value) {if (value.getCanonicalPath().equals(KeyPath.of(TraceTimeManager.KEY_TIME_RADIX))) {provider.setRadix(0,- BentoRadix.fromStr(currentTrace.getTimeManager().getTimeRadix().name()));+ Radix.fromStr(currentTrace.getTimeManager().getTimeRadix().name()));provider.fireTableDataChanged();}}diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TracePathLastLifespanColumn.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TracePathLastLifespanColumn.javaindex 955cc25983..63680d88f8 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TracePathLastLifespanColumn.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TracePathLastLifespanColumn.java@@ -26,14 +26,14 @@ import ghidra.framework.plugintool.ServiceProvider;import ghidra.trace.model.Lifespan;import ghidra.trace.model.Trace;import ghidra.trace.model.target.TraceObjectValue;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.table.column.AbstractGColumnRenderer;import ghidra.util.table.column.GColumnRenderer;public class TracePathLastLifespanColumnextends AbstractDynamicTableColumn<PathRow, SpanAndRadix, Trace> {- record SpanAndRadix(Lifespan span, TimeRadix radix) implements Comparable<SpanAndRadix> {+ record SpanAndRadix(Lifespan span, Radix radix) implements Comparable<SpanAndRadix> {@Overridepublic final String toString() {return span.toString(radix::format);@@ -78,7 +78,7 @@ public class TracePathLastLifespanColumnpublic SpanAndRadix getValue(PathRow rowObject, Settings settings, Trace data,ServiceProvider serviceProvider) throws IllegalArgumentException {TraceObjectValue lastEntry = rowObject.getPath().getLastEntry();- TimeRadix radix = data == null ? TimeRadix.DEFAULT : data.getTimeManager().getTimeRadix();+ Radix radix = data == null ? Radix.DEFAULT : data.getTimeManager().getTimeRadix();if (lastEntry == null) {return new SpanAndRadix(Lifespan.ALL, radix);}diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TraceValueLifeColumn.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TraceValueLifeColumn.javaindex 6e3536871b..ae831da891 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TraceValueLifeColumn.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/columns/TraceValueLifeColumn.java@@ -22,13 +22,13 @@ import ghidra.docking.settings.Settings;import ghidra.framework.plugintool.ServiceProvider;import ghidra.trace.model.Lifespan.LifeSet;import ghidra.trace.model.Trace;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.table.column.GColumnRenderer;public class TraceValueLifeColumnextends AbstractDynamicTableColumn<ValueRow, SetAndRadix, Trace> {- record SetAndRadix(LifeSet set, TimeRadix radix) {+ record SetAndRadix(LifeSet set, Radix radix) {@Overridepublic final String toString() {return set.toString(radix::format);@@ -51,6 +51,6 @@ public class TraceValueLifeColumnpublic SetAndRadix getValue(ValueRow rowObject, Settings settings, Trace data,ServiceProvider serviceProvider) throws IllegalArgumentException {return new SetAndRadix(rowObject.getLife(),- data == null ? TimeRadix.DEFAULT : data.getTimeManager().getTimeRadix());+ data == null ? Radix.DEFAULT : data.getTimeManager().getTimeRadix());}}diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.javaindex 1eec5e5128..6c2865c504 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.java@@ -61,7 +61,6 @@ import ghidra.trace.model.target.TraceObjectValue;import ghidra.trace.model.target.path.KeyPath;import ghidra.trace.model.time.TraceTimeManager;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.trace.util.TraceEvents;import ghidra.util.*;import ghidra.util.table.GhidraTable;@@ -820,7 +819,7 @@ public class DebuggerPcodeStepperProvider extends ComponentProviderAdapter {}protected void updateSubTitle() {- TimeRadix radix = current.getTrace() == null ? TimeRadix.DEFAULT+ Radix radix = current.getTrace() == null ? Radix.DEFAULT: current.getTrace().getTimeManager().getTimeRadix();setSubTitle(current.getTime().toString(radix));}diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerSnapshotTablePanel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerSnapshotTablePanel.javaindex ba64e2f977..33e4a5b86c 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerSnapshotTablePanel.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerSnapshotTablePanel.java@@ -33,8 +33,8 @@ import ghidra.program.model.address.Address;import ghidra.trace.model.Trace;import ghidra.trace.model.time.TraceSnapshot;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.util.DateUtils;+import ghidra.util.Radix;import ghidra.util.table.GhidraTableFilterPanel;import ghidra.util.table.column.AbstractGColumnRenderer;import ghidra.util.table.column.GColumnRenderer;@@ -180,9 +180,9 @@ public class DebuggerSnapshotTablePanel extends JPanel {Font fixedWidthBoldFont;Font fixedWidthItalicFont;- protected TimeRadix getTimeRadix() {+ protected Radix getTimeRadix() {Trace trace = model == null ? null : model.getTrace();- return trace == null ? TimeRadix.DEFAULT : trace.getTimeManager().getTimeRadix();+ return trace == null ? Radix.DEFAULT : trace.getTimeManager().getTimeRadix();}@Overridediff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeProvider.javaindex 4535608fdc..5db04b184d 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeProvider.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeProvider.java@@ -45,9 +45,9 @@ import ghidra.trace.model.target.path.KeyPath;import ghidra.trace.model.time.TraceSnapshot;import ghidra.trace.model.time.TraceTimeManager;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.trace.util.TraceEvents;import ghidra.util.HelpLocation;+import ghidra.util.Radix;public class DebuggerTimeProvider extends ComponentProviderAdapter {private static final AutoConfigState.ClassHandler<DebuggerTimeProvider> CONFIG_STATE_HANDLER =@@ -254,17 +254,17 @@ public class DebuggerTimeProvider extends ComponentProviderAdapter {actionSetRadixDec = SetTimeRadixAction.builder("Decimal", plugin).enabledWhen(c -> current.getTrace() != null &¤t.getTrace().getObjectManager().getRootObject() != null)- .onAction(c -> activatedSetRadix(TimeRadix.DEC))+ .onAction(c -> activatedSetRadix(Radix.DEC)).buildAndInstall(tool);actionSetRadixHexUpper = SetTimeRadixAction.builder("Upper Hex", plugin).enabledWhen(c -> current.getTrace() != null &¤t.getTrace().getObjectManager().getRootObject() != null)- .onAction(c -> activatedSetRadix(TimeRadix.HEX_UPPER))+ .onAction(c -> activatedSetRadix(Radix.HEX_UPPER)).buildAndInstall(tool);actionSetRadixHexLower = SetTimeRadixAction.builder("Lower Hex", plugin).enabledWhen(c -> current.getTrace() != null &¤t.getTrace().getObjectManager().getRootObject() != null)- .onAction(c -> activatedSetRadix(TimeRadix.HEX_LOWER))+ .onAction(c -> activatedSetRadix(Radix.HEX_LOWER)).buildAndInstall(tool);}@@ -282,7 +282,7 @@ public class DebuggerTimeProvider extends ComponentProviderAdapter {mainPanel.setHideScratchSnapshots(hideScratch);}- private void activatedSetRadix(TimeRadix radix) {+ private void activatedSetRadix(Radix radix) {try (Transaction tx = current.getTrace().openTransaction("Set Time Radix")) {current.getTrace().getTimeManager().setTimeRadix(radix);}@@ -313,11 +313,11 @@ public class DebuggerTimeProvider extends ComponentProviderAdapter {}private void refreshRadixSelection() {- TimeRadix radix = current.getTrace() == null ? TimeRadix.DEFAULT+ Radix radix = current.getTrace() == null ? Radix.DEFAULT: current.getTrace().getTimeManager().getTimeRadix();- actionSetRadixHexLower.setSelected(radix == TimeRadix.HEX_LOWER);- actionSetRadixHexUpper.setSelected(radix == TimeRadix.HEX_UPPER);- actionSetRadixDec.setSelected(radix == TimeRadix.DEC);+ actionSetRadixHexLower.setSelected(radix == Radix.HEX_LOWER);+ actionSetRadixHexUpper.setSelected(radix == Radix.HEX_UPPER);+ actionSetRadixDec.setSelected(radix == Radix.DEC);}public void writeConfigState(SaveState saveState) {diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeSelectionDialog.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeSelectionDialog.javaindex c9a3dc0bfb..0394640b4c 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeSelectionDialog.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/time/DebuggerTimeSelectionDialog.java@@ -29,9 +29,7 @@ import ghidra.app.plugin.core.debug.gui.DebuggerResources;import ghidra.framework.plugintool.PluginTool;import ghidra.trace.model.Trace;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;-import ghidra.util.MessageType;-import ghidra.util.Msg;+import ghidra.util.*;public class DebuggerTimeSelectionDialog extends DialogComponentProvider {@@ -39,7 +37,7 @@ public class DebuggerTimeSelectionDialog extends DialogComponentProvider {DebuggerSnapshotTablePanel snapshotPanel;JTextField scheduleText;- TimeRadix radix = TimeRadix.DEFAULT;+ Radix radix = Radix.DEFAULT;TraceSchedule schedule;JButton tickStep;@@ -189,7 +187,7 @@ public class DebuggerTimeSelectionDialog extends DialogComponentProvider {public void close() {super.close();snapshotPanel.setTrace(null);- radix = TimeRadix.DEFAULT;+ radix = Radix.DEFAULT;snapshotPanel.setSelectedSnapshot(null);}diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/timeoverview/timetype/TimeTypeOverviewColorService.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/timeoverview/timetype/TimeTypeOverviewColorService.javaindex 877a8be809..e9ecca2ac0 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/timeoverview/timetype/TimeTypeOverviewColorService.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/timeoverview/timetype/TimeTypeOverviewColorService.java@@ -31,7 +31,6 @@ import ghidra.framework.options.ToolOptions;import ghidra.framework.plugintool.PluginTool;import ghidra.trace.model.Lifespan;import ghidra.trace.model.Trace;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.util.*;public class TimeTypeOverviewColorService implements TimeOverviewColorService {@@ -89,7 +88,7 @@ public class TimeTypeOverviewColorService implements TimeOverviewColorService {if (snap == null) {return "";}- TimeRadix radix = trace == null ? TimeRadix.DEFAULT : trace.getTimeManager().getTimeRadix();+ Radix radix = trace == null ? Radix.DEFAULT : trace.getTimeManager().getTimeRadix();Set<Pair<TimeType, String>> types = plugin.getTypes(snap);StringBuffer buffer = new StringBuffer();buffer.append("<b>");diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/trace/DebuggerTraceTabPanel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/trace/DebuggerTraceTabPanel.javaindex 97a78b183c..ba4f9af9ee 100644--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/trace/DebuggerTraceTabPanel.java+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/trace/DebuggerTraceTabPanel.java@@ -35,7 +35,7 @@ import ghidra.framework.plugintool.*;import ghidra.framework.plugintool.annotation.AutoServiceConsumed;import ghidra.framework.plugintool.util.PluginEventListener;import ghidra.trace.model.Trace;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.Swing;import utilities.util.SuppressableCallback;import utilities.util.SuppressableCallback.Suppression;@@ -128,7 +128,7 @@ public class DebuggerTraceTabPanel extends GTabPanel<Trace>// NOTE: Could use view's snap and time table's schedule, but not worth it.return name + " (?)";}- TimeRadix radix = trace.getTimeManager().getTimeRadix();+ Radix radix = trace.getTimeManager().getTimeRadix();String schedule = current.getTime().toString(radix);if (schedule.length() > 15) {schedule = "..." + schedule.substring(schedule.length() - 12);diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.javaindex 564acfdddd..9b8bcd379f 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java@@ -27,9 +27,7 @@ import ghidra.trace.model.target.iface.TraceEventScope;import ghidra.trace.model.thread.TraceThread;import ghidra.trace.model.time.TraceSnapshot;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;-import ghidra.util.LockHold;-import ghidra.util.Msg;+import ghidra.util.*;import ghidra.util.database.*;import ghidra.util.database.annot.*;@@ -88,7 +86,7 @@ public class DBTraceSnapshot extends DBAnnotatedObject implements TraceSnapshoteventThread = manager.threadManager.getThread(threadKey);if (!"".equals(scheduleStr)) {try {- schedule = TraceSchedule.parse(scheduleStr, TimeRadix.DEC);+ schedule = TraceSchedule.parse(scheduleStr, Radix.DEC);}catch (IllegalArgumentException e) {Msg.error(this, "Could not parse schedule: " + schedule, e);@@ -226,7 +224,7 @@ public class DBTraceSnapshot extends DBAnnotatedObject implements TraceSnapshotpublic void setSchedule(TraceSchedule schedule) {try (LockHold hold = LockHold.lock(manager.lock.writeLock())) {this.schedule = schedule;- this.scheduleStr = schedule == null ? "" : schedule.toString(TimeRadix.DEC);+ this.scheduleStr = schedule == null ? "" : schedule.toString(Radix.DEC);this.isFork = computeIsFork();update(SCHEDULE_COLUMN);diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceTimeManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceTimeManager.javaindex 4cf65d1f6b..8105ba82ef 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceTimeManager.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceTimeManager.java@@ -32,10 +32,10 @@ import ghidra.trace.model.target.TraceObjectValue;import ghidra.trace.model.time.TraceSnapshot;import ghidra.trace.model.time.TraceTimeManager;import ghidra.trace.model.time.schedule.*;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.trace.util.TraceChangeRecord;import ghidra.trace.util.TraceEvents;import ghidra.util.LockHold;+import ghidra.util.Radix;import ghidra.util.database.*;import ghidra.util.database.annot.*;import ghidra.util.exception.VersionException;@@ -327,7 +327,7 @@ public class DBTraceTimeManager implements TraceTimeManager, DBTraceManager {}@Override- public void setTimeRadix(TimeRadix radix) {+ public void setTimeRadix(Radix radix) {DBTraceObject root = trace.getObjectManager().getRootObject();if (root == null) {throw new IllegalStateException(@@ -341,18 +341,18 @@ public class DBTraceTimeManager implements TraceTimeManager, DBTraceManager {}@Override- public TimeRadix getTimeRadix() {+ public Radix getTimeRadix() {DBTraceObject root = trace.getObjectManager().getRootObject();if (root == null) {- return TimeRadix.DEFAULT;+ return Radix.DEFAULT;}TraceObjectValue attribute = root.getAttribute(0, KEY_TIME_RADIX);if (attribute == null) {- return TimeRadix.DEFAULT;+ return Radix.DEFAULT;}return switch (attribute.getValue()) {- case String s -> TimeRadix.fromStr(s);- default -> TimeRadix.DEFAULT;+ case String s -> Radix.fromStr(s);+ default -> Radix.DEFAULT;};}}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/TraceTimeManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/TraceTimeManager.javaindex e291f8c95a..562938f012 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/TraceTimeManager.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/TraceTimeManager.java@@ -19,7 +19,7 @@ import java.util.Collection;import ghidra.trace.model.Trace;import ghidra.trace.model.time.schedule.TraceSchedule;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;public interface TraceTimeManager {/** The attribute key for controlling the time radix */@@ -153,7 +153,7 @@ public interface TraceTimeManager {** @param radix the radix*/- void setTimeRadix(TimeRadix radix);+ void setTimeRadix(Radix radix);/*** Get the radix for displaying and parsing time (snapshots and step counts)@@ -161,5 +161,5 @@ public interface TraceTimeManager {* @see #setTimeRadix(TimeRadix)* @return radix the radix*/- TimeRadix getTimeRadix();+ Radix getTimeRadix();}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/AbstractStep.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/AbstractStep.javaindex 1cdb06b59a..49428cde47 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/AbstractStep.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/AbstractStep.java@@ -18,7 +18,7 @@ package ghidra.trace.model.time.schedule;import java.util.List;import ghidra.program.model.lang.Language;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;public abstract class AbstractStep implements Step {protected final long threadKey;@@ -38,15 +38,15 @@ public abstract class AbstractStep implements Step {* @param radix the radix* @return the string*/- protected abstract String toStringStepPart(TimeRadix radix);+ protected abstract String toStringStepPart(Radix radix);@Overridepublic String toString() {- return toString(TimeRadix.DEFAULT);+ return toString(Radix.DEFAULT);}@Override- public String toString(TimeRadix radix) {+ public String toString(Radix radix) {if (threadKey == -1) {return toStringStepPart(radix);}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/PatchStep.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/PatchStep.javaindex 38a9a0b8cb..6701b8c87d 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/PatchStep.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/PatchStep.java@@ -34,7 +34,7 @@ import ghidra.program.model.lang.Language;import ghidra.program.model.lang.Register;import ghidra.program.model.pcode.PcodeOp;import ghidra.program.model.pcode.Varnode;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -234,11 +234,11 @@ public class PatchStep implements Step {@Overridepublic String toString() {- return toString(TimeRadix.DEFAULT);+ return toString(Radix.DEFAULT);}@Override- public String toString(TimeRadix radix) {+ public String toString(Radix radix) {if (threadKey == -1) {return "{" + sleigh + "}";}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Sequence.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Sequence.javaindex ae75c2680e..4be7b74f4f 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Sequence.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Sequence.java@@ -24,7 +24,7 @@ import ghidra.program.model.lang.Language;import ghidra.trace.model.Trace;import ghidra.trace.model.thread.TraceThread;import ghidra.trace.model.thread.TraceThreadManager;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -50,7 +50,7 @@ public class Sequence implements Comparable<Sequence> {* @return the parsed sequence* @throws IllegalArgumentException if the specification is of the wrong form*/- public static Sequence parse(String seqSpec, TimeRadix radix) {+ public static Sequence parse(String seqSpec, Radix radix) {Sequence result = new Sequence();for (String stepSpec : seqSpec.split(SEP)) {Step step = Step.parse(stepSpec, radix);@@ -109,10 +109,10 @@ public class Sequence implements Comparable<Sequence> {@Overridepublic String toString() {- return toString(TimeRadix.DEFAULT);+ return toString(Radix.DEFAULT);}- public String toString(TimeRadix radix) {+ public String toString(Radix radix) {return steps.stream().map(s -> s.toString(radix)).collect(Collectors.joining(SEP));}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.javaindex 5b89b516ac..c3c4c04900 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/SkipStep.java@@ -16,13 +16,13 @@package ghidra.trace.model.time.schedule;import ghidra.pcode.emu.PcodeThread;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;public class SkipStep extends AbstractStep {- public static SkipStep parse(long threadKey, String stepSpec, TimeRadix radix) {+ public static SkipStep parse(long threadKey, String stepSpec, Radix radix) {if (!stepSpec.startsWith("s")) {throw new IllegalArgumentException("Cannot parse skip step: '" + stepSpec + "'");}@@ -55,7 +55,7 @@ public class SkipStep extends AbstractStep {}@Override- protected String toStringStepPart(TimeRadix radix) {+ protected String toStringStepPart(Radix radix) {return "s" + radix.format(tickCount);}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Step.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Step.javaindex 08067cf1a3..b3256f2ec4 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Step.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/Step.java@@ -22,7 +22,7 @@ import ghidra.pcode.emu.PcodeThread;import ghidra.program.model.lang.Language;import ghidra.trace.model.thread.TraceThread;import ghidra.trace.model.thread.TraceThreadManager;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -45,7 +45,7 @@ public interface Step extends Comparable<Step> {* @return the parsed step* @throws IllegalArgumentException if the specification is of the wrong form*/- static Step parse(String stepSpec, TimeRadix radix) {+ static Step parse(String stepSpec, Radix radix) {if ("".equals(stepSpec)) {return nop();}@@ -76,7 +76,7 @@ public interface Step extends Comparable<Step> {* @return the parsed step* @throws IllegalArgumentException if the specification is of the wrong form*/- static Step parse(long threadKey, String stepSpec, TimeRadix radix) {+ static Step parse(long threadKey, String stepSpec, Radix radix) {if (stepSpec.startsWith("s")) {return SkipStep.parse(threadKey, stepSpec, radix);}@@ -90,7 +90,7 @@ public interface Step extends Comparable<Step> {return new TickStep(-1, 0);}- String toString(TimeRadix radix);+ String toString(Radix radix);StepType getType();diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.javaindex bd5333e638..91bf581f78 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TickStep.java@@ -16,7 +16,7 @@package ghidra.trace.model.time.schedule;import ghidra.pcode.emu.PcodeThread;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;+import ghidra.util.Radix;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -25,7 +25,7 @@ import ghidra.util.task.TaskMonitor;*/public class TickStep extends AbstractStep {- public static TickStep parse(long threadKey, String stepSpec, TimeRadix radix) {+ public static TickStep parse(long threadKey, String stepSpec, Radix radix) {try {return new TickStep(threadKey, radix.decode(stepSpec));}@@ -55,7 +55,7 @@ public class TickStep extends AbstractStep {}@Override- protected String toStringStepPart(TimeRadix radix) {+ protected String toStringStepPart(Radix radix) {return radix.format(tickCount);}diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TraceSchedule.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TraceSchedule.javaindex 682638a268..51470b232c 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TraceSchedule.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/time/schedule/TraceSchedule.java@@ -23,6 +23,8 @@ import ghidra.program.model.lang.Language;import ghidra.trace.model.Trace;import ghidra.trace.model.thread.TraceThread;import ghidra.trace.model.time.TraceSnapshot;+import ghidra.trace.model.time.schedule.TraceSchedule.Source;+import ghidra.util.Radix;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;@@ -35,62 +37,6 @@ public class TraceSchedule implements Comparable<TraceSchedule> {*/public static final TraceSchedule ZERO = TraceSchedule.snap(0);- /**- * Format for rendering and parsing snaps and step counts- */- public enum TimeRadix {- /** Use decimal (default) */- DEC("dec", 10, "%d"),- /** Use upper-case hexadecimal */- HEX_UPPER("HEX", 16, "%X"),- /** Use lower-case hexadecimal */- HEX_LOWER("hex", 16, "%x");-- /** The default radix (decimal) */- public static final TimeRadix DEFAULT = DEC;-- /**- * Get the radix specified by the given string- *- * @param s the name of the specified radix- * @return the radix- */- public static TimeRadix fromStr(String s) {- return switch (s) {- case "dec" -> DEC;- case "HEX" -> HEX_UPPER;- case "hex" -> HEX_LOWER;- default -> DEFAULT;- };- }-- public final String name;- public final int n;- public final String fmt;-- private TimeRadix(String name, int n, String fmt) {- this.name = name;- this.n = n;- this.fmt = fmt;- }-- public String format(long time) {- return fmt.formatted(time);- }-- public long decode(String nm) {- if (nm.startsWith("0x") || nm.startsWith("0X") ||- nm.startsWith("-0x") || nm.startsWith("-0X")) {- return Long.parseLong(nm, 16);- }- if (nm.startsWith("0n") || nm.startsWith("0N") ||- nm.startsWith("-0n") || nm.startsWith("-0N")) {- return Long.parseLong(nm, 10);- }- return Long.parseLong(nm, n);- }- }-/*** Specifies forms of a stepping schedule.*@@ -260,7 +206,7 @@ public class TraceSchedule implements Comparable<TraceSchedule> {* @param radix the radix* @return the parsed schedule*/- public static TraceSchedule parse(String spec, Source source, TimeRadix radix) {+ public static TraceSchedule parse(String spec, Source source, Radix radix) {String[] parts = spec.split(":", 2);if (parts.length > 2) {throw new AssertionError();@@ -311,7 +257,7 @@ public class TraceSchedule implements Comparable<TraceSchedule> {* @param radix the radix* @return the parsed schedule*/- public static TraceSchedule parse(String spec, TimeRadix radix) {+ public static TraceSchedule parse(String spec, Radix radix) {return parse(spec, Source.INPUT, radix);}@@ -322,7 +268,7 @@ public class TraceSchedule implements Comparable<TraceSchedule> {* @return the parse sequence*/public static TraceSchedule parse(String spec) {- return parse(spec, TimeRadix.DEFAULT);+ return parse(spec, Radix.DEFAULT);}public enum Source {@@ -386,10 +332,10 @@ public class TraceSchedule implements Comparable<TraceSchedule> {@Overridepublic String toString() {- return toString(TimeRadix.DEFAULT);+ return toString(Radix.DEFAULT);}- public String toString(TimeRadix radix) {+ public String toString(Radix radix) {if (pSteps.isNop()) {if (steps.isNop()) {return radix.format(snap);diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TraceScheduleTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TraceScheduleTest.javaindex 5f0411932e..73937a29b4 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TraceScheduleTest.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/model/time/schedule/TraceScheduleTest.java@@ -30,8 +30,8 @@ import ghidra.test.AbstractGhidraHeadlessIntegrationTest;import ghidra.test.ToyProgramBuilder;import ghidra.trace.database.ToyDBTraceBuilder;import ghidra.trace.model.thread.TraceThread;-import ghidra.trace.model.time.schedule.TraceSchedule.TimeRadix;import ghidra.util.Msg;+import ghidra.util.Radix;import ghidra.util.task.TaskMonitor;public class TraceScheduleTest extends AbstractGhidraHeadlessIntegrationTest {@@ -163,7 +163,7 @@ public class TraceScheduleTest extends AbstractGhidraHeadlessIntegrationTest {@Testpublic void testRewind() {- Sequence seq = Sequence.parse("10;t1-20;t2-30", TimeRadix.DEC);+ Sequence seq = Sequence.parse("10;t1-20;t2-30", Radix.DEC);assertEquals(0, seq.rewind(5));assertEquals("10;t1-20;t2-25", seq.toString());@@ -183,7 +183,7 @@ public class TraceScheduleTest extends AbstractGhidraHeadlessIntegrationTest {@Test(expected = IllegalArgumentException.class)public void testRewindNegativeErr() {- Sequence seq = Sequence.parse("10;t1-20;t2-30", TimeRadix.DEC);+ Sequence seq = Sequence.parse("10;t1-20;t2-30", Radix.DEC);seq.rewind(-1);}@@ -253,8 +253,8 @@ public class TraceScheduleTest extends AbstractGhidraHeadlessIntegrationTest {}public String strRelativize(String fromSpec, String toSpec) {- Sequence seq = Sequence.parse(toSpec, TimeRadix.DEC)- .relativize(Sequence.parse(fromSpec, TimeRadix.DEC));+ Sequence seq = Sequence.parse(toSpec, Radix.DEC)+ .relativize(Sequence.parse(fromSpec, Radix.DEC));return seq == null ? null : seq.toString();}@@ -534,10 +534,10 @@ public class TraceScheduleTest extends AbstractGhidraHeadlessIntegrationTest {@Testpublic void testTimeRadix() throws Exception {- TraceSchedule schedule = TraceSchedule.parse("A:t10-B.C", TimeRadix.HEX_UPPER);+ TraceSchedule schedule = TraceSchedule.parse("A:t10-B.C", Radix.HEX_UPPER);- assertEquals("10:t10-11.12", schedule.toString(TimeRadix.DEC));- assertEquals("A:t10-B.C", schedule.toString(TimeRadix.HEX_UPPER));- assertEquals("a:t10-b.c", schedule.toString(TimeRadix.HEX_LOWER));+ assertEquals("10:t10-11.12", schedule.toString(Radix.DEC));+ assertEquals("A:t10-B.C", schedule.toString(Radix.HEX_UPPER));+ assertEquals("a:t10-b.c", schedule.toString(Radix.HEX_LOWER));}}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/AddressRangeBoundedObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/AddressRangeBoundedObject.javaindex 5ae9a059dd..185f8da6bb 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/AddressRangeBoundedObject.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/AddressRangeBoundedObject.java@@ -16,6 +16,7 @@package ghidra.app.plugin.core.bento;import ghidra.program.model.address.AddressRange;+import ghidra.util.Radix;public class AddressRangeBoundedObject extends BoundedObject {@@ -27,8 +28,8 @@ public class AddressRangeBoundedObject extends BoundedObject {}@Override- public BentoRadix getDefaultRadix() {- return BentoRadix.HEX_LOWER;+ public Radix getDefaultRadix() {+ return Radix.HEX_LOWER;}@Overridediff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoMapModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoMapModel.javaindex 379596cfb7..526d74538a 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoMapModel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoMapModel.java@@ -18,6 +18,7 @@ package ghidra.app.plugin.core.bento;import java.util.*;import docking.widgets.table.AbstractSortedTableModel;+import ghidra.util.Radix;class BentoMapModel extends AbstractSortedTableModel<BentoBox> {@@ -189,7 +190,7 @@ class BentoMapModel extends AbstractSortedTableModel<BentoBox> {Object rep = columnBounds.get(columnIndex) ? obj.getLowRep() : obj.getHiRep();if (rep instanceof Long lrep) {- BentoRadix radix = provider.getRadix(columnIndices.get(columnIndex));+ Radix radix = provider.getRadix(columnIndices.get(columnIndex));rep = radix.format(lrep);}return rep;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoPanel.javaindex af9bc75421..579845d790 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoPanel.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoPanel.java@@ -24,6 +24,7 @@ import javax.swing.*;import generic.theme.GColor;import generic.theme.GThemeDefaults.Colors;+import ghidra.util.Radix;public class BentoPanel extends JPanel implements MouseListener, MouseMotionListener {private static final long serialVersionUID = 1L;@@ -393,9 +394,9 @@ public class BentoPanel extends JPanel implements MouseListener, MouseMotionListparseBoxes(blist);}- protected BentoRadix getRadix(int index) {+ protected Radix getRadix(int index) {if (boxList == null || boxList.isEmpty()) {- return BentoRadix.DEFAULT;+ return Radix.DEFAULT;}return provider.getRadix(index);}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoProvider.javaindex 20f3b92a56..cce70372e2 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoProvider.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoProvider.java@@ -31,8 +31,7 @@ import ghidra.app.plugin.core.bento.actions.*;import ghidra.framework.plugintool.ComponentProviderAdapter;import ghidra.framework.plugintool.PluginTool;import ghidra.program.model.listing.Program;-import ghidra.util.HelpLocation;-import ghidra.util.Swing;+import ghidra.util.*;import resources.ResourceManager;public class BentoProvider extends ComponentProviderAdapter {@@ -52,7 +51,7 @@ public class BentoProvider extends ComponentProviderAdapter {ResourceManager.getScaledIcon(new GIcon("icon.widget.filterpanel.filter.off"), 12, 12);long halfPage = 512L;- private Map<Integer, BentoRadix> radixMap = new HashMap<>();+ private Map<Integer, Radix> radixMap = new HashMap<>();public BentoProvider(PluginTool tool, BentoServicePlugin plugin, boolean isTransient) {super(tool, plugin.title, plugin.getName());@@ -332,13 +331,13 @@ public class BentoProvider extends ComponentProviderAdapter {return bentoPanel;}- public void setRadix(int index, BentoRadix radix) {+ public void setRadix(int index, Radix radix) {radixMap.put(index, radix);}- public BentoRadix getRadix(int index) {- BentoRadix radix = radixMap.get(index);- return radix == null ? BentoRadix.DEFAULT : radix;+ public Radix getRadix(int index) {+ Radix radix = radixMap.get(index);+ return radix == null ? Radix.DEFAULT : radix;}}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BoundedObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BoundedObject.javaindex 6f9f5b8fb8..ce979d9082 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BoundedObject.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BoundedObject.java@@ -15,6 +15,8 @@*/package ghidra.app.plugin.core.bento;+import ghidra.util.Radix;+public class BoundedObject {protected Object obj;@@ -75,8 +77,8 @@ public class BoundedObject {return hiBound;}- public BentoRadix getDefaultRadix() {- return BentoRadix.DEFAULT;+ public Radix getDefaultRadix() {+ return Radix.DEFAULT;}}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/FunctionBoundedObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/FunctionBoundedObject.javaindex 18045b2aa9..f271ce56a7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/FunctionBoundedObject.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/FunctionBoundedObject.java@@ -16,6 +16,7 @@package ghidra.app.plugin.core.bento;import ghidra.program.model.listing.Function;+import ghidra.util.Radix;public class FunctionBoundedObject extends BoundedObject {@@ -27,8 +28,8 @@ public class FunctionBoundedObject extends BoundedObject {}@Override- public BentoRadix getDefaultRadix() {- return BentoRadix.HEX_LOWER;+ public Radix getDefaultRadix() {+ return Radix.HEX_LOWER;}@Overridediff --git a/Ghidra/Features/Decompiler/ghidra_scripts/ExampleBentoScript.java b/Ghidra/Features/Decompiler/ghidra_scripts/ExampleBentoScript.javaindex 544c662e78..d53b6bbf41 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/ExampleBentoScript.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/ExampleBentoScript.java@@ -39,6 +39,7 @@ import ghidra.program.model.address.Address;import ghidra.program.model.listing.*;import ghidra.program.model.pcode.HighFunction;import ghidra.program.model.pcode.PcodeOpAST;+import ghidra.util.Radix;import ghidra.util.task.TaskMonitor;public class ExampleBentoScript extends GhidraScript {@@ -90,7 +91,7 @@ public class ExampleBentoScript extends GhidraScript {provider.setBoxes(boxes);provider.setProgram(program);provider.setColumns(List.of("Inst", "Addr", "Op"));- provider.setRadix(0, BentoRadix.HEX_UPPER);+ provider.setRadix(0, Radix.HEX_UPPER);return false;}}diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoRadix.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/Radix.javasimilarity index 88%rename from Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoRadix.javarename to Ghidra/Framework/Generic/src/main/java/ghidra/util/Radix.javaindex 9fb4f5d248..b7a173ca79 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bento/BentoRadix.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/Radix.java@@ -13,9 +13,9 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package ghidra.app.plugin.core.bento;+package ghidra.util;-public enum BentoRadix {+public enum Radix {/** Use decimal (default) */DEC("dec", 10, "%d"),/** Use upper-case hexadecimal */@@ -24,7 +24,7 @@ public enum BentoRadix {HEX_LOWER("hex", 16, "%x");/** The default radix (decimal) */- public static final BentoRadix DEFAULT = DEC;+ public static final Radix DEFAULT = DEC;/*** Get the radix specified by the given string@@ -32,7 +32,7 @@ public enum BentoRadix {* @param s the name of the specified radix* @return the radix*/- public static BentoRadix fromStr(String s) {+ public static Radix fromStr(String s) {return switch (s) {case "dec" -> DEC;case "HEX" -> HEX_UPPER;@@ -45,7 +45,7 @@ public enum BentoRadix {public final int n;public final String fmt;- private BentoRadix(String name, int n, String fmt) {+ private Radix(String name, int n, String fmt) {this.name = name;this.n = n;this.fmt = fmt;