100899 2012-10-31 15:53:14 -0700 JSC: C++ llint 64-bit backend needs to zero extend results of int32 operations 2012-11-01 00:32:11 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97586 1 mark.lam mark.lam fpizlo laszlo.gombos ossy zherczeg oldest_to_newest 755691 0 mark.lam 2012-10-31 15:53:14 -0700 The BaseIndex address calculation should use a different type/sized index depending on the type of the instruction that is using it. This is an x86_64-ism that wasn't previously captured. 755692 1 171736 mark.lam 2012-10-31 15:58:27 -0700 Created attachment 171736 Fix. 755705 2 171736 fpizlo 2012-10-31 16:17:43 -0700 Comment on attachment 171736 Fix. Mark and I found a bug while looking at this. 755839 3 mark.lam 2012-10-31 20:42:47 -0700 Also, the index register used in BaseIndex addressing is expected to be of size intptr_t. 755931 4 171780 mark.lam 2012-10-31 23:40:15 -0700 Created attachment 171780 The real fix. 755936 5 171780 fpizlo 2012-10-31 23:51:38 -0700 Comment on attachment 171780 The real fix. Woohoo! 755958 6 mark.lam 2012-11-01 00:32:11 -0700 Landed in r133131: <http://trac.webkit.org/changeset/133131>. The svn commit message for it was erroneous. It should have said: === BEGIN === C++ llint 64-bit backend needs to zero extend results of int32 operations. https://bugs.webkit.org/show_bug.cgi?id=100899. Reviewed by Filip Pizlo. llint asm instructions ending in "i" for a 64-bit machine expects the high 32-bit of registers to be zero'ed out when a 32-bit instruction writes into a register. Fixed the C++ llint to honor this. Fixed the index register used in BaseIndex addressing to be of size intptr_t as expected. Updated CLoopRegister to handle different endiannesss configurations. * llint/LowLevelInterpreter.cpp: (JSC::CLoopRegister::clearHighWord): - new method to clear the high 32-bit of a 64-bit register. It's a no-op for the 32-bit build. (CLoopRegister): - CLoopRegister now takes care of packing and byte endianness order. (JSC::CLoop::execute): - Added an assert. * offlineasm/cloop.rb: - Add calls to clearHighWord() wherever needed. === END === 171736 2012-10-31 15:58:27 -0700 2012-10-31 23:40:15 -0700 Fix. bug-100899.patch text/plain 3137 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMzMDkxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDEyLTEwLTMxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXhlZCBDKysgbGxpbnQgQmFzZUluZGV4IGJhY2tlbmQgdG8gdXNlIHRoZSBjb3JyZWN0IHR5cGUg Zm9yIGl0cyBpbmRleAorICAgICAgICBwYXJhbWV0ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA4OTkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBvZmZsaW5lYXNtL2Nsb29wLnJiOgorCiAyMDEy LTEwLTMxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICA2NC1iaXQg bGxpbnQgUEMgb2Zmc2V0IGNhbiBiZSBuZWdhdGl2ZTogdXNpbmcgYW4gdW5zaWduZWQgc2hpZnQg aXMgYSBidWcuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9jbG9vcC5y Ygo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9jbG9vcC5y YgkocmV2aXNpb24gMTMzMDg5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v Y2xvb3AucmIJKHdvcmtpbmcgY29weSkKQEAgLTI0Nyw0OSArMjQ3LDQ5IEBAIGNsYXNzIEJhc2VJ bmRleAogICAgICAgICAgICAgcmFpc2UgIlVuZXhwZWN0ZWQgQmFzZUluZGV4IHR5cGU6ICN7dHlw ZX0iCiAgICAgICAgIGVuZAogICAgIGVuZAotICAgIGRlZiBwb2ludGVyRXhwcgorICAgIGRlZiBw b2ludGVyRXhwcihpbmRleFR5cGUpCiAgICAgICAgIGlmIGJhc2UuaXNfYT8gUmVnaXN0ZXJJRCBh bmQgYmFzZS5uYW1lID09ICJzcCIKLSAgICAgICAgICAgIG9mZnNldFZhbHVlID0gIigje2luZGV4 LmNsVmFsdWUoOmludDMyKX0gPDwgI3tzY2FsZVNoaWZ0fSkgKyAje29mZnNldC5jbFZhbHVlfSki CisgICAgICAgICAgICBvZmZzZXRWYWx1ZSA9ICIoI3tpbmRleC5jbFZhbHVlKGluZGV4VHlwZSl9 IDw8ICN7c2NhbGVTaGlmdH0pICsgI3tvZmZzZXQuY2xWYWx1ZX0pIgogICAgICAgICAgICAgIihB U1NFUlQoI3tvZmZzZXRWYWx1ZX0gPT0gb2Zmc2V0b2YoSklUU3RhY2tGcmFtZSwgZ2xvYmFsRGF0 YSkpLCAmc3AtPmdsb2JhbERhdGEpIgogICAgICAgICBlbHNlCi0gICAgICAgICAgICAiI3tiYXNl LmNsVmFsdWUoOmludDhQdHIpfSArICgje2luZGV4LmNsVmFsdWUoOmludDMyKX0gPDwgI3tzY2Fs ZVNoaWZ0fSkgKyAje29mZnNldC5jbFZhbHVlfSIKKyAgICAgICAgICAgICIje2Jhc2UuY2xWYWx1 ZSg6aW50OFB0cil9ICsgKCN7aW5kZXguY2xWYWx1ZShpbmRleFR5cGUpfSA8PCAje3NjYWxlU2hp ZnR9KSArICN7b2Zmc2V0LmNsVmFsdWV9IgogICAgICAgICBlbmQKICAgICBlbmQKICAgICBkZWYg aW50OE1lbVJlZgotICAgICAgICAiKkNBU1Q8aW50OF90Kj4oI3twb2ludGVyRXhwcn0pIgorICAg ICAgICAiKkNBU1Q8aW50OF90Kj4oI3twb2ludGVyRXhwcig6aW50MzIpfSkiCiAgICAgZW5kCiAg ICAgZGVmIGludDE2TWVtUmVmCi0gICAgICAgICIqQ0FTVDxpbnQxNl90Kj4oI3twb2ludGVyRXhw cn0pIgorICAgICAgICAiKkNBU1Q8aW50MTZfdCo+KCN7cG9pbnRlckV4cHIoOmludDMyKX0pIgog ICAgIGVuZAogICAgIGRlZiBpbnQzMk1lbVJlZgotICAgICAgICAiKkNBU1Q8aW50MzJfdCo+KCN7 cG9pbnRlckV4cHJ9KSIKKyAgICAgICAgIipDQVNUPGludDMyX3QqPigje3BvaW50ZXJFeHByKDpp bnQzMil9KSIKICAgICBlbmQKICAgICBkZWYgaW50NjRNZW1SZWYKLSAgICAgICAgIipDQVNUPGlu dDY0X3QqPigje3BvaW50ZXJFeHByfSkiCisgICAgICAgICIqQ0FTVDxpbnQ2NF90Kj4oI3twb2lu dGVyRXhwcig6aW50NjQpfSkiCiAgICAgZW5kCiAgICAgZGVmIGludE1lbVJlZgotICAgICAgICAi KkNBU1Q8aW50cHRyX3QqPigje3BvaW50ZXJFeHByfSkiCisgICAgICAgICIqQ0FTVDxpbnRwdHJf dCo+KCN7cG9pbnRlckV4cHIoOmludDMyKX0pIgogICAgIGVuZAogICAgIGRlZiB1aW50OE1lbVJl ZgotICAgICAgICAiKkNBU1Q8dWludDhfdCo+KCN7cG9pbnRlckV4cHJ9KSIKKyAgICAgICAgIipD QVNUPHVpbnQ4X3QqPigje3BvaW50ZXJFeHByKDppbnQzMil9KSIKICAgICBlbmQKICAgICBkZWYg dWludDE2TWVtUmVmCi0gICAgICAgICIqQ0FTVDx1aW50MTZfdCo+KCN7cG9pbnRlckV4cHJ9KSIK KyAgICAgICAgIipDQVNUPHVpbnQxNl90Kj4oI3twb2ludGVyRXhwcig6aW50MzIpfSkiCiAgICAg ZW5kCiAgICAgZGVmIHVpbnQzMk1lbVJlZgotICAgICAgICAiKkNBU1Q8dWludDMyX3QqPigje3Bv aW50ZXJFeHByfSkiCisgICAgICAgICIqQ0FTVDx1aW50MzJfdCo+KCN7cG9pbnRlckV4cHIoOmlu dDMyKX0pIgogICAgIGVuZAogICAgIGRlZiB1aW50NjRNZW1SZWYKLSAgICAgICAgIipDQVNUPHVp bnQ2NF90Kj4oI3twb2ludGVyRXhwcn0pIgorICAgICAgICAiKkNBU1Q8dWludDY0X3QqPigje3Bv aW50ZXJFeHByKDppbnQ2NCl9KSIKICAgICBlbmQKICAgICBkZWYgdWludE1lbVJlZgotICAgICAg ICAiKkNBU1Q8dWludHB0cl90Kj4oI3twb2ludGVyRXhwcn0pIgorICAgICAgICAiKkNBU1Q8dWlu dHB0cl90Kj4oI3twb2ludGVyRXhwcig6aW50KX0pIgogICAgIGVuZAogICAgIGRlZiBvcGNvZGVN ZW1SZWYKLSAgICAgICAgIipDQVNUPE9wY29kZSo+KCN7cG9pbnRlckV4cHJ9KSIKKyAgICAgICAg IipDQVNUPE9wY29kZSo+KCN7cG9pbnRlckV4cHIoOmludCl9KSIKICAgICBlbmQKICAgICBkZWYg ZGJsTWVtUmVmCi0gICAgICAgICIqQ0FTVDxkb3VibGUqPigje3BvaW50ZXJFeHByfSkiCisgICAg ICAgICIqQ0FTVDxkb3VibGUqPigje3BvaW50ZXJFeHByKDppbnQpfSkiCiAgICAgZW5kCiBlbmQK IAo= 171780 2012-10-31 23:40:15 -0700 2012-10-31 23:51:38 -0700 The real fix. bug-100899.patch text/plain 11281 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMzMTE5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDEyLTEwLTMxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBD KysgbGxpbnQgNjQtYml0IGJhY2tlbmQgbmVlZHMgdG8gemVybyBleHRlbmQgcmVzdWx0cyBvZiBp bnQzMiBvcGVyYXRpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAwODk5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGxsaW50IGFzbSBpbnN0cnVjdGlvbnMgZW5kaW5nIGluICJpIiBmb3IgYSA2NC1i aXQgbWFjaGluZSBleHBlY3RzIHRoZQorICAgICAgICBoaWdoIDMyLWJpdCBvZiByZWdpc3RlcnMg dG8gYmUgemVybydlZCBvdXQgd2hlbiBhIDMyLWJpdCBpbnN0cnVjdGlvbgorICAgICAgICB3cml0 ZXMgaW50byBhIHJlZ2lzdGVyLiBGaXhlZCB0aGUgQysrIGxsaW50IHRvIGhvbm9yIHRoaXMuCisK KyAgICAgICAgRml4ZWQgdGhlIGluZGV4IHJlZ2lzdGVyIHVzZWQgaW4gQmFzZUluZGV4IGFkZHJl c3NpbmcgdG8gYmUgb2Ygc2l6ZQorICAgICAgICBpbnRwdHJfdCBhcyBleHBlY3RlZC4KKworICAg ICAgICBVcGRhdGVkIENMb29wUmVnaXN0ZXIgdG8gaGFuZGxlIGRpZmZlcmVudCBlbmRpYW5uZXNz cyBjb25maWd1cmF0aW9ucy4KKworICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIu Y3BwOgorICAgICAgICAoSlNDOjpDTG9vcFJlZ2lzdGVyOjpjbGVhckhpZ2hXb3JkKToKKyAgICAg ICAgICAtIG5ldyBtZXRob2QgdG8gY2xlYXIgdGhlIGhpZ2ggMzItYml0IG9mIGEgNjQtYml0IHJl Z2lzdGVyLgorICAgICAgICAgICAgSXQncyBhIG5vLW9wIGZvciB0aGUgMzItYml0IGJ1aWxkLiAK KyAgICAgICAgKENMb29wUmVnaXN0ZXIpOgorICAgICAgICAgIC0gQ0xvb3BSZWdpc3RlciBub3cg dGFrZXMgY2FyZSBvZiBwYWNraW5nIGFuZCBieXRlIGVuZGlhbm5lc3Mgb3JkZXIuCisgICAgICAg IChKU0M6OkNMb29wOjpleGVjdXRlKTogLSBBZGRlZCBhbiBhc3NlcnQuCisgICAgICAgICogb2Zm bGluZWFzbS9jbG9vcC5yYjoKKyAgICAgICAgICAtIEFkZCBjYWxscyB0byBjbGVhckhpZ2hXb3Jk KCkgd2hlcmV2ZXIgbmVlZGVkLgorCiAyMDEyLTEwLTMxICBNYXJrIExhbSAgPG1hcmsubGFtQGFw cGxlLmNvbT4KIAogICAgICAgICBBIEpTQyBwcmludGYgKHN1cHBvcnQgZm9yICVKK3MgYW5kICVi KS4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJ bnRlcnByZXRlci5jcHAJKHJldmlzaW9uIDEzMzExOSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIyLDYg KzEyMiw5OCBAQCBzdGF0aWMgZG91YmxlIEludHMyRG91YmxlKHVpbnQzMl90IGxvLCB1CiAKIAog Ly89PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09CisvLyBDTG9vcFJlZ2lzdGVyIGlzIHRoZSBzdG9yYWdlIGZv ciBhbiBlbXVsYXRlZCBDUFUgcmVnaXN0ZXIuCisvLyBJdCBkZWZpbmVzIHRoZSBwb2xpY3kgb2Yg aG93IGludHMgc21hbGxlciB0aGFuIGludHB0cl90IGFyZSBwYWNrZWQgaW50byB0aGUKKy8vIHBz ZXVkbyByZWdpc3RlciwgYXMgd2VsbCBhcyBoaWRlcyBlbmRpYW5uZXNzIGRpZmZlcmVuY2VzLgor CitzdHJ1Y3QgQ0xvb3BSZWdpc3RlciB7CisgICAgdW5pb24geworICAgICAgICBpbnRwdHJfdCBp OworICAgICAgICB1aW50cHRyX3QgdTsKKyNpZiBVU0UoSlNWQUxVRTY0KQorI2lmIENQVShCSUdf RU5ESUFOKQorICAgICAgICBzdHJ1Y3QgeworICAgICAgICAgICAgaW50MzJfdCBpMzJwYWRkaW5n OworICAgICAgICAgICAgaW50MzJfdCBpMzI7CisgICAgICAgIH07CisgICAgICAgIHN0cnVjdCB7 CisgICAgICAgICAgICB1aW50MzJfdCB1MzJwYWRkaW5nOworICAgICAgICAgICAgdWludDMyX3Qg dTMyOworICAgICAgICB9OworICAgICAgICBzdHJ1Y3QgeworICAgICAgICAgICAgaW50OF90IGk4 cGFkZGluZ1s3XTsKKyAgICAgICAgICAgIGludDhfdCBpODsKKyAgICAgICAgfTsKKyAgICAgICAg c3RydWN0IHsKKyAgICAgICAgICAgIHVpbnQ4X3QgdThwYWRkaW5nWzddOworICAgICAgICAgICAg dWludDhfdCB1ODsKKyAgICAgICAgfTsKKyNlbHNlIC8vICFDUFUoQklHX0VORElBTikKKyAgICAg ICAgc3RydWN0IHsKKyAgICAgICAgICAgIGludDMyX3QgaTMyOworICAgICAgICAgICAgaW50MzJf dCBpMzJwYWRkaW5nOworICAgICAgICB9OworICAgICAgICBzdHJ1Y3QgeworICAgICAgICAgICAg dWludDMyX3QgdTMyOworICAgICAgICAgICAgdWludDMyX3QgdTMycGFkZGluZzsKKyAgICAgICAg fTsKKyAgICAgICAgc3RydWN0IHsKKyAgICAgICAgICAgIGludDhfdCBpODsKKyAgICAgICAgICAg IGludDhfdCBpOHBhZGRpbmdbN107CisgICAgICAgIH07CisgICAgICAgIHN0cnVjdCB7CisgICAg ICAgICAgICB1aW50OF90IHU4OworICAgICAgICAgICAgdWludDhfdCB1OHBhZGRpbmdbN107Cisg ICAgICAgIH07CisjZW5kaWYgLy8gIUNQVShCSUdfRU5ESUFOKQorI2Vsc2UgLy8gIVVTRShKU1ZB TFVFNjQpCisgICAgICAgIGludDMyX3QgaTMyOworICAgICAgICB1aW50MzJfdCB1MzI7CisKKyNp ZiBDUFUoQklHX0VORElBTikKKyAgICAgICAgc3RydWN0IHsKKyAgICAgICAgICAgIGludDhfdCBp OHBhZGRpbmdbM107CisgICAgICAgICAgICBpbnQ4X3QgaTg7CisgICAgICAgIH07CisgICAgICAg IHN0cnVjdCB7CisgICAgICAgICAgICB1aW50OF90IHU4cGFkZGluZ1szXTsKKyAgICAgICAgICAg IHVpbnQ4X3QgdTg7CisgICAgICAgIH07CisKKyNlbHNlIC8vICFDUFUoQklHX0VORElBTikKKyAg ICAgICAgc3RydWN0IHsKKyAgICAgICAgICAgIGludDhfdCBpODsKKyAgICAgICAgICAgIGludDhf dCBpOHBhZGRpbmdbM107CisgICAgICAgIH07CisgICAgICAgIHN0cnVjdCB7CisgICAgICAgICAg ICB1aW50OF90IHU4OworICAgICAgICAgICAgdWludDhfdCB1OHBhZGRpbmdbM107CisgICAgICAg IH07CisjZW5kaWYgLy8gIUNQVShCSUdfRU5ESUFOKQorI2VuZGlmIC8vICFVU0UoSlNWQUxVRTY0 KQorCisgICAgICAgIGludDhfdCogaThwOworICAgICAgICB2b2lkKiB2cDsKKyAgICAgICAgRXhl Y1N0YXRlKiBleGVjU3RhdGU7CisgICAgICAgIHZvaWQqIGluc3RydWN0aW9uOworICAgICAgICBO YXRpdmVGdW5jdGlvbiBuYXRpdmVGdW5jOworI2lmIFVTRShKU1ZBTFVFNjQpCisgICAgICAgIGlu dDY0X3QgaTY0OworICAgICAgICB1aW50NjRfdCB1NjQ7CisgICAgICAgIEVuY29kZWRKU1ZhbHVl IGVuY29kZWRKU1ZhbHVlOworICAgICAgICBkb3VibGUgY2FzdFRvRG91YmxlOworI2VuZGlmCisg ICAgICAgIE9wY29kZSBvcGNvZGU7CisgICAgfTsKKworI2lmIFVTRShKU1ZBTFVFNjQpCisgICAg aW5saW5lIHZvaWQgY2xlYXJIaWdoV29yZCgpIHsgaTMycGFkZGluZyA9IDA7IH0KKyNlbHNlCisg ICAgaW5saW5lIHZvaWQgY2xlYXJIaWdoV29yZCgpIHsgfQorI2VuZGlmCit9OworCisvLz09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KIC8vIFRoZSBsbGludCBDKysgaW50ZXJwcmV0ZXIgbG9vcDoKIC8vCiAK QEAgLTE2NCwyNiArMjU2LDggQEAgSlNWYWx1ZSBDTG9vcDo6ZXhlY3V0ZShDYWxsRnJhbWUqIGNh bGxGcgogICAgIEFTU0VSVChjYWxsRnJhbWUtPmdsb2JhbERhdGEoKS50b3BDYWxsRnJhbWUgPT0g Y2FsbEZyYW1lKTsKIAogICAgIC8vIERlZmluZSB0aGUgcHNldWRvIHJlZ2lzdGVycyB1c2VkIGJ5 IHRoZSBMTElOVCBDIExvb3AgYmFja2VuZDoKLSAgICB1bmlvbiBDTG9vcFJlZ2lzdGVyIHsKLSAg ICAgICAgaW50cHRyX3QgaTsKLSAgICAgICAgdWludHB0cl90IHU7Ci0gICAgICAgIGludDMyX3Qg aTMyOwotICAgICAgICB1aW50MzJfdCB1MzI7Ci0gICAgICAgIGludDhfdCBpODsKLSAgICAgICAg dWludDhfdCB1ODsKLSAgICAgICAgaW50OF90KiBpOHA7Ci0gICAgICAgIHZvaWQqIHZwOwotICAg ICAgICBFeGVjU3RhdGUqIGV4ZWNTdGF0ZTsKLSAgICAgICAgdm9pZCogaW5zdHJ1Y3Rpb247Ci0g ICAgICAgIE5hdGl2ZUZ1bmN0aW9uIG5hdGl2ZUZ1bmM7Ci0jaWYgVVNFKEpTVkFMVUU2NCkKLSAg ICAgICAgaW50NjRfdCBpNjQ7Ci0gICAgICAgIHVpbnQ2NF90IHU2NDsKLSAgICAgICAgRW5jb2Rl ZEpTVmFsdWUgZW5jb2RlZEpTVmFsdWU7Ci0gICAgICAgIGRvdWJsZSBjYXN0VG9Eb3VibGU7Ci0j ZW5kaWYKLSAgICAgICAgT3Bjb2RlIG9wY29kZTsKLSAgICB9OworICAgIEFTU0VSVChzaXplb2Yo Q0xvb3BSZWdpc3RlcikgPT0gc2l6ZW9mKGludHB0cl90KSk7CisKICAgICB1bmlvbiBDTG9vcERv dWJsZVJlZ2lzdGVyIHsKICAgICAgICAgZG91YmxlIGQ7CiAjaWYgVVNFKEpTVkFMVUU2NCkKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2Nsb29wLnJiCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2Nsb29wLnJiCShyZXZpc2lvbiAx MzMxMTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9jbG9vcC5yYgkod29y a2luZyBjb3B5KQpAQCAtMjQ5LDEwICsyNDksMTAgQEAgY2xhc3MgQmFzZUluZGV4CiAgICAgZW5k CiAgICAgZGVmIHBvaW50ZXJFeHByCiAgICAgICAgIGlmIGJhc2UuaXNfYT8gUmVnaXN0ZXJJRCBh bmQgYmFzZS5uYW1lID09ICJzcCIKLSAgICAgICAgICAgIG9mZnNldFZhbHVlID0gIigje2luZGV4 LmNsVmFsdWUoOmludDMyKX0gPDwgI3tzY2FsZVNoaWZ0fSkgKyAje29mZnNldC5jbFZhbHVlfSki CisgICAgICAgICAgICBvZmZzZXRWYWx1ZSA9ICIoI3tpbmRleC5jbFZhbHVlfSA8PCAje3NjYWxl U2hpZnR9KSArICN7b2Zmc2V0LmNsVmFsdWV9KSIKICAgICAgICAgICAgICIoQVNTRVJUKCN7b2Zm c2V0VmFsdWV9ID09IG9mZnNldG9mKEpJVFN0YWNrRnJhbWUsIGdsb2JhbERhdGEpKSwgJnNwLT5n bG9iYWxEYXRhKSIKICAgICAgICAgZWxzZQotICAgICAgICAgICAgIiN7YmFzZS5jbFZhbHVlKDpp bnQ4UHRyKX0gKyAoI3tpbmRleC5jbFZhbHVlKDppbnQzMil9IDw8ICN7c2NhbGVTaGlmdH0pICsg I3tvZmZzZXQuY2xWYWx1ZX0iCisgICAgICAgICAgICAiI3tiYXNlLmNsVmFsdWUoOmludDhQdHIp fSArICgje2luZGV4LmNsVmFsdWV9IDw8ICN7c2NhbGVTaGlmdH0pICsgI3tvZmZzZXQuY2xWYWx1 ZX0iCiAgICAgICAgIGVuZAogICAgIGVuZAogICAgIGRlZiBpbnQ4TWVtUmVmCkBAIC0zNTMsMjIg KzM1Myw0NyBAQCBlbmQKIAogCiBkZWYgY2xvb3BFbWl0T3BlcmF0aW9uKG9wZXJhbmRzLCB0eXBl LCBvcGVyYXRvcikKKyAgICByYWlzZSB1bmxlc3MgdHlwZSA9PSA6aW50IHx8IHR5cGUgPT0gOnVp bnQgfHwgdHlwZSA9PSA6aW50MzIgfHwgdHlwZSA9PSA6dWludDMyIHx8IFwKKyAgICAgICAgdHlw ZSA9PSA6aW50NjQgfHwgdHlwZSA9PSA6dWludDY0IHx8IHR5cGUgPT0gOmRvdWJsZQogICAgIGlm IG9wZXJhbmRzLnNpemUgPT0gMwogICAgICAgICAkYXNtLnB1dGMgIiN7b3BlcmFuZHNbMl0uY2xW YWx1ZSh0eXBlKX0gPSAje29wZXJhbmRzWzFdLmNsVmFsdWUodHlwZSl9ICN7b3BlcmF0b3J9ICN7 b3BlcmFuZHNbMF0uY2xWYWx1ZSh0eXBlKX07IgorICAgICAgICBpZiBvcGVyYW5kc1syXS5pc19h PyBSZWdpc3RlcklEIGFuZCAodHlwZSA9PSA6aW50MzIgb3IgdHlwZSA9PSA6dWludDMyKQorICAg ICAgICAgICAgJGFzbS5wdXRjICIje29wZXJhbmRzWzJdLmR1bXB9LmNsZWFySGlnaFdvcmQoKTsi ICMgSnVzdCBjbGVhciBpdC4gSXQgZG9lcyBub3RoaW5nIG9uIHRoZSAzMi1iaXQgcG9ydC4KKyAg ICAgICAgZW5kCiAgICAgZWxzZQogICAgICAgICByYWlzZSB1bmxlc3Mgb3BlcmFuZHMuc2l6ZSA9 PSAyCiAgICAgICAgIHJhaXNlIHVubGVzcyBub3Qgb3BlcmFuZHNbMV0uaXNfYT8gSW1tZWRpYXRl CiAgICAgICAgICRhc20ucHV0YyAiI3tvcGVyYW5kc1sxXS5jbFZhbHVlKHR5cGUpfSA9ICN7b3Bl cmFuZHNbMV0uY2xWYWx1ZSh0eXBlKX0gI3tvcGVyYXRvcn0gI3tvcGVyYW5kc1swXS5jbFZhbHVl KHR5cGUpfTsiCisgICAgICAgIGlmIG9wZXJhbmRzWzFdLmlzX2E/IFJlZ2lzdGVySUQgYW5kICh0 eXBlID09IDppbnQzMiBvciB0eXBlID09IDp1aW50MzIpCisgICAgICAgICAgICAkYXNtLnB1dGMg IiN7b3BlcmFuZHNbMV0uZHVtcH0uY2xlYXJIaWdoV29yZCgpOyIgIyBKdXN0IGNsZWFyIGl0LiBJ dCBkb2VzIG5vdGhpbmcgb24gdGhlIDMyLWJpdCBwb3J0LgorICAgICAgICBlbmQKICAgICBlbmQK IGVuZAogCiBkZWYgY2xvb3BFbWl0U2hpZnRPcGVyYXRpb24ob3BlcmFuZHMsIHR5cGUsIG9wZXJh dG9yKQorICAgIHJhaXNlIHVubGVzcyB0eXBlID09IDppbnQgfHwgdHlwZSA9PSA6dWludCB8fCB0 eXBlID09IDppbnQzMiB8fCB0eXBlID09IDp1aW50MzIgfHwgdHlwZSA9PSA6aW50NjQgfHwgdHlw ZSA9PSA6dWludDY0CiAgICAgaWYgb3BlcmFuZHMuc2l6ZSA9PSAzCiAgICAgICAgICRhc20ucHV0 YyAiI3tvcGVyYW5kc1syXS5jbFZhbHVlKHR5cGUpfSA9ICN7b3BlcmFuZHNbMV0uY2xWYWx1ZSh0 eXBlKX0gI3tvcGVyYXRvcn0gKCN7b3BlcmFuZHNbMF0uY2xWYWx1ZSg6aW50KX0gJiAweDFmKTsi CisgICAgICAgIGlmIG9wZXJhbmRzWzJdLmlzX2E/IFJlZ2lzdGVySUQgYW5kICh0eXBlID09IDpp bnQzMiBvciB0eXBlID09IDp1aW50MzIpCisgICAgICAgICAgICAkYXNtLnB1dGMgIiN7b3BlcmFu ZHNbMl0uZHVtcH0uY2xlYXJIaWdoV29yZCgpOyIgIyBKdXN0IGNsZWFyIGl0LiBJdCBkb2VzIG5v dGhpbmcgb24gdGhlIDMyLWJpdCBwb3J0LgorICAgICAgICBlbmQKICAgICBlbHNlCiAgICAgICAg IHJhaXNlIHVubGVzcyBvcGVyYW5kcy5zaXplID09IDIKICAgICAgICAgcmFpc2UgdW5sZXNzIG5v dCBvcGVyYW5kc1sxXS5pc19hPyBJbW1lZGlhdGUKICAgICAgICAgJGFzbS5wdXRjICIje29wZXJh bmRzWzFdLmNsVmFsdWUodHlwZSl9ID0gI3tvcGVyYW5kc1sxXS5jbFZhbHVlKHR5cGUpfSAje29w ZXJhdG9yfSAoI3tvcGVyYW5kc1swXS5jbFZhbHVlKDppbnQpfSAmIDB4MWYpOyIKKyAgICAgICAg aWYgb3BlcmFuZHNbMV0uaXNfYT8gUmVnaXN0ZXJJRCBhbmQgKHR5cGUgPT0gOmludDMyIG9yIHR5 cGUgPT0gOnVpbnQzMikKKyAgICAgICAgICAgICRhc20ucHV0YyAiI3tvcGVyYW5kc1sxXS5kdW1w fS5jbGVhckhpZ2hXb3JkKCk7IiAjIEp1c3QgY2xlYXIgaXQuIEl0IGRvZXMgbm90aGluZyBvbiB0 aGUgMzItYml0IHBvcnQuCisgICAgICAgIGVuZAorICAgIGVuZAorZW5kCisKK2RlZiBjbG9vcEVt aXRVbmFyeU9wZXJhdGlvbihvcGVyYW5kcywgdHlwZSwgb3BlcmF0b3IpCisgICAgcmFpc2UgdW5s ZXNzIHR5cGUgPT0gOmludCB8fCB0eXBlID09IDp1aW50IHx8IHR5cGUgPT0gOmludDMyIHx8IHR5 cGUgPT0gOnVpbnQzMiB8fCB0eXBlID09IDppbnQ2NCB8fCB0eXBlID09IDp1aW50NjQKKyAgICBy YWlzZSB1bmxlc3Mgb3BlcmFuZHMuc2l6ZSA9PSAxCisgICAgcmFpc2UgdW5sZXNzIG5vdCBvcGVy YW5kc1swXS5pc19hPyBJbW1lZGlhdGUKKyAgICAkYXNtLnB1dGMgIiN7b3BlcmFuZHNbMF0uY2xW YWx1ZSh0eXBlKX0gPSAje29wZXJhdG9yfSN7b3BlcmFuZHNbMF0uY2xWYWx1ZSh0eXBlKX07Igor ICAgIGlmIG9wZXJhbmRzWzBdLmlzX2E/IFJlZ2lzdGVySUQgYW5kICh0eXBlID09IDppbnQzMiBv ciB0eXBlID09IDp1aW50MzIpCisgICAgICAgICRhc20ucHV0YyAiI3tvcGVyYW5kc1swXS5kdW1w fS5jbGVhckhpZ2hXb3JkKCk7IiAjIEp1c3QgY2xlYXIgaXQuIEl0IGRvZXMgbm90aGluZyBvbiB0 aGUgMzItYml0IHBvcnQuCiAgICAgZW5kCiBlbmQKIApAQCAtNTk1LDE3ICs2MjAsMTkgQEAgY2xh c3MgSW5zdHJ1Y3Rpb24KICAgICAgICAgICAgIGNsb29wRW1pdE9wZXJhdGlvbihvcGVyYW5kcywg OmludCwgIi0iKQogCiAgICAgICAgIHdoZW4gIm5lZ2kiCi0gICAgICAgICAgICAkYXNtLnB1dGMg IiN7b3BlcmFuZHNbMF0uY2xWYWx1ZSg6aW50MzIpfSA9IC0je29wZXJhbmRzWzBdLmNsVmFsdWUo OmludDMyKX07IgorICAgICAgICAgICAgY2xvb3BFbWl0VW5hcnlPcGVyYXRpb24ob3BlcmFuZHMs IDppbnQzMiwgIi0iKQogICAgICAgICB3aGVuICJuZWdxIgotICAgICAgICAgICAgJGFzbS5wdXRj ICIje29wZXJhbmRzWzBdLmNsVmFsdWUoOmludDY0KX0gPSAtI3tvcGVyYW5kc1swXS5jbFZhbHVl KDppbnQ2NCl9OyIKKyAgICAgICAgICAgIGNsb29wRW1pdFVuYXJ5T3BlcmF0aW9uKG9wZXJhbmRz LCA6aW50NjQsICItIikKICAgICAgICAgd2hlbiAibmVncCIKLSAgICAgICAgICAgICRhc20ucHV0 YyAiI3tvcGVyYW5kc1swXS5jbFZhbHVlKDppbnQpfSA9IC0je29wZXJhbmRzWzBdLmNsVmFsdWUo OmludCl9OyIKKyAgICAgICAgICAgIGNsb29wRW1pdFVuYXJ5T3BlcmF0aW9uKG9wZXJhbmRzLCA6 aW50LCAiLSIpCiAKICAgICAgICAgd2hlbiAibm90aSIKLSAgICAgICAgICAgICRhc20ucHV0YyAi I3tvcGVyYW5kc1swXS5jbFZhbHVlKDppbnQzMil9ID0gISN7b3BlcmFuZHNbMF0uY2xWYWx1ZSg6 aW50MzIpfTsiCisgICAgICAgICAgICBjbG9vcEVtaXRVbmFyeU9wZXJhdGlvbihvcGVyYW5kcywg OmludDMyLCAiISIpCiAKICAgICAgICAgd2hlbiAibG9hZGkiCi0gICAgICAgICAgICAkYXNtLnB1 dGMgIiN7b3BlcmFuZHNbMV0uY2xWYWx1ZSg6aW50KX0gPSAje29wZXJhbmRzWzBdLnVpbnQzMk1l bVJlZn07IgorICAgICAgICAgICAgJGFzbS5wdXRjICIje29wZXJhbmRzWzFdLmNsVmFsdWUoOnVp bnQpfSA9ICN7b3BlcmFuZHNbMF0udWludDMyTWVtUmVmfTsiCisgICAgICAgICAgICAjIFRoZXJl J3Mgbm8gbmVlZCB0byBjYWxsIGNsZWFySGlnaFdvcmQoKSBoZXJlIGJlY2F1c2UgdGhlIGFib3Zl IHdpbGwKKyAgICAgICAgICAgICMgYXV0b21hdGljYWxseSB0YWtlIGNhcmUgb2YgMCBleHRlbnNp b24uCiAgICAgICAgIHdoZW4gImxvYWRpcyIKICAgICAgICAgICAgICRhc20ucHV0YyAiI3tvcGVy YW5kc1sxXS5jbFZhbHVlKDppbnQpfSA9ICN7b3BlcmFuZHNbMF0uaW50MzJNZW1SZWZ9OyIKICAg ICAgICAgd2hlbiAibG9hZHEiCkBAIC02NzYsNiArNzAzLDcgQEAgY2xhc3MgSW5zdHJ1Y3Rpb24K IAogICAgICAgICB3aGVuICJ0ZDJpIgogICAgICAgICAgICAgJGFzbS5wdXRjICIje29wZXJhbmRz WzFdLmNsVmFsdWUoOmludCl9ID0gI3tvcGVyYW5kc1swXS5jbFZhbHVlKDpkb3VibGUpfTsiCisg ICAgICAgICAgICAkYXNtLnB1dGMgIiN7b3BlcmFuZHNbMV0uZHVtcH0uY2xlYXJIaWdoV29yZCgp OyIKIAogICAgICAgICB3aGVuICJiY2QyaSIgICMgb3BlcmFuZHM6IHNyY0RibCBkc3RJbnQgc2xv d1BhdGgKICAgICAgICAgICAgICRhc20ucHV0YyAieyIKQEAgLTY4NCw2ICs3MTIsNyBAQCBjbGFz cyBJbnN0cnVjdGlvbgogICAgICAgICAgICAgJGFzbS5wdXRjICIgICAgaWYgKGFzSW50MzIgIT0g ZCB8fCAoIWFzSW50MzIgJiYgc2lnbmJpdChkKSkpIC8vIHRydWUgZm9yIC0wLjAiCiAgICAgICAg ICAgICAkYXNtLnB1dGMgIiAgICAgICAgZ290byAgI3tvcGVyYW5kc1syXS5jTGFiZWx9OyIKICAg ICAgICAgICAgICRhc20ucHV0YyAiICAgICN7b3BlcmFuZHNbMV0uY2xWYWx1ZX0gPSBhc0ludDMy OyIgICAgICAgICAgICAKKyAgICAgICAgICAgICRhc20ucHV0YyAiICAgICN7b3BlcmFuZHNbMV0u ZHVtcH0uY2xlYXJIaWdoV29yZCgpOyIKICAgICAgICAgICAgICRhc20ucHV0YyAifSIKIAogICAg ICAgICB3aGVuICJtb3ZlIgpAQCAtOTY1LDcgKzk5NCw5IEBAIGNsYXNzIEluc3RydWN0aW9uCiAg ICAgICAgICAgICAkYXNtLnB1dGMgInsiCiAgICAgICAgICAgICAkYXNtLnB1dGMgIiAgICBpbnQ2 NF90IHRlbXAgPSB0MC5pMzI7IC8vIHNpZ24gZXh0ZW5kIHRoZSBsb3cgMzJiaXQiCiAgICAgICAg ICAgICAkYXNtLnB1dGMgIiAgICB0MC5pMzIgPSB0ZW1wOyAvLyBsb3cgd29yZCIKKyAgICAgICAg ICAgICRhc20ucHV0YyAiICAgIHQwLmNsZWFySGlnaFdvcmQoKTsiCiAgICAgICAgICAgICAkYXNt LnB1dGMgIiAgICB0MS5pMzIgPSB1aW50NjRfdCh0ZW1wKSA+PiAzMjsgLy8gaGlnaCB3b3JkIgor ICAgICAgICAgICAgJGFzbS5wdXRjICIgICAgdDEuY2xlYXJIaWdoV29yZCgpOyIKICAgICAgICAg ICAgICRhc20ucHV0YyAifSIKIAogICAgICAgICAjIDY0LWJpdCBpbnN0cnVjdGlvbjogaWRpdmkg b3AxIChiYXNlZCBvbiBYNjQpCkBAIC05ODUsNyArMTAxNiw5IEBAIGNsYXNzIEluc3RydWN0aW9u CiAgICAgICAgICAgICAkYXNtLnB1dGMgIiAgICBpbnQ2NF90IGRpdmlkZW5kID0gKGludDY0X3Qo dDEudTMyKSA8PCAzMikgfCB0MC51MzI7IgogICAgICAgICAgICAgJGFzbS5wdXRjICIgICAgaW50 NjRfdCBkaXZpc29yID0gI3tvcGVyYW5kc1swXS5jbFZhbHVlKDppbnQpfTsiCiAgICAgICAgICAg ICAkYXNtLnB1dGMgIiAgICB0MS5pMzIgPSBkaXZpZGVuZCAlIGRpdmlzb3I7IC8vIHJlbWFpbmRl ciIKKyAgICAgICAgICAgICRhc20ucHV0YyAiICAgIHQxLmNsZWFySGlnaFdvcmQoKTsiCiAgICAg ICAgICAgICAkYXNtLnB1dGMgIiAgICB0MC5pMzIgPSBkaXZpZGVuZCAvIGRpdmlzb3I7IC8vIHF1 b3RpZW50IgorICAgICAgICAgICAgJGFzbS5wdXRjICIgICAgdDAuY2xlYXJIaWdoV29yZCgpOyIK ICAgICAgICAgICAgICRhc20ucHV0YyAifSIKIAogICAgICAgICAjIDMyLWJpdCBpbnN0cnVjdGlv bjogZmlpMmQgaW50MzJMb09wIGludDMySGlPcCBkYmxPcCAoYmFzZWQgb24gQVJNdjcpCg==