From cc44af744ca9ed6c236bfdab949f54cf75f973b6 Mon Sep 17 00:00:00 2001 From: Filipe Rodrigues Date: Mon, 11 Jan 2021 16:59:22 +0000 Subject: [PATCH] Fixed missing `0x` when printing signed hex in some places. --- dcb-exe/src/exe/inst/basic/load.rs | 2 +- dcb-exe/src/exe/inst/basic/store.rs | 2 +- dcb-exe/src/exe/inst/pseudo/load_imm.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dcb-exe/src/exe/inst/basic/load.rs b/dcb-exe/src/exe/inst/basic/load.rs index f18c88c..075eb56 100644 --- a/dcb-exe/src/exe/inst/basic/load.rs +++ b/dcb-exe/src/exe/inst/basic/load.rs @@ -133,6 +133,6 @@ impl InstFmt for Inst { let Self { dst, src, offset, kind } = self; let mnemonic = kind.mnemonic(); - write!(f, "{mnemonic} {dst}, {}({src})", SignedHex(offset)) + write!(f, "{mnemonic} {dst}, {:#}({src})", SignedHex(offset)) } } diff --git a/dcb-exe/src/exe/inst/basic/store.rs b/dcb-exe/src/exe/inst/basic/store.rs index 6aa2c45..2c3b693 100644 --- a/dcb-exe/src/exe/inst/basic/store.rs +++ b/dcb-exe/src/exe/inst/basic/store.rs @@ -120,6 +120,6 @@ impl InstFmt for Inst { let Self { dst, src, offset, kind } = self; let mnemonic = kind.mnemonic(); - write!(f, "{mnemonic} {dst}, {}({src})", SignedHex(offset)) + write!(f, "{mnemonic} {dst}, {:#}({src})", SignedHex(offset)) } } diff --git a/dcb-exe/src/exe/inst/pseudo/load_imm.rs b/dcb-exe/src/exe/inst/pseudo/load_imm.rs index 47812af..07dd289 100644 --- a/dcb-exe/src/exe/inst/pseudo/load_imm.rs +++ b/dcb-exe/src/exe/inst/pseudo/load_imm.rs @@ -50,7 +50,7 @@ impl Kind { Self::Address(address) => write!(f, "{address:#x}"), Self::Word(value) => write!(f, "{value:#x}"), Self::HalfWordUnsigned(value) => write!(f, "{value:#x}"), - Self::HalfWordSigned(value) => write!(f, "{}", SignedHex(value)), + Self::HalfWordSigned(value) => write!(f, "{:#}", SignedHex(value)), }) } }