Merge pull request #1 from staticfloat/sf/v2.53

2022-04-28 version 2.53

Author: staticfloat

changelog.txt

@@ -1,59 +1,77 @@
-2017-07-27 version 2.47
-* fixed bug in library manager for long module names
-
-2017-07-15 version 2.46
-* dump of ELF files improved
-* a new unnecessary warnings removed
-
-2017-04-10 version 2.45
-* support disassembly of forthcoming Control-flow Enforcement instructions
-
-2016-11-27 version 2.44
-* fixed bug when disassembling file generated by Tiny C compiler
-
-2016-11-09 version 2.43
-* fixed "string table corrupt" message for ELF files
-* support for disassembly of AVX512_4VNNIW, AVX512_4FMAPS instructions
-
-2016-01-16 version 2.42
-* fixed bugs with disassembly of some AVX512 and BMI2 instructions
-
-2015-10-15 version 2.41
-* fixed bugs with disassembly of some AVX512 instructions
-* fixed missing "ptr" in masm syntax disassembly
-
-2015-10-15 version 2.40
-* fixed bugs with disassembly of some AVX512 instructions
-
-2015-09-14 version 2.39
-* fixed bugs with disassembly of some AVX512 instructions
-
-2014-12-15 version 2.38
-* fixed bugs with disassembly of Knights Corner instruction set
-* exe file made compatible with Windows XP
-
-2014-12-06 version 2.37
-* support for disassembly of AVX512BW/DQ, etc.
-* fixed disassembly bug of vpgatherdd on knights corner
-* fixed disassembly bug for FMA4 instructions
-* improved disassembly of switch/case tables for gcc and clang compilers
-
-2014-07-21 version 2.36
-* improved execution times for disassembling very big files
-
-2013-11-27 version 2.32
-* fix bug with .bss section in elf2elf.cpp and elf2coff.cpp
-
-2013-08-23 version 2.31
-* support for disassembly of AVX512F
-* library operations were extremely slow on big libraries because of rebuilding and search for unique names. This problem is fixed. 
-* long member names allowed in libraries
-* option -ls to make member names short. Perhaps good for compatibility with BSD. Member names are made unique just by adding a running hex number, not by comparing with all previous names, which was the cause of slow operations in previous versions.
-* option -ns to change symbol suffixes
-* options -ap and -as to change prefix or suffix and keep old name as alias
-* added missing relocation type in ELF to COFF conversion
-* fixed error that often occurred when disassembling .exe files
-* fixed minor errors
-
-2012-08-31 version 2.16
-* support for disassembly of Knights Corner instruction set
+2022-04-28 version 2.53
+* add disassembler support for AVX512-FP16, etc.
+
+2020-06-08 version 2.52
+* fix  problem in asm syntax output for lea
+
+2018-10-08 version 2.51
+* fix bug in movq mm0,rax
+
+2018-08-15 version 2.50
+* minor change in omf2cof
+
+2018-01-29 version 2.49
+* fixed minor problem with disassembly of DLL
+
+2017-10-18 version 2.48
+* minor changes
+
+2017-07-27 version 2.47
+* fixed bug in library manager for long module names
+
+2017-07-15 version 2.46
+* dump of ELF files improved
+* a new unnecessary warnings removed
+
+2017-04-10 version 2.45
+* support disassembly of forthcoming Control-flow Enforcement instructions
+
+2016-11-27 version 2.44
+* fixed bug when disassembling file generated by Tiny C compiler
+
+2016-11-09 version 2.43
+* fixed "string table corrupt" message for ELF files
+* support for disassembly of AVX512_4VNNIW, AVX512_4FMAPS instructions
+
+2016-01-16 version 2.42
+* fixed bugs with disassembly of some AVX512 and BMI2 instructions
+
+2015-10-15 version 2.41
+* fixed bugs with disassembly of some AVX512 instructions
+* fixed missing "ptr" in masm syntax disassembly
+
+2015-10-15 version 2.40
+* fixed bugs with disassembly of some AVX512 instructions
+
+2015-09-14 version 2.39
+* fixed bugs with disassembly of some AVX512 instructions
+
+2014-12-15 version 2.38
+* fixed bugs with disassembly of Knights Corner instruction set
+* exe file made compatible with Windows XP
+
+2014-12-06 version 2.37
+* support for disassembly of AVX512BW/DQ, etc.
+* fixed disassembly bug of vpgatherdd on knights corner
+* fixed disassembly bug for FMA4 instructions
+* improved disassembly of switch/case tables for gcc and clang compilers
+
+2014-07-21 version 2.36
+* improved execution times for disassembling very big files
+
+2013-11-27 version 2.32
+* fix bug with .bss section in elf2elf.cpp and elf2coff.cpp
+
+2013-08-23 version 2.31
+* support for disassembly of AVX512F
+* library operations were extremely slow on big libraries because of rebuilding and search for unique names. This problem is fixed. 
+* long member names allowed in libraries
+* option -ls to make member names short. Perhaps good for compatibility with BSD. Member names are made unique just by adding a running hex number, not by comparing with all previous names, which was the cause of slow operations in previous versions.
+* option -ns to change symbol suffixes
+* options -ap and -as to change prefix or suffix and keep old name as alias
+* added missing relocation type in ELF to COFF conversion
+* fixed error that often occurred when disassembling .exe files
+* fixed minor errors
+
+2012-08-31 version 2.16
+* support for disassembly of Knights Corner instruction set

src/build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Build script for building objconv on Linux, BSD and Mac OS X platforms.
+
+# Instructions:
+
+# You may need to change the path to bash above as required by your system
+
+# Make sure the current directory contains all the .cpp files for objconv,
+# and only one copy of each, and no other .cpp files
+
+# Then run ./build.sh
+# The compilation may take half a minute.
+
+# Alternatively, run the following line:
+
+g++ -o objconv -O2 *.cpp
+
+#or: clang++ -o objconv -O2 *.cpp

src/cmdline.cpp

@@ -1,14 +1,14 @@
 /****************************  cmdline.cpp  **********************************
 * Author:        Agner Fog
 * Date created:  2006-07-25
-* Last modified: 2018-01-29
+* Last modified: 2022-04-28
 * Project:       objconv
 * Module:        cmdline.cpp
 * Description:
 * This module is for interpretation of command line options
 * Also contains symbol change function
 *
-* Copyright 2006-2018 GNU General Public License http://www.gnu.org/licenses
+* Copyright 2006-2022 GNU General Public License http://www.gnu.org/licenses
 *****************************************************************************/
 
 #include "stdafx.h"
@@ -39,14 +39,14 @@ static SIntTxt SubtypeNames[] = {
     {SUBTYPE_MASM,  "asm"},
     {SUBTYPE_MASM,  "masm"},
     {SUBTYPE_MASM,  "tasm"},
-    {SUBTYPE_YASM,  "nasm"},
-    {SUBTYPE_YASM,  "yasm"},
+    {SUBTYPE_NASM,  "nasm"},
+    {SUBTYPE_NASM,  "yasm"},
     {SUBTYPE_GASM,  "gasm"},
     {SUBTYPE_GASM,  "gas"}
 };
 
 // List of standard names that are always translated
-const uint32 MaxType = FILETYPE_MACHO_LE;
+const uint32_t MaxType = FILETYPE_MACHO_LE;
 
 // Standard names in 32-bit mode
 const char * StandardNames32[][MaxType+1] = {
@@ -173,7 +173,7 @@ void CCommandLineInterpreter::ReadCommandFile(char * filename) {
     ResponseFiles[NumBuffers-1].Read();
 
     // Get buffer with file contents
-    char * buffer = ResponseFiles[NumBuffers-1].Buf();
+    char * buffer = (char*)ResponseFiles[NumBuffers-1].Buf();
     char * ItemBegin, * ItemEnd;  // Mark begin and end of token in buffer
 
     // Check if buffer is allocated
@@ -183,13 +183,13 @@ void CCommandLineInterpreter::ReadCommandFile(char * filename) {
         while (*buffer) {
 
             // Skip whitespace
-            while (*buffer != 0 && uint8(*buffer) <= uint8(' ')) buffer++;
+            while (*buffer != 0 && uint8_t(*buffer) <= uint8_t(' ')) buffer++;
             if (*buffer == 0) break; // End of buffer found
             ItemBegin = buffer;
 
             // Find end of token
             ItemEnd = buffer+1;
-            while (uint8(*ItemEnd) > uint8(' ')) ItemEnd++;
+            while (uint8_t(*ItemEnd) > uint8_t(' ')) ItemEnd++;
             if (*ItemEnd == 0) {
                 buffer = ItemEnd;
             }
@@ -436,8 +436,8 @@ void CCommandLineInterpreter::AddObjectToLibrary(char * filename, char * membern
     }
 
     // Truncate name and store it in MemberNames
-    //uint32 Name1Offset = MemberNames.PushString(CLibrary::TruncateMemberName(membername));
-    uint32 Name1Offset = MemberNames.PushString(membername);
+    //uint32_t Name1Offset = MemberNames.PushString(CLibrary::TruncateMemberName(membername));
+    uint32_t Name1Offset = MemberNames.PushString(membername);
     Sym.Name1 = (char*)(MemberNames.Buf() + Name1Offset);
     CLibrary::StripMemberName(Sym.Name1);
 
@@ -648,7 +648,7 @@ void CCommandLineInterpreter::InterpretSymbolNameChangeOption(char * string) {
         }
         if (name2 && name2[0]) {
             // name2 found. check if it ends with ':'
-            for (uint32 i = 0; i < (uint32)strlen(name2); i++) {
+            for (uint32_t i = 0; i < (uint32_t)strlen(name2); i++) {
                 if (name2[i] == ':') name2[i] = 0;
             }
         }
@@ -787,7 +787,7 @@ void CCommandLineInterpreter::InterpretImagebaseOption(char * string) {
         // Must be divisible by page size
         err.submit(2331, string);
     }
-    if ((int32)ImageBase <= 0) {
+    if ((int32_t)ImageBase <= 0) {
         // Cannot be zero or > 2^31
         err.submit(2332, string);
     }
@@ -819,7 +819,7 @@ void CCommandLineInterpreter::CheckExtractSuccess() {
     // Check if library members to extract were found
 
     // Search through SymbolList for extract records
-    for (uint32 i = 0; i < SymbolList.GetDataSize(); i += sizeof(SSymbolChange)) {
+    for (uint32_t i = 0; i < SymbolList.GetDataSize(); i += sizeof(SSymbolChange)) {
         SSymbolChange * Sym = (SSymbolChange *)(SymbolList.Buf() + i);
         if (Sym->Action == SYMA_EXTRACT_MEMBER && Sym->Done == 0) {
             // Member has not been extracted
@@ -833,7 +833,7 @@ void CCommandLineInterpreter::CheckSymbolModifySuccess() {
     // Check if symbols to modify were found
 
     // Search through SymbolList for symbol change records
-    for (uint32 i = 0; i < SymbolList.GetDataSize(); i += sizeof(SSymbolChange)) {
+    for (uint32_t i = 0; i < SymbolList.GetDataSize(); i += sizeof(SSymbolChange)) {
         SSymbolChange * Sym = (SSymbolChange *)(SymbolList.Buf() + i);
         if (Sym->Action >= SYMA_MAKE_WEAK && Sym->Action < SYMA_ADD_MEMBER && Sym->Done == 0) {
             // Member has not been extracted
@@ -869,7 +869,7 @@ int CCommandLineInterpreter::SymbolChange(char const * oldname, char const ** ne
 
     // Convert standard names if type conversion
     if (cmd.InputType != cmd.OutputType
-        && uint32(cmd.InputType) <= MaxType && uint32(cmd.OutputType) <= MaxType) {
+        && uint32_t(cmd.InputType) <= MaxType && uint32_t(cmd.OutputType) <= MaxType) {
             if (DesiredWordSize == 32) {
                 // Look for standard names to translate, 32-bit
                 for (i = 0; i < NumStandardNames; i++) {
@@ -1053,7 +1053,7 @@ int CCommandLineInterpreter::SymbolChange(char const * oldname, char const ** ne
                 static char const * StandardSectionNames[] = {
                 ".text", ".data", ".bss", ".comment", ".lib"
                 };
-                for (uint32 i = 0; i < sizeof(StandardSectionNames)/sizeof(StandardSectionNames[0]); i++) {
+                for (uint32_t i = 0; i < sizeof(StandardSectionNames)/sizeof(StandardSectionNames[0]); i++) {
                 if (stricmp(oldname,StandardSectionNames[i]) == 0) {
                 // Standard name. Don't change
                 return SYMA_NOCHANGE;
@@ -1186,7 +1186,7 @@ void CCommandLineInterpreter::ReportStatistics() {
 void CCommandLineInterpreter::Help() {
     // Print help message
     printf("\nObject file converter version %.2f for x86 and x86-64 platforms.", OBJCONV_VERSION);
-    printf("\nCopyright (c) 2018 by Agner Fog. Gnu General Public License.");
+    printf("\nCopyright (c) 2022 by Agner Fog. Gnu General Public License.");
     printf("\n\nUsage: objconv options inputfile [outputfile]");
     printf("\n\nOptions:");
     printf("\n-fXXX[SS]  Output file format XXX, word size SS. Supported formats:");

src/cmdline.h

@@ -26,7 +26,7 @@
 
 // Constants for subtypes
 #define SUBTYPE_MASM                 0       // Disassembly MASM/TASM
-#define SUBTYPE_YASM                 1       // Disassembly NASM/YASM
+#define SUBTYPE_NASM                 1       // Disassembly NASM/YASM
 #define SUBTYPE_GASM                 2       // Disassembly GAS(Intel)
 
 // Constants for verbose or silent console output
@@ -136,16 +136,16 @@ class CCommandLineInterpreter {
    int    SubType;                           // Subtype of output type. Assembly language dialect or library type
    int    MemberType;                        // File type of library members
    int    DesiredWordSize;                   // Desired word size for output file
-   uint32 Verbose;                           // How much diagnostics to print on screen
-   uint32 DumpOptions;                       // Options for dumping file
-   uint32 DebugInfo;                         // Strip or convert debug info
-   uint32 ExeptionInfo;                      // Strip or preserve exception handler info and other incompatible info
-   uint32 Underscore;                        // Add/remove underscores in symbol names
-   uint32 SegmentDot;                        // Change underscore/dot in beginning of segment names
-   uint32 LibraryOptions;                    // Options for manipulating library
-   uint32 LibrarySubtype;                    // Options for manipulating library
-   uint32 FileOptions;                       // Options for input and output files
-   uint32 ImageBase;                         // Specified image base
+   uint32_t Verbose;                           // How much diagnostics to print on screen
+   uint32_t DumpOptions;                       // Options for dumping file
+   uint32_t DebugInfo;                         // Strip or convert debug info
+   uint32_t ExeptionInfo;                      // Strip or preserve exception handler info and other incompatible info
+   uint32_t Underscore;                        // Add/remove underscores in symbol names
+   uint32_t SegmentDot;                        // Change underscore/dot in beginning of segment names
+   uint32_t LibraryOptions;                    // Options for manipulating library
+   uint32_t LibrarySubtype;                    // Options for manipulating library
+   uint32_t FileOptions;                       // Options for input and output files
+   uint32_t ImageBase;                         // Specified image base
    int    ShowHelp;                          // Help screen printed
 protected:
    int  libmode;                             // -lib option has been encountered
@@ -169,8 +169,8 @@ class CCommandLineInterpreter {
    int SymbolChangeEntries;                  // Number of entries in SymbolList, except library entries
    CMemoryBuffer SymbolList;                 // List of symbol names to change. Contains entries of type SSymbolChange
    CMemoryBuffer MemberNames;                // Buffer containing truncated member names
-   uint32 MemberNamesAllocated;              // Size of buffer in MemberNames
-   uint32 CurrentSymbol;                     // Pointer into SymbolList
+   uint32_t MemberNamesAllocated;              // Size of buffer in MemberNames
+   uint32_t CurrentSymbol;                     // Pointer into SymbolList
    // Statistics counters
    int CountUnderscoreConversions;           // Count number of times symbol leading underscores are changed
    int CountSectionDotConversions;           // Count number of times leading character is changed on section names