From 4b15c60e331669eda25352154675fdeb77db1dcb Mon Sep 17 00:00:00 2001
From: wargio <deroad@kumo.xn--q9jyb4c>
Date: Sat, 28 Dec 2024 21:45:50 +0800
Subject: [PATCH] Fix tests

---
 test/db/analysis/java           |  1 +
 test/db/analysis/rl78           |  1 +
 test/db/analysis/rx             |  1 +
 test/db/formats/dmp/dmp         |  1 +
 test/db/formats/dyldcache       |  5 +++++
 test/db/formats/elf/elf-riscv64 |  1 +
 test/db/formats/elf/m68k        |  2 +-
 test/db/formats/elf/mips        | 22 ++++++++++++++++++----
 test/db/formats/elf/v850        |  1 +
 test/db/formats/mdmp            |  1 +
 test/db/formats/n3ds            |  1 +
 test/db/formats/ninds           |  1 +
 test/db/formats/pe/arm          |  1 +
 test/db/formats/prg             |  1 +
 test/db/formats/smd             |  1 +
 test/db/io/srec                 |  1 +
 test/db/tools/rz_bin            |  6 +++++-
 17 files changed, 42 insertions(+), 6 deletions(-)

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/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