From: "Максим Корякшин via Tarantool-patches" <tarantool-patches@dev.tarantool.org> To: "Maxim Kokryashkin" <max.kokryashkin@gmail.com> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit v2] luajit-gdb: support dualnum mode Date: Sat, 14 Aug 2021 16:36:18 +0300 [thread overview] Message-ID: <1628948178.874488018@f341.i.mail.ru> (raw) In-Reply-To: <20210814113834.1171307-1-m.kokryashkin@tarantool.org> [-- Attachment #1: Type: text/plain, Size: 3382 bytes --] While I was working on another luajit-gdb enhancement, I noticed that I forgot to add LJ_DUALNUM and LJ_TISNUM declarations. So here is the diff that fixes it: =========================================== diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py index d4882dd7..b656a808 100644 --- a/src/luajit-gdb.py +++ b/src/luajit-gdb.py @@ -157,9 +157,10 @@ def frame_prev(framelink): LJ_64 = None LJ_GC64 = None LJ_FR2 = None +LJ_DUALNUM = None LJ_GCVMASK = ((1 << 47) - 1) - +LJ_TISNUM = None PADDING = None # }}} =========================================== >Суббота, 14 августа 2021, 14:39 +03:00 от Maxim Kokryashkin <max.kokryashkin@gmail.com>: > >luajit-gdb.py displays integers in LJ_DUALNUM mode as nan-s. The >dumper function produces output thinking of any input value as of a >double. However, in DUALNUM mode, integers and doubles are stored >differently, so the `itype` of a float number must be less than >`LJ_TISNUM`, and the `itype` of an integer must be `LJ_TISNUM`. With >this fact in mind, we can easily differentiate one from another. > >Closes tarantool/tarantool#6224 >--- >Changes in v2: > - Fixed comments as per review by Sergey > > src/luajit-gdb.py | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > >diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py >index c50405ad..d4882dd7 100644 >--- a/src/luajit-gdb.py >+++ b/src/luajit-gdb.py >@@ -238,8 +238,11 @@ def jit_state(g): > 0x15: 'ERR', > }.get(int(J(g)['state']), 'INVALID') > >+def tvisint(o): >+ return LJ_DUALNUM and itype(o) == LJ_TISNUM >+ > def tvisnumber(o): >- return itype(o) <= (0xfffeffff if LJ_64 and not LJ_GC64 else LJ_T['NUMX']) >+ return itype(o) <= LJ_TISNUM > > def tvislightud(o): > if LJ_64 and not LJ_GC64: >@@ -343,7 +346,10 @@ def dump_lj_tudata(tv): > return 'userdata @ {}'.format(strx64(gcval(tv['gcr']))) > > def dump_lj_tnumx(tv): >- return 'number {}'.format(cast('double', tv['n'])) >+ if tvisint(tv): >+ return 'number {}'.format(cast('int32_t', tv['i'])) >+ else: >+ return 'number {}'.format(cast('double', tv['n'])) > > def dump_lj_invalid(tv): > return 'not valid type @ {}'.format(strx64(gcval(tv['gcr']))) >@@ -683,7 +689,7 @@ The command requires no args and dumps current GC stats: > )) > > def init(commands): >- global LJ_64, LJ_GC64, LJ_FR2, PADDING >+ global LJ_64, LJ_GC64, LJ_DUALNUM, LJ_TISNUM, LJ_FR2, PADDING > > # XXX Fragile: though connecting the callback looks like a crap but it > # respects both Python 2 and Python 3 (see #4828). >@@ -724,6 +730,7 @@ def init(commands): > try: > LJ_64 = str(gdb.parse_and_eval('IRT_PTR')) == 'IRT_P64' > LJ_FR2 = LJ_GC64 = str(gdb.parse_and_eval('IRT_PGC')) == 'IRT_P64' >+ LJ_DUALNUM = lookup('lj_lib_checknumber') is not None > except: > gdb.write('luajit-gdb.py failed to load: ' > 'no debugging symbols found for libluajit\n') >@@ -733,6 +740,7 @@ def init(commands): > command(name) > > PADDING = ' ' * len(':' + hex((1 << (47 if LJ_GC64 else 32)) - 1)) >+ LJ_TISNUM = 0xfffeffff if LJ_64 and not LJ_GC64 else LJ_T['NUMX'] > > gdb.write('luajit-gdb.py is successfully loaded\n') > >-- >2.32.0 [-- Attachment #2: Type: text/html, Size: 4525 bytes --]
next prev parent reply other threads:[~2021-08-14 13:36 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-31 13:36 [Tarantool-patches] [PATCH luajit] " Maxim Kokryashkin via Tarantool-patches 2021-08-11 8:27 ` Sergey Kaplun via Tarantool-patches 2021-08-13 14:29 ` Максим Корякшин via Tarantool-patches 2021-08-14 11:38 ` [Tarantool-patches] [PATCH luajit v2] " Maxim Kokryashkin via Tarantool-patches 2021-08-14 13:36 ` Максим Корякшин via Tarantool-patches [this message] 2021-08-14 13:47 ` Sergey Kaplun via Tarantool-patches 2021-08-14 17:26 ` Максим Корякшин via Tarantool-patches 2021-08-17 7:56 ` Igor Munkin via Tarantool-patches 2021-08-16 8:49 ` Igor Munkin via Tarantool-patches 2021-08-16 10:01 ` Максим Корякшин via Tarantool-patches 2021-08-16 16:23 ` Vitaliia Ioffe via Tarantool-patches 2021-08-17 7:47 ` Igor Munkin via Tarantool-patches 2021-08-17 9:23 ` [Tarantool-patches] [PATCH luajit] " Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1628948178.874488018@f341.i.mail.ru \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=max.kokryashkin@gmail.com \ --subject='Re: [Tarantool-patches] [PATCH luajit v2] luajit-gdb: support dualnum mode' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox