Merge pull request #3 from eschnett/eschnett/update

2023-08-16 version 2.55

Author: giordano

README.md

@@ -1,5 +1,5 @@
 ## objconv
 
-This is a git mirror of [objconv](http://www.agner.org/optimize/), by Agner Fog.  All rights belong to Agner Fog.  As of this writing, this repository contains version 2.54 of objconv.
+This is a git mirror of [objconv](http://www.agner.org/optimize/), by Agner Fog.  All rights belong to Agner Fog.  As of this writing, this repository contains version 2.55 of objconv.
 
 To regenerate this repository, run `./update.sh`.

changelog.txt

@@ -1,3 +1,6 @@
+2023-08-16 version 2.55
+* cosmetic fix in disassembly of sign-extended 8-bit and 16-bit constants
+
 2022-08-31 version 2.54
 * fix problem with ELF files having same string table for symbols and sections (generated by rustc compiler)
 

src/cmdline.cpp

@@ -1189,7 +1189,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) 2023 by Agner Fog. Gnu General Public License.");
+    printf("\nCopyright (c) 2025 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/disasm.h

@@ -1,13 +1,13 @@
 /****************************  disasm.h   **********************************
 * Author:        Agner Fog
 * Date created:  2007-02-21
-* Last modified: 2023-03-29
+* Last modified: 2025-08-26
 * Project:       objconv
 * Module:        disasm.h
 * Description:
 * Header file for disassembler
 *
-* Copyright 2007-2023 GNU General Public License http://www.gnu.org/licenses
+* Copyright 2007-2025 GNU General Public License http://www.gnu.org/licenses
 *****************************************************************************/
 #ifndef DISASM_H
 #define DISASM_H
@@ -435,7 +435,7 @@ struct SOpcodeProp {
    uint32_t Vreg;                                  // ~VEX.vvvv or AMD DREX byte
    uint32_t Kreg;                                  // EVEX.aaa = MVEX.kkk mask register
    uint32_t Esss;                                  // EVEX.zLLb = MVEX.Esss option bits
-   SwizSpec const * SwizRecord;                  // Selected entry in MVEX table for MVEX code
+   SwizSpec const * SwizRecord;                    // Selected entry in MVEX table for MVEX code
    uint32_t OffsetMultiplier;                      // Multiplier for 1-byte offset calculated from EVEX or obtained from MVEX.sss and table lookup
    uint32_t Operands[5];                           // Operand types for destination, source, immediate
    uint32_t OpcodeStart1;                          // Index to first opcode byte, after prefixes
@@ -446,8 +446,8 @@ struct SOpcodeProp {
    uint32_t ImmediateField;                        // Beginning of immediate operand or jump address field
    uint32_t ImmediateFieldSize;                    // Size of immediate operand or jump address field
    uint32_t ImmediateRelocation;                   // Relocation pointing to immediate operand or jump address field
-   const char * OpComment;                       // Additional comment for opcode
-   void   Reset() {                              // Set everything to zero
+   const char * OpComment;                         // Additional comment for opcode
+   void   Reset() {                                // Set everything to zero
       memset(this, 0, sizeof(*this));}
 };
 // The meaning of each bit in s.Warnings and s.Errors is given in

src/disasm1.cpp

@@ -1,7 +1,7 @@
 /****************************  disasm1.cpp   ********************************
 * Author:        Agner Fog
 * Date created:  2007-02-25
-* Last modified: 2022-08-02
+* Last modified: 2025-08-26
 * Project:       objconv
 * Module:        disasm1.cpp
 * Description:
@@ -11,7 +11,7 @@
 * Instruction tables are in opcodes.cpp.
 * All functions relating to file output are in disasm2.cpp
 *
-* Copyright 2007-2022 GNU General Public License http://www.gnu.org/licenses
+* Copyright 2007-2025 GNU General Public License http://www.gnu.org/licenses
 *****************************************************************************/
 #include "stdafx.h"
 

src/disasm2.cpp

@@ -1,15 +1,15 @@
 /****************************  disasm2.cpp   ********************************
 * Author:        Agner Fog
 * Date created:  2007-02-25
-* Last modified: 2023-03-29
+* Last modified: 2025-08-26
 * Project:       objconv
 * Module:        disasm2.cpp
 * Description:
 * Module for disassembler containing file output functions
 *
 * Changes that relate to assembly language syntax should be done in this file only.
 *
-* Copyright 2007-2023 GNU General Public License http://www.gnu.org/licenses
+* Copyright 2007-2025 GNU General Public License http://www.gnu.org/licenses
 *****************************************************************************/
 #include "stdafx.h"
 
@@ -72,7 +72,7 @@ SIntTxt AsmWarningTexts1[] = {
     {8,          "Displacement could be made smaller by sign extension"},
     {0x10,       "SIB byte unnecessary here"},
     {0x20,       "A shorter instruction exists for register operand"},
-    {0x40,       "Length-changing prefix causes delay on Intel processors"},
+    {0x40,       "Length-changing prefix causes delay on old Intel processors"},
     {0x80,       "Address size prefix should be avoided"},
     {0x100,      "Same prefix occurs more than once"},
     {0x200,      "Prefix valid but unnecessary"},
@@ -91,7 +91,7 @@ SIntTxt AsmWarningTexts1[] = {
     {0x400000,   "Memory operand is misaligned. Performance penalty"},
     {0x800000,   "Alignment fault. Memory operand must be aligned"},
     {0x1000000,  "Multi-byte NOP. Replace with ALIGN"},
-    {0x2000000,  "Bogus length-changing prefix causes delay on Intel processors here"},
+    {0x2000000,  "Bogus length-changing prefix causes delay on old Intel processors here"},
     {0x4000000,  "Non-default size for stack operation"},
     {0x8000000,  "Function does not end with ret or jmp"},
     {0x10000000, "No jump seems to point here"},
@@ -1098,6 +1098,9 @@ void CDisassembler::WriteImmediateOperand(uint32_t Type) {
     if ((s.Operands[0] & 0xFFF) <= 0xA && s.Operands[0] != 0 || (s.Operands[0] & 0xF0) == 0xA0) {
         // Destination is general purpose register
         OSize = s.OperandSize;
+        if ((s.Operands[0] & 0x0F) < 3) {
+            OSize = (s.Operands[0] & 0x0F) << 3;
+        }
     }
     else {
         // Constant probably unrelated to destination size
@@ -1108,8 +1111,8 @@ void CDisassembler::WriteImmediateOperand(uint32_t Type) {
 
     // Check if sign extended
     if (OSize > s.ImmediateFieldSize * 8) {
-        if (WriteFormat == 2 && Value >= 0) {
-            // Hexadecimal sign extended, not negative:
+        if (WriteFormat == 2  && Value >= 0) {
+            // Hexadecimal sign extended
             // Does not need full length
             OSize = s.ImmediateFieldSize * 8;
         }

src/maindef.h

@@ -1,19 +1,19 @@
 /****************************  maindef.h   **********************************
 * Author:        Agner Fog
 * Date created:  2006-08-26
-* Last modified: 2022-08-31
+* Last modified: 2025-08-26
 * Project:       objconv
 * Module:        maindef.h
 * Description:
 * Header file for type definitions and other main definitions.
 *
-* Copyright 2006-2022 GNU General Public License v. 3 http://www.gnu.org/licenses
+* Copyright 2006-2025 GNU General Public License v. 3 http://www.gnu.org/licenses
 *****************************************************************************/
 #ifndef MAINDEF_H
 #define MAINDEF_H
 
 // Program version
-#define OBJCONV_VERSION         2.54
+#define OBJCONV_VERSION         2.55
 
 
 // Integer type definitions with platform-independent sizes: