diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/internal/RStarTreeProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/internal/RStarTreeProvider.java index a7055008b5..0ff51b700b 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/internal/RStarTreeProvider.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/internal/RStarTreeProvider.java @@ -21,7 +21,6 @@ import java.util.*; import javax.swing.*; import docking.widgets.tree.*; -import generic.theme.GIcon; import ghidra.framework.plugintool.ComponentProviderAdapter; import ghidra.trace.model.TraceAddressSnapRange; import ghidra.util.database.spatial.*; @@ -34,8 +33,6 @@ public class RStarTreeProvider extends ComponentProviderAdapter { } class RootRStarNode extends GTreeLazyNode implements HasShape { - static final GIcon ICON = new GIcon("blargh"); - @Override public TraceAddressSnapRange getShape() { if (plugin == null || plugin.space == null) { @@ -55,7 +52,7 @@ public class RStarTreeProvider extends ComponentProviderAdapter { @Override public Icon getIcon(boolean expanded) { - return ICON; + return null; } @Override @@ -78,7 +75,6 @@ public class RStarTreeProvider extends ComponentProviderAdapter { } class NodeRStarNode extends GTreeLazyNode implements HasShape { - static final GIcon ICON = new GIcon("blargh"); final DBTreeNodeRecord rec; public NodeRStarNode(DBTreeNodeRecord rec) { @@ -97,7 +93,7 @@ public class RStarTreeProvider extends ComponentProviderAdapter { @Override public Icon getIcon(boolean expanded) { - return ICON; + return null; } @Override @@ -117,7 +113,6 @@ public class RStarTreeProvider extends ComponentProviderAdapter { } class DataRStarNode extends GTreeNode implements HasShape { - static final GIcon ICON = new GIcon("blargh"); final DBTreeDataRecord rec; public DataRStarNode(DBTreeDataRecord rec) { @@ -136,7 +131,7 @@ public class RStarTreeProvider extends ComponentProviderAdapter { @Override public Icon getIcon(boolean expanded) { - return ICON; + return null; } @Override diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java index a5604da48b..d52470b533 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java @@ -263,8 +263,8 @@ public abstract class AbstractBaseDBTraceDefinedUnitsView mapSpace // - .reduce(TraceAddressSnapRangeQuery.intersecting(min, max, snap, snap)) // + return () -> mapSpace + .reduce(TraceAddressSnapRangeQuery.intersecting(min, max, snap, snap)) .reduce(TraceAddressSnapRangeQuery.enclosed(min, spaceMax, Long.MIN_VALUE, Long.MAX_VALUE).starting(direction)) .orderedValues() diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java index 7e9899a84d..c109191ad5 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java @@ -323,7 +323,6 @@ public class DBTraceMemorySpace if (predicate.test(entry.getValue())) { result.add(foundRange); } - break; } } return result; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/ByteCache.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/ByteCache.java index 166bb69dba..465efc1796 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/ByteCache.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/ByteCache.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -100,7 +100,7 @@ public abstract class ByteCache { int cacheBufOff = (int) (startOff - startPage); while (buf.hasRemaining()) { int required = MathUtilities.unsignedMin(SIZE - cacheBufOff, buf.remaining()); - Page page = ensurePageCached(address.getNewAddress(memOffset), required); + Page page = ensurePageCached(address.getNewAddress(memOffset), required + cacheBufOff); buf.put(page.bytes, cacheBufOff, required); memOffset += SIZE; cacheBufOff = 0; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/target/ValueSpaceTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/target/ValueSpaceTest.java index 92a7d00088..3aa72d4dc6 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/target/ValueSpaceTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/target/ValueSpaceTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,22 +30,22 @@ public class ValueSpaceTest { assertEquals(0.0, dim.distance(new RecAddress(0, 0), new RecAddress(0, 0)), 0.0); - assertEquals(100.0, dim.distance(new RecAddress(0, 0), new RecAddress(0, 100)), 0.0); - assertEquals(-100.0, dim.distance(new RecAddress(0, 100), new RecAddress(0, 0)), 0.0); - assertEquals(Math.pow(2, 65), dim.distance(new RecAddress(0, 0), new RecAddress(2, 0)), + assertEquals(100.0, dim.distance(new RecAddress(0, 100), new RecAddress(0, 0)), 0.0); + assertEquals(-100.0, dim.distance(new RecAddress(0, 0), new RecAddress(0, 100)), 0.0); + assertEquals(Math.pow(2, 65), dim.distance(new RecAddress(2, 0), new RecAddress(0, 0)), 0.0); - assertEquals(-Math.pow(2, 65), dim.distance(new RecAddress(2, 0), new RecAddress(0, 0)), + assertEquals(-Math.pow(2, 65), dim.distance(new RecAddress(0, 0), new RecAddress(2, 0)), 0.0); // 10000 instead of 100, because double precision will not detect just 100 assertEquals(Math.pow(2, 65) + 10000, - dim.distance(new RecAddress(0, 0), new RecAddress(2, 10000)), 0.0); - assertEquals(-Math.pow(2, 65) - 10000, dim.distance(new RecAddress(2, 10000), new RecAddress(0, 0)), 0.0); + assertEquals(-Math.pow(2, 65) - 10000, + dim.distance(new RecAddress(0, 0), new RecAddress(2, 10000)), 0.0); assertEquals(Math.pow(2, 65) - 10000, - dim.distance(new RecAddress(0, 10000), new RecAddress(2, 0)), 0.0); - assertEquals(-Math.pow(2, 65) + 10000, dim.distance(new RecAddress(2, 0), new RecAddress(0, 10000)), 0.0); + assertEquals(-Math.pow(2, 65) + 10000, + dim.distance(new RecAddress(0, 10000), new RecAddress(2, 0)), 0.0); } @Test @@ -98,19 +98,19 @@ public class ValueSpaceTest { // null is not a valid key, but because it's the "absolute max", the tree may ask assertEquals(0.0, dim.distance(null, null), 0.0); - assertEquals(25.0 * (Double.MAX_VALUE / 128), dim.distance("A", "Z"), 0.0); - assertEquals(-1.0 * (Double.MAX_VALUE / 128), dim.distance("B", "A"), 0.0); - assertEquals(1.0 * (Double.MAX_VALUE / 128), dim.distance("AA", "BA"), 0.0); - assertEquals(-1.0 * (Double.MAX_VALUE / 128), dim.distance("BA", "AA"), 0.0); + assertEquals(25.0 * (Double.MAX_VALUE / 128), dim.distance("Z", "A"), 0.0); + assertEquals(-1.0 * (Double.MAX_VALUE / 128), dim.distance("A", "B"), 0.0); + assertEquals(1.0 * (Double.MAX_VALUE / 128), dim.distance("BA", "AA"), 0.0); + assertEquals(-1.0 * (Double.MAX_VALUE / 128), dim.distance("AA", "BA"), 0.0); assertEquals(1.0 * (Double.MAX_VALUE / 128) + 1.0 * (Double.MAX_VALUE / 128 / 128), - dim.distance("AA", "BB"), 0.0); - assertEquals(-1.0 * (Double.MAX_VALUE / 128) - 1.0 * (Double.MAX_VALUE / 128 / 128), dim.distance("BB", "AA"), 0.0); + assertEquals(-1.0 * (Double.MAX_VALUE / 128) - 1.0 * (Double.MAX_VALUE / 128 / 128), + dim.distance("AA", "BB"), 0.0); assertEquals(1.0 * (Double.MAX_VALUE / 128) - 1.0 * (Double.MAX_VALUE / 128 / 128), - dim.distance("AB", "BA"), 0.0); - assertEquals(-1.0 * (Double.MAX_VALUE / 128) + 1.0 * (Double.MAX_VALUE / 128 / 128), dim.distance("BA", "AB"), 0.0); + assertEquals(-1.0 * (Double.MAX_VALUE / 128) + 1.0 * (Double.MAX_VALUE / 128 / 128), + dim.distance("AB", "BA"), 0.0); } @Test diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java index 700034a5b9..ff182b7021 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java @@ -314,10 +314,16 @@ public abstract class AbstractConstraintsTree< } private void descend(NR nr) { - List> passed = getChildrenOf(nr).stream() - .filter(c -> query.testNode(c.getBounds()) != QueryInclusion.NONE) - .toList(); - queue.addAll(passed); + Collection> all = getChildrenOf(nr); + if (query == null) { + queue.addAll(all); + } + else { + List> passed = all.stream() + .filter(c -> query.testNode(c.getBounds()) != QueryInclusion.NONE) + .toList(); + queue.addAll(passed); + } } private DR findNext() { diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractRStarConstraintsTree.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractRStarConstraintsTree.java index d2180a80d8..7bce0c23d2 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractRStarConstraintsTree.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractRStarConstraintsTree.java @@ -218,9 +218,8 @@ public abstract class AbstractRStarConstraintsTree< PriorityQueue sorted = new PriorityQueue<>(n.getChildCount()); List children = new ArrayList<>(getNodeChildrenOf(n)); - for (NR leaf : children) { - assert leaf.getType().isLeaf(); - sorted.offer(new LeastAreaEnlargementThenLeastArea(leaf, bounds)); + for (NR child : children) { + sorted.offer(new LeastAreaEnlargementThenLeastArea(child, bounds)); } LeastOverlap least = null;