Added a "--triple [<width>]" ("-t<width>" as a short option) option to the

image list command so we can see the full triple for each target module.

llvm-svn: 130728

1 files changed, 14 insertions, 4 deletions

diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp
index 080d16bb5d1..cc87631ce7b 100644
--- a/lldb/source/Commands/CommandObjectImage.cpp
+++ b/lldb/source/Commands/CommandObjectImage.cpp
@@ -37,14 +37,19 @@ using namespace lldb_private;
 // Static Helper functions
 //----------------------------------------------------------------------
 static void
-DumpModuleArchitecture (Stream &strm, Module *module, uint32_t width)
+DumpModuleArchitecture (Stream &strm, Module *module, bool full_triple, uint32_t width)
 {
     if (module)
     {
+        const char *arch_cstr;
+        if (full_triple)
+            arch_cstr = module->GetArchitecture().GetTriple().str().c_str();
+        else
+            arch_cstr = module->GetArchitecture().GetArchitectureName();
         if (width)
-            strm.Printf("%-*s", width, module->GetArchitecture().GetArchitectureName());
+            strm.Printf("%-*s", width, arch_cstr);
         else
-            strm.PutCString(module->GetArchitecture().GetArchitectureName());
+            strm.PutCString(arch_cstr);
     }
 }
 
@@ -1278,9 +1283,13 @@ public:
                             switch (format_char)
                             {
                             case 'a':
-                                DumpModuleArchitecture (strm, module, width);
+                                DumpModuleArchitecture (strm, module, false, width);
                                 break;
 
+                            case 't':
+                                DumpModuleArchitecture (strm, module, true, width);
+                                break;
+                                    
                             case 'f':
                                 DumpFullpath (strm, &module->GetFileSpec(), width);
                                 dump_object_name = true;
@@ -1354,6 +1363,7 @@ OptionDefinition
 CommandObjectImageList::CommandOptions::g_option_table[] =
 {
 { LLDB_OPT_SET_1, false, "arch",       'a', optional_argument, NULL, 0, eArgTypeWidth,   "Display the architecture when listing images."},
+{ LLDB_OPT_SET_1, false, "triple",     't', optional_argument, NULL, 0, eArgTypeWidth,   "Display the triple when listing images."},
 { LLDB_OPT_SET_1, false, "uuid",       'u', no_argument,       NULL, 0, eArgTypeNone,    "Display the UUID when listing images."},
 { LLDB_OPT_SET_1, false, "fullpath",   'f', optional_argument, NULL, 0, eArgTypeWidth,   "Display the fullpath to the image object file."},
 { LLDB_OPT_SET_1, false, "directory",  'd', optional_argument, NULL, 0, eArgTypeWidth,   "Display the directory with optional width for the image object file."},