Hook up LLDB debugger backend on linux

IDEHelper/CMakeLists.txt

@@ -123,8 +123,6 @@ file(GLOB SRC_FILES
     Targets.cpp
     X86XmmInfo.cpp
 
-    LinuxDebugger.cpp
-
     Beef/BfCommon.cpp
     Clang/CDepChecker.cpp
     Clang/ClangHelper.cpp
@@ -183,9 +181,42 @@ else()
   message(FATAL_ERROR "LLVM not found")
 endif()
 
+set(DBG64_OBJECTS)
+
+# Windows builds debugger backends through separate Debugger32/Debugger64
+# Visual Studio projects, with BF_DBG_32/BF_DBG_64 defined at the target
+# level; those Windows debugger backend targets are not currently modeled in
+# CMake.  Do the same for Linux debugger sources here instead of compiling
+# them as part of the common IDEHelper source list.
+if(UNIX AND NOT APPLE)
+  set(DBG64_SRC LinuxDebugger.cpp)
+  find_path(LLDB_INCLUDE_DIR lldb/API/LLDB.h HINTS ${LLVM_INCLUDE_DIRS})
+  find_library(LLDB_LIBRARY NAMES lldb liblldb lldb-22 liblldb-22 HINTS ${LLVM_LIBRARY_DIRS})
+
+  if (LLDB_INCLUDE_DIR AND LLDB_LIBRARY)
+    message(STATUS "Found LLDB: ${LLDB_LIBRARY}")
+    list(APPEND DBG64_SRC LLDBDebugger.cpp)
+    string(APPEND TARGET_LIBS_OS " ${LLDB_LIBRARY}")
+    string(STRIP ${TARGET_LIBS_OS} TARGET_LIBS_OS)
+  else()
+    message(WARNING "LLDB was not found; Linux IDE debugger support will be disabled")
+  endif()
+
+  add_library(IDEHelperDebugger64 OBJECT ${DBG64_SRC})
+  target_compile_definitions(IDEHelperDebugger64 PRIVATE BF_DBG_64)
+  if (LLDB_INCLUDE_DIR AND LLDB_LIBRARY)
+    target_compile_definitions(IDEHelperDebugger64 PRIVATE LLDB_ENABLED)
+    target_include_directories(IDEHelperDebugger64 PRIVATE ${LLDB_INCLUDE_DIR})
+  endif()
+  set(DBG64_OBJECTS $<TARGET_OBJECTS:IDEHelperDebugger64>)
+else()
+  list(APPEND SRC_FILES LinuxDebugger.cpp)
+endif()
+
 # Add library to build.
 add_library(${PROJECT_NAME} STATIC
    ${SRC_FILES}
+   ${DBG64_OBJECTS}
 )
 
 if (HAVE_BACKTRACE_HEADERS)

IDEHelper/LLDBDebugger.cpp

@@ -4,7 +4,11 @@
 #ifdef LLDB_ENABLED
 
 #ifdef __linux__
+#include <limits.h>
 #include <unistd.h>
+#ifndef MAX_PATH
+#define MAX_PATH PATH_MAX
+#endif
 #endif
 #ifdef __APPLE__
 #include <mach/mach.h>
@@ -327,8 +331,9 @@ void LLDBDebugger::DoLaunch()
 
 	// Launch the process stopped at entry so the IDE can set up before running.
 	lldb::SBError launchError;
+	lldb::SBListener listener = debugger.GetListener();
 	lldb::SBProcess process = target.Launch(
-		debugger.GetListener(),
+		listener,
 		argv.size() > 1 ? &argv.front() : NULL,
 		envp.size() > 1 ? &envp.front() : NULL,
 		NULL, // stdin

IDEHelper/LinuxDebugger.cpp

@@ -1,6 +1,7 @@
 #include "BeefySysLib/Common.h"
 #include "LinuxDebugger.h"
 #include "Debugger.h"
+#include "LLDBDebugger.h"
 #include "X86Target.h"
 
 namespace Beefy
@@ -21,7 +22,11 @@ Beefy::Debugger* CreateDebugger64(DebugManager* debugManager, DbgMiniDump* miniD
 {
 	//if (gX86Target == NULL)
 	//	gX86Target = new X86Target();
+#ifdef LLDB_ENABLED
+	return new LLDBDebugger(debugManager);
+#else
 	return NULL;
+#endif
 }
 
-NS_BF_END
+NS_BF_END

IDEHelper/LinuxDebugger.h

@@ -1,10 +1,8 @@
-#define BF_DBG_64
-
-#include "DebugCommon.h"
-
-NS_BF_DBG_BEGIN
-
-
-
-
-NS_BF_DBG_END
+#include "DebugCommon.h"
+
+NS_BF_DBG_BEGIN
+
+
+
+
+NS_BF_DBG_END