From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id /s94Dx26mWR4sQ4AWB0awg (envelope-from ) for ; Mon, 26 Jun 2023 12:17:33 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=QIJdSviR; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 305A71E0BB; Mon, 26 Jun 2023 12:17:33 -0400 (EDT) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 simark.ca (Postfix) with ESMTPS id 20B4C1E0AC for ; Mon, 26 Jun 2023 12:17:31 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 509F93858C78 for ; Mon, 26 Jun 2023 16:17:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 509F93858C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687796249; bh=h5kKgNufI9LMwlk6HT8QO/tg85OqdZiMwCTJMd7xT8E=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=QIJdSviRjxf9hBzol3ALjetRp3lmpeIb4MtExFsUsBZpL5yYdo8XyiwMSy/mxpKBv XMY7y15uAW5ptQuqk7NWVqsVuNa6y4jOACx5hEtijZHurEADSeJBelfrH7mmKIx4DQ 1wF0zXujYM7bsMsLqYr/WnFqb2Xp2l+gk8IJ4OoI= Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by sourceware.org (Postfix) with ESMTPS id 66EAD3858D1E for ; Mon, 26 Jun 2023 16:17:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66EAD3858D1E Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4f86e6e4038so4314692e87.0 for ; Mon, 26 Jun 2023 09:17:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687796224; x=1690388224; 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=h5kKgNufI9LMwlk6HT8QO/tg85OqdZiMwCTJMd7xT8E=; b=hUYUM5JrUVYygnHhw2JWBJEKsiRKW/IZxIKPOVm8/4vEkVc31j2jzH9JDJEpLwT1Zc jqUnzKAduNycqvnOUs780/KXmZDdC88it7nfKAl2mCWYSha8qvWD0i7vxZWQ7qpqDMiN XMh1vnH7m6MXvR+61doopuhQB/3j96N4gyDTYZR0ce/QJcsjgCqUrM5eeopjeTbbRjpY aVFqQQ/Z4RZLDI6PM6sQX2TKEyKnlZYjliLCa5hGC1tcSC9g7z5L/1c/BwyZ27hkJOmH kyZYL+sRYPzTGDVqgVIgAcJeqZcoQXlLC27/CB28E73R/pjkPy8pkOqSZLlTtaqerGCD MBjw== X-Gm-Message-State: AC+VfDzs5Fwb434dN5pnaYEPKh7I0O3lbGYvyhrsDHD9c8p+1uyzc8at QZrM+IhwhpA0xSLZ3781OuxRte+Yr7Y= X-Google-Smtp-Source: ACHHUZ5ctQGmBkxoknEER/u4JnfBG65up8/93Ubn/dX1PfALgf35DkJAwwkkjgYdawdZYHYa0bN8bw== X-Received: by 2002:a05:6512:4007:b0:4f6:214f:fdb1 with SMTP id br7-20020a056512400700b004f6214ffdb1mr11718994lfb.3.1687796224016; Mon, 26 Jun 2023 09:17:04 -0700 (PDT) Received: from fedora.. (78-73-77-63-no2450.tbcn.telia.com. [78.73.77.63]) by smtp.gmail.com with ESMTPSA id d1-20020a05651221c100b004f84226f0bfsm1083288lft.26.2023.06.26.09.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 09:17:03 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Simon Farre Subject: [PATCH v1] gdb/DAP Fix disassemble bug Date: Mon, 26 Jun 2023 18:16:54 +0200 Message-ID: <20230626161654.207687-1-simon.farre.cx@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Simon Farre via Gdb-patches Reply-To: Simon Farre Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Fixes disassembleRequest The field instructionOffset can be negative. Previous patch made it so that sometimes the request got calculated to 0 instructions, when it meant to retrieve disasm for -50 to 0 (current position). --- gdb/python/lib/gdb/dap/disassemble.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/python/lib/gdb/dap/disassemble.py b/gdb/python/lib/gdb/dap/disassemble.py index bc091eb2c89..1ee6cf2ff48 100644 --- a/gdb/python/lib/gdb/dap/disassemble.py +++ b/gdb/python/lib/gdb/dap/disassemble.py @@ -27,8 +27,8 @@ def _disassemble(pc, skip_insns, count): # Maybe there was no frame. arch = gdb.selected_inferior().architecture() result = [] - total_count = skip_insns + count - for elt in arch.disassemble(pc, count=total_count)[skip_insns:]: + + for elt in arch.disassemble(pc + skip_insns, count=count): result.append( { "address": hex(elt["addr"]), -- 2.41.0