[LLDB][MIPS] Added support for the debugging of N32/O32 applications on MIPS64 target.

Mohit7 · Mohit7 · commit 9514a383c871 · 2015-09-09T10:32:20.000Z
Patch by Nitesh Jain Reviewers: clayborg, ovyalov. Subscribers: jaydeep, bhushan, mohit.bhakkad, sagar, nitesh.jain, lldb-commits. Differential Revision: http://reviews.llvm.org/D12671 llvm-svn: 247134
diff --git a/lldb/include/lldb/Core/ArchSpec.h b/lldb/include/lldb/Core/ArchSpec.h
@@ -65,7 +65,11 @@ class ArchSpec
         eMIPSAse_mips16     = 0x00000400,   // MIPS16 ASE
         eMIPSAse_micromips  = 0x00000800,   // MICROMIPS ASE
         eMIPSAse_xpa        = 0x00001000,   // XPA ASE
-        eMIPSAse_mask       = 0x00001fff
+        eMIPSAse_mask       = 0x00001fff,
+        eMIPSABI_O32        = 0x00002000,
+        eMIPSABI_N32        = 0x00004000,
+        eMIPSABI_N64        = 0x00008000,
+        eMIPSABI_mask       = 0x000ff000
     };
 
     enum Core
diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp
@@ -602,7 +602,15 @@ ArchSpec::GetAddressByteSize() const
 {
     const CoreDefinition *core_def = FindCoreDefinition (m_core);
     if (core_def)
-        return core_def->addr_byte_size;
+    { 
+       if (core_def->machine == llvm::Triple::mips64 || core_def->machine == llvm::Triple::mips64el)
+       {  
+          // For N32/O32 applications Address size is 4 bytes.
+          if (m_flags & (eMIPSABI_N32 | eMIPSABI_O32))
+              return 4;
+       }
+       return core_def->addr_byte_size;
+    }
     return 0;
 }
 
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -1517,32 +1517,42 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,
                  I != section_headers.end(); ++I)
             {
                 static ConstString g_sect_name_gnu_debuglink (".gnu_debuglink");
-                const ELFSectionHeaderInfo &header = *I;
-                const uint64_t section_size = header.sh_type == SHT_NOBITS ? 0 : header.sh_size;
+                const ELFSectionHeaderInfo &sheader = *I;
+                const uint64_t section_size = sheader.sh_type == SHT_NOBITS ? 0 : sheader.sh_size;
                 ConstString name(shstr_data.PeekCStr(I->sh_name));
 
                 I->section_name = name;
 
                 if (arch_spec.GetMachine() == llvm::Triple::mips || arch_spec.GetMachine() == llvm::Triple::mipsel
                     || arch_spec.GetMachine() == llvm::Triple::mips64 || arch_spec.GetMachine() == llvm::Triple::mips64el)
                 {
-                    if (header.sh_type == SHT_MIPS_ABIFLAGS)
+                    uint32_t arch_flags = arch_spec.GetFlags ();
+                    DataExtractor data;
+                    if (sheader.sh_type == SHT_MIPS_ABIFLAGS)
                     {
-                        DataExtractor data;
-                        if (section_size && (data.SetData (object_data, header.sh_offset, section_size) == section_size))
+                        
+                        if (section_size && (data.SetData (object_data, sheader.sh_offset, section_size) == section_size))
                         {
                             lldb::offset_t ase_offset = 12; // MIPS ABI Flags Version: 0
-                            uint32_t arch_flags = arch_spec.GetFlags ();
                             arch_flags |= data.GetU32 (&ase_offset);
-                            arch_spec.SetFlags (arch_flags);
                         }
                     }
+                    // Settings appropriate ArchSpec ABI Flags
+                    if (header.e_flags & llvm::ELF::EF_MIPS_ABI2)
+                    {   
+                        arch_flags |= lldb_private::ArchSpec::eMIPSABI_N32;
+                    }
+                    else if (header.e_flags & llvm::ELF::EF_MIPS_ABI_O32)
+                    {
+                         arch_flags |= lldb_private::ArchSpec::eMIPSABI_O32;       
+                    }
+                    arch_spec.SetFlags (arch_flags);
                 }
 
                 if (name == g_sect_name_gnu_debuglink)
                 {
                     DataExtractor data;
-                    if (section_size && (data.SetData (object_data, header.sh_offset, section_size) == section_size))
+                    if (section_size && (data.SetData (object_data, sheader.sh_offset, section_size) == section_size))
                     {
                         lldb::offset_t gnu_debuglink_offset = 0;
                         gnu_debuglink_file = data.GetCStr (&gnu_debuglink_offset);
@@ -1552,7 +1562,7 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,
                 }
 
                 // Process ELF note section entries.
-                bool is_note_header = (header.sh_type == SHT_NOTE);
+                bool is_note_header = (sheader.sh_type == SHT_NOTE);
 
                 // The section header ".note.android.ident" is stored as a
                 // PROGBITS type header but it is actually a note header.
@@ -1564,7 +1574,7 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,
                 {
                     // Allow notes to refine module info.
                     DataExtractor data;
-                    if (section_size && (data.SetData (object_data, header.sh_offset, section_size) == section_size))
+                    if (section_size && (data.SetData (object_data, sheader.sh_offset, section_size) == section_size))
                     {
                         Error error = RefineModuleDetailsFromNote (data, arch_spec, uuid);
                         if (error.Fail ())

Original file line number	Diff line number	Diff line change
`@@ -1517,32 +1517,42 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,`
`1517`	`1517`	`I != section_headers.end(); ++I)`
`1518`	`1518`	`{`
`1519`	`1519`	`static ConstString g_sect_name_gnu_debuglink (".gnu_debuglink");`
`1520`		`- const ELFSectionHeaderInfo &header = *I;`
`1521`		`- const uint64_t section_size = header.sh_type == SHT_NOBITS ? 0 : header.sh_size;`
	`1520`	`+ const ELFSectionHeaderInfo &sheader = *I;`
	`1521`	`+ const uint64_t section_size = sheader.sh_type == SHT_NOBITS ? 0 : sheader.sh_size;`
`1522`	`1522`	`ConstString name(shstr_data.PeekCStr(I->sh_name));`
`1523`	`1523`
`1524`	`1524`	`I->section_name = name;`
`1525`	`1525`
`1526`	`1526`	`if (arch_spec.GetMachine() == llvm::Triple::mips \|\| arch_spec.GetMachine() == llvm::Triple::mipsel`
`1527`	`1527`	`\|\| arch_spec.GetMachine() == llvm::Triple::mips64 \|\| arch_spec.GetMachine() == llvm::Triple::mips64el)`
`1528`	`1528`	`{`
`1529`		`- if (header.sh_type == SHT_MIPS_ABIFLAGS)`
	`1529`	`+ uint32_t arch_flags = arch_spec.GetFlags ();`
	`1530`	`+ DataExtractor data;`
	`1531`	`+ if (sheader.sh_type == SHT_MIPS_ABIFLAGS)`
`1530`	`1532`	`{`
`1531`		`- DataExtractor data;`
`1532`		`- if (section_size && (data.SetData (object_data, header.sh_offset, section_size) == section_size))`
	`1533`	`+`
	`1534`	`+ if (section_size && (data.SetData (object_data, sheader.sh_offset, section_size) == section_size))`
`1533`	`1535`	`{`
`1534`	`1536`	`lldb::offset_t ase_offset = 12; // MIPS ABI Flags Version: 0`
`1535`		`- uint32_t arch_flags = arch_spec.GetFlags ();`
`1536`	`1537`	`arch_flags \|= data.GetU32 (&ase_offset);`
`1537`		`- arch_spec.SetFlags (arch_flags);`
`1538`	`1538`	`}`
`1539`	`1539`	`}`
	`1540`	`+ // Settings appropriate ArchSpec ABI Flags`
	`1541`	`+ if (header.e_flags & llvm::ELF::EF_MIPS_ABI2)`
	`1542`	`+ {`
	`1543`	`+ arch_flags \|= lldb_private::ArchSpec::eMIPSABI_N32;`
	`1544`	`+ }`
	`1545`	`+ else if (header.e_flags & llvm::ELF::EF_MIPS_ABI_O32)`
	`1546`	`+ {`
	`1547`	`+ arch_flags \|= lldb_private::ArchSpec::eMIPSABI_O32;`
	`1548`	`+ }`
	`1549`	`+ arch_spec.SetFlags (arch_flags);`
`1540`	`1550`	`}`
`1541`	`1551`
`1542`	`1552`	`if (name == g_sect_name_gnu_debuglink)`
`1543`	`1553`	`{`
`1544`	`1554`	`DataExtractor data;`
`1545`		`- if (section_size && (data.SetData (object_data, header.sh_offset, section_size) == section_size))`
	`1555`	`+ if (section_size && (data.SetData (object_data, sheader.sh_offset, section_size) == section_size))`
`1546`	`1556`	`{`
`1547`	`1557`	`lldb::offset_t gnu_debuglink_offset = 0;`
`1548`	`1558`	`gnu_debuglink_file = data.GetCStr (&gnu_debuglink_offset);`
`@@ -1552,7 +1562,7 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,`
`1552`	`1562`	`}`
`1553`	`1563`
`1554`	`1564`	`// Process ELF note section entries.`
`1555`		`- bool is_note_header = (header.sh_type == SHT_NOTE);`
	`1565`	`+ bool is_note_header = (sheader.sh_type == SHT_NOTE);`
`1556`	`1566`
`1557`	`1567`	`// The section header ".note.android.ident" is stored as a`
`1558`	`1568`	`// PROGBITS type header but it is actually a note header.`
`@@ -1564,7 +1574,7 @@ ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,`
`1564`	`1574`	`{`
`1565`	`1575`	`// Allow notes to refine module info.`
`1566`	`1576`	`DataExtractor data;`
`1567`		`- if (section_size && (data.SetData (object_data, header.sh_offset, section_size) == section_size))`
	`1577`	`+ if (section_size && (data.SetData (object_data, sheader.sh_offset, section_size) == section_size))`
`1568`	`1578`	`{`
`1569`	`1579`	`Error error = RefineModuleDetailsFromNote (data, arch_spec, uuid);`
`1570`	`1580`	`if (error.Fail ())`