diff options
| author | Simon Wanner <skyrising@pvpctutorials.de> | 2022-03-28 00:03:34 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-11-26 12:50:38 +0100 |
| commit | 0c8da1478a9ed86f5b61225b638ce1ce25913c88 (patch) | |
| tree | 949b0b07791f4d88ae1b508e374f79446d6ab3c7 | |
| parent | 2ae228dac7c0203332fa650b86f01a13e6945903 (diff) | |
| download | serenity-0c8da1478a9ed86f5b61225b638ce1ce25913c88.zip | |
LibX86: Use '+' format parameter to include signs for displacements
| -rw-r--r-- | Userland/Libraries/LibX86/Instruction.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Userland/Libraries/LibX86/Instruction.cpp b/Userland/Libraries/LibX86/Instruction.cpp index 58cb91fe0b..d618bb129a 100644 --- a/Userland/Libraries/LibX86/Instruction.cpp +++ b/Userland/Libraries/LibX86/Instruction.cpp @@ -1432,12 +1432,7 @@ String MemoryOrRegisterReference::to_string_a16() const if (!hasDisplacement) return base; - String displacement_string; - if ((i16)m_displacement16 < 0) - displacement_string = String::formatted("-{:#x}", -(i16)m_displacement16); - else - displacement_string = String::formatted("+{:#x}", m_displacement16); - return String::formatted("{}{}", base, displacement_string); + return String::formatted("{}{:+#x}", base, (i16)m_displacement16); } String MemoryOrRegisterReference::sib_to_string(ProcessorMode mode) const @@ -1519,12 +1514,7 @@ String MemoryOrRegisterReference::to_string_a64() const if (!has_displacement) return base; - String displacement_string; - if ((i32)m_displacement32 < 0) - displacement_string = String::formatted("-{:#x}", -(i32)m_displacement32); - else - displacement_string = String::formatted("+{:#x}", m_displacement32); - return String::formatted("{}{}", base, displacement_string); + return String::formatted("{}{:+#x}", base, (i32)m_displacement32); } String MemoryOrRegisterReference::to_string_a32() const @@ -1559,12 +1549,7 @@ String MemoryOrRegisterReference::to_string_a32() const if (!has_displacement) return base; - String displacement_string; - if ((i32)m_displacement32 < 0) - displacement_string = String::formatted("-{:#x}", -(i32)m_displacement32); - else - displacement_string = String::formatted("+{:#x}", m_displacement32); - return String::formatted("{}{}", base, displacement_string); + return String::formatted("{}{:+#x}", base, (i32)m_displacement32); } static String relative_address(u32 origin, bool x32, i8 imm) |