diff --git a/libr/core/disasm.c b/libr/core/disasm.c
index 421229b0cb587..dc3e4799f7d55 100644
--- a/libr/core/disasm.c
+++ b/libr/core/disasm.c
@@ -3736,15 +3736,25 @@ static void ds_print_bytes(RDisasmState *ds) {
 			// R2R db/cmd/cmd_disassembly
 			nstr = r_print_hexpair (ds->print, str, n);
 			if (r_str_ansi_len (nstr) > nb) {
+				if (nb % 2) {
+					nb--;
+					if (ds->show_bytes_align) {
+						r_cons_printf (" ");
+					}
+				}
 				char *p = (char *)r_str_ansi_chrn (nstr, nb);
-				if (p)  {
+				if (p) {
 					off = true;
+					if (!core->print->bytespace) {
+						p--;
+					}
 					p[0] = '.';
-					if (core->print->bytespace) {
-						p[1] = '.';
+					p[1] = '.';
+					if (ds->show_bytes_align) {
 						p[2] = '\0';
 					} else {
-						p[1] = '\0';
+						p[2] = ' ';
+						p[3] = '\0';
 					}
 				}
 			}
@@ -3779,7 +3789,7 @@ static void ds_print_bytes(RDisasmState *ds) {
 		if (core->print->bytespace) {
 			const int d = off? 2: 1;
 			const char *air = off? " ":"";
-			r_cons_printf ("%s%s%s  %s", (extra[0] && extra[1])? extra + d: extra, str, pad, air);
+			r_cons_printf ("%s%s%s %s", (extra[0] && extra[1])? extra + d: extra, str, pad, air);
 		} else {
 			r_cons_printf ("%s%s%s  ", (extra[0])? extra + 1: extra, str, pad);
 		}
diff --git a/test/db/anal/bpf_64 b/test/db/anal/bpf_64
index 1fe8e8c6d7ce5..68f47865b7e8f 100644
--- a/test/db/anal/bpf_64
+++ b/test/db/anal/bpf_64
@@ -118,11 +118,11 @@ CMDS=pd 5
 EXPECT=<<EOF
             ;-- entry0:
             ;-- entrypoint:
-            0x000009b8      bf1200000000.  mov64 r2, r1
-            0x000009c0      bfa100000000.  mov64 r1, r10
-            0x000009c8      07010000d0ff.  add64 r1, 0xffffffd0
-            0x000009d0      851000000502.  call 0x205
-            0x000009d8      79a6d0ff0000.  ldxdw r6, [r10+0xffd0]
+            0x000009b8      bf12000000..   mov64 r2, r1
+            0x000009c0      bfa1000000..   mov64 r1, r10
+            0x000009c8      07010000d0..   add64 r1, 0xffffffd0
+            0x000009d0      8510000005..   call 0x205
+            0x000009d8      79a6d0ff00..   ldxdw r6, [r10+0xffd0]
 EOF
 RUN
 
diff --git a/test/db/anal/calls b/test/db/anal/calls
index 9339b1a1eea6e..2f8816213a390 100644
--- a/test/db/anal/calls
+++ b/test/db/anal/calls
@@ -21,9 +21,9 @@ EXPECT=<<EOF
 |           0x00400419      4883e4f0       and rsp, 0xfffffffffffffff0
 |           0x0040041d      50             push rax
 |           0x0040041e      54             push rsp
-|           0x0040041f      49c7c0000640.  mov r8, sym.__libc_csu_fini ; 0x400600
-|           0x00400426      48c7c1900540.  mov rcx, sym.__libc_csu_init ; 0x400590 ; "AWA\x89\xffAVI\x89\xf6AUI\x89\xd5ATL\x8d%p\x01 "
-|           0x0040042d      48c7c7740540.  mov rdi, main               ; 0x400574 ; "U\xff\x14%X\t`"
+|           0x0040041f      49c7c00006..   mov r8, sym.__libc_csu_fini ; 0x400600
+|           0x00400426      48c7c19005..   mov rcx, sym.__libc_csu_init ; 0x400590 ; "AWA\x89\xffAVI\x89\xf6AUI\x89\xd5ATL\x8d%p\x01 "
+|           0x0040042d      48c7c77405..   mov rdi, main               ; 0x400574 ; "U\xff\x14%X\t`"
 \           0x00400434      e8b7ffffff     call sym.imp.__libc_start_main ; int __libc_start_main(func main, int argc, char **ubp_av, func init, func fini, func rtld_fini, void *stack_end)
 EOF
 RUN
diff --git a/test/db/anal/evm b/test/db/anal/evm
index d3d56e3abea88..19c50ae2f2cfe 100644
--- a/test/db/anal/evm
+++ b/test/db/anal/evm
@@ -6,7 +6,7 @@ wx 7c030000000000000000000000000000000000000000000000000000000f9004
 pd 3
 EOF
 EXPECT=<<EOF
-            0x00000000      7c0300000000.  push29 0x030000000000000000000000000000000000000000000000000000000f
+            0x00000000      7c03000000..   push29 0x030000000000000000000000000000000000000000000000000000000f
             0x0000001e      90             swap1
             0x0000001f      04             div
 EOF
diff --git a/test/db/anal/x86_64 b/test/db/anal/x86_64
index fe33dd83edbf2..41f6167eda4e2 100644
--- a/test/db/anal/x86_64
+++ b/test/db/anal/x86_64
@@ -522,15 +522,15 @@ EOF
 EXPECT=<<EOF
 / 114: fcn.00487350 ();
 | 0x00487350      8b8710030000   mov eax, dword [rdi + 0x310]
-| 0x00487356      48b900000000.  movabs rcx, 0x200000000
+| 0x00487356      48b9000000..   movabs rcx, 0x200000000
 | 0x00487360      8d50ff         lea edx, [rax - 1]
-| 0x00487363      48b8ffffffff.  movabs rax, 0x3ffffffff
+| 0x00487363      48b8ffffff..   movabs rax, 0x3ffffffff
 | 0x0048736d      899710030000   mov dword [rdi + 0x310], edx
-| 0x00487373      482387100300.  and rax, qword [rdi + 0x310]
+| 0x00487373      4823871003..   and rax, qword [rdi + 0x310]
 | 0x0048737a      4839c8         cmp rax, rcx
 | 0x0048737d      7411           je 0x487390
 | // true: 0x00487390  false: 0x0048737f
-| 0x0048737f      f605d2542300.  test byte [0x006bc858], 0x40
+| 0x0048737f      f605d25423..   test byte [0x006bc858], 0x40
 | 0x00487386      7525           jne 0x4873ad
 | // true: 0x004873ad  false: 0x00487388
 | 0x00487388      f3c3           repz ret
@@ -539,12 +539,12 @@ EXPECT=<<EOF
 | 0x00487396      85c0           test eax, eax
 | 0x00487398      7426           je 0x4873c0
 | // true: 0x004873c0  false: 0x0048739a
-| 0x0048739a      f605b7542300.  test byte [0x006bc858], 0x40
-| 0x004873a1      c705d54d2300.  mov dword [0x006bc180], 2
+| 0x0048739a      f605b75423..   test byte [0x006bc858], 0x40
+| 0x004873a1      c705d54d23..   mov dword [0x006bc180], 2
 | 0x004873ab      74db           je 0x487388
 | // true: 0x00487388  false: 0x004873ad
 | 0x004873ad      488b7708       mov rsi, qword [rdi + 8]
-| 0x004873b1      488d3dd03502.  lea rdi, str._nclosing_file_s__direct_opencount_u_n
+| 0x004873b1      488d3dd035..   lea rdi, str._nclosing_file_s__direct_opencount_u_n
 | 0x004873b8      31c0           xor eax, eax
 | 0x004873ba      e9b16cffff     jmp fcn.0047e070
 
@@ -3535,29 +3535,29 @@ EXPECT=<<EOF
 0x140001012      0f871a010000   ja case.0x140001034.3
 0x140001034      ffe1           jmp rcx                                ; switch table (99 cases) at 0x140001148
 ;-- case 1:                                                            ; from 0x140001034
-0x140001036      488d0dd31100.  lea rcx, str.case_1                    ; 0x140002210 ; "case 1"
+0x140001036      488d0dd311..   lea rcx, str.case_1                    ; 0x140002210 ; "case 1"
 ;-- case 2:                                                            ; from 0x140001034
-0x14000104b      488d0dc61100.  lea rcx, str.case_2                    ; 0x140002218 ; "case 2"
+0x14000104b      488d0dc611..   lea rcx, str.case_2                    ; 0x140002218 ; "case 2"
 ;-- case 11:                                                           ; from 0x140001034
-0x140001060      488d0db91100.  lea rcx, str.case_11                   ; 0x140002220 ; "case 11"
+0x140001060      488d0db911..   lea rcx, str.case_11                   ; 0x140002220 ; "case 11"
 ;-- case 13:                                                           ; from 0x140001034
-0x140001075      488d0dac1100.  lea rcx, str.case_13                   ; 0x140002228 ; "case 13"
+0x140001075      488d0dac11..   lea rcx, str.case_13                   ; 0x140002228 ; "case 13"
 ;-- case 15...16:                                                      ; from 0x140001034
-0x14000108a      488d0d9f1100.  lea rcx, str.case_15_and_16            ; 0x140002230 ; "case 15 and 16"
+0x14000108a      488d0d9f11..   lea rcx, str.case_15_and_16            ; 0x140002230 ; "case 15 and 16"
 ;-- case 19:                                                           ; from 0x140001034
-0x14000109f      488d0d9a1100.  lea rcx, str.case_19                   ; 0x140002240 ; "case 19"
+0x14000109f      488d0d9a11..   lea rcx, str.case_19                   ; 0x140002240 ; "case 19"
 ;-- case 50:                                                           ; from 0x140001034
-0x1400010b4      488d0d8d1100.  lea rcx, str.case_50                   ; 0x140002248 ; "case 50"
+0x1400010b4      488d0d8d11..   lea rcx, str.case_50                   ; 0x140002248 ; "case 50"
 ;-- case 30:                                                           ; from 0x140001034
-0x1400010c9      488d0d801100.  lea rcx, str.case_30                   ; 0x140002250 ; "case 30"
+0x1400010c9      488d0d8011..   lea rcx, str.case_30                   ; 0x140002250 ; "case 30"
 ;-- case 20:                                                           ; from 0x140001034
-0x1400010de      488d0d731100.  lea rcx, str.case_20                   ; 0x140002258 ; "case 20"
+0x1400010de      488d0d7311..   lea rcx, str.case_20                   ; 0x140002258 ; "case 20"
 ;-- case 10:                                                           ; from 0x140001034
-0x1400010f3      488d0d661100.  lea rcx, str.case_10                   ; 0x140002260 ; "case 10"
+0x1400010f3      488d0d6611..   lea rcx, str.case_10                   ; 0x140002260 ; "case 10"
 ;-- case 99:                                                           ; from 0x140001034
-0x140001108      488d0d591100.  lea rcx, str.case_99                   ; 0x140002268 ; "case 99"
+0x140001108      488d0d5911..   lea rcx, str.case_99                   ; 0x140002268 ; "case 99"
 ;-- case 97:                                                           ; from 0x140001034
-0x14000111d      488d0d4c1100.  lea rcx, str.case_97                   ; 0x140002270 ; "case 97"
+0x14000111d      488d0d4c11..   lea rcx, str.case_97                   ; 0x140002270 ; "case 97"
 ;-- case 3...9:                                                        ; from 0x140001034
 ;-- case 12:                                                           ; from 0x140001034
 ;-- case 14:                                                           ; from 0x140001034
@@ -3847,7 +3847,7 @@ EXPECT=<<EOF
 |           0x00000004      b402           mov ah, 2
 |           0x00000006      66b83333       mov ax, 0x3333
 |           0x0000000a      b855554444     mov eax, 0x44445555
-|           0x0000000f      48b8bebafeca.  movabs rax, 0xdeadbeefcafebabe
+|           0x0000000f      48b8bebafe..   movabs rax, 0xdeadbeefcafebabe
 |           0x00000019      4889d8         mov rax, rbx
 |           0x0000001c      488d03         lea rax, [rbx]
 |           0x0000001f      488b4308       mov rax, qword [rbx + 8]
@@ -3888,7 +3888,7 @@ EXPECT=<<EOF
 |           0x00000004      b402           ah = 2
 |           0x00000006      66b83333       ax = 0x3333
 |           0x0000000a      b855554444     eax = 0x44445555
-|           0x0000000f      48b8bebafeca.  rax = 0xdeadbeefcafebabe
+|           0x0000000f      48b8bebafe..   rax = 0xdeadbeefcafebabe
 |           0x00000019      4889d8         rax = rbx
 |           0x0000001c      488d03         rax = rbx
 |           0x0000001f      488b4308       rax = qword [rbx + 8]
@@ -4036,7 +4036,7 @@ scale: 1
 esil: 0x1fce0,rip,+,[16],xmm0,=
 direction: read
 family: vec
-            0x140001358      660f6f05e0fc.  movdqa xmm0, xmmword [str._n_2.__1__a] ; [0x140021040:16]=-1 ; "\n*,2.)%#1%#)a~\x7f"
+            0x140001358      660f6f05e0..   movdqa xmm0, xmmword [str._n_2.__1__a] ; [0x140021040:16]=-1 ; "\n*,2.)%#1%#)a~\x7f"
             ;-- str._n_2.__1__a:
             ; DATA XREF from main @ +0x38(r)
             0x140021040     .string "\n*,2.)%#1%#)a~" ; len=15
diff --git a/test/db/cmd/cmd_ahi b/test/db/cmd/cmd_ahi
index a847b9999e22f..06af4a2ccb27a 100644
--- a/test/db/cmd/cmd_ahi
+++ b/test/db/cmd/cmd_ahi
@@ -58,8 +58,8 @@ ahi 10
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      4881ec480600.  sub rsp, 0x648
-            0x00000000      4881ec480600.  sub rsp, 1608
+            0x00000000      4881ec4806..   sub rsp, 0x648
+            0x00000000      4881ec4806..   sub rsp, 1608
 EOF
 RUN
 
@@ -123,7 +123,7 @@ wx 4881ec48060000
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      4881ec480600.  sub rsp, 0x648
+            0x00000000      4881ec4806..   sub rsp, 0x648
 EOF
 RUN
 
@@ -137,7 +137,7 @@ wx 4881ec48060000
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      4881ec480600.  sub rsp, 0x648
+            0x00000000      4881ec4806..   sub rsp, 0x648
 EOF
 RUN
 
@@ -151,7 +151,7 @@ ahi 10
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      4881ec480600.  sub rsp, 1608
+            0x00000000      4881ec4806..   sub rsp, 1608
 EOF
 RUN
 
@@ -165,7 +165,7 @@ ahi 8
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      4881ec480600.  sub rsp, 03110
+            0x00000000      4881ec4806..   sub rsp, 03110
 EOF
 RUN
 
@@ -179,7 +179,7 @@ ahi 2
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      4881ec480600.  sub rsp, 11001001000b
+            0x00000000      4881ec4806..   sub rsp, 11001001000b
 EOF
 RUN
 
@@ -282,9 +282,9 @@ ahi 10; pd 1
 EOF
 EXPECT=<<EOF
 true
-            0x100001000      c7055f440000.  mov dword [rip + 0x445f], 0 ; [0x100005469:4]=-1
-            0x100001000      c7055f440000.  mov dword [0x100005469], 0 ; [0x100005469:4]=-1
-            0x100001000      c7055f440000.  mov dword [4294988905], 0  ; [0x100005469:4]=-1
+            0x100001000      c7055f4400..   mov dword [rip + 0x445f], 0 ; [0x100005469:4]=-1
+            0x100001000      c7055f4400..   mov dword [0x100005469], 0 ; [0x100005469:4]=-1
+            0x100001000      c7055f4400..   mov dword [4294988905], 0  ; [0x100005469:4]=-1
 EOF
 RUN
 
diff --git a/test/db/cmd/cmd_disassembly b/test/db/cmd/cmd_disassembly
index b2982acde43d4..0021791ea99b2 100644
--- a/test/db/cmd/cmd_disassembly
+++ b/test/db/cmd/cmd_disassembly
@@ -282,7 +282,7 @@ e asm.bytes.align = true
 pd 10
 EOF
 EXPECT=<<EOF
-            0x00000000      803d1ca00408.  cmp byte [0x804a01c], 0x33
+            0x00000000      803d1ca004..   cmp byte [0x804a01c], 0x33
         ,=< 0x00000007      740c           je 0x15
        ,==< 0x00000009      eb1c           jmp 0x27
        ||   0x0000000b      83c004         add eax, 4
@@ -293,7 +293,7 @@ EXPECT=<<EOF
        |    0x00000018      40             inc eax
        |    0x00000019      8b10           mov edx, dword [eax]
 --
-            0x00000000      803d1ca00408.  cmp byte [0x804a01c], 0x33
+            0x00000000       803d1ca004..  cmp byte [0x804a01c], 0x33
         ,=< 0x00000007               740c  je 0x15
        ,==< 0x00000009               eb1c  jmp 0x27
        ||   0x0000000b             83c004  add eax, 4
@@ -304,26 +304,26 @@ EXPECT=<<EOF
        |    0x00000018                 40  inc eax
        |    0x00000019               8b10  mov edx, dword [eax]
 --
-            0x00000000           80 3d 1c a0 ..   cmp byte [0x804a01c], 0x33
-        ,=< 0x00000007                    74 0c   je 0x15
-       ,==< 0x00000009                    eb 1c   jmp 0x27
-       ||   0x0000000b                 83 c0 04   add eax, 4
-       ||   0x0000000e           a3 18 a0 08 ..   mov dword [0x8f08a018], eax
-       ||   0x00000013                       fd   std
-       ||   0x00000014                    2a 11   sub dl, byte [ecx]
-       |    0x00000016                    8a 00   mov al, byte [eax]
-       |    0x00000018                       40   inc eax
-       |    0x00000019                    8b 10   mov edx, dword [eax]
+            0x00000000            80 3d 1c a0..  cmp byte [0x804a01c], 0x33
+        ,=< 0x00000007                    74 0c  je 0x15
+       ,==< 0x00000009                    eb 1c  jmp 0x27
+       ||   0x0000000b                 83 c0 04  add eax, 4
+       ||   0x0000000e            a3 18 a0 08..  mov dword [0x8f08a018], eax
+       ||   0x00000013                       fd  std
+       ||   0x00000014                    2a 11  sub dl, byte [ecx]
+       |    0x00000016                    8a 00  mov al, byte [eax]
+       |    0x00000018                       40  inc eax
+       |    0x00000019                    8b 10  mov edx, dword [eax]
 --
-            0x00000000           80 3d 1c a0 ..   cmp byte [0x804a01c], 0x33
-        ,=< 0x00000007                    74 0c   je 0x15
-       ,==< 0x00000009                    eb 1c   jmp 0x27
-       ||   0x0000000b                 83 c0 04   add eax, 4
-       ||   0x0000000e           a3 18 a0 08 ..   mov dword [0x8f08a018], eax
-       ||   0x00000013                       fd   std
-       ||   0x00000014                    2a 11   sub dl, byte [ecx]
-       |    0x00000016                    8a 00   mov al, byte [eax]
-       |    0x00000018                       40   inc eax
-       |    0x00000019                    8b 10   mov edx, dword [eax]
+            0x00000000            80 3d 1c a0..  cmp byte [0x804a01c], 0x33
+        ,=< 0x00000007                    74 0c  je 0x15
+       ,==< 0x00000009                    eb 1c  jmp 0x27
+       ||   0x0000000b                 83 c0 04  add eax, 4
+       ||   0x0000000e            a3 18 a0 08..  mov dword [0x8f08a018], eax
+       ||   0x00000013                       fd  std
+       ||   0x00000014                    2a 11  sub dl, byte [ecx]
+       |    0x00000016                    8a 00  mov al, byte [eax]
+       |    0x00000018                       40  inc eax
+       |    0x00000019                    8b 10  mov edx, dword [eax]
 EOF
 RUN
diff --git a/test/db/cmd/cmd_pd b/test/db/cmd/cmd_pd
index cfd2bb463307b..698d42ec22ba4 100644
--- a/test/db/cmd/cmd_pd
+++ b/test/db/cmd/cmd_pd
@@ -12,13 +12,13 @@ e asm.sub.rel=0
 pd 1
 EOF
 EXPECT=<<EOF
-            0x100001232      c70594420000.  mov dword [rip + 0x4294], 0x50 ; 'P' ; section.10.__DATA.__data
+            0x100001232      c705944200..   mov dword [rip + 0x4294], 0x50 ; 'P' ; section.10.__DATA.__data
                                                                        ; [0x1000054d0:4]=80 ; U"P."
-            0x100001232      c70594420000.  mov dword [section.10.__DATA.__data], 0x50 ; 'P'
+            0x100001232      c705944200..   mov dword [section.10.__DATA.__data], 0x50 ; 'P'
                                                                        ; [0x1000054d0:4]=80 ; U"P."
-            0x100001232      c70594420000.  mov dword [fin.dus], 0x50  ; 'P'
+            0x100001232      c705944200..   mov dword [fin.dus], 0x50  ; 'P'
                                                                        ; [0x1000054d0:4]=80 ; U"P."
-            0x100001232      c70594420000.  mov dword [rip + 0x4294], 0x50 ; 'P' ; fin.dus
+            0x100001232      c705944200..   mov dword [rip + 0x4294], 0x50 ; 'P' ; fin.dus
                                                                        ; [0x1000054d0:4]=80 ; U"P."
 EOF
 RUN
@@ -285,7 +285,7 @@ wx c6852fffffff61
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      c6852fffffff.  mov byte [ebp - 0xd1], 0x61 ; 'a'
+            0x00000000      c6852fffff..   mov byte [ebp - 0xd1], 0x61 ; 'a'
 EOF
 RUN
 
@@ -532,8 +532,8 @@ e asm.nbytes = 6
 pd 3
 EOF
 EXPECT=<<EOF
-  0x00000000      488d85c0f9ff.  lea rax, [rbp - 0x640]
-  0x00000007      488985b8f9ff.  mov qword [rbp - 0x648], rax
+  0x00000000      488d85c0f9..   lea rax, [rbp - 0x640]
+  0x00000007      488985b8f9..   mov qword [rbp - 0x648], rax
   0x0000000e      4585f6         test r14d, r14d
   0x00000000      488d85c0f9ffff         lea rax, [rbp - 0x640]
   0x00000007      488985b8f9ffff         mov qword [rbp - 0x648], rax
@@ -541,8 +541,8 @@ EXPECT=<<EOF
   0x00000000              488d85c0f9ffff  lea rax, [rbp - 0x640]
   0x00000007              488985b8f9ffff  mov qword [rbp - 0x648], rax
   0x0000000e                      4585f6  test r14d, r14d
-  0x00000000       488d85c0f9ff.  lea rax, [rbp - 0x640]
-  0x00000007       488985b8f9ff.  mov qword [rbp - 0x648], rax
+  0x00000000      488d85c0f9..   lea rax, [rbp - 0x640]
+  0x00000007      488985b8f9..   mov qword [rbp - 0x648], rax
   0x0000000e              4585f6  test r14d, r14d
 EOF
 RUN
@@ -563,8 +563,8 @@ e asm.sub.rel=true
 pd 1
 EOF
 EXPECT=<<EOF
-  0x00400000      488d05020000.  lea rax, [rip + 2]
-  0x00400000      488d05020000.  lea rax, [0x00400009]
+  0x00400000      488d050200..   lea rax, [rip + 2]
+  0x00400000      488d050200..   lea rax, [0x00400009]
 EOF
 RUN
 
@@ -672,7 +672,7 @@ NAME=r_str_escape anal
 FILE=bins/pe/a.exe
 CMDS=pd 1 @ 0x00401322
 EXPECT=<<EOF
-            0x00401322      c70424043040.  mov dword [esp], 0x403004   ; [0x403004:4]=0xa7025 ; "%p\n"
+            0x00401322      c704240430..   mov dword [esp], 0x403004   ; [0x403004:4]=0xa7025 ; "%p\n"
 EOF
 RUN
 
@@ -683,8 +683,8 @@ pd 1 @ 0x140001034
 pd 1 @ 0x140001070
 EOF
 EXPECT=<<EOF
-            0x140001034      488d05495001.  lea rax, [0x140016084]     ; "\r"
-            0x140001070      488d053d5001.  lea rax, [0x1400160b4]     ; "a"
+            0x140001034      488d054950..   lea rax, [0x140016084]     ; "\r"
+            0x140001070      488d053d50..   lea rax, [0x1400160b4]     ; "a"
 EOF
 RUN
 
@@ -705,10 +705,10 @@ e asm.cmt.right=false
 pd 1 @ 0x0001145f
 EOF
 EXPECT=<<EOF
-            0x0001145f      488d3d72a100.  lea rdi, str.A_NULL_argv_0__was_passed_through_an_exec_system_call._n ; 0x1b5d8 ; "A NULL argv[0] was passed through an exec system call.\n"
+            0x0001145f      488d3d72a1..   lea rdi, str.A_NULL_argv_0__was_passed_through_an_exec_system_call._n ; 0x1b5d8 ; "A NULL argv[0] was passed through an exec system call.\n"
             ; 0x1b5d8
             ; "A NULL argv[0] was passed through an exec system call.\n"
-            0x0001145f      488d3d72a100.  lea rdi, str.A_NULL_argv_0__was_passed_through_an_exec_system_call._n
+            0x0001145f      488d3d72a1..   lea rdi, str.A_NULL_argv_0__was_passed_through_an_exec_system_call._n
 EOF
 RUN
 
@@ -723,10 +723,10 @@ e asm.cmt.right=false
 pd 1 @ 0x0001145f
 EOF
 EXPECT=<<EOF
-            0x0001145f      488d3d72a100.  lea rdi, [NULL_error]       ; 0x1b5d8 ; "A NULL argv[0] was passed through an exec system call.\n"
+            0x0001145f      488d3d72a1..   lea rdi, [NULL_error]       ; 0x1b5d8 ; "A NULL argv[0] was passed through an exec system call.\n"
             ; 0x1b5d8
             ; "A NULL argv[0] was passed through an exec system call.\n"
-            0x0001145f      488d3d72a100.  lea rdi, [NULL_error]
+            0x0001145f      488d3d72a1..   lea rdi, [NULL_error]
 EOF
 RUN
 
@@ -827,20 +827,20 @@ pd 1 @ 0x140001010
 pd 1 @ 0x14000101c
 EOF
 EXPECT=<<EOF
-            0x140001004      488d05f54f01.  lea rax, str._tANSIesc:_e_33m_r_n ; section..data
+            0x140001004      488d05f54f..   lea rax, str._tANSIesc:_e_33m_r_n ; section..data
                                                                        ; 0x140016000 ; "\tANSI\esc: \x1b[33m\r\n"
-            0x140001010      488d05015001.  lea rax, str._twideesc:_e_0m ; 0x140016018 ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x14000101c      488d051d5001.  lea rax, str._wide__in_Arabic:_ ; 0x140016040 ; u"\"wide\" in Arabic: \u0648\u0627\u0633\u0639"
+            0x140001010      488d050150..   lea rax, str._twideesc:_e_0m ; 0x140016018 ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x14000101c      488d051d50..   lea rax, str._wide__in_Arabic:_ ; 0x140016040 ; u"\"wide\" in Arabic: \u0648\u0627\u0633\u0639"
             ; section..data
             ; 0x140016000
             ; "\tANSI\esc: \x1b[33m\r\n"
-            0x140001004      488d05f54f01.  lea rax, str._tANSIesc:_e_33m_r_n
+            0x140001004      488d05f54f..   lea rax, str._tANSIesc:_e_33m_r_n
             ; 0x140016018
             ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001010      488d05015001.  lea rax, str._twideesc:_e_0m
+            0x140001010      488d050150..   lea rax, str._twideesc:_e_0m
             ; 0x140016040
             ; u"\"wide\" in Arabic: \u0648\u0627\u0633\u0639"
-            0x14000101c      488d051d5001.  lea rax, str._wide__in_Arabic:_
+            0x14000101c      488d051d50..   lea rax, str._wide__in_Arabic:_
 EOF
 RUN
 
@@ -848,7 +848,7 @@ NAME=no ffffff test for issue #7755
 FILE=bins/pe/testapp-msvc64.exe
 CMDS=pd 1 @ 0x140001040
 EXPECT=<<EOF
-            0x140001040      488d05415001.  lea rax, [0x140016088]     ; u"r2 \u1308\u23f4\u23f4"
+            0x140001040      488d054150..   lea rax, [0x140016088]     ; u"r2 \u1308\u23f4\u23f4"
 EOF
 RUN
 
@@ -917,8 +917,8 @@ e bin.str.enc=utf8
 pd 1 @ 0x140001058
 EOF
 EXPECT=<<EOF
-            0x140001058      488d05415001.  lea rax, [0x1400160a0]     ; "latin1 gate: \xce\xbb\xab\xce"
-            0x140001058      488d05415001.  lea rax, [0x1400160a0]     ; "latin1 gate: \u03bb\xab\xce"
+            0x140001058      488d054150..   lea rax, [0x1400160a0]     ; "latin1 gate: \xce\xbb\xab\xce"
+            0x140001058      488d054150..   lea rax, [0x1400160a0]     ; "latin1 gate: \u03bb\xab\xce"
 EOF
 RUN
 
@@ -995,8 +995,8 @@ e bin.str.enc=utf16le
 pd 1 @ 0x14000104c
 EOF
 EXPECT=<<EOF
-            0x14000104c      488d05455001.  lea rax, [0x140016098]     ; "@"
-            0x14000104c      488d05455001.  lea rax, [0x140016098]     ; u"@\ufffd\ud801"
+            0x14000104c      488d054550..   lea rax, [0x140016098]     ; "@"
+            0x14000104c      488d054550..   lea rax, [0x140016098]     ; u"@\ufffd\ud801"
 EOF
 RUN
 
@@ -1086,15 +1086,15 @@ e asm.cmt.right=false
 pd 1 @ 0x140001010
 EOF
 EXPECT=<<EOF
-            0x140001010      488d05015001.  lea rax, [0x140016018]     ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001028      488d05415001.  lea rax, [0x140016070]     ; str._fFormfeed_at_start
+            0x140001010      488d050150..   lea rax, [0x140016018]     ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x140001028      488d054150..   lea rax, [0x140016070]     ; str._fFormfeed_at_start
             ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001010      488d05015001.  lea rax, [0x140016018]
+            0x140001010      488d050150..   lea rax, [0x140016018]
             ; str._fFormfeed_at_start
-            0x140001028      488d05415001.  lea rax, [0x140016070]
-            0x140001010      488d05015001.  lea rax, [0x140016018]     ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x140001028      488d054150..   lea rax, [0x140016070]
+            0x140001010      488d050150..   lea rax, [0x140016018]     ; u"\twide\esc: \x1b[0m\xa1\r\n"
             ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001010      488d05015001.  lea rax, [0x140016018]
+            0x140001010      488d050150..   lea rax, [0x140016018]
 EOF
 RUN
 
@@ -1110,10 +1110,10 @@ e asm.cmt.right=false
 pd 1 @ 0x140001010
 EOF
 EXPECT=<<EOF
-            0x140001010      488d05015001.  lea rax, [0x140016018]     ; str._twideesc:_e_0m ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x140001010      488d050150..   lea rax, [0x140016018]     ; str._twideesc:_e_0m ; u"\twide\esc: \x1b[0m\xa1\r\n"
             ; str._twideesc:_e_0m
             ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001010      488d05015001.  lea rax, [0x140016018]
+            0x140001010      488d050150..   lea rax, [0x140016018]
 EOF
 RUN
 
@@ -1162,9 +1162,9 @@ e asm.cmt.off=nodup
 pd 1 @ 0x140001010
 EOF
 EXPECT=<<EOF
-            0x140001010      488d05015001.  lea rax, str._twideesc:_e_0m ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001010      488d05015001.  lea rax, [0x140016018]     ; 0x140016018 ; u"\twide\esc: \x1b[0m\xa1\r\n"
-            0x140001010      488d05015001.  lea rax, [0x140016018]     ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x140001010      488d050150..   lea rax, str._twideesc:_e_0m ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x140001010      488d050150..   lea rax, [0x140016018]     ; 0x140016018 ; u"\twide\esc: \x1b[0m\xa1\r\n"
+            0x140001010      488d050150..   lea rax, [0x140016018]     ; u"\twide\esc: \x1b[0m\xa1\r\n"
 EOF
 RUN
 
@@ -1333,7 +1333,7 @@ e str.escbslash=1
 pdJ 1 @ 0x08048532
 EOF
 EXPECT=<<EOF
-[{"offset":134513970,"text":"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;[0x8048679:4]=0x73736150"},{"offset":134513970,"text":"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;\"Password&nbsp;Incorrect!\\n\""},{"offset":134513970,"text":"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0x08048532&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;c70424798604.&nbsp;&nbsp;mov&nbsp;dword&nbsp;[esp],&nbsp;str.Password_Incorrect__n"}]
+[{"offset":134513970,"text":"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;[0x8048679:4]=0x73736150"},{"offset":134513970,"text":"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;&nbsp;\"Password&nbsp;Incorrect!\\n\""},{"offset":134513970,"text":"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0x08048532&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;c704247986..&nbsp;&nbsp;&nbsp;mov&nbsp;dword&nbsp;[esp],&nbsp;str.Password_Incorrect__n"}]
 EOF
 RUN
 
@@ -1578,7 +1578,7 @@ s 0x0040294b
 pd 10
 EOF
 EXPECT=<<EOF
-|           0x0040294b      c6059ea72100.  mov byte [0x0061d0f0], 0
+|           0x0040294b      c6059ea721..   mov byte [0x0061d0f0], 0
 |           0x00402952      83f802         cmp eax, 2
 |       ,=< 0x00402955      0f8483080000   je 0x4031de
 |       |   |
@@ -1609,7 +1609,7 @@ s 0x0040294b
 pd 10
 EOF
 EXPECT=<<EOF
-|        .text            0x0040294b      c6059ea72100.  mov byte [0x0061d0f0], 0
+|        .text            0x0040294b      c6059ea721..   mov byte [0x0061d0f0], 0
 |        .text            0x00402952      83f802         cmp eax, 2
 |        .text        ,=< 0x00402955      0f8483080000   je 0x4031de
 |                     |   |
@@ -2035,9 +2035,9 @@ pdJ 1 @ 0x9b3
 EOF
 EXPECT=<<EOF
             ; '>>>[<<+<'
-            0x000009b3      48b83e3e3e5b.  movabs rax, 0x3c2b3c3c5b3e3e3e
+            0x000009b3      48b83e3e3e..   movabs rax, 0x3c2b3c3c5b3e3e3e
 
-[{"offset":2483,"text":"            ; '>>>[<<+<'"},{"offset":2483,"text":"            0x000009b3      48b83e3e3e5b.  movabs rax, 0x3c2b3c3c5b3e3e3e"}]
+[{"offset":2483,"text":"            ; '>>>[<<+<'"},{"offset":2483,"text":"            0x000009b3      48b83e3e3e..   movabs rax, 0x3c2b3c3c5b3e3e3e"}]
 EOF
 RUN
 
@@ -2101,9 +2101,9 @@ EXPECT=<<EOF
 |           0x00005aed      4883e4f0       and rsp, 0xfffffffffffffff0
 |           0x00005af1      50             push rax
 |           0x00005af2      54             push rsp
-|           0x00005af3      4c8d05660c01.  lea r8, [0x00016760]
-|           0x00005afa      488d0def0b01.  lea rcx, [0x000166f0]
-|           0x00005b01      488d3d68e5ff.  lea rdi, [main]             ; 0x4070 ; "AWAVAUATU\x89\xfdSH\x89\xf3H\x83\xecXH\x8b>dH\x8b\x04%("
+|           0x00005af3      4c8d05660c..   lea r8, [0x00016760]
+|           0x00005afa      488d0def0b..   lea rcx, [0x000166f0]
+|           0x00005b01      488d3d68e5..   lea rdi, [main]             ; 0x4070 ; "AWAVAUATU\x89\xfdSH\x89\xf3H\x83\xecXH\x8b>dH\x8b\x04%("
 \           0x00005b08      ff150ac30100   call qword [reloc.__libc_start_main] ; [0x21e18:8]=0
 EOF
 RUN
diff --git a/test/db/cmd/cmd_pd2 b/test/db/cmd/cmd_pd2
index ad77aa7758951..193238b646f3a 100644
--- a/test/db/cmd/cmd_pd2
+++ b/test/db/cmd/cmd_pd2
@@ -805,8 +805,8 @@ e scr.color=1
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00005e6e      488d3d339b01.  lea rdi, section..fini_array ; 0x1f9a8
-            0x00005e6e      488d3d339b01.  lea rdi, section..fini_array ; 0x1f9a8
+            0x00005e6e      488d3d339b..   lea rdi, section..fini_array ; 0x1f9a8
+            0x00005e6e      488d3d339b..   lea rdi, section..fini_array ; 0x1f9a8
 EOF
 RUN
 
diff --git a/test/db/cmd/cmd_pd3 b/test/db/cmd/cmd_pd3
index 906609a1da355..4163d52b00a89 100644
--- a/test/db/cmd/cmd_pd3
+++ b/test/db/cmd/cmd_pd3
@@ -42,3 +42,53 @@ EXPECT=<<EOF
 EOF
 RUN
 
+NAME=right bytealign -- needs proper fix, but at least it looks good
+FILE=bins/elf/before-after-main
+CMDS=<<EOF
+e asm.bytes.space=true
+e asm.bytes.align=true
+e asm.nbytes=5
+so 10
+pd 10
+?e --
+e asm.bytes.space=false
+pd 10
+?e --
+e asm.nbytes=3
+pd 10
+EOF
+EXPECT=<<EOF
+            0x0804838c                    50  push eax
+            0x0804838d           8d 83 00 ..  lea eax, [ebx - 0x1a00]
+            0x08048393                    50  push eax
+            0x08048394                    51  push ecx
+            0x08048395                    56  push esi
+            0x08048396           c7 c0 4e ..  mov eax, main            ; 0x804854e
+            0x0804839c                    50  push eax
+            0x0804839d           e8 be ff ..  call sym.imp.__libc_start_main
+            0x080483a2                    f4  hlt
+            0x080483a3              8b 1c 24  mov ebx, dword [esp]
+--
+            0x0804838c               50  push eax
+            0x0804838d       8d8300e6..  lea eax, [ebx - 0x1a00]
+            0x08048393               50  push eax
+            0x08048394               51  push ecx
+            0x08048395               56  push esi
+            0x08048396       c7c04e85..  mov eax, main                 ; 0x804854e
+            0x0804839c               50  push eax
+            0x0804839d       e8beffffff  call sym.imp.__libc_start_main
+            0x080483a2               f4  hlt
+            0x080483a3           8b1c24  mov ebx, dword [esp]
+--
+            0x0804838c           50  push eax
+            0x0804838d       8d83..  lea eax, [ebx - 0x1a00]
+            0x08048393           50  push eax
+            0x08048394           51  push ecx
+            0x08048395           56  push esi
+            0x08048396       c7c0..  mov eax, main                     ; 0x804854e
+            0x0804839c           50  push eax
+            0x0804839d       e8be..  call sym.imp.__libc_start_main
+            0x080483a2           f4  hlt
+            0x080483a3       8b1c24  mov ebx, dword [esp]
+EOF
+RUN
diff --git a/test/db/cmd/cmd_pd_bugs b/test/db/cmd/cmd_pd_bugs
index 190aedd4fb924..5dfeef3c059cf 100644
--- a/test/db/cmd/cmd_pd_bugs
+++ b/test/db/cmd/cmd_pd_bugs
@@ -50,9 +50,9 @@ EXPECT=<<EOF
 |           entry0+0x9                     4883e4f0       and rsp, 0xfffffffffffffff0
 |           entry0+0xd                     50             push rax
 |           entry0+0xe                     54             push rsp
-|           entry0+0xf                     4c8b05e69301.  mov r8, qword [section..got] ; [0x1f220:8]=0x16ee0
-|           entry0+0x16                    488b0de79301.  mov rcx, qword [0x0001f228] ; [0x1f228:8]=0x16e60
-|           entry0+0x1d                    488b3de89301.  mov rdi, qword [0x0001f230] ; [0x1f230:8]=0x3bd0 main
+|           entry0+0xf                     4c8b05e693..   mov r8, qword [section..got] ; [0x1f220:8]=0x16ee0
+|           entry0+0x16                    488b0de793..   mov rcx, qword [0x0001f228] ; [0x1f228:8]=0x16e60
+|           entry0+0x1d                    488b3de893..   mov rdi, qword [0x0001f230] ; [0x1f230:8]=0x3bd0 main
 / 41: entry0 (int64_t arg3, void *stack_end);
 |           ; arg int64_t arg3 @ rdx
 |           ; arg void *stack_end @ xmm0
@@ -63,9 +63,9 @@ EXPECT=<<EOF
 |           entry0+0x9                      4883e4f0       and rsp, 0xfffffffffffffff0
 |           entry0+0xd                      50             push rax
 |           entry0+0xe                      54             push rsp
-|           entry0+0xf                      4c8b05e69301.  mov r8, qword [section..got] ; [0x1f220:8]=0x16ee0
-|           entry0+0x16                     488b0de79301.  mov rcx, qword [0x0001f228] ; [0x1f228:8]=0x16e60
-|           entry0+0x1d                     488b3de89301.  mov rdi, qword [0x0001f230] ; [0x1f230:8]=0x3bd0 main
+|           entry0+0xf                      4c8b05e693..   mov r8, qword [section..got] ; [0x1f220:8]=0x16ee0
+|           entry0+0x16                     488b0de793..   mov rcx, qword [0x0001f228] ; [0x1f228:8]=0x16e60
+|           entry0+0x1d                     488b3de893..   mov rdi, qword [0x0001f230] ; [0x1f230:8]=0x3bd0 main
 EOF
 RUN
 
diff --git a/test/db/cmd/cmd_pd_str b/test/db/cmd/cmd_pd_str
index 56cfba95f1546..b9c35495246a4 100644
--- a/test/db/cmd/cmd_pd_str
+++ b/test/db/cmd/cmd_pd_str
@@ -29,8 +29,8 @@ wx 48ba306c5f666c34670a
 pd 1
 EOF
 EXPECT=<<EOF
-            0x00000000      48b974686973.  movabs rcx, 0x3030635f73696874 ; 'this_c00'
-            0x00000000      48ba306c5f66.  movabs rdx, 0xa67346c665f6c30 ; '0l_fl4g\n'
+            0x00000000      48b9746869..   movabs rcx, 0x3030635f73696874 ; 'this_c00'
+            0x00000000      48ba306c5f..   movabs rdx, 0xa67346c665f6c30 ; '0l_fl4g\n'
 EOF
 RUN
 
diff --git a/test/db/cmd/cmd_pdr b/test/db/cmd/cmd_pdr
index c890d01f9a879..ec0c8f0bfdf20 100644
--- a/test/db/cmd/cmd_pdr
+++ b/test/db/cmd/cmd_pdr
@@ -468,9 +468,9 @@ pdr @ entry.init0
 EOF
 EXPECT=<<EOF
 | ; CODE XREF from entry.init0 @ 0x5bd4(x)
-| 0x00005b40      488d3d21c701.  lea rdi, loc._edata                   ; loc.__bss_start
+| 0x00005b40      488d3d21c7..   lea rdi, loc._edata                   ; loc.__bss_start
 |                                                                      ; 0x22268
-| 0x00005b47      488d351ac701.  lea rsi, loc._edata                   ; loc.__bss_start
+| 0x00005b47      488d351ac7..   lea rsi, loc._edata                   ; loc.__bss_start
 |                                                                      ; 0x22268
 | 0x00005b4e      4829fe         sub rsi, rdi
 | 0x00005b51      48c1fe03       sar rsi, 3
@@ -480,7 +480,7 @@ EXPECT=<<EOF
 | 0x00005b5f      48d1fe         sar rsi, 1
 | 0x00005b62      7414           je 0x5b78
 | // true: 0x00005b78  false: 0x00005b64
-| 0x00005b64      488b053dc401.  mov rax, qword [reloc._ITM_registerTMCloneTable] ; [0x21fa8:8]=0
+| 0x00005b64      488b053dc4..   mov rax, qword [reloc._ITM_registerTMCloneTable] ; [0x21fa8:8]=0
 | 0x00005b6b      4885c0         test rax, rax
 | 0x00005b6e      7408           je 0x5b78
 | // true: 0x00005b78  false: 0x00005b70
diff --git a/test/db/cmd/cmd_px b/test/db/cmd/cmd_px
index 988458e983570..5c08fba073e4f 100644
--- a/test/db/cmd/cmd_px
+++ b/test/db/cmd/cmd_px
@@ -397,17 +397,17 @@ EXPECT=<<EOF
 |           0x00005aed      4883e4f0       and rsp, 0xfffffffffffffff0
 |           0x00005af1      50             push rax
 |           0x00005af2      54             push rsp
-|           0x00005af3      4c8d05660c01.  lea r8, [fcn.00016760]      ; 0x16760
-|           0x00005afa      488d0def0b01.  lea rcx, [fcn.000166f0]     ; 0x166f0
-|           0x00005b01      488d3d68e5ff.  lea rdi, main               ; 0x4070 ; "AWAVAUATU\x89\xfdSH\x89\xf3H\x83\xecXH\x8b>dH\x8b\x04%("
+|           0x00005af3      4c8d05660c..   lea r8, [fcn.00016760]      ; 0x16760
+|           0x00005afa      488d0def0b..   lea rcx, [fcn.000166f0]     ; 0x166f0
+|           0x00005b01      488d3d68e5..   lea rdi, main               ; 0x4070 ; "AWAVAUATU\x89\xfdSH\x89\xf3H\x83\xecXH\x8b>dH\x8b\x04%("
 \           0x00005b08      ff150ac30100   call qword [reloc.__libc_start_main] ; [0x21e18:8]=0
             0x00005b0e      f4             hlt
             0x00005b0f      90             nop
             ; CALL XREF from entry.fini0 @ 0x5ba8(x)
 / 34: fcn.00005b0e ();
-|           0x00005b10      488d3d51c701.  lea rdi, loc._edata         ; loc.__bss_start
+|           0x00005b10      488d3d51c7..   lea rdi, loc._edata         ; loc.__bss_start
 |                                                                      ; 0x22268
-|           0x00005b17      488d054ac701.  lea rax, loc._edata         ; loc.__bss_start
+|           0x00005b17      488d054ac7..   lea rax, loc._edata         ; loc.__bss_start
 |                                                                      ; 0x22268
 |           0x00005b1e      4839f8         cmp rax, rdi
 EOF
diff --git a/test/db/cmd/display_flag b/test/db/cmd/display_flag
index a1c8e520cd129..3b5d1442766cf 100644
--- a/test/db/cmd/display_flag
+++ b/test/db/cmd/display_flag
@@ -30,7 +30,7 @@ pd 1 @ 9
 EOF
 EXPECT=<<EOF
 |            .loop1:
-|           0000:0009     6683.  cmp ebx, 2
+|           0000:0009     66..   cmp ebx, 2
 EOF
 RUN
 
diff --git a/test/db/cmd/dwarf b/test/db/cmd/dwarf
index ba4f3da8d575c..62b2b700a8cb5 100644
--- a/test/db/cmd/dwarf
+++ b/test/db/cmd/dwarf
@@ -264,34 +264,34 @@ EXPECT=<<EOF
 |           ; var int64_t var_220h @ rsp+0x220
 |           ; var int64_t var_228h @ rsp+0x228
 |           ; var &str[6] *arg0 @ rsp+0x230
-|           0x00005750      4881ec380200.  sub rsp, 0x238              ; void main();
-|           0x00005757      c78424800000.  mov dword [numbers], 8
-|           0x00005762      c78424840000.  mov dword [var_84h], 7
-|           0x0000576d      c78424880000.  mov dword [var_88h], 1
-|           0x00005778      c784248c0000.  mov dword [var_8ch], 2
-|           0x00005783      c78424900000.  mov dword [var_90h], 9
-|           0x0000578e      c78424940000.  mov dword [var_94h], 3
-|           0x00005799      c78424980000.  mov dword [var_98h], 4
-|           0x000057a4      c784249c0000.  mov dword [var_9ch], 5
-|           0x000057af      c78424a00000.  mov dword [var_a0h], 0
-|           0x000057ba      c78424a40000.  mov dword [var_a4h], 6
-|           0x000057c5      488b05842b03.  mov rax, qword [0x00038350] ; [0x38350:8]=0x38330
-|           0x000057cc      488d8c248000.  lea rcx, [numbers]
-|           0x000057d4      48898c24e800.  mov qword [var_e8h], rcx
-|           0x000057dc      488b8c24e800.  mov rcx, qword [var_e8h]
-|           0x000057e4      48898c241802.  mov qword [var_218h], rcx
+|           0x00005750      4881ec3802..   sub rsp, 0x238              ; void main();
+|           0x00005757      c784248000..   mov dword [numbers], 8
+|           0x00005762      c784248400..   mov dword [var_84h], 7
+|           0x0000576d      c784248800..   mov dword [var_88h], 1
+|           0x00005778      c784248c00..   mov dword [var_8ch], 2
+|           0x00005783      c784249000..   mov dword [var_90h], 9
+|           0x0000578e      c784249400..   mov dword [var_94h], 3
+|           0x00005799      c784249800..   mov dword [var_98h], 4
+|           0x000057a4      c784249c00..   mov dword [var_9ch], 5
+|           0x000057af      c78424a000..   mov dword [var_a0h], 0
+|           0x000057ba      c78424a400..   mov dword [var_a4h], 6
+|           0x000057c5      488b05842b..   mov rax, qword [0x00038350] ; [0x38350:8]=0x38330
+|           0x000057cc      488d8c2480..   lea rcx, [numbers]
+|           0x000057d4      48898c24e8..   mov qword [var_e8h], rcx
+|           0x000057dc      488b8c24e8..   mov rcx, qword [var_e8h]
+|           0x000057e4      48898c2418..   mov qword [var_218h], rcx
 |           0x000057ec      4889cf         mov rdi, rcx                ; int64_t arg1
-|           0x000057ef      488d35da0f00.  lea rsi, [sym.core::array::__impl_core::fmt::Debug_for__T_____::fmt::h894a83bd2e78b654] ; 0x67d0 ; "H\x83\xecHH\x89|$8H\x89t$@\xb8\n" ; int64_t arg2
+|           0x000057ef      488d35da0f..   lea rsi, [sym.core::array::__impl_core::fmt::Debug_for__T_____::fmt::h894a83bd2e78b654] ; 0x67d0 ; "H\x83\xecHH\x89|$8H\x89t$@\xb8\n" ; int64_t arg2
 |           0x000057f6      4889442478     mov qword [var_78h], rax
 |           0x000057fb      e8501b0000     call sym core::fmt::ArgumentV1::new::h4b3dd9450748c5fc ; dbg.new<[i32; 10]>
 |           0x00005800      4889442470     mov qword [var_70h], rax
 |           0x00005805      4889542468     mov qword [var_68h], rdx
 |           0x0000580a      488b442470     mov rax, qword [var_70h]
-|           0x0000580f      48898424d800.  mov qword [var_d8h], rax
+|           0x0000580f      48898424d8..   mov qword [var_d8h], rax
 |           0x00005817      488b4c2468     mov rcx, qword [var_68h]
-|           0x0000581c      48898c24e000.  mov qword [var_e0h], rcx
-|           0x00005824      488d9424d800.  lea rdx, [var_d8h]
-|           0x0000582c      488dbc24a800.  lea rdi, [var_a8h]          ; int64_t arg1
+|           0x0000581c      48898c24e0..   mov qword [var_e0h], rcx
+|           0x00005824      488d9424d8..   lea rdx, [var_d8h]
+|           0x0000582c      488dbc24a8..   lea rdi, [var_a8h]          ; int64_t arg1
 |           0x00005834      488b742478     mov rsi, qword [var_78h]    ; int64_t arg2
 |           0x00005839      41b802000000   mov r8d, 2
 |           0x0000583f      4889542460     mov qword [var_60h], rdx
@@ -299,29 +299,29 @@ EXPECT=<<EOF
 |           0x00005847      488b4c2460     mov rcx, qword [var_60h]    ; int64_t arg4
 |           0x0000584c      41b801000000   mov r8d, 1                  ; int64_t arg5
 |           0x00005852      e8591b0000     call sym core::fmt::Arguments::new_v1::h2673b5bf555c0288 ; dbg.new_v1
-|           0x00005857      488dbc24a800.  lea rdi, [var_a8h]
+|           0x00005857      488dbc24a8..   lea rdi, [var_a8h]
 |           0x0000585f      ff15b3430300   call qword [dbg._print]     ; [0x39c18:8]=0xa2d0 dbg._print
-|           0x00005865      488d84248000.  lea rax, [numbers]
+|           0x00005865      488d842480..   lea rax, [numbers]
 |           0x0000586d      4889c7         mov rdi, rax                ; int64_t arg1
 |           0x00005870      be0a000000     mov esi, 0xa                ; int64_t arg2
 |           0x00005875      e8f6f9ffff     call sym rust::bubble_sort::h0777bc845caabc60 ; dbg.bubble_sort<i32>
-|           0x0000587a      488b05f72a03.  mov rax, qword [0x00038378] ; [0x38378:8]=0x38358
-|           0x00005881      488d8c248000.  lea rcx, [numbers]
-|           0x00005889      48898c243001.  mov qword [var_130h], rcx
-|           0x00005891      488b8c243001.  mov rcx, qword [var_130h]
-|           0x00005899      48898c242002.  mov qword [var_220h], rcx
+|           0x0000587a      488b05f72a..   mov rax, qword [0x00038378] ; [0x38378:8]=0x38358
+|           0x00005881      488d8c2480..   lea rcx, [numbers]
+|           0x00005889      48898c2430..   mov qword [var_130h], rcx
+|           0x00005891      488b8c2430..   mov rcx, qword [var_130h]
+|           0x00005899      48898c2420..   mov qword [var_220h], rcx
 |           0x000058a1      4889cf         mov rdi, rcx                ; int64_t arg1
-|           0x000058a4      488d35250f00.  lea rsi, [sym.core::array::__impl_core::fmt::Debug_for__T_____::fmt::h894a83bd2e78b654] ; 0x67d0 ; "H\x83\xecHH\x89|$8H\x89t$@\xb8\n" ; int64_t arg2
+|           0x000058a4      488d35250f..   lea rsi, [sym.core::array::__impl_core::fmt::Debug_for__T_____::fmt::h894a83bd2e78b654] ; 0x67d0 ; "H\x83\xecHH\x89|$8H\x89t$@\xb8\n" ; int64_t arg2
 |           0x000058ab      4889442458     mov qword [var_58h], rax
 |           0x000058b0      e89b1a0000     call sym core::fmt::ArgumentV1::new::h4b3dd9450748c5fc ; dbg.new<[i32; 10]>
 |           0x000058b5      4889442450     mov qword [var_50h], rax
 |           0x000058ba      4889542448     mov qword [var_48h], rdx
 |           0x000058bf      488b442450     mov rax, qword [var_50h]
-|           0x000058c4      488984242001.  mov qword [var_120h], rax
+|           0x000058c4      4889842420..   mov qword [var_120h], rax
 |           0x000058cc      488b4c2448     mov rcx, qword [var_48h]
-|           0x000058d1      48898c242801.  mov qword [var_128h], rcx
-|           0x000058d9      488d94242001.  lea rdx, [var_120h]
-|           0x000058e1      488dbc24f000.  lea rdi, [var_f0h]          ; int64_t arg1
+|           0x000058d1      48898c2428..   mov qword [var_128h], rcx
+|           0x000058d9      488d942420..   lea rdx, [var_120h]
+|           0x000058e1      488dbc24f0..   lea rdi, [var_f0h]          ; int64_t arg1
 |           0x000058e9      488b742458     mov rsi, qword [var_58h]    ; int64_t arg2
 |           0x000058ee      41b802000000   mov r8d, 2
 |           0x000058f4      4889542440     mov qword [var_40h], rdx
@@ -329,16 +329,16 @@ EXPECT=<<EOF
 |           0x000058fc      488b4c2440     mov rcx, qword [var_40h]    ; int64_t arg4
 |           0x00005901      41b801000000   mov r8d, 1                  ; int64_t arg5
 |           0x00005907      e8a41a0000     call sym core::fmt::Arguments::new_v1::h2673b5bf555c0288 ; dbg.new_v1
-|           0x0000590c      488dbc24f000.  lea rdi, [var_f0h]
+|           0x0000590c      488dbc24f0..   lea rdi, [var_f0h]
 |           0x00005914      ff15fe420300   call qword [dbg._print]     ; [0x39c18:8]=0xa2d0 dbg._print
-|           0x0000591a      488d052b4702.  lea rax, [0x0002a04c]       ; "dealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed to ge"
-|           0x00005921      488d0d214702.  lea rcx, [0x0002a049]       ; "cardealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed to"
-|           0x00005928      488d15174702.  lea rdx, [0x0002a046]       ; "artcardealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed"
-|           0x0000592f      488d350b4702.  lea rsi, [0x0002a041]       ; "beachartcardealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsf"
-|           0x00005936      488d3d134702.  lea rdi, [0x0002a050]       ; "empty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed to get en"
-|           0x0000593d      4889bc243801.  mov qword [strings], rdi
-|           0x00005945      48c784244001.  mov qword [var_140h], 5
-|           0x00005951      4889b4244801.  mov qword [var_148h], rsi
+|           0x0000591a      488d052b47..   lea rax, [0x0002a04c]       ; "dealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed to ge"
+|           0x00005921      488d0d2147..   lea rcx, [0x0002a049]       ; "cardealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed to"
+|           0x00005928      488d151747..   lea rdx, [0x0002a046]       ; "artcardealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed"
+|           0x0000592f      488d350b47..   lea rsi, [0x0002a041]       ; "beachartcardealempty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsf"
+|           0x00005936      488d3d1347..   lea rdi, [0x0002a050]       ; "empty/usr/src/rustc-1.43.0/src/libcore/slice/mod.rscalled `Option::unwrap()` on a `None` valuesrc/libstd/env.rsfailed to get en"
+|           0x0000593d      4889bc2438..   mov qword [strings], rdi
+|           0x00005945      48c7842440..   mov qword [var_140h], 5
+|           0x00005951      4889b42448..   mov qword [var_148h], rsi
 EOF
 RUN
 
@@ -379,9 +379,9 @@ EXPECT=<<EOF
 |           ; var usize val @ rsp+0xa0
 |           ; var usize __next @ rsp+0xa8
 |           ; var usize i @ rsp+0xb0
-|           0x00005270      4881ecb80000.  sub rsp, 0xb8               ; void bubble_sort<i32>(&mut [i32] values);
-|           0x00005277      4889bc249000.  mov qword [values], rdi     ; arg1
-|           0x0000527f      4889b4249800.  mov qword [var_98h], rsi    ; arg2
+|           0x00005270      4881ecb800..   sub rsp, 0xb8               ; void bubble_sort<i32>(&mut [i32] values);
+|           0x00005277      4889bc2490..   mov qword [values], rdi     ; arg1
+|           0x0000527f      4889b42498..   mov qword [var_98h], rsi    ; arg2
 |           0x00005287      48897c2448     mov qword [var_48h], rdi    ; arg1
 |           0x0000528c      4889742440     mov qword [var_40h], rsi    ; arg2
 |           0x00005291      e8ea090000     call sym core::slice::_<impl [T]>::len::hbaf7153778228b73 ; dbg.len<i32>
@@ -390,12 +390,12 @@ EXPECT=<<EOF
 |           ; CODE XREF from rust::bubble_sort::h0777bc845caabc60 @ 0x5441(x)
 |           0x000052a0      f644245f01     test byte [swapped], 1
 |       ,=< 0x000052a5      7508           jne 0x52af
-|       |   0x000052a7      4881c4b80000.  add rsp, 0xb8
+|       |   0x000052a7      4881c4b800..   add rsp, 0xb8
 |       |   0x000052ae      c3             ret
 |       |   ; CODE XREF from rust::bubble_sort::h0777bc845caabc60 @ 0x52a5(x)
 |       `-> 0x000052af      c644245f00     mov byte [swapped], 0
 |           0x000052b4      488b442450     mov rax, qword [n]
-|           0x000052b9      48c744246001.  mov qword [var_60h], 1
+|           0x000052b9      48c7442460..   mov qword [var_60h], 1
 |           0x000052c2      4889442468     mov qword [var_68h], rax
 |           0x000052c7      488b7c2460     mov rdi, qword [var_60h]    ; int64_t arg1
 |           0x000052cc      488b742468     mov rsi, qword [var_68h]    ; int64_t arg2
@@ -409,9 +409,9 @@ EXPECT=<<EOF
 |           ; CODE XREF from rust::bubble_sort::h0777bc845caabc60 @ 0x5432(x)
 |           0x000052f4      488d7c2470     lea rdi, [iter]             ; int64_t arg1
 |           0x000052f9      e812130000     call sym core::iter::range::_<impl core::iter::traits::iterator::Iterator for core::ops::range::Range<A>>::next::h707e8283b20ce50a ; dbg.next<usize>
-|           0x000052fe      488994248800.  mov qword [var_88h], rdx
-|           0x00005306      488984248000.  mov qword [var_80h], rax
-|           0x0000530e      488b84248000.  mov rax, qword [var_80h]
+|           0x000052fe      4889942488..   mov qword [var_88h], rdx
+|           0x00005306      4889842480..   mov qword [var_80h], rax
+|           0x0000530e      488b842480..   mov rax, qword [var_80h]
 |           0x00005316      4885c0         test rax, rax
 |       ,=< 0x00005319      7404           je 0x531f
 |      ,==< 0x0000531b      eb00           jmp 0x531d
@@ -486,14 +486,14 @@ EXPECT=<<EOF
 |           0x0000274a      897dec         mov dword [var_14h], edi    ; argc
 |           0x0000274d      488975e0       mov qword [var_20h], rsi    ; argv
 |           0x00002751      488955d8       mov qword [var_28h], rdx    ; envp
-|           0x00002755      488d05dc0800.  lea rax, obj.__gnat_ada_main_program_name ; 0x3038 ; "_ada_ada_test"
+|           0x00002755      488d05dc08..   lea rax, obj.__gnat_ada_main_program_name ; 0x3038 ; "_ada_ada_test"
 |           0x0000275c      488945f0       mov qword [ensure_reference], rax
 |           0x00002760      8b45ec         mov eax, dword [var_14h]
 |           0x00002763      8905572a0000   mov dword [obj.gnat_argc], eax ; [0x51c0:4]=0
 |           0x00002769      488b45e0       mov rax, qword [var_20h]
-|           0x0000276d      488905b42900.  mov qword [obj.gnat_argv], rax ; [0x5128:8]=0
+|           0x0000276d      488905b429..   mov qword [obj.gnat_argv], rax ; [0x5128:8]=0
 |           0x00002774      488b45d8       mov rax, qword [var_28h]
-|           0x00002778      488905112900.  mov qword [obj.gnat_envp], rax ; [0x5090:8]=0
+|           0x00002778      4889051129..   mov qword [obj.gnat_envp], rax ; [0x5090:8]=0
 |           0x0000277f      488d45f8       lea rax, [seh.F]
 |           0x00002783      4889c7         mov rdi, rax
 |           0x00002786      e875f9ffff     call sym.imp.__gnat_initialize
diff --git a/test/db/cmd/print b/test/db/cmd/print
index 45a436597b6a9..722344beb6f25 100644
--- a/test/db/cmd/print
+++ b/test/db/cmd/print
@@ -113,9 +113,9 @@ pd 20~7f
 EOF
 EXPECT=<<EOF
         ,=< 0x100001083      7f05           jg 0x10000108a
-        `-> 0x10000108a      488d357f3a00.  lea rsi, [0x100004b10]     ; section.4.__TEXT.__cstring
+        `-> 0x10000108a      488d357f3a..   lea rsi, [0x100004b10]     ; section.4.__TEXT.__cstring
         ,=< 0x100001083      7f05           jg jeje.lolo
-        `-> 0x10000108a      488d357f3a00.  lea rsi, section.4.__TEXT.__cstring ; 0x100004b10
+        `-> 0x10000108a      488d357f3a..   lea rsi, section.4.__TEXT.__cstring ; 0x100004b10
 EOF
 RUN
 
diff --git a/test/db/cmd/projects b/test/db/cmd/projects
index f1a5f07645f76..3661e8946ef46 100644
--- a/test/db/cmd/projects
+++ b/test/db/cmd/projects
@@ -71,7 +71,7 @@ EXPECT=<<EOF
             0x100003c14      4155           push r13
             0x100003c16      4154           push r12
             0x100003c18      53             push rbx
-            0x100003c19      4881ec380600.  sub rsp, 0x638
+            0x100003c19      4881ec3806..   sub rsp, 0x638
             0x100003c20      4989f7         mov r15, rsi
             0x100003c23      4189fe         mov r14d, edi
 0x100003c0c
@@ -87,7 +87,7 @@ EXPECT=<<EOF
             0x100003c14      4155           push r13
             0x100003c16      4154           push r12
             0x100003c18      53             push rbx
-            0x100003c19      4881ec380600.  sub rsp, 0x638
+            0x100003c19      4881ec3806..   sub rsp, 0x638
             0x100003c20      4989f7         mov r15, rsi
             0x100003c23      4189fe         mov r14d, edi
  3 fd: 3 +0x00004000 0x100000000 - 0x100007fff r-x fmap.__TEXT
diff --git a/test/db/cmd/types b/test/db/cmd/types
index d27599d7a9738..5b4e3977180d5 100644
--- a/test/db/cmd/types
+++ b/test/db/cmd/types
@@ -58,7 +58,7 @@ EXPECT=<<EOF
 0x00000008 = 0x55f48949
             0x0000000c      53             push rbx
             0x0000000d      89fd           mov ebp, edi
-            0x0000000f      4881eca80300.  sub rsp, 0x3a8
+            0x0000000f      4881eca803..   sub rsp, 0x3a8
 EOF
 RUN
 
@@ -810,10 +810,10 @@ pdf
 EOF
 EXPECT=<<EOF
 / 33: fcn.00000000 ();
-|           0x00000000      48c7c0000100.  mov rax, 0x100
+|           0x00000000      48c7c00001..   mov rax, 0x100
 |           0x00000007      488b5008       mov rdx, qword [rax + foo.c]
 |           0x0000000b      488b4804       mov rcx, qword [rax + foo.b]
-|           0x0000000f      48c7c0000200.  mov rax, 0x200
+|           0x0000000f      48c7c00002..   mov rax, 0x200
 |           0x00000016      488b5008       mov rdx, qword [rax + bar.z]
 |           0x0000001a      488b4804       mov rcx, qword [rax + bar.y]
 |           0x0000001e      90             nop
@@ -835,11 +835,11 @@ EOF
 EXPECT=<<EOF
 
 |           ; var struct Books @ rbp-0xe0
-|           0x00000684      488d8520ffff.  lea rax, [Books]
+|           0x00000684      488d8520ff..   lea rax, [Books]
 |           0x00000695      488910         mov qword [rax], rdx        ; Books.title
-|           0x00000698      488d8520ffff.  lea rax, [Books]
+|           0x00000698      488d8520ff..   lea rax, [Books]
 |           0x000006ad      488908         mov qword [rax], rcx        ; Books.author
-|           0x000006b0      488d8520ffff.  lea rax, [Books]
+|           0x000006b0      488d8520ff..   lea rax, [Books]
 |           0x000006c5      488930         mov qword [rax], rsi        ; Books.subject
 |           0x000006d5      b800000000     mov eax, 0                  ; Books.subject
 EOF
@@ -861,7 +861,7 @@ EXPECT=<<EOF
 
 |           0x000005a8      c70206000000   mov dword [edx], 6          ; Test.a
 |           0x000005ae      8b55f4         mov edx, dword [Test]       ; Test.a
-|           0x000005b1      c74204070000.  mov dword [edx + Test.b], 7
+|           0x000005b1      c742040700..   mov dword [edx + Test.b], 7
 EOF
 RUN
 
@@ -1738,7 +1738,7 @@ foo3.bar
 foo4.bar
 foo5.bar
 =
-            0x00000000      c74004000000.  mov dword [rax + foo.bar], 0
+            0x00000000      c740040000..   mov dword [rax + foo.bar], 0
 EOF
 RUN
 
diff --git a/test/db/esil/bf b/test/db/esil/bf
index 3820696e2c8a8..76b7b558dc898 100644
--- a/test/db/esil/bf
+++ b/test/db/esil/bf
@@ -27,7 +27,7 @@ EXPECT=<<EOF
 Hello World!
         ,=< 0x0000000a      5b             while [ptr]
         |   0x0000000b      3e             inc ptr
-        |   0x0000000c      2b2b2b2b2b2b.  add [ptr], 7
+        |   0x0000000c      2b2b2b2b2b..   add [ptr], 7
 EOF
 RUN
 
@@ -56,7 +56,7 @@ EOF
 EXPECT=<<EOF
             0x0000000a      5b             while [ptr]
             0x0000000b      3e             inc ptr
-            0x0000000c      2b2b2b2b2b2b.  add [ptr], 7
+            0x0000000c      2b2b2b2b2b..   add [ptr], 7
 EOF
 RUN
 
diff --git a/test/db/formats/coff b/test/db/formats/coff
index 283c767566843..9233ee2c83a33 100644
--- a/test/db/formats/coff
+++ b/test/db/formats/coff
@@ -150,7 +150,7 @@ ARGS=-e bin.relocs.apply=1
 FILE=bins/coff/coff.obj
 CMDS=pd 2 @ sym.main+6
 EXPECT=<<EOF
-            0x00000006      4c8d05230000.  lea r8, [0x00000030]        ; sym..data ; "Win64 assembly"; RELOC 32 .data @ 0x00000030
-            0x0000000d      488d152b0000.  lea rdx, [0x0000003f]       ; str.Coffee_time_ ; "Coffee time!"; RELOC 32 .data @ 0x00000030 + 0xf
+            0x00000006      4c8d052300..   lea r8, [0x00000030]        ; sym..data ; "Win64 assembly"; RELOC 32 .data @ 0x00000030
+            0x0000000d      488d152b00..   lea rdx, [0x0000003f]       ; str.Coffee_time_ ; "Coffee time!"; RELOC 32 .data @ 0x00000030 + 0xf
 EOF
 RUN
diff --git a/test/db/formats/elf/vax b/test/db/formats/elf/vax
index d01df2e53e71b..5b4c539515a37 100644
--- a/test/db/formats/elf/vax
+++ b/test/db/formats/elf/vax
@@ -18,18 +18,18 @@ EXPECT=<<EOF
 |           0x00010b2d      01             nop
 |           0x00010b2e      dd59           pushl r9
 |           0x00010b30      dd57           pushl r7
-|           0x00010b32      fb02ef3d0000.  calls $0x2, sym.___start
+|           0x00010b32      fb02ef3d00..   calls $0x2, sym.___start
 |           0x00010b39      01             nop
 |           0x00010b3a      c000c2045e     addl2 $0x0, 0x5e04(r2)
-|           0x00010b3f      9eef73950100.  movab loc.__init_array_end, r6
-|           0x00010b46      9eef6c950100.  movab loc.__init_array_end, r0
+|           0x00010b3f      9eef739501..   movab loc.__init_array_end, r6
+|           0x00010b46      9eef6c9501..   movab loc.__init_array_end, r0
 |           0x00010b4d      d15650         cmpl r6, r0
 |       ,=< 0x00010b50      1e23           bcc 0x00010b75
 |       |   0x00010b52      d05057         movl r0, r7
-|       |   0x00010b55      9eef5e950100.  movab 0x0002a0b9, r0
+|       |   0x00010b55      9eef5e9501..   movab 0x0002a0b9, r0
 |       |   0x00010b5c      c25057         subl2 r0, r7
 |       |   0x00010b5f      ca0357         bicl2 $0x3, r7
-|       |   0x00010b62      9e47ef539501.  movab loc.__CTOR_LIST_END__[r7], r7
+|       |   0x00010b62      9e47ef5395..   movab loc.__CTOR_LIST_END__[r7], r7
 |       |   ; CODE XREF from entry0 @ 0x10b73(x)
 |      .--> 0x00010b6a      d08650         movl (r6)+, r0
 |      :|   0x00010b6d      fb0060         calls $0x0, (r0)
diff --git a/test/db/formats/mangling/bin b/test/db/formats/mangling/bin
index 3ba91f859a6db..c0228d412c2c4 100644
--- a/test/db/formats/mangling/bin
+++ b/test/db/formats/mangling/bin
@@ -80,7 +80,7 @@ NAME=C++ demangle relocs
 FILE=bins/elf/libstdc++.so.6
 CMDS=pd 1 @0x00091004
 EXPECT=<<EOF
-            0x00091004      488b159d880f.  mov rdx, qword [reloc.vtable_for_std::bad_alloc] ; new:57 ; [0x1898a8:8]=0
+            0x00091004      488b159d88..   mov rdx, qword [reloc.vtable_for_std::bad_alloc] ; new:57 ; [0x1898a8:8]=0
 EOF
 RUN
 
@@ -107,7 +107,7 @@ NAME=demangle obj in pd
 FILE=bins/elf/ch25.bin
 CMDS=pd 1 @0x08048aac
 EXPECT=<<EOF
-            0x08048aac      c7042460b004.  mov dword [esp], obj.std::cerr ; sym..bss
+            0x08048aac      c7042460b0..   mov dword [esp], obj.std::cerr ; sym..bss
                                                                        ; [0x804b060:4]=0
 EOF
 RUN
diff --git a/test/db/formats/mdmp b/test/db/formats/mdmp
index f75834587ca8b..004302e964f90 100644
--- a/test/db/formats/mdmp
+++ b/test/db/formats/mdmp
@@ -349,7 +349,7 @@ EXPECT=<<EOF
             0x7fefdb0a1a8      4c89442420     mov qword [rsp + 0x20], r8
             0x7fefdb0a1ad      4c8bc2         mov r8, rdx
             0x7fefdb0a1b0      488bd1         mov rdx, rcx
-            0x7fefdb0a1b3      488d0dea7ffa.  lea rcx, [0x7fefdab21a4]
+            0x7fefdb0a1b3      488d0dea7f..   lea rcx, [0x7fefdab21a4]
             0x7fefdb0a1ba      4533c9         xor r9d, r9d
             0x7fefdb0a1bd      e87efdffff     call 0x7fefdb09f40
             0x7fefdb0a1c2      4883c438       add rsp, 0x38