124468 2013-11-17 08:45:58 -0800 [sh4] revertJumpReplacementToBranchPtrWithPatch implementation is wrong in MacroAssembler 2013-11-17 23:49:12 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbriance webkit-unassigned commit-queue ggaren msaboff oliver yannick.poirier oldest_to_newest 951420 0 jbriance 2013-11-17 08:45:58 -0800 Current implementation of revertJumpReplacementToBranchPtrWithPatch is wrong in the sh4 MacroAssembler part, leading to random unstabilities with this architecture. I'll submit a patch soon to fix this. 951424 1 217150 jbriance 2013-11-17 09:39:48 -0800 Created attachment 217150 Fix revertJumpReplacementToBranchPtrWithPatch implementation in MacroAssembler for sh4. 951457 2 217150 msaboff 2013-11-17 16:37:45 -0800 Comment on attachment 217150 Fix revertJumpReplacementToBranchPtrWithPatch implementation in MacroAssembler for sh4. View in context: https://bugs.webkit.org/attachment.cgi?id=217150&action=review > Source/JavaScriptCore/ChangeLog:9 > + the sh4 MacroAssembler part, leading to random unstabilities. This patch fixes it I think you mean "instabilities". 951489 3 jbriance 2013-11-17 23:09:47 -0800 (In reply to comment #2) > I think you mean "instabilities". Indeed :) 951490 4 217170 jbriance 2013-11-17 23:10:25 -0800 Created attachment 217170 Fix revertJumpReplacementToBranchPtrWithPatch implementation in MacroAssembler for sh4 (2). 951498 5 217170 commit-queue 2013-11-17 23:49:10 -0800 Comment on attachment 217170 Fix revertJumpReplacementToBranchPtrWithPatch implementation in MacroAssembler for sh4 (2). Clearing flags on attachment: 217170 Committed r159400: <http://trac.webkit.org/changeset/159400> 951499 6 commit-queue 2013-11-17 23:49:12 -0800 All reviewed patches have been landed. Closing bug. 217150 2013-11-17 09:39:48 -0800 2013-11-17 23:12:15 -0800 Fix revertJumpReplacementToBranchPtrWithPatch implementation in MacroAssembler for sh4. bug-124468.patch text/plain 5439 jbriance SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5Mzg0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTExLTE3ICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VAY2lzY28uY29tPgorCisg ICAgICAgIFtzaDRdIEZpeCByZXZlcnRKdW1wUmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRj aCBpbiBNYWNyb0Fzc2VtYmxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNDQ2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEN1cnJlbnQgaW1wbGVtZW50YXRpb24gb2YgcmV2ZXJ0SnVtcFJlcGxhY2Vt ZW50VG9CcmFuY2hQdHJXaXRoUGF0Y2ggaXMgd3JvbmcgaW4KKyAgICAgICAgdGhlIHNoNCBNYWNy b0Fzc2VtYmxlciBwYXJ0LCBsZWFkaW5nIHRvIHJhbmRvbSB1bnN0YWJpbGl0aWVzLiBUaGlzIHBh dGNoIGZpeGVzIGl0CisgICAgICAgIGFuZCBhbHNvIHJlbmFtZXMgdGhlIGJhZC1uYW1lZCByZXZl cnRKdW1wVG9Nb3ZlIHRvIHJldmVydEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNo CisgICAgICAgIGluIHRoZSBTSDRBc3NlbWJsZXIuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJTSDQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJTSDQ6OnJldmVy dEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoKToKKyAgICAgICAgKiBhc3NlbWJs ZXIvU0g0QXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6OlNINEFzc2VtYmxlcjo6cmVwbGFjZVdp dGhKdW1wKToKKyAgICAgICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpyZXZlcnRKdW1wUmVwbGFjZW1l bnRUb0JyYW5jaFB0cldpdGhQYXRjaCk6CisKIDIwMTMtMTEtMTYgIEZpbGlwIFBpemxvICA8ZnBp emxvQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggaW5kZW50YXRpb24gb2YgSlNBY3RpdmF0aW9u LmguCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy U0g0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlclNINC5oCShyZXZpc2lvbiAxNTkzODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyU0g0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI0NDcs NyArMjQ0Nyw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyB2b2lkIHJldmVydEp1bXBSZXBsYWNl bWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoKENvZGVMb2NhdGlvbkxhYmVsIGluc3RydWN0aW9uU3Rh cnQsIFJlZ2lzdGVySUQgcmQsIHZvaWQqIGluaXRpYWxWYWx1ZSkKICAgICB7Ci0gICAgICAgIFNI NEFzc2VtYmxlcjo6cmV2ZXJ0SnVtcFRvTW92ZShpbnN0cnVjdGlvblN0YXJ0LmRhdGFMb2NhdGlv bigpLCByZCwgcmVpbnRlcnByZXRfY2FzdDxpbnQ+KGluaXRpYWxWYWx1ZSkpOworICAgICAgICBT SDRBc3NlbWJsZXI6OnJldmVydEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoKGlu c3RydWN0aW9uU3RhcnQuZGF0YUxvY2F0aW9uKCksIHJkLCByZWludGVycHJldF9jYXN0PGludD4o aW5pdGlhbFZhbHVlKSk7CiAgICAgfQogCiAgICAgc3RhdGljIENvZGVMb2NhdGlvbkxhYmVsIHN0 YXJ0T2ZQYXRjaGFibGVCcmFuY2hQdHJXaXRoUGF0Y2hPbkFkZHJlc3MoQ29kZUxvY2F0aW9uRGF0 YUxhYmVsUHRyKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9TSDRBc3Nl bWJsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NI NEFzc2VtYmxlci5oCShyZXZpc2lvbiAxNTkzODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL1NINEFzc2VtYmxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAzLDkgKzE1MDMs MTMgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHJlcGxhY2VXaXRoSnVtcCh2b2lkICppbnN0 cnVjdGlvblN0YXJ0LCB2b2lkICp0bykKICAgICB7CiAgICAgICAgIFNINFdvcmQqIGluc3RydWN0 aW9uID0gcmVpbnRlcnByZXRfY2FzdDxTSDRXb3JkKj4oaW5zdHJ1Y3Rpb25TdGFydCk7Ci0gICAg ICAgIGludHB0cl90IGRpZmZlcmVuY2UgPSByZWludGVycHJldF9jYXN0PGludHB0cl90Pih0bykg LSAocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oaW5zdHJ1Y3Rpb24pICsgMiAqIHNpemVvZihT SDRXb3JkKSk7CisgICAgICAgIGludHB0cl90IGRpZmZlcmVuY2UgPSByZWludGVycHJldF9jYXN0 PGludHB0cl90Pih0bykgLSAocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oaW5zdHJ1Y3Rpb24p ICsgMyAqIHNpemVvZihTSDRXb3JkKSk7CiAKICAgICAgICAgaWYgKChpbnN0cnVjdGlvblswXSAm IDB4ZjAwMCkgPT0gTU9WTF9SRUFEX09GRlBDX09QQ09ERSkgeworICAgICAgICAgICAgLy8gV2Ug aGF2ZSBhbiBlbnRyeSBpbiBjb25zdGFudCBwb29sIGFuZCB3ZSBwb3RlbnRpYWxseSByZXBsYWNl IGEgYnJhbmNoUHRyV2l0aFBhdGNoLCBzbyBsZXQncyBiYWNrdXAgd2hhdCB3b3VsZCBiZSB0aGUK KyAgICAgICAgICAgIC8vIGNvbmRpdGlvbiAoQ01QL3h4IGFuZCBCeCBvcGNvZGVzKSBmb3IgbGF0 ZXIgdXNlIGluIHJldmVydEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoIGJlZm9y ZSBwdXR0aW5nIHRoZSBqdW1wLgorICAgICAgICAgICAgaW5zdHJ1Y3Rpb25bNF0gPSBpbnN0cnVj dGlvblsxXTsKKyAgICAgICAgICAgIGluc3RydWN0aW9uWzVdID0gaW5zdHJ1Y3Rpb25bMl07CiAg ICAgICAgICAgICBpbnN0cnVjdGlvblsxXSA9IChCUkFGX09QQ09ERSB8IChpbnN0cnVjdGlvblsw XSAmIDB4MGYwMCkpOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25bMl0gPSBOT1BfT1BDT0RFOwog ICAgICAgICAgICAgY2FjaGVGbHVzaCgmaW5zdHJ1Y3Rpb25bMV0sIDIgKiBzaXplb2YoU0g0V29y ZCkpOwpAQCAtMTUxNiwyMiArMTUyMCwzMiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBjYWNoZUZs dXNoKGluc3RydWN0aW9uLCAzICogc2l6ZW9mKFNINFdvcmQpKTsKICAgICAgICAgfQogCi0gICAg ICAgIGNoYW5nZVBDcmVsYXRpdmVBZGRyZXNzKGluc3RydWN0aW9uWzBdICYgMHgwMGZmLCBpbnN0 cnVjdGlvbiwgZGlmZmVyZW5jZSAtIDIpOworICAgICAgICBjaGFuZ2VQQ3JlbGF0aXZlQWRkcmVz cyhpbnN0cnVjdGlvblswXSAmIDB4MDBmZiwgaW5zdHJ1Y3Rpb24sIGRpZmZlcmVuY2UpOwogICAg IH0KIAotICAgIHN0YXRpYyB2b2lkIHJldmVydEp1bXBUb01vdmUodm9pZCogaW5zdHJ1Y3Rpb25T dGFydCwgUmVnaXN0ZXJJRCByZCwgaW50IGltbSkKKyAgICBzdGF0aWMgdm9pZCByZXZlcnRKdW1w UmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRjaCh2b2lkKiBpbnN0cnVjdGlvblN0YXJ0LCBS ZWdpc3RlcklEIHJkLCBpbnQgaW1tKQogICAgIHsKICAgICAgICAgU0g0V29yZCAqaW5zbiA9IHJl aW50ZXJwcmV0X2Nhc3Q8U0g0V29yZCo+KGluc3RydWN0aW9uU3RhcnQpOwogICAgICAgICBBU1NF UlQoKGluc25bMF0gJiAweGYwMDApID09IE1PVkxfUkVBRF9PRkZQQ19PUENPREUpOworICAgICAg ICBBU1NFUlQoKGluc25bMF0gJiAweDAwZmYpICE9IDEpOwogCi0gICAgICAgIGlmICgoaW5zblsx XSAmIDB4ZjAwMCkgPT0gQ01QRVFfT1BDT0RFKSB7Ci0gICAgICAgICAgICBpbnNuWzBdID0gZ2V0 T3Bjb2RlR3JvdXAzKE1PVkxfUkVBRF9PRkZQQ19PUENPREUsIFNINFJlZ2lzdGVyczo6cjEzLCBp bnNuWzBdICYgMHgwMGZmKTsKKyAgICAgICAgaW5zblswXSA9IGdldE9wY29kZUdyb3VwMyhNT1ZM X1JFQURfT0ZGUENfT1BDT0RFLCBTSDRSZWdpc3RlcnM6OnIxMywgaW5zblswXSAmIDB4MDBmZik7 CisgICAgICAgIGlmICgoaW5zblsxXSAmIDB4ZjBmZikgPT0gQlJBRl9PUENPREUpIHsKKyAgICAg ICAgICAgIGluc25bMV0gPSAoaW5zbls0XSAmIDB4ZjAwZikgfCAocmQgPDwgOCkgfCAoU0g0UmVn aXN0ZXJzOjpyMTMgPDwgNCk7IC8vIFJlc3RvcmUgQ01QL3h4IG9wY29kZS4KKyAgICAgICAgICAg IGluc25bMl0gPSBpbnNuWzVdOworICAgICAgICAgICAgQVNTRVJUKCgoaW5zblsyXSAmIDB4ZmYw MCkgPT0gQlRfT1BDT0RFKSB8fCAoKGluc25bMl0gJiAweGZmMDApID09IEJGX09QQ09ERSkpOwor ICAgICAgICAgICAgQVNTRVJUKChpbnNuWzNdICYgMHhmMDAwKSA9PSBNT1ZMX1JFQURfT0ZGUENf T1BDT0RFKTsKKyAgICAgICAgICAgIGluc25bNF0gPSAoQlJBRl9PUENPREUgfCAoaW5zblszXSAm IDB4MGYwMCkpOworICAgICAgICAgICAgaW5zbls1XSA9IE5PUF9PUENPREU7CisgICAgICAgICAg ICBjYWNoZUZsdXNoKGluc24sIDYgKiBzaXplb2YoU0g0V29yZCkpOworICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgLy8gVGhlIGJyYW5jaFB0cldpdGhQYXRjaCBoYXMgYWxyZWFkeSBiZWVu IHJlc3RvcmVkLCBzbyB3ZSBqdXN0IHBhdGNoIHRoZSBpbW1lZGlhdGUgdmFsdWUgYW5kIEFTU0VS VCBhbGwgaXMgYXMgZXhwZWN0ZWQuCisgICAgICAgICAgICBBU1NFUlQoKGluc25bMV0gJiAweGYw MDApID09IDB4MzAwMCk7CiAgICAgICAgICAgICBpbnNuWzFdID0gKGluc25bMV0gJiAweGYwMGYp IHwgKHJkIDw8IDgpIHwgKFNINFJlZ2lzdGVyczo6cjEzIDw8IDQpOwogICAgICAgICAgICAgY2Fj aGVGbHVzaChpbnNuLCAyICogc2l6ZW9mKFNINFdvcmQpKTsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIGluc25bMV0gPSBnZXRPcGNvZGVHcm91cDYoQlJBX09QQ09ERSwgMyk7Ci0gICAg ICAgICAgICBpbnNuWzJdID0gTk9QX09QQ09ERTsKLSAgICAgICAgICAgIGNhY2hlRmx1c2goJmlu c25bMV0sIDIgKiBzaXplb2YoU0g0V29yZCkpOworICAgICAgICAgICAgQVNTRVJUKCgoaW5zblsy XSAmIDB4ZmYwMCkgPT0gQlRfT1BDT0RFKSB8fCAoKGluc25bMl0gJiAweGZmMDApID09IEJGX09Q Q09ERSkpOworICAgICAgICAgICAgQVNTRVJUKChpbnNuWzNdICYgMHhmMDAwKSA9PSBNT1ZMX1JF QURfT0ZGUENfT1BDT0RFKTsKKyAgICAgICAgICAgIEFTU0VSVChpbnNuWzVdID09IE5PUF9PUENP REUpOwogICAgICAgICB9CiAKICAgICAgICAgY2hhbmdlUENyZWxhdGl2ZUFkZHJlc3MoaW5zblsw XSAmIDB4MDBmZiwgaW5zbiwgaW1tKTsK 217170 2013-11-17 23:10:25 -0800 2013-11-17 23:49:10 -0800 Fix revertJumpReplacementToBranchPtrWithPatch implementation in MacroAssembler for sh4 (2). bug-124468_2.patch text/plain 5439 jbriance SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU5Mzg0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTExLTE3ICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VAY2lzY28uY29tPgorCisg ICAgICAgIFtzaDRdIEZpeCByZXZlcnRKdW1wUmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRj aCBpbiBNYWNyb0Fzc2VtYmxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNDQ2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgU2Fib2Zm LgorCisgICAgICAgIEN1cnJlbnQgaW1wbGVtZW50YXRpb24gb2YgcmV2ZXJ0SnVtcFJlcGxhY2Vt ZW50VG9CcmFuY2hQdHJXaXRoUGF0Y2ggaXMgd3JvbmcgaW4KKyAgICAgICAgdGhlIHNoNCBNYWNy b0Fzc2VtYmxlciBwYXJ0LCBsZWFkaW5nIHRvIHJhbmRvbSBpbnN0YWJpbGl0aWVzLiBUaGlzIHBh dGNoIGZpeGVzIGl0CisgICAgICAgIGFuZCBhbHNvIHJlbmFtZXMgdGhlIGJhZC1uYW1lZCByZXZl cnRKdW1wVG9Nb3ZlIHRvIHJldmVydEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNo CisgICAgICAgIGluIHRoZSBTSDRBc3NlbWJsZXIuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJTSDQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJTSDQ6OnJldmVy dEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoKToKKyAgICAgICAgKiBhc3NlbWJs ZXIvU0g0QXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6OlNINEFzc2VtYmxlcjo6cmVwbGFjZVdp dGhKdW1wKToKKyAgICAgICAgKEpTQzo6U0g0QXNzZW1ibGVyOjpyZXZlcnRKdW1wUmVwbGFjZW1l bnRUb0JyYW5jaFB0cldpdGhQYXRjaCk6CisKIDIwMTMtMTEtMTYgIEZpbGlwIFBpemxvICA8ZnBp emxvQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggaW5kZW50YXRpb24gb2YgSlNBY3RpdmF0aW9u LmguCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy U0g0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlclNINC5oCShyZXZpc2lvbiAxNTkzODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyU0g0LmgJKHdvcmtpbmcgY29weSkKQEAgLTI0NDcs NyArMjQ0Nyw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyB2b2lkIHJldmVydEp1bXBSZXBsYWNl bWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoKENvZGVMb2NhdGlvbkxhYmVsIGluc3RydWN0aW9uU3Rh cnQsIFJlZ2lzdGVySUQgcmQsIHZvaWQqIGluaXRpYWxWYWx1ZSkKICAgICB7Ci0gICAgICAgIFNI NEFzc2VtYmxlcjo6cmV2ZXJ0SnVtcFRvTW92ZShpbnN0cnVjdGlvblN0YXJ0LmRhdGFMb2NhdGlv bigpLCByZCwgcmVpbnRlcnByZXRfY2FzdDxpbnQ+KGluaXRpYWxWYWx1ZSkpOworICAgICAgICBT SDRBc3NlbWJsZXI6OnJldmVydEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoKGlu c3RydWN0aW9uU3RhcnQuZGF0YUxvY2F0aW9uKCksIHJkLCByZWludGVycHJldF9jYXN0PGludD4o aW5pdGlhbFZhbHVlKSk7CiAgICAgfQogCiAgICAgc3RhdGljIENvZGVMb2NhdGlvbkxhYmVsIHN0 YXJ0T2ZQYXRjaGFibGVCcmFuY2hQdHJXaXRoUGF0Y2hPbkFkZHJlc3MoQ29kZUxvY2F0aW9uRGF0 YUxhYmVsUHRyKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9TSDRBc3Nl bWJsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1NI NEFzc2VtYmxlci5oCShyZXZpc2lvbiAxNTkzODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL1NINEFzc2VtYmxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAzLDkgKzE1MDMs MTMgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHJlcGxhY2VXaXRoSnVtcCh2b2lkICppbnN0 cnVjdGlvblN0YXJ0LCB2b2lkICp0bykKICAgICB7CiAgICAgICAgIFNINFdvcmQqIGluc3RydWN0 aW9uID0gcmVpbnRlcnByZXRfY2FzdDxTSDRXb3JkKj4oaW5zdHJ1Y3Rpb25TdGFydCk7Ci0gICAg ICAgIGludHB0cl90IGRpZmZlcmVuY2UgPSByZWludGVycHJldF9jYXN0PGludHB0cl90Pih0bykg LSAocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oaW5zdHJ1Y3Rpb24pICsgMiAqIHNpemVvZihT SDRXb3JkKSk7CisgICAgICAgIGludHB0cl90IGRpZmZlcmVuY2UgPSByZWludGVycHJldF9jYXN0 PGludHB0cl90Pih0bykgLSAocmVpbnRlcnByZXRfY2FzdDxpbnRwdHJfdD4oaW5zdHJ1Y3Rpb24p ICsgMyAqIHNpemVvZihTSDRXb3JkKSk7CiAKICAgICAgICAgaWYgKChpbnN0cnVjdGlvblswXSAm IDB4ZjAwMCkgPT0gTU9WTF9SRUFEX09GRlBDX09QQ09ERSkgeworICAgICAgICAgICAgLy8gV2Ug aGF2ZSBhbiBlbnRyeSBpbiBjb25zdGFudCBwb29sIGFuZCB3ZSBwb3RlbnRpYWxseSByZXBsYWNl IGEgYnJhbmNoUHRyV2l0aFBhdGNoLCBzbyBsZXQncyBiYWNrdXAgd2hhdCB3b3VsZCBiZSB0aGUK KyAgICAgICAgICAgIC8vIGNvbmRpdGlvbiAoQ01QL3h4IGFuZCBCeCBvcGNvZGVzKSBmb3IgbGF0 ZXIgdXNlIGluIHJldmVydEp1bXBSZXBsYWNlbWVudFRvQnJhbmNoUHRyV2l0aFBhdGNoIGJlZm9y ZSBwdXR0aW5nIHRoZSBqdW1wLgorICAgICAgICAgICAgaW5zdHJ1Y3Rpb25bNF0gPSBpbnN0cnVj dGlvblsxXTsKKyAgICAgICAgICAgIGluc3RydWN0aW9uWzVdID0gaW5zdHJ1Y3Rpb25bMl07CiAg ICAgICAgICAgICBpbnN0cnVjdGlvblsxXSA9IChCUkFGX09QQ09ERSB8IChpbnN0cnVjdGlvblsw XSAmIDB4MGYwMCkpOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25bMl0gPSBOT1BfT1BDT0RFOwog ICAgICAgICAgICAgY2FjaGVGbHVzaCgmaW5zdHJ1Y3Rpb25bMV0sIDIgKiBzaXplb2YoU0g0V29y ZCkpOwpAQCAtMTUxNiwyMiArMTUyMCwzMiBAQCBwdWJsaWM6CiAgICAgICAgICAgICBjYWNoZUZs dXNoKGluc3RydWN0aW9uLCAzICogc2l6ZW9mKFNINFdvcmQpKTsKICAgICAgICAgfQogCi0gICAg ICAgIGNoYW5nZVBDcmVsYXRpdmVBZGRyZXNzKGluc3RydWN0aW9uWzBdICYgMHgwMGZmLCBpbnN0 cnVjdGlvbiwgZGlmZmVyZW5jZSAtIDIpOworICAgICAgICBjaGFuZ2VQQ3JlbGF0aXZlQWRkcmVz cyhpbnN0cnVjdGlvblswXSAmIDB4MDBmZiwgaW5zdHJ1Y3Rpb24sIGRpZmZlcmVuY2UpOwogICAg IH0KIAotICAgIHN0YXRpYyB2b2lkIHJldmVydEp1bXBUb01vdmUodm9pZCogaW5zdHJ1Y3Rpb25T dGFydCwgUmVnaXN0ZXJJRCByZCwgaW50IGltbSkKKyAgICBzdGF0aWMgdm9pZCByZXZlcnRKdW1w UmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRjaCh2b2lkKiBpbnN0cnVjdGlvblN0YXJ0LCBS ZWdpc3RlcklEIHJkLCBpbnQgaW1tKQogICAgIHsKICAgICAgICAgU0g0V29yZCAqaW5zbiA9IHJl aW50ZXJwcmV0X2Nhc3Q8U0g0V29yZCo+KGluc3RydWN0aW9uU3RhcnQpOwogICAgICAgICBBU1NF UlQoKGluc25bMF0gJiAweGYwMDApID09IE1PVkxfUkVBRF9PRkZQQ19PUENPREUpOworICAgICAg ICBBU1NFUlQoKGluc25bMF0gJiAweDAwZmYpICE9IDEpOwogCi0gICAgICAgIGlmICgoaW5zblsx XSAmIDB4ZjAwMCkgPT0gQ01QRVFfT1BDT0RFKSB7Ci0gICAgICAgICAgICBpbnNuWzBdID0gZ2V0 T3Bjb2RlR3JvdXAzKE1PVkxfUkVBRF9PRkZQQ19PUENPREUsIFNINFJlZ2lzdGVyczo6cjEzLCBp bnNuWzBdICYgMHgwMGZmKTsKKyAgICAgICAgaW5zblswXSA9IGdldE9wY29kZUdyb3VwMyhNT1ZM X1JFQURfT0ZGUENfT1BDT0RFLCBTSDRSZWdpc3RlcnM6OnIxMywgaW5zblswXSAmIDB4MDBmZik7 CisgICAgICAgIGlmICgoaW5zblsxXSAmIDB4ZjBmZikgPT0gQlJBRl9PUENPREUpIHsKKyAgICAg ICAgICAgIGluc25bMV0gPSAoaW5zbls0XSAmIDB4ZjAwZikgfCAocmQgPDwgOCkgfCAoU0g0UmVn aXN0ZXJzOjpyMTMgPDwgNCk7IC8vIFJlc3RvcmUgQ01QL3h4IG9wY29kZS4KKyAgICAgICAgICAg IGluc25bMl0gPSBpbnNuWzVdOworICAgICAgICAgICAgQVNTRVJUKCgoaW5zblsyXSAmIDB4ZmYw MCkgPT0gQlRfT1BDT0RFKSB8fCAoKGluc25bMl0gJiAweGZmMDApID09IEJGX09QQ09ERSkpOwor ICAgICAgICAgICAgQVNTRVJUKChpbnNuWzNdICYgMHhmMDAwKSA9PSBNT1ZMX1JFQURfT0ZGUENf T1BDT0RFKTsKKyAgICAgICAgICAgIGluc25bNF0gPSAoQlJBRl9PUENPREUgfCAoaW5zblszXSAm IDB4MGYwMCkpOworICAgICAgICAgICAgaW5zbls1XSA9IE5PUF9PUENPREU7CisgICAgICAgICAg ICBjYWNoZUZsdXNoKGluc24sIDYgKiBzaXplb2YoU0g0V29yZCkpOworICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgLy8gVGhlIGJyYW5jaFB0cldpdGhQYXRjaCBoYXMgYWxyZWFkeSBiZWVu IHJlc3RvcmVkLCBzbyB3ZSBqdXN0IHBhdGNoIHRoZSBpbW1lZGlhdGUgdmFsdWUgYW5kIEFTU0VS VCBhbGwgaXMgYXMgZXhwZWN0ZWQuCisgICAgICAgICAgICBBU1NFUlQoKGluc25bMV0gJiAweGYw MDApID09IDB4MzAwMCk7CiAgICAgICAgICAgICBpbnNuWzFdID0gKGluc25bMV0gJiAweGYwMGYp IHwgKHJkIDw8IDgpIHwgKFNINFJlZ2lzdGVyczo6cjEzIDw8IDQpOwogICAgICAgICAgICAgY2Fj aGVGbHVzaChpbnNuLCAyICogc2l6ZW9mKFNINFdvcmQpKTsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIGluc25bMV0gPSBnZXRPcGNvZGVHcm91cDYoQlJBX09QQ09ERSwgMyk7Ci0gICAg ICAgICAgICBpbnNuWzJdID0gTk9QX09QQ09ERTsKLSAgICAgICAgICAgIGNhY2hlRmx1c2goJmlu c25bMV0sIDIgKiBzaXplb2YoU0g0V29yZCkpOworICAgICAgICAgICAgQVNTRVJUKCgoaW5zblsy XSAmIDB4ZmYwMCkgPT0gQlRfT1BDT0RFKSB8fCAoKGluc25bMl0gJiAweGZmMDApID09IEJGX09Q Q09ERSkpOworICAgICAgICAgICAgQVNTRVJUKChpbnNuWzNdICYgMHhmMDAwKSA9PSBNT1ZMX1JF QURfT0ZGUENfT1BDT0RFKTsKKyAgICAgICAgICAgIEFTU0VSVChpbnNuWzVdID09IE5PUF9PUENP REUpOwogICAgICAgICB9CiAKICAgICAgICAgY2hhbmdlUENyZWxhdGl2ZUFkZHJlc3MoaW5zblsw XSAmIDB4MDBmZiwgaW5zbiwgaW1tKTsK