From 30d8d2c3b21b2e0cf1b66e0ec5ce6748b200ac86 Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Fri, 27 Mar 2026 01:31:46 +0800
Subject: [PATCH] Filter dm/fl@F:maps wrt vvar/vdso size (#6104)

---
 test/db/archos/linux-x64/dbg_maps | 12 ++++++------
 test/db/archos/linux-x64/dbg_oo   |  4 ++--
 test/scripts/map_clean.rz         |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/db/archos/linux-x64/dbg_maps b/test/db/archos/linux-x64/dbg_maps
index cd451c2ccc..6c3b27802a 100644
--- a/test/db/archos/linux-x64/dbg_maps
+++ b/test/db/archos/linux-x64/dbg_maps
@@ -21,9 +21,9 @@ EXPECT=<<EOF
 10
 0x08048000 - 0x08049000 - usr     4K s r-x .../rizin/test/bins/elf/analysis/elf-nx .../rizin/test/bins/elf/analysis/elf-nx ; ..._rizin_test_bins_elf_analysis_elf_nx.r_x
 0x08049000 - 0x0804a000 - usr     4K s rw- .../rizin/test/bins/elf/analysis/elf-nx .../rizin/test/bins/elf/analysis/elf-nx ; ..._rizin_test_bins_elf_analysis_elf_nx.rw
-0x________ - 0x________ - usr     8K s r-- [vvar] [vvar] ; vvar_.r
+0x________ - 0x________ - usr     _K s r-- [vvar] [vvar] ; vvar_.r
 0x________ - 0x________ - usr     8K s r-- [vvar_vclock] [vvar_vclock] ; vvar_vclock_.r
-0x________ - 0x________ - usr     8K s r-x [vdso] [vdso] ; vdso_.r_x
+0x________ - 0x________ - usr     _K s r-x [vdso] [vdso] ; vdso_.r_x
 0x________ - 0x________ - usr     4K s r-- /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r
 0x________ - 0x________ * usr   140K s r-x /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r_x
 0x________ - 0x________ - usr    56K s r-- /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r.________
@@ -44,9 +44,9 @@ EXPECT=<<EOF
 10
 0x08048000 4096 ..._rizin_test_bins_elf_analysis_elf_nx.r_x
 0x08049000 4096 ..._rizin_test_bins_elf_analysis_elf_nx.rw
-0x________ 8192 vvar_.r
+0x________ ____ vvar_.r
 0x________ 8192 vvar_vclock_.r
-0x________ 8192 vdso_.r_x
+0x________ ____ vdso_.r_x
 0x________ 4096 usr_lib32_ld_linux.so.2.r
 0x________ 143360 usr_lib32_ld_linux.so.2.r_x
 0x________ 57344 usr_lib32_ld_linux.so.2.r.________
@@ -84,9 +84,9 @@ EXPECT=<<EOF
 0x________ - 0x________ - usr     4K s rw- /usr/lib32/libc.so.6 /usr/lib32/libc.so.6
 0x________ - 0x________ - usr    40K s rw- unk0 unk0
 0x________ - 0x________ - usr     8K s rw- unk1 unk1
-0x________ - 0x________ - usr     8K s r-- [vvar] [vvar] ; vvar_.r
+0x________ - 0x________ - usr     _K s r-- [vvar] [vvar] ; vvar_.r
 0x________ - 0x________ - usr     8K s r-- [vvar_vclock] [vvar_vclock] ; vvar_vclock_.r
-0x________ - 0x________ - usr     8K s r-x [vdso] [vdso] ; vdso_.r_x
+0x________ - 0x________ - usr     _K s r-x [vdso] [vdso] ; vdso_.r_x
 0x________ - 0x________ - usr     4K s r-- /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r
 0x________ - 0x________ - usr   140K s r-x /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r_x
 0x________ - 0x________ - usr    56K s r-- /usr/lib32/ld-linux.so.2 /usr/lib32/ld-linux.so.2 ; usr_lib32_ld_linux.so.2.r.________
diff --git a/test/db/archos/linux-x64/dbg_oo b/test/db/archos/linux-x64/dbg_oo
index bb3b1dd2df..f9907e2f12 100644
--- a/test/db/archos/linux-x64/dbg_oo
+++ b/test/db/archos/linux-x64/dbg_oo
@@ -105,9 +105,9 @@ EXPECT=<<EOF
 10
 0x08048000 4096 ..._rizin_test_bins_elf_analysis_x86_helloworld_gcc.r_x
 0x08049000 4096 ..._rizin_test_bins_elf_analysis_x86_helloworld_gcc.rw
-0x________ 8192 vvar_.r
+0x________ ____ vvar_.r
 0x________ 8192 vvar_vclock_.r
-0x________ 8192 vdso_.r_x
+0x________ ____ vdso_.r_x
 0x________ 4096 usr_lib32_ld_linux.so.2.r
 0x________ 143360 usr_lib32_ld_linux.so.2.r_x
 0x________ 57344 usr_lib32_ld_linux.so.2.r.________
diff --git a/test/scripts/map_clean.rz b/test/scripts/map_clean.rz
index c68d4d0d3c..1477cf6c9e 100644
--- a/test/scripts/map_clean.rz
+++ b/test/scripts/map_clean.rz
@@ -2,6 +2,6 @@
 (map_clean cmd; .(map_clean_i ${cmd} `di~exe[1] | sed 's,.*/rizin/test/bins/,,g;  s,/,\\2,g;  s/-/[-_]/g'`))
 (map_clean_i cmd bin; .echo ${cmd} | sed 's/[fe][0-9a-f]\{7\}/________/g;  s,[^[:space:]]*\(\([/_]\)rizin\2test\2bins\2${bin}\),...\1,g')
 
-(dm_cmd_clean cmd; .(map_clean ${cmd}) | sed 's/1..\(K.*stack\)/1__\1/g')
+(dm_cmd_clean cmd; .(map_clean ${cmd}) | sed 's/1..\(K.*stack\)/1__\1/g;  s/[ 0-9]\{2\}\(K.*\(vvar.[^v]\|vdso\)\)/ _\1/g')
 (dm_clean; .(dm_cmd_clean dm))
-(fl_F_maps_clean; .(map_clean "fl@F:maps") | sed 's/1[0-9]\{5\}\(.*stack\)/1_____\1/g')
+(fl_F_maps_clean; .(map_clean "fl@F:maps") | sed 's/1[0-9]\{5\}\(.*stack\)/1_____\1/g;  s/[0-9]\{4,5\}\(.*\(vvar.[^v]\|vdso\)\)/____\1/g')