Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-5642 - Gnu Demangler - Added support for TLS init functions

dragonmacher5f61a063814d
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
index efdcf1f967..58e055aa79 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
@@ -22,8 +22,7 @@ import java.util.regex.Pattern;
import ghidra.app.cmd.label.SetLabelPrimaryCmd;
import ghidra.app.util.NamespaceUtils;
import ghidra.program.model.address.Address;
-import ghidra.program.model.listing.CodeUnit;
-import ghidra.program.model.listing.Program;
+import ghidra.program.model.listing.*;
import ghidra.program.model.symbol.*;
import ghidra.util.Msg;
import ghidra.util.exception.DuplicateNameException;
@@ -480,7 +479,8 @@ public abstract class DemangledObject implements Demangled {
return true; // skip this symbol
}
- String comment = program.getListing().getComment(CodeUnit.PLATE_COMMENT, address);
+ Listing listing = program.getListing();
+ String comment = listing.getComment(CommentType.PLATE, address);
String newComment = generatePlateComment();
if (comment == null || comment.indexOf(newComment) < 0) {
if (comment == null) {
@@ -489,7 +489,7 @@ public abstract class DemangledObject implements Demangled {
else {
comment = comment + '\n' + newComment;
}
- program.getListing().setComment(address, CodeUnit.PLATE_COMMENT, comment);
+ listing.setComment(address, CommentType.PLATE, comment);
}
return true;
}
diff --git a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
index 5af4da0d8a..e304bc85c2 100644
--- a/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
+++ b/Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
@@ -59,6 +59,7 @@ public class GnuDemanglerParser {
private static final String TYPEINFO_NAME_FOR = "typeinfo name for ";
private static final String TYPEINFO_FN_FOR = "typeinfo fn for ";
private static final String TYPEINFO_FOR = "typeinfo for ";
+ private static final String TLS_INIT_FOR = "TLS init function for ";
private static final String COVARIANT_RETURN_THUNK = "covariant return thunk";
private static final Set<String> ADDRESS_TABLE_PREFIXES =
@@ -502,6 +503,10 @@ public class GnuDemanglerParser {
return new TypeInfoNameHandler(demangled, TYPEINFO_NAME_FOR);
}
+ if (prefix.startsWith(TLS_INIT_FOR)) {
+ return new TlsInitHandler(demangled, TLS_INIT_FOR, type);
+ }
+
Matcher arrayMatcher = ARRAY_DATA_PATTERN.matcher(type);
if (arrayMatcher.matches()) {
return new ArrayHandler(demangled, prefix, type);
@@ -1656,6 +1661,12 @@ public class GnuDemanglerParser {
super(demangled);
}
+ SpecialPrefixHandler(String demangled, String prefix, String type) {
+ super(demangled);
+ this.prefix = prefix;
+ this.type = type;
+ }
+
@Override
DemangledObject build() {
@@ -1677,17 +1688,41 @@ public class GnuDemanglerParser {
}
}
+ /**
+ * Thread Local Storage init function
+ */
+ private class TlsInitHandler extends SpecialPrefixHandler {
+
+ TlsInitHandler(String demangled, String prefix, String type) {
+ super(demangled, prefix, type);
+ }
+
+ @Override
+ DemangledObject doBuild(Demangled namespace) {
+
+ /*
+ Create a function named '__tls_init' in the given namespace:
+ Foo::__tls_init
+ */
+ String functionName = "__tls_init";
+
+ DemangledObject demangledFunction =
+ new DemangledFunction(mangledSource, demangledSource, functionName);
+ demangledFunction.setOriginalDemangled(demangled);
+ demangledFunction.setNamespace(namespace);
+ return demangledFunction;
+ }
+
+ }
+
private class ItemInNamespaceHandler extends SpecialPrefixHandler {
ItemInNamespaceHandler(String demangled) {
- super(demangled);
- this.type = demangled;
+ this(demangled, null, demangled);
}
- ItemInNamespaceHandler(String demangled, String prefix, String item) {
- super(demangled);
- this.prefix = prefix;
- this.type = item;
+ ItemInNamespaceHandler(String demangled, String prefix, String type) {
+ super(demangled, prefix, type);
}
@Override
@@ -1699,10 +1734,8 @@ public class GnuDemanglerParser {
private class GlobalCtorDtorHandler extends SpecialPrefixHandler {
- GlobalCtorDtorHandler(String demangled, String prefix, String item) {
- super(demangled);
- this.prefix = prefix;
- this.type = item;
+ GlobalCtorDtorHandler(String demangled, String prefix, String type) {
+ super(demangled, prefix, type);
}
@Override
@@ -1735,11 +1768,8 @@ public class GnuDemanglerParser {
private String arrayType;
- ArrayHandler(String demangled, String prefix, String item) {
- super(demangled);
- this.demangled = demangled;
- this.prefix = prefix;
- this.type = item;
+ ArrayHandler(String demangled, String prefix, String type) {
+ super(demangled, prefix, type);
//
// Handle array data definitions here for now. If we see this in non-specialized prefix
@@ -1778,11 +1808,8 @@ public class GnuDemanglerParser {
private class ThunkHandler extends SpecialPrefixHandler {
- ThunkHandler(String demangled, String prefix, String item) {
- super(demangled);
- this.demangled = demangled;
- this.prefix = prefix;
- this.type = item;
+ ThunkHandler(String demangled, String prefix, String type) {
+ super(demangled, prefix, type);
}
@Override
@@ -1805,7 +1832,6 @@ public class GnuDemanglerParser {
TypeInfoNameHandler(String demangled, String prefix) {
super(demangled);
- this.demangled = demangled;
this.prefix = prefix;
String classname = demangled.substring(prefix.length()).trim();
@@ -1826,10 +1852,7 @@ public class GnuDemanglerParser {
private class AddressTableHandler extends SpecialPrefixHandler {
AddressTableHandler(String demangled, String prefix, String type) {
- super(demangled);
- this.demangled = demangled;
- this.prefix = prefix;
- this.type = type;
+ super(demangled, prefix, type);
/*
Samples:
diff --git a/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java b/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
index 5974df1858..8a56e2bb84 100644
--- a/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
+++ b/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
@@ -614,6 +614,24 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
object.getSignature(false));
}
+ @Test
+ public void testTlsInitFunctionFor() throws Exception {
+
+ String mangled = "_ZTH8SomeName";
+ String demangled = process.demangle(mangled);
+
+ assertEquals("TLS init function for SomeName", demangled);
+
+ DemangledObject object = parser.parse(mangled, demangled);
+ assertType(object, DemangledFunction.class);
+ assertName(object, "__tls_init", "SomeName");
+
+ DemangledFunction function = (DemangledFunction) object;
+ String plate = function.generatePlateComment();
+ assertEquals("TLS init function for SomeName", plate);
+ assertEquals("SomeName::__tls_init(void)", object.getSignature(false));
+ }
+
@Test
public void testGuardVariable_WithGuardVariableText() throws Exception {