OSDN Git Service

powerpc/xmon: Fix disassembly since printf changes
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 16 Jul 2018 13:52:14 +0000 (23:52 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 17 Jul 2018 11:18:14 +0000 (21:18 +1000)
commit941d810725ad48cc21948f4cff8cf70fa2a67cf9
treec2d012f87491d0f3637b9e61cb7eb93f3f603b8b
parent021c91791a5e7e85c567452f1be3e4c2c6cb6063
powerpc/xmon: Fix disassembly since printf changes

The recent change to add printf annotations to xmon inadvertently made
the disassembly output ugly, eg:

  c00000002001e058  7ee00026      mfcr    r23
  c00000002001e05c  fffffffffae101a0      std     r23,416(r1)
  c00000002001e060  fffffffff8230000      std     r1,0(r3)

The problem being that negative 32-bit values are being displayed in
full 64-bits.

The printf conversion was actually correct, we are passing unsigned
long so it should use "lx". But powerpc instructions are only 4 bytes
and the code only reads 4 bytes, so inst should really just be
unsigned int, and that also fixes the printing to look the way we
want:

  c00000002001e058  7ee00026      mfcr    r23
  c00000002001e05c  fae101a0      std     r23,416(r1)
  c00000002001e060  f8230000      std     r1,0(r3)

Fixes: e70d8f55268b ("powerpc/xmon: Add __printf annotation to xmon_printf()")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/xmon/xmon.c