[Tarantool-patches] [PATCH luajit v2] gdb: support full-range 64-bit lightuserdata
Maxim Kokryashkin
max.kokryashkin at gmail.com
Mon Dec 5 12:56:52 MSK 2022
Following up the introduction of full-range 64-bit lightuserdata
support in commit 2cacfa8e7ffefb715abf55dc5b0c708c63251868 ('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
---
Changes in v2:
- Restored the initial lightudV specification mechanism.
Issue: https://github.com/tarantool/tarantool/issues/6481
Branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-6481-luajit-gdb-light-ud
src/luajit-gdb.py | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py
index 6480d014..96ee2289 100644
--- a/src/luajit-gdb.py
+++ b/src/luajit-gdb.py
@@ -166,6 +166,12 @@ LJ_GCVMASK = ((1 << 47) - 1)
LJ_TISNUM = None
PADDING = None
+# These constants are meaningful only for 'LJ_64' mode.
+LJ_LIGHTUD_BITS_SEG = 8
+LJ_LIGHTUD_BITS_LO = 47 - LJ_LIGHTUD_BITS_SEG
+LIGHTUD_SEG_MASK = (1 << LJ_LIGHTUD_BITS_SEG) - 1
+LIGHTUD_LO_MASK = (1 << LJ_LIGHTUD_BITS_LO) - 1
+
# }}}
def itype(o):
@@ -315,6 +321,17 @@ def frames(L):
break
framelink = frame_prev(framelink)
+def lightudV(tv):
+ if LJ_64:
+ u = int(tv['u64'])
+ # lightudseg macro expanded.
+ seg = (u >> LJ_LIGHTUD_BITS_LO) & LIGHTUD_SEG_MASK
+ segmap = mref('uint32_t *', G(L(None))['gc']['lightudseg'])
+ # lightudlo macro expanded.
+ return (int(segmap[seg]) << 32) | (u & LIGHTUD_LO_MASK)
+ else:
+ return gcval(tv['gcr'])
+
# Dumpers {{{
def dump_lj_tnil(tv):
@@ -327,7 +344,7 @@ def dump_lj_ttrue(tv):
return 'true'
def dump_lj_tlightud(tv):
- return 'light userdata @ {}'.format(strx64(gcval(tv['gcr'])))
+ return 'light userdata @ {}'.format(strx64(lightudV(tv)))
def dump_lj_tstr(tv):
return 'string {body} @ {address}'.format(
--
2.38.1
More information about the Tarantool-patches
mailing list