143168 2015-03-27 17:53:15 -0700 load8Signed() and load16Signed() should be renamed to avoid confusion 2015-03-27 19:55:54 -0700 1 1 1 Unclassified WebKit JavaScriptCore 312.x All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff oldest_to_newest 1080828 0 msaboff 2015-03-27 17:53:15 -0700 It isn't clear from the names of the JSC MacroAssembler function load8Signed() and load16Signed() as to how many bits to sign extend. The code expects sign extending to 32 bits, but the ARM64 version was sign extending to 64 bits (https://bugs.webkit.org/show_bug.cgi?id=138390). The names of these function should reflect the number of bits they sign extend out to. 1080833 1 249627 msaboff 2015-03-27 17:57:40 -0700 Created attachment 249627 Patch for lnding, already reviewed. 1080865 2 msaboff 2015-03-27 19:55:54 -0700 Committed r182098: <http://trac.webkit.org/changeset/182098> 249627 2015-03-27 17:57:40 -0700 2015-03-27 17:57:40 -0700 Patch for lnding, already reviewed. 143168.patch text/plain 13968 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTgyMDkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBA CisyMDE1LTAzLTI3ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIGxvYWQ4U2lnbmVkKCkgYW5kIGxvYWQxNlNpZ25lZCgpIHNob3VsZCBiZSByZW5hbWVkIHRv IGF2b2lkIGNvbmZ1c2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQzMTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4K KworICAgICAgICBSZW5hbWVkIGxvYWQ4U2lnbmVkKCkgdG8gbG9hZDhTaWduZWRFeHRlbmRUbzMy KCkgYW5kIGxvYWQxNlNpZ25lZCgpIHRvIGxvYWQxNlNpZ25lZEV4dGVuZFRvMzIoKS4KKworICAg ICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgorICAgICAgICAoSlNDOjpNYWNy b0Fzc2VtYmxlckFSTTo6bG9hZDhTaWduZWRFeHRlbmRUbzMyKToKKyAgICAgICAgKEpTQzo6TWFj cm9Bc3NlbWJsZXJBUk06OmxvYWQxNlNpZ25lZEV4dGVuZFRvMzIpOgorICAgICAgICAoSlNDOjpN YWNyb0Fzc2VtYmxlckFSTTo6bG9hZDhTaWduZWQpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpN YWNyb0Fzc2VtYmxlckFSTTo6bG9hZDE2U2lnbmVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBhc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ckFSTTY0Ojpsb2FkMTZTaWduZWRFeHRlbmRUbzMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJBUk02NDo6bG9hZDhTaWduZWRFeHRlbmRUbzMyKToKKyAgICAgICAgKEpTQzo6TWFjcm9B c3NlbWJsZXJBUk02NDo6bG9hZDE2U2lnbmVkKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6TWFj cm9Bc3NlbWJsZXJBUk02NDo6bG9hZDhTaWduZWQpOiBEZWxldGVkLgorICAgICAgICAqIGFzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTXY3Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVy QVJNdjc6OmxvYWQxNlNpZ25lZEV4dGVuZFRvMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2Vt YmxlckFSTXY3Ojpsb2FkOFNpZ25lZEV4dGVuZFRvMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fz c2VtYmxlckFSTXY3Ojpsb2FkMTZTaWduZWQpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpNYWNy b0Fzc2VtYmxlckFSTXY3Ojpsb2FkOFNpZ25lZCk6IERlbGV0ZWQuCisgICAgICAgICogYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyTUlQUy5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1J UFM6OmxvYWQ4U2lnbmVkRXh0ZW5kVG8zMik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVy TUlQUzo6bG9hZDE2U2lnbmVkRXh0ZW5kVG8zMik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1i bGVyTUlQUzo6bG9hZDhTaWduZWQpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2Vt Ymxlck1JUFM6OmxvYWQxNlNpZ25lZCk6IERlbGV0ZWQuCisgICAgICAgICogYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyU0g0Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyU0g0Ojpsb2Fk OFNpZ25lZEV4dGVuZFRvMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclNINDo6bG9h ZDgpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclNINDo6bG9hZDE2U2lnbmVkRXh0ZW5k VG8zMik6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyU0g0Ojpsb2FkMTYpOgorICAgICAg ICAoSlNDOjpNYWNyb0Fzc2VtYmxlclNINDo6bG9hZDhTaWduZWQpOiBEZWxldGVkLgorICAgICAg ICAoSlNDOjpNYWNyb0Fzc2VtYmxlclNINDo6bG9hZDE2U2lnbmVkKTogRGVsZXRlZC4KKyAgICAg ICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaDoKKyAgICAgICAgKEpTQzo6 TWFjcm9Bc3NlbWJsZXJYODZDb21tb246OmxvYWQ4U2lnbmVkRXh0ZW5kVG8zMik6CisgICAgICAg IChKU0M6Ok1hY3JvQXNzZW1ibGVyWDg2Q29tbW9uOjpsb2FkMTZTaWduZWRFeHRlbmRUbzMyKToK KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJYODZDb21tb246OmxvYWQ4U2lnbmVkKTogRGVs ZXRlZC4KKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJYODZDb21tb246OmxvYWQxNlNpZ25l ZCk6IERlbGV0ZWQuCisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUdldEJ5VmFsT25JbnRUeXBlZEFy cmF5KToKKyAgICAgICAgKiBqaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwOgorICAgICAgICAoSlND OjpKSVQ6OmVtaXRJbnRUeXBlZEFycmF5R2V0QnlWYWwpOgorCiAyMDE1LTAzLTI3ICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBmbGFrZXkgZGZnLWlu dDhhcnJheS5qcyBhbmQgZGZnLWludDE2YXJyYXkuanMgdGVzdHMgZm9yIEFSTTY0CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy QVJNNjQuaAkocmV2aXNpb24gMTgyMDkxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmgJKHdvcmtpbmcgY29weSkKQEAgLTkxOCw3ICs5MTgs NyBAQCBwdWJsaWM6CiAgICAgICAgIGxvYWQxNihhZGRyZXNzLCBkZXN0KTsKICAgICB9CiAKLSAg ICB2b2lkIGxvYWQxNlNpZ25lZChCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQor ICAgIHZvaWQgbG9hZDE2U2lnbmVkRXh0ZW5kVG8zMihCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0 ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgaWYgKCFhZGRyZXNzLm9mZnNldCAmJiAoIWFkZHJl c3Muc2NhbGUgfHwgYWRkcmVzcy5zY2FsZSA9PSAxKSkgewogICAgICAgICAgICAgbV9hc3NlbWJs ZXIubGRyc2g8MzI+KGRlc3QsIGFkZHJlc3MuYmFzZSwgYWRkcmVzcy5pbmRleCwgQVJNNjRBc3Nl bWJsZXI6OlVYVFgsIGFkZHJlc3Muc2NhbGUpOwpAQCAtOTU5LDcgKzk1OSw3IEBAIHB1YmxpYzoK ICAgICAgICAgICAgIG1fY2FjaGVkTWVtb3J5VGVtcFJlZ2lzdGVyLmludmFsaWRhdGUoKTsKICAg ICB9CiAKLSAgICB2b2lkIGxvYWQ4U2lnbmVkKEJhc2VJbmRleCBhZGRyZXNzLCBSZWdpc3RlcklE IGRlc3QpCisgICAgdm9pZCBsb2FkOFNpZ25lZEV4dGVuZFRvMzIoQmFzZUluZGV4IGFkZHJlc3Ms IFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIGlmICghYWRkcmVzcy5vZmZzZXQgJiYg IWFkZHJlc3Muc2NhbGUpIHsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLmxkcnNiPDMyPihkZXN0 LCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIEFSTTY0QXNzZW1ibGVyOjpVWFRYLCBhZGRy ZXNzLnNjYWxlKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJBUk0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyQVJNLmgJKHJldmlzaW9uIDE4MjA5MSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAkod29ya2luZyBjb3B5KQpA QCAtMzcwLDcgKzM3MCw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9hc3NlbWJsZXIuZGF0YVRyYW5z ZmVyMzIoQVJNQXNzZW1ibGVyOjpMb2FkVWludDgsIGRlc3QsIEFSTVJlZ2lzdGVyczo6UzAsIDAp OwogICAgIH0KIAotICAgIHZvaWQgbG9hZDhTaWduZWQoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lz dGVySUQgZGVzdCkKKyAgICB2b2lkIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMihCYXNlSW5kZXggYWRk cmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYmFzZUlu ZGV4VHJhbnNmZXIxNihBUk1Bc3NlbWJsZXI6OkxvYWRJbnQ4LCBkZXN0LCBhZGRyZXNzLmJhc2Us IGFkZHJlc3MuaW5kZXgsIHN0YXRpY19jYXN0PGludD4oYWRkcmVzcy5zY2FsZSksIGFkZHJlc3Mu b2Zmc2V0KTsKICAgICB9CkBAIC0zODUsNyArMzg1LDcgQEAgcHVibGljOgogICAgICAgICBtX2Fz c2VtYmxlci5iYXNlSW5kZXhUcmFuc2ZlcjE2KEFSTUFzc2VtYmxlcjo6TG9hZFVpbnQxNiwgZGVz dCwgYWRkcmVzcy5iYXNlLCBhZGRyZXNzLmluZGV4LCBzdGF0aWNfY2FzdDxpbnQ+KGFkZHJlc3Mu c2NhbGUpLCBhZGRyZXNzLm9mZnNldCk7CiAgICAgfQogCi0gICAgdm9pZCBsb2FkMTZTaWduZWQo QmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2b2lkIGxvYWQxNlNpZ25l ZEV4dGVuZFRvMzIoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAg ICAgICAgIG1fYXNzZW1ibGVyLmJhc2VJbmRleFRyYW5zZmVyMTYoQVJNQXNzZW1ibGVyOjpMb2Fk SW50MTYsIGRlc3QsIGFkZHJlc3MuYmFzZSwgYWRkcmVzcy5pbmRleCwgc3RhdGljX2Nhc3Q8aW50 PihhZGRyZXNzLnNjYWxlKSwgYWRkcmVzcy5vZmZzZXQpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5o CShyZXZpc2lvbiAxODIwOTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyQVJNdjcuaAkod29ya2luZyBjb3B5KQpAQCAtNTQ2LDcgKzU0Niw3IEBAIHBy aXZhdGU6CiAgICAgICAgIH0KICAgICB9CiAgICAgCi0gICAgdm9pZCBsb2FkMTZTaWduZWQoQXJt QWRkcmVzcyBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCisgICAgdm9pZCBsb2FkMTZTaWduZWRF eHRlbmRUbzMyKEFybUFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAg ICAgICAgQVNTRVJUKGFkZHJlc3MudHlwZSA9PSBBcm1BZGRyZXNzOjpIYXNJbmRleCk7CiAgICAg ICAgIG1fYXNzZW1ibGVyLmxkcnNoKGRlc3QsIGFkZHJlc3MuYmFzZSwgYWRkcmVzcy51LmluZGV4 LCBhZGRyZXNzLnUuc2NhbGUpOwpAQCAtNTY2LDcgKzU2Niw3IEBAIHByaXZhdGU6CiAgICAgICAg IH0KICAgICB9CiAgICAgCi0gICAgdm9pZCBsb2FkOFNpZ25lZChBcm1BZGRyZXNzIGFkZHJlc3Ms IFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2b2lkIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMihBcm1BZGRy ZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIEFTU0VSVChhZGRy ZXNzLnR5cGUgPT0gQXJtQWRkcmVzczo6SGFzSW5kZXgpOwogICAgICAgICBtX2Fzc2VtYmxlci5s ZHJzYihkZXN0LCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MudS5pbmRleCwgYWRkcmVzcy51LnNjYWxl KTsKQEAgLTY2OCw3ICs2NjgsNyBAQCBwdWJsaWM6CiAgICAgICAgIGxvYWQ4KHNldHVwQXJtQWRk cmVzcyhhZGRyZXNzKSwgZGVzdCk7CiAgICAgfQogCi0gICAgdm9pZCBsb2FkOFNpZ25lZChJbXBs aWNpdEFkZHJlc3MsIFJlZ2lzdGVySUQpCisgICAgdm9pZCBsb2FkOFNpZ25lZEV4dGVuZFRvMzIo SW1wbGljaXRBZGRyZXNzLCBSZWdpc3RlcklEKQogICAgIHsKICAgICAgICAgVU5SRUFDSEFCTEVf Rk9SX1BMQVRGT1JNKCk7CiAgICAgfQpAQCAtNjc4LDkgKzY3OCw5IEBAIHB1YmxpYzoKICAgICAg ICAgbG9hZDgoc2V0dXBBcm1BZGRyZXNzKGFkZHJlc3MpLCBkZXN0KTsKICAgICB9CiAgICAgCi0g ICAgdm9pZCBsb2FkOFNpZ25lZChCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQor ICAgIHZvaWQgbG9hZDhTaWduZWRFeHRlbmRUbzMyKEJhc2VJbmRleCBhZGRyZXNzLCBSZWdpc3Rl cklEIGRlc3QpCiAgICAgewotICAgICAgICBsb2FkOFNpZ25lZChzZXR1cEFybUFkZHJlc3MoYWRk cmVzcyksIGRlc3QpOworICAgICAgICBsb2FkOFNpZ25lZEV4dGVuZFRvMzIoc2V0dXBBcm1BZGRy ZXNzKGFkZHJlc3MpLCBkZXN0KTsKICAgICB9CiAKICAgICB2b2lkIGxvYWQ4KGNvbnN0IHZvaWQq IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKQEAgLTcxNCw5ICs3MTQsOSBAQCBwdWJsaWM6CiAg ICAgICAgIG1fYXNzZW1ibGVyLmxkcmgoZGVzdCwgbWFrZUJhc2VJbmRleEJhc2UoYWRkcmVzcyks IGFkZHJlc3MuaW5kZXgsIGFkZHJlc3Muc2NhbGUpOwogICAgIH0KICAgICAKLSAgICB2b2lkIGxv YWQxNlNpZ25lZChCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHZvaWQg bG9hZDE2U2lnbmVkRXh0ZW5kVG8zMihCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0 KQogICAgIHsKLSAgICAgICAgbG9hZDE2U2lnbmVkKHNldHVwQXJtQWRkcmVzcyhhZGRyZXNzKSwg ZGVzdCk7CisgICAgICAgIGxvYWQxNlNpZ25lZEV4dGVuZFRvMzIoc2V0dXBBcm1BZGRyZXNzKGFk ZHJlc3MpLCBkZXN0KTsKICAgICB9CiAgICAgCiAgICAgdm9pZCBsb2FkMTYoSW1wbGljaXRBZGRy ZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKQEAgLTczMCw3ICs3MzAsNyBAQCBwdWJsaWM6 CiAgICAgICAgIH0KICAgICB9CiAgICAgCi0gICAgdm9pZCBsb2FkMTZTaWduZWQoSW1wbGljaXRB ZGRyZXNzLCBSZWdpc3RlcklEKQorICAgIHZvaWQgbG9hZDE2U2lnbmVkRXh0ZW5kVG8zMihJbXBs aWNpdEFkZHJlc3MsIFJlZ2lzdGVySUQpCiAgICAgewogICAgICAgICBVTlJFQUNIQUJMRV9GT1Jf UExBVEZPUk0oKTsKICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L01hY3JvQXNzZW1ibGVyTUlQUy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgJKHJldmlzaW9uIDE4MjA5MSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgJKHdvcmtp bmcgY29weSkKQEAgLTcwNyw3ICs3MDcsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fYXNzZW1ibGVy LmxidShkZXN0LCBhZGRyVGVtcFJlZ2lzdGVyLCAwKTsKICAgICB9CiAKLSAgICB2b2lkIGxvYWQ4 U2lnbmVkKEJhc2VJbmRleCBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCisgICAgdm9pZCBsb2Fk OFNpZ25lZEV4dGVuZFRvMzIoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAg ICB7CiAgICAgICAgIGlmIChhZGRyZXNzLm9mZnNldCA+PSAtMzI3NjggJiYgYWRkcmVzcy5vZmZz ZXQgPD0gMzI3NjcKICAgICAgICAgICAgICYmICFtX2ZpeGVkV2lkdGgpIHsKQEAgLTkxOSw3ICs5 MTksNyBAQCBwdWJsaWM6CiAgICAgICAgIH0KICAgICB9CiAKLSAgICB2b2lkIGxvYWQxNlNpZ25l ZChCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHZvaWQgbG9hZDE2U2ln bmVkRXh0ZW5kVG8zMihCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsK ICAgICAgICAgaWYgKGFkZHJlc3Mub2Zmc2V0ID49IC0zMjc2OCAmJiBhZGRyZXNzLm9mZnNldCA8 PSAzMjc2NwogICAgICAgICAgICAgJiYgIW1fZml4ZWRXaWR0aCkgewpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclNINC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJTSDQuaAkocmV2 aXNpb24gMTgyMDkxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlclNINC5oCSh3b3JraW5nIGNvcHkpCkBAIC03MTgsMTMgKzcxOCwxMyBAQCBwdWJsaWM6 CiAgICAgICAgIG1fYXNzZW1ibGVyLmV4dHViKGRlc3QsIGRlc3QpOwogICAgIH0KIAotICAgIHZv aWQgbG9hZDhTaWduZWQoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2 b2lkIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMihCYXNlSW5kZXggYWRkcmVzcywgUmVnaXN0ZXJJRCBk ZXN0KQogICAgIHsKICAgICAgICAgUmVnaXN0ZXJJRCBzY3IgPSBjbGFpbVNjcmF0Y2goKTsKICAg ICAgICAgbW92ZShhZGRyZXNzLmluZGV4LCBzY3IpOwogICAgICAgICBsc2hpZnQzMihUcnVzdGVk SW1tMzIoYWRkcmVzcy5zY2FsZSksIHNjcik7CiAgICAgICAgIGFkZDMyKGFkZHJlc3MuYmFzZSwg c2NyKTsKLSAgICAgICAgbG9hZDhTaWduZWQoc2NyLCBhZGRyZXNzLm9mZnNldCwgZGVzdCk7Cisg ICAgICAgIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMihzY3IsIGFkZHJlc3Mub2Zmc2V0LCBkZXN0KTsK ICAgICAgICAgcmVsZWFzZVNjcmF0Y2goc2NyKTsKICAgICB9CiAKQEAgLTc3MCw3ICs3NzAsNyBA QCBwdWJsaWM6CiAgICAgICAgICAgICByZWxlYXNlU2NyYXRjaChzY3IpOwogICAgIH0KIAotICAg IHZvaWQgbG9hZDhTaWduZWQoUmVnaXN0ZXJJRCBiYXNlLCBpbnQgb2Zmc2V0LCBSZWdpc3RlcklE IGRlc3QpCisgICAgdm9pZCBsb2FkOFNpZ25lZEV4dGVuZFRvMzIoUmVnaXN0ZXJJRCBiYXNlLCBp bnQgb2Zmc2V0LCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBpZiAoIW9mZnNldCkg ewogICAgICAgICAgICAgbV9hc3NlbWJsZXIubW92Yk1lbVJlZyhiYXNlLCBkZXN0KTsKQEAgLTc5 OCw3ICs3OTgsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGxvYWQ4KFJlZ2lzdGVySUQgYmFzZSwg aW50IG9mZnNldCwgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKLSAgICAgICAgbG9hZDhTaWduZWQo YmFzZSwgb2Zmc2V0LCBkZXN0KTsKKyAgICAgICAgbG9hZDhTaWduZWRFeHRlbmRUbzMyKGJhc2Us IG9mZnNldCwgZGVzdCk7CiAgICAgICAgIG1fYXNzZW1ibGVyLmV4dHViKGRlc3QsIGRlc3QpOwog ICAgIH0KIApAQCAtODU4LDE0ICs4NTgsMTQgQEAgcHVibGljOgogICAgICAgICBtX2Fzc2VtYmxl ci5leHR1dyhkZXN0LCBkZXN0KTsKICAgICB9CiAKLSAgICB2b2lkIGxvYWQxNlNpZ25lZChSZWdp c3RlcklEIHNyYywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHZvaWQgbG9hZDE2U2lnbmVkRXh0ZW5k VG8zMihSZWdpc3RlcklEIHNyYywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9h c3NlbWJsZXIubW92d01lbVJlZyhzcmMsIGRlc3QpOwogICAgIH0KIAogICAgIHZvaWQgbG9hZDE2 KEJhc2VJbmRleCBhZGRyZXNzLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBsb2Fk MTZTaWduZWQoYWRkcmVzcywgZGVzdCk7CisgICAgICAgIGxvYWQxNlNpZ25lZEV4dGVuZFRvMzIo YWRkcmVzcywgZGVzdCk7CiAgICAgICAgIG1fYXNzZW1ibGVyLmV4dHV3KGRlc3QsIGRlc3QpOwog ICAgIH0KIApAQCAtODc1LDcgKzg3NSw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9hc3NlbWJsZXIu ZXh0dXcoZGVzdCwgZGVzdCk7CiAgICAgfQogCi0gICAgdm9pZCBsb2FkMTZTaWduZWQoQmFzZUlu ZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2b2lkIGxvYWQxNlNpZ25lZEV4dGVu ZFRvMzIoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAg IFJlZ2lzdGVySUQgc2NyID0gY2xhaW1TY3JhdGNoKCk7CiAKQEAgLTg4Nyw3ICs4ODcsNyBAQCBw dWJsaWM6CiAgICAgICAgICAgICBtX2Fzc2VtYmxlci5tb3Z3UjBtcihzY3IsIGRlc3QpOwogICAg ICAgICBlbHNlIHsKICAgICAgICAgICAgIGFkZDMyKGFkZHJlc3MuYmFzZSwgc2NyKTsKLSAgICAg ICAgICAgIGxvYWQxNlNpZ25lZChzY3IsIGRlc3QpOworICAgICAgICAgICAgbG9hZDE2U2lnbmVk RXh0ZW5kVG8zMihzY3IsIGRlc3QpOwogICAgICAgICB9CiAKICAgICAgICAgcmVsZWFzZVNjcmF0 Y2goc2NyKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3Nl bWJsZXJYODZDb21tb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2Q29tbW9uLmgJKHJldmlzaW9uIDE4MjA5MSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaAko d29ya2luZyBjb3B5KQpAQCAtNTI1LDEyICs1MjUsMTIgQEAgcHVibGljOgogICAgICAgICBtX2Fz c2VtYmxlci5tb3Z6YmxfbXIoYWRkcmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSwgZGVzdCk7CiAg ICAgfQogICAgIAotICAgIHZvaWQgbG9hZDhTaWduZWQoQmFzZUluZGV4IGFkZHJlc3MsIFJlZ2lz dGVySUQgZGVzdCkKKyAgICB2b2lkIGxvYWQ4U2lnbmVkRXh0ZW5kVG8zMihCYXNlSW5kZXggYWRk cmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIubW92c2Js X21yKGFkZHJlc3Mub2Zmc2V0LCBhZGRyZXNzLmJhc2UsIGFkZHJlc3MuaW5kZXgsIGFkZHJlc3Mu c2NhbGUsIGRlc3QpOwogICAgIH0KIAotICAgIHZvaWQgbG9hZDhTaWduZWQoSW1wbGljaXRBZGRy ZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB2b2lkIGxvYWQ4U2lnbmVkRXh0ZW5k VG8zMihJbXBsaWNpdEFkZHJlc3MgYWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAg ICAgICAgbV9hc3NlbWJsZXIubW92c2JsX21yKGFkZHJlc3Mub2Zmc2V0LCBhZGRyZXNzLmJhc2Us IGRlc3QpOwogICAgIH0KQEAgLTU0NSwxMiArNTQ1LDEyIEBAIHB1YmxpYzoKICAgICAgICAgbV9h c3NlbWJsZXIubW92endsX21yKGFkZHJlc3Mub2Zmc2V0LCBhZGRyZXNzLmJhc2UsIGRlc3QpOwog ICAgIH0KIAotICAgIHZvaWQgbG9hZDE2U2lnbmVkKEJhc2VJbmRleCBhZGRyZXNzLCBSZWdpc3Rl cklEIGRlc3QpCisgICAgdm9pZCBsb2FkMTZTaWduZWRFeHRlbmRUbzMyKEJhc2VJbmRleCBhZGRy ZXNzLCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxlci5tb3Zzd2xf bXIoYWRkcmVzcy5vZmZzZXQsIGFkZHJlc3MuYmFzZSwgYWRkcmVzcy5pbmRleCwgYWRkcmVzcy5z Y2FsZSwgZGVzdCk7CiAgICAgfQogICAgIAotICAgIHZvaWQgbG9hZDE2U2lnbmVkKEFkZHJlc3Mg YWRkcmVzcywgUmVnaXN0ZXJJRCBkZXN0KQorICAgIHZvaWQgbG9hZDE2U2lnbmVkRXh0ZW5kVG8z MihBZGRyZXNzIGFkZHJlc3MsIFJlZ2lzdGVySUQgZGVzdCkKICAgICB7CiAgICAgICAgIG1fYXNz ZW1ibGVyLm1vdnN3bF9tcihhZGRyZXNzLm9mZnNldCwgYWRkcmVzcy5iYXNlLCBkZXN0KTsKICAg ICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklULmNwcAkocmV2aXNpb24gMTgyMDkxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzMTAsMTMgKzIzMTAsMTMg QEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUdldEJ5VmFsT25JbgogICAgIHN3aXRjaCAo ZWxlbWVudFNpemUodHlwZSkpIHsKICAgICBjYXNlIDE6CiAgICAgICAgIGlmIChpc1NpZ25lZCh0 eXBlKSkKLSAgICAgICAgICAgIG1faml0LmxvYWQ4U2lnbmVkKE1hY3JvQXNzZW1ibGVyOjpCYXNl SW5kZXgoc3RvcmFnZVJlZywgcHJvcGVydHlSZWcsIE1hY3JvQXNzZW1ibGVyOjpUaW1lc09uZSks IHJlc3VsdFJlZyk7CisgICAgICAgICAgICBtX2ppdC5sb2FkOFNpZ25lZEV4dGVuZFRvMzIoTWFj cm9Bc3NlbWJsZXI6OkJhc2VJbmRleChzdG9yYWdlUmVnLCBwcm9wZXJ0eVJlZywgTWFjcm9Bc3Nl bWJsZXI6OlRpbWVzT25lKSwgcmVzdWx0UmVnKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAg bV9qaXQubG9hZDgoTWFjcm9Bc3NlbWJsZXI6OkJhc2VJbmRleChzdG9yYWdlUmVnLCBwcm9wZXJ0 eVJlZywgTWFjcm9Bc3NlbWJsZXI6OlRpbWVzT25lKSwgcmVzdWx0UmVnKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSAyOgogICAgICAgICBpZiAoaXNTaWduZWQodHlwZSkpCi0gICAgICAgICAg ICBtX2ppdC5sb2FkMTZTaWduZWQoTWFjcm9Bc3NlbWJsZXI6OkJhc2VJbmRleChzdG9yYWdlUmVn LCBwcm9wZXJ0eVJlZywgTWFjcm9Bc3NlbWJsZXI6OlRpbWVzVHdvKSwgcmVzdWx0UmVnKTsKKyAg ICAgICAgICAgIG1faml0LmxvYWQxNlNpZ25lZEV4dGVuZFRvMzIoTWFjcm9Bc3NlbWJsZXI6OkJh c2VJbmRleChzdG9yYWdlUmVnLCBwcm9wZXJ0eVJlZywgTWFjcm9Bc3NlbWJsZXI6OlRpbWVzVHdv KSwgcmVzdWx0UmVnKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9qaXQubG9hZDE2KE1h Y3JvQXNzZW1ibGVyOjpCYXNlSW5kZXgoc3RvcmFnZVJlZywgcHJvcGVydHlSZWcsIE1hY3JvQXNz ZW1ibGVyOjpUaW1lc1R3byksIHJlc3VsdFJlZyk7CiAgICAgICAgIGJyZWFrOwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAJKHJldmlz aW9uIDE4MjA5MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nl c3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTc3LDEzICsxMTc3LDEzIEBAIEpJVDo6SnVtcExp c3QgSklUOjplbWl0SW50VHlwZWRBcnJheUdldEIKICAgICBzd2l0Y2ggKGVsZW1lbnRTaXplKHR5 cGUpKSB7CiAgICAgY2FzZSAxOgogICAgICAgICBpZiAoaXNTaWduZWQodHlwZSkpCi0gICAgICAg ICAgICBsb2FkOFNpZ25lZChCYXNlSW5kZXgoYmFzZSwgcHJvcGVydHksIFRpbWVzT25lKSwgcmVz dWx0UGF5bG9hZCk7CisgICAgICAgICAgICBsb2FkOFNpZ25lZEV4dGVuZFRvMzIoQmFzZUluZGV4 KGJhc2UsIHByb3BlcnR5LCBUaW1lc09uZSksIHJlc3VsdFBheWxvYWQpOwogICAgICAgICBlbHNl CiAgICAgICAgICAgICBsb2FkOChCYXNlSW5kZXgoYmFzZSwgcHJvcGVydHksIFRpbWVzT25lKSwg cmVzdWx0UGF5bG9hZCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgMjoKICAgICAgICAgaWYg KGlzU2lnbmVkKHR5cGUpKQotICAgICAgICAgICAgbG9hZDE2U2lnbmVkKEJhc2VJbmRleChiYXNl LCBwcm9wZXJ0eSwgVGltZXNUd28pLCByZXN1bHRQYXlsb2FkKTsKKyAgICAgICAgICAgIGxvYWQx NlNpZ25lZEV4dGVuZFRvMzIoQmFzZUluZGV4KGJhc2UsIHByb3BlcnR5LCBUaW1lc1R3byksIHJl c3VsdFBheWxvYWQpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBsb2FkMTYoQmFzZUluZGV4 KGJhc2UsIHByb3BlcnR5LCBUaW1lc1R3byksIHJlc3VsdFBheWxvYWQpOwogICAgICAgICBicmVh azsK