From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065030.outbound.protection.outlook.com [40.92.65.30]) by sourceware.org (Postfix) with ESMTPS id D28243942028 for ; Fri, 13 Mar 2020 12:47:40 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U2HFMJDOWfM066wiXWTa/jQI5DkTkbYN/mEZL+jlU9Ru1E6bC03+PdIDvG9KXbyRVOoGVvH4xfyuvXvZE4UE2ipr1N9fX6zp1kNoL4LSM2j+DFKiX318cNGiRTguODRfhtRI09XOFe69uJtUJjWQWQLB4PM794TSy2ZgRQyrYF/g+OwYWxELuh9KqFpdo8hPA78VWKkT6Hsc3TMhF6sH68k1Wbs3UMP7myow1Xxl2pUfc579CvvBkEQ7i2s9SZAXAceZ3dLcfyFO5X8L791d2xxyVpGksjjZiJ1rK7kRp3v9DGHKElcm+FvS9iHzvo/OLcrYBek7qjPcxeKos651nw== 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=+p1DgVuBYqW284YWI0BIWzzb+lP3NevXOoQkkG+8UNU=; b=Vtj+I72y4+pepPcjoxJyKqnHyzwVS5ch3StGCXgKUxi0gtpIl3RQTjWr9Qsntxk9L7sViVJtB5Vw5xU7zBBroxmToUHLuNjy+kEcLvREY6Zq++JCfKI211vbOvQCQFDgQCJ1VUioX5pgAWi6S4dP/vGYUtZ0B72EogZ0qIl0V+LekH6Dl2rMmazvm2gAg4sO6dkCtBClJX7PzmyRJhxncAAla9edg+STdAwdpyamlb4pgco+3J1ml0vIbZc9CUDvASWtqy7+4PxUCicG8SMX60D3S6swPGLVymLcO63ALTNJImvRiVqbDlXpSmOSspnJRp9G9jLUTpD1st00xLTxng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hotmail.de; dmarc=pass action=none header.from=hotmail.de; dkim=pass header.d=hotmail.de; arc=none Received: from DB5EUR01FT015.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::34) by DB5EUR01HT069.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::399) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.14; Fri, 13 Mar 2020 12:47:39 +0000 Received: from VE1PR03MB5181.eurprd03.prod.outlook.com (10.152.4.52) by DB5EUR01FT015.mail.protection.outlook.com (10.152.5.0) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.14 via Frontend Transport; Fri, 13 Mar 2020 12:47:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2D153B2E2EC182082D1BB66B2194ADAA4B9EBA1154CF03876F1328FC59C0390E; UpperCasedChecksum:F97567AE1DE197A8D7BACD27CB71E5485EB3601DB1662AF9F875961481EDA63D; SizeAsReceived:8319; Count:48 Received: from VE1PR03MB5181.eurprd03.prod.outlook.com ([fe80::9820:a2b6:2afb:1be3]) by VE1PR03MB5181.eurprd03.prod.outlook.com ([fe80::9820:a2b6:2afb:1be3%5]) with mapi id 15.20.2814.018; Fri, 13 Mar 2020 12:47:39 +0000 Subject: [PATCHv4] Fix range end handling of inlined subroutines From: Bernd Edlinger To: Andrew Burgess , gdb-patches@sourceware.org References: <94e33268f64060fc887670f4ee5ed524050cbcc7.1580902412.git.andrew.burgess@embecosm.com> Message-ID: Date: Fri, 13 Mar 2020 13:47:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 In-Reply-To: Content-Type: multipart/mixed; boundary="------------F2A5637B59143AB23B677A75" Content-Language: en-US X-ClientProxiedBy: AM0PR10CA0010.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::20) To VE1PR03MB5181.eurprd03.prod.outlook.com (2603:10a6:802:a7::13) X-Microsoft-Original-Message-ID: <115e04ac-3e7d-ca55-359c-dbed36bc22ae@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.101] (92.77.140.102) by AM0PR10CA0010.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.18 via Frontend Transport; Fri, 13 Mar 2020 12:47:38 +0000 X-Microsoft-Original-Message-ID: <115e04ac-3e7d-ca55-359c-dbed36bc22ae@hotmail.de> X-TMN: [p/wygMH6Y+dpZ7giUq/pkRoxCPsENCmi] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e951bfad-64eb-47cc-3d83-08d7c74cb668 X-MS-TrafficTypeDiagnostic: DB5EUR01HT069: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TWa11MaSLvVGM8pJfCBNkyUgTcbleajjgcWRqOqoQh5Zk84p+11ubStrUR9SQFydtM+gkTfjbr/KmBFXTFNhe56Ljr/BtE8hEH5Vrm9iwiA6irP9Li+xv6iG7sJpwTxwntOQM0lc/uUs8jSrgYp9jQl+h67nhu3ATDLNvF9dqOhAx847PPWKxih2E7ptym/M X-MS-Exchange-AntiSpam-MessageData: CsbulDoB5jtfJbFA7G1WCVmJHveK/IYzeGX7rS2y/aEtIotIbEsr2tnAysva45W0AZGljduoHcEjGeqSHTrW+A3/ppY9l1dFKdmu3lJWOnIX9m7XJVnlEu99C3sae5dTEl7jiqAp18K0O5H2co4BGw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e951bfad-64eb-47cc-3d83-08d7c74cb668 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2020 12:47:39.3118 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR01HT069 X-Spam-Status: No, score=-24.6 required=5.0 tests=BAYES_00, FORGED_MUA_MOZILLA, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , X-List-Received-Date: Fri, 13 Mar 2020 12:47:42 -0000 --------------F2A5637B59143AB23B677A75 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit This is the updated version of my patch, with additional information "why" this is done in the changelog, and addressing all review comments so far. I tested again, also together with my other patch, all test results look good. Thanks Bernd. --------------F2A5637B59143AB23B677A75 Content-Type: text/x-patch; name="0001-Fix-range-end-handling-of-inlined-subroutines.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Fix-range-end-handling-of-inlined-subroutines.patch" RnJvbSBmYWVjMzNhOGQ3ZmVhM2E5OTA1MDVlYjlkNjVlNmM5M2MwYWZkMGViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZXJuZCBFZGxpbmdlciA8YmVybmQuZWRsaW5nZXJAaG90bWFp bC5kZT4KRGF0ZTogU3VuLCA5IEZlYiAyMDIwIDIxOjEzOjE3ICswMTAwClN1YmplY3Q6IFtQQVRD SF0gRml4IHJhbmdlIGVuZCBoYW5kbGluZyBvZiBpbmxpbmVkIHN1YnJvdXRpbmVzCgpTaW5jZSB0 aGUgaXNfc3RtdCBpcyBub3cgaGFuZGxlZCwgaXQgYmVjb21lcwpwb3NzaWJsZSB0byBsb2NhdGUg ZHViaW91cyBpc19zdG10IGxpbmUgZW50cmllcwphdCB0aGUgZW5kIG9mIGFuIGlubGluZWQgZnVu Y3Rpb24sIGV2ZW4gaWYgdGhlCmNhbGxlZCBpbmxpbmUgZnVuY3Rpb24gaXMgaW4gdGhlIHNhbWUg c3ViZmlsZS4KCldoZW4gdGhlcmUgaXMgYSBzZXF1ZW5jZSBvZiBsaW5lIGVudHJpZXMgYXQgdGhl CnNhbWUgYWRkcmVzcyB3aGVyZSBhbiBpbmxpbmUgcmFuZ2UgZW5kcywgYW5kIHRoZQpsYXN0IGl0 ZW0gaGFzIGlzX3N0bXQgPSAwLCB3ZSBmb3JjZSBhbGwgcHJldmlvdXMKaXRlbXMgdG8gaGF2ZSBp c19zdG10ID0gMCBhcyB3ZWxsLgoKSWYgdGhlIGxhc3QgbGluZSBhdCB0aGF0IGFkZHJlc3MgaGFz IGlzX3N0bXQgPSAxLAp0aGVyZSBpcyBubyBuZWVkIHRvIGNoYW5nZSBhbnl0aGluZywgc2luY2Ug YSBzdGVwCm92ZXIgd2lsbCBhbHdheXMgc3RvcCBhdCB0aGF0IGxhc3QgbGluZSBmcm9tIHRoZQpz YW1lIGFkZHJlc3MsIHdoaWNoIGlzIGZpbmUsIHNpbmNlIGl0IGlzIG91dHNpZGUKdGhlIHN1YnJv dXRpbmUuCgpXaXRoIHRoaXMgY2hhbmdlIHdlIGxvb3NlIHRoZSBhYmlsaXR5IHRvIHNldApicmVh a3BvaW50cyBvbiBzb21lIGxpbmVzIHVzaW5nIGZpbGU6bGluZSBzeW50YXgsCmJ1dCB0aGUgZGF0 YSBpcyBub3QgY29tcGxldGVseSBsb3N0LCBhcyB0aGUKbGluZSB0YWJsZSBpcyBzdGlsbCBob2xk aW5nIHRob3NlIGxpbmVzLCBqdXN0CndpdGggdGhlIGlzX3N0bXQgZmxhZyByZXNldC4KClRoaXMg aXMgbmVjZXNzYXJ5IGFzIGJyZWFrcG9pbnRzIG9uIHRoZXNlIGxpbmVzCmFyZSBwcm9ibGVtYXRp YywgYmVjYXVzZSB0aGUgY2FsbCBzdGFjayBpcyBvZnRlbgp3cm9uZy4gIEZyb20gdGhlIGJsb2Nr IGluZm8gdGhleSBhcHBlYXIgdG8gYmUKbG9jYXRlZCBpbiB0aGUgY2FsbGVyLCBidXQgdGhleSBh cmUgYWN0dWFsbHkgbWVhbnQKdG8gYmUgcGFydCBvZiB0aGUgc3Vicm91dGluZSwgdGhlcmVmb3Jl IHVzdWFsbHkgb25lCmZyYW1lIGlzIG1pc3NpbmcgZnJvbSB0aGUgY2FsbHN0YWNrIHdoZW4gdGhl CmV4ZWN1dGlvbiBzdG9wcyB0aGVyZS4KClRoaXMgaXMgYWJvdXQgdGhlIGJlc3Qgd2UgY2FuIGRv IGF0IHRoZSBtb21lbnQsCnVubGVzcyBsb2NhdGlvbiB2aWV3IGluZm9ybWF0aW9uIGFyZSBhZGRl ZCB0byB0aGUKYmxvY2sgcmFuZ2VzIGRlYnVnIGluZm8gc3RydWN0dXJlLCBhbmQgbG9jYXRpb24K dmlld3MgYXJlIGltcGxlbWVudGVkIGluIGdkYiBpbiBnZW5lcmFsLgoKZ2RiOgoyMDIwLTAzLTEz ICBCZXJuZCBFZGxpbmdlciAgPGJlcm5kLmVkbGluZ2VyQGhvdG1haWwuZGU+CgoJKiBidWlsZHN5 bS5jIChidWlsZHN5bV9jb21wdW5pdDo6cmVjb3JkX2lubGluZV9yYW5nZV9lbmQsCglwYXRjaF9p bmxpbmVfZW5kX3Bvcyk6IE5ldyBoZWxwZXIgZnVuY3Rpb25zLgoJKGJ1aWxkc3ltX2NvbXB1bml0 OjplbmRfc3ltdGFiX3dpdGhfYmxvY2t2ZWN0b3IpOiBQYXRjaCBsaW5lIHRhYmxlLgoJKGJ1aWxk c3ltX2NvbXB1bml0Ojp+YnVpbGRzeW1fY29tcHVuaXQpOiBDbGVhbnVwIG1faW5saW5lX2VuZF92 ZWN0b3IuCgkqIGJ1aWxkc3ltLmggKGJ1aWxkc3ltX2NvbXB1bml0OjpyZWNvcmRfaW5saW5lX3Jh bmdlX2VuZCk6IERlY2xhcmUuCgkoYnVpbGRzeW1fY29tcHVuaXQ6Om1faW5saW5lX2VuZF92ZWN0 b3IsCglidWlsZHN5bV9jb21wdW5pdDo6bV9pbmxpbmVfZW5kX3ZlY3Rvcl9sZW5ndGgsCglidWls ZHN5bV9jb21wdW5pdDo6bV9pbmxpbmVfZW5kX3ZlY3Rvcl9uaXRlbXMpOiBOZXcgZGF0YSBpdGVt cy4KCSogZHdhcmYyL3JlYWQuYyAoZHdhcmYyX3JuZ2xpc3RzX3Byb2Nlc3MsCglkd2FyZjJfcmFu Z2VzX3Byb2Nlc3MpOiBEb24ndCBpZ25vcmUgZW1wdHkgcmFuZ2VzIGhlcmUuCgkoZHdhcmYyX3Jh bmdlc19yZWFkKTogSWdub3JlIGVtcHR5IHJhbmdlcyBoZXJlLgoJKGR3YXJmMl9yZWNvcmRfYmxv Y2tfcmFuZ2VzKTogUGFzcyBlbmQgb2YgcmFuZ2UgUEMgdG8KCXJlY29yZF9pbmxpbmVfcmFuZ2Vf ZW5kIGZvciBpbmxpbmUgZnVuY3Rpb25zLgoKZ2RiL3Rlc3RzdWl0ZToKMjAyMC0wMy0xMyAgQmVy bmQgRWRsaW5nZXIgIDxiZXJuZC5lZGxpbmdlckBob3RtYWlsLmRlPgoKCSogZ2RiLmNwL3N0ZXAt YW5kLW5leHQtaW5saW5lLmV4cDogQWRqdXN0IHRlc3QuCi0tLQogZ2RiL2J1aWxkc3ltLmMgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgODYgKysrKysrKysrKysrKysrKysrKysrKysr KysrCiBnZGIvYnVpbGRzeW0uaCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxMSAr KysrCiBnZGIvZHdhcmYyL3JlYWQuYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMiAr KysrLS0tCiBnZGIvdGVzdHN1aXRlL2dkYi5jcC9zdGVwLWFuZC1uZXh0LWlubGluZS5leHAgfCAx NyAtLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTEwIGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2dkYi9idWlsZHN5bS5jIGIvZ2RiL2J1aWxkc3ltLmMKaW5kZXgg OTYwYTM2Yy4uNDZmOTg1YSAxMDA2NDQKLS0tIGEvZ2RiL2J1aWxkc3ltLmMKKysrIGIvZ2RiL2J1 aWxkc3ltLmMKQEAgLTExMyw2ICsxMTMsOCBAQCBzdHJ1Y3QgcGVuZGluZ19ibG9jawogICAgICAg bmV4dDEgPSBuZXh0LT5uZXh0OwogICAgICAgeGZyZWUgKCh2b2lkICopIG5leHQpOwogICAgIH0K KworICB4ZnJlZSAobV9pbmxpbmVfZW5kX3ZlY3Rvcik7CiB9CiAKIHN0cnVjdCBtYWNyb190YWJs ZSAqCkBAIC03MjksNiArNzMxLDg2IEBAIHN0cnVjdCBibG9ja3ZlY3RvciAqCiB9CiAKIAwKKy8q IFJlY29yZCBhIFBDIHdoZXJlIGEgaW5saW5lZCBzdWJyb3V0aW5lIGVuZHMuICAqLworCit2b2lk CitidWlsZHN5bV9jb21wdW5pdDo6cmVjb3JkX2lubGluZV9yYW5nZV9lbmQgKENPUkVfQUREUiBl bmQpCit7CisgIGlmIChtX2lubGluZV9lbmRfdmVjdG9yID09IG51bGxwdHIpCisgICAgeworICAg ICAgbV9pbmxpbmVfZW5kX3ZlY3Rvcl9sZW5ndGggPSBJTklUSUFMX0xJTkVfVkVDVE9SX0xFTkdU SDsKKyAgICAgIG1faW5saW5lX2VuZF92ZWN0b3IgPSAoQ09SRV9BRERSICopCisJeG1hbGxvYyAo c2l6ZW9mIChDT1JFX0FERFIpICogbV9pbmxpbmVfZW5kX3ZlY3Rvcl9sZW5ndGgpOworICAgICAg bV9pbmxpbmVfZW5kX3ZlY3Rvcl9uaXRlbXMgPSAwOworICAgIH0KKyAgZWxzZSBpZiAobV9pbmxp bmVfZW5kX3ZlY3Rvcl9uaXRlbXMgPT0gbV9pbmxpbmVfZW5kX3ZlY3Rvcl9sZW5ndGgpCisgICAg eworICAgICAgbV9pbmxpbmVfZW5kX3ZlY3Rvcl9sZW5ndGggKj0gMjsKKyAgICAgIG1faW5saW5l X2VuZF92ZWN0b3IgPSAoQ09SRV9BRERSICopCisJeHJlYWxsb2MgKChjaGFyICopIG1faW5saW5l X2VuZF92ZWN0b3IsCisJCSAgc2l6ZW9mIChDT1JFX0FERFIpICogbV9pbmxpbmVfZW5kX3ZlY3Rv cl9sZW5ndGgpOworICAgIH0KKworICBtX2lubGluZV9lbmRfdmVjdG9yW21faW5saW5lX2VuZF92 ZWN0b3Jfbml0ZW1zKytdID0gZW5kOworfQorCisMCisvKiBQYXRjaCB0aGUgaXNfc3RtdCBiaXRz IGF0IHRoZSBnaXZlbiBpbmxpbmUgZW5kIGFkZHJlc3MuCisgICBUaGUgbGluZSB0YWJsZSBoYXMg dG8gYmUgYWxyZWFkeSBzb3J0ZWQuICAqLworCitzdGF0aWMgdm9pZAorcGF0Y2hfaW5saW5lX2Vu ZF9wb3MgKHN0cnVjdCBsaW5ldGFibGUgKnRhYmxlLCBDT1JFX0FERFIgZW5kKQoreworICBpbnQg YSA9IDIsIGIgPSB0YWJsZS0+bml0ZW1zIC0gMTsKKyAgc3RydWN0IGxpbmV0YWJsZV9lbnRyeSAq aXRlbXMgPSB0YWJsZS0+aXRlbTsKKworICAvKiBXZSBuZWVkIGF0IGxlYXN0IHR3byBpdGVtcyB3 aXRoIHBjID0gZW5kIGluIHRoZSB0YWJsZS4KKyAgICAgVGhlIGxvd2VzdCB1c2FibGUgaXRlbXMg YXJlIGF0IHBvcyAwIGFuZCAxLCB0aGUgaGlnaGVzdAorICAgICB1c2FibGUgaXRlbXMgYXJlIGF0 IHBvcyBiIC0gMiBhbmQgYiAtIDEuICAqLworICBpZiAoYSA+IGIgfHwgZW5kIDwgaXRlbXNbMV0u cGMgfHwgZW5kID4gaXRlbXNbYiAtIDJdLnBjKQorICAgIHJldHVybjsKKworICAvKiBMb29rIGZv ciB0aGUgZmlyc3QgaXRlbSB3aXRoIHBjID4gZW5kIGluIHRoZSByYW5nZSBbYSxiXS4KKyAgICAg VGhlIHByZXZpb3VzIGVsZW1lbnQgaGFzIHBjID0gZW5kIG9yIHRoZXJlIGlzIG5vIG1hdGNoLgor ICAgICBXZSBzZXQgYSA9IDIsIHNpbmNlIHdlIG5lZWQgYXQgbGVhc3QgdHdvIGNvbnNlY3V0aXZl IGVsZW1lbnRzCisgICAgIHdpdGggcGMgPSBlbmQgdG8gZG8gYW55dGhpbmcgdXNlZnVsLgorICAg ICBXZSBzZXQgYiA9IG5pdGVtcyAtIDEsIHNpbmNlIHdlIGFyZSBub3QgaW50ZXJlc3RlZCBpbiB0 aGUgbGFzdAorICAgICBlbGVtZW50IHdoaWNoIHNob3VsZCBiZSBhbiBlbmQgb2Ygc2VxdWVuY2Ug bWFya2VyIHdpdGggbGluZSA9IDAKKyAgICAgYW5kIGlzX3N0bXQgPSAxLiAgKi8KKyAgd2hpbGUg KGEgPCBiKQorICAgIHsKKyAgICAgIGludCBjID0gKGEgKyBiKSAvIDI7CisKKyAgICAgIGlmIChl bmQgPCBpdGVtc1tjXS5wYykKKwliID0gYzsKKyAgICAgIGVsc2UKKwlhID0gYyArIDE7CisgICAg fQorCisgIGEtLTsKKyAgaWYgKGl0ZW1zW2FdLnBjICE9IGVuZCB8fCBpdGVtc1thXS5pc19zdG10 KQorICAgIHJldHVybjsKKworICAvKiBXaGVuIHRoZXJlIGlzIGEgc2VxdWVuY2Ugb2YgbGluZSBl bnRyaWVzIGF0IHRoZSBzYW1lIGFkZHJlc3MKKyAgICAgd2hlcmUgYW4gaW5saW5lIHJhbmdlIGVu ZHMsIGFuZCB0aGUgbGFzdCBpdGVtIGhhcyBpc19zdG10ID0gMCwKKyAgICAgd2UgZm9yY2UgYWxs IHByZXZpb3VzIGl0ZW1zIHRvIGhhdmUgaXNfc3RtdCA9IDAgYXMgd2VsbC4KKyAgICAgU2V0dGlu ZyBicmVha3BvaW50cyBhdCB0aG9zZSBhZGRyZXNzZXMgaXMgY3VycmVudGx5IG5vdAorICAgICBz dXBwb3J0ZWQsIHNpbmNlIGl0IGlzIHVuY2xlYXIgaWYgdGhlIHByZXZpb3VzIGFkZHJlc3NlcyBh cmUKKyAgICAgcGFydCBvZiB0aGUgc3Vicm91dGluZSBvciB0aGUgY2FsbGluZyBwcm9ncmFtLiAg Ki8KKyAgZG8KKyAgICB7CisgICAgICAvKiBXZSBzdG9wIGF0IHRoZSBmaXJzdCBsaW5lIGVudHJ5 IHdpdGggYSBkaWZmZXJlbnQgYWRkcmVzcywKKwkgb3Igd2hlbiB3ZSBzZWUgYW4gZW5kIG9mIHNl cXVlbmNlIG1hcmtlci4gICovCisgICAgICBhLS07CisgICAgICBpZiAoaXRlbXNbYV0ucGMgIT0g ZW5kIHx8IGl0ZW1zW2FdLmxpbmUgPT0gMCkKKwlicmVhazsKKworICAgICAgaXRlbXNbYV0uaXNf c3RtdCA9IDA7CisgICAgfQorICB3aGlsZSAoYSA+IDApOworfQorCisMCiAvKiBTdWJyb3V0aW5l IG9mIGVuZF9zeW10YWIgdG8gc2ltcGxpZnkgaXQuICBMb29rIGZvciBhIHN1YmZpbGUgdGhhdAog ICAgbWF0Y2hlcyB0aGUgbWFpbiBzb3VyY2UgZmlsZSdzIGJhc2VuYW1lLiAgSWYgdGhlcmUgaXMg b25seSBvbmUsIGFuZAogICAgaWYgdGhlIG1haW4gc291cmNlIGZpbGUgZG9lc24ndCBoYXZlIGFu eSBzeW1ib2wgb3IgbGluZSBudW1iZXIKQEAgLTk2Miw2ICsxMDQ0LDEwIEBAIHN0cnVjdCBjb21w dW5pdF9zeW10YWIgKgogCQkJICAgICAgc3ViZmlsZS0+bGluZV92ZWN0b3ItPml0ZW0KIAkJCSAg ICAgICsgc3ViZmlsZS0+bGluZV92ZWN0b3ItPm5pdGVtcywKIAkJCSAgICAgIGx0ZV9pc19sZXNz X3RoYW4pOworCisJICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX2lubGluZV9lbmRfdmVjdG9yX25p dGVtczsgaSsrKQorCSAgICAgcGF0Y2hfaW5saW5lX2VuZF9wb3MgKHN1YmZpbGUtPmxpbmVfdmVj dG9yLAorCQkJCSAgIG1faW5saW5lX2VuZF92ZWN0b3JbaV0pOwogCX0KIAogICAgICAgLyogQWxs b2NhdGUgYSBzeW1ib2wgdGFibGUgaWYgbmVjZXNzYXJ5LiAgKi8KZGlmZiAtLWdpdCBhL2dkYi9i dWlsZHN5bS5oIGIvZ2RiL2J1aWxkc3ltLmgKaW5kZXggYzc2OGE0Yy4uMjg0NTc4OSAxMDA2NDQK LS0tIGEvZ2RiL2J1aWxkc3ltLmgKKysrIGIvZ2RiL2J1aWxkc3ltLmgKQEAgLTE5MCw2ICsxOTAs OCBAQCBzdHJ1Y3QgYnVpbGRzeW1fY29tcHVuaXQKICAgdm9pZCByZWNvcmRfbGluZSAoc3RydWN0 IHN1YmZpbGUgKnN1YmZpbGUsIGludCBsaW5lLCBDT1JFX0FERFIgcGMsCiAJCSAgICBib29sIGlz X3N0bXQpOwogCisgIHZvaWQgcmVjb3JkX2lubGluZV9yYW5nZV9lbmQgKENPUkVfQUREUiBlbmQp OworCiAgIHN0cnVjdCBjb21wdW5pdF9zeW10YWIgKmdldF9jb21wdW5pdF9zeW10YWIgKCkKICAg ewogICAgIHJldHVybiBtX2NvbXB1bml0X3N5bXRhYjsKQEAgLTM5Nyw2ICszOTksMTUgQEAgc3Ry dWN0IGJ1aWxkc3ltX2NvbXB1bml0CiAKICAgLyogUGVuZGluZyBzeW1ib2xzIHRoYXQgYXJlIGxv Y2FsIHRvIHRoZSBsZXhpY2FsIGNvbnRleHQuICAqLwogICBzdHJ1Y3QgcGVuZGluZyAqbV9sb2Nh bF9zeW1ib2xzID0gbnVsbHB0cjsKKworICAvKiBQZW5kaW5nIGlubGluZSBlbmQgcmFuZ2UgYWRk cmVzc2VzLiAgKi8KKyAgQ09SRV9BRERSICogbV9pbmxpbmVfZW5kX3ZlY3RvciA9IG51bGxwdHI7 CisKKyAgLyogTnVtYmVyIG9mIGFsbG9jYXRlZCBpbmxpbmUgZW5kIHJhbmdlIGFkZHJlc3Nlcy4g ICovCisgIGludCBtX2lubGluZV9lbmRfdmVjdG9yX2xlbmd0aCA9IDA7CisKKyAgLyogTnVtYmVy IG9mIHBlbmRpbmcgaW5saW5lIGVuZCByYW5nZSBhZGRyZXNzZXMuICAqLworICBpbnQgbV9pbmxp bmVfZW5kX3ZlY3Rvcl9uaXRlbXMgPSAwOwogfTsKIAogDApkaWZmIC0tZ2l0IGEvZ2RiL2R3YXJm Mi9yZWFkLmMgYi9nZGIvZHdhcmYyL3JlYWQuYwppbmRleCAxNzA2Yjk2Li42YmUwMDhjIDEwMDY0 NAotLS0gYS9nZGIvZHdhcmYyL3JlYWQuYworKysgYi9nZGIvZHdhcmYyL3JlYWQuYwpAQCAtMTM2 MDksMTAgKzEzNjA5LDYgQEAgY2xhc3MgcHJvY2Vzc19kaWVfc2NvcGUKIAkgIHJldHVybiBmYWxz ZTsKIAl9CiAKLSAgICAgIC8qIEVtcHR5IHJhbmdlIGVudHJpZXMgaGF2ZSBubyBlZmZlY3QuICAq LwotICAgICAgaWYgKHJhbmdlX2JlZ2lubmluZyA9PSByYW5nZV9lbmQpCi0JY29udGludWU7Ci0K ICAgICAgIHJhbmdlX2JlZ2lubmluZyArPSBiYXNlOwogICAgICAgcmFuZ2VfZW5kICs9IGJhc2U7 CiAKQEAgLTEzNzIzLDEwICsxMzcxOSw2IEBAIGNsYXNzIHByb2Nlc3NfZGllX3Njb3BlCiAJICBy ZXR1cm4gMDsKIAl9CiAKLSAgICAgIC8qIEVtcHR5IHJhbmdlIGVudHJpZXMgaGF2ZSBubyBlZmZl Y3QuICAqLwotICAgICAgaWYgKHJhbmdlX2JlZ2lubmluZyA9PSByYW5nZV9lbmQpCi0JY29udGlu dWU7Ci0KICAgICAgIHJhbmdlX2JlZ2lubmluZyArPSBiYXNlOwogICAgICAgcmFuZ2VfZW5kICs9 IGJhc2U7CiAKQEAgLTEzNzY2LDYgKzEzNzU4LDEwIEBAIGNsYXNzIHByb2Nlc3NfZGllX3Njb3Bl CiAgIHJldHZhbCA9IGR3YXJmMl9yYW5nZXNfcHJvY2VzcyAob2Zmc2V0LCBjdSwKICAgICBbJl0g KENPUkVfQUREUiByYW5nZV9iZWdpbm5pbmcsIENPUkVfQUREUiByYW5nZV9lbmQpCiAgICAgewor ICAgICAgLyogRW1wdHkgcmFuZ2UgZW50cmllcyBoYXZlIG5vIGVmZmVjdC4gICovCisgICAgICBp ZiAocmFuZ2VfYmVnaW5uaW5nID09IHJhbmdlX2VuZCkKKwlyZXR1cm47CisKICAgICAgIGlmIChy YW5nZXNfcHN0ICE9IE5VTEwpCiAJewogCSAgQ09SRV9BRERSIGxvd3BjOwpAQCAtMTQwMDMsNiAr MTM5OTksNyBAQCBjbGFzcyBwcm9jZXNzX2RpZV9zY29wZQogICBzdHJ1Y3QgZ2RiYXJjaCAqZ2Ri YXJjaCA9IGdldF9vYmpmaWxlX2FyY2ggKG9iamZpbGUpOwogICBzdHJ1Y3QgYXR0cmlidXRlICph dHRyOwogICBzdHJ1Y3QgYXR0cmlidXRlICphdHRyX2hpZ2g7CisgIGJvb2wgaW5saW5lZF9zdWJy b3V0aW5lID0gKGRpZS0+dGFnID09IERXX1RBR19pbmxpbmVkX3N1YnJvdXRpbmUpOwogCiAgIGF0 dHJfaGlnaCA9IGR3YXJmMl9hdHRyIChkaWUsIERXX0FUX2hpZ2hfcGMsIGN1KTsKICAgaWYgKGF0 dHJfaGlnaCkKQEAgLTE0MDE4LDcgKzE0MDE1LDEwIEBAIGNsYXNzIHByb2Nlc3NfZGllX3Njb3Bl CiAKIAkgIGxvdyA9IGdkYmFyY2hfYWRqdXN0X2R3YXJmMl9hZGRyIChnZGJhcmNoLCBsb3cgKyBi YXNlYWRkcik7CiAJICBoaWdoID0gZ2RiYXJjaF9hZGp1c3RfZHdhcmYyX2FkZHIgKGdkYmFyY2gs IGhpZ2ggKyBiYXNlYWRkcik7Ci0JICBjdS0+Z2V0X2J1aWxkZXIgKCktPnJlY29yZF9ibG9ja19y YW5nZSAoYmxvY2ssIGxvdywgaGlnaCAtIDEpOworCSAgaWYgKGlubGluZWRfc3Vicm91dGluZSkK KwkgICAgY3UtPmdldF9idWlsZGVyICgpLT5yZWNvcmRfaW5saW5lX3JhbmdlX2VuZCAoaGlnaCk7 CisJICBpZiAobG93IDwgaGlnaCkKKwkgICAgY3UtPmdldF9idWlsZGVyICgpLT5yZWNvcmRfYmxv Y2tfcmFuZ2UgKGJsb2NrLCBsb3csIGhpZ2ggLSAxKTsKICAgICAgICAgfQogICAgIH0KIApAQCAt MTQwNDMsNiArMTQwNDMsMTAgQEAgY2xhc3MgcHJvY2Vzc19kaWVfc2NvcGUKIAkgIGVuZCArPSBi YXNlYWRkcjsKIAkgIHN0YXJ0ID0gZ2RiYXJjaF9hZGp1c3RfZHdhcmYyX2FkZHIgKGdkYmFyY2gs IHN0YXJ0KTsKIAkgIGVuZCA9IGdkYmFyY2hfYWRqdXN0X2R3YXJmMl9hZGRyIChnZGJhcmNoLCBl bmQpOworCSAgaWYgKGlubGluZWRfc3Vicm91dGluZSkKKwkgICAgY3UtPmdldF9idWlsZGVyICgp LT5yZWNvcmRfaW5saW5lX3JhbmdlX2VuZCAoZW5kKTsKKwkgIGlmIChzdGFydCA9PSBlbmQpCisJ ICAgIHJldHVybjsKIAkgIGN1LT5nZXRfYnVpbGRlciAoKS0+cmVjb3JkX2Jsb2NrX3JhbmdlIChi bG9jaywgc3RhcnQsIGVuZCAtIDEpOwogCSAgYmxvY2t2ZWMuZW1wbGFjZV9iYWNrIChzdGFydCwg ZW5kKTsKIAl9KTsKZGlmZiAtLWdpdCBhL2dkYi90ZXN0c3VpdGUvZ2RiLmNwL3N0ZXAtYW5kLW5l eHQtaW5saW5lLmV4cCBiL2dkYi90ZXN0c3VpdGUvZ2RiLmNwL3N0ZXAtYW5kLW5leHQtaW5saW5l LmV4cAppbmRleCBhY2VjNDhiLi44NGMwOTAxIDEwMDY0NAotLS0gYS9nZGIvdGVzdHN1aXRlL2dk Yi5jcC9zdGVwLWFuZC1uZXh0LWlubGluZS5leHAKKysrIGIvZ2RiL3Rlc3RzdWl0ZS9nZGIuY3Av c3RlcC1hbmQtbmV4dC1pbmxpbmUuZXhwCkBAIC00OCwzNyArNDgsMjAgQEAgcHJvYyBkb190ZXN0 IHsgdXNlX2hlYWRlciB9IHsKICAgICBnZGJfdGVzdCAic3RlcCIgIi4qIiAic3RlcCBpbnRvIGdl dF9hbGlhc19zZXQiCiAgICAgZ2RiX3Rlc3QgImJ0IiAiXFxzKlxcIzBcXHMrZ2V0X2FsaWFzX3Nl dFxbXlxyXF0qJHtzcmNmaWxlfTouKiIgXAogCSJub3QgaW4gaW5saW5lIDEiCi0gICAgIyBJdCdz IHBvc3NpYmxlIHRoYXQgdGhpcyBmaXJzdCBmYWlsdXJlICh3aGVuIG5vdCB1c2luZyBhIGhlYWRl cgotICAgICMgZmlsZSkgaXMgR0NDJ3MgZmF1bHQsIHRob3VnaCB0aGUgcmVtYWluaW5nIGZhaWx1 cmVzIHdvdWxkIGJlc3QKLSAgICAjIGJlIGZpeGVkIGJ5IGFkZGluZyBsb2NhdGlvbiB2aWV3cyBz dXBwb3J0ICh0aG91Z2ggaXQgY291bGQgYmUKLSAgICAjIHRoYXQgc29tZSBlYXNpZXIgaGV1cmlz dGljIGNvdWxkIGJlIGZpZ3VyZWQgb3V0KS4gIFN0aWxsLCBpdCBpcwotICAgICMgbm90IGNlcnRh aW4gdGhhdCB0aGUgZmlyc3QgZmFpbHVyZSB3b3VsZG4ndCBhbHNvIGJlIGZpeGVkIGJ5Ci0gICAg IyBoYXZpbmcgbG9jYXRpb24gdmlldyBzdXBwb3J0LCBzbyBmb3Igbm93IGl0IGlzIHRhZ2dlZCBh cyBzdWNoLgotICAgIGlmIHshJHVzZV9oZWFkZXJ9IHsgc2V0dXBfa2ZhaWwgIiotKi0qIiBzeW10 YWIvMjU1MDcgfQogICAgIGdkYl90ZXN0ICJuZXh0IiAiLipUUkVFX1RZUEUuKiIgIm5leHQgc3Rl cCAxIgogICAgIGdkYl90ZXN0ICJidCIgIlxccypcXCMwXFxzK2dldF9hbGlhc19zZXRcW15cclxd KiR7c3JjZmlsZX06LioiIFwKIAkibm90IGluIGlubGluZSAyIgogICAgIGdkYl90ZXN0ICJuZXh0 IiAiLipUUkVFX1RZUEUuKiIgIm5leHQgc3RlcCAyIgogICAgIGdkYl90ZXN0ICJidCIgIlxccypc XCMwXFxzK2dldF9hbGlhc19zZXRcW15cclxdKiR7c3JjZmlsZX06LioiIFwKIAkibm90IGluIGlu bGluZSAzIgotICAgIGlmIHshJHVzZV9oZWFkZXJ9IHsgc2V0dXBfa2ZhaWwgIiotKi0qIiBzeW10 YWIvMjU1MDcgfQogICAgIGdkYl90ZXN0ICJuZXh0IiAiLipUUkVFX1RZUEUuKiIgIm5leHQgc3Rl cCAzIgogICAgIGdkYl90ZXN0ICJidCIgIlxccypcXCMwXFxzK2dldF9hbGlhc19zZXRcW15cclxd KiR7c3JjZmlsZX06LioiIFwKIAkibm90IGluIGlubGluZSA0IgotICAgIGlmIHshJHVzZV9oZWFk ZXJ9IHsgc2V0dXBfa2ZhaWwgIiotKi0qIiBzeW10YWIvMjU1MDcgfQogICAgIGdkYl90ZXN0ICJu ZXh0IiAicmV0dXJuIDAuKiIgIm5leHQgc3RlcCA0IgogICAgIGdkYl90ZXN0ICJidCIgXAogCSJc XHMqXFwjMFxccysobWFpbnxnZXRfYWxpYXNfc2V0KVxbXlxyXF0qJHtzcmNmaWxlfTouKiIgXAog CSJub3QgaW4gaW5saW5lIDUiCiAKLSAgICBpZiB7ISR1c2VfaGVhZGVyfSB7Ci0JIyBXaXRoIHRo ZSBkZWJ1ZyBmcm9tIEdDQyAxMC54IChhbmQgZWFybGllcikgR0RCIGlzIGN1cnJlbnRseQotCSMg dW5hYmxlIHRvIHN1Y2Nlc3NmdWxseSBjb21wbGV0ZSB0aGUgZm9sbG93aW5nIHRlc3RzIHdoZW4g d2UKLQkjIGFyZSBub3QgdXNpbmcgYSBoZWFkZXIgZmlsZS4KLQlrZmFpbCBzeW10YWIvMjU1MDcg InN0ZXBwaW5nIHRlc3RzIgotCXJldHVybgotICAgIH0KLQogICAgIGNsZWFuX3Jlc3RhcnQgJHtl eGVjdXRhYmxlfQogCiAgICAgaWYgIVtydW50b19tYWluXSB7Ci0tIAoxLjkuMQoK --------------F2A5637B59143AB23B677A75--