mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-21 19:42:14 +00:00
Merge remote-tracking branch 'origin/GP-1086_ghizard_fix_PDB_bug_preventing_proper_constructor_signature' into patch
This commit is contained in:
commit
7936f89ab5
@ -105,7 +105,7 @@ public abstract class AbstractFunctionTypeApplier extends MsTypeApplier {
|
||||
|
||||
/**
|
||||
* Returns whether the function has a "this" pointer
|
||||
* @return {@code true} if it has a "this" pointer
|
||||
* @return {@code true} if it has a "this" pointer
|
||||
*/
|
||||
protected abstract boolean hasThisPointer();
|
||||
|
||||
@ -131,7 +131,7 @@ public abstract class AbstractFunctionTypeApplier extends MsTypeApplier {
|
||||
|
||||
/**
|
||||
* Method to create the {@link DataType} based upon the type indices of the calling
|
||||
* convention, return type, and arguments list.
|
||||
* convention, return type, and arguments list.
|
||||
* @param callingConventionParam Identification of the {@link AbstractMsType} record of the
|
||||
* {@link CallingConvention}.
|
||||
* @param hasThisPointerParam true if has a this pointer
|
||||
@ -212,7 +212,7 @@ public abstract class AbstractFunctionTypeApplier extends MsTypeApplier {
|
||||
private boolean setReturnType() {
|
||||
|
||||
if (isConstructor()) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
DataType returnDataType = returnApplier.getDataType();
|
||||
@ -234,7 +234,7 @@ public abstract class AbstractFunctionTypeApplier extends MsTypeApplier {
|
||||
// Since we are a member function, we will always assume a _thiscall...
|
||||
// but how do we know it is not a atatic member function (no "this")?
|
||||
switch (callingConvention) {
|
||||
// TODO: figure all of these out.
|
||||
// TODO: figure all of these out.
|
||||
case THISCALL: // "this" passed in register (we have not yet seen this)
|
||||
convention = GenericCallingConvention.thiscall; // Is this correct if in reg?
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user