From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, sergos@tarantool.org, skaplun@tarantool.org Subject: [Tarantool-patches] [PATCH luajit] luajit-gdb: support full-range 64-bit lightud Date: Wed, 5 Oct 2022 17:43:31 +0300 [thread overview] Message-ID: <20221005144331.39666-1-m.kokryashkin@tarantool.org> (raw) Following up the introduction of full-range 64-bit lightuserdata support in commit 2cacfa8 ("Add support for full-range 64 bit lightuserdata."), this patch modifies the corresponding dumper behavior for LJ_64 platforms in the luajit-gdb extension. Resolves tarantool/tarantool#6481 --- Branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-6481-luajit-gdb-light-ud Issue: https://github.com/tarantool/tarantool/issues/6481 src/luajit-gdb.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py index 6480d014..2993f2c1 100644 --- a/src/luajit-gdb.py +++ b/src/luajit-gdb.py @@ -166,6 +166,9 @@ LJ_GCVMASK = ((1 << 47) - 1) LJ_TISNUM = None PADDING = None +LJ_LIGHTUD_BITS_SEG = 8 +LJ_LIGHTUD_BITS_LO = 47 - LJ_LIGHTUD_BITS_SEG + # }}} def itype(o): @@ -315,6 +318,12 @@ def frames(L): break framelink = frame_prev(framelink) +def lightudseg(u): + return (u >> LJ_LIGHTUD_BITS_LO) & ((1 << LJ_LIGHTUD_BITS_SEG) - 1) + +def lightudlo(u): + return u & ((1 << LJ_LIGHTUD_BITS_LO) - 1) + # Dumpers {{{ def dump_lj_tnil(tv): @@ -327,7 +336,14 @@ def dump_lj_ttrue(tv): return 'true' def dump_lj_tlightud(tv): - return 'light userdata @ {}'.format(strx64(gcval(tv['gcr']))) + if LJ_64: + u = int(tv['u64']) + seg = lightudseg(u) + segmap = mref('uint32_t *', G(L(None))['gc']['lightudseg']) + addr = (int(segmap[seg]) << 32) | lightudlo(u) + else: + addr = gcval(tv['gcr']) + return 'light userdata @ {}'.format(strx64(addr)) def dump_lj_tstr(tv): return 'string {body} @ {address}'.format( -- 2.36.1
next reply other threads:[~2022-10-05 14:43 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-05 14:43 Maxim Kokryashkin via Tarantool-patches [this message] 2022-10-06 9:02 ` sergos via Tarantool-patches 2022-11-29 15:20 ` Igor Munkin via Tarantool-patches 2022-12-01 5:14 ` Maxim Kokryashkin 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=20221005144331.39666-1-m.kokryashkin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=sergos@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit] luajit-gdb: support full-range 64-bit lightud' \ /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