diff --git a/CMakeLists.txt b/CMakeLists.txt index 0253a1d..7f97668 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") # lldb requires c++11 to build. Make sure that we have a compiler and standard # library combination that can do that. -if (MSVC11) +if (MSVC11 OR MSVC12) # Do nothing, we're good. elseif (NOT MSVC) # gcc and clang require the -std=c++0x or -std=c++11 flag. @@ -240,6 +240,12 @@ install(DIRECTORY include/ PATTERN ".svn" EXCLUDE ) +# Some additional headers MSVC doesn't have +if (MSVC) + include_directories(BEFORE + ${CMAKE_CURRENT_SOURCE_DIR}/include/msvc + ) +endif() # Find libraries or frameworks that may be needed if (CMAKE_SYSTEM_NAME MATCHES "Darwin") diff --git a/include/lldb/Breakpoint/BreakpointLocation.h b/include/lldb/Breakpoint/BreakpointLocation.h index 9ab0a79..0f30f08 100644 --- a/include/lldb/Breakpoint/BreakpointLocation.h +++ b/include/lldb/Breakpoint/BreakpointLocation.h @@ -27,6 +27,8 @@ #include "lldb/Target/Process.h" #include "lldb/Expression/ClangUserExpression.h" +class CommandObjectBreakpointCommandAdd; + namespace lldb_private { //---------------------------------------------------------------------- diff --git a/include/lldb/DataFormatters/CXXFormatterFunctions.h b/include/lldb/DataFormatters/CXXFormatterFunctions.h index 2f56c56..4605598 100644 --- a/include/lldb/DataFormatters/CXXFormatterFunctions.h +++ b/include/lldb/DataFormatters/CXXFormatterFunctions.h @@ -153,6 +153,7 @@ namespace lldb_private { bool RuntimeSpecificDescriptionSummaryProvider (ValueObject& valobj, Stream& stream); +#ifndef _MSC_VER extern template bool NSDictionarySummaryProvider (ValueObject&, Stream&) ; @@ -170,6 +171,7 @@ namespace lldb_private { extern template bool ObjCSELSummaryProvider (ValueObject&, Stream&); +#endif class NSArrayMSyntheticFrontEnd : public SyntheticChildrenFrontEnd { diff --git a/include/lldb/DataFormatters/FormatManager.h b/include/lldb/DataFormatters/FormatManager.h index 162e251..46792c8 100644 --- a/include/lldb/DataFormatters/FormatManager.h +++ b/include/lldb/DataFormatters/FormatManager.h @@ -191,7 +191,11 @@ public: void Changed () { +#ifdef _MSC_VER + InterlockedIncrement(&m_last_revision); +#else __sync_add_and_fetch(&m_last_revision, +1); +#endif m_format_cache.Clear (); } diff --git a/include/lldb/Host/Config.h b/include/lldb/Host/Config.h index 2d5d39b..91d5913 100644 --- a/include/lldb/Host/Config.h +++ b/include/lldb/Host/Config.h @@ -26,6 +26,10 @@ #include "lldb/Host/mingw/Config.h" +#elif defined(_MSC_VER) + +#include "lldb/Host/msvc/Config.h" + #else #error undefined platform diff --git a/include/lldb/Host/TimeValue.h b/include/lldb/Host/TimeValue.h index 8c43d6d..987b66d 100644 --- a/include/lldb/Host/TimeValue.h +++ b/include/lldb/Host/TimeValue.h @@ -12,12 +12,17 @@ // C Includes #include +#ifdef _MSC_VER +#include "lldb/Host/windows/windows.h" +#include +#else #include // BEGIN: MinGW work around #if !defined(_STRUCT_TIMESPEC) && !defined(HAVE_STRUCT_TIMESPEC) #include #endif +#endif // END: MinGW work around // C++ Includes diff --git a/include/lldb/Host/msvc/Config.h b/include/lldb/Host/msvc/Config.h new file mode 100644 index 0000000..cdf6f21 --- /dev/null +++ b/include/lldb/Host/msvc/Config.h @@ -0,0 +1,30 @@ +//===-- Config.h -----------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +//---------------------------------------------------------------------- +// LLDB currently doesn't have a dynamic configuration mechanism, so we +// are going to hardcode things for now. Eventually these files will +// be auto generated by some configuration script that can detect +// platform functionality availability. +//---------------------------------------------------------------------- + +#ifndef liblldb_Platform_Config_h_ +#define liblldb_Platform_Config_h_ + +#define LLDB_DISABLE_POSIX + +//#define LLDB_CONFIG_TERMIOS_SUPPORTED 1 + +//#define LLDB_CONFIG_TILDE_RESOLVES_TO_USER 1 + +//#define LLDB_CONFIG_DLOPEN_RTLD_FIRST_SUPPORTED 1 + +//#define LLDB_CONFIG_FCNTL_GETPATH_SUPPORTED 1 + +#endif // #ifndef liblldb_Platform_Config_h_ diff --git a/include/lldb/Host/windows/win32.h b/include/lldb/Host/windows/win32.h index 918c000..e3030d3 100644 --- a/include/lldb/Host/windows/win32.h +++ b/include/lldb/Host/windows/win32.h @@ -40,4 +40,42 @@ char* realpath(const char * name, char * resolved); #define S_IRWXG 0 #define S_IRWXO 0 +#ifdef _MSC_VER + +#include +#include +typedef unsigned short mode_t; +typedef uint32_t pid_t; + +int usleep(uint32_t useconds); + +char* getcwd(char* path, int max); +char* basename(char *path); +char *dirname(char *path); + +int strcasecmp(const char* s1, const char* s2); +int strncasecmp(const char* s1, const char* s2, size_t n); + + +#define PATH_MAX MAX_PATH +#define STDIN_FILENO 0 +#define STDOUT_FILENO 1 +#define STDERR_FILENO 2 + +#define __PRETTY_FUNCTION__ __FUNCSIG__ + +#define S_IFDIR _S_IFDIR +#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) + +#define snprintf _snprintf + +// timespec +struct timespec +{ + time_t tv_sec; + long tv_nsec; +}; + +#endif + #endif // LLDB_lldb_win32_h_ diff --git a/include/lldb/Host/windows/windows.h b/include/lldb/Host/windows/windows.h index de6d9b8..760b13b 100644 --- a/include/lldb/Host/windows/windows.h +++ b/include/lldb/Host/windows/windows.h @@ -22,5 +22,10 @@ #undef LoadImage #undef GetUserName #undef far +#undef near +#undef FAR +#undef NEAR +#define FAR +#define NEAR #endif // LLDB_lldb_windows_h_ diff --git a/include/lldb/Interpreter/OptionValueEnumeration.h b/include/lldb/Interpreter/OptionValueEnumeration.h index 012eeb6..68beddf 100644 --- a/include/lldb/Interpreter/OptionValueEnumeration.h +++ b/include/lldb/Interpreter/OptionValueEnumeration.h @@ -34,7 +34,7 @@ public: const char *description; }; typedef UniqueCStringMap EnumerationMap; - typedef typename EnumerationMap::Entry EnumerationMapEntry; + typedef EnumerationMap::Entry EnumerationMapEntry; OptionValueEnumeration (const OptionEnumValueElement *enumerators, enum_type value); diff --git a/include/lldb/Target/Process.h b/include/lldb/Target/Process.h index 15ae87a..2488a59 100644 --- a/include/lldb/Target/Process.h +++ b/include/lldb/Target/Process.h @@ -47,6 +47,8 @@ #include "lldb/Target/UnixSignals.h" #include "lldb/Utility/PseudoTerminal.h" +class CommandObjectProcessLaunch; + namespace lldb_private { //---------------------------------------------------------------------- diff --git a/include/lldb/Utility/RefCounter.h b/include/lldb/Utility/RefCounter.h index 6daed54..1f88f71 100644 --- a/include/lldb/Utility/RefCounter.h +++ b/include/lldb/Utility/RefCounter.h @@ -12,6 +12,10 @@ #include "lldb/lldb-public.h" +#ifdef _MSC_VER +#include "lldb/Host/windows/windows.h" +#endif + namespace lldb_utility { //---------------------------------------------------------------------- @@ -39,14 +43,22 @@ private: inline T increment(T* t) { +#ifdef _MSC_VER + return InterlockedIncrement((LONG*)&t); +#else return __sync_fetch_and_add(t, 1); +#endif } template inline T decrement(T* t) { +#ifdef _MSC_VER + return InterlockedIncrement((LONG*)&t); +#else return __sync_fetch_and_add(t, -1); +#endif } }; diff --git a/include/lldb/Utility/SharingPtr.h b/include/lldb/Utility/SharingPtr.h index 814b54b..3f0cb84 100644 --- a/include/lldb/Utility/SharingPtr.h +++ b/include/lldb/Utility/SharingPtr.h @@ -13,6 +13,10 @@ #include #include +#ifdef _MSC_VER +#include "lldb/Host/windows/windows.h" +#endif + //#define ENABLE_SP_LOGGING 1 // DON'T CHECK THIS LINE IN UNLESS COMMENTED OUT #if defined (ENABLE_SP_LOGGING) @@ -28,14 +32,22 @@ template inline T increment(T& t) { +#ifdef _MSC_VER + return InterlockedIncrement(&t); +#else return __sync_add_and_fetch(&t, 1); +#endif } template inline T decrement(T& t) { +#ifdef _MSC_VER + return InterlockedDecrement(&t); +#else return __sync_add_and_fetch(&t, -1); +#endif } class shared_count diff --git a/include/lldb/lldb-defines.h b/include/lldb/lldb-defines.h index 3318aa1..bd72e45 100644 --- a/include/lldb/lldb-defines.h +++ b/include/lldb/lldb-defines.h @@ -109,6 +109,11 @@ #define LLDB_OPT_SET_10 (1U << 9) #define LLDB_OPT_SET_FROM_TO(A, B) (((1U << (B)) - 1) ^ (((1U << (A))-1) >> 1)) +#ifdef _MSC_VER +// ignore GCC function attributes +#define __attribute__(X) +#endif + #if defined(__cplusplus) //---------------------------------------------------------------------- diff --git a/include/lldb/lldb-types.h b/include/lldb/lldb-types.h index 07817ad..a851ae6 100644 --- a/include/lldb/lldb-types.h +++ b/include/lldb/lldb-types.h @@ -35,8 +35,10 @@ // things should be defined. Currently MacOSX is being assumed by default // since that is what lldb was first developed for. +#ifndef _MSC_VER #include #include +#endif #ifdef _WIN32 diff --git a/include/msvc/getopt.h b/include/msvc/getopt.h new file mode 100644 index 0000000..a73af1f --- /dev/null +++ b/include/msvc/getopt.h @@ -0,0 +1,49 @@ +//===-- getopt.h ------------------------------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLDB_getopt_h_ +#define LLDB_getopt_h_ + +// getopt() +enum { + no_argument = 0, + required_argument, + optional_argument +}; + +struct option { + /* name of long option */ + const char *name; + /* + * one of no_argument, required_argument, and optional_argument: + * whether option takes an argument + */ + int has_arg; + /* if not NULL, set *flag to val when option found */ + int *flag; + /* if flag not NULL, value to set *flag to; else return value */ + int val; +}; + +int getopt(int argc, char * const argv[], + const char *optstring); + +extern char *optarg; +extern int optind, opterr, optopt; + +int getopt_long(int argc, char * const *argv, + const char *optstring, + const struct option *longopts, int *longindex); + +int getopt_long_only(int argc, char * const *argv, + const char *optstring, + const struct option *longopts, int *longindex); +extern int optreset; + +#endif // LLDB_lldb_getopt_h_ diff --git a/include/msvc/inttypes.h b/include/msvc/inttypes.h new file mode 100644 index 0000000..27adc23 --- /dev/null +++ b/include/msvc/inttypes.h @@ -0,0 +1,14 @@ +#ifndef LLDB_inttypes_h_ +#define LLDB_inttypes_h_ + +// MSVC12 includes this header, however it has some issues: +// http://connect.microsoft.com/VisualStudio/feedback/details/792397/stdlib-h-and-inttypes-h-conflict-abs-and-div + +#define PRIi32 "li" +#define PRIu32 "lu" +#define PRIx32 "lx" +#define PRIi64 "lli" +#define PRIu64 "llu" +#define PRIx64 "llx" + +#endif diff --git a/source/API/SBDebugger.cpp b/source/API/SBDebugger.cpp index 4ff0999..88c991b 100644 --- a/source/API/SBDebugger.cpp +++ b/source/API/SBDebugger.cpp @@ -711,7 +711,7 @@ SBDebugger::GetIndexOfTarget (lldb::SBTarget target) } SBTarget -SBDebugger::FindTargetWithProcessID (pid_t pid) +SBDebugger::FindTargetWithProcessID (lldb::pid_t pid) { SBTarget sb_target; if (m_opaque_sp) diff --git a/source/Core/ConnectionFileDescriptor.cpp b/source/Core/ConnectionFileDescriptor.cpp index 77645d2..cfe514a 100644 --- a/source/Core/ConnectionFileDescriptor.cpp +++ b/source/Core/ConnectionFileDescriptor.cpp @@ -162,13 +162,21 @@ ConnectionFileDescriptor::CloseCommandPipe () { if (m_pipe_read != -1) { +#ifdef _MSC_VER + assert(false); +#else close (m_pipe_read); +#endif m_pipe_read = -1; } if (m_pipe_write != -1) { +#ifdef _MSC_VER + assert(false); +#else close (m_pipe_write); +#endif m_pipe_write = -1; } } @@ -851,7 +859,9 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt // If this assert fires off on MacOSX, we will need to switch to using // libdispatch to read from file descriptors because poll() is causing // kernel panics and if we exceed FD_SETSIZE we will have no choice... +#ifndef _WIN32 assert (data_fd < FD_SETSIZE); +#endif const bool have_pipe_fd = pipe_fd >= 0; diff --git a/source/Core/DataExtractor.cpp b/source/Core/DataExtractor.cpp index 518faeb..101b9ad 100644 --- a/source/Core/DataExtractor.cpp +++ b/source/Core/DataExtractor.cpp @@ -1330,6 +1330,10 @@ DumpAPInt (Stream *s, const DataExtractor &data, lldb::offset_t offset, lldb::of static float half2float (uint16_t half) { +#ifdef _MSC_VER + assert(false && "not implemented"); + return 0.0f; +#else union{ float f; uint32_t u;}u; int32_t v = (int16_t) half; @@ -1342,6 +1346,7 @@ static float half2float (uint16_t half) v <<= 13; u.u = v | 0x70000000U; return u.f * 0x1.0p-112f; +#endif } lldb::offset_t diff --git a/source/Core/Mangled.cpp b/source/Core/Mangled.cpp index 4655eb1..76d8520 100644 --- a/source/Core/Mangled.cpp +++ b/source/Core/Mangled.cpp @@ -10,7 +10,9 @@ // FreeBSD9-STABLE requires this to know about size_t in cxxabi.h #include +#ifndef _MSC_VER #include +#endif #include "llvm/ADT/DenseMap.h" @@ -199,7 +201,11 @@ Mangled::GetDemangledName () const { // We didn't already mangle this name, demangle it and if all goes well // add it to our map. +#if !defined(_MSC_VER) char *demangled_name = abi::__cxa_demangle (mangled_cstr, NULL, NULL, NULL); +#else + char *demangled_name = 0; +#endif if (demangled_name) { diff --git a/source/Host/common/FileSpec.cpp b/source/Host/common/FileSpec.cpp index 6681845..33de198 100644 --- a/source/Host/common/FileSpec.cpp +++ b/source/Host/common/FileSpec.cpp @@ -14,7 +14,9 @@ #include "lldb/Host/windows/windows.h" #endif #include +#ifndef _MSC_VER #include +#endif #include #include #include @@ -328,7 +330,11 @@ FileSpec::SetFile (const char *pathname, bool resolve) // Truncate the basename off the end of the resolved path // Only attempt to get the dirname if it looks like we have a path - if (strchr(resolved_path, '/')) + if (strchr(resolved_path, '/') +#ifdef _WIN32 + || strchr(resolved_path, '\\') +#endif + ) { char *directory = ::dirname (resolved_path); @@ -339,6 +345,11 @@ FileSpec::SetFile (const char *pathname, bool resolve) else { char *last_resolved_path_slash = strrchr(resolved_path, '/'); +#ifdef _WIN32 + char* last_resolved_path_slash_windows = strrchr(resolved_path, '\\'); + if (last_resolved_path_slash_windows > last_resolved_path_slash) + last_resolved_path_slash = last_resolved_path_slash_windows; +#endif if (last_resolved_path_slash) { *last_resolved_path_slash = '\0'; diff --git a/source/Host/common/TimeValue.cpp b/source/Host/common/TimeValue.cpp index 0858255..de6de08 100644 --- a/source/Host/common/TimeValue.cpp +++ b/source/Host/common/TimeValue.cpp @@ -128,7 +128,17 @@ TimeValue TimeValue::Now() { struct timeval tv; +#if _MSC_VER + SYSTEMTIME st; + GetSystemTime(&st); + tv.tv_usec = st.wMilliseconds * 1000; + FILETIME ft; + SystemTimeToFileTime(&st, &ft); + + tv.tv_sec = ((((uint64_t)ft.dwHighDateTime) << 32 | ft.dwLowDateTime) / 10000000) - 11644473600ULL; +#else gettimeofday(&tv, NULL); +#endif TimeValue now(tv); return now; } diff --git a/source/Host/windows/CMakeLists.txt b/source/Host/windows/CMakeLists.txt index 0ffe734..c56659e 100644 --- a/source/Host/windows/CMakeLists.txt +++ b/source/Host/windows/CMakeLists.txt @@ -6,4 +6,5 @@ add_lldb_library(lldbHostWindows Mutex.cpp Condition.cpp Windows.cpp + getopt.cpp ) diff --git a/source/Host/windows/Windows.cpp b/source/Host/windows/Windows.cpp index ed886c7..8459d80 100644 --- a/source/Host/windows/Windows.cpp +++ b/source/Host/windows/Windows.cpp @@ -46,7 +46,7 @@ int vasprintf(char **ret, const char *fmt, va_list ap) return len; } -char * strcasestr(const char *s, const char* find) +char* strcasestr(const char *s, const char* find) { char c, sc; size_t len; @@ -144,3 +144,66 @@ char* realpath(const char * name, char * resolved) return retname; } + +#ifdef _MSC_VER + +char* basename(char *path) +{ + char* l1 = strrchr(path, '\\'); + char* l2 = strrchr(path, '/'); + if (l2 > l1) l1 = l2; + if (!l1) return path; // no base name + return &l1[1]; +} + +char* getcwd(char* path, int max) +{ + if (GetCurrentDirectory(max, path) == 0) + return path; + return NULL; +} + +char *dirname(char *path) +{ + char* l1 = strrchr(path, '\\'); + char* l2 = strrchr(path, '/'); + if (l2 > l1) l1 = l2; + if (!l1) return NULL; // no dir name + *l1 = 0; + return path; +} + +int strcasecmp(const char* s1, const char* s2) +{ + while (*s1 != '\0' && tolower(*s1) == tolower(*s2)) + { + s1++; + s2++; + } + + return tolower(*(unsigned char *) s1) - tolower(*(unsigned char *) s2); +} + +int strncasecmp(const char* s1, const char* s2, size_t n) +{ + if (n == 0) + return 0; + + while (n-- != 0 && tolower(*s1) == tolower(*s2)) + { + if (n == 0 || *s1 == '\0' || *s2 == '\0') + break; + s1++; + s2++; + } + + return tolower(*(unsigned char *) s1) - tolower(*(unsigned char *) s2); +} + +int usleep(uint32_t useconds) +{ + Sleep(useconds / 1000); + return 0; +} + +#endif // _MSC_VER diff --git a/source/Host/windows/getopt.cpp b/source/Host/windows/getopt.cpp new file mode 100644 index 0000000..55e116c --- /dev/null +++ b/source/Host/windows/getopt.cpp @@ -0,0 +1,514 @@ +/* $OpenBSD: getopt_long.c,v 1.25 2011/03/05 22:10:11 guenther Exp $ */ +/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ + +/* + * Copyright (c) 2002 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. + */ +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Dieter Baron and Thomas Klausner. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef _MSC_VER +#include +#include +#include +#include + +int opterr = 1; /* if error message should be printed */ +int optind = 1; /* index into parent argv vector */ +int optopt = '?'; /* character checked for validity */ +int optreset; /* reset getopt */ +char *optarg; /* argument associated with option */ + +#define PRINT_ERROR ((opterr) && (*options != ':')) + +#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */ +#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */ +#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */ + +/* return values */ +#define BADCH (int)'?' +#define BADARG ((*options == ':') ? (int)':' : (int)'?') +#define INORDER (int)1 + +#define EMSG "" + +static int getopt_internal(int, char * const *, const char *, + const struct option *, int *, int); +static int parse_long_options(char * const *, const char *, + const struct option *, int *, int); +static int gcd(int, int); +static void permute_args(int, int, int, char * const *); + +static char *place = EMSG; /* option letter processing */ + +/* XXX: set optreset to 1 rather than these two */ +static int nonopt_start = -1; /* first non option argument (for permute) */ +static int nonopt_end = -1; /* first option after non options (for permute) */ + +/* Error messages */ +static const char recargchar[] = "option requires an argument -- %c"; +static const char recargstring[] = "option requires an argument -- %s"; +static const char ambig[] = "ambiguous option -- %.*s"; +static const char noarg[] = "option doesn't take an argument -- %.*s"; +static const char illoptchar[] = "unknown option -- %c"; +static const char illoptstring[] = "unknown option -- %s"; + +/* + * Compute the greatest common divisor of a and b. + */ +static int +gcd(int a, int b) +{ + int c; + + c = a % b; + while (c != 0) { + a = b; + b = c; + c = a % b; + } + + return (b); +} + +static void pass() {} +#define warnx(a, ...) pass(); + +/* + * Exchange the block from nonopt_start to nonopt_end with the block + * from nonopt_end to opt_end (keeping the same order of arguments + * in each block). + */ +static void +permute_args(int panonopt_start, int panonopt_end, int opt_end, + char * const *nargv) +{ + int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; + char *swap; + + /* + * compute lengths of blocks and number and size of cycles + */ + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle = gcd(nnonopts, nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + + for (i = 0; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; + for (j = 0; j < cyclelen; j++) { + if (pos >= panonopt_end) + pos -= nnonopts; + else + pos += nopts; + swap = nargv[pos]; + /* LINTED const cast */ + ((char **) nargv)[pos] = nargv[cstart]; + /* LINTED const cast */ + ((char **)nargv)[cstart] = swap; + } + } +} + +/* + * parse_long_options -- + * Parse long options in argc/argv argument vector. + * Returns -1 if short_too is set and the option does not match long_options. + */ +static int +parse_long_options(char * const *nargv, const char *options, + const struct option *long_options, int *idx, int short_too) +{ + char *current_argv, *has_equal; + size_t current_argv_len; + int i, match; + + current_argv = place; + match = -1; + + optind++; + + if ((has_equal = strchr(current_argv, '=')) != NULL) { + /* argument found (--option=arg) */ + current_argv_len = has_equal - current_argv; + has_equal++; + } else + current_argv_len = strlen(current_argv); + + for (i = 0; long_options[i].name; i++) { + /* find matching long option */ + if (strncmp(current_argv, long_options[i].name, + current_argv_len)) + continue; + + if (strlen(long_options[i].name) == current_argv_len) { + /* exact match */ + match = i; + break; + } + /* + * If this is a known short option, don't allow + * a partial match of a single character. + */ + if (short_too && current_argv_len == 1) + continue; + + if (match == -1) /* partial match */ + match = i; + else { + /* ambiguous abbreviation */ + if (PRINT_ERROR) + warnx(ambig, (int)current_argv_len, + current_argv); + optopt = 0; + return (BADCH); + } + } + if (match != -1) { /* option found */ + if (long_options[match].has_arg == no_argument + && has_equal) { + if (PRINT_ERROR) + warnx(noarg, (int)current_argv_len, + current_argv); + /* + * XXX: GNU sets optopt to val regardless of flag + */ + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + return (BADARG); + } + if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { + if (has_equal) + optarg = has_equal; + else if (long_options[match].has_arg == + required_argument) { + /* + * optional argument doesn't use next nargv + */ + optarg = nargv[optind++]; + } + } + if ((long_options[match].has_arg == required_argument) + && (optarg == NULL)) { + /* + * Missing argument; leading ':' indicates no error + * should be generated. + */ + if (PRINT_ERROR) + warnx(recargstring, + current_argv); + /* + * XXX: GNU sets optopt to val regardless of flag + */ + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + --optind; + return (BADARG); + } + } else { /* unknown option */ + if (short_too) { + --optind; + return (-1); + } + if (PRINT_ERROR) + warnx(illoptstring, current_argv); + optopt = 0; + return (BADCH); + } + if (idx) + *idx = match; + if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; + return (0); + } else + return (long_options[match].val); +} + +/* + * getopt_internal -- + * Parse argc/argv argument vector. Called by user level routines. + */ +static int +getopt_internal(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx, int flags) +{ + const char *oli; /* option letter list index */ + int optchar, short_too; + static int posixly_correct = -1; + + if (options == NULL) + return (-1); + + /* + * XXX Some GNU programs (like cvs) set optind to 0 instead of + * XXX using optreset. Work around this braindamage. + */ + if (optind == 0) + optind = optreset = 1; + + /* + * Disable GNU extensions if POSIXLY_CORRECT is set or options + * string begins with a '+'. + */ + if (posixly_correct == -1 || optreset) + posixly_correct = (getenv("POSIXLY_CORRECT") != NULL); + if (*options == '-') + flags |= FLAG_ALLARGS; + else if (posixly_correct || *options == '+') + flags &= ~FLAG_PERMUTE; + if (*options == '+' || *options == '-') + options++; + + optarg = NULL; + if (optreset) + nonopt_start = nonopt_end = -1; +start: + if (optreset || !*place) { /* update scanning pointer */ + optreset = 0; + if (optind >= nargc) { /* end of argument vector */ + place = EMSG; + if (nonopt_end != -1) { + /* do permutation, if we have to */ + permute_args(nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + else if (nonopt_start != -1) { + /* + * If we skipped non-options, set optind + * to the first of them. + */ + optind = nonopt_start; + } + nonopt_start = nonopt_end = -1; + return (-1); + } + if (*(place = nargv[optind]) != '-' || + (place[1] == '\0' && strchr(options, '-') == NULL)) { + place = EMSG; /* found non-option */ + if (flags & FLAG_ALLARGS) { + /* + * GNU extension: + * return non-option as argument to option 1 + */ + optarg = nargv[optind++]; + return (INORDER); + } + if (!(flags & FLAG_PERMUTE)) { + /* + * If no permutation wanted, stop parsing + * at first non-option. + */ + return (-1); + } + /* do permutation */ + if (nonopt_start == -1) + nonopt_start = optind; + else if (nonopt_end != -1) { + permute_args(nonopt_start, nonopt_end, + optind, nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end = -1; + } + optind++; + /* process next argument */ + goto start; + } + if (nonopt_start != -1 && nonopt_end == -1) + nonopt_end = optind; + + /* + * If we have "-" do nothing, if "--" we are done. + */ + if (place[1] != '\0' && *++place == '-' && place[1] == '\0') { + optind++; + place = EMSG; + /* + * We found an option (--), so if we skipped + * non-options, we have to permute. + */ + if (nonopt_end != -1) { + permute_args(nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + return (-1); + } + } + + /* + * Check long options if: + * 1) we were passed some + * 2) the arg is not just "-" + * 3) either the arg starts with -- we are getopt_long_only() + */ + if (long_options != NULL && place != nargv[optind] && + (*place == '-' || (flags & FLAG_LONGONLY))) { + short_too = 0; + if (*place == '-') + place++; /* --foo long option */ + else if (*place != ':' && strchr(options, *place) != NULL) + short_too = 1; /* could be short option too */ + + optchar = parse_long_options(nargv, options, long_options, + idx, short_too); + if (optchar != -1) { + place = EMSG; + return (optchar); + } + } + + if ((optchar = (int)*place++) == (int)':' || + (optchar == (int)'-' && *place != '\0') || + (oli = strchr(options, optchar)) == NULL) { + /* + * If the user specified "-" and '-' isn't listed in + * options, return -1 (non-option) as per POSIX. + * Otherwise, it is an unknown option character (or ':'). + */ + if (optchar == (int)'-' && *place == '\0') + return (-1); + if (!*place) + ++optind; + if (PRINT_ERROR) + warnx(illoptchar, optchar); + optopt = optchar; + return (BADCH); + } + if (long_options != NULL && optchar == 'W' && oli[1] == ';') { + /* -W long-option */ + if (*place) /* no space */ + /* NOTHING */; + else if (++optind >= nargc) { /* no arg */ + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar, optchar); + optopt = optchar; + return (BADARG); + } else /* white space */ + place = nargv[optind]; + optchar = parse_long_options(nargv, options, long_options, + idx, 0); + place = EMSG; + return (optchar); + } + if (*++oli != ':') { /* doesn't take argument */ + if (!*place) + ++optind; + } else { /* takes (optional) argument */ + optarg = NULL; + if (*place) /* no white space */ + optarg = place; + else if (oli[1] != ':') { /* arg not optional */ + if (++optind >= nargc) { /* no arg */ + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar, optchar); + optopt = optchar; + return (BADARG); + } else + optarg = nargv[optind]; + } + place = EMSG; + ++optind; + } + /* dump back option letter */ + return (optchar); +} + +/* + * getopt -- + * Parse argc/argv argument vector. + * + * [eventually this will replace the BSD getopt] + */ +int +getopt(int nargc, char * const *nargv, const char *options) +{ + + /* + * We don't pass FLAG_PERMUTE to getopt_internal() since + * the BSD getopt(3) (unlike GNU) has never done this. + * + * Furthermore, since many privileged programs call getopt() + * before dropping privileges it makes sense to keep things + * as simple (and bug-free) as possible. + */ + return (getopt_internal(nargc, nargv, options, NULL, NULL, 0)); +} + +/* + * getopt_long -- + * Parse argc/argv argument vector. + */ +int +getopt_long(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) +{ + return (getopt_internal(nargc, nargv, options, long_options, idx, + FLAG_PERMUTE)); +} + +/* + * getopt_long_only -- + * Parse argc/argv argument vector. + */ +int +getopt_long_only(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) +{ + + return (getopt_internal(nargc, nargv, options, long_options, idx, + FLAG_PERMUTE|FLAG_LONGONLY)); +} +#endif diff --git a/source/Interpreter/OptionValueProperties.cpp b/source/Interpreter/OptionValueProperties.cpp index 0df3782..abee55d 100644 --- a/source/Interpreter/OptionValueProperties.cpp +++ b/source/Interpreter/OptionValueProperties.cpp @@ -651,6 +651,7 @@ lldb::OptionValueSP OptionValueProperties::DeepCopy () const { assert(!"this shouldn't happen"); + return lldb::OptionValueSP(); } const Property * diff --git a/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp b/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp index 2c3eee4..2852ae0 100644 --- a/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp +++ b/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp @@ -149,7 +149,7 @@ RegisterContextMacOSXFrameBackchain::ReadRegister (const RegisterInfo *reg_info, // TOOD: need a better way to detect when "long double" types are // the same bytes size as "double" -#if !defined(__arm__) +#if !defined(__arm__) && !defined(_MSC_VER) case sizeof (long double): if (sizeof (long double) == sizeof(uint32_t)) { diff --git a/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h b/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h index 941c83e..5db5415 100644 --- a/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h +++ b/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h @@ -13,7 +13,7 @@ #include "SymbolFileDWARF.h" #include #include -#if __cplusplus >= 201103L +#if __cplusplus >= 201103L || defined(_MSC_VER) #include #else #include @@ -87,7 +87,7 @@ protected: dw_offset_t m_offset; Header m_header; -#if __cplusplus >= 201103L +#if __cplusplus >= 201103L || defined(_MSC_VER) typedef std::unordered_multimap, CStringEqualBinaryPredicate> cstr_to_index_mmap; #else typedef __gnu_cxx::hash_multimap, CStringEqualBinaryPredicate> cstr_to_index_mmap;