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-7104: More removal of stuff marked deprecated since 10.x (and

Browse Source 
old
This commit is contained in:
Ryan Kurtz
2026-07-31 04:57:43 -04:00
parent efacab1c15
commit 6653f65a82
35 changed files with 67 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceDefinedDataAdapter.java
View File

@@ -124,12 +124,6 @@ public interface DBTraceDefinedDataAdapter extends DBTraceDataAdapter {
}
}
@Deprecated
@Override
default DBTraceDefinedDataAdapter getComponentAt(int offset) {
return getComponentContaining(offset);
}
@Override
default DBTraceDefinedDataAdapter getComponentContaining(int offset) {
// We may write to the cache
@@ -216,11 +210,11 @@ public interface DBTraceDefinedDataAdapter extends DBTraceDataAdapter {
@Override
default DBTraceDefinedDataAdapter getPrimitiveAt(int offset) {
// We may write to the cache
try (LockHold hold = LockHold.lock(getTrace().getReadWriteLock().writeLock())) {
try (LockHold _ = LockHold.lock(getTrace().getReadWriteLock().writeLock())) {
if (offset < 0 || offset >= getLength()) {
return null;
}
DBTraceDefinedDataAdapter component = getComponentAt(offset);
DBTraceDefinedDataAdapter component = getComponentContaining(offset);
if (component == null || component == this) {
return this;
}

5
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/UndefinedDBTraceData.java
View File

@@ -244,11 +244,6 @@ public class UndefinedDBTraceData implements DBTraceDataAdapter, TraceSpaceMixin
return 0;
}
@Override
public TraceData getComponentAt(int offset) {
return null;
}
@Override
public TraceData getComponentContaining(int offset) {
return null;

7
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/listing/TraceData.java
View File

@@ -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.
@@ -26,9 +26,6 @@ public interface TraceData extends TraceCodeUnit, Data {
@Override
TraceData getComponent(int index);
@Override
TraceData getComponentAt(int offset);
@Override
TraceData getComponentContaining(int offset);

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/util/TraceRegisterUtils.java
View File

@@ -200,7 +200,7 @@ public enum TraceRegisterUtils {
}
// we know data contains register, and data cannot exceed Integer.MAX_VALUE in length
int offset = (int) range.getMinAddress().subtract(data.getMinAddress());
TraceData component = data.getComponentAt(offset);
TraceData component = data.getComponentContaining(offset);
if (component == null) { // TODO: I'm not sure this can happen
return null;
}

62
Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/listing/DBTraceCodeUnitTest.java
View File

@@ -1687,41 +1687,41 @@ public class DBTraceCodeUnitTest extends AbstractGhidraHeadlessIntegrationTest {
assertEquals("tac", d400c.getComponent(2).getValue());
assertEquals("toe", d400c.getComponent(3).getValue());
assertNull(u3fff.getComponentAt(0));
assertNull(d4000.getComponentAt(0));
assertNull(u3fff.getComponentContaining(0));
assertNull(d4000.getComponentContaining(0));
assertNull(d4004.getComponentAt(-1));
assertEquals(d4004.getComponent(0), d4004.getComponentAt(0));
assertEquals(d4004.getComponent(0), d4004.getComponentAt(1));
assertEquals(d4004.getComponent(1), d4004.getComponentAt(2));
assertEquals(d4004.getComponent(1), d4004.getComponentAt(3));
assertEquals(d4004.getComponent(2), d4004.getComponentAt(4));
assertNull(d4004.getComponentAt(5));
assertNull(d4004.getComponentContaining(-1));
assertEquals(d4004.getComponent(0), d4004.getComponentContaining(0));
assertEquals(d4004.getComponent(0), d4004.getComponentContaining(1));
assertEquals(d4004.getComponent(1), d4004.getComponentContaining(2));
assertEquals(d4004.getComponent(1), d4004.getComponentContaining(3));
assertEquals(d4004.getComponent(2), d4004.getComponentContaining(4));
assertNull(d4004.getComponentContaining(5));
assertEquals(d400c.getComponent(0), d400c.getComponentAt(0));
assertEquals(d400c.getComponent(0), d400c.getComponentAt(1));
assertEquals(d400c.getComponent(1), d400c.getComponentAt(2));
assertEquals(d400c.getComponent(1), d400c.getComponentAt(3));
assertEquals(d400c.getComponent(1), d400c.getComponentAt(4));
assertEquals(d400c.getComponent(1), d400c.getComponentAt(5));
assertEquals(d400c.getComponent(2), d400c.getComponentAt(6));
assertEquals(d400c.getComponent(2), d400c.getComponentAt(7));
assertEquals(d400c.getComponent(2), d400c.getComponentAt(8));
assertEquals(d400c.getComponent(2), d400c.getComponentAt(9));
assertEquals(d400c.getComponent(3), d400c.getComponentAt(10));
assertEquals(d400c.getComponent(3), d400c.getComponentAt(11));
assertEquals(d400c.getComponent(3), d400c.getComponentAt(12));
assertEquals(d400c.getComponent(3), d400c.getComponentAt(13));
assertEquals(d400c.getComponent(0), d400c.getComponentContaining(0));
assertEquals(d400c.getComponent(0), d400c.getComponentContaining(1));
assertEquals(d400c.getComponent(1), d400c.getComponentContaining(2));
assertEquals(d400c.getComponent(1), d400c.getComponentContaining(3));
assertEquals(d400c.getComponent(1), d400c.getComponentContaining(4));
assertEquals(d400c.getComponent(1), d400c.getComponentContaining(5));
assertEquals(d400c.getComponent(2), d400c.getComponentContaining(6));
assertEquals(d400c.getComponent(2), d400c.getComponentContaining(7));
assertEquals(d400c.getComponent(2), d400c.getComponentContaining(8));
assertEquals(d400c.getComponent(2), d400c.getComponentContaining(9));
assertEquals(d400c.getComponent(3), d400c.getComponentContaining(10));
assertEquals(d400c.getComponent(3), d400c.getComponentContaining(11));
assertEquals(d400c.getComponent(3), d400c.getComponentContaining(12));
assertEquals(d400c.getComponent(3), d400c.getComponentContaining(13));
assertNull(d401c.getComponentAt(0));
assertNull(d401c.getComponentAt(1));
assertNull(d401c.getComponentAt(2));
assertNull(d401c.getComponentAt(3));
assertNull(d401c.getComponentContaining(0));
assertNull(d401c.getComponentContaining(1));
assertNull(d401c.getComponentContaining(2));
assertNull(d401c.getComponentContaining(3));
assertEquals(d4020.getComponent(0), d4020.getComponentAt(0));
assertEquals(d4020.getComponent(1), d4020.getComponentAt(1));
assertEquals(d4020.getComponent(2), d4020.getComponentAt(2));
assertEquals(d4020.getComponent(3), d4020.getComponentAt(3));
assertEquals(d4020.getComponent(0), d4020.getComponentContaining(0));
assertEquals(d4020.getComponent(1), d4020.getComponentContaining(1));
assertEquals(d4020.getComponent(2), d4020.getComponentContaining(2));
assertEquals(d4020.getComponent(3), d4020.getComponentContaining(3));
assertNull(u3fff.getComponentsContaining(-1));
assertTrue(u3fff.getComponentsContaining(0).isEmpty());