From 9597e4feadf1e828b43fbb81e0876cae16ab610a Mon Sep 17 00:00:00 2001
From: billow <billow.fun@gmail.com>
Date: Sat, 28 Oct 2023 17:44:55 +0800
Subject: [PATCH] Add test for `afvlt`

---
 test/db/analysis/arm                          |   2 +-
 test/db/analysis/vars                         | 331 ++++++++++--------
 test/db/analysis/x86_64                       |  30 +-
 test/db/archos/linux-x64/dbg_aslr             |   4 +-
 test/db/archos/linux-x64/dbg_gdbserver_rebase |   4 +-
 test/db/archos/windows-x64/dbg_rebase         |   4 +-
 test/db/cmd/dwarf                             |   4 +-
 test/db/cmd/types                             |  42 +--
 test/db/cmd/write                             |   2 +-
 9 files changed, 223 insertions(+), 200 deletions(-)

diff --git a/test/db/analysis/arm b/test/db/analysis/arm
index c1bd150ec29..b9cbcefc164 100644
--- a/test/db/analysis/arm
+++ b/test/db/analysis/arm
@@ -745,7 +745,7 @@ e asm.arch=arm
 e asm.bits=16
 wx f0b503af2de9000d95b0002001210222032340f2040940f2050c40f2060e0724082509261490139112921193cdf80090cdf804c0cdf808e0039404950596ddf85080cdf81880ddf84ca0cdf81ca0ddf848b0cdf820b0ddf84480cdf82480cdf82890cdf82cc0cdf830e00d940e950f96fff740ff00211090084615b0bde8000df0bd
 aa
-afv~var
+afvl~var
 EOF
 EXPECT=<<EOF
 var int16_t var_74h @ stack - 0x74
diff --git a/test/db/analysis/vars b/test/db/analysis/vars
index 25df34daa6c..3be3793c77e 100644
--- a/test/db/analysis/vars
+++ b/test/db/analysis/vars
@@ -328,7 +328,7 @@ s sym.rarg_detection.dll_funcB
 af
 s sym.rarg_detection.dll_funcC
 af
-afv
+afvl
 EOF
 EXPECT=<<EOF
 arg int64_t arg3 @ r8
@@ -342,7 +342,7 @@ FILE=bins/pe/testx64.exe
 CMDS=<<EOF
 s 0x14000184c
 af
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var int64_t var_8h @ stack + 0x8
@@ -483,9 +483,9 @@ ARGS=-a x86 -b 32
 CMDS=<<EOF
 wx e805000000e80600000039d1742577145589e583ec048b5d088b4d0c895dfc83f90174098b45fc8945fc49ebf28b45fc89ec5dc3
 aac
-afv  @ 10
+afvl  @ 10
 afvx @ 10
-afv  @ 16
+afvl  @ 16
 afvx @ 16
 EOF
 EXPECT=<<EOF
@@ -522,7 +522,7 @@ FILE=bins/elf/vars-x86_64-bp
 CMDS=<<EOF
 s sym.varfunc
 af
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var int64_t var_18h @ stack - 0x18
@@ -569,7 +569,7 @@ FILE=bins/elf/vars-x86_64-sp
 CMDS=<<EOF
 s sym.varfunc
 af
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var int64_t var_10h @ stack - 0x10
@@ -868,7 +868,7 @@ NAME=Function va_args arguments from DWARF
 FILE=bins/elf/float_ex1/float_ex1_hightec
 CMDS=<<EOF
 aaa
-(sig; afv; afs; pd 1; echo "---------")
+(sig; afvl; afvlt; afs; pd 1; echo "---------")
 s dbg.printf
 .(sig)
 s dbg.prout
@@ -892,6 +892,19 @@ EXPECT=<<EOF
 var va_list ap @ stack + 0x4
 arg const char *fmt @ a4
 var int ans @ ...
+is_arg name type         constraints origin addr                                                                                                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+false  ap   va_list                  DWARF  loclist: [
+	(0x80000c22, 0x80000c36): CFA+0,
+	(0x80000c36, 0x80000c3b): a7,
+	(0x80000c3b, 0x80000c3c): CFA+0
+	]
+true   fmt  const char *             DWARF  loclist: [
+	(0x80000c22, 0x80000c2c): a4,
+	(0x80000c2c, 0x80000c3b): a6,
+	(0x80000c3b, 0x80000c3c): <evaluation waiting>
+	]
+false  ans  int                      DWARF  empty
 int printf(const char *fmt, ...);
             ; CALL XREFS from dbg.main @ 0x8000054e, 0x80000636
             ;-- printf:
@@ -905,6 +918,24 @@ arg void *str @ a4
 arg const char *buf @ a4
 var int32_t arg6 @ a5
 arg size_t n @ d5
+is_arg name type         constraints origin addr                                                                                                                                                        
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+true   str  void *                   DWARF  loclist: [
+	(0x80000c04, 0x80000c0a): a4,
+	(0x80000c0a, 0x80000c22): a15
+	]
+true   buf  const char *             DWARF  loclist: [
+	(0x80000c04, 0x80000c10): a5,
+	(0x80000c10, 0x80000c13): a4,
+	(0x80000c13, 0x80000c22): <evaluation waiting>
+	]
+false  arg6 int32_t                  rizin  a5
+true   n    size_t                   DWARF  loclist: [
+	(0x80000c04, 0x80000c0e): d4,
+	(0x80000c0e, 0x80000c13): d5,
+	(0x80000c13, 0x80000c1a): d15,
+	(0x80000c1a, 0x80000c22): <evaluation waiting>
+	]
 void * prout(void *str, const char *buf, size_t n);
             ;-- prout:
 / void * prout(void *str, const char *buf, size_t n)
@@ -923,6 +954,72 @@ var intfrac tfraction @ composite: [(.0, 32): d2, (.0, 32): d3]
 var fractype b_fraction @ composite: [(.0, 32): d8, (.0, 32): d9]
 var int a_normal_exp @ ...
 var fractype a_fraction @ ...
+is_arg name         type             constraints origin addr                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+true   b            fp_number_type *             DWARF  loclist: [
+	(0x80003c60, 0x80003c8c): a5,
+	(0x80003c8c, 0x80003c8e): a2,
+	(0x80003c8e, 0x80003c92): a5,
+	(0x80003c92, 0x80003c98): a2,
+	(0x80003c98, 0x80003cb4): a5,
+	(0x80003cb4, 0x80003cb6): a2,
+	(0x80003cb6, 0x80003cba): a5,
+	(0x80003cba, 0x80003ce9): a2,
+	(0x80003ce9, 0x80003d10): a12,
+	(0x80003d10, 0x80003d1d): a2,
+	(0x80003d1d, 0x80003d46): a12,
+	(0x80003d46, 0x80003d56): a2,
+	(0x80003d56, 0x80003e02): a12,
+	(0x80003e02, 0x80003e04): <evaluation waiting>
+	]
+true   a            fp_number_type *             DWARF  loclist: [
+	(0x80003c60, 0x80003c9c): a4,
+	(0x80003c9c, 0x80003cae): a2,
+	(0x80003cae, 0x80003cb4): <evaluation waiting>,
+	(0x80003cb4, 0x80003ce9): a4,
+	(0x80003ce9, 0x80003d10): a13,
+	(0x80003d10, 0x80003d1d): a4,
+	(0x80003d1d, 0x80003d46): a13,
+	(0x80003d46, 0x80003d56): a4,
+	(0x80003d56, 0x80003e02): a13,
+	(0x80003e02, 0x80003e04): <evaluation waiting>
+	]
+false  arg6         int32_t                      rizin  a5
+true   tmp          fp_number_type *             DWARF  loclist: [
+	(0x80003c60, 0x80003ce9): a6,
+	(0x80003ce9, 0x80003d10): a15,
+	(0x80003d10, 0x80003d1d): a6,
+	(0x80003d1d, 0x80003d46): a15,
+	(0x80003d46, 0x80003d56): a6,
+	(0x80003d56, 0x80003dea): a15,
+	(0x80003dea, 0x80003e02): a2,
+	(0x80003e02, 0x80003e04): <evaluation waiting>
+	]
+false  b_normal_exp int                          DWARF  loclist: [
+	(0x80003cc0, 0x80003ce0): d2,
+	(0x80003ce0, 0x80003ce9): <evaluation waiting>,
+	(0x80003d10, 0x80003d1d): d2,
+	(0x80003d46, 0x80003d56): d2
+	]
+false  tfraction    intfrac                      DWARF  composite: [(.0, 32): d2,	(.0, 32): d3]
+false  b_fraction   fractype                     DWARF  loclist: [
+	(0x80003cd8, 0x80003d08): composite: [(.0, 32): d8,	(.0, 32): d9],
+	(0x80003d0e, 0x80003e02): composite: [(.0, 32): d8,	(.0, 32): d9]
+	]
+false  a_normal_exp int                          DWARF  loclist: [
+	(0x80003cbc, 0x80003d4c): d15,
+	(0x80003d4c, 0x80003d52): a4+8,
+	(0x80003d52, 0x80003d88): d15,
+	(0x80003d88, 0x80003d98): a15+8,
+	(0x80003dc6, 0x80003dd0): d15,
+	(0x80003dd0, 0x80003dd6): a15+8
+	]
+false  a_fraction   fractype                     DWARF  loclist: [
+	(0x80003cd4, 0x80003d3c): composite: [(.0, 32): d10,	(.0, 32): d11],
+	(0x80003d44, 0x80003d50): composite: [(.0, 32): d10,	(.0, 32): d11],
+	(0x80003d50, 0x80003d52): a4+12,
+	(0x80003d52, 0x80003e02): composite: [(.0, 32): d10,	(.0, 32): d11]
+	]
 fp_number_type * _fpadd_parts(fp_number_type *a, fp_number_type *b, fp_number_type *tmp);
             ; CALL XREF from dbg.__adddf3 @ 0x80003e32
             ; CALL XREF from dbg.__subdf3 @ 0x80003e72
@@ -943,6 +1040,20 @@ arg const char *s @ a2
 var const char *sc @ a2
 var int32_t arg5 @ a4
 arg size_t maxsize @ d4
+is_arg name    type         constraints origin addr                                                                                                                                                       
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+true   s       const char *             DWARF  loclist: [
+	(0x800030ca, 0x800030dc): a4,
+	(0x800030dc, 0x800030e0): <evaluation waiting>,
+	(0x800030e0, 0x800030ea): a4,
+	(0x800030ea, 0x800030ec): a2
+	]
+false  sc      const char *             DWARF  a2
+false  arg5    int32_t                  rizin  a4
+true   maxsize size_t                   DWARF  loclist: [
+	(0x800030ca, 0x800030d2): d4,
+	(0x800030ea, 0x800030ec): d4
+	]
 size_t strnlen_s(const char *s, size_t maxsize);
             ; CALL XREF from dbg._Fail_s @ 0x8000191e
             ;-- strnlen_s:
@@ -958,6 +1069,22 @@ arg char *s @ a4
 arg mbstate_t *pst @ a5
 arg wchar_t wc @ d4
 var _Statab *pmbstate @ ...
+is_arg name     type        constraints origin addr                                                                        
+---------------------------------------------------------------------------------------------------------------------------
+false  pwcstate _Statab *               DWARF  a13
+true   s        char *                  DWARF  loclist: [
+	(0x800018a6, 0x800018bb): a4,
+	(0x800018bb, 0x800018ec): a15
+	]
+true   pst      mbstate_t *             DWARF  loclist: [
+	(0x800018a6, 0x800018bb): a5,
+	(0x800018bb, 0x800018ec): a12
+	]
+true   wc       wchar_t                 DWARF  loclist: [
+	(0x800018a6, 0x800018bb): d4,
+	(0x800018bb, 0x800018ec): d15
+	]
+false  pmbstate _Statab *               DWARF  empty
 int _Wctomb(char *s, wchar_t wc, mbstate_t *pst);
             ; CALL XREF from dbg._Putstr @ 0x800014d2
             ;-- _Wctomb:
@@ -976,6 +1103,27 @@ var int32_t arg5 @ a4
 var int32_t arg6 @ a5
 var int32_t arg7 @ a6
 arg size_t nin @ d15
+is_arg name type         constraints origin addr                                                                        
+------------------------------------------------------------------------------------------------------------------------
+true   pst  mbstate_t *              DWARF  loclist: [
+	(0x80003084, 0x8000309b): a6,
+	(0x8000309b, 0x800030b0): a12
+	]
+true   s    const char *             DWARF  loclist: [
+	(0x80003084, 0x8000309b): a5,
+	(0x8000309b, 0x800030b0): a13
+	]
+true   pwc  wchar_t *                DWARF  loclist: [
+	(0x80003084, 0x8000309b): a4,
+	(0x8000309b, 0x800030b0): a14
+	]
+false  arg5 int32_t                  rizin  a4
+false  arg6 int32_t                  rizin  a5
+false  arg7 int32_t                  rizin  a6
+true   nin  size_t                   DWARF  loclist: [
+	(0x80003084, 0x8000309b): d4,
+	(0x8000309b, 0x800030b0): d15
+	]
 int _Mbtowc(wchar_t *pwc, const char *s, size_t nin, mbstate_t *pst);
             ; CALL XREF from dbg._Printf @ 0x80000d02
             ;-- _Mbtowc:
@@ -990,6 +1138,9 @@ int _Mbtowc(wchar_t *pwc, const char *s, size_t nin, mbstate_t *pst);
 |           0x80003084      movh.a a15, #0xd000                        ; xmbtowc.c:150 ; int _Mbtowc(wchar_t *pwc, const char *s, size_t nin, mbstate_t *pst)
 ---------
 arg int except @ d4
+is_arg name   type constraints origin addr 
+-------------------------------------------
+true   except int              DWARF  d4
 int feraiseexcept(int except);
             ; CALL XREF from dbg._Feraise @ 0x8000343e
             ;-- feraiseexcept:
@@ -1000,6 +1151,14 @@ int feraiseexcept(int except);
 var size_t size_arg @ a0
 var Ppvoidfn newfuns @ a2
 var size_t inc @ d15
+is_arg name     type     constraints origin addr                                                                        
+------------------------------------------------------------------------------------------------------------------------
+false  size_arg size_t               rizin  a0
+false  newfuns  Ppvoidfn             DWARF  loclist: [
+	(0x800019aa, 0x800019b8): a2,
+	(0x800019b8, 0x80001a1c): a12
+	]
+false  inc      size_t               DWARF  d15
 int _Atrealloc();
             ; CALL XREF from dbg.atexit @ 0x80001a4c
             ; CALL XREF from dbg._Atexit @ 0x800033b8
@@ -1019,6 +1178,17 @@ var size_t size_arg @ a0
 var int32_t arg5 @ a4
 var int32_t arg6 @ a5
 var int32_t arg7 @ a6
+is_arg name     type          constraints origin addr   
+--------------------------------------------------------
+true   out      some_t **                 DWARF  a14-24
+true   gg       struct Some *             DWARF  a14-20
+true   q        double                    DWARF  a14-16
+true   g        char *                    DWARF  a14-8
+true   a        int                       DWARF  a14-4
+false  size_arg size_t                    rizin  a0
+false  arg5     int32_t                   rizin  a4
+false  arg6     int32_t                   rizin  a5
+false  arg7     int32_t                   rizin  a6
 void dbg.fn1(int a, char *g, double q, struct Some *gg, some_t **out);
             ; CALL XREF from dbg.main @ 0x8000059e
             ;-- fn1:
@@ -1098,150 +1268,3 @@ EXPECT=<<EOF
 \           0x8000054e      ret
 EOF
 RUN
-
-NAME=Function va_args arguments from DWARF
-FILE=bins/elf/float_ex1/float_ex1_hightec
-CMDS=<<EOF
-aaa
-(sig; afv; afs; pd 1; echo "")
-s dbg.printf
-.(sig)
-s dbg.prout
-.(sig)
-s dbg._fpadd_parts
-.(sig)
-s dbg.strnlen_s
-.(sig)
-s dbg._Wctomb
-.(sig)
-s dbg._Mbtowc
-.(sig)
-s dbg.feraiseexcept
-.(sig)
-s dbg._Atrealloc
-.(sig)
-EOF
-EXPECT=<<EOF
-var va_list ap @ stack + 0x4
-arg const char *fmt @ a4
-var int ans @ ...
-int printf(const char *fmt, ...);
-            ; CALL XREFS from dbg.main @ 0x8000054e, 0x80000636
-            ;-- printf:
-/ int printf(const char *fmt, ...)
-|           ; arg const char *fmt @ a4
-|           ; var int ans @ ...
-|           ; var va_list ap @ stack + 0x4
-|           0x80000c22      mov.aa a6, a4                              ; printf.c:10 ; arg5 ; int printf(const char *fmt, ...)
-
-arg void *str @ a4
-arg const char *buf @ a4
-var int32_t arg6 @ a5
-arg size_t n @ d5
-void * prout(void *str, const char *buf, size_t n);
-            ;-- prout:
-/ void * prout(void *str, const char *buf, size_t n)
-|           ; var int32_t arg6 @ a5
-|           ; arg void *str @ a4
-|           ; arg const char *buf @ a4
-|           ; arg size_t n @ d5
-|           0x80000c04      mov.aa a15, a4                             ; printf.c:5 ; arg5 ; void * prout(void *str, const char *buf, size_t n)
-
-arg fp_number_type *b @ a2
-arg fp_number_type *a @ a4
-var int32_t arg6 @ a5
-arg fp_number_type *tmp @ a6
-var int b_normal_exp @ d2
-var intfrac tfraction @ composite: [(.0, 32): d2, (.0, 32): d3]
-var fractype b_fraction @ composite: [(.0, 32): d8, (.0, 32): d9]
-var int a_normal_exp @ ...
-var fractype a_fraction @ ...
-fp_number_type * _fpadd_parts(fp_number_type *a, fp_number_type *b, fp_number_type *tmp);
-            ; CALL XREF from dbg.__adddf3 @ 0x80003e32
-            ; CALL XREF from dbg.__subdf3 @ 0x80003e72
-            ;-- _fpadd_parts:
-/ fp_number_type * _fpadd_parts(fp_number_type *a, fp_number_type *b, fp_number_type *tmp)
-|           ; var int32_t arg6 @ a5
-|           ; arg fp_number_type *a @ a4
-|           ; arg fp_number_type *b @ a2
-|           ; arg fp_number_type *tmp @ a6
-|           ; var intfrac tfraction @ composite: [(.0, 32): d2, (.0, 32): d3]
-|           ; var int a_normal_exp @ ...
-|           ; var int b_normal_exp @ d2
-|           ; var fractype a_fraction @ ...
-|           ; var fractype b_fraction @ composite: [(.0, 32): d8, (.0, 32): d9]
-|           0x80003c60      ld.bu d15, [a4]#0                          ; fp-bit.c:604 ; arg5 ; fp_number_type * _fpadd_parts(fp_number_type *a, fp_number_type *b, fp_number_type *tmp)
-
-arg const char *s @ a2
-var const char *sc @ a2
-var int32_t arg5 @ a4
-arg size_t maxsize @ d4
-size_t strnlen_s(const char *s, size_t maxsize);
-            ; CALL XREF from dbg._Fail_s @ 0x8000191e
-            ;-- strnlen_s:
-/ size_t strnlen_s(const char *s, size_t maxsize)
-|           ; var int32_t arg5 @ a4
-|           ; arg const char *s @ a2
-|           ; arg size_t maxsize @ d4
-|           ; var const char *sc @ a2
-|           0x800030ca      mov   d2, #0                               ; strnlen_s.c:6 ; size_t strnlen_s(const char *s, size_t maxsize)
-
-var _Statab *pwcstate @ a13
-arg char *s @ a4
-arg mbstate_t *pst @ a5
-arg wchar_t wc @ d4
-var _Statab *pmbstate @ ...
-int _Wctomb(char *s, wchar_t wc, mbstate_t *pst);
-            ; CALL XREF from dbg._Putstr @ 0x800014d2
-            ;-- _Wctomb:
-/ int _Wctomb(char *s, wchar_t wc, mbstate_t *pst)
-|           ; arg char *s @ a4
-|           ; arg wchar_t wc @ d4
-|           ; arg mbstate_t *pst @ a5
-|           ; var _Statab *pmbstate @ ...
-|           ; var _Statab *pwcstate @ a13
-|           0x800018a6      movh.a a2, #0xd000                         ; xwctomb.c:123 ; int _Wctomb(char *s, wchar_t wc, mbstate_t *pst)
-
-arg mbstate_t *pst @ a12
-arg const char *s @ a13
-arg wchar_t *pwc @ a14
-var int32_t arg5 @ a4
-var int32_t arg6 @ a5
-var int32_t arg7 @ a6
-arg size_t nin @ d15
-int _Mbtowc(wchar_t *pwc, const char *s, size_t nin, mbstate_t *pst);
-            ; CALL XREF from dbg._Printf @ 0x80000d02
-            ;-- _Mbtowc:
-/ int _Mbtowc(wchar_t *pwc, const char *s, size_t nin, mbstate_t *pst)
-|           ; var int32_t arg5 @ a4
-|           ; var int32_t arg6 @ a5
-|           ; var int32_t arg7 @ a6
-|           ; arg wchar_t *pwc @ a14
-|           ; arg const char *s @ a13
-|           ; arg size_t nin @ d15
-|           ; arg mbstate_t *pst @ a12
-|           0x80003084      movh.a a15, #0xd000                        ; xmbtowc.c:150 ; int _Mbtowc(wchar_t *pwc, const char *s, size_t nin, mbstate_t *pst)
-
-arg int except @ d4
-int feraiseexcept(int except);
-            ; CALL XREF from dbg._Feraise @ 0x8000343e
-            ;-- feraiseexcept:
-/ int feraiseexcept(int except)
-|           ; arg int except @ d4
-|           0x800037d8      mov   d2, #0                               ; feraiseexcept.c:173 ; int feraiseexcept(int except)
-
-var size_t size_arg @ a0
-var Ppvoidfn newfuns @ a2
-var size_t inc @ d15
-int _Atrealloc();
-            ; CALL XREF from dbg.atexit @ 0x80001a4c
-            ; CALL XREF from dbg._Atexit @ 0x800033b8
-            ;-- _Atrealloc:
-/ int _Atrealloc()
-|           ; var size_t size_arg @ a0
-|           ; var size_t inc @ d15
-|           ; var Ppvoidfn newfuns @ a2
-|           0x80001994      movh.a a15, #0xd000                        ; exit.c:22 ; int _Atrealloc()
-
-EOF
-RUN
diff --git a/test/db/analysis/x86_64 b/test/db/analysis/x86_64
index 10b4994050d..5dfbdb92106 100644
--- a/test/db/analysis/x86_64
+++ b/test/db/analysis/x86_64
@@ -1418,7 +1418,7 @@ FILE=bins/mach0/arg
 CMDS=<<EOF
 s sym._call
 af
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var int64_t var_1ch @ stack - 0x1c
@@ -1434,9 +1434,9 @@ FILE=bins/mach0/macho
 CMDS=<<EOF
 s 0x100000b60
 af
-afv~var_30h
+afvl~var_30h
 afvt var_30h char
-afv~var_30h
+afvl~var_30h
 EOF
 EXPECT=<<EOF
 var int64_t var_30h @ stack - 0x30
@@ -1449,9 +1449,9 @@ FILE=bins/mach0/macho
 CMDS=<<EOF
 s 0x100000b60
 af
-afv~var_30h
+afvl~var_30h
 afvn mylocal var_30h
-afv~mylocal
+afvl~mylocal
 EOF
 EXPECT=<<EOF
 var int64_t var_30h @ stack - 0x30
@@ -1464,10 +1464,10 @@ FILE=bins/mach0/macho
 CMDS=<<EOF
 s 0x100000b60
 af
-afv~var_30h
+afvl~var_30h
 afvn mylocal var_30h
 afvn var_30h mylocal
-afv~var_30h
+afvl~var_30h
 EOF
 EXPECT=<<EOF
 var int64_t var_30h @ stack - 0x30
@@ -1480,10 +1480,10 @@ FILE=bins/mach0/macho
 CMDS=<<EOF
 s 0x100000b60
 af
-afv~var_30h
+afvl~var_30h
 afvn mylocal var_30h
 afvt mylocal char
-afv~mylocal
+afvl~mylocal
 EOF
 EXPECT=<<EOF
 var int64_t var_30h @ stack - 0x30
@@ -1496,10 +1496,10 @@ FILE=bins/mach0/macho
 CMDS=<<EOF
 s 0x100000b60
 af
-afv~var_30h
+afvl~var_30h
 afvt var_30h char
 afvn mylocal var_30h
-afv~mylocal
+afvl~mylocal
 EOF
 EXPECT=<<EOF
 var int64_t var_30h @ stack - 0x30
@@ -1512,10 +1512,10 @@ FILE=bins/mach0/macho
 CMDS=<<EOF
 s 0x100000b60
 af
-afv~var_30h
+afvl~var_30h
 afvt var_30h char
 afvt var_30h int
-afv~var_30h
+afvl~var_30h
 EOF
 EXPECT=<<EOF
 var int64_t var_30h @ stack - 0x30
@@ -4281,10 +4281,10 @@ CMDS=<<EOF
 s 0x10270
 af
 afs
-afv
+afvl
 aaft
 afs
-afv
+afvl
 EOF
 EXPECT=<<EOF
 void fcn.00010270(int64_t arg1, int64_t arg2, int64_t arg3, int64_t arg4, int64_t arg5);
diff --git a/test/db/archos/linux-x64/dbg_aslr b/test/db/archos/linux-x64/dbg_aslr
index 18ce49b3464..5c45b2e5e55 100644
--- a/test/db/archos/linux-x64/dbg_aslr
+++ b/test/db/archos/linux-x64/dbg_aslr
@@ -76,9 +76,9 @@ FILE=bins/elf/hello_world
 ARGS=-d
 CMDS=<<EOF
 aa
-afv @ main
+afvl @ main
 doc
-afv @ main
+afvl @ main
 EOF
 EXPECT=<<EOF
 var int64_t var_28h @ stack - 0x28
diff --git a/test/db/archos/linux-x64/dbg_gdbserver_rebase b/test/db/archos/linux-x64/dbg_gdbserver_rebase
index d2bf642f22c..4d200ebe3d4 100644
--- a/test/db/archos/linux-x64/dbg_gdbserver_rebase
+++ b/test/db/archos/linux-x64/dbg_gdbserver_rebase
@@ -74,9 +74,9 @@ CMDS=<<EOF
 aa
 !scripts/gdbserver.py --port 12344 --binary bins/elf/hello_world
 oodf gdb://127.0.0.1:12344
-afv @ main
+afvl @ main
 doc
-afv @ main
+afvl @ main
 EOF
 EXPECT=<<EOF
 var int64_t var_20h @ rbp-0x20
diff --git a/test/db/archos/windows-x64/dbg_rebase b/test/db/archos/windows-x64/dbg_rebase
index 41fe84b0e51..0cd80bef2a8 100644
--- a/test/db/archos/windows-x64/dbg_rebase
+++ b/test/db/archos/windows-x64/dbg_rebase
@@ -63,9 +63,9 @@ FILE=bins/pe/hello_world/hello_world_od64bit.exe
 ARGS=-d
 CMDS=<<EOF
 aa
-afv @ entry0
+afvl @ entry0
 doc
-afv @ entry0
+afvl @ entry0
 EOF
 EXPECT=<<EOF
 var int64_t var_18h @ stack - 0x18
diff --git a/test/db/cmd/dwarf b/test/db/cmd/dwarf
index 1b0e1c646ca..6c861d5dd01 100644
--- a/test/db/cmd/dwarf
+++ b/test/db/cmd/dwarf
@@ -6503,7 +6503,7 @@ CMDS=<<EOF
 e asm.cpu=cortexm
 o bins/elf/test_app2/test_app2.elf
 aaa
-afv @ dbg.main
+afvl @ dbg.main
 pdf @ dbg.new_some
 aaa
 EOF
@@ -6540,7 +6540,7 @@ NAME="ARM types"
 FILE=bins/elf/test_app2/test_app2.elf
 CMDS=<<EOF
 aaa
-afv @ dbg.main
+afvl @ dbg.main
 pdf @ dbg.new_some
 aaa
 EOF
diff --git a/test/db/cmd/types b/test/db/cmd/types
index 2a633b33012..eeee7127a1f 100644
--- a/test/db/cmd/types
+++ b/test/db/cmd/types
@@ -1246,7 +1246,7 @@ tu Books
 s main
 afvt var_78h "union Books"
 afvn books var_78h
-afv~Books
+afvl~Books
 s 0x000006d2
 pd 1
 EOF
@@ -1547,9 +1547,9 @@ FILE=bins/elf/ls
 CMDS=<<EOF
 aaa
 s 0x4070
-afv
+afvl
 afvt var_70h "char [20]"
-afv
+afvl
 ar bp=0x98
 afvd var_70h
 EOF
@@ -1591,7 +1591,7 @@ CMDS=<<EOF
 aa
 s main
 aaft
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var size_t size @ stack - 0x1c
@@ -1606,7 +1606,7 @@ CMDS=<<EOF
 aa
 s main
 aaft
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var size_t size @ stack - 0x1c
@@ -1621,7 +1621,7 @@ CMDS=<<EOF
 aa
 s main
 aaft
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var size_t var_24h @ stack - 0x24
@@ -1637,7 +1637,7 @@ CMDS=<<EOF
 aa
 s main
 aaft
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var size_t var_28h @ stack - 0x28
@@ -1654,7 +1654,7 @@ CMDS=<<EOF
 aa
 s main
 aaft
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var const char *src @ stack - 0x24
@@ -1800,7 +1800,7 @@ CMDS=<<EOF
 aa
 aaft
 s main
-afv~ptr
+afvl~ptr
 EOF
 EXPECT=<<EOF
 var char **ptr @ stack - 0x20
@@ -1813,9 +1813,9 @@ CMDS=<<EOF
 aa
 aaft
 s main
-afv~var_3ch
-afv~var_38h
-afv~var_30h
+afvl~var_3ch
+afvl~var_38h
+afvl~var_30h
 EOF
 EXPECT=<<EOF
 var int var_3ch @ stack - 0x3c
@@ -1830,7 +1830,7 @@ CMDS=<<EOF
 aa
 aaft
 s main
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var void *va_args @ stack - 0x3c
@@ -1862,9 +1862,9 @@ CMDS=<<EOF
 aa
 aaft
 s main
-afv
+afvl
 s sym.processCmd
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var char **var_14e8h @ stack - 0x14e8
@@ -1930,7 +1930,7 @@ CMDS=<<EOF
 s main
 af
 aaft
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var int32_t var_1454h @ stack - 0x1454
@@ -1964,7 +1964,7 @@ CMDS=<<EOF
 aa
 aaft
 s main
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var int64_t var_2dh @ stack - 0x2d
@@ -1983,7 +1983,7 @@ CMDS=<<EOF
 aa
 aaft
 s main
-afv
+afvl
 EOF
 EXPECT=<<EOF
 var char **var_30h @ stack - 0x30
@@ -2024,7 +2024,7 @@ FILE=bins/elf/movstr
 CMDS=<<EOF
 aaa
 s main
-afv~var_28h
+afvl~var_28h
 EOF
 EXPECT=<<EOF
 var const char *var_28h @ stack - 0x28
@@ -2036,7 +2036,7 @@ FILE=bins/elf/tie-test
 CMDS=<<EOF
 aaa
 s sym.foo
-afv~var_28h
+afvl~var_28h
 EOF
 EXPECT=<<EOF
 var size_t *var_28h @ stack - 0x28
@@ -2134,7 +2134,7 @@ af
 afc fastcall
 afs "int fastcalled(int sarg0, int sarg1, int sarg2, int sarg3)"
 afs
-afv
+afvl
 afi~name,convention
 EOF
 EXPECT=<<EOF
diff --git a/test/db/cmd/write b/test/db/cmd/write
index b8ef365aff2..5c7ad12e63f 100644
--- a/test/db/cmd/write
+++ b/test/db/cmd/write
@@ -464,7 +464,7 @@ afvn test var_4h
 wa "jne 0" @ 4
 pdr
 wx 00000000
-afv # check var was deleted
+afvl # check var was deleted
 EOF
 EXPECT=<<EOF
 / fcn.00000000();