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 B3B23158CE7; Mon, 5 Dec 2022 12:56:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B3B23158CE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1670234219; bh=BOSVYEeWNbidyH2LXmPgVXlZmhmCnEsQ562S8E0MT7o=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ODNqyi7yj9VZReAisFq1HG8t2PpMwahpMbA9om/V+CpkGe84DV1ZPClFX6wpqaCCW ki1qC4fGqCF8whZROXWcXdRIlNLmPqum3vRHuFzvSiorDoikzc+MVzMRJr7HNvYXRJ CLhDdaNATGi4qM7XrjJU5b7sEvglvMDJYz5MFQmo= Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 D3EEB158CE7 for ; Mon, 5 Dec 2022 12:56:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D3EEB158CE7 Received: by mail-lf1-f42.google.com with SMTP id p8so17660850lfu.11 for ; Mon, 05 Dec 2022 01:56:57 -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=p1voyiqifWe+MGo+KElJMv/FwCUyXy/fteF8uvReIIM=; b=npXC3tNgedH6xnvyHNe5Gq8Q0OTmDu41SNQRxnTjE58eyG2qICxEoRgUArjVQLyYjh lxjNZa8XZaTG2uq0vgQwKLkliIEAdfeFthneUPuvl5sr3U3OC4QnyWg0j7aOmYcEtB5u E6VReqzSJva7I0ktYjLlDZi+TSQQl+u0X7j8lDPdFAPlkJqXsAOY1fMZwdkpwY3MR69Q T7JWGJX11SGH44EQ3uTKq4jEixf2WtWtDgx1IXUdjgHlHrKcNInYDkVaIFjK68a6tF40 +/xWoX7/fy2Plr0XNBgy0VxEQaIK/M1FuzW328Qgmr0BEdzhQYE+fJ62s+6ZswUP8ymP WfCg== X-Gm-Message-State: ANoB5pkvHV0TeiabzzmpBjivH/sffGL+UjRM6Pc1GThAMZEr3ui4BUBm v2r0H8dVaHtqHB8SJfcgaOz2h7Fwd9I8+g== X-Google-Smtp-Source: AA0mqf4Se6TPXVJtyVdEG9dqpcZm3Ja6w4IkQeuqDWXGa3z0NGVMpx5oPn1A6HcTfHpTZMonYhCblA== X-Received: by 2002:ac2:5964:0:b0:4b4:b5d3:650f with SMTP id h4-20020ac25964000000b004b4b5d3650fmr29925924lfp.649.1670234216776; Mon, 05 Dec 2022 01:56:56 -0800 (PST) Received: from localhost.localdomain (93-81-207-127.broadband.corbina.ru. [93.81.207.127]) by smtp.gmail.com with ESMTPSA id g22-20020a2eb5d6000000b00267232d0652sm1334961ljn.46.2022.12.05.01.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 01:56:56 -0800 (PST) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, sergos@tarantool.org, imun@tarantool.org Date: Mon, 5 Dec 2022 12:56:52 +0300 Message-Id: <20221205095652.231379-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 luajit v2] 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 --- 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