mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-04 10:19:23 +02:00
GP-4886 Do not assign storage for DEFAULT/unassigned datatype and create
undefined-typedef instead of DWORD-typedef as a default named type when demangling.
This commit is contained in:
parent
7ec765c854
commit
7128a2adbd
3 changed files with 68 additions and 8 deletions
|
@ -95,8 +95,8 @@ public class DemangledDataType extends DemangledType {
|
||||||
private static final String UNSIGNED_LONG = "unsigned long";
|
private static final String UNSIGNED_LONG = "unsigned long";
|
||||||
|
|
||||||
public final static String[] PRIMITIVES =
|
public final static String[] PRIMITIVES =
|
||||||
{ VOID, BOOL, CHAR, WCHAR_T, WCHAR16, WCHAR32, CHAR8_T, SHORT, INT, INT0_T, LONG,
|
{ VOID, BOOL, CHAR, WCHAR_T, WCHAR16, WCHAR32, CHAR8_T, SHORT, INT, INT0_T, LONG, LONG_LONG,
|
||||||
LONG_LONG, FLOAT, FLOAT2, DOUBLE, INT128, FLOAT128, LONG_DOUBLE, };
|
FLOAT, FLOAT2, DOUBLE, INT128, FLOAT128, LONG_DOUBLE, };
|
||||||
|
|
||||||
private int arrayDimensions = 0;
|
private int arrayDimensions = 0;
|
||||||
private boolean isClass;
|
private boolean isClass;
|
||||||
|
@ -200,10 +200,10 @@ public class DemangledDataType extends DemangledType {
|
||||||
else if (dt == null) {
|
else if (dt == null) {
|
||||||
|
|
||||||
// I don't know what this is
|
// I don't know what this is
|
||||||
// If it isn't pointed to, or isn't a referent, then assume typedef.
|
// If it isn't pointed to, or isn't a referent, then assume undefined typedef.
|
||||||
if (!(isReference() || isPointer())) { // Unknown type
|
if (!(isReference() || isPointer())) { // Unknown type
|
||||||
dt = new TypedefDataType(getDemanglerCategoryPath(getNamespace()), name,
|
dt = new TypedefDataType(getDemanglerCategoryPath(getNamespace()), name,
|
||||||
new DWordDataType());
|
DataType.DEFAULT);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// try creating empty structures for unknown types instead.
|
// try creating empty structures for unknown types instead.
|
||||||
|
|
|
@ -26,6 +26,7 @@ import generic.test.AbstractGenericTest;
|
||||||
import ghidra.app.util.demangler.*;
|
import ghidra.app.util.demangler.*;
|
||||||
import ghidra.program.database.ProgramDB;
|
import ghidra.program.database.ProgramDB;
|
||||||
import ghidra.program.model.address.Address;
|
import ghidra.program.model.address.Address;
|
||||||
|
import ghidra.program.model.data.DataType;
|
||||||
import ghidra.program.model.data.TerminatedStringDataType;
|
import ghidra.program.model.data.TerminatedStringDataType;
|
||||||
import ghidra.program.model.listing.CodeUnit;
|
import ghidra.program.model.listing.CodeUnit;
|
||||||
import ghidra.program.model.listing.Data;
|
import ghidra.program.model.listing.Data;
|
||||||
|
@ -132,6 +133,60 @@ public class GnuDemanglerTest extends AbstractGenericTest {
|
||||||
fullSignature);
|
fullSignature);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUseStandardReplacements2() throws Exception {
|
||||||
|
|
||||||
|
//
|
||||||
|
// Mangled: _ZN7Greeter5greetENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
|
||||||
|
//
|
||||||
|
// Demangled: undefined Greeter::greet(std::__cxx11::basic_string<char,std::char_traits<char>,std::allocator<char>>)
|
||||||
|
//
|
||||||
|
// Replaced: undefined Greeter::greet(std::string)
|
||||||
|
//
|
||||||
|
String mangled = "_ZN7Greeter5greetENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE";
|
||||||
|
|
||||||
|
GnuDemangler demangler = new GnuDemangler();
|
||||||
|
demangler.canDemangle(program);// this perform initialization
|
||||||
|
|
||||||
|
GnuDemanglerOptions options = new GnuDemanglerOptions();
|
||||||
|
options.setUseStandardReplacements(true);
|
||||||
|
DemangledFunction dobj = (DemangledFunction) demangler.demangle(mangled, options);
|
||||||
|
assertNotNull(dobj);
|
||||||
|
|
||||||
|
String signature = dobj.getSignature();
|
||||||
|
assertEquals("undefined Greeter::greet(std::string)", signature);
|
||||||
|
|
||||||
|
DemangledParameter demangledParameter = dobj.getParameters().get(0);
|
||||||
|
DemangledDataType type = demangledParameter.getType();
|
||||||
|
DataType dt = type.getDataType(program.getDataTypeManager());
|
||||||
|
assertTrue(dt.isNotYetDefined());
|
||||||
|
//@formatter:off
|
||||||
|
assertEquals("/Demangler/std/string\n" +
|
||||||
|
"pack(disabled)\n" +
|
||||||
|
"Structure string {\n" +
|
||||||
|
"}\n" +
|
||||||
|
"Length: 0 Alignment: 1\n", dt.toString());
|
||||||
|
//@formatter:on
|
||||||
|
|
||||||
|
//
|
||||||
|
// Now disable demangled string replacement
|
||||||
|
//
|
||||||
|
options.setUseStandardReplacements(false);
|
||||||
|
dobj = (DemangledFunction) demangler.demangle(mangled, options);
|
||||||
|
assertNotNull(dobj);
|
||||||
|
|
||||||
|
String fullSignature = dobj.getSignature();
|
||||||
|
assertEquals(
|
||||||
|
"undefined Greeter::greet(std::__cxx11::basic_string<char,std::char_traits<char>,std::allocator<char>>)",
|
||||||
|
fullSignature);
|
||||||
|
|
||||||
|
demangledParameter = dobj.getParameters().get(0);
|
||||||
|
type = demangledParameter.getType();
|
||||||
|
dt = type.getDataType(program.getDataTypeManager());
|
||||||
|
assertEquals("typedef basic_string undefined", dt.toString());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testDemangleOnlyKnownPatterns_True() throws Exception {
|
public void testDemangleOnlyKnownPatterns_True() throws Exception {
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@ -23,8 +23,7 @@ import java.util.ArrayList;
|
||||||
|
|
||||||
import ghidra.program.model.address.Address;
|
import ghidra.program.model.address.Address;
|
||||||
import ghidra.program.model.address.AddressSpace;
|
import ghidra.program.model.address.AddressSpace;
|
||||||
import ghidra.program.model.data.DataType;
|
import ghidra.program.model.data.*;
|
||||||
import ghidra.program.model.data.DataTypeManager;
|
|
||||||
import ghidra.program.model.lang.protorules.*;
|
import ghidra.program.model.lang.protorules.*;
|
||||||
import ghidra.program.model.listing.Program;
|
import ghidra.program.model.listing.Program;
|
||||||
import ghidra.program.model.listing.VariableStorage;
|
import ghidra.program.model.listing.VariableStorage;
|
||||||
|
@ -133,6 +132,12 @@ public class ParamListStandard implements ParamList {
|
||||||
if (dt.isZeroLength()) {
|
if (dt.isZeroLength()) {
|
||||||
return AssignAction.NO_ASSIGNMENT;
|
return AssignAction.NO_ASSIGNMENT;
|
||||||
}
|
}
|
||||||
|
if (dt == DataType.DEFAULT) {
|
||||||
|
return AssignAction.NO_ASSIGNMENT;
|
||||||
|
}
|
||||||
|
if (dt instanceof TypeDef td && td.getBaseDataType() == DataType.DEFAULT) {
|
||||||
|
return AssignAction.NO_ASSIGNMENT;
|
||||||
|
}
|
||||||
for (ModelRule modelRule : modelRules) {
|
for (ModelRule modelRule : modelRules) {
|
||||||
int responseCode = modelRule.assignAddress(dt, proto, pos, dtManager, status, res);
|
int responseCode = modelRule.assignAddress(dt, proto, pos, dtManager, status, res);
|
||||||
if (responseCode != AssignAction.FAIL) {
|
if (responseCode != AssignAction.FAIL) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue