Skip to content

Ghidra is a software reverse engineering (SRE) framework

Label Swift data symbols instead of creating functions on them

Leon Zandman5d3b9cefaba6
diff --git a/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangledNodeKind.java b/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangledNodeKind.java
index 181a63e393..3cfa41c051 100644
--- a/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangledNodeKind.java
+++ b/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/SwiftDemangledNodeKind.java
@@ -25,19 +25,24 @@ import ghidra.app.util.demangler.swift.nodes.SwiftNode;
public enum SwiftDemangledNodeKind {
//@formatter:off
+ AccessibleFunctionRecord,
Allocator,
AnonymousDescriptor,
ArgumentTuple,
+ AsyncFunctionPointer,
BoundGenericStructure,
BuiltinTypeName,
Class,
Constructor,
+ CoroFunctionPointer,
Deallocator,
DefaultArgumentInitializer,
DependentGenericParamType,
DependentGenericType,
Destructor,
DispatchThunk,
+ DynamicallyReplaceableFunctionKey,
+ DynamicallyReplaceableFunctionVar,
Enum,
Extension,
FirstElementMarker,
@@ -65,6 +70,8 @@ public enum SwiftDemangledNodeKind {
ObjCAttribute,
OutlinedConsume,
OutlinedCopy,
+ OutlinedReadOnlyObject,
+ OutlinedVariable,
Owned,
PrivateDeclName,
Protocol,
diff --git a/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/nodes/SwiftGlobalNode.java b/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/nodes/SwiftGlobalNode.java
index 769f8c9d3b..fb4af335db 100644
--- a/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/nodes/SwiftGlobalNode.java
+++ b/Ghidra/Features/Swift/src/main/java/ghidra/app/util/demangler/swift/nodes/SwiftGlobalNode.java
@@ -37,6 +37,15 @@ public class SwiftGlobalNode extends SwiftNode {
case MergedFunction:
case ObjCAttribute:
continue;
+ case AccessibleFunctionRecord:
+ case AsyncFunctionPointer:
+ case CoroFunctionPointer:
+ case DynamicallyReplaceableFunctionKey:
+ case DynamicallyReplaceableFunctionVar:
+ case OutlinedReadOnlyObject:
+ case OutlinedVariable:
+ // The symbol is data that belongs to the entity in the next child, not its code
+ return getUnknown();
case Suffix:
suffix = child.demangle(demangler);
break;
diff --git a/Ghidra/Features/Swift/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java b/Ghidra/Features/Swift/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java
index 73f93f2aec..1694ff8df1 100644
--- a/Ghidra/Features/Swift/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java
+++ b/Ghidra/Features/Swift/src/test/java/ghidra/app/util/demangler/swift/SwiftDemanglerTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import generic.test.AbstractGenericTest;
import ghidra.app.util.demangler.DemangledFunction;
+import ghidra.app.util.demangler.DemangledLabel;
import ghidra.app.util.demangler.DemangledStructure;
import ghidra.util.exception.AssertException;
@@ -705,6 +706,148 @@ public class SwiftDemanglerTest extends AbstractGenericTest {
assertEquals(demangled, function.toString());
}
+ @Test
+ public void testAsyncFunctionPointer() throws Exception {
+ /*-********************************************************************
+ kind=Global
+ kind=AsyncFunctionPointer
+ kind=Function
+ kind=Module, text="SwiftDemanglerTest"
+ kind=Identifier, text="fetch"
+ kind=LabelList
+ kind=Type
+ kind=FunctionType
+ kind=AsyncAnnotation
+ kind=ArgumentTuple
+ kind=Type
+ kind=Structure
+ kind=Module, text="Swift"
+ kind=Identifier, text="Int"
+ kind=ReturnType
+ kind=Type
+ kind=Structure
+ kind=Module, text="Swift"
+ kind=Identifier, text="Int"
+ async function pointer to SwiftDemanglerTest.fetch(Swift.Int) async -> Swift.Int
+ **********************************************************************/
+ String mangled = "_$s18SwiftDemanglerTest5fetchyS2iYaFTu";
+ String demangled =
+ "async function pointer to SwiftDemanglerTest.fetch(Swift.Int) async -> Swift.Int";
+
+ if (!(demangler.demangle(mangled) instanceof DemangledLabel label)) {
+ throw new AssertException("Demangled object is not a label");
+ }
+ assertEquals(demangled, label.getOriginalDemangled());
+ }
+
+ @Test
+ public void testDynamicallyReplaceableFunctionKey() throws Exception {
+ /*-********************************************************************
+ kind=Global
+ kind=DynamicallyReplaceableFunctionKey
+ kind=Function
+ kind=Module, text="SwiftDemanglerTest"
+ kind=Identifier, text="replaceable"
+ kind=LabelList
+ kind=Type
+ kind=FunctionType
+ kind=ArgumentTuple
+ kind=Type
+ kind=Structure
+ kind=Module, text="Swift"
+ kind=Identifier, text="Int"
+ kind=ReturnType
+ kind=Type
+ kind=Structure
+ kind=Module, text="Swift"
+ kind=Identifier, text="Int"
+ dynamically replaceable key for SwiftDemanglerTest.replaceable(Swift.Int) -> Swift.Int
+ **********************************************************************/
+ String mangled = "_$s18SwiftDemanglerTest11replaceableyS2iFTx";
+ String demangled =
+ "dynamically replaceable key for SwiftDemanglerTest.replaceable(Swift.Int) -> Swift.Int";
+
+ if (!(demangler.demangle(mangled) instanceof DemangledLabel label)) {
+ throw new AssertException("Demangled object is not a label");
+ }
+ assertEquals(demangled, label.getOriginalDemangled());
+ }
+
+ @Test
+ public void testDynamicallyReplaceableFunctionVar() throws Exception {
+ /*-********************************************************************
+ kind=Global
+ kind=DynamicallyReplaceableFunctionVar
+ kind=Function
+ kind=Module, text="SwiftDemanglerTest"
+ kind=Identifier, text="replaceable"
+ kind=LabelList
+ kind=Type
+ kind=FunctionType
+ kind=ArgumentTuple
+ kind=Type
+ kind=Structure
+ kind=Module, text="Swift"
+ kind=Identifier, text="Int"
+ kind=ReturnType
+ kind=Type
+ kind=Structure
+ kind=Module, text="Swift"
+ kind=Identifier, text="Int"
+ dynamically replaceable variable for SwiftDemanglerTest.replaceable(Swift.Int) -> Swift.Int
+ **********************************************************************/
+ String mangled = "_$s18SwiftDemanglerTest11replaceableyS2iFTX";
+ String demangled =
+ "dynamically replaceable variable for SwiftDemanglerTest.replaceable(Swift.Int) -> Swift.Int";
+
+ if (!(demangler.demangle(mangled) instanceof DemangledLabel label)) {
+ throw new AssertException("Demangled object is not a label");
+ }
+ assertEquals(demangled, label.getOriginalDemangled());
+ }
+
+ @Test
+ public void testOutlinedVariable() throws Exception {
+ /*-********************************************************************
+ kind=Global
+ kind=OutlinedVariable, index=0
+ kind=GlobalVariableOnceFunction
+ kind=Module, text="SwiftDemanglerTest"
+ kind=GlobalVariableOnceDeclList
+ kind=Identifier, text="sharedNode"
+ outlined variable #0 of one-time initialization function for sharedNode
+ **********************************************************************/
+ String mangled = "_$s18SwiftDemanglerTest10sharedNode_WZTv_";
+ String demangled =
+ "outlined variable #0 of one-time initialization function for sharedNode";
+
+ if (!(demangler.demangle(mangled) instanceof DemangledLabel label)) {
+ throw new AssertException("Demangled object is not a label");
+ }
+ assertEquals(demangled, label.getOriginalDemangled());
+ }
+
+ @Test
+ public void testOutlinedReadOnlyObject() throws Exception {
+ /*-********************************************************************
+ kind=Global
+ kind=OutlinedReadOnlyObject, index=0
+ kind=GlobalVariableOnceFunction
+ kind=Module, text="SwiftDemanglerTest"
+ kind=GlobalVariableOnceDeclList
+ kind=Identifier, text="table"
+ outlined read-only object #0 of one-time initialization function for table
+ **********************************************************************/
+ String mangled = "_$s18SwiftDemanglerTest5table_WZTv_r";
+ String demangled =
+ "outlined read-only object #0 of one-time initialization function for table";
+
+ if (!(demangler.demangle(mangled) instanceof DemangledLabel label)) {
+ throw new AssertException("Demangled object is not a label");
+ }
+ assertEquals(demangled, label.getOriginalDemangled());
+ }
+
@Test
public void testUnsupportedString() throws Exception {
String mangled = "__mh_execute_header";