https://github.com/charles-zablit updated https://github.com/llvm/llvm-project/pull/201638
>From 488a6ce990aa489d73306795d3e40112a499bc9e Mon Sep 17 00:00:00 2001 From: Charles Zablit <[email protected]> Date: Thu, 4 Jun 2026 18:09:30 +0100 Subject: [PATCH 1/3] [lldb][Windows] add stdin support to lldb-server --- .../lldb/Host/common/NativeProcessProtocol.h | 6 ++++- .../Host/windows/ConnectionConPTYWindows.cpp | 27 ++++++++++++++++++- .../Windows/Common/NativeProcessWindows.cpp | 15 +++++++++++ .../Windows/Common/NativeProcessWindows.h | 7 +++++ .../Process/Windows/Common/ProcessWindows.cpp | 1 + .../GDBRemoteCommunicationServerLLGS.cpp | 9 ++++++- .../Process/gdb-remote/ProcessGDBRemote.cpp | 16 ++++++++++- 7 files changed, 77 insertions(+), 4 deletions(-) diff --git a/lldb/include/lldb/Host/common/NativeProcessProtocol.h b/lldb/include/lldb/Host/common/NativeProcessProtocol.h index 4e4804623b1d8..435185a38f3f9 100644 --- a/lldb/include/lldb/Host/common/NativeProcessProtocol.h +++ b/lldb/include/lldb/Host/common/NativeProcessProtocol.h @@ -247,8 +247,12 @@ class NativeProcessProtocol { // Access to inferior stdio virtual int GetTerminalFileDescriptor() { return m_terminal_fd; } - // Stop id interface + /// Write up to \p len bytes from \p buf to the inferior's stdin. + virtual size_t WriteStdin(const void *buf, size_t len, Status &error) { + return 0; + } + // Stop id interface uint32_t GetStopID() const; // Callbacks for low-level process state changes diff --git a/lldb/source/Host/windows/ConnectionConPTYWindows.cpp b/lldb/source/Host/windows/ConnectionConPTYWindows.cpp index e9d026fc7dc9f..f7e90421653e3 100644 --- a/lldb/source/Host/windows/ConnectionConPTYWindows.cpp +++ b/lldb/source/Host/windows/ConnectionConPTYWindows.cpp @@ -61,5 +61,30 @@ size_t ConnectionConPTY::Read(void *dst, size_t dst_len, size_t ConnectionConPTY::Write(const void *src, size_t src_len, lldb::ConnectionStatus &status, Status *error_ptr) { - llvm_unreachable("not implemented"); + if (!m_pty || !m_pty->IsConnected()) { + status = eConnectionStatusNoConnection; + if (error_ptr) + *error_ptr = Status::FromErrorString("ConPTY not connected"); + return 0; + } + HANDLE stdin_handle = m_pty->GetSTDINHandle(); + if (stdin_handle == INVALID_HANDLE_VALUE || stdin_handle == nullptr) { + status = eConnectionStatusNoConnection; + if (error_ptr) + *error_ptr = Status::FromErrorString("ConPTY STDIN handle is invalid"); + return 0; + } + DWORD written = 0; + if (!::WriteFile(stdin_handle, src, static_cast<DWORD>(src_len), &written, + nullptr)) { + DWORD err = ::GetLastError(); + status = (err == ERROR_BROKEN_PIPE || err == ERROR_NO_DATA) + ? eConnectionStatusEndOfFile + : eConnectionStatusError; + if (error_ptr) + *error_ptr = Status(err, lldb::eErrorTypeWin32); + return written; + } + status = eConnectionStatusSuccess; + return written; } diff --git a/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp index b235ab281bad6..bf447c9ea81f5 100644 --- a/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp @@ -749,4 +749,19 @@ void NativeProcessWindows::STDIOReadThreadBytesReceived(void *baton, self->m_delegate.NewProcessOutput( self, llvm::StringRef(static_cast<const char *>(src), src_len)); } + +size_t NativeProcessWindows::WriteStdin(const void *buf, size_t len, + Status &error) { + if (!m_stdio_communication.HasConnection()) { + error = Status::FromErrorString( + "no ConPTY connection on this NativeProcessWindows"); + return 0; + } + ConnectionStatus status; + size_t written = m_stdio_communication.Write(buf, len, status, &error); + if (status != eConnectionStatusSuccess && error.Success()) + error = Status::FromErrorStringWithFormatv( + "ConPTY stdin write returned status {0}", static_cast<int>(status)); + return written; +} } // namespace lldb_private diff --git a/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.h b/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.h index 95b85754ebdeb..cac3920d82aa9 100644 --- a/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.h +++ b/lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.h @@ -107,6 +107,13 @@ class NativeProcessWindows : public NativeProcessProtocol, bool HasPendingLibraryEvents() override; + /// Forward bytes from the gdb-remote `I` packet into the inferior's + /// ConPTY-backed stdin via `m_stdio_communication.Write` → + /// `ConnectionConPTY::Write` → `WriteFile` on the parent-side STDIN + /// HANDLE. Returns the number of bytes written (0 if the PTY is + /// disconnected or write fails). + size_t WriteStdin(const void *buf, size_t len, Status &error) override; + // ProcessDebugger Overrides void OnExitProcess(uint32_t exit_code) override; void OnDebuggerConnected(lldb::addr_t image_base) override; diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp index 941c25e9ecb77..d6776260806f3 100644 --- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp @@ -46,6 +46,7 @@ #include "ForwardDecl.h" #include "IOHandlerProcessSTDIOWindows.h" #include "LocalDebugDelegate.h" +#include "Plugins/Process/Utility/IOHandlerProcessSTDIOWindows.h" #include "ProcessWindowsLog.h" #include "TargetThreadWindows.h" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp index d56026e011564..077144f94227d 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp @@ -2569,12 +2569,19 @@ GDBRemoteCommunicationServerLLGS::Handle_I(StringExtractorGDBRemote &packet) { // write directly to stdin *this might block if stdin buffer is full* // TODO: enqueue this block in circular buffer and send window size to // remote host - ConnectionStatus status; Status error; + +#if defined(_WIN32) + // On Windows the inferior's stdio is owned by NativeProcessWindows. + if (m_current_process->WriteStdin(tmp, read, error) != read || error.Fail()) + return SendErrorResponse(0x15); +#else + ConnectionStatus status; m_stdio_communication.WriteAll(tmp, read, status, &error); if (error.Fail()) { return SendErrorResponse(0x15); } +#endif } return SendOKResponse(); diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index f6eaf5851338b..1cded3f428e0b 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -95,6 +95,10 @@ #include "llvm/Support/Threading.h" #include "llvm/Support/raw_ostream.h" +#ifdef _WIN32 +#include "Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.h" +#endif + #if defined(__APPLE__) #define DEBUGSERVER_BASENAME "debugserver" #elif defined(_WIN32) @@ -873,8 +877,18 @@ Status ProcessGDBRemote::DoLaunch(lldb_private::Module *exe_module, SetPrivateState(SetThreadStopInfo(response)); if (!disable_stdio) { - if (pty.GetPrimaryFileDescriptor() != PseudoTerminal::invalid_fd) + if (pty.GetPrimaryFileDescriptor() != PseudoTerminal::invalid_fd) { SetSTDIOFileDescriptor(pty.ReleasePrimaryFileDescriptor()); + } +#ifdef _WIN32 + else if (m_stdin_forward) { + // No client-side PTY FD on Windows. + std::lock_guard<std::mutex> guard(m_process_input_reader_mutex); + if (!m_process_input_reader) + m_process_input_reader = + std::make_shared<IOHandlerProcessSTDIOWindows>(this); + } +#endif } } } else { >From f81f3cf8724598610203f43b1b8510b201bce234 Mon Sep 17 00:00:00 2001 From: Charles Zablit <[email protected]> Date: Fri, 5 Jun 2026 17:38:51 +0100 Subject: [PATCH 2/3] fixup! [lldb][Windows] add stdin support to lldb-server --- lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp index d6776260806f3..941c25e9ecb77 100644 --- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp @@ -46,7 +46,6 @@ #include "ForwardDecl.h" #include "IOHandlerProcessSTDIOWindows.h" #include "LocalDebugDelegate.h" -#include "Plugins/Process/Utility/IOHandlerProcessSTDIOWindows.h" #include "ProcessWindowsLog.h" #include "TargetThreadWindows.h" >From f06b19cc8eeff2756d8c56a43513e38a569129b6 Mon Sep 17 00:00:00 2001 From: Charles Zablit <[email protected]> Date: Mon, 8 Jun 2026 13:33:39 +0100 Subject: [PATCH 3/3] move IOHandlerProcessSTDIOWindows --- .../lldb/Target}/IOHandlerProcessSTDIOWindows.h | 10 ++++++---- .../Plugins/Process/Windows/Common/CMakeLists.txt | 1 - .../Plugins/Process/Windows/Common/ProcessWindows.cpp | 2 +- .../Plugins/Process/gdb-remote/ProcessGDBRemote.cpp | 2 +- lldb/source/Target/CMakeLists.txt | 1 + .../Common => Target}/IOHandlerProcessSTDIOWindows.cpp | 6 +++++- 6 files changed, 14 insertions(+), 8 deletions(-) rename lldb/{source/Plugins/Process/Windows/Common => include/lldb/Target}/IOHandlerProcessSTDIOWindows.h (84%) rename lldb/source/{Plugins/Process/Windows/Common => Target}/IOHandlerProcessSTDIOWindows.cpp (98%) diff --git a/lldb/source/Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.h b/lldb/include/lldb/Target/IOHandlerProcessSTDIOWindows.h similarity index 84% rename from lldb/source/Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.h rename to lldb/include/lldb/Target/IOHandlerProcessSTDIOWindows.h index 79a414eeda12f..0b140fe602fca 100644 --- a/lldb/source/Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.h +++ b/lldb/include/lldb/Target/IOHandlerProcessSTDIOWindows.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LIBLLDB_PLUGINS_PROCESS_WINDOWS_COMMON_IO_HANDLER_PROCESS_STDIO_WINDOWS_H_ -#define LIBLLDB_PLUGINS_PROCESS_WINDOWS_COMMON_IO_HANDLER_PROCESS_STDIO_WINDOWS_H_ +#ifndef LLDB_TARGET_IOHANDLERPROCESSSTDIOWINDOWS_H +#define LLDB_TARGET_IOHANDLERPROCESSSTDIOWINDOWS_H #include "lldb/Core/IOHandler.h" #include "lldb/Host/File.h" @@ -15,7 +15,7 @@ using HANDLE = void *; -using namespace lldb_private; +namespace lldb_private { class IOHandlerProcessSTDIOWindows : public IOHandler { public: @@ -60,4 +60,6 @@ class IOHandlerProcessSTDIOWindows : public IOHandler { bool m_is_running = false; }; -#endif // LIBLLDB_PLUGINS_PROCESS_WINDOWS_COMMON_IO_HANDLER_PROCESS_STDIO_WINDOWS_H_ +} // namespace lldb_private + +#endif // LLDB_TARGET_IOHANDLERPROCESSSTDIOWINDOWS_H diff --git a/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt b/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt index bd076d5d64df1..9854b79fbb8d6 100644 --- a/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt +++ b/lldb/source/Plugins/Process/Windows/Common/CMakeLists.txt @@ -1,6 +1,5 @@ add_lldb_library(lldbPluginProcessWindowsCommon PLUGIN - IOHandlerProcessSTDIOWindows.cpp DebuggerThread.cpp LocalDebugDelegate.cpp NativeProcessWindows.cpp diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp index 941c25e9ecb77..b47b78e86e94c 100644 --- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp @@ -28,6 +28,7 @@ #include "lldb/Host/windows/HostThreadWindows.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/DynamicLoader.h" +#include "lldb/Target/IOHandlerProcessSTDIOWindows.h" #include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/StopInfo.h" #include "lldb/Target/Target.h" @@ -44,7 +45,6 @@ #include "DebuggerThread.h" #include "ExceptionRecord.h" #include "ForwardDecl.h" -#include "IOHandlerProcessSTDIOWindows.h" #include "LocalDebugDelegate.h" #include "ProcessWindowsLog.h" #include "TargetThreadWindows.h" diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 68f3eb0752973..f44cc4fd36b15 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -102,7 +102,7 @@ #include "llvm/Support/raw_ostream.h" #ifdef _WIN32 -#include "Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.h" +#include "lldb/Target/IOHandlerProcessSTDIOWindows.h" #endif #if defined(__APPLE__) diff --git a/lldb/source/Target/CMakeLists.txt b/lldb/source/Target/CMakeLists.txt index ee9b68525e201..af13b34037e59 100644 --- a/lldb/source/Target/CMakeLists.txt +++ b/lldb/source/Target/CMakeLists.txt @@ -19,6 +19,7 @@ add_lldb_library(lldbTarget ExecutionContext.cpp InstrumentationRuntime.cpp InstrumentationRuntimeStopInfo.cpp + IOHandlerProcessSTDIOWindows.cpp JITLoader.cpp JITLoaderList.cpp Language.cpp diff --git a/lldb/source/Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.cpp b/lldb/source/Target/IOHandlerProcessSTDIOWindows.cpp similarity index 98% rename from lldb/source/Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.cpp rename to lldb/source/Target/IOHandlerProcessSTDIOWindows.cpp index 2b9ab9ce0812b..69fe0b1585ac7 100644 --- a/lldb/source/Plugins/Process/Windows/Common/IOHandlerProcessSTDIOWindows.cpp +++ b/lldb/source/Target/IOHandlerProcessSTDIOWindows.cpp @@ -6,7 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "IOHandlerProcessSTDIOWindows.h" +#include "lldb/Target/IOHandlerProcessSTDIOWindows.h" + +#ifdef _WIN32 #include "lldb/Host/windows/windows.h" #include "lldb/Utility/LLDBLog.h" @@ -170,3 +172,5 @@ bool IOHandlerProcessSTDIOWindows::Interrupt() { } return false; } + +#endif // _WIN32 _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
