Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-20 22:40:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[lldb][NFC] Migrate to raw_ostream in ArchSpec::DumpTriple

Browse Source 
Reviewers: labath, davide

Reviewed By: davide

Subscribers: clayborg, JDevlieghere, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D70979
This commit is contained in:
Raphael Isemann 2019-12-04 08:27:43 +01:00
parent ddcce0f3d6
commit 2f1e7b3d01
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Core/ModuleSpec.h
View File

@ -207,7 +207,7 @@ public:
if (dumped_something) if (dumped_something)
strm.PutCString(", "); strm.PutCString(", ");
strm.Printf("arch = "); strm.Printf("arch = ");
m_arch.DumpTriple(strm); m_arch.DumpTriple(strm.AsRawOstream());
dumped_something = true; dumped_something = true;
} }
if (m_uuid.IsValid()) { if (m_uuid.IsValid()) {

2
lldb/include/lldb/Utility/ArchSpec.h
View File

@ -433,7 +433,7 @@ public:
/// \return A triple describing this ArchSpec. /// \return A triple describing this ArchSpec.
const llvm::Triple &GetTriple() const { return m_triple; } const llvm::Triple &GetTriple() const { return m_triple; }
void DumpTriple(Stream &s) const; void DumpTriple(llvm::raw_ostream &s) const;
/// Architecture triple setter. /// Architecture triple setter.
/// ///

4
lldb/source/Commands/CommandObjectTarget.cpp
View File

@ -78,7 +78,7 @@ static void DumpTargetInfo(uint32_t target_idx, Target *target,
uint32_t properties = 0; uint32_t properties = 0;
if (target_arch.IsValid()) { if (target_arch.IsValid()) {
strm.Printf("%sarch=", properties++ > 0 ? ", " : " ( "); strm.Printf("%sarch=", properties++ > 0 ? ", " : " ( ");
target_arch.DumpTriple(strm); target_arch.DumpTriple(strm.AsRawOstream());
properties++; properties++;
} }
PlatformSP platform_sp(target->GetPlatform()); PlatformSP platform_sp(target->GetPlatform());
@ -1291,7 +1291,7 @@ static void DumpModuleArchitecture(Stream &strm, Module *module,
StreamString arch_strm; StreamString arch_strm;
if (full_triple) if (full_triple)
module->GetArchitecture().DumpTriple(arch_strm); module->GetArchitecture().DumpTriple(arch_strm.AsRawOstream());
else else
arch_strm.PutCString(module->GetArchitecture().GetArchitectureName()); arch_strm.PutCString(module->GetArchitecture().GetArchitectureName());
std::string arch_str = arch_strm.GetString(); std::string arch_str = arch_strm.GetString();

2
lldb/source/Target/Platform.cpp
View File

@ -406,7 +406,7 @@ void Platform::GetStatus(Stream &strm) {
if (arch.IsValid()) { if (arch.IsValid()) {
if (!arch.GetTriple().str().empty()) { if (!arch.GetTriple().str().empty()) {
strm.Printf(" Triple: "); strm.Printf(" Triple: ");
arch.DumpTriple(strm); arch.DumpTriple(strm.AsRawOstream());
strm.EOL(); strm.EOL();
} }
} }

4
lldb/source/Target/TargetList.cpp
View File

@ -144,9 +144,9 @@ Status TargetList::CreateTargetInternal(
StreamString platform_arch_strm; StreamString platform_arch_strm;
StreamString module_arch_strm; StreamString module_arch_strm;
platform_arch.DumpTriple(platform_arch_strm); platform_arch.DumpTriple(platform_arch_strm.AsRawOstream());
matching_module_spec.GetArchitecture().DumpTriple( matching_module_spec.GetArchitecture().DumpTriple(
module_arch_strm); module_arch_strm.AsRawOstream());
error.SetErrorStringWithFormat( error.SetErrorStringWithFormat(
"the specified architecture '%s' is not compatible with '%s' " "the specified architecture '%s' is not compatible with '%s' "
"in '%s'", "in '%s'",

10
lldb/source/Utility/ArchSpec.cpp
View File

@ -1450,17 +1450,17 @@ bool ArchSpec::IsAlwaysThumbInstructions() const {
return false; return false;
} }
void ArchSpec::DumpTriple(Stream &s) const { void ArchSpec::DumpTriple(llvm::raw_ostream &s) const {
const llvm::Triple &triple = GetTriple(); const llvm::Triple &triple = GetTriple();
llvm::StringRef arch_str = triple.getArchName(); llvm::StringRef arch_str = triple.getArchName();
llvm::StringRef vendor_str = triple.getVendorName(); llvm::StringRef vendor_str = triple.getVendorName();
llvm::StringRef os_str = triple.getOSName(); llvm::StringRef os_str = triple.getOSName();
llvm::StringRef environ_str = triple.getEnvironmentName(); llvm::StringRef environ_str = triple.getEnvironmentName();
s.Printf("%s-%s-%s", arch_str.empty() ? "*" : arch_str.str().c_str(), s << llvm::formatv("{0}-{1}-{2}", arch_str.empty() ? "*" : arch_str,
vendor_str.empty() ? "*" : vendor_str.str().c_str(), vendor_str.empty() ? "*" : vendor_str,
os_str.empty() ? "*" : os_str.str().c_str()); os_str.empty() ? "*" : os_str);
if (!environ_str.empty()) if (!environ_str.empty())
s.Printf("-%s", environ_str.str().c_str()); s << "-" << environ_str;
} }

6
lldb/source/Utility/ProcessInfo.cpp
View File

@ -49,7 +49,7 @@ llvm::StringRef ProcessInfo::GetNameAsStringRef() const {
void ProcessInfo::Dump(Stream &s, Platform *platform) const { void ProcessInfo::Dump(Stream &s, Platform *platform) const {
s << "Executable: " << GetName() << "\n"; s << "Executable: " << GetName() << "\n";
s << "Triple: "; s << "Triple: ";
m_arch.DumpTriple(s); m_arch.DumpTriple(s.AsRawOstream());
s << "\n"; s << "\n";
s << "Arguments:\n"; s << "Arguments:\n";
@ -137,7 +137,7 @@ void ProcessInstanceInfo::Dump(Stream &s, UserIDResolver &resolver) const {
if (m_arch.IsValid()) { if (m_arch.IsValid()) {
s.Printf(" arch = "); s.Printf(" arch = ");
m_arch.DumpTriple(s); m_arch.DumpTriple(s.AsRawOstream());
s.EOL(); s.EOL();
} }
@ -189,7 +189,7 @@ void ProcessInstanceInfo::DumpAsTableRow(Stream &s, UserIDResolver &resolver,
StreamString arch_strm; StreamString arch_strm;
if (m_arch.IsValid()) if (m_arch.IsValid())
m_arch.DumpTriple(arch_strm); m_arch.DumpTriple(arch_strm.AsRawOstream());
auto print = [&](bool (ProcessInstanceInfo::*isValid)() const, auto print = [&](bool (ProcessInstanceInfo::*isValid)() const,
uint32_t (ProcessInstanceInfo::*getID)() const, uint32_t (ProcessInstanceInfo::*getID)() const,