maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make lldb -P work on Windows. 

lldb -P, which outputs its python path, works by using Host-layer
facilities to get information about the loaded python module.  This
Host functionality was unimplemented on Windows, so this patch
implements it.  Additionally, it removes a pexpect dependency from
the test runner and uses an equivalent invocation of subprocess.

Reviewed by: Todd Fiala

Differential Revision: http://reviews.llvm.org/D4548

llvm-svn: 213410
This commit is contained in:
Zachary Turner 2014-07-18 20:36:08 +00:00
parent 754d54fcf8
commit c9bf0c70b5
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/Host/common/Host.cpp
View File

@ -1152,6 +1152,10 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
{
char raw_path[PATH_MAX];
char resolved_path[PATH_MAX];
#if defined(_WIN32)
lldb_file_spec.AppendPathComponent("../lib/site-packages");
lldb_file_spec.GetPath(raw_path, sizeof(raw_path));
#else
lldb_file_spec.GetPath(raw_path, sizeof(raw_path));
#if defined (__APPLE__)
@ -1174,7 +1178,7 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
::strncat(raw_path, python_version_dir.c_str(),
sizeof(raw_path) - strlen(raw_path) - 1);
#endif
#if defined (__APPLE__)
}
#endif

14
lldb/source/Host/windows/Host.cpp
View File

@ -247,6 +247,20 @@ FileSpec
Host::GetModuleFileSpecForHostAddress (const void *host_addr)
{
FileSpec module_filespec;
HMODULE hmodule = NULL;
if (!::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)host_addr, &hmodule))
return module_filespec;
std::vector<char> buffer(MAX_PATH);
DWORD chars_copied = 0;
do {
chars_copied = ::GetModuleFileName(hmodule, &buffer[0], buffer.size());
if (chars_copied == buffer.size() && ::GetLastError() == ERROR_INSUFFICIENT_BUFFER)
buffer.resize(buffer.size() * 2);
} while (chars_copied >= buffer.size());
module_filespec.SetFile(&buffer[0], false);
return module_filespec;
}

10
lldb/test/dotest.py
View File

@ -1004,17 +1004,17 @@ def setupSysPath():
# If our lldb supports the -P option, use it to find the python path:
init_in_python_dir = 'lldb/__init__.py'
import pexpect
lldb_dash_p_result = None
if lldbHere:
lldb_dash_p_result = pexpect.run("%s -P"%(lldbHere))
lldb_dash_p_result = subprocess.check_output([lldbHere, "-P"], stderr=subprocess.STDOUT)
elif lldbExec:
lldb_dash_p_result = pexpect.run("%s -P"%(lldbExec))
lldb_dash_p_result = subprocess.check_output([lldbExec, "-P"], stderr=subprocess.STDOUT)
if lldb_dash_p_result and not lldb_dash_p_result.startswith(("<", "lldb: invalid option:")):
if lldb_dash_p_result and not lldb_dash_p_result.startswith(("<", "lldb: invalid option:")) \
and not lldb_dash_p_result.startswith("Traceback"):
lines = lldb_dash_p_result.splitlines()
if len(lines) == 1 and os.path.isfile(os.path.join(lines[0], init_in_python_dir)):
if len(lines) >= 1 and os.path.isfile(os.path.join(lines[0], init_in_python_dir)):
lldbPath = lines[0]
if "freebsd" in sys.platform or "linux" in sys.platform:
os.environ['LLDB_LIB_DIR'] = os.path.join(lldbPath, '..', '..')