Merge remote-tracking branch 'origin/GP-1898_d-millar_register_reads'

This commit is contained in:
Ryan Kurtz
2022-04-06 15:28:39 -04:00
2 changed files with 9 additions and 7 deletions
@@ -46,12 +46,14 @@ public class DbgReadRegistersCommand extends AbstractDbgCommand<Map<DbgRegister,
return Collections.emptyMap();
}
Map<DbgRegister, BigInteger> result = new LinkedHashMap<>();
for (DbgRegister r : regs) {
if (registers != null) {
DebugValue value = registers.getValueByName(r.getName());
if (value != null) {
BigInteger bval = new BigInteger(value.encodeAsBytes());
result.put(r, bval);
if (registers != null) {
for (DbgRegister r : regs) {
if (r.isBaseRegister()) {
DebugValue value = registers.getValueByName(r.getName());
if (value != null) {
BigInteger bval = new BigInteger(value.encodeAsBytes());
result.put(r, bval);
}
}
}
}
@@ -84,6 +84,6 @@ public class DbgRegister implements Comparable<DbgRegister> {
if (desc == null) {
return true;
}
return desc.subregMaster == 0;
return desc.subregMask == 0;
}
}