diff --git a/test/db/analysis/java b/test/db/analysis/java
index f0a5ce94bfa..c2d5c2600a0 100644
--- a/test/db/analysis/java
+++ b/test/db/analysis/java
@@ -194,6 +194,7 @@ block    0x100
 type     JAVA CLASS
 arch     java
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x00000400
 bintype  class
diff --git a/test/db/analysis/rl78 b/test/db/analysis/rl78
index ca21754b481..5880caa8e1d 100644
--- a/test/db/analysis/rl78
+++ b/test/db/analysis/rl78
@@ -14,6 +14,7 @@ EXPECT=<<EOF
             0x00000785      clrw  ax
 arch     rl78
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x00008360
 bintype  elf
diff --git a/test/db/analysis/rx b/test/db/analysis/rx
index 97f92e36150..0c6b5537e1b 100644
--- a/test/db/analysis/rx
+++ b/test/db/analysis/rx
@@ -20,6 +20,7 @@ EXPECT=<<EOF
             0xfff4000f      mvtc  #loc.__vectors, intb,                ; crt0.S:41
 arch     rx
 cpu      N/A
+features N/A
 baddr    0xfff40000
 binsz    0x0000a623
 bintype  elf
diff --git a/test/db/cmd/cmd_i b/test/db/cmd/cmd_i
index ea22eb494c0..818e554b1ed 100644
--- a/test/db/cmd/cmd_i
+++ b/test/db/cmd/cmd_i
@@ -126,6 +126,7 @@ type
 [Info]
 arch     N/A
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x00000401
 bintype  N/A
@@ -224,6 +225,7 @@ block   0x100
 type    
 arch     N/A
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x00000400
 bintype  N/A
@@ -273,6 +275,7 @@ iorw     false
 block    0x100
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x08048000
 binsz    0x00001323
 bintype  elf
@@ -316,10 +319,10 @@ iA
 iAj
 EOF
 EXPECT=<<EOF
-offset     size   arch              machine    
------------------------------------------------
-0x00000000 266108 mips_32 mips1 o32 MIPS R3000
-[{"arch":"mips","bits":32,"offset":0,"size":266108,"isa":"mips1","features":"o32","machine":"MIPS R3000"}]
+offset     size   arch                          machine               
+----------------------------------------------------------------------
+0x00000000 266108 mips_32 mips5 noreorder pic c MIPS R3000 big-endian
+[{"arch":"mips","bits":32,"offset":0,"size":266108,"cpu":"mips5","features":"noreorder pic cpic o32 n32","machine":"MIPS R3000 big-endian"}]
 EOF
 RUN
 
@@ -330,10 +333,10 @@ iA
 iAj
 EOF
 EXPECT=<<EOF
-offset     size    arch                 machine    
----------------------------------------------------
-0x00000000 1039368 mips_64 mips64r2 n64 MIPS R3000
-[{"arch":"mips","bits":64,"offset":0,"size":1039368,"isa":"mips64r2","features":"n64","machine":"MIPS R3000"}]
+offset     size    arch                          machine               
+-----------------------------------------------------------------------
+0x00000000 1039368 mips_64 mips64r2 noreorder pi MIPS R3000 big-endian
+[{"arch":"mips","bits":64,"offset":0,"size":1039368,"cpu":"mips64r2","features":"noreorder pic cpic n64","machine":"MIPS R3000 big-endian"}]
 EOF
 RUN
 
@@ -375,6 +378,7 @@ block    0x100
 type     JAVA CLASS
 arch     java
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x00000400
 bintype  class
@@ -819,6 +823,7 @@ CMDS=iq
 EXPECT=<<EOF
 arch arm
 cpu N/A
+features N/A
 bits 16
 os linux
 endian little
@@ -834,6 +839,7 @@ CMDS=iaq
 EXPECT=<<EOF
 arch arm
 cpu N/A
+features N/A
 bits 16
 os linux
 endian little
@@ -1782,6 +1788,7 @@ CMDS=iI
 EXPECT=<<EOF
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x08048000
 binsz    0x00001323
 bintype  elf
@@ -3297,6 +3304,7 @@ block    0x100
 type     EXEC (Executable file)
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x00400000
 binsz    0x00001a36
 bintype  elf
@@ -3393,6 +3401,7 @@ CMDS=iI
 EXPECT=<<EOF
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x00400000
 binsz    0x00001a36
 bintype  elf
diff --git a/test/db/cmd/cmd_open b/test/db/cmd/cmd_open
index d2cc454f645..57fa68cbc0c 100644
--- a/test/db/cmd/cmd_open
+++ b/test/db/cmd/cmd_open
@@ -437,6 +437,7 @@ block    0x100
 type     EXEC (Executable file)
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x08048000
 binsz    0x000050bc
 bintype  elf
diff --git a/test/db/cmd/cmd_pipe b/test/db/cmd/cmd_pipe
index b0de1253304..38a74b211c1 100644
--- a/test/db/cmd/cmd_pipe
+++ b/test/db/cmd/cmd_pipe
@@ -106,7 +106,7 @@ Copied bins/mach0/mach0_2-x86_64 succesfully
 -------------
 Shared buffer size 0x10e8
 -------------
-{'arch': 'x86', 'baddr': 4294967296, 'binsz': 4328, 'bintype': 'mach0', 'bits': 64, 'class': 'MACH064', 'compiler': '', 'endian': 'LE', 'intrp': '/usr/lib/dyld', 'laddr': 0, 'lang': 'c', 'machine': 'x86 64 all', 'maxopsz': 16, 'minopsz': 1, 'os': 'darwin', 'pcalign': 0, 'subsys': 'macOS', 'stripped': False, 'crypto': False, 'havecode': True, 'va': True, 'sanitiz': False, 'static': False, 'linenum': False, 'lsyms': False, 'canary': False, 'PIE': True, 'RELROCS': False, 'NX': False}
+{'arch': 'x86', 'cpu': 'x86 64 all', 'baddr': 4294967296, 'binsz': 4328, 'bintype': 'mach0', 'bits': 64, 'class': 'MACH064', 'compiler': '', 'endian': 'LE', 'intrp': '/usr/lib/dyld', 'laddr': 0, 'lang': 'c', 'machine': 'x86 64 all', 'maxopsz': 16, 'minopsz': 1, 'os': 'darwin', 'pcalign': 0, 'subsys': 'macOS', 'stripped': False, 'crypto': False, 'havecode': True, 'va': True, 'sanitiz': False, 'static': False, 'linenum': False, 'lsyms': False, 'canary': False, 'PIE': True, 'RELROCS': False, 'NX': False}
 - offset -    0 1  2 3  4 5  6 7  8 9  A B  C D  E F  0123456789ABCDEF
 0x100000f70  5548 89e5 4883 ec10 c745 fc00 0000 0089  UH..H....E......
 
diff --git a/test/db/esil/mips_32 b/test/db/esil/mips_32
index 34cb98b00ff..c76f571682c 100644
--- a/test/db/esil/mips_32
+++ b/test/db/esil/mips_32
@@ -3,7 +3,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx 20000200
 aei
@@ -22,7 +21,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx 20280200
 aei
@@ -41,7 +39,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xFFFFFFFF
 ar v1=0x5
 wx 20284300
@@ -61,7 +58,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 05000020
 aei
 aeim
@@ -79,7 +75,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx 05000520
 aei
@@ -98,7 +93,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx fbff0520
 aei
@@ -117,7 +111,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=6
 wx fbff4520
 aei
@@ -136,7 +129,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx 21000200
 aei
@@ -155,7 +147,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx 21280200
 aei
@@ -174,7 +165,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xFFFFFFFF
 ar v1=0x5
 wx 21284300
@@ -194,7 +184,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 05000024
 aei
 aeim
@@ -212,7 +201,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx 05000524
 aei
@@ -231,7 +219,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 wx fbff0524
 aei
@@ -250,7 +237,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=6
 wx fbff4524
 aei
@@ -269,7 +255,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=5
 ar v1=1
 wx 22004300
@@ -289,7 +274,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=1
 ar v1=5
 wx 22284300
@@ -309,7 +293,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xFFFFFFFF
 ar v1=0x5
 wx 22284300
@@ -329,7 +312,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=1
 ar v1=5
 wx 23284300
@@ -349,7 +331,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xFFFFFFFF
 ar v1=0x5
 wx 23284300
@@ -369,7 +350,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffffffff
 ar v1=0x10101010
 wx 24284300
@@ -389,7 +369,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffffffff
 wx ffff4530
 aei
@@ -408,7 +387,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffffffff
 wx 01004530
 aes
@@ -424,7 +402,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 wx 25000200
 aes
@@ -440,7 +417,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 wx 25280200
 aes
@@ -456,7 +432,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v1=0x01010111
 ar v0=0x10101010
 wx 25284300
@@ -473,7 +448,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx ffff0034
 aes
 ar zero
@@ -488,7 +462,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx ffff0534
 aes
 ar a1
@@ -503,7 +476,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffff0000
 wx 01004534
 aes
@@ -519,7 +491,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 wx 26000200
 aes
@@ -535,7 +506,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 wx 26280200
 aes
@@ -551,7 +521,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x01010111
 ar v1=0x10101010
 wx 26284300
@@ -568,7 +537,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx ffff0038
 aes
 ar zero
@@ -583,7 +551,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx ffff0538
 aes
 ar a1
@@ -598,7 +565,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffff0000
 wx 01004538
 aes
@@ -614,7 +580,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffff00ff
 wx f1004538
 aes
@@ -630,7 +595,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 wx 27000200
 aes
@@ -646,7 +610,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 wx 27280200
 aes
@@ -662,7 +625,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x10101010
 ar v1=0xffff0000
 wx 27284300
@@ -679,7 +641,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000004
 s 4
 wx aabbccdd00004384
@@ -700,7 +661,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000006
 s 4
 wx aabbccddfeff4384
@@ -721,7 +681,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000000
 wx aabbccdd02004384
 s 4
@@ -741,7 +700,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000004
 s 4
 wx aabbccdd112233440000438c
@@ -762,7 +720,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000008
 s 0x4
 wx aabbccdd11223344fcff438c
@@ -783,7 +740,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000000
 wx aabbccdd112233440400438c
 s 8
@@ -803,7 +759,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x11aa22bb
 ar v1=0x10
 s 4
@@ -824,7 +779,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x11aa22bb
 ar v1=0x14
 s 4
@@ -845,7 +799,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x11aa22bb
 ar v1=0x10
 wx 00000000000062a4
@@ -866,7 +819,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x11aa22bb
 ar v1=0x10
 wx 00000000020062a4
@@ -887,7 +839,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x11aa22bb
 ar v1=0x10
 wx 00000000000062a0
@@ -908,7 +859,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x11aa22bb
 ar v1=0
 wx 00000000030062a0
@@ -929,7 +879,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x0001ffff
 wx 00140200
 aes
@@ -945,7 +894,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x0001ffff
 ar v1=16
 wx 04106200
@@ -962,7 +910,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar v1=0x44556677
 wx 18004300
@@ -981,7 +928,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar v1=0x44556677
 wx 18004300
@@ -999,14 +945,13 @@ NAME=mul s0, a0, v0
 FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
+e asm.cpu=mips32r5
 e asm.bits=32
 wx 02808270
-ar > /dev/null
 ar a0=21
 ar v0=12
 aes
 ar s0
-ar > /dev/null
 ar a0=0x44556677
 ar v0=0x00112233
 aeip
@@ -1024,7 +969,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar lo=0xffffffff12345678
 wx 12100000
@@ -1041,7 +985,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar hi=0xffffffff12345678
 wx 10100000
@@ -1058,7 +1001,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar lo=0xffffffff12345678
 wx 12100000
 aes
@@ -1074,7 +1016,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar hi=0xffffffff12345678
 wx 10100000
 aes
@@ -1090,7 +1031,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar lo=0xffffffff12345678
 wx 13004000
@@ -1107,7 +1047,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar hi=0xffffffff12345678
 wx 11004000
@@ -1124,7 +1063,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffffffff
 ar hi=0xffffffff12345678
 wx 11004000
@@ -1141,7 +1079,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar v1=0x00112233
 wx 0e004314
@@ -1158,7 +1095,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00222233
 ar v1=0x00112233
 wx 0e004314
@@ -1175,7 +1111,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00222233
 ar v1=0x00112233
 wx 0e004310
@@ -1192,7 +1127,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00112233
 ar v1=0x00112233
 wx 0e004310
@@ -1209,7 +1143,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar s4=0x00000000
 wx 02008016
 aes
@@ -1226,7 +1159,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar s4=0x00112233
 wx 02008016
 aes
@@ -1243,7 +1175,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000001
 wx 0e004018
 aes
@@ -1260,7 +1191,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xfffffffc
 wx 0e004018
 aes
@@ -1276,7 +1206,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 0e000018
 aes
 ar pc
@@ -1291,7 +1220,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000001
 wx 0e004104
 aes
@@ -1307,7 +1235,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xfffffffc
 wx 0e004104
 aes
@@ -1323,7 +1250,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 0e000104
 aes
 ar pc
@@ -1338,7 +1264,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000001
 wx 0e004004
 aes
@@ -1354,7 +1279,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xfffffffc
 wx 0e004004
 aes
@@ -1370,7 +1294,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 0e000004
 aes
 ar pc
@@ -1385,7 +1308,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0x00000001
 wx 0e00401c
 aes
@@ -1401,7 +1323,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xfffffffc
 wx 0e00401c
 aes
@@ -1417,7 +1338,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 0e00001c
 aes
 ar pc
@@ -1432,7 +1352,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 wx 0400000c
 aes
 ar pc
@@ -1450,7 +1369,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar t9=16
 wx 09f82003
 aes
@@ -1469,7 +1387,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar t9=16
 wx 09602003
 aes
@@ -1488,7 +1405,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar t9=16
 wx 09602003f6736430
 aes
@@ -1507,7 +1423,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=1
 ar v1=2
 wx 2a804300
@@ -1525,7 +1440,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0
 ar v1=0
 wx 2a804300
@@ -1542,7 +1456,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=2
 ar v1=1
 wx 2a804300
@@ -1559,7 +1472,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=-1
 ar v1=1
 wx 2a804300
@@ -1576,7 +1488,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0xffffffff
 ar v1=1
 wx 2b804300
@@ -1593,7 +1504,6 @@ FILE=malloc://0x200
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=0
 ar v1=0xffffffff
 wx 2b804300
@@ -1611,7 +1521,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v1=0
 ar v0=-1
 wx 23180200
@@ -1629,7 +1538,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v1=0
 ar v0=1
 wx 23180200
@@ -1647,7 +1555,6 @@ BROKEN=1
 CMDS=<<EOF
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v1=0
 ar v0=3497
 wx 23180200
@@ -1671,7 +1578,6 @@ e cfg.bigendian=true
 aei
 aeim
 aeip
-ar > /dev/null
 ar t9=0
 ar gp=0
 wx 3c1c0042279c89408f99805011223344
@@ -1693,7 +1599,6 @@ CMDS=<<EOF
 e io.va=true
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar t9=0
 ar v0=14
 ar a0=0x00400a7c
@@ -1719,7 +1624,6 @@ CMDS=<<EOF
 e io.va=true
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar t9=0
 ar v0=14
 ar a0=0x00400a7c
@@ -1745,7 +1649,6 @@ CMDS=<<EOF
 e io.va=true
 e asm.arch=mips
 e asm.bits=32
-ar > /dev/null
 ar v0=8
 ar a0=0x00400b48
 ar fp=0x00401000
diff --git a/test/db/formats/dmp/dmp b/test/db/formats/dmp/dmp
index 6f30c756d2d..a794074dc68 100644
--- a/test/db/formats/dmp/dmp
+++ b/test/db/formats/dmp/dmp
@@ -12,6 +12,7 @@ CMDS=iI
 EXPECT=<<EOF
 arch     x86
 cpu      N/A
+features N/A
 baddr    ----------
 binsz    0x05455038
 bintype  dmp64
diff --git a/test/db/formats/dyldcache b/test/db/formats/dyldcache
index 9721a319994..aa7bbf304b5 100644
--- a/test/db/formats/dyldcache
+++ b/test/db/formats/dyldcache
@@ -20,6 +20,7 @@ block    0x100
 type     production
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x180000000
 binsz    0x00034000
 bintype  N/A
@@ -184,6 +185,7 @@ block    0x100
 type     production
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x180000000
 binsz    0x00034000
 bintype  N/A
@@ -346,6 +348,7 @@ block    0x100
 type     production
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x180000000
 binsz    0x00098000
 bintype  N/A
@@ -438,6 +441,7 @@ block    0x100
 type     production
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x180000000
 binsz    0x000a8000
 bintype  N/A
@@ -620,6 +624,7 @@ block    0x100
 type     development
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x180000000
 binsz    0x00020000
 bintype  N/A
diff --git a/test/db/formats/elf/elf-riscv64 b/test/db/formats/elf/elf-riscv64
index 496d3318cc6..9446ff41edb 100644
--- a/test/db/formats/elf/elf-riscv64
+++ b/test/db/formats/elf/elf-riscv64
@@ -407,6 +407,7 @@ block    0x100
 type     EXEC (Executable file)
 arch     riscv
 cpu      N/A
+features N/A
 baddr    0x00010000
 binsz    0x0009d024
 bintype  elf
diff --git a/test/db/formats/elf/m68k b/test/db/formats/elf/m68k
index 6a7322421ec..26894479eb0 100644
--- a/test/db/formats/elf/m68k
+++ b/test/db/formats/elf/m68k
@@ -31,7 +31,7 @@ ori.b 0x8a, d0
 illegal 0x4afc
 link.w a6, 0x0
 move.l 0x8015b11c, d0
-subi.l 0x8015b119, d0
+subi.l 0x15b119, d0
 moveq 0x6, d1
 cmp.l d0, d1
 bcc.b 0x80000df6
diff --git a/test/db/formats/elf/mips b/test/db/formats/elf/mips
index 5012c8ff885..cf993896eb1 100644
--- a/test/db/formats/elf/mips
+++ b/test/db/formats/elf/mips
@@ -1,9 +1,15 @@
 NAME=ELF: mips.elf
 FILE=bins/elf/analysis/mips.elf
-ARGS=-A
-CMDS=%v entry0
+ARGS=
+CMDS=<<EOF
+%v entry0
+iI~cpu
+iI~features
+EOF
 EXPECT=<<EOF
 0x400ab0
+cpu      mips32r2
+features noreorder cpic o32 n32
 EOF
 RUN
 
@@ -13,6 +19,8 @@ CMDS=<<EOF
 af
 e asm.sub.var=false
 pif
+iI~cpu
+iI~features
 EOF
 EXPECT=<<EOF
 lui gp, 0x42
@@ -20,7 +28,7 @@ addiu gp, gp, -0x4770
 move ra, zero
 lui a0, 0x40
 addiu a0, a0, 0xec0
-lw a1, (sp)
+lw a1, 0(sp)
 addiu a2, sp, 4
 addiu at, zero, -8
 and sp, sp, at
@@ -33,6 +41,8 @@ sw t0, 0x10(sp)
 sw v0, 0x14(sp)
 jal sym.imp.__uClibc_main
 sw sp, 0x18(sp)
+cpu      mips32
+features noreorder cpic o32 n32
 EOF
 BROKEN=1
 RUN
@@ -44,6 +54,8 @@ CMDS=<<EOF
 af
 e asm.sub.var=false
 pif
+iI~cpu
+iI~features
 EOF
 EXPECT=<<EOF
 lui gp, 0x48
@@ -51,7 +63,7 @@ addiu gp, gp, 0xb40
 move ra, zero
 lui a0, 0x40
 addiu a0, a0, 0x5474
-lw a1, (sp)
+lw a1, 0(sp)
 addiu a2, sp, 4
 addiu at, zero, -8
 and sp, sp, at
@@ -64,6 +76,8 @@ sw t0, 0x10(sp)
 sw v0, 0x14(sp)
 jal sym.imp.__uClibc_main
 sw sp, 0x18(sp)
+cpu      mips32
+features noreorder cpic o32 n32
 EOF
 RUN
 BROKEN=1
diff --git a/test/db/formats/elf/v850 b/test/db/formats/elf/v850
index aa98bc0c954..049d98fb333 100644
--- a/test/db/formats/elf/v850
+++ b/test/db/formats/elf/v850
@@ -18,6 +18,7 @@ block    0x100
 type     EXEC (Executable file)
 arch     v850
 cpu      N/A
+features N/A
 baddr    0x00100000
 binsz    0x000edb6d
 bintype  elf
diff --git a/test/db/formats/mdmp b/test/db/formats/mdmp
index 6e5cb4ecb4c..aef69039887 100644
--- a/test/db/formats/mdmp
+++ b/test/db/formats/mdmp
@@ -12,6 +12,7 @@ CMDS=iI
 EXPECT=<<EOF
 arch     x86
 cpu      N/A
+features N/A
 baddr    ----------
 binsz    0x00008f74
 bintype  mdmp
diff --git a/test/db/formats/n3ds b/test/db/formats/n3ds
index 51fbe94fd2a..f22b2d1734b 100644
--- a/test/db/formats/n3ds
+++ b/test/db/formats/n3ds
@@ -4,6 +4,7 @@ CMDS=iI ; iS ; ie ; iT
 EXPECT=<<EOF
 arch     arm
 cpu      N/A
+features N/A
 baddr    ----------
 binsz    0x0002d800
 bintype  N/A
diff --git a/test/db/formats/ninds b/test/db/formats/ninds
index f1002f4cf62..47b72e1f973 100644
--- a/test/db/formats/ninds
+++ b/test/db/formats/ninds
@@ -4,6 +4,7 @@ CMDS=iI ; omlt ; iS ; ie
 EXPECT=<<EOF
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x02000000
 binsz    0x001ce803
 bintype  N/A
diff --git a/test/db/formats/pe/arm b/test/db/formats/pe/arm
index 075224625bc..34d24567f83 100644
--- a/test/db/formats/pe/arm
+++ b/test/db/formats/pe/arm
@@ -18,6 +18,7 @@ block    0x100
 type     EXEC (Executable file)
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x00400000
 binsz    0x00001e00
 bintype  pe
diff --git a/test/db/formats/prg b/test/db/formats/prg
index 30cf0009655..5cee44de076 100644
--- a/test/db/formats/prg
+++ b/test/db/formats/prg
@@ -8,6 +8,7 @@ EOF
 EXPECT=<<EOF
 arch     6502
 cpu      N/A
+features N/A
 baddr    0x00000801
 binsz    0x00000026
 bintype  N/A
diff --git a/test/db/formats/smd b/test/db/formats/smd
index 42375d560f4..4189f6725a2 100644
--- a/test/db/formats/smd
+++ b/test/db/formats/smd
@@ -12,6 +12,7 @@ block    0x100
 type     ROM
 arch     m68k
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x000272f8
 bintype  N/A
diff --git a/test/db/io/srec b/test/db/io/srec
index 0c04c1cbbb8..8c37daeebf4 100644
--- a/test/db/io/srec
+++ b/test/db/io/srec
@@ -88,6 +88,7 @@ EOF
 EXPECT=<<EOF
 arch     arm
 cpu      N/A
+features N/A
 baddr    0x00008000
 binsz    0x0008b9c8
 bintype  elf
diff --git a/test/db/tools/rz_bin b/test/db/tools/rz_bin
index 299889d9154..ff724305b6a 100644
--- a/test/db/tools/rz_bin
+++ b/test/db/tools/rz_bin
@@ -399,6 +399,7 @@ EXPECT=<<EOF
 [Info]
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x08048000
 binsz    0x00001323
 bintype  elf
@@ -668,6 +669,7 @@ EXPECT=<<EOF
 [Info]
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x00000000
 binsz    0x00001b8b
 bintype  elf
@@ -713,6 +715,7 @@ EXPECT=<<EOF
 [Info]
 arch     x86
 cpu      N/A
+features N/A
 baddr    0x00400000
 binsz    0x001876b7
 bintype  elf
@@ -757,7 +760,8 @@ CMDS=!rz-bin -I ${RZ_FILE}
 EXPECT=<<EOF
 [Info]
 arch     x86
-cpu      N/A
+cpu      x86 64 all
+features N/A
 baddr    0x100000000
 binsz    0x00002664
 bintype  mach0