From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 130871 invoked by alias); 20 Oct 2019 06:48:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 130846 invoked by uid 89); 20 Oct 2019 06:48:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.7 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 spammy=Previously, H*r:sk:DB5EUR0, safer, infcmdc X-HELO: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-oln040092065076.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (40.92.65.76) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 20 Oct 2019 06:48:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=elb+GTSJh+48OBcSs9drFNPFZnWShasfUlktKf1DFWJbMJWvY+gB/p/D66eHXsrtN0dCYwWQYU9rsOEWMasmGYxxAeSGm21XinyywSp1P5N74LRK25QHkqmL/m/eXTBmGs6IyYTByyexLmcdlkRYKaiD4dCTnkRicrLXqJfo449y7w8JViKsIclRRYv1MMcdAimRV+1HUXURAajk04IqrWilLuIhiWyfBVBxgn+VJJbxk1Yj3hF0pW4tCtomZLYaqslnaM+y7cyo62PAniKFBPbre4uZT2d0kLVK1X9p4+qVtN4hX4V1upuQs9ldX3PybTzoLjyQWaHSSSoysAXDWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RI0u2/kpVOwbltw1gomNOMrnL4hxJ/QXThUAt4r0luA=; b=eLW2XeOeUNXYJi+bt0nLu60Dx+M6mLzxv0VebOG0wcGdCSAdDoAgTuMcXxKOVvDa7x2PDIn2eZdnStcQuAN+us8qCw1YWxC7AomQVJ3ozCc6ReDF/tljVb5CpbbIIfeNShwsmLT/08cQ+dpP6TVlRu8o2tYs9FZlI+H4GYso1XNlwGR2QDVz46wfW2rvv1NcXYAYB/CmMRJC5zaN4EeGBrioJnQYq4vR7Rn5YDXFF+mCaLEYvC7QJFnMK8UYgSRc3PcV6MiEUkc5vtJ+aBtX8ik+PK2MPtV+Vho7YtM4eYVRUQrKf1cjH+uM4WmhfPYdDitdMXzjsaOhCJCT775Kcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DB5EUR01FT035.eop-EUR01.prod.protection.outlook.com (10.152.4.55) by DB5EUR01HT145.eop-EUR01.prod.protection.outlook.com (10.152.5.239) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2367.14; Sun, 20 Oct 2019 06:48:44 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com (10.152.4.54) by DB5EUR01FT035.mail.protection.outlook.com (10.152.4.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2367.14 via Frontend Transport; Sun, 20 Oct 2019 06:48:44 +0000 Received: from VI1PR03MB4528.eurprd03.prod.outlook.com ([fe80::f12a:6f14:2368:e758]) by VI1PR03MB4528.eurprd03.prod.outlook.com ([fe80::f12a:6f14:2368:e758%4]) with mapi id 15.20.2347.028; Sun, 20 Oct 2019 06:48:44 +0000 From: Bernd Edlinger To: "gdb-patches@sourceware.org" Subject: [PATCHv2] Make "skip" work on inline frames Date: Sun, 20 Oct 2019 06:48:00 -0000 Message-ID: References: In-Reply-To: x-microsoft-original-message-id: <369d3970-0dc2-fba0-a9b9-4ec929f63297@hotmail.de> x-ms-exchange-transport-forked: True Content-Type: multipart/mixed; boundary="_002_VI1PR03MB452814244371F04E2848AB68E46E0VI1PR03MB4528eurp_" MIME-Version: 1.0 X-SW-Source: 2019-10/txt/msg00685.txt.bz2 --_002_VI1PR03MB452814244371F04E2848AB68E46E0VI1PR03MB4528eurp_ Content-Type: text/plain; charset="Windows-1252" Content-ID: Content-Transfer-Encoding: quoted-printable Content-length: 1337 On 10/19/19 6:38 AM, Bernd Edlinger wrote: > Hmm, >=20 > I noticed that the patch does not yet handle > the step correctly, the count is decremented > although the inline frame is skipped and should not be > counted... >=20 > Thus I will need to change at least this: >=20 > --- a/gdb/infcmd.c > +++ b/gdb/infcmd.c > @@ -1122,7 +1122,6 @@ prepare_one_step (struct step_command_fsm *sm) > set_running (resume_ptid, 1); >=20=20 > step_into_inline_frame (tp); > - sm->count--; >=20=20 > sal =3D find_frame_sal (frame); > sym =3D get_frame_function (frame); > @@ -1132,13 +1131,17 @@ prepare_one_step (struct step_command_fsm *sm) >=20=20 > if (sal.line =3D=3D 0 > || !function_name_is_marked_for_skip (fn, sal)) > - return prepare_one_step (sm); > + { > + sm->count--; > + return prepare_one_step (sm); > + } > } >=20=20 >=20 Attached is an updated patch that fixes this issue, and also adds the following after step_into_inline_frame (): frame =3D get_current_frame (); That I consider safer, since this function calls reinit_frame_cache (). It was probably just by chance that this did not seem to cause any problems for me. Thanks Bernd. --_002_VI1PR03MB452814244371F04E2848AB68E46E0VI1PR03MB4528eurp_ Content-Type: text/x-patch; name="0001-Check-all-inline-frames-if-they-are-marked-for-skip.patch" Content-Description: 0001-Check-all-inline-frames-if-they-are-marked-for-skip.patch Content-Disposition: attachment; filename="0001-Check-all-inline-frames-if-they-are-marked-for-skip.patch"; size=4461; creation-date="Sun, 20 Oct 2019 06:48:43 GMT"; modification-date="Sun, 20 Oct 2019 06:48:43 GMT" Content-ID: Content-Transfer-Encoding: base64 Content-length: 6048 RnJvbSBmYTAwYjE4OTBlNTI1YjRlOGU5YTgzOTdiZGRmYTk5NjNjMjUzMDgw IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZXJuZCBFZGxpbmdl ciA8YmVybmQuZWRsaW5nZXJAaG90bWFpbC5kZT4KRGF0ZTogRnJpLCAxOCBP Y3QgMjAxOSAxNDoyODo0NSArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIENoZWNr IGFsbCBpbmxpbmUgZnJhbWVzIGlmIHRoZXkgYXJlIG1hcmtlZCBmb3Igc2tp cC4KClRoaXMgbWFrZXMgdGhlIHNraXAgY29tbWFuZCB3b3JrIGluIG9wdGlt aXplZCBidWlsZHMsCndoZXJlIHNraXBwZWQgZnVuY3Rpb25zIG1heSBiZSBp bmxpbmVkLgpQcmV2aW91c2x5IHRoYXQgd2FzIG9ubHkgd29ya2luZyB3aGVu IHN0ZXBwaW5nIGludG8KYSBub24taW5saW5lZCBmdW5jdGlvbi4KLS0tCiBn ZGIvaW5mY21kLmMgfCAyMCArKysrKysrKysrKysrKysrKystLQogZ2RiL2lu ZnJ1bi5jIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDY5IGlu c2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ2Ri L2luZmNtZC5jIGIvZ2RiL2luZmNtZC5jCmluZGV4IDcxMDU3NzQuLmY0YzE4 M2MgMTAwNjQ0Ci0tLSBhL2dkYi9pbmZjbWQuYworKysgYi9nZGIvaW5mY21k LmMKQEAgLTU4LDYgKzU4LDcgQEAKICNpbmNsdWRlICJ0aHJlYWQtZnNtLmgi CiAjaW5jbHVkZSAidG9wLmgiCiAjaW5jbHVkZSAiaW50ZXJwcy5oIgorI2lu Y2x1ZGUgInNraXAuaCIKICNpbmNsdWRlICJnZGJzdXBwb3J0L2dkYl9vcHRp b25hbC5oIgogI2luY2x1ZGUgInNvdXJjZS5oIgogI2luY2x1ZGUgImNsaS9j bGktc3R5bGUuaCIKQEAgLTExMTIsMTQgKzExMTMsMjkgQEAgcHJlcGFyZV9v bmVfc3RlcCAoc3RydWN0IHN0ZXBfY29tbWFuZF9mc20gKnNtKQogCSAgICAg ICYmIGlubGluZV9za2lwcGVkX2ZyYW1lcyAodHApKQogCSAgICB7CiAJICAg ICAgcHRpZF90IHJlc3VtZV9wdGlkOworCSAgICAgIGNvbnN0IGNoYXIgKmZu ID0gTlVMTDsKKwkgICAgICBzeW10YWJfYW5kX2xpbmUgc2FsOworCSAgICAg IHN0cnVjdCBzeW1ib2wgKnN5bTsKIAogCSAgICAgIC8qIFByZXRlbmQgdGhh dCB3ZSd2ZSByYW4uICAqLwogCSAgICAgIHJlc3VtZV9wdGlkID0gdXNlcl92 aXNpYmxlX3Jlc3VtZV9wdGlkICgxKTsKIAkgICAgICBzZXRfcnVubmluZyAo cmVzdW1lX3B0aWQsIDEpOwogCiAJICAgICAgc3RlcF9pbnRvX2lubGluZV9m cmFtZSAodHApOwotCSAgICAgIHNtLT5jb3VudC0tOwotCSAgICAgIHJldHVy biBwcmVwYXJlX29uZV9zdGVwIChzbSk7CisKKwkgICAgICBmcmFtZSA9IGdl dF9jdXJyZW50X2ZyYW1lICgpOworCSAgICAgIHNhbCA9IGZpbmRfZnJhbWVf c2FsIChmcmFtZSk7CisJICAgICAgc3ltID0gZ2V0X2ZyYW1lX2Z1bmN0aW9u IChmcmFtZSk7CisKKwkgICAgICBpZiAoc3ltICE9IE5VTEwpCisJCWZuID0g U1lNQk9MX1BSSU5UX05BTUUgKHN5bSk7CisKKwkgICAgICBpZiAoc2FsLmxp bmUgPT0gMAorCQkgIHx8ICFmdW5jdGlvbl9uYW1lX2lzX21hcmtlZF9mb3Jf c2tpcCAoZm4sIHNhbCkpCisJCXsKKwkJICBzbS0+Y291bnQtLTsKKwkJICBy ZXR1cm4gcHJlcGFyZV9vbmVfc3RlcCAoc20pOworCQl9CiAJICAgIH0KIAog CSAgcGMgPSBnZXRfZnJhbWVfcGMgKGZyYW1lKTsKZGlmZiAtLWdpdCBhL2dk Yi9pbmZydW4uYyBiL2dkYi9pbmZydW4uYwppbmRleCAwN2FlYmZhLi4wNGMx ZWVlIDEwMDY0NAotLS0gYS9nZGIvaW5mcnVuLmMKKysrIGIvZ2RiL2luZnJ1 bi5jCkBAIC00MDQxLDYgKzQwNDEsNDUgQEAgc3RlcHBlZF9pbl9mcm9tIChz dHJ1Y3QgZnJhbWVfaW5mbyAqZnJhbWUsIHN0cnVjdCBmcmFtZV9pZCBzdGVw X2ZyYW1lX2lkKQogICByZXR1cm4gMDsKIH0KIAorLyogTG9vayBmb3IgYW4g aW5saW5lIGZyYW1lIHRoYXQgaXMgbWFya2VkIGZvciBza2lwLgorICAgSWYg UFJFVl9GUkFNRSBpcyBUUlVFIHN0YXJ0IGF0IHRoZSBwcmV2aW91cyBmcmFt ZSwKKyAgIG90aGVyd2lzZSBzdGFydCBhdCB0aGUgY3VycmVudCBmcmFtZS4g IFN0b3AgYXQgdGhlCisgICBmaXJzdCBub24taW5saW5lIGZyYW1lLCBvciBh dCB0aGUgZnJhbWUgd2hlcmUgdGhlCisgICBzdGVwIHN0YXJ0ZWQuICAqLwor CitzdGF0aWMgYm9vbAoraW5saW5lX2ZyYW1lX2lzX21hcmtlZF9mb3Jfc2tp cCAoYm9vbCBwcmV2X2ZyYW1lLCBzdHJ1Y3QgdGhyZWFkX2luZm8gKnRwKQor eworICBzdHJ1Y3QgZnJhbWVfaW5mbyAqZnJhbWUgPSBnZXRfY3VycmVudF9m cmFtZSAoKTsKKworICBpZiAocHJldl9mcmFtZSkKKyAgICBmcmFtZSA9IGdl dF9wcmV2X2ZyYW1lIChmcmFtZSk7CisKKyAgZm9yICg7IGZyYW1lICE9IE5V TEw7IGZyYW1lID0gZ2V0X3ByZXZfZnJhbWUgKGZyYW1lKSkKKyAgICB7Cisg ICAgICBjb25zdCBjaGFyICpmbiA9IE5VTEw7CisgICAgICBzeW10YWJfYW5k X2xpbmUgc2FsOworICAgICAgc3RydWN0IHN5bWJvbCAqc3ltOworCisgICAg ICBpZiAoZnJhbWVfaWRfZXEgKGdldF9mcmFtZV9pZCAoZnJhbWUpLCB0cC0+ Y29udHJvbC5zdGVwX2ZyYW1lX2lkKSkKKwlicmVhazsKKyAgICAgIGlmIChn ZXRfZnJhbWVfdHlwZSAoZnJhbWUpICE9IElOTElORV9GUkFNRSkKKwlicmVh azsKKworICAgICAgc2FsID0gZmluZF9mcmFtZV9zYWwgKGZyYW1lKTsKKyAg ICAgIHN5bSA9IGdldF9mcmFtZV9mdW5jdGlvbiAoZnJhbWUpOworCisgICAg ICBpZiAoc3ltICE9IE5VTEwpCisJZm4gPSBTWU1CT0xfUFJJTlRfTkFNRSAo c3ltKTsKKworICAgICAgaWYgKHNhbC5saW5lICE9IDAKKwkgICYmIGZ1bmN0 aW9uX25hbWVfaXNfbWFya2VkX2Zvcl9za2lwIChmbiwgc2FsKSkKKwlyZXR1 cm4gdHJ1ZTsKKyAgICB9CisKKyAgcmV0dXJuIGZhbHNlOworfQorCiAvKiBJ ZiB0aGUgZXZlbnQgdGhyZWFkIGhhcyB0aGUgc3RvcCByZXF1ZXN0ZWQgZmxh ZyBzZXQsIHByZXRlbmQgaXQKICAgIHN0b3BwZWQgZm9yIGEgR0RCX1NJR05B TF8wIChpLmUuLCBhcyBpZiBpdCBzdG9wcGVkIGR1ZSB0bwogICAgdGFyZ2V0 X3N0b3ApLiAgKi8KQEAgLTY1MzEsNyArNjU3MCw4IEBAIHByb2Nlc3NfZXZl bnRfc3RvcF90ZXN0IChzdHJ1Y3QgZXhlY3V0aW9uX2NvbnRyb2xfc3RhdGUg KmVjcykKIAl0bXBfc2FsID0gZmluZF9wY19saW5lIChlY3MtPnN0b3BfZnVu Y19zdGFydCwgMCk7CiAJaWYgKHRtcF9zYWwubGluZSAhPSAwCiAJICAgICYm ICFmdW5jdGlvbl9uYW1lX2lzX21hcmtlZF9mb3Jfc2tpcCAoZWNzLT5zdG9w X2Z1bmNfbmFtZSwKLQkJCQkJCSAgdG1wX3NhbCkpCisJCQkJCQkgIHRtcF9z YWwpCisJICAgICYmICFpbmxpbmVfZnJhbWVfaXNfbWFya2VkX2Zvcl9za2lw ICh0cnVlLCBlY3MtPmV2ZW50X3RocmVhZCkpCiAJICB7CiAJICAgIGlmIChl eGVjdXRpb25fZGlyZWN0aW9uID09IEVYRUNfUkVWRVJTRSkKIAkgICAgICBo YW5kbGVfc3RlcF9pbnRvX2Z1bmN0aW9uX2JhY2t3YXJkIChnZGJhcmNoLCBl Y3MpOwpAQCAtNjY5Nyw3ICs2NzM3LDE0IEBAIHByb2Nlc3NfZXZlbnRfc3Rv cF90ZXN0IChzdHJ1Y3QgZXhlY3V0aW9uX2NvbnRyb2xfc3RhdGUgKmVjcykK IAogCSAgaWYgKGNhbGxfc2FsLmxpbmUgPT0gZWNzLT5ldmVudF90aHJlYWQt PmN1cnJlbnRfbGluZQogCSAgICAgICYmIGNhbGxfc2FsLnN5bXRhYiA9PSBl Y3MtPmV2ZW50X3RocmVhZC0+Y3VycmVudF9zeW10YWIpCi0JICAgIHN0ZXBf aW50b19pbmxpbmVfZnJhbWUgKGVjcy0+ZXZlbnRfdGhyZWFkKTsKKwkgICAg eworCSAgICAgIHN0ZXBfaW50b19pbmxpbmVfZnJhbWUgKGVjcy0+ZXZlbnRf dGhyZWFkKTsKKwkgICAgICBpZiAoaW5saW5lX2ZyYW1lX2lzX21hcmtlZF9m b3Jfc2tpcCAoZmFsc2UsIGVjcy0+ZXZlbnRfdGhyZWFkKSkKKwkJeworCQkg IGtlZXBfZ29pbmcgKGVjcyk7CisJCSAgcmV0dXJuOworCQl9CisJICAgIH0K IAogCSAgZW5kX3N0ZXBwaW5nX3JhbmdlIChlY3MpOwogCSAgcmV0dXJuOwpA QCAtNjczMSw3ICs2Nzc4LDggQEAgcHJvY2Vzc19ldmVudF9zdG9wX3Rlc3Qg KHN0cnVjdCBleGVjdXRpb25fY29udHJvbF9zdGF0ZSAqZWNzKQogCWZwcmlu dGZfdW5maWx0ZXJlZCAoZ2RiX3N0ZGxvZywKIAkJCSAgICAiaW5mcnVuOiBz dGVwcGluZyB0aHJvdWdoIGlubGluZWQgZnVuY3Rpb25cbiIpOwogCi0gICAg ICBpZiAoZWNzLT5ldmVudF90aHJlYWQtPmNvbnRyb2wuc3RlcF9vdmVyX2Nh bGxzID09IFNURVBfT1ZFUl9BTEwpCisgICAgICBpZiAoZWNzLT5ldmVudF90 aHJlYWQtPmNvbnRyb2wuc3RlcF9vdmVyX2NhbGxzID09IFNURVBfT1ZFUl9B TEwKKwkgIHx8IGlubGluZV9mcmFtZV9pc19tYXJrZWRfZm9yX3NraXAgKGZh bHNlLCBlY3MtPmV2ZW50X3RocmVhZCkpCiAJa2VlcF9nb2luZyAoZWNzKTsK ICAgICAgIGVsc2UKIAllbmRfc3RlcHBpbmdfcmFuZ2UgKGVjcyk7Ci0tIAox LjkuMQoK --_002_VI1PR03MB452814244371F04E2848AB68E46E0VI1PR03MB4528eurp_--