5818

4 files changed, 16 insertions, 16 deletions

diff --git a/010---vm.cc b/010---vm.cc
index 699fe506..1b80b5e5 100644
--- a/010---vm.cc
+++ b/010---vm.cc
@@ -336,8 +336,8 @@ void dump_registers() {
   ostringstream out;
   out << "registers before: ";
   for (int i = 0;  i < NUM_INT_REGISTERS;  ++i) {
-    if (i > 0) out << "; ";
-    out << "  " << i << ": " << std::hex << std::setw(8) << std::setfill('_') << Reg[i].u;
+    if (i > 0) out << "    ";
+    out << i << ": " << std::hex << std::setw(8) << std::setfill('_') << Reg[i].u;
   }
   out << " -- SF: " << SF << "; ZF: " << ZF << "; CF: " << CF << "; OF: " << OF;
   trace(Callstack_depth+1, "run") << out.str() << end();
diff --git a/013direct_addressing.cc b/013direct_addressing.cc
index 513cb61b..38e00665 100644
--- a/013direct_addressing.cc
+++ b/013direct_addressing.cc
@@ -108,7 +108,7 @@ int32_t* effective_address(uint8_t modrm) {
     return &Reg[rm].i;
   }
   uint32_t addr = effective_address_number(modrm);
-  trace(Callstack_depth+1, "run") << "effective address contains " << read_mem_i32(addr) << end();
+  trace(Callstack_depth+1, "run") << "effective address contains 0x" << HEXWORD << read_mem_i32(addr) << end();
   return mem_addr_i32(addr);
 }
 
diff --git a/014indirect_addressing.cc b/014indirect_addressing.cc
index 3767c46d..9c50c129 100644
--- a/014indirect_addressing.cc
+++ b/014indirect_addressing.cc
@@ -91,7 +91,7 @@ void test_add_mem_at_r32_to_r32_signed_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: add r/m32 to EBX\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 1\n"
+      "run: effective address contains 0x00000001\n"
       "run: SF=1; ZF=0; CF=0; OF=1\n"
       "run: storing 0x80000000\n"
   );
@@ -111,7 +111,7 @@ void test_add_mem_at_r32_to_r32_unsigned_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: add r/m32 to EBX\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 1\n"
+      "run: effective address contains 0x00000001\n"
       "run: SF=0; ZF=1; CF=1; OF=0\n"
       "run: storing 0x00000000\n"
   );
@@ -131,7 +131,7 @@ void test_add_mem_at_r32_to_r32_unsigned_and_signed_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: add r/m32 to EBX\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 80000000\n"
+      "run: effective address contains 0x80000000\n"
       "run: SF=0; ZF=1; CF=1; OF=1\n"
       "run: storing 0x00000000\n"
   );
@@ -219,7 +219,7 @@ void test_subtract_mem_at_r32_from_r32_signed_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: subtract r/m32 from EBX\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 7fffffff\n"
+      "run: effective address contains 0x7fffffff\n"
       "run: SF=0; ZF=0; CF=0; OF=1\n"
       "run: storing 0x00000001\n"
   );
@@ -239,7 +239,7 @@ void test_subtract_mem_at_r32_from_r32_unsigned_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: subtract r/m32 from EBX\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 1\n"
+      "run: effective address contains 0x00000001\n"
       "run: SF=1; ZF=0; CF=1; OF=0\n"
       "run: storing 0xffffffff\n"
   );
@@ -259,7 +259,7 @@ void test_subtract_mem_at_r32_from_r32_signed_and_unsigned_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: subtract r/m32 from EBX\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 80000000\n"
+      "run: effective address contains 0x80000000\n"
       "run: SF=1; ZF=0; CF=1; OF=1\n"
       "run: storing 0x80000000\n"
   );
@@ -590,7 +590,7 @@ void test_compare_r32_with_mem_at_r32_lesser_unsigned_and_signed() {
   CHECK_TRACE_CONTENTS(
       "run: compare EBX with r/m32\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains a0b0c0d\n"
+      "run: effective address contains 0x0a0b0c0d\n"
       "run: SF=1; ZF=0; CF=1; OF=0\n"
   );
 }
@@ -609,7 +609,7 @@ void test_compare_r32_with_mem_at_r32_lesser_unsigned_and_signed_due_to_overflow
   CHECK_TRACE_CONTENTS(
       "run: compare EBX with r/m32\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 80000000\n"
+      "run: effective address contains 0x80000000\n"
       "run: SF=1; ZF=0; CF=1; OF=1\n"
   );
 }
@@ -628,7 +628,7 @@ void test_compare_r32_with_mem_at_r32_lesser_signed() {
   CHECK_TRACE_CONTENTS(
       "run: compare EBX with r/m32\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains 1\n"
+      "run: effective address contains 0x00000001\n"
       "run: SF=1; ZF=0; CF=0; OF=0\n"
   );
 }
@@ -647,7 +647,7 @@ void test_compare_r32_with_mem_at_r32_lesser_unsigned() {
   CHECK_TRACE_CONTENTS(
       "run: compare EBX with r/m32\n"
       "run: effective address is 0x00002000 (EAX)\n"
-      "run: effective address contains ffffffff\n"
+      "run: effective address contains 0xffffffff\n"
       "run: SF=0; ZF=0; CF=1; OF=0\n"
   );
 }
diff --git a/015immediate_addressing.cc b/015immediate_addressing.cc
index 0ff5726d..c264d5d3 100644
--- a/015immediate_addressing.cc
+++ b/015immediate_addressing.cc
@@ -339,7 +339,7 @@ void test_subtract_imm32_from_mem_at_r32_signed_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: combine r/m32 with imm32\n"
       "run: effective address is 0x00002000 (EBX)\n"
-      "run: effective address contains 80000000\n"
+      "run: effective address contains 0x80000000\n"
       "run: imm32 is 0x7fffffff\n"
       "run: subop subtract\n"
       "run: SF=0; ZF=0; CF=0; OF=1\n"
@@ -360,7 +360,7 @@ void test_subtract_imm32_from_mem_at_r32_unsigned_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: combine r/m32 with imm32\n"
       "run: effective address is 0x00002000 (EBX)\n"
-      "run: effective address contains 0\n"
+      "run: effective address contains 0x00000000\n"
       "run: imm32 is 0x00000001\n"
       "run: subop subtract\n"
       "run: SF=1; ZF=0; CF=1; OF=0\n"
@@ -381,7 +381,7 @@ void test_subtract_imm32_from_mem_at_r32_signed_and_unsigned_overflow() {
   CHECK_TRACE_CONTENTS(
       "run: combine r/m32 with imm32\n"
       "run: effective address is 0x00002000 (EBX)\n"
-      "run: effective address contains 0\n"
+      "run: effective address contains 0x00000000\n"
       "run: imm32 is 0x80000000\n"
       "run: subop subtract\n"
       "run: SF=1; ZF=0; CF=1; OF=1\n"