yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2024-08-28-1'

Browse source
This commit is contained in:
Ryan Kurtz 2024-08-28 08:17:39 -04:00
commit d5540087c8
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java
View file

@ -230,11 +230,6 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
return languageEntry == null ? manager.baseLanguage : languageEntry.getLanguage(); return languageEntry == null ? manager.baseLanguage : languageEntry.getLanguage();
} }
@Override
public AddressFactory getAddressFactory() {
return manager.trace.getBaseAddressFactory();
}
@Override @Override
public CompilerSpec getCompilerSpec() { public CompilerSpec getCompilerSpec() {
return compilerSpec; return compilerSpec;

9
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTracePlatformManager.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -92,6 +92,11 @@ public class DBTracePlatformManager implements DBTraceManager, TracePlatformMana
return trace.getBaseCompilerSpec(); return trace.getBaseCompilerSpec();
} }
@Override
public AddressFactory getAddressFactory() {
return trace.getBaseAddressFactory();
}
@Override @Override
public AddressSetView getHostAddressSet() { public AddressSetView getHostAddressSet() {
return trace.getBaseAddressFactory().getAddressSet(); return trace.getBaseAddressFactory().getAddressSet();