From aed2e721f4e4f7a3776528015f8f7f821a29a634 Mon Sep 17 00:00:00 2001 From: Justin Viiret Date: Mon, 11 Jul 2016 14:42:23 +1000 Subject: [PATCH] rose: tidy up CHECK_{BYTE,MASK} dump code --- src/rose/rose_dump.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/rose/rose_dump.cpp b/src/rose/rose_dump.cpp index 1e1c36ca..c483443c 100644 --- a/src/rose/rose_dump.cpp +++ b/src/rose/rose_dump.cpp @@ -291,18 +291,25 @@ void dumpProgram(ofstream &os, const RoseEngine *t, const char *pc) { PROGRAM_NEXT_INSTRUCTION PROGRAM_CASE(CHECK_MASK) { - os << " and_mask " << std::hex << ri->and_mask << endl; - os << " cmp_mask " << ri->cmp_mask << endl; - os << " neg_mask " << ri->neg_mask << std::dec<< endl; + os << " and_mask 0x" << std::hex << std::setw(16) + << std::setfill('0') << ri->and_mask << std::dec << endl; + os << " cmp_mask 0x" << std::hex << std::setw(16) + << std::setfill('0') << ri->cmp_mask << std::dec << endl; + os << " neg_mask 0x" << std::hex << std::setw(16) + << std::setfill('0') << ri->neg_mask << std::dec << endl; os << " offset " << ri->offset << endl; os << " fail_jump " << offset + ri->fail_jump << endl; } PROGRAM_NEXT_INSTRUCTION PROGRAM_CASE(CHECK_BYTE) { - os << " and_mask " << std::hex << ri->and_mask << endl; - os << " cmp_mask " << ri->cmp_mask << std::dec << endl; - os << " negation " << ri->negation << endl; + os << " and_mask 0x" << std::hex << std::setw(2) + << std::setfill('0') << u32{ri->and_mask} << std::dec + << endl; + os << " cmp_mask 0x" << std::hex << std::setw(2) + << std::setfill('0') << u32{ri->cmp_mask} << std::dec + << endl; + os << " negation " << u32{ri->negation} << endl; os << " offset " << ri->offset << endl; os << " fail_jump " << offset + ri->fail_jump << endl; }