Fix formatting and iOS compatibility

Author: MaxDesiatov

[email protected]

@@ -8,7 +8,7 @@ let DarwinPlatforms: [Platform] = [.macOS, .iOS, .watchOS, .tvOS, .visionOS]
 
 let package = Package(
     name: "WasmKit",
-    platforms: [.macOS(.v14), .iOS(.v12)],
+    platforms: [.macOS(.v14), .iOS(.v13)],
     products: [
         .executable(name: "wasmkit-cli", targets: ["CLI"]),
         .library(name: "WasmKit", targets: ["WasmKit"]),

Sources/WasmKit/Execution/Errors.swift

@@ -17,8 +17,8 @@ struct Backtrace: CustomStringConvertible, Sendable {
 
             var description: String {
                 switch self {
-                    case .iseq(let pc): "iseq(\(Int(bitPattern: pc)))"
-                    case .wasm(let wasmAddress): "wasm(\(wasmAddress))"
+                case .iseq(let pc): "iseq(\(Int(bitPattern: pc)))"
+                case .wasm(let wasmAddress): "wasm(\(wasmAddress))"
                 }
             }
         }

Sources/WasmKit/Module.swift

@@ -138,17 +138,17 @@ public struct Module {
         Instance(handle: try self.instantiateHandle(store: store, imports: imports), store: store)
     }
 
-#if WasmDebuggingSupport
-    /// Instantiate this module in the given imports.
-    ///
-    /// - Parameters:
-    ///   - store: The ``Store`` to allocate the instance in.
-    ///   - imports: The imports to use for instantiation. All imported entities
-    ///     must be allocated in the given store.
-    public func instantiate(store: Store, imports: Imports = [:], isDebuggable: Bool) throws -> Instance {
-        Instance(handle: try self.instantiateHandle(store: store, imports: imports, isDebuggable: isDebuggable), store: store)
-    }
-#endif
+    #if WasmDebuggingSupport
+        /// Instantiate this module in the given imports.
+        ///
+        /// - Parameters:
+        ///   - store: The ``Store`` to allocate the instance in.
+        ///   - imports: The imports to use for instantiation. All imported entities
+        ///     must be allocated in the given store.
+        public func instantiate(store: Store, imports: Imports = [:], isDebuggable: Bool) throws -> Instance {
+            Instance(handle: try self.instantiateHandle(store: store, imports: imports, isDebuggable: isDebuggable), store: store)
+        }
+    #endif
 
     /// > Note:
     /// <https://webassembly.github.io/spec/core/exec/modules.html#instantiation>

Sources/WasmKitGDBHandler/WasmKitDebugger.swift

@@ -19,43 +19,44 @@ package actor WasmKitDebugger {
         let responseKind: GDBTargetResponse.Kind
         logger.trace("handling GDB host command", metadata: ["GDBHostCommand": .string(command.kind.rawValue)])
 
-        responseKind = switch command.kind {
-        case .startNoAckMode, .isThreadSuffixSupported, .listThreadsInStopReply:
-            .ok
+        responseKind =
+            switch command.kind {
+            case .startNoAckMode, .isThreadSuffixSupported, .listThreadsInStopReply:
+                .ok
 
-        case .hostInfo:
-            .keyValuePairs([
-                "arch": "wasm32",
-                "ptrsize": "4",
-                "endian": "little",
-                "ostype": "wasip1",
-                "vendor": "WasmKit",
-            ])
+            case .hostInfo:
+                .keyValuePairs([
+                    "arch": "wasm32",
+                    "ptrsize": "4",
+                    "endian": "little",
+                    "ostype": "wasip1",
+                    "vendor": "WasmKit",
+                ])
 
-        case .supportedFeatures:
-            // FIXME: should return a different set of supported features instead of echoing.
-            .raw(command.arguments)
+            case .supportedFeatures:
+                // FIXME: should return a different set of supported features instead of echoing.
+                .raw(command.arguments)
 
-        case .vContSupportedActions:
-            .vContSupportedActions([.continue, .step, .stop])
+            case .vContSupportedActions:
+                .vContSupportedActions([.continue, .step, .stop])
 
-        case .isVAttachOrWaitSupported, .enableErrorStrings:
-            .empty
-        case .processInfo:
-            .raw("pid:1;parent-pid:1;arch:wasm32;endian:little;ptrsize:4;")
+            case .isVAttachOrWaitSupported, .enableErrorStrings:
+                .empty
+            case .processInfo:
+                .raw("pid:1;parent-pid:1;arch:wasm32;endian:little;ptrsize:4;")
 
-        case .currentThreadID:
-            .raw("QC1")
+            case .currentThreadID:
+                .raw("QC1")
 
-        case .firstThreadInfo:
-            .raw("m1")
+            case .firstThreadInfo:
+                .raw("m1")
 
-        case .subsequentThreadInfo:
-            .raw("l")
+            case .subsequentThreadInfo:
+                .raw("l")
 
-        case .generalRegisters:
-            fatalError()
-        }
+            case .generalRegisters:
+                fatalError()
+            }
 
         defer {
             if command.kind == .startNoAckMode {