Added various features

tools/cxbe/Exe.cpp

@@ -100,6 +100,7 @@ Exe::Exe(const char *x_szFilename)
     // read section headers
     {
         m_SectionHeader = new SectionHeader[m_Header.m_sections];
+        m_SectionHeader_longname = new SectionHeader_longname[m_Header.m_sections];
 
         printf("Exe::Exe: Reading Section Headers...\n");
 
@@ -115,7 +116,46 @@ Exe::Exe(const char *x_szFilename)
                 goto cleanup;
             }
 
-            printf("OK %d\n", v);
+            // interpret long section names
+            if(m_SectionHeader[v].m_name[0] == '/')
+            {
+                m_SectionHeader_longname[v].m_offset = 0;
+                for(uint32 i = 1; i < 8; ++i)
+                {
+                    char c = m_SectionHeader[v].m_name[i];
+                    if(!c)
+                        break;
+                    if(c < '0' || c > '9') // not a long section after all?
+                        goto notlong;
+                    m_SectionHeader_longname[v].m_offset *= 10;
+                    m_SectionHeader_longname[v].m_offset += c - '0';
+                }
+                m_SectionHeader_longname[v].m_longname = new char[256]();
+
+                long tmppos = ftell(ExeFile);
+                fseek(ExeFile, m_Header.m_symbol_table_addr + m_SectionHeader_longname[v].m_offset,
+                      SEEK_SET);
+
+                uint32 i;
+                for(i = 0; i < 255; ++i)
+                {
+                    int c = fgetc(ExeFile);
+                    if(!c || c == EOF)
+                        break;
+                    m_SectionHeader_longname[v].m_longname[i] = c;
+                }
+                m_SectionHeader_longname[v].m_longname[i] = 0;
+
+                fseek(ExeFile, tmppos, SEEK_SET);
+                printf("OK %d (long)\n", v, m_SectionHeader_longname[v].m_offset,
+                       m_SectionHeader_longname[v].m_longname);
+            }
+            else
+            {
+            notlong:;
+                m_SectionHeader_longname[v].m_longname = NULL;
+                printf("OK %d\n", v);
+            }
         }
     }
 
@@ -184,6 +224,7 @@ Exe::Exe(const char *x_szFilename)
 void Exe::ConstructorInit()
 {
     m_SectionHeader = NULL;
+    m_SectionHeader_longname = NULL;
     m_bzSection = NULL;
 }
 
@@ -193,12 +234,16 @@ Exe::~Exe()
     if(m_bzSection != 0)
     {
         for(uint32 v = 0; v < m_Header.m_sections; v++)
+        {
+            delete[] m_SectionHeader_longname[v].m_longname;
             delete[] m_bzSection[v];
+        }
 
         delete[] m_bzSection;
     }
 
     delete[] m_SectionHeader;
+    delete[] m_SectionHeader_longname;
 }
 
 // export to Exe file

tools/cxbe/Exe.h

@@ -129,6 +129,13 @@ class Exe : public Error
         uint32 m_characteristics;  // characteristics for this segment
     } __attribute((packed)) * m_SectionHeader;
 
+    // array to store long section names
+    struct SectionHeader_longname
+    {
+        char *m_longname;
+        uint32 m_offset;
+    } __attribute((packed)) * m_SectionHeader_longname;
+
     // array of section data
     uint08 **m_bzSection;
 

tools/cxbe/Xbe.cpp

@@ -125,8 +125,16 @@ Xbe::Xbe(class Exe *x_Exe, const char *x_szTitle, bool x_bRetail, const std::vec
             {
                 uint32 s = 0;
 
-                while(s < 8 && x_Exe->m_SectionHeader[v].m_name[s] != '\0')
-                    s++;
+                if(x_Exe->m_SectionHeader_longname[v].m_longname)
+                {
+                    while(s < 255 && x_Exe->m_SectionHeader_longname[v].m_longname[s] != '\0')
+                        s++;
+                }
+                else
+                {
+                    while(s < 8 && x_Exe->m_SectionHeader[v].m_name[s] != '\0')
+                        s++;
+                }
 
                 mrc += s + 1;
             }
@@ -345,7 +353,7 @@ Xbe::Xbe(class Exe *x_Exe, const char *x_szTitle, bool x_bRetail, const std::vec
 
         // write section headers / section names
         {
-            m_szSectionName = new char[m_Header.dwSections][9];
+            m_szSectionName = new char[m_Header.dwSections][256];
 
             m_SectionHeader = new SectionHeader[m_Header.dwSections];
 
@@ -431,10 +439,21 @@ Xbe::Xbe(class Exe *x_Exe, const char *x_szTitle, bool x_bRetail, const std::vec
                     memset(secn, 0, 8);
 
                     m_SectionHeader[v].dwSectionNameAddr = hwc_secn;
-                    while(s < 8 && x_Exe->m_SectionHeader[v].m_name[s] != '\0')
+                    if(x_Exe->m_SectionHeader_longname[v].m_longname)
                     {
-                        m_szSectionName[v][s] = secn[s] = x_Exe->m_SectionHeader[v].m_name[s];
-                        s++;
+                        while(s < 255 && x_Exe->m_SectionHeader_longname[v].m_longname[s] != '\0')
+                        {
+                            m_szSectionName[v][s] = secn[s] = x_Exe->m_SectionHeader_longname[v].m_longname[s];
+                            s++;
+                        }
+                    }
+                    else
+                    {
+                        while(s < 8 && x_Exe->m_SectionHeader[v].m_name[s] != '\0')
+                        {
+                            m_szSectionName[v][s] = secn[s] = x_Exe->m_SectionHeader[v].m_name[s];
+                            s++;
+                        }
                     }
 
                     m_szSectionName[v][s] = '\0';

tools/cxbe/Xbe.h

@@ -170,8 +170,8 @@ class Xbe : public Error
         uint32 dwCharacteristics; // characteristics
     } __attribute((packed)) * m_TLS;
 
-    // Xbe section names, each 8 bytes max and null terminated
-    char (*m_szSectionName)[9];
+    // Xbe section names, each 255 bytes max and null terminated
+    char (*m_szSectionName)[256];
 
     // Xbe sections
     uint08 **m_bzSection;