190016 2018-09-26 16:15:40 -0700 Assert that performJITMemcpy() is always called with instruction size aligned addresses on ARM64. 2018-09-26 17:15:00 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1463805 0 mark.lam 2018-09-26 16:15:40 -0700 <rdar://problem/44802875> 1463807 1 350921 mark.lam 2018-09-26 16:23:58 -0700 Created attachment 350921 proposed patch. 1463811 2 350921 mark.lam 2018-09-26 16:26:19 -0700 Comment on attachment 350921 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=350921&action=review > Source/JavaScriptCore/ChangeLog:3 > + Assert that performJITMemcpy() is always called with instruction size aligned addresses. Will update this title to say "... on ARM64" before landing. 1463826 3 350921 saam 2018-09-26 16:48:35 -0700 Comment on attachment 350921 proposed patch. r=me 1463836 4 mark.lam 2018-09-26 17:15:00 -0700 Thanks for the review. Landed in r236534: <http://trac.webkit.org/r236534>. 350921 2018-09-26 16:23:58 -0700 2018-09-26 16:48:35 -0700 proposed patch. bug-190016.patch text/plain 10701 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM2NTMwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE4LTA5LTI2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB c3NlcnQgdGhhdCBwZXJmb3JtSklUTWVtY3B5KCkgaXMgYWx3YXlzIGNhbGxlZCB3aXRoIGluc3Ry dWN0aW9uIHNpemUgYWxpZ25lZCBhZGRyZXNzZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAwMTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ0 ODAyODc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFsc28gYXNzZXJ0IGluIHBlcmZvcm1KSVRNZW1jcHkoKSB0aGF0IHRoZSBlbnRpcmUgYnVmZmVy IHRvIGJlIGNvcGllZCB3aWxsIGZpdCBpbgorICAgICAgICBKSVQgbWVtb3J5LgorCisgICAgICAg ICogYXNzZW1ibGVyL0FSTTY0QXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1i bGVyOjpmaWxsTm9wcyk6CisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjpyZXBsYWNlV2l0 aFZNSGFsdCk6CisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjpyZXBsYWNlV2l0aEp1bXAp OgorICAgICAgICAoSlNDOjpBUk02NEFzc2VtYmxlcjo6cmVwbGFjZVdpdGhMb2FkKToKKyAgICAg ICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6OnJlcGxhY2VXaXRoQWRkcmVzc0NvbXB1dGF0aW9uKToK KyAgICAgICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6OnNldFBvaW50ZXIpOgorICAgICAgICAoSlND OjpBUk02NEFzc2VtYmxlcjo6cmVwYXRjaEludDMyKToKKyAgICAgICAgKEpTQzo6QVJNNjRBc3Nl bWJsZXI6OnJlcGF0Y2hDb21wYWN0KToKKyAgICAgICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6Omxp bmtKdW1wT3JDYWxsKToKKyAgICAgICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6OmxpbmtDb21wYXJl QW5kQnJhbmNoKToKKyAgICAgICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6OmxpbmtDb25kaXRpb25h bEJyYW5jaCk6CisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjpsaW5rVGVzdEFuZEJyYW5j aCk6CisgICAgICAgICogYXNzZW1ibGVyL0xpbmtCdWZmZXIuY3BwOgorICAgICAgICAoSlNDOjpM aW5rQnVmZmVyOjpjb3B5Q29tcGFjdEFuZExpbmtDb2RlKToKKyAgICAgICAgKEpTQzo6TGlua0J1 ZmZlcjo6bGlua0NvZGUpOgorICAgICAgICAqIGppdC9FeGVjdXRhYmxlQWxsb2NhdG9yLmg6Cisg ICAgICAgIChKU0M6OnBlcmZvcm1KSVRNZW1jcHkpOgorCiAyMDE4LTA5LTI1ICBLZWl0aCBNaWxs ZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgU3ltYm9sIEFQSSB0 byBTUEkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNNjRBc3NlbWJs ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTTY0 QXNzZW1ibGVyLmgJKHJldmlzaW9uIDIzNjUyMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvQVJNNjRBc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjY2LDYgKzI2Niw4 IEBAIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBpc1pyKFJlZ2lzdGVySUQgcmUKIAogY2xhc3MgQVJN NjRBc3NlbWJsZXIgewogcHVibGljOgorICAgIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IGluc3Ry dWN0aW9uU2l6ZSA9IHNpemVvZih1bnNpZ25lZCk7CisKICAgICB0eXBlZGVmIEFSTTY0UmVnaXN0 ZXJzOjpSZWdpc3RlcklEIFJlZ2lzdGVySUQ7CiAgICAgdHlwZWRlZiBBUk02NFJlZ2lzdGVyczo6 U1BSZWdpc3RlcklEIFNQUmVnaXN0ZXJJRDsKICAgICB0eXBlZGVmIEFSTTY0UmVnaXN0ZXJzOjpG UFJlZ2lzdGVySUQgRlBSZWdpc3RlcklEOwpAQCAtMTU2Miw5ICsxNTY0LDEwIEBAIHB1YmxpYzoK ICAgICAgICAgc2l6ZV90IG4gPSBzaXplIC8gc2l6ZW9mKGludDMyX3QpOwogICAgICAgICBmb3Ig KGludDMyX3QqIHB0ciA9IHN0YXRpY19jYXN0PGludDMyX3QqPihiYXNlKTsgbi0tOykgewogICAg ICAgICAgICAgaW50IGluc24gPSBub3BQc2V1ZG8oKTsKLSAgICAgICAgICAgIGlmIChpc0NvcHlp bmdUb0V4ZWN1dGFibGVNZW1vcnkpCisgICAgICAgICAgICBpZiAoaXNDb3B5aW5nVG9FeGVjdXRh YmxlTWVtb3J5KSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVs dGlwbGVPZjxpbnN0cnVjdGlvblNpemU+KHB0cikgPT0gcHRyKTsKICAgICAgICAgICAgICAgICBw ZXJmb3JtSklUTWVtY3B5KHB0cisrLCAmaW5zbiwgc2l6ZW9mKGludCkpOwotICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgbWVtY3B5KHB0cisrLCAm aW5zbiwgc2l6ZW9mKGludCkpOwogICAgICAgICB9CiAgICAgfQpAQCAtMjYzNiw2ICsyNjM5LDcg QEAgcHVibGljOgogICAgIHsKICAgICAgICAgLy8gVGhpcyBzaG91bGQgdHJ5IHRvIHdyaXRlIHRv IG51bGwgd2hpY2ggc2hvdWxkIGFsd2F5cyBTZWdmYXVsdC4KICAgICAgICAgaW50IGluc24gPSBk YXRhQ2FjaGVaZXJvVmlydHVhbEFkZHJlc3MoQVJNNjRSZWdpc3RlcnM6OnpyKTsKKyAgICAgICAg UkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxpbnN0cnVjdGlvblNpemU+KHdoZXJl KSA9PSB3aGVyZSk7CiAgICAgICAgIHBlcmZvcm1KSVRNZW1jcHkod2hlcmUsICZpbnNuLCBzaXpl b2YoaW50KSk7CiAgICAgICAgIGNhY2hlRmx1c2god2hlcmUsIHNpemVvZihpbnQpKTsKICAgICB9 CkBAIC0yNjQ1LDYgKzI2NDksNyBAQCBwdWJsaWM6CiAgICAgICAgIGludHB0cl90IG9mZnNldCA9 IChyZWludGVycHJldF9jYXN0PGludHB0cl90Pih0bykgLSByZWludGVycHJldF9jYXN0PGludHB0 cl90Pih3aGVyZSkpID4+IDI7CiAgICAgICAgIEFTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KG9mZnNl dCkgPT0gb2Zmc2V0KTsKICAgICAgICAgaW50IGluc24gPSB1bmNvbmRpdGlvbmFsQnJhbmNoSW1t ZWRpYXRlKGZhbHNlLCBzdGF0aWNfY2FzdDxpbnQ+KG9mZnNldCkpOworICAgICAgICBSRUxFQVNF X0FTU0VSVChyb3VuZFVwVG9NdWx0aXBsZU9mPGluc3RydWN0aW9uU2l6ZT4od2hlcmUpID09IHdo ZXJlKTsKICAgICAgICAgcGVyZm9ybUpJVE1lbWNweSh3aGVyZSwgJmluc24sIHNpemVvZihpbnQp KTsKICAgICAgICAgY2FjaGVGbHVzaCh3aGVyZSwgc2l6ZW9mKGludCkpOwogICAgIH0KQEAgLTI2 NzUsNiArMjY4MCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIEFTU0VSVCghc2hpZnQpOwogICAg ICAgICAgICAgQVNTRVJUKCEoaW1tMTIgJiB+MHhmZjgpKTsKICAgICAgICAgICAgIGludCBpbnNu ID0gbG9hZFN0b3JlUmVnaXN0ZXJVbnNpZ25lZEltbWVkaWF0ZShNZW1PcFNpemVfNjQsIGZhbHNl LCBNZW1PcF9MT0FELCBlbmNvZGVQb3NpdGl2ZUltbWVkaWF0ZTw2ND4oaW1tMTIpLCBybiwgcmQp OworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxpbnN0cnVj dGlvblNpemU+KHdoZXJlKSA9PSB3aGVyZSk7CiAgICAgICAgICAgICBwZXJmb3JtSklUTWVtY3B5 KHdoZXJlLCAmaW5zbiwgc2l6ZW9mKGludCkpOwogICAgICAgICAgICAgY2FjaGVGbHVzaCh3aGVy ZSwgc2l6ZW9mKGludCkpOwogICAgICAgICB9CkBAIC0yNzA5LDYgKzI3MTUsNyBAQCBwdWJsaWM6 CiAgICAgICAgICAgICBBU1NFUlQob3BjID09IE1lbU9wX0xPQUQpOwogICAgICAgICAgICAgQVNT RVJUKCEoaW1tMTIgJiB+MHgxZmYpKTsKICAgICAgICAgICAgIGludCBpbnNuID0gYWRkU3VidHJh Y3RJbW1lZGlhdGUoRGF0YXNpemVfNjQsIEFkZE9wX0FERCwgRG9udFNldEZsYWdzLCAwLCBpbW0x MiAqIHNpemVvZih2b2lkKiksIHJuLCBydCk7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChy b3VuZFVwVG9NdWx0aXBsZU9mPGluc3RydWN0aW9uU2l6ZT4od2hlcmUpID09IHdoZXJlKTsKICAg ICAgICAgICAgIHBlcmZvcm1KSVRNZW1jcHkod2hlcmUsICZpbnNuLCBzaXplb2YoaW50KSk7CiAg ICAgICAgICAgICBjYWNoZUZsdXNoKHdoZXJlLCBzaXplb2YoaW50KSk7CiAgICAgICAgIH0KQEAg LTI3NDMsNiArMjc1MCw3IEBAIHB1YmxpYzoKICAgICAgICAgYnVmZmVyWzBdID0gbW92ZVdpZGVJ bWVkaWF0ZShEYXRhc2l6ZV82NCwgTW92ZVdpZGVPcF9aLCAwLCBnZXRIYWxmd29yZCh2YWx1ZSwg MCksIHJkKTsKICAgICAgICAgYnVmZmVyWzFdID0gbW92ZVdpZGVJbWVkaWF0ZShEYXRhc2l6ZV82 NCwgTW92ZVdpZGVPcF9LLCAxLCBnZXRIYWxmd29yZCh2YWx1ZSwgMSksIHJkKTsKICAgICAgICAg YnVmZmVyWzJdID0gbW92ZVdpZGVJbWVkaWF0ZShEYXRhc2l6ZV82NCwgTW92ZVdpZGVPcF9LLCAy LCBnZXRIYWxmd29yZCh2YWx1ZSwgMiksIHJkKTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91 bmRVcFRvTXVsdGlwbGVPZjxpbnN0cnVjdGlvblNpemU+KGFkZHJlc3MpID09IGFkZHJlc3MpOwog ICAgICAgICBwZXJmb3JtSklUTWVtY3B5KGFkZHJlc3MsIGJ1ZmZlciwgc2l6ZW9mKGludCkgKiAz KTsKIAogICAgICAgICBpZiAoZmx1c2gpCkBAIC0yNzcwLDYgKzI3NzgsNyBAQCBwdWJsaWM6CiAg ICAgICAgICAgICBidWZmZXJbMF0gPSBtb3ZlV2lkZUltZWRpYXRlKERhdGFzaXplXzMyLCBNb3Zl V2lkZU9wX04sIDAsIH5nZXRIYWxmd29yZCh2YWx1ZSwgMCksIHJkKTsKICAgICAgICAgICAgIGJ1 ZmZlclsxXSA9IG1vdmVXaWRlSW1lZGlhdGUoRGF0YXNpemVfMzIsIE1vdmVXaWRlT3BfSywgMSwg Z2V0SGFsZndvcmQodmFsdWUsIDEpLCByZCk7CiAgICAgICAgIH0KKyAgICAgICAgUkVMRUFTRV9B U1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxpbnN0cnVjdGlvblNpemU+KHdoZXJlKSA9PSB3aGVy ZSk7CiAgICAgICAgIHBlcmZvcm1KSVRNZW1jcHkod2hlcmUsICZidWZmZXIsIHNpemVvZihpbnQp ICogMik7CiAKICAgICAgICAgY2FjaGVGbHVzaCh3aGVyZSwgc2l6ZW9mKGludCkgKiAyKTsKQEAg LTI4NDUsNiArMjg1NCw3IEBAIHB1YmxpYzoKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW1t MTIgPSBlbmNvZGVQb3NpdGl2ZUltbWVkaWF0ZTw2ND4odmFsdWUpOwogICAgICAgICBpbnQgaW5z biA9IGxvYWRTdG9yZVJlZ2lzdGVyVW5zaWduZWRJbW1lZGlhdGUoc2l6ZSwgViwgb3BjLCBpbW0x Miwgcm4sIHJ0KTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxp bnN0cnVjdGlvblNpemU+KHdoZXJlKSA9PSB3aGVyZSk7CiAgICAgICAgIHBlcmZvcm1KSVRNZW1j cHkod2hlcmUsICZpbnNuLCBzaXplb2YoaW50KSk7CiAKICAgICAgICAgY2FjaGVGbHVzaCh3aGVy ZSwgc2l6ZW9mKGludCkpOwpAQCAtMzA0OCw2ICszMDU4LDcgQEAgcHJvdGVjdGVkOgogICAgICAg ICBBU1NFUlQoc3RhdGljX2Nhc3Q8aW50PihvZmZzZXQpID09IG9mZnNldCk7CiAKICAgICAgICAg aW50IGluc24gPSB1bmNvbmRpdGlvbmFsQnJhbmNoSW1tZWRpYXRlKGlzQ2FsbCwgc3RhdGljX2Nh c3Q8aW50PihvZmZzZXQpKTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlw bGVPZjxpbnN0cnVjdGlvblNpemU+KGZyb20pID09IGZyb20pOwogICAgICAgICBwZXJmb3JtSklU TWVtY3B5KGZyb20sICZpbnNuLCBzaXplb2YoaW50KSk7CiAgICAgfQogCkBAIC0zMDY0LDEzICsz MDc1LDE2IEBAIHByb3RlY3RlZDoKIAogICAgICAgICBpZiAodXNlRGlyZWN0IHx8IGlzRGlyZWN0 KSB7CiAgICAgICAgICAgICBpbnQgaW5zbiA9IGNvbXBhcmVBbmRCcmFuY2hJbW1lZGlhdGUoaXM2 NEJpdCA/IERhdGFzaXplXzY0IDogRGF0YXNpemVfMzIsIGNvbmRpdGlvbiA9PSBDb25kaXRpb25O RSwgc3RhdGljX2Nhc3Q8aW50PihvZmZzZXQpLCBydCk7CisgICAgICAgICAgICBSRUxFQVNFX0FT U0VSVChyb3VuZFVwVG9NdWx0aXBsZU9mPGluc3RydWN0aW9uU2l6ZT4oZnJvbSkgPT0gZnJvbSk7 CiAgICAgICAgICAgICBwZXJmb3JtSklUTWVtY3B5KGZyb20sICZpbnNuLCBzaXplb2YoaW50KSk7 CiAgICAgICAgICAgICBpZiAoIWlzRGlyZWN0KSB7CiAgICAgICAgICAgICAgICAgaW5zbiA9IG5v cFBzZXVkbygpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHJvdW5kVXBUb011bHRp cGxlT2Y8aW5zdHJ1Y3Rpb25TaXplPihmcm9tICsgMSkgPT0gKGZyb20gKyAxKSk7CiAgICAgICAg ICAgICAgICAgcGVyZm9ybUpJVE1lbWNweShmcm9tICsgMSwgJmluc24sIHNpemVvZihpbnQpKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGludCBpbnNuID0g Y29tcGFyZUFuZEJyYW5jaEltbWVkaWF0ZShpczY0Qml0ID8gRGF0YXNpemVfNjQgOiBEYXRhc2l6 ZV8zMiwgaW52ZXJ0KGNvbmRpdGlvbikgPT0gQ29uZGl0aW9uTkUsIDIsIHJ0KTsKKyAgICAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKHJvdW5kVXBUb011bHRpcGxlT2Y8aW5zdHJ1Y3Rpb25TaXplPihm cm9tKSA9PSBmcm9tKTsKICAgICAgICAgICAgIHBlcmZvcm1KSVRNZW1jcHkoZnJvbSwgJmluc24s IHNpemVvZihpbnQpKTsKICAgICAgICAgICAgIGxpbmtKdW1wT3JDYWxsPGZhbHNlPihmcm9tICsg MSwgZnJvbUluc3RydWN0aW9uICsgMSwgdG8pOwogICAgICAgICB9CkBAIC0zMDg5LDEzICszMTAz LDE2IEBAIHByb3RlY3RlZDoKIAogICAgICAgICBpZiAodXNlRGlyZWN0IHx8IGlzRGlyZWN0KSB7 CiAgICAgICAgICAgICBpbnQgaW5zbiA9IGNvbmRpdGlvbmFsQnJhbmNoSW1tZWRpYXRlKHN0YXRp Y19jYXN0PGludD4ob2Zmc2V0KSwgY29uZGl0aW9uKTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNT RVJUKHJvdW5kVXBUb011bHRpcGxlT2Y8aW5zdHJ1Y3Rpb25TaXplPihmcm9tKSA9PSBmcm9tKTsK ICAgICAgICAgICAgIHBlcmZvcm1KSVRNZW1jcHkoZnJvbSwgJmluc24sIHNpemVvZihpbnQpKTsK ICAgICAgICAgICAgIGlmICghaXNEaXJlY3QpIHsKICAgICAgICAgICAgICAgICBpbnNuID0gbm9w UHNldWRvKCk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlw bGVPZjxpbnN0cnVjdGlvblNpemU+KGZyb20gKyAxKSA9PSAoZnJvbSArIDEpKTsKICAgICAgICAg ICAgICAgICBwZXJmb3JtSklUTWVtY3B5KGZyb20gKyAxLCAmaW5zbiwgc2l6ZW9mKGludCkpOwog ICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaW50IGluc24gPSBj b25kaXRpb25hbEJyYW5jaEltbWVkaWF0ZSgyLCBpbnZlcnQoY29uZGl0aW9uKSk7CisgICAgICAg ICAgICBSRUxFQVNFX0FTU0VSVChyb3VuZFVwVG9NdWx0aXBsZU9mPGluc3RydWN0aW9uU2l6ZT4o ZnJvbSkgPT0gZnJvbSk7CiAgICAgICAgICAgICBwZXJmb3JtSklUTWVtY3B5KGZyb20sICZpbnNu LCBzaXplb2YoaW50KSk7CiAgICAgICAgICAgICBsaW5rSnVtcE9yQ2FsbDxmYWxzZT4oZnJvbSAr IDEsIGZyb21JbnN0cnVjdGlvbiArIDEsIHRvKTsKICAgICAgICAgfQpAQCAtMzExNSwxMyArMzEz MiwxNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICAgICAgaWYgKHVzZURpcmVjdCB8fCBpc0RpcmVjdCkg ewogICAgICAgICAgICAgaW50IGluc24gPSB0ZXN0QW5kQnJhbmNoSW1tZWRpYXRlKGNvbmRpdGlv biA9PSBDb25kaXRpb25ORSwgc3RhdGljX2Nhc3Q8aW50PihiaXROdW1iZXIpLCBzdGF0aWNfY2Fz dDxpbnQ+KG9mZnNldCksIHJ0KTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHJvdW5kVXBU b011bHRpcGxlT2Y8aW5zdHJ1Y3Rpb25TaXplPihmcm9tKSA9PSBmcm9tKTsKICAgICAgICAgICAg IHBlcmZvcm1KSVRNZW1jcHkoZnJvbSwgJmluc24sIHNpemVvZihpbnQpKTsKICAgICAgICAgICAg IGlmICghaXNEaXJlY3QpIHsKICAgICAgICAgICAgICAgICBpbnNuID0gbm9wUHNldWRvKCk7Cisg ICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxpbnN0cnVj dGlvblNpemU+KGZyb20gKyAxKSA9PSAoZnJvbSArIDEpKTsKICAgICAgICAgICAgICAgICBwZXJm b3JtSklUTWVtY3B5KGZyb20gKyAxLCAmaW5zbiwgc2l6ZW9mKGludCkpOwogICAgICAgICAgICAg fQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaW50IGluc24gPSB0ZXN0QW5kQnJhbmNo SW1tZWRpYXRlKGludmVydChjb25kaXRpb24pID09IENvbmRpdGlvbk5FLCBzdGF0aWNfY2FzdDxp bnQ+KGJpdE51bWJlciksIDIsIHJ0KTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHJvdW5k VXBUb011bHRpcGxlT2Y8aW5zdHJ1Y3Rpb25TaXplPihmcm9tKSA9PSBmcm9tKTsKICAgICAgICAg ICAgIHBlcmZvcm1KSVRNZW1jcHkoZnJvbSwgJmluc24sIHNpemVvZihpbnQpKTsKICAgICAgICAg ICAgIGxpbmtKdW1wT3JDYWxsPGZhbHNlPihmcm9tICsgMSwgZnJvbUluc3RydWN0aW9uICsgMSwg dG8pOwogICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0xp bmtCdWZmZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTGlua0J1ZmZlci5jcHAJKHJldmlzaW9uIDIzNjUyMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTGlua0J1ZmZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMyw2ICsx MTMsMTAgQEAgdm9pZCBMaW5rQnVmZmVyOjpjb3B5Q29tcGFjdEFuZExpbmtDb2RlKAogCiAgICAg dWludDhfdCogb3V0RGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhfdCo+KG91dEJ1ZmZlci5i dWZmZXIoKSk7CiAgICAgdWludDhfdCogY29kZU91dERhdGEgPSBtX2NvZGUuZGF0YUxvY2F0aW9u PHVpbnQ4X3QqPigpOworI2lmIENQVShBUk02NCkKKyAgICBSRUxFQVNFX0FTU0VSVChyb3VuZFVw VG9NdWx0aXBsZU9mPHNpemVvZih1bnNpZ25lZCk+KG91dERhdGEpID09IG91dERhdGEpOworICAg IFJFTEVBU0VfQVNTRVJUKHJvdW5kVXBUb011bHRpcGxlT2Y8c2l6ZW9mKHVuc2lnbmVkKT4oY29k ZU91dERhdGEpID09IGNvZGVPdXREYXRhKTsKKyNlbmRpZgogCiAgICAgaW50IHJlYWRQdHIgPSAw OwogICAgIGludCB3cml0ZVB0ciA9IDA7CkBAIC0yMTMsNiArMjE3LDggQEAgdm9pZCBMaW5rQnVm ZmVyOjpsaW5rQ29kZShNYWNyb0Fzc2VtYmxlcgogICAgIHZvaWQqIGNvZGUgPSBtX2NvZGUuZGF0 YUxvY2F0aW9uKCk7CiAjaWYgQ1BVKEFSTV9UUkFESVRJT05BTCkKICAgICBtYWNyb0Fzc2VtYmxl ci5tX2Fzc2VtYmxlci5wcmVwYXJlRXhlY3V0YWJsZUNvcHkoY29kZSk7CisjZWxpZiBDUFUoQVJN NjQpCisgICAgUkVMRUFTRV9BU1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxBc3NlbWJsZXI6Omlu c3RydWN0aW9uU2l6ZT4oY29kZSkgPT0gY29kZSk7CiAjZW5kaWYKICAgICBwZXJmb3JtSklUTWVt Y3B5KGNvZGUsIGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5jb2RlU2l6ZSgpKTsKICNpZiBDUFUoTUlQ UykKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvRXhlY3V0YWJsZUFsbG9j YXRvci5oCShyZXZpc2lvbiAyMzY1MjIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4 ZWN1dGFibGVBbGxvY2F0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsMTMgQEAgZXh0 ZXJuIEpTX0VYUE9SVF9QUklWQVRFIGJvb2wgdXNlRmFzdFBlcgogCiBzdGF0aWMgaW5saW5lIHZv aWQqIHBlcmZvcm1KSVRNZW1jcHkodm9pZCAqZHN0LCBjb25zdCB2b2lkICpzcmMsIHNpemVfdCBu KQogeworI2lmIENQVShBUk02NCkKKyAgICBzdGF0aWMgY29uc3RleHByIHNpemVfdCBpbnN0cnVj dGlvblNpemUgPSBzaXplb2YodW5zaWduZWQpOworICAgIFJFTEVBU0VfQVNTRVJUKHJvdW5kVXBU b011bHRpcGxlT2Y8aW5zdHJ1Y3Rpb25TaXplPihkc3QpID09IGRzdCk7CisgICAgUkVMRUFTRV9B U1NFUlQocm91bmRVcFRvTXVsdGlwbGVPZjxpbnN0cnVjdGlvblNpemU+KHNyYykgPT0gc3JjKTsK KyNlbmRpZgogICAgIGlmIChkc3QgPj0gc3RhcnRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2wo KSAmJiBkc3QgPCBlbmRPZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2woKSkgeworICAgICAgICBS RUxFQVNFX0FTU0VSVChyZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihkc3QpICsgbiA8PSBlbmRP ZkZpeGVkRXhlY3V0YWJsZU1lbW9yeVBvb2woKSk7CiAjaWYgRU5BQkxFKEZBU1RfSklUX1BFUk1J U1NJT05TKQogICAgICAgICBpZiAodXNlRmFzdFBlcm1pc2lvbnNKSVRDb3B5KSB7CiAgICAgICAg ICAgICBvc190aHJlYWRfc2VsZl9yZXN0cmljdF9yd3hfdG9fcncoKTsK