Merge branch 'maxd/lldb-remote-protocol' of github.com:swiftwasm/WasmKit into maxd/debugging-breakpoints

Author: MaxDesiatov

[email protected]

@@ -178,19 +178,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
             exclude: ["Fixtures"]
         ),
 
-        .executableTarget(
-            name: "wasmkit-gdb-tool",
-            dependencies: [
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "Logging", package: "swift-log"),
-                .product(name: "NIOCore", package: "swift-nio"),
-                .product(name: "NIOPosix", package: "swift-nio"),
-                .product(name: "SystemPackage", package: "swift-system"),
-                "GDBRemoteProtocol",
-                "WasmKitGDBHandler",
-            ]
-        ),
-
         .target(
             name: "WasmKitGDBHandler",
             dependencies: [

Sources/GDBRemoteProtocol/GDBHostCommandDecoder.swift

@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
 import Logging
 import NIOCore
 

Sources/GDBRemoteProtocol/GDBTargetResponse.swift

@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
 import NIOCore
 
 /// Actions supported in the `vCont` host command.

Sources/GDBRemoteProtocol/GDBTargetResponseEncoder.swift

@@ -1,3 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
 import Foundation
 import NIOCore
 

Sources/WAT/Encoder.swift

@@ -158,7 +158,6 @@ extension TableType: WasmEncodable {
 struct ElementExprCollector: AnyInstructionVisitor {
     typealias Output = Void
 
-    var binaryOffset: Int = 0
     var isAllRefFunc: Bool = true
     var instructions: [Instruction] = []
 
@@ -444,7 +443,6 @@ extension WatParser.DataSegmentDecl {
 }
 
 struct ExpressionEncoder: BinaryInstructionEncoder {
-    var binaryOffset: Int = 0
     var encoder = Encoder()
     var hasDataSegmentInstruction: Bool = false
 

Sources/WAT/Parser/WastParser.swift

@@ -54,7 +54,6 @@ struct WastParser {
     }
 
     struct ConstExpressionCollector: WastConstInstructionVisitor {
-        var binaryOffset: Int = 0
         let addValue: (Value) -> Void
 
         mutating func visitI32Const(value: Int32) throws { addValue(.i32(UInt32(bitPattern: value))) }

Sources/WasmKit/Execution/Debugger.swift

@@ -5,21 +5,19 @@ import struct WasmParser.Import
 /// The backtrace of the trap.
 struct Backtrace: CustomStringConvertible, Sendable {
     /// A symbol in the backtrace.
-    struct Symbol: @unchecked Sendable {
+    struct Symbol {
         /// The name of the symbol.
         let name: String?
-        let address: Pc
     }
 
     /// The symbols in the backtrace.
-    let symbols: [Symbol]
+    let symbols: [Symbol?]
 
     /// Textual description of the backtrace.
     var description: String {
-        print("backtrace contains \(symbols.count) symbols")
-        return symbols.enumerated().map { (index, symbol) in
-            let name = symbol.name ?? "unknown"
-            return "    \(index): (\(symbol.address)) \(name)"
+        symbols.enumerated().map { (index, symbol) in
+            let name = symbol?.name ?? "unknown"
+            return "    \(index): \(name)"
         }.joined(separator: "\n")
     }
 }

Sources/WasmKit/Execution/Errors.swift

@@ -4,7 +4,7 @@ import _CWasmKit
 ///
 /// Each new invocation through exported function has a separate ``Execution``
 /// even though the invocation happens during another invocation.
-struct Execution: ~Copyable {
+struct Execution {
     /// The reference to the ``Store`` associated with the execution.
     let store: StoreRef
     /// The end of the VM stack space.
@@ -14,13 +14,6 @@ struct Execution: ~Copyable {
     /// - Note: If the trap is set, it must be released manually.
     private var trap: (error: UnsafeRawPointer, sp: Sp)? = nil
 
-    #if WasmDebuggingSupport
-        package init(store: StoreRef, stackEnd: UnsafeMutablePointer<StackSlot>) {
-            self.store = store
-            self.stackEnd = stackEnd
-        }
-    #endif
-
     /// Executes the given closure with a new execution state associated with
     /// the given ``Store`` instance.
     static func with<T>(
@@ -68,15 +61,18 @@ struct Execution: ~Copyable {
 
     static func captureBacktrace(sp: Sp, store: Store) -> Backtrace {
         var frames = FrameIterator(sp: sp)
-        var symbols: [Backtrace.Symbol] = []
-
+        var symbols: [Backtrace.Symbol?] = []
         while let frame = frames.next() {
             guard let function = frame.function else {
-                symbols.append(.init(name: nil, address: frame.pc))
+                symbols.append(nil)
                 continue
             }
             let symbolName = store.nameRegistry.symbolicate(.wasm(function))
-            symbols.append(.init(name: symbolName, address: frame.pc))
+            symbols.append(
+                Backtrace.Symbol(
+                    name: symbolName
+                )
+            )
         }
         return Backtrace(symbols: symbols)
     }
@@ -252,7 +248,7 @@ extension Sp {
         nonmutating set { self[-1] = UInt64(UInt(bitPattern: newValue)) }
     }
 
-    var currentInstance: InternalInstance? {
+    fileprivate var currentInstance: InternalInstance? {
         currentFunction?.instance
     }
 }

Sources/WasmKit/Execution/Execution.swift

@@ -243,7 +243,7 @@ struct WasmFunctionEntity {
         switch code {
         case .uncompiled(let code):
             return try compile(store: store, code: code)
-        case .compiled(let iseq), .debuggable(_, let iseq):
+        case .compiled(let iseq), .compiledAndPatchable(_, let iseq):
             return iseq
         }
     }
@@ -280,14 +280,10 @@ extension EntityHandle<WasmFunctionEntity> {
         case .uncompiled(let code):
             return try self.withValue {
                 let iseq = try $0.compile(store: store, code: code)
-                if $0.instance.isDebuggable {
-                    $0.code = .debuggable(code, iseq)
-                } else {
-                    $0.code = .compiled(iseq)
-                }
+                $0.code = .compiled(iseq)
                 return iseq
             }
-        case .compiled(let iseq), .debuggable(_, let iseq):
+        case .compiled(let iseq), .compiledAndPatchable(_, let iseq):
             return iseq
         }
     }
@@ -320,7 +316,7 @@ struct InstructionSequence {
 enum CodeBody {
     case uncompiled(InternalUncompiledCode)
     case compiled(InstructionSequence)
-    case debuggable(InternalUncompiledCode, InstructionSequence)
+    case compiledAndPatchable(InternalUncompiledCode, InstructionSequence)
 }
 
 extension Reference {