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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2024-08-01 06:15:24 -04:00
commit 4265ac01e1
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProvider.java
View file

@ -1021,8 +1021,9 @@ public class DebuggerRegistersProvider extends ComponentProviderAdapter
if (regs == null && register.getAddressSpace().isRegisterSpace()) { if (regs == null && register.getAddressSpace().isRegisterSpace()) {
return false; return false;
} }
AddressRange range = AddressRange range = current.getPlatform()
current.getPlatform().getConventionalRegisterRange(regs.getAddressSpace(), register); .getConventionalRegisterRange(regs == null ? null : regs.getAddressSpace(),
register);
return viewKnown.contains(range.getMinAddress(), range.getMaxAddress()); return viewKnown.contains(range.getMinAddress(), range.getMaxAddress());
} }

3
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/ByteCache.java
View file

@ -38,6 +38,9 @@ public abstract class ByteCache {
if (!valid || start == null) { if (!valid || start == null) {
return false; return false;
} }
if (start.getAddressSpace() != address.getAddressSpace()) {
return false;
}
long offset = address.subtract(start); long offset = address.subtract(start);
return Long.compareUnsigned(offset + length, len) < 0; return Long.compareUnsigned(offset + length, len) < 0;
} }