Skip to content

Ghidra is a software reverse engineering (SRE) framework

Resolve PDB complex primitive widths and render their listing values

Rudy Celekli12bbe451ad9e
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbPrimitiveTypeApplicator.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbPrimitiveTypeApplicator.java
index 88bc499e8f..2049a0aa12 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbPrimitiveTypeApplicator.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbPrimitiveTypeApplicator.java
@@ -568,7 +568,7 @@ public class PdbPrimitiveTypeApplicator {
}
DataType get32BitComplexType() {
- return getComplexType(4);
+ return getComplexType(32);
}
DataType get32BitPartialPrecisionComplexType() {
@@ -580,11 +580,11 @@ public class PdbPrimitiveTypeApplicator {
}
DataType get64BitComplexType() {
- return getComplexType(8);
+ return getComplexType(64);
}
DataType get80BitComplexType() {
- return getComplexType(10);
+ return getComplexType(80);
}
DataType get128BitComplexType() {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractComplexDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractComplexDataType.java
index 3b42335909..66ac6dc49a 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractComplexDataType.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractComplexDataType.java
@@ -19,6 +19,8 @@ import java.math.BigDecimal;
import generic.complex.Complex;
import ghidra.docking.settings.Settings;
+import ghidra.pcode.floatformat.BigFloat;
+import ghidra.pcode.floatformat.FloatFormatFactory;
import ghidra.program.model.mem.MemBuffer;
import ghidra.program.model.mem.WrappedMemBuffer;
@@ -98,6 +100,10 @@ public abstract class AbstractComplexDataType extends BuiltIn {
}
private static double toDouble(Object obj) {
+ if (obj instanceof BigFloat) {
+ return Double.longBitsToDouble(
+ FloatFormatFactory.getFloatFormat(8).getEncoding((BigFloat) obj).longValue());
+ }
if (obj instanceof Double) {
return (Double) obj;
}
@@ -121,7 +127,7 @@ public abstract class AbstractComplexDataType extends BuiltIn {
MemBuffer wrp = new WrappedMemBuffer(buf, length / 2);
Object b = floatType.getValue(wrp, settings, length / 2);
- return new Complex(toDouble(a), toDouble(b));
+ return a != null && b != null ? new Complex(toDouble(a), toDouble(b)) : null;
}
@Override