Add more NetBSD platform glue for lldb

[krytarowski]

Summary

These changes are still incomplete, but we are almost there.

Changes:

• CMake and gmake code
• SWIG code
• minor code additions

[krytarowski]

+brucem, committer of the previous NetBSD glue

[akat1]

I've compiled it successfully on:

Distributor ID: Ubuntu
Description: Ubuntu 14.04.3 LTS
Release: 14.04
Codename: trusty
Linux AAH 3.13.0-46-generic #75-Ubuntu SMP Tue Feb 10 15:24:04 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux

[krytarowski]

I have successfully compiled this patch on FreeBSD.

$   uname -a
FreeBSD 10.1-RELEASE-p19 FreeBSD 10.1-RELEASE-p19 #0: Sat Aug 22 03:55:09 UTC 2015     [e-mail]:/usr/obj/usr/src/sys/GENERIC  amd64

[youri]

This builds on OS X:

Darwin mac.local 15.0.0 Darwin Kernel Version 15.0.0: Wed Aug 26 16:57:32 PDT 2015; root:xnu-3247.1.106~1/RELEASE_X86_64 x86_64

[brucem]

emaste, are you okay with this and willing to approve it?

It looks good to me.

[joerg]

LGTM

[emaste]

Fine by me.

I'm not sure how we ended up with the Python-with-semicolons in scripts/buildSwigWrapperClasses.py (prior to this change) though.

[brucem]

Kamil, please rebase forward and I'll land it.

The semicolons in Python are gone now. And so is the need for that block of Python at all.

[krytarowski]

Rebase to head

cmake/LLDBDependencies.cmake

set( LLDB_USED_LIBS
   lldbPluginObjectContainerMachOArchive
   lldbPluginProcessGDBRemote
   lldbPluginProcessUtility
   lldbPluginPlatformAndroid
   lldbPluginPlatformGDB
   lldbPluginPlatformFreeBSD
   lldbPluginPlatformKalimba
   lldbPluginPlatformLinux
+  lldbPluginPlatformNetBSD
   lldbPluginPlatformPOSIX
   lldbPluginPlatformWindows
   lldbPluginObjectContainerMachOArchive
   lldbPluginObjectContainerBSDArchive
   lldbPluginPlatformMacOSX
   lldbPluginDynamicLoaderMacOSXDYLD
   lldbPluginUnwindAssemblyInstEmulation
   lldbPluginUnwindAssemblyX86

 # FreeBSD-only libraries
 if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
   list(APPEND LLDB_USED_LIBS
     lldbPluginProcessFreeBSD
     lldbPluginProcessPOSIX
     )
 endif ()
 
+# NetBSD-only libraries
+if ( CMAKE_SYSTEM_NAME MATCHES "NetBSD" )
+  list(APPEND LLDB_USED_LIBS
+    lldbPluginProcessPOSIX
+    )
+endif ()
+
 # Darwin-only libraries
 if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
   list(APPEND LLDB_USED_LIBS
     lldbPluginDynamicLoaderDarwinKernel
     lldbPluginObjectFileMachO
     lldbPluginProcessMachCore
     lldbPluginProcessMacOSXKernel
     lldbPluginSymbolVendorMacOSX

cmake/modules/LLDBConfig.cmake

else()
         endif()
     endif()
 endif()
 
 # Figure out if lldb could use lldb-server.  If so, then we'll
 # ensure we build lldb-server when an lldb target is being built.
 if ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR
     (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR
-    (CMAKE_SYSTEM_NAME MATCHES "Linux"))
+    (CMAKE_SYSTEM_NAME MATCHES "Linux") OR
+    (CMAKE_SYSTEM_NAME MATCHES "NetBSD"))
     set(LLDB_CAN_USE_LLDB_SERVER 1)
 else()
     set(LLDB_CAN_USE_LLDB_SERVER 0)
 endif()
 
 # Figure out if lldb could use debugserver.  If so, then we'll
 # ensure we build debugserver when we build lldb.
 if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
     set(LLDB_CAN_USE_DEBUGSERVER 1)
 else()
     set(LLDB_CAN_USE_DEBUGSERVER 0)
 endif()

scripts/buildSwigWrapperClasses.py

def check_lldb_swig_executable_file_exists_FreeBSD( vDictArgs ):
     bExeFileFound = False;
     # ToDo: Find the SWIG executable and add the path to the args dictionary
     #vDictArgs.[ "--swigExePath" ] = "/usr/bin/swig";
     strStatusMsg = "Sorry function 'check_lldb_swig_executable_file_exists_FreeBSD()' is not implemented";
 
     return (bExeFileFound, strStatusMsg);
 
 #++---------------------------------------------------------------------------
+# Details:  Locate the SWIG executable file in a NetBSD system. Several hard
+#           coded predetermined possible file path locations are searched.
+#           (This is good candidate for a derived class object)
+# Args:     vDictArgs   - (W) Program input parameters.
+# Returns:  Bool    - True = Success.
+#                   - False = Failure file not found.
+#           Str     - Error message.
+# Throws:   None.
+#--
+def check_lldb_swig_executable_file_exists_NetBSD( vDictArgs ):
+    dbg = utilsDebug.CDebugFnVerbose( "check_lldb_swig_executable_file_exists_NetBSD()" );
+    bExeFileFound = False;
+    # ToDo: Find the SWIG executable and add the path to the args dictionary
+    #vDictArgs.[ "--swigExePath" ] = "/usr/bin/swig";
+    strStatusMsg = "Sorry function 'check_lldb_swig_executable_file_exists_NetBSD()' is not implemented";
+
+    return (bExeFileFound, strStatusMsg);
+
+#++---------------------------------------------------------------------------
 # Details:  Locate the SWIG executable file. Several hard coded predetermined
 #           possible file path locations are searched.
 # Args:     vDictArgs   - (RW) Program input parameters.
 #           veOSType    - (R) Current OS type enumeration.
 # Returns:  Bool    - True = Success.
 #                   - False = Failure file not found.
 #           Str     - Error message.
 # Throws:   None.
 #--
 def check_lldb_swig_executable_file_exists( vDictArgs, veOSType ):
     dbg = utilsDebug.CDebugFnVerbose( "check_lldb_swig_executable_file_exists()" );
     bExeFileFound = False;
     strStatusMsg = "";
     if "--swigExecutable" in vDictArgs:
         vDictArgs["--swigExeName"] = os.path.basename(vDictArgs["--swigExecutable"])
         vDictArgs["--swigExePath"] = os.path.dirname(vDictArgs["--swigExecutable"])
         bExeFileFound = True
     else:
         from utilsOsType import EnumOsType;
         switch = { EnumOsType.Unknown : check_lldb_swig_executable_file_exists_Unknown,
                EnumOsType.Darwin : check_lldb_swig_executable_file_exists_Darwin,
                EnumOsType.FreeBSD : check_lldb_swig_executable_file_exists_FreeBSD,
                EnumOsType.Linux : check_lldb_swig_executable_file_exists_Linux,
+               EnumOsType.NetBSD : check_lldb_swig_executable_file_exists_NetBSD,
                EnumOsType.Windows : check_lldb_swig_executable_file_exists_Windows }
         bExeFileFound, strStatusMsg = switch[ veOSType ]( vDictArgs );
     return (bExeFileFound, strStatusMsg);
 #++---------------------------------------------------------------------------
 # Details:  Validate the arguments passed to the program. This function exits
 #           the program should error with the arguments be found.
 # Args:     vArgv   - (R) List of arguments and values.
 # Returns:  Int     - 0 = success, -ve = some failure.

source/Initialization/SystemInitializerCommon.cpp

 #include "Plugins/OperatingSystem/Go/OperatingSystemGo.h"
 #include "Plugins/Platform/Android/PlatformAndroid.h"
 #include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h"
 #include "Plugins/Platform/Kalimba/PlatformKalimba.h"
 #include "Plugins/Platform/Linux/PlatformLinux.h"
 #include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"
 #include "Plugins/Platform/MacOSX/PlatformMacOSX.h"
 #include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h"
+#include "Plugins/Platform/NetBSD/PlatformNetBSD.h"
 #include "Plugins/Platform/Windows/PlatformWindows.h"
 #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
 
 #if defined(__APPLE__)
 #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
 #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
 #include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h"
 #endif

source/lldb.cpp

if (g_version_string[0] == '\0')
             (newline_loc - version_string < static_cast<ptrdiff_t>(version_len)))
             version_len = newline_loc - version_string;
         
         ::snprintf(g_version_string, version_len + 1, "%s", version_string);
     }
 
     return g_version_string;
 #else
-    // On Linux/FreeBSD/Windows, report a version number in the same style as the clang tool.
+    // On platforms other than Darwin, report a version number in the same style as the clang tool.
     static std::string g_version_str;
     if (g_version_str.empty())
     {
         g_version_str += "lldb version ";
         g_version_str += CLANG_VERSION_STRING;
         const char * lldb_repo = GetLLDBRepository();
         if (lldb_repo)
         {

tools/Makefile

 ##===- source/Makefile -------------------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ..
 include $(LLDB_LEVEL)/../../Makefile.config
 
 DIRS :=
 
 # enable lldb-gdbserver for supported platforms
-ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD)))
+ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux NetBSD GNU/kFreeBSD)))
 DIRS += lldb-server
 endif
 
 ifeq ($(HOST_OS),Darwin)
 DIRS += debugserver
 endif
 
 ifeq ($(ENABLE_WERROR),0)
 DIRS += lldb-mi
 endif
 
 DIRS += driver
 
 include $(LLDB_LEVEL)/Makefile

tools/lldb-mi/CMakeLists.txt

set(LLDB_MI_SOURCES
   MIUtilFileStd.cpp
   MIUtilMapIdToVariant.cpp
   MIUtilString.cpp
   MIUtilThreadBaseStd.cpp
   MIUtilVariant.cpp
   Platform.cpp
   )
 
-if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+if ( CMAKE_SYSTEM_NAME MATCHES "Windows" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD" )
   add_definitions( -DIMPORT_LIBLLDB )
   list(APPEND LLDB_MI_SOURCES
     ${LLDB_SOURCE_ROOT}/Host/common/GetOptInc.cpp
     )
 endif ()
 
 include(../../cmake/LLDBDependencies.cmake)