From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id 2CBC7385703F for ; Wed, 26 Aug 2020 15:07:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2CBC7385703F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=csie.io Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=demonic@csie.io Received: by mail-lf1-x136.google.com with SMTP id k10so1175626lfm.5 for ; Wed, 26 Aug 2020 08:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=csie-io.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=0QOh+jY5oQQ0fdXFvQf2dadDh/hBR7NsiOPUkgLuoJ0=; b=atXNxFSRl3RZKufOoFjPUFMlbatHrYuRiBhyjB5s9Oseot+x6cc0RbSc5HkdHvbF6h Sd3HAHT0ugYsV1L3yaRXNalMmrSQCmEwToHPYVTmOB6Tm9BKTucl/WKy99U1JLbHAIvo krtJvywrR9j6vCvLqm7OlcnKQMa9evDrvnq9yrH+Ilac8KDln/oSO7DP0vAlj+EEbUHI gSPMpWokXRfb+PsLDUjvcVsxBFWrsXpdtdpaUeli66pWAmbzkFGqoCMAF8hzOX4VXTqe Byd/cSqXDb1EgGNzh0O/s7FE3Z1NHumLvZ9Q/1hJn1CacVM2cCKbBXEAxneucDwKwbhR a0dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=0QOh+jY5oQQ0fdXFvQf2dadDh/hBR7NsiOPUkgLuoJ0=; b=SkJkyP/zLf5xw4IqAkKythYHur8DpAH4f/XnGuRRUhIMqHDfoy9J7FbpuuMnw9yIYZ 0pefxYYuXRm/5xCSLUG8FaqkxcWflTxQdko58ELqnaCEa2uRkPrYsWs3lnCwbMp+A7pu TP18D8y/vwtSm5lh/PCgiIoDoSpq2HsUnqdNkaGdw38A6RJ2BLaUfe+9iH/lOnnUxRxL EgejIeLTo0fEhgeGmMtjol63PXn55YKdEojgyFE99JGdgUta5TFlCJX5vOjJmT38PjYo 39+D3aAvCrRMg5YEqxDcMTL4+LyDppRjrzRfN2nX7eXR81M5euVvzfepuDgTM4w9ZAbn GWsQ== X-Gm-Message-State: AOAM530bNKh+LC/UvKAv1SwkxtiKdmXfxTSlHeYQzDd4LNWhtTYBixyJ oBGV9f0WS1o/tnIFViqFiKlhZLNXAzyisZFSWaMwj6q3kvQ= X-Google-Smtp-Source: ABdhPJz254cm5kPD+A2P+H3hcUEy5U3+vmhnFdV/zC+5takQW0rCUp1FWF2znuX2u5e7uP1QB5LkOYCuSGpnsFsH1NI= X-Received: by 2002:ac2:4570:: with SMTP id k16mr7590450lfm.60.1598454443392; Wed, 26 Aug 2020 08:07:23 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?B?57SA6YeN56aV?= Date: Wed, 26 Aug 2020 23:06:47 +0800 Message-ID: Subject: [PATCH] breakpoint.c: Fix advance/until and multiple locations To: gdb-patches@sourceware.org Content-Type: multipart/mixed; boundary="00000000000049fba005adc92da3" X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Wed, 26 Aug 2020 15:07:27 -0000 --00000000000049fba005adc92da3 Content-Type: text/plain; charset="UTF-8" Fix bug 26524 , iterate the sals variable to insert a breakpoint for each -- Best regards, Chung-Yi Chi --00000000000049fba005adc92da3 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-gdb-gdb-Fix-advance-until-and-multiple-locations.patch" Content-Disposition: attachment; filename="0001-gdb-gdb-Fix-advance-until-and-multiple-locations.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kebic0tt0 RnJvbSAzN2ZmNTIxYzZjZDhhYzZmYmFjNjQyZDFkYWVjZTU3ZjFlMWNlNDYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaHVuZ3lpIENoaSA8ZGVtb25pY0Bjc2llLmlvPgpEYXRlOiBX ZWQsIDI2IEF1ZyAyMDIwIDIyOjA4OjQzICswODAwClN1YmplY3Q6IFtQQVRDSF0gZ2RiL2dkYjog Rml4IGFkdmFuY2UvdW50aWwgYW5kIG11bHRpcGxlIGxvY2F0aW9ucwoKQXNzdW1lIDxsb2NhdGlv bj4gaXMgYWJsZSB0byBleHBhbmQgdG8gbXVsdGlwbGUgb25lcyBhbmQgaW5zZXJ0IGEKYnJlYWtw b2ludCBmb3IgZWFjaCBvbmUuCi0tLQogZ2RiL0NoYW5nZUxvZyAgICB8ICAgNSArKysKIGdkYi9i cmVha3BvaW50LmMgfCAxMDggKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwgNTUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZ2RiL0NoYW5nZUxvZyBiL2dkYi9DaGFuZ2VMb2cKaW5kZXggY2Vm ZjgwOGQ4Mi4uODY4MjdjYTdkNyAxMDA2NDQKLS0tIGEvZ2RiL0NoYW5nZUxvZworKysgYi9nZGIv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsOCBAQAorMjAyMC0wOC0yNiAgQ2h1bmd5aSBDaGkgICA8aWFu Y2hpQGFuZGVzdGVjaC5jb20+ICAKKyAgCisgICogYnJlYWtwb2ludC5jICh1bnRpbF9icmVha19j b21tYW5kKTogQXNzdW1lIDxsb2NhdGlvbj4gaXMgYWJsZSB0bworICBleHBhbmQgdG8gbXVsdGlw bGUgb25lcyBhbmQgaW5zZXJ0IGEgYnJlYWtwb2ludCBmb3IgZWFjaCBvbmUuCisKIDIwMjAtMDgt MjUgIFNoYWhhYiBWYWhlZGkgIDxzaGFoYWJAc3lub3BzeXMuY29tPgogCiAJKiBNQUlOVEFJTkVS UzogQWRkIEFSQyB0YXJnZXQgYW5kIG1haW50YWluZXIuCmRpZmYgLS1naXQgYS9nZGIvYnJlYWtw b2ludC5jIGIvZ2RiL2JyZWFrcG9pbnQuYwppbmRleCBlZjhlNTRmNjM0Li42NDViZDExYjMwIDEw MDY0NAotLS0gYS9nZGIvYnJlYWtwb2ludC5jCisrKyBiL2dkYi9icmVha3BvaW50LmMKQEAgLTEx MDIzLDc0ICsxMTAyMyw3MiBAQCB1bnRpbF9icmVha19jb21tYW5kIChjb25zdCBjaGFyICphcmcs IGludCBmcm9tX3R0eSwgaW50IGFueXdoZXJlKQogICAgICAgIDogZGVjb2RlX2xpbmVfMSAobG9j YXRpb24uZ2V0ICgpLCBERUNPREVfTElORV9GVU5GSVJTVExJTkUsCiAJCQlOVUxMLCBOVUxMLCAw KSk7CiAKLSAgaWYgKHNhbHMuc2l6ZSAoKSAhPSAxKQotICAgIGVycm9yIChfKCJDb3VsZG4ndCBn ZXQgaW5mb3JtYXRpb24gb24gc3BlY2lmaWVkIGxpbmUuIikpOwotCi0gIHN5bXRhYl9hbmRfbGlu ZSAmc2FsID0gc2Fsc1swXTsKLQogICBpZiAoKmFyZykKICAgICBlcnJvciAoXygiSnVuayBhdCBl bmQgb2YgYXJndW1lbnRzLiIpKTsKIAotICByZXNvbHZlX3NhbF9wYyAoJnNhbCk7Ci0KLSAgdHAg PSBpbmZlcmlvcl90aHJlYWQgKCk7Ci0gIHRocmVhZCA9IHRwLT5nbG9iYWxfbnVtOwotCi0gIC8q IE5vdGUgbGluZXNwZWMgaGFuZGxpbmcgYWJvdmUgaW52YWxpZGF0ZXMgdGhlIGZyYW1lIGNoYWlu LgotICAgICBJbnN0YWxsaW5nIGEgYnJlYWtwb2ludCBhbHNvIGludmFsaWRhdGVzIHRoZSBmcmFt ZSBjaGFpbiAoYXMgaXQKLSAgICAgbWF5IG5lZWQgdG8gc3dpdGNoIHRocmVhZHMpLCBzbyBkbyBh bnkgZnJhbWUgaGFuZGxpbmcgYmVmb3JlCi0gICAgIHRoYXQuICAqLwotCi0gIGZyYW1lID0gZ2V0 X3NlbGVjdGVkX2ZyYW1lIChOVUxMKTsKLSAgZnJhbWVfZ2RiYXJjaCA9IGdldF9mcmFtZV9hcmNo IChmcmFtZSk7Ci0gIHN0YWNrX2ZyYW1lX2lkID0gZ2V0X3N0YWNrX2ZyYW1lX2lkIChmcmFtZSk7 Ci0gIGNhbGxlcl9mcmFtZV9pZCA9IGZyYW1lX3Vud2luZF9jYWxsZXJfaWQgKGZyYW1lKTsKKyAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBzYWxzLnNpemUgKCk7IGkrKykKKyAgICB7CisgICAgICBz eW10YWJfYW5kX2xpbmUgJnNhbCA9IHNhbHNbaV07CisgICAgICByZXNvbHZlX3NhbF9wYyAoJnNh bCk7CisgICAgICB0cCA9IGluZmVyaW9yX3RocmVhZCAoKTsKKyAgICAgIHRocmVhZCA9IHRwLT5n bG9iYWxfbnVtOwogCi0gIC8qIEtlZXAgd2l0aGluIHRoZSBjdXJyZW50IGZyYW1lLCBvciBpbiBm cmFtZXMgY2FsbGVkIGJ5IHRoZSBjdXJyZW50Ci0gICAgIG9uZS4gICovCisgICAgICAvKiBOb3Rl IGxpbmVzcGVjIGhhbmRsaW5nIGFib3ZlIGludmFsaWRhdGVzIHRoZSBmcmFtZSBjaGFpbi4KKyAg ICAgICAgSW5zdGFsbGluZyBhIGJyZWFrcG9pbnQgYWxzbyBpbnZhbGlkYXRlcyB0aGUgZnJhbWUg Y2hhaW4gKGFzIGl0CisgICAgICAgIG1heSBuZWVkIHRvIHN3aXRjaCB0aHJlYWRzKSwgc28gZG8g YW55IGZyYW1lIGhhbmRsaW5nIGJlZm9yZQorICAgICAgICB0aGF0LiAgKi8KIAotICBicmVha3Bv aW50X3VwIGNhbGxlcl9icmVha3BvaW50OworICAgICAgZnJhbWUgPSBnZXRfc2VsZWN0ZWRfZnJh bWUgKE5VTEwpOworICAgICAgZnJhbWVfZ2RiYXJjaCA9IGdldF9mcmFtZV9hcmNoIChmcmFtZSk7 CisgICAgICBzdGFja19mcmFtZV9pZCA9IGdldF9zdGFja19mcmFtZV9pZCAoZnJhbWUpOworICAg ICAgY2FsbGVyX2ZyYW1lX2lkID0gZnJhbWVfdW53aW5kX2NhbGxlcl9pZCAoZnJhbWUpOwogCi0g IGdkYjo6b3B0aW9uYWw8ZGVsZXRlX2xvbmdqbXBfYnJlYWtwb2ludF9jbGVhbnVwPiBsal9kZWxl dGVyOworICAgICAgLyogS2VlcCB3aXRoaW4gdGhlIGN1cnJlbnQgZnJhbWUsIG9yIGluIGZyYW1l cyBjYWxsZWQgYnkgdGhlIGN1cnJlbnQKKyAgICAgICAgb25lLiAgKi8KIAotICBpZiAoZnJhbWVf aWRfcCAoY2FsbGVyX2ZyYW1lX2lkKSkKLSAgICB7Ci0gICAgICBzdHJ1Y3Qgc3ltdGFiX2FuZF9s aW5lIHNhbDI7Ci0gICAgICBzdHJ1Y3QgZ2RiYXJjaCAqY2FsbGVyX2dkYmFyY2g7CisgICAgICBi cmVha3BvaW50X3VwIGNhbGxlcl9icmVha3BvaW50OwogCi0gICAgICBzYWwyID0gZmluZF9wY19s aW5lIChmcmFtZV91bndpbmRfY2FsbGVyX3BjIChmcmFtZSksIDApOwotICAgICAgc2FsMi5wYyA9 IGZyYW1lX3Vud2luZF9jYWxsZXJfcGMgKGZyYW1lKTsKLSAgICAgIGNhbGxlcl9nZGJhcmNoID0g ZnJhbWVfdW53aW5kX2NhbGxlcl9hcmNoIChmcmFtZSk7Ci0gICAgICBjYWxsZXJfYnJlYWtwb2lu dCA9IHNldF9tb21lbnRhcnlfYnJlYWtwb2ludCAoY2FsbGVyX2dkYmFyY2gsCi0JCQkJCQkgICAg c2FsMiwKLQkJCQkJCSAgICBjYWxsZXJfZnJhbWVfaWQsCi0JCQkJCQkgICAgYnBfdW50aWwpOwor ICAgICAgZ2RiOjpvcHRpb25hbDxkZWxldGVfbG9uZ2ptcF9icmVha3BvaW50X2NsZWFudXA+IGxq X2RlbGV0ZXI7CiAKLSAgICAgIHNldF9sb25nam1wX2JyZWFrcG9pbnQgKHRwLCBjYWxsZXJfZnJh bWVfaWQpOwotICAgICAgbGpfZGVsZXRlci5lbXBsYWNlICh0aHJlYWQpOwotICAgIH0KKyAgICAg IGlmIChmcmFtZV9pZF9wIChjYWxsZXJfZnJhbWVfaWQpKQorICAgICAgICB7CisgICAgICAgICAg c3RydWN0IHN5bXRhYl9hbmRfbGluZSBzYWwyOworICAgICAgICAgIHN0cnVjdCBnZGJhcmNoICpj YWxsZXJfZ2RiYXJjaDsKKworICAgICAgICAgIHNhbDIgPSBmaW5kX3BjX2xpbmUgKGZyYW1lX3Vu d2luZF9jYWxsZXJfcGMgKGZyYW1lKSwgMCk7CisgICAgICAgICAgc2FsMi5wYyA9IGZyYW1lX3Vu d2luZF9jYWxsZXJfcGMgKGZyYW1lKTsKKyAgICAgICAgICBjYWxsZXJfZ2RiYXJjaCA9IGZyYW1l X3Vud2luZF9jYWxsZXJfYXJjaCAoZnJhbWUpOworICAgICAgICAgIGNhbGxlcl9icmVha3BvaW50 ID0gc2V0X21vbWVudGFyeV9icmVha3BvaW50IChjYWxsZXJfZ2RiYXJjaCwKKyAgICAgICAgICAg ICAgICAgICAgc2FsMiwKKyAgICAgICAgICAgICAgICAgICAgY2FsbGVyX2ZyYW1lX2lkLAorICAg ICAgICAgICAgICAgICAgICBicF91bnRpbCk7CisKKyAgICAgICAgICBzZXRfbG9uZ2ptcF9icmVh a3BvaW50ICh0cCwgY2FsbGVyX2ZyYW1lX2lkKTsKKyAgICAgICAgICBsal9kZWxldGVyLmVtcGxh Y2UgKHRocmVhZCk7CisgICAgICAgIH0KIAotICAvKiBzZXRfbW9tZW50YXJ5X2JyZWFrcG9pbnQg Y291bGQgaW52YWxpZGF0ZSBGUkFNRS4gICovCi0gIGZyYW1lID0gTlVMTDsKKyAgICAgIC8qIHNl dF9tb21lbnRhcnlfYnJlYWtwb2ludCBjb3VsZCBpbnZhbGlkYXRlIEZSQU1FLiAgKi8KKyAgICAg IGZyYW1lID0gTlVMTDsKIAotICBicmVha3BvaW50X3VwIGxvY2F0aW9uX2JyZWFrcG9pbnQ7Ci0g IGlmIChhbnl3aGVyZSkKLSAgICAvKiBJZiB0aGUgdXNlciB0b2xkIHVzIHRvIGNvbnRpbnVlIHVu dGlsIGEgc3BlY2lmaWVkIGxvY2F0aW9uLAotICAgICAgIHdlIGRvbid0IHNwZWNpZnkgYSBmcmFt ZSBhdCB3aGljaCB3ZSBuZWVkIHRvIHN0b3AuICAqLwotICAgIGxvY2F0aW9uX2JyZWFrcG9pbnQg PSBzZXRfbW9tZW50YXJ5X2JyZWFrcG9pbnQgKGZyYW1lX2dkYmFyY2gsIHNhbCwKLQkJCQkJCSAg ICBudWxsX2ZyYW1lX2lkLCBicF91bnRpbCk7Ci0gIGVsc2UKLSAgICAvKiBPdGhlcndpc2UsIHNw ZWNpZnkgdGhlIHNlbGVjdGVkIGZyYW1lLCBiZWNhdXNlIHdlIHdhbnQgdG8gc3RvcAotICAgICAg IG9ubHkgYXQgdGhlIHZlcnkgc2FtZSBmcmFtZS4gICovCi0gICAgbG9jYXRpb25fYnJlYWtwb2lu dCA9IHNldF9tb21lbnRhcnlfYnJlYWtwb2ludCAoZnJhbWVfZ2RiYXJjaCwgc2FsLAotCQkJCQkJ ICAgIHN0YWNrX2ZyYW1lX2lkLCBicF91bnRpbCk7CisgICAgICBicmVha3BvaW50X3VwIGxvY2F0 aW9uX2JyZWFrcG9pbnQ7CisgICAgICBpZiAoYW55d2hlcmUpCisgICAgICAgIC8qIElmIHRoZSB1 c2VyIHRvbGQgdXMgdG8gY29udGludWUgdW50aWwgYSBzcGVjaWZpZWQgbG9jYXRpb24sCisgICAg ICAgICAgd2UgZG9uJ3Qgc3BlY2lmeSBhIGZyYW1lIGF0IHdoaWNoIHdlIG5lZWQgdG8gc3RvcC4g ICovCisgICAgICAgIGxvY2F0aW9uX2JyZWFrcG9pbnQgPSBzZXRfbW9tZW50YXJ5X2JyZWFrcG9p bnQgKGZyYW1lX2dkYmFyY2gsIHNhbCwKKyAgICAgICAgICAgICAgICAgICAgbnVsbF9mcmFtZV9p ZCwgYnBfdW50aWwpOworICAgICAgZWxzZQorICAgICAgICAvKiBPdGhlcndpc2UsIHNwZWNpZnkg dGhlIHNlbGVjdGVkIGZyYW1lLCBiZWNhdXNlIHdlIHdhbnQgdG8gc3RvcAorICAgICAgICAgIG9u bHkgYXQgdGhlIHZlcnkgc2FtZSBmcmFtZS4gICovCisgICAgICAgIGxvY2F0aW9uX2JyZWFrcG9p bnQgPSBzZXRfbW9tZW50YXJ5X2JyZWFrcG9pbnQgKGZyYW1lX2dkYmFyY2gsIHNhbCwKKyAgICAg ICAgICAgICAgICAgICAgc3RhY2tfZnJhbWVfaWQsIGJwX3VudGlsKTsKIAotICB0cC0+dGhyZWFk X2ZzbSA9IG5ldyB1bnRpbF9icmVha19mc20gKGNvbW1hbmRfaW50ZXJwICgpLCB0cC0+Z2xvYmFs X251bSwKLQkJCQkJc3RkOjptb3ZlIChsb2NhdGlvbl9icmVha3BvaW50KSwKLQkJCQkJc3RkOjpt b3ZlIChjYWxsZXJfYnJlYWtwb2ludCkpOworICAgICAgdHAtPnRocmVhZF9mc20gPSBuZXcgdW50 aWxfYnJlYWtfZnNtIChjb21tYW5kX2ludGVycCAoKSwgdHAtPmdsb2JhbF9udW0sCisgICAgICAg ICAgICAgIHN0ZDo6bW92ZSAobG9jYXRpb25fYnJlYWtwb2ludCksCisgICAgICAgICAgICAgIHN0 ZDo6bW92ZSAoY2FsbGVyX2JyZWFrcG9pbnQpKTsKIAotICBpZiAobGpfZGVsZXRlcikKLSAgICBs al9kZWxldGVyLT5yZWxlYXNlICgpOworICAgICAgaWYgKGxqX2RlbGV0ZXIpCisgICAgICAgIGxq X2RlbGV0ZXItPnJlbGVhc2UgKCk7CisgICAgfQogCiAgIHByb2NlZWQgKC0xLCBHREJfU0lHTkFM X0RFRkFVTFQpOwogfQotLSAKMi4xNy4xCgo= --00000000000049fba005adc92da3--