Merge pull request #233 from p-x9/feature/export-symbol-func-variant

Support new export symbol flag `EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT`

Author: p-x9

Sources/MachOKit/Extension/TrieTreeProtocol+.swift

@@ -28,7 +28,8 @@ extension TrieTreeProtocol where Content == ExportTrieNodeContent {
                     ordinal: content.ordinal,
                     importedName: content.importedName,
                     stub: content.stub,
-                    resolverOffset: content.resolver
+                    resolverOffset: content.resolver,
+                    functionVariantTableIndex: content.functionVariantTableIndex
                 )
             }
     }
@@ -48,7 +49,8 @@ extension TrieTreeProtocol where Content == ExportTrieNodeContent {
             ordinal: content.ordinal,
             importedName: content.importedName,
             stub: content.stub,
-            resolverOffset: content.resolver
+            resolverOffset: content.resolver,
+            functionVariantTableIndex: content.functionVariantTableIndex
         )
     }
 
@@ -67,7 +69,8 @@ extension TrieTreeProtocol where Content == ExportTrieNodeContent {
                 ordinal: content.ordinal,
                 importedName: content.importedName,
                 stub: content.stub,
-                resolverOffset: content.resolver
+                resolverOffset: content.resolver,
+                functionVariantTableIndex: content.functionVariantTableIndex
             )
         }
     }

Sources/MachOKit/Model/Export/ExportSymbolFlags.swift

@@ -39,6 +39,10 @@ extension ExportSymbolFlags {
     public static let static_resolver = ExportSymbolFlags(
         rawValue: Bit.static_resolver.rawValue
     )
+    /// EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT
+    public static let function_variant = ExportSymbolFlags(
+        rawValue: Bit.function_variant.rawValue
+    )
 }
 
 extension ExportSymbolFlags {
@@ -51,6 +55,8 @@ extension ExportSymbolFlags {
         case stub_and_resolver
         /// EXPORT_SYMBOL_FLAGS_STATIC_RESOLVER
         case static_resolver
+        /// EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT
+        case function_variant
     }
 }
 
@@ -63,6 +69,7 @@ extension ExportSymbolFlags.Bit: RawRepresentable {
         case RawValue(EXPORT_SYMBOL_FLAGS_REEXPORT): self = .reexport
         case RawValue(EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER): self = .stub_and_resolver
         case RawValue(EXPORT_SYMBOL_FLAGS_STATIC_RESOLVER): self = .static_resolver
+        case RawValue(EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT): self = .function_variant
         default: return nil
         }
     }
@@ -73,6 +80,7 @@ extension ExportSymbolFlags.Bit: RawRepresentable {
         case .reexport: RawValue(EXPORT_SYMBOL_FLAGS_REEXPORT)
         case .stub_and_resolver: RawValue(EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER)
         case .static_resolver: RawValue(EXPORT_SYMBOL_FLAGS_STATIC_RESOLVER)
+        case .function_variant: RawValue(EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT)
         }
     }
 }
@@ -84,6 +92,7 @@ extension ExportSymbolFlags.Bit: CustomStringConvertible {
         case .reexport: "EXPORT_SYMBOL_FLAGS_REEXPORT"
         case .stub_and_resolver: "EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER"
         case .static_resolver: "EXPORT_SYMBOL_FLAGS_STATIC_RESOLVER"
+        case .function_variant: "EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT"
         }
     }
 }

Sources/MachOKit/Model/Export/ExportTrieEntry.swift

@@ -19,6 +19,8 @@ public struct ExportTrieNodeContent {
     public var stub: UInt?
     public var resolver: UInt?
 
+    public var functionVariantTableIndex: UInt?
+
     public var symbolOffset: UInt?
 }
 
@@ -67,6 +69,18 @@ extension ExportTrieNodeContent: TrieNodeContent {
 
             content.stub = stub
             content.resolver = resolver
+        } else if flags.contains(.function_variant) {
+            let (symbolOffset, ulebOffset) = basePointer
+                .advanced(by: nextOffset)
+                .readULEB128()
+            nextOffset += ulebOffset
+            let (functionVariantTableIndex, ulebOffset2) = basePointer
+                .advanced(by: nextOffset)
+                .readULEB128()
+            nextOffset += ulebOffset2
+
+            content.symbolOffset = symbolOffset
+            content.functionVariantTableIndex = functionVariantTableIndex
         } else {
             let (value, ulebOffset) = basePointer
                 .advanced(by: nextOffset)

Sources/MachOKit/Model/ExportedSymbol.swift

@@ -21,6 +21,8 @@ public struct ExportedSymbol {
 
     public var stub: UInt?
     public var resolverOffset: UInt?
+
+    public var functionVariantTableIndex: UInt?
 }
 
 extension ExportedSymbol {

Sources/MachOKitC/include/backports.h

@@ -81,4 +81,8 @@ struct target_triple_command {
 
 #endif /* __linux__ */
 
+#ifndef EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT
+#define EXPORT_SYMBOL_FLAGS_FUNCTION_VARIANT  0x20
+#endif
+
 #endif /* backports_h */