Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 00:04:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_fixTests-2026-02-19-1' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2026-02-19 12:05:19 -05:00
parent dfaf0106b8 ffd0fbebdf
commit 2d851f3a58
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/action/BasicAutoReadMemorySpec.java
+3 -2
View File
@@ -36,6 +36,7 @@ import ghidra.program.model.address.*;
import ghidra.program.model.mem.MemoryAccessException; import ghidra.program.model.mem.MemoryAccessException;
import ghidra.trace.model.*; import ghidra.trace.model.*;
import ghidra.trace.model.memory.*; import ghidra.trace.model.memory.*;
import ghidra.util.MathUtilities;
import ghidra.util.task.TaskMonitor; import ghidra.util.task.TaskMonitor;
public enum BasicAutoReadMemorySpec implements AutoReadMemorySpec { public enum BasicAutoReadMemorySpec implements AutoReadMemorySpec {
@@ -139,9 +140,9 @@ public enum BasicAutoReadMemorySpec implements AutoReadMemorySpec {
for (AddressRange range : set) { for (AddressRange range : set) {
AddressSpace space = range.getAddressSpace(); AddressSpace space = range.getAddressSpace();
long minOffset = range.getMinAddress().getOffset() & blockMask; long minOffset = range.getMinAddress().getOffset() & blockMask;
minOffset = Math.max(minOffset, space.getMinAddress().getOffset()); minOffset = MathUtilities.unsignedMax(minOffset, space.getMinAddress().getOffset());
long maxOffset = range.getMaxAddress().getOffset() | ~blockMask; long maxOffset = range.getMaxAddress().getOffset() | ~blockMask;
maxOffset = Math.min(maxOffset, space.getMaxAddress().getOffset()); maxOffset = MathUtilities.unsignedMin(maxOffset, space.getMaxAddress().getOffset());
if (minOffset > maxOffset) { if (minOffset > maxOffset) {
continue; continue;
} }