Set path syntax for remote executable FileSpec.
Reviewers: ovyalov, zturner
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D9579
llvm-svn: 236925
diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp
index 36fddc1..062cdcd 100644
--- a/lldb/source/Host/common/FileSpec.cpp
+++ b/lldb/source/Host/common/FileSpec.cpp
@@ -27,6 +27,7 @@
#include <pwd.h>
#endif
+#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/DataBufferHeap.h"
#include "lldb/Core/DataBufferMemoryMap.h"
#include "lldb/Core/RegularExpression.h"
@@ -201,6 +202,11 @@
SetFile(pathname, resolve_path, syntax);
}
+FileSpec::FileSpec(const char *pathname, bool resolve_path, ArchSpec arch) :
+ FileSpec(pathname, resolve_path, arch.GetTriple().isOSWindows() ? ePathSyntaxWindows : ePathSyntaxPosix)
+{
+}
+
//------------------------------------------------------------------
// Copy constructor
//------------------------------------------------------------------
@@ -605,11 +611,10 @@
void
FileSpec::Dump(Stream *s) const
{
- static ConstString g_slash_only ("/");
if (s)
{
m_directory.Dump(s);
- if (m_directory && m_directory != g_slash_only)
+ if (m_directory && m_directory.GetStringRef().back() != '/')
s->PutChar('/');
m_filename.Dump(s);
}
@@ -810,10 +815,9 @@
void
FileSpec::GetPath(llvm::SmallVectorImpl<char> &path, bool denormalize) const
{
- if (m_directory)
- path.append(m_directory.GetCString(), m_directory.GetCString() + m_directory.GetLength());
- if (m_filename)
- llvm::sys::path::append(path, m_filename.GetCString());
+ StreamString stream;
+ Dump(&stream);
+ path.append(stream.GetString().begin(), stream.GetString().end());
Normalize(path, m_syntax);
if (denormalize && !path.empty())
DeNormalize(path, m_syntax);
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index de382ac..07c51dc 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -1312,7 +1312,7 @@
const char *arg = NULL;
const Args &launch_args = launch_info.GetArguments();
if (exe_file)
- exe_path = exe_file.GetPath(false);
+ exe_path = exe_file.GetPath();
else
{
arg = launch_args.GetArgumentAtIndex(0);
@@ -3744,8 +3744,8 @@
packet.PutCString("qModuleInfo:");
packet.PutCStringAsRawHex8(module_path.c_str());
packet.PutCString(";");
- const auto& tripple = arch_spec.GetTriple().getTriple();
- packet.PutBytesAsRawHex8(tripple.c_str(), tripple.size());
+ const auto& triple = arch_spec.GetTriple().getTriple();
+ packet.PutBytesAsRawHex8(triple.c_str(), triple.size());
StringExtractorGDBRemote response;
if (SendPacketAndWaitForResponse (packet.GetData(), packet.GetSize(), response, false) != PacketResult::Success)
@@ -3795,7 +3795,7 @@
extractor.GetStringRef ().swap (value);
extractor.SetFilePos (0);
extractor.GetHexByteString (value);
- module_spec.GetFileSpec () = FileSpec (value.c_str(), false);
+ module_spec.GetFileSpec() = FileSpec(value.c_str(), false, arch_spec);
}
}
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 9b794ab..03a5845 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -2377,8 +2377,9 @@
if (is_main_executable) // TODO: add setting for always installing main executable???
{
// Always install the main executable
+ remote_file = FileSpec(module_sp->GetFileSpec().GetFilename().AsCString(),
+ false, module_sp->GetArchitecture());
remote_file.GetDirectory() = platform_sp->GetWorkingDirectory();
- remote_file.GetFilename() = module_sp->GetFileSpec().GetFilename();
}
}
if (remote_file)