Merge pull request #9 from MxIris-Reverse-Engineering/develop

Update Dependencies

Author: Mx-Iris

Package.resolved

@@ -17,7 +17,7 @@ extension Package.Dependency {
 
     static let MachOKitOrigin = Package.Dependency.package(
         url: "https://github.com/p-x9/MachOKit.git",
-        from: "0.35.0"
+        from: "0.35.1"
     )
 
     static let MachOKitMain = Package.Dependency.package(
@@ -27,7 +27,7 @@ extension Package.Dependency {
 
     static let MachOKitSPM = Package.Dependency.package(
         url: "https://github.com/p-x9/MachOKit-SPM",
-        from: "0.35.0"
+        from: "0.35.1"
     )
 }
 
@@ -89,8 +89,8 @@ let package = Package(
     ],
     dependencies: [
         .MachOKit,
-        .package(url: "https://github.com/swiftlang/swift-syntax", from: "601.0.1"),
-        .package(url: "https://github.com/p-x9/AssociatedObject", from: "0.13.0"),
+        .package(url: "https://github.com/swift-precompiled/swift-syntax.git", from: "601.0.1"),
+        .package(url: "https://github.com/MxIris-Library-Forks/AssociatedObject", from: "0.13.0"),
         .package(url: "https://github.com/p-x9/swift-fileio.git", from: "0.9.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.1"),
         .package(url: "https://github.com/onevcat/Rainbow", .upToNextMajor(from: "4.0.0")),

Package.swift

@@ -14,10 +14,10 @@ It may be the most powerful swift dump you can find so far, as it uses a custom
 - [x] Protocol Conformance Descriptors
 - [x] Type Context Descriptors
 - [x] Associated Type Descriptors
+- [x] Method Symbol For Dyld Caches
+- [ ] Type Member Layout (WIP)
 - [ ] Builtin Type Descriptors
 - [ ] Capture Descriptors
-- [ ] Type Member Layout
-- [ ] Method Symbol For Dyld Caches
 
 ## Usage
 

README.md

@@ -23,4 +23,6 @@ public enum SwiftSymbolParseError: Error, Sendable {
     case integerOverflow(at: Int)
 
     case unimplementedFeature
+    
+    case requiredNonOptional
 }

Sources/Demangle/Enums/SwiftSymbolParseError.swift

@@ -114,11 +114,12 @@ extension Demangler {
     }
 
     private mutating func demangleSymbolicReference(rawValue: UInt8) throws -> Node {
+        
         guard let (kind, directness) = SymbolicReference.symbolicReference(for: rawValue) else {
-            throw SwiftSymbolParseError.unimplementedFeature
+            throw SwiftSymbolParseError.requiredNonOptional
         }
         guard let symbolicReferenceResolver, let symbol = symbolicReferenceResolver(kind, directness, symbolicReferenceIndex) else {
-            throw SwiftSymbolParseError.unimplementedFeature
+            throw SwiftSymbolParseError.requiredNonOptional
         }
         symbolicReferenceIndex += 1
         if (kind == .context || kind == .objectiveCProtocol) && (symbol.kind != .opaqueTypeDescriptorSymbolicReference && symbol.kind != .opaqueReturnTypeOf) {

Sources/Demangle/Main/Demangler.swift

@@ -6,4 +6,5 @@ package enum MachOFileName: String {
     case SourceEdit = "/Applications/SourceEdit.app"
     case SourceEditor = "/Applications/SourceEdit.app/Contents/Frameworks/SourceEditor.framework"
     case ControlCenter = "/System/Library/CoreServices/ControlCenter.app"
+    case Freeform = "/System/Applications/Freeform.app"
 }

Sources/MachOPointer/SignedPointer.swift

@@ -40,10 +40,10 @@ struct SwiftDumpTests {
         self.machOFileInCache = try #require(mainCache.machOFile(named: .AttributeGraph))
 
         // File
-        let file = try loadFromFile(named: .SourceEditor)
+        let file = try loadFromFile(named: .Freeform)
         switch file {
         case .fat(let fatFile):
-            self.machOFile = try #require(fatFile.machOFiles().first(where: { $0.header.cpu.type == .x86_64 }))
+            self.machOFile = try #require(fatFile.machOFiles().first(where: { $0.header.cpu.subtype == .arm64(.arm64e) }))
         case .machO(let machO):
             self.machOFile = machO
         @unknown default:
@@ -68,6 +68,14 @@ struct SwiftDumpTests {
     @Test func mangledName() async throws {
         try MetadataReader.demangleSymbol(for: .init(offset: 0, stringValue: "_$sSo10CUICatalogC7SwiftUIE9findAsset3key10matchTypes11assetLookupxSgAC10CatalogKeyV_q_AHSSXEtSo08CUINamedJ0CRbzSlR_AC0kE9MatchTypeO7ElementRt_r0_lFSo0M5ColorC_SayANGTB503$s7b3UI5q107V05NamedC033_F70ADAD69423F89598F901BDE477D497LLV14resolveCGColor2inSo0L3RefaSgAA17EnvironmentValuesV_tFSo08M12C0CSgSSXEfU_AbC0Q0V0uQ001_wxyZ10BDE477D497LLVAC0q5CacheL0AXLLVSiTf1nncn_nTf4nnngggn_n"), in: machOFile).print(using: printOptions).print()
     }
+    
+    @Test func dyldCacheLoaded() async throws {
+        let current = try #require(DyldCacheLoaded.current)
+        print(current.mainCacheHeader.sharedRegionStart)
+        for machOImage in current.machOImages() {
+            print(machOImage.ptr.uint, machOImage.path)
+        }
+    }
 }
 
 extension SwiftDumpTests {
@@ -167,7 +175,7 @@ extension SwiftDumpTests {
     private func dumpProtocolConformances(for machO: MachOFile) async throws {
         let protocolConformanceDescriptors = try machO.swift.protocolConformanceDescriptors
 
-        for (index, protocolConformanceDescriptor) in protocolConformanceDescriptors.enumerated() {
+        for protocolConformanceDescriptor in protocolConformanceDescriptors {
             try print(ProtocolConformance(descriptor: protocolConformanceDescriptor, in: machO).dump(using: printOptions, in: machO).string)
         }
     }