From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 2EC6A111A01B; Tue, 19 May 2026 15:42:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2EC6A111A01B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1779194521; bh=QNUeyaE+74qa60gQoyCDUk4A1CtSelRh7GGFOQs0jM0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Xz+HRL9pkXbOpEC4VKdTnRPwv98/HGd+GOil9awqR8A5EItzSUye0jyQsNzGbENU/ Hh5rPnFXWdLpGMASpEik2lQyn+x1AjAP8+MGU1Z1JOiBGs/+tgNJ8qayiAtI8UXw2z mNIA9dtrUZHfeex7Y9GD+/62VxLhLEDgp/26aLVs= Received: from send242.i.mail.ru (send242.i.mail.ru [95.163.59.81]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C9312111A002 for ; Tue, 19 May 2026 15:40:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C9312111A002 Received: by exim-smtp-8466d5ddfc-zbcjt with esmtpa (envelope-from ) id 1wPJjt-00000000Fgc-2fkt; Tue, 19 May 2026 15:40:02 +0300 To: Mikhail Elhimov , Sergey Bronnikov , Evgeniy Temirgaleev Date: Tue, 19 May 2026 15:39:11 +0300 Message-ID: <20260519123913.178775-5-skaplun@tarantool.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519123913.178775-1-skaplun@tarantool.org> References: <20260519123913.178775-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-618D5548: C0F7A63A94E80811411046492FDDF806BE8028EA2BCBA40C9D98F6840A4EFB780FCE12206E7DA3E2 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD98DC58EE55F2C5C375ED019E89806C63C68B913310D02212300894C459B0CD1B9C0F7A63A94E80811411046492FDDF806C8331CE2750AB6A29D98F6840A4EFB78F253FDB7F52A2E4C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E50EC9128971FD6EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FE9EFE935CD7C6AE8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B244618F7D7F87BC372E070BE324C7D3C4C75CC8041FCD7852F6B57BC7E64490618DEB871D839B73339E8FC8737B5C2249D99FB7B2A39B4961CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0F6FAE79CA2B8C2908941B15DA834481F9449624AB7ADAF372E808ACE2090B5E14AD6D5ED66289B5278DA827A17800CE76631511D42670FFE2EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE71FE705C1FB16C834731C566533BA786AA5CC5B56E945C8DA X-87b9d050: 1 X-C1DE0DAB: 0D63561A33F958A5066EA7E35F0EE7DE5002B1117B3ED696E756713DD2F2C1D719AC5B239BAD4335823CB91A9FED034534781492E4B8EEAD9F68E8F4EDE74A9DC79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADB58128AB1E6D661A716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D6592DE18AD69CB494E37F88C7A506D265C81E4FC6587403AAEC7CF84BF1A6FE46D6A92CED41A7A8568CB8341EE9D5BE9A0AD83A4537D5F0B1424B43B2A6B51D093C7EDF5D4C2FE6ABF19350E1BD188BD56E4C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVax5M0mESuWmtBMUKnp6EqY= X-DA7885C5: CA5BD781F3767238F255D290C0D534F928FEB424A90FC6D1F15A751504A1D991E9164BAD8E11CF845B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393520AF17B8A65FDE2F6C4E7F6670133D0228D337503C33EE55F14F6680B0D1CA7E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 4/6] lldb: support full-range 64-bit lightuserdata X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This commit adds the missed support for the full-range 64-bit light userdata, which was lost during lldb extension implementation. The corresponding entries for the test of lj-tv are sorted according to LJT* types. --- src/luajit_lldb.py | 20 +++++++++++++- .../debug-extension-tests.py | 27 ++++++++++++------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/luajit_lldb.py b/src/luajit_lldb.py index 7668a94c..e3fe82fc 100644 --- a/src/luajit_lldb.py +++ b/src/luajit_lldb.py @@ -18,6 +18,12 @@ IRT_P64 = 9 LJ_GCVMASK = ((1 << 47) - 1) LJ_TISNUM = 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 + # Debugger specific {{{ @@ -440,6 +446,18 @@ def tvisnumber(o): return itype(o) <= LJ_TISNUM +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']) + + def dump_lj_tnil(tv): return 'nil' @@ -453,7 +471,7 @@ def dump_lj_ttrue(tv): 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): diff --git a/test/tarantool-debugger-tests/debug-extension-tests.py b/test/tarantool-debugger-tests/debug-extension-tests.py index f3ce3ced..2b67e151 100644 --- a/test/tarantool-debugger-tests/debug-extension-tests.py +++ b/test/tarantool-debugger-tests/debug-extension-tests.py @@ -211,23 +211,28 @@ class TestLJTV(TestCaseBase): 'lj-tv L->base + 9\n' 'lj-tv L->base + 10\n' 'lj-tv L->base + 11\n' + 'lj-tv L->base + 12\n' + 'lj-tv L->base + 13\n' ) + # Sorted in LJT order. lua_script = ( 'local ffi = require("ffi")\n' 'print(\n' ' nil,\n' ' false,\n' ' true,\n' + ' debug.upvalueid(print, 1), \n' # lightuserdata ' "hello",\n' - ' {1},\n' - ' 1,\n' - ' 1.1,\n' ' coroutine.create(function() end),\n' - ' ffi.new("int*"),\n' ' function() end,\n' + ' require,\n' ' print,\n' - ' require\n' + ' ffi.new("int*"),\n' + ' {1},\n' + ' newproxy(),\n' + ' 1,\n' + ' 1.1\n' ')\n' ) @@ -235,15 +240,17 @@ class TestLJTV(TestCaseBase): r'nil\n' r'false\n' r'true\n' + r'light userdata @ ' + RX_ADDR + r'\n' r'string \"hello\" @ ' + RX_ADDR + r'\n' - r'table @ ' + RX_ADDR + r' \(asize: \d+, hmask: ' + RX_HASH + r'\)\n' - r'(number|integer) .*1.*\n' - r'number 1.1\d+\n' r'thread @ ' + RX_ADDR + r'\n' - r'cdata @ ' + RX_ADDR + r'\n' r'Lua function @ ' + RX_ADDR + r', [0-9]+ upvalues, .+:[0-9]+\n' - r'fast function #[0-9]+\n' r'C function @ ' + RX_ADDR + r'\n' + r'fast function #[0-9]+\n' + r'cdata @ ' + RX_ADDR + r'\n' + r'table @ ' + RX_ADDR + r' \(asize: \d+, hmask: ' + RX_HASH + r'\)\n' + r'userdata @ ' + RX_ADDR + r'\n' + r'(number|integer) .*1.*\n' + r'number 1.1\d+\n' ) -- 2.53.0