Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7382: Fixing compilation error caused by new "Counter bytesAvailable" parameter

Ryan Kurtz92cfb5553b50
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
index d888e02fda..6952f5f5d4 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java
@@ -15,7 +15,7 @@
*/
package ghidra.app.plugin.core.debug.gui.listing;
-import static ghidra.app.plugin.core.debug.gui.DebuggerResources.ICON_REGISTER_MARKER;
+import static ghidra.app.plugin.core.debug.gui.DebuggerResources.*;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -87,6 +87,7 @@ import ghidra.trace.model.Trace;
import ghidra.trace.model.program.TraceProgramView;
import ghidra.trace.model.time.TraceSnapshot;
import ghidra.util.*;
+import ghidra.util.datastruct.Counter;
import ghidra.util.datastruct.ListenerSet;
import utilities.util.SuppressableCallback;
import utilities.util.SuppressableCallback.Suppression;
@@ -241,7 +242,8 @@ public class DebuggerListingProvider extends CodeViewerProvider implements Debug
}
@Override
- protected boolean hasEnoughSpace(Program program, Address address, int byteCount) {
+ protected boolean hasEnoughSpace(Program program, Address address, int byteCount,
+ Counter bytesAvailable) {
return doHasEnoughSpace(program, address, byteCount);
}
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
index dba4cfb77f..5dba69cef7 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesProvider.java
@@ -66,6 +66,7 @@ import ghidra.trace.model.TraceDomainObjectListener;
import ghidra.trace.model.program.TraceProgramView;
import ghidra.trace.util.TraceEvents;
import ghidra.util.Swing;
+import ghidra.util.datastruct.Counter;
public class DebuggerMemoryBytesProvider extends ProgramByteViewerComponentProvider {
private static final AutoConfigState.ClassHandler<
@@ -184,7 +185,8 @@ public class DebuggerMemoryBytesProvider extends ProgramByteViewerComponentProvi
}
@Override
- protected boolean hasEnoughSpace(Program program, Address address, int byteCount) {
+ protected boolean hasEnoughSpace(Program program, Address address, int byteCount,
+ Counter bytesAvailable) {
return doHasEnoughSpace(program, address, byteCount);
}