46095 2010-09-20 08:37:28 -0700 MacroAssemblerARM generates unaligned loads 2011-02-01 06:40:21 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Other RESOLVED FIXED http://acid3.acidtests.org P2 Normal --- 0 dave+webkit webkit-unassigned barraclough commit-queue eric loki staikos thomas zherczeg oldest_to_newest 281568 0 dave+webkit 2010-09-20 08:37:28 -0700 While running acid3.acidtests.org on a ARMv5 processor a ldr r8,[r1, #7] will be generated This instruction should be ldrb r8,[r1, #7] The problem code is the set8 and setTest8 implementations call load32 where they should be calling load8. 281626 1 68102 dave+webkit 2010-09-20 10:10:50 -0700 Created attachment 68102 Fix alignment failures 281719 2 zherczeg 2010-09-20 11:53:56 -0700 Good fix. Could you add a common function for the common code of setTest8 and setTest32 to avoid code duplication? 282277 3 68235 dave+webkit 2010-09-21 06:55:44 -0700 Created attachment 68235 Add new setTest32 with RegisterID parameter 300508 4 68235 oliver 2010-10-27 13:25:26 -0700 Comment on attachment 68235 Add new setTest32 with RegisterID parameter Have you tested perf impact of this on non-armv5? 300527 5 dave+webkit 2010-10-27 13:46:27 -0700 (In reply to comment #4) > (From update of attachment 68235 [details]) > Have you tested perf impact of this on non-armv5? No I didn't measure a pref impact. The old code was just wrong; as the fill on the register would be wrong because it would be using data around the address instead of letting the core fill in zeros into the register in top 3 bytes. So one could expect an incorrect branch occasionally and possible data exposure. 317014 6 eric 2010-12-03 13:33:34 -0800 This seems like an easy patch for gbarra to review. 317320 7 68235 barraclough 2010-12-04 16:04:53 -0800 Comment on attachment 68235 Add new setTest32 with RegisterID parameter Hi David, These methods had been rather poorly named, and it was rather unclear what they were doing. I've hopefully just cleared this up a little: https://bugs.webkit.org/show_bug.cgi?id=50509 Looking at your patch, I think your changes to (the method previously known as) setTest8 are correct, but the change to set8 is incorrect, and should be reverted. Please update & check your change. cheers, G. 342661 8 80657 dave+webkit 2011-01-31 10:29:11 -0800 Created attachment 80657 Re-apply patch to set32Test8 as per comments Applied patch as per comments. 342667 9 80657 barraclough 2011-01-31 10:36:21 -0800 Comment on attachment 80657 Re-apply patch to set32Test8 as per comments Looks great David. 343196 10 80657 commit-queue 2011-02-01 06:40:15 -0800 Comment on attachment 80657 Re-apply patch to set32Test8 as per comments Clearing flags on attachment: 80657 Committed r77248: <http://trac.webkit.org/changeset/77248> 343197 11 commit-queue 2011-02-01 06:40:21 -0800 All reviewed patches have been landed. Closing bug. 68102 2010-09-20 10:10:50 -0700 2010-09-21 06:55:44 -0700 Fix alignment failures 46095.txt text/plain 2848 dave+webkit Y29tbWl0IGE3MmIyZTQzOGM4MTAxZWI4ZGNhYjRkOWIwYWIyYmRhZDFmNTBlZGEKQXV0aG9yOiBE YXZlIFRhcHVza2EgPGR0YXB1c2thQHJpbS5jb20+CkRhdGU6ICAgTW9uIFNlcCAyMCAxMzowNTow NSAyMDEwIC0wNDAwCgogICAgMjAxMC0wOS0yMCAgRGF2ZSBUYXB1c2thICA8ZHRhcHVza2FAcmlt LmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICAgIAog ICAgICAgICAgICBNYWNyb0Fzc2VtYmxlckFSTSB3b3VsZCBnZW5lcmF0ZSBjb2RlIHRoYXQgZGlk IDMyYml0IGxvYWRzCiAgICAgICAgICAgIG9uIGFkZHJlc3NlcyB0aGF0IHdlcmUgbm90IGFsaWdu ZWQuIE1vcmUgc3BlY2lmaWNhbGx5IGl0IHdvdWxkCiAgICAgICAgICAgIGdlbmVyYXRlIGEgbGRy IHI4LFtyMSwgIzddIHdoaWNoIGlzbid0IHZhbGlkIG9uIEFSTXY1IGFuZCBsb3dlci4KICAgICAg ICAgICAgVGhlIGludGVuZGVkIGluc3RydWN0aW9uIHJlYWxseSBpcyBsZHJiIHI4LFtyMSwgIzdd OyBlbnN1cmUgd2UKICAgICAgICAgICAgY2FsbCBsb2FkOCBpbnN0ZWFkIG9mIGxvYWQzMi4KICAg IAogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYw OTUKICAgIAogICAgICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgogICAg ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6c2V0OCk6CiAgICAgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyQVJNOjpzZXRUZXN0OCk6CgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDM0OTA3NDguLmVm ZjY3OTEgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0yMCAgRGF2ZSBUYXB1 c2thICA8ZHRhcHVza2FAcmltLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYWNyb0Fzc2VtYmxlckFSTSB3b3VsZCBnZW5lcmF0ZSBjb2RlIHRo YXQgZGlkIDMyYml0IGxvYWRzCisgICAgICAgIG9uIGFkZHJlc3NlcyB0aGF0IHdlcmUgbm90IGFs aWduZWQuIE1vcmUgc3BlY2lmaWNhbGx5IGl0IHdvdWxkCisgICAgICAgIGdlbmVyYXRlIGEgbGRy IHI4LFtyMSwgIzddIHdoaWNoIGlzbid0IHZhbGlkIG9uIEFSTXY1IGFuZCBsb3dlci4KKyAgICAg ICAgVGhlIGludGVuZGVkIGluc3RydWN0aW9uIHJlYWxseSBpcyBsZHJiIHI4LFtyMSwgIzddOyBl bnN1cmUgd2UKKyAgICAgICAgY2FsbCBsb2FkOCBpbnN0ZWFkIG9mIGxvYWQzMi4KKyAgICAgICAg CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjA5NQor CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmg6CisgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyQVJNOjpzZXQ4KToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJB Uk06OnNldFRlc3Q4KToKKwogMjAxMC0wOS0xOSAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNs b3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgV2luZG93cyBidWlsZCBmaXggcHQgMi4KZGlmZiAt LWdpdCBhL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oIGIvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmgKaW5kZXggNWRlOGIzNC4u MTIzZDlkNCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyQVJNLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJN LmgKQEAgLTYzNyw3ICs2MzcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXQ4KENvbmRpdGlvbiBj b25kLCBBZGRyZXNzIGxlZnQsIFJlZ2lzdGVySUQgcmlnaHQsIFJlZ2lzdGVySUQgZGVzdCkKICAg ICB7CiAgICAgICAgIC8vIEFSTSBkb2Vzbid0IGhhdmUgYnl0ZSByZWdpc3RlcnMKLSAgICAgICAg bG9hZDMyKGxlZnQsIEFSTVJlZ2lzdGVyczo6UzEpOworICAgICAgICBsb2FkOChsZWZ0LCBBUk1S ZWdpc3RlcnM6OlMxKTsKICAgICAgICAgc2V0MzIoY29uZCwgQVJNUmVnaXN0ZXJzOjpTMSwgcmln aHQsIGRlc3QpOwogICAgIH0KIApAQCAtNjYwLDggKzY2MCwxMyBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIHNldFRlc3Q4KENvbmRpdGlvbiBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIEltbTMyIG1hc2ss IFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIC8vIEFSTSBkb2Vzbid0IGhhdmUgYnl0 ZSByZWdpc3RlcnMKLSAgICAgICAgc2V0VGVzdDMyKGNvbmQsIGFkZHJlc3MsIG1hc2ssIGRlc3Qp OworICAgICAgICBsb2FkOChhZGRyZXNzLCBBUk1SZWdpc3RlcnM6OlMxKTsKKyAgICAgICAgaWYg KG1hc2subV92YWx1ZSA9PSAtMSkKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmNtcF9yKDAsIEFS TVJlZ2lzdGVyczo6UzEpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBtX2Fzc2VtYmxlci50 c3RfcihBUk1SZWdpc3RlcnM6OlMxLCBtX2Fzc2VtYmxlci5nZXRJbW0obWFzay5tX3ZhbHVlLCBB Uk1SZWdpc3RlcnM6OlMwKSk7CisgICAgICAgIG1fYXNzZW1ibGVyLm1vdl9yKGRlc3QsIEFSTUFz c2VtYmxlcjo6Z2V0T3AyKDApKTsKKyAgICAgICAgbV9hc3NlbWJsZXIubW92X3IoZGVzdCwgQVJN QXNzZW1ibGVyOjpnZXRPcDIoMSksIEFSTUNvbmRpdGlvbihjb25kKSk7CiAgICAgfQogCiAgICAg dm9pZCBhZGQzMihJbW0zMiBpbW0sIFJlZ2lzdGVySUQgc3JjLCBSZWdpc3RlcklEIGRlc3QpCg== 68235 2010-09-21 06:55:44 -0700 2011-01-31 10:29:11 -0800 Add new setTest32 with RegisterID parameter 46095.txt text/plain 3598 dave+webkit Y29tbWl0IGYyN2EwMDMxZWI4MGU4NGFkNDcwYmMzMTRhMjM3NTIwODVmNGQxMGMKQXV0aG9yOiBE YXZlIFRhcHVza2EgPGR0YXB1c2thQHJpbS5jb20+CkRhdGU6ICAgTW9uIFNlcCAyMCAxMzowNTow NSAyMDEwIC0wNDAwCgogICAgMjAxMC0wOS0yMCAgRGF2ZSBUYXB1c2thICA8ZHRhcHVza2FAcmlt LmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KICAgIAog ICAgICAgICAgICBNYWNyb0Fzc2VtYmxlckFSTSB3b3VsZCBnZW5lcmF0ZSBjb2RlIHRoYXQgZGlk IDMyYml0IGxvYWRzCiAgICAgICAgICAgIG9uIGFkZHJlc3NlcyB0aGF0IHdlcmUgbm90IGFsaWdu ZWQuIE1vcmUgc3BlY2lmaWNhbGx5IGl0IHdvdWxkCiAgICAgICAgICAgIGdlbmVyYXRlIGEgbGRy IHI4LFtyMSwgIzddIHdoaWNoIGlzbid0IHZhbGlkIG9uIEFSTXY1IGFuZCBsb3dlci4KICAgICAg ICAgICAgVGhlIGludGVuZGVkIGluc3RydWN0aW9uIHJlYWxseSBpcyBsZHJiIHI4LFtyMSwgIzdd OyBlbnN1cmUgd2UKICAgICAgICAgICAgY2FsbCBsb2FkOCBpbnN0ZWFkIG9mIGxvYWQzMi4KICAg IAogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYw OTUKICAgIAogICAgICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgogICAg ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6c2V0OCk6CiAgICAgICAgICAgIChKU0M6 Ok1hY3JvQXNzZW1ibGVyQVJNOjpzZXRUZXN0OCk6CiAgICAgICAgICAgIChKU0M6Ok1hY3JvQXNz ZW1ibGVyQVJNOjpzZXRUZXN0MzIpOgoKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAzNDkwNzQ4Li5lNDkwYTBiIDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDktMjAgIERhdmUgVGFwdXNrYSAgPGR0 YXB1c2thQHJpbS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTWFjcm9Bc3NlbWJsZXJBUk0gd291bGQgZ2VuZXJhdGUgY29kZSB0aGF0IGRpZCAz MmJpdCBsb2FkcworICAgICAgICBvbiBhZGRyZXNzZXMgdGhhdCB3ZXJlIG5vdCBhbGlnbmVkLiBN b3JlIHNwZWNpZmljYWxseSBpdCB3b3VsZAorICAgICAgICBnZW5lcmF0ZSBhIGxkciByOCxbcjEs ICM3XSB3aGljaCBpc24ndCB2YWxpZCBvbiBBUk12NSBhbmQgbG93ZXIuCisgICAgICAgIFRoZSBp bnRlbmRlZCBpbnN0cnVjdGlvbiByZWFsbHkgaXMgbGRyYiByOCxbcjEsICM3XTsgZW5zdXJlIHdl CisgICAgICAgIGNhbGwgbG9hZDggaW5zdGVhZCBvZiBsb2FkMzIuCisgICAgICAgIAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDYwOTUKKworICAgICAg ICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fz c2VtYmxlckFSTTo6c2V0OCk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjpzZXRU ZXN0OCk6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjpzZXRUZXN0MzIpOgorCiAy MDEwLTA5LTE5ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAog ICAgICAgICBXaW5kb3dzIGJ1aWxkIGZpeCBwdCAyLgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENv cmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmggYi9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAppbmRleCA1ZGU4YjM0Li40MGRkOTg4IDEwMDY0NAotLS0g YS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAorKysgYi9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaApAQCAtNjM3LDcgKzYzNyw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldDgoQ29uZGl0aW9uIGNvbmQsIEFkZHJlc3MgbGVmdCwg UmVnaXN0ZXJJRCByaWdodCwgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgLy8gQVJN IGRvZXNuJ3QgaGF2ZSBieXRlIHJlZ2lzdGVycwotICAgICAgICBsb2FkMzIobGVmdCwgQVJNUmVn aXN0ZXJzOjpTMSk7CisgICAgICAgIGxvYWQ4KGxlZnQsIEFSTVJlZ2lzdGVyczo6UzEpOwogICAg ICAgICBzZXQzMihjb25kLCBBUk1SZWdpc3RlcnM6OlMxLCByaWdodCwgZGVzdCk7CiAgICAgfQog CkBAIC02NDcsMjEgKzY0NywyNiBAQCBwdWJsaWM6CiAgICAgICAgIHNldDMyKGNvbmQsIGxlZnQs IHJpZ2h0LCBkZXN0KTsKICAgICB9CiAKLSAgICB2b2lkIHNldFRlc3QzMihDb25kaXRpb24gY29u ZCwgQWRkcmVzcyBhZGRyZXNzLCBJbW0zMiBtYXNrLCBSZWdpc3RlcklEIGRlc3QpCisgICAgdm9p ZCBzZXRUZXN0MzIoQ29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVySUQgcmVnLCBJbW0zMiBtYXNrLCBS ZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBsb2FkMzIoYWRkcmVzcywgQVJNUmVnaXN0 ZXJzOjpTMSk7CiAgICAgICAgIGlmIChtYXNrLm1fdmFsdWUgPT0gLTEpCi0gICAgICAgICAgICBt X2Fzc2VtYmxlci5jbXBfcigwLCBBUk1SZWdpc3RlcnM6OlMxKTsKKyAgICAgICAgICAgIG1fYXNz ZW1ibGVyLmNtcF9yKDAsIHJlZyk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fYXNzZW1i bGVyLnRzdF9yKEFSTVJlZ2lzdGVyczo6UzEsIG1fYXNzZW1ibGVyLmdldEltbShtYXNrLm1fdmFs dWUsIEFSTVJlZ2lzdGVyczo6UzApKTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnRzdF9yKHJl ZywgbV9hc3NlbWJsZXIuZ2V0SW1tKG1hc2subV92YWx1ZSwgQVJNUmVnaXN0ZXJzOjpTMCkpOwog ICAgICAgICBtX2Fzc2VtYmxlci5tb3ZfcihkZXN0LCBBUk1Bc3NlbWJsZXI6OmdldE9wMigwKSk7 CiAgICAgICAgIG1fYXNzZW1ibGVyLm1vdl9yKGRlc3QsIEFSTUFzc2VtYmxlcjo6Z2V0T3AyKDEp LCBBUk1Db25kaXRpb24oY29uZCkpOwogICAgIH0KIAorICAgIHZvaWQgc2V0VGVzdDMyKENvbmRp dGlvbiBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIEltbTMyIG1hc2ssIFJlZ2lzdGVySUQgZGVzdCkK KyAgICB7CisgICAgICAgIGxvYWQzMihhZGRyZXNzLCBBUk1SZWdpc3RlcnM6OlMxKTsKKyAgICAg ICAgc2V0VGVzdDMyKGNvbmQsIEFSTVJlZ2lzdGVyczo6UzEsIG1hc2ssIGRlc3QpOworICAgIH0K KwogICAgIHZvaWQgc2V0VGVzdDgoQ29uZGl0aW9uIGNvbmQsIEFkZHJlc3MgYWRkcmVzcywgSW1t MzIgbWFzaywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKLSAgICAgICAgLy8gQVJNIGRvZXNuJ3Qg aGF2ZSBieXRlIHJlZ2lzdGVycwotICAgICAgICBzZXRUZXN0MzIoY29uZCwgYWRkcmVzcywgbWFz aywgZGVzdCk7CisgICAgICAgIGxvYWQ4KGFkZHJlc3MsIEFSTVJlZ2lzdGVyczo6UzEpOworICAg ICAgICBzZXRUZXN0MzIoY29uZCwgQVJNUmVnaXN0ZXJzOjpTMSwgbWFzaywgZGVzdCk7CiAgICAg fQogCiAgICAgdm9pZCBhZGQzMihJbW0zMiBpbW0sIFJlZ2lzdGVySUQgc3JjLCBSZWdpc3RlcklE IGRlc3QpCg== 80657 2011-01-31 10:29:11 -0800 2011-02-01 06:40:15 -0800 Re-apply patch to set32Test8 as per comments 0001-2011-01-31-Dave-Tapuska-dtapuska-rim.com.patch text/plain 3425 dave+webkit RnJvbSBkZWZkYjgxN2I4MzMxNTIxZTdhMTQ5NjA3MzQ3NDJkNmFhMmNmNTU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZlIFRhcHVza2EgPGR0YXB1c2thQHJpbS5jb20+CkRhdGU6 IE1vbiwgMzEgSmFuIDIwMTEgMTE6Mzk6MTQgLTA1MDAKU3ViamVjdDogW1BBVENIXSAyMDExLTAx LTMxICBEYXZlIFRhcHVza2EgIDxkdGFwdXNrYUByaW0uY29tPgoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpNYWNyb0Fzc2VtYmxlckFSTSB3b3VsZCBnZW5lcmF0ZSBjb2RlIHRoYXQgZGlk IDMyYml0IGxvYWRzCm9uIGFkZHJlc3NlcyB0aGF0IHdlcmUgbm90IGFsaWduZWQuIE1vcmUgc3Bl Y2lmaWNhbGx5IGl0IHdvdWxkCmdlbmVyYXRlIGEgbGRyIHI4LFtyMSwgIzddIHdoaWNoIGlzbid0 IHZhbGlkIG9uIEFSTXY1IGFuZCBsb3dlci4KVGhlIGludGVuZGVkIGluc3RydWN0aW9uIHJlYWxs eSBpcyBsZHJiIHI4LFtyMSwgIzddOyBlbnN1cmUgd2UKY2FsbCBsb2FkOCBpbnN0ZWFkIG9mIGxv YWQzMi4KCmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjA5NQoKKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaDoKKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk06OnNl dDMyVGVzdDMyKToKKEpTQzo6TWFjcm9Bc3NlbWJsZXJBUk06OnNldDMyVGVzdDgpOgotLS0KIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgIHwgICAxNiAr KysrKysrKysrKysrKysrCiAuLi4vSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyQVJNLmggICB8ICAgMTcgKysrKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjcg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRl eCBhN2FiMmQzLi5kMzJlYjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OSBAQAorMjAxMS0wMS0zMSAgRGF2ZSBUYXB1c2thICA8ZHRhcHVza2FAcmltLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWNyb0Fzc2VtYmxl ckFSTSB3b3VsZCBnZW5lcmF0ZSBjb2RlIHRoYXQgZGlkIDMyYml0IGxvYWRzCisgICAgICAgIG9u IGFkZHJlc3NlcyB0aGF0IHdlcmUgbm90IGFsaWduZWQuIE1vcmUgc3BlY2lmaWNhbGx5IGl0IHdv dWxkCisgICAgICAgIGdlbmVyYXRlIGEgbGRyIHI4LFtyMSwgIzddIHdoaWNoIGlzbid0IHZhbGlk IG9uIEFSTXY1IGFuZCBsb3dlci4KKyAgICAgICAgVGhlIGludGVuZGVkIGluc3RydWN0aW9uIHJl YWxseSBpcyBsZHJiIHI4LFtyMSwgIzddOyBlbnN1cmUgd2UKKyAgICAgICAgY2FsbCBsb2FkOCBp bnN0ZWFkIG9mIGxvYWQzMi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDYwOTUKKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TS5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6c2V0MzJUZXN0MzIpOgorICAg ICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6c2V0MzJUZXN0OCk6CisKIDIwMTEtMDEtMjgg IFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3Njg5My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAppbmRleCBhYTg1Yzg4Li5hZmFlNzE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyQVJNLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTS5oCkBAIC02NjEsMjEgKzY2MSwyNiBAQCBwdWJsaWM6CiAgICAgICAgIHNldDMyQ29t cGFyZTMyKGNvbmQsIGxlZnQsIHJpZ2h0LCBkZXN0KTsKICAgICB9CiAKLSAgICB2b2lkIHNldDMy VGVzdDMyKENvbmRpdGlvbiBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIEltbTMyIG1hc2ssIFJlZ2lz dGVySUQgZGVzdCkKKyAgICB2b2lkIHNldDMyVGVzdDMyKENvbmRpdGlvbiBjb25kLCBSZWdpc3Rl cklEIHJlZywgSW1tMzIgbWFzaywgUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKLSAgICAgICAgbG9h ZDMyKGFkZHJlc3MsIEFSTVJlZ2lzdGVyczo6UzEpOwogICAgICAgICBpZiAobWFzay5tX3ZhbHVl ID09IC0xKQotICAgICAgICAgICAgbV9hc3NlbWJsZXIuY21wX3IoMCwgQVJNUmVnaXN0ZXJzOjpT MSk7CisgICAgICAgICAgICBtX2Fzc2VtYmxlci5jbXBfcigwLCByZWcpOwogICAgICAgICBlbHNl Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci50c3RfcihBUk1SZWdpc3RlcnM6OlMxLCBtX2Fzc2Vt Ymxlci5nZXRJbW0obWFzay5tX3ZhbHVlLCBBUk1SZWdpc3RlcnM6OlMwKSk7CisgICAgICAgICAg ICBtX2Fzc2VtYmxlci50c3RfcihyZWcsIG1fYXNzZW1ibGVyLmdldEltbShtYXNrLm1fdmFsdWUs IEFSTVJlZ2lzdGVyczo6UzApKTsKICAgICAgICAgbV9hc3NlbWJsZXIubW92X3IoZGVzdCwgQVJN QXNzZW1ibGVyOjpnZXRPcDIoMCkpOwogICAgICAgICBtX2Fzc2VtYmxlci5tb3ZfcihkZXN0LCBB Uk1Bc3NlbWJsZXI6OmdldE9wMigxKSwgQVJNQ29uZGl0aW9uKGNvbmQpKTsKICAgICB9CiAKKyAg ICB2b2lkIHNldDMyVGVzdDMyKENvbmRpdGlvbiBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIEltbTMy IG1hc2ssIFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIGxvYWQzMihhZGRyZXNzLCBB Uk1SZWdpc3RlcnM6OlMxKTsKKyAgICAgICAgc2V0MzJUZXN0MzIoY29uZCwgQVJNUmVnaXN0ZXJz OjpTMSwgbWFzaywgZGVzdCk7CisgICAgfQorCiAgICAgdm9pZCBzZXQzMlRlc3Q4KENvbmRpdGlv biBjb25kLCBBZGRyZXNzIGFkZHJlc3MsIEltbTMyIG1hc2ssIFJlZ2lzdGVySUQgZGVzdCkKICAg ICB7Ci0gICAgICAgIC8vIEFSTSBkb2Vzbid0IGhhdmUgYnl0ZSByZWdpc3RlcnMKLSAgICAgICAg c2V0MzJUZXN0MzIoY29uZCwgYWRkcmVzcywgbWFzaywgZGVzdCk7CisgICAgICAgIGxvYWQ4KGFk ZHJlc3MsIEFSTVJlZ2lzdGVyczo6UzEpOworICAgICAgICBzZXQzMlRlc3QzMihjb25kLCBBUk1S ZWdpc3RlcnM6OlMxLCBtYXNrLCBkZXN0KTsKICAgICB9CiAKICAgICB2b2lkIGFkZDMyKEltbTMy IGltbSwgUmVnaXN0ZXJJRCBzcmMsIFJlZ2lzdGVySUQgZGVzdCkKLS0gCjEuNy4zLjEubXN5c2dp dC4wCgo=