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 EFB0111A702; Fri, 2 Dec 2022 00:15:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EFB0111A702 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1669929312; bh=hOYqk+pJCcriktfNT/mBgcTwFcrDuS8160sews31p+M=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=KK+nkfRZaEWsJSGwHx9z/9TaHTbkgeY/znyEF7v4S0yGHe1lIxwkbsuFsWAeu/UHP vN8uuselLjgzUrWaYLG8BLgAeRs+54u5Bh47e78vv6YNfQx7/v3tWsnMAGnUlxGyVz CwKJVZzxTpxsXtldlfxbRQcUBlzLFSuajtbGj1OM= Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 B671611A702 for ; Fri, 2 Dec 2022 00:15:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B671611A702 Received: by mail-lf1-f54.google.com with SMTP id be13so4477524lfb.4 for ; Thu, 01 Dec 2022 13:15:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RmcGczVaQ5YsZp+Gd6FRAn8aESANNrbcFH5vO2bQww0=; b=uQXuwIK1U4XHvkI0rCg7bDXzXFxwDy8sBdXx1Yl9zHxDgMgU5W70eS0j3sBB7XEdAC FCB80Dl09YIsrIHvSopPhZALyB+p4d0y/CbJfMZjv2+nNCCdprBX/ITOCypmIzpm1V1j XO891rxLNLODu9iqx2MxRvpwy6jwkes/n/aT4uhMxSOkLdsX2/rVGYtwr7e4Qj33aqAR NCQfFGmQ9Tb3XTc7ziLWltwneLsguD9e2F4pc6rfT98C0WEP61z8arsZkK7Q85M0+kAF PvrUJIgb+6eaJYAwqBPHSwerYlcSu6SFmn3YnSfd+Qs8yLN/rNjCUAl8j4cmYz7y3Sok 7UJA== X-Gm-Message-State: ANoB5pkolpysZfVoO+dmEMAt8fQioS4B43SZ8vTuI7r8XcM4XQfL3eBC r1FXoIxXpNinyuigtC7/x3IseG3Zgfw= X-Google-Smtp-Source: AA0mqf4IpGmTlW45l+bAlxLj2Y8x80PugJbO/g6u8UHMFCfJzjK+KgcN2UsWLGxMFA/hwmsppnksNA== X-Received: by 2002:a19:c506:0:b0:4b1:c15c:126c with SMTP id w6-20020a19c506000000b004b1c15c126cmr17589834lfe.8.1669929306189; Thu, 01 Dec 2022 13:15:06 -0800 (PST) Received: from localhost.localdomain (93-81-207-127.broadband.corbina.ru. [93.81.207.127]) by smtp.gmail.com with ESMTPSA id bp25-20020a056512159900b00497a0ea92desm766899lfb.135.2022.12.01.13.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 13:15:05 -0800 (PST) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, sergos@tarantool.org, imun@tarantool.org Date: Fri, 2 Dec 2022 00:15:00 +0300 Message-Id: <20221201211500.44362-1-m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] gdb: 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 --- src/luajit-gdb.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py index 6480d014..e5c94000 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,18 @@ def frames(L): break framelink = frame_prev(framelink) +if LJ_64: + def lightudV(tv): + 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: + def lightudV(tv): + return gcval(tv['gcr']) + # Dumpers {{{ def dump_lj_tnil(tv): @@ -327,7 +345,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