Merge remote-tracking branch

'origin/GP-2456_datatypes_of_HighConstants--SQUASHED' (Closes #4512)
This commit is contained in:
Ryan Kurtz 2022-08-16 09:03:36 -04:00
commit d59b45253d

View file

@ -18,6 +18,7 @@ package ghidra.program.model.pcode;
import ghidra.program.model.address.Address;
import ghidra.program.model.data.AbstractIntegerDataType;
import ghidra.program.model.data.DataType;
import ghidra.program.model.listing.Data;
import ghidra.program.model.listing.Program;
import ghidra.program.model.scalar.Scalar;
@ -112,7 +113,9 @@ public class HighConstant extends HighVariable {
PcodeOp op = ((VarnodeAST) represent).getLoneDescend();
Address addr = HighFunctionDBUtil.getSpacebaseReferenceAddress(program, op);
if (addr != null) {
symbol = globalMap.newSymbol(symref, addr, DataType.DEFAULT, 1);
Data data = program.getListing().getDataAt(addr);
DataType dt = data == null ? DataType.DEFAULT : data.getDataType();
symbol = globalMap.newSymbol(symref, addr, dt, data.getLength());
}
}
}