111854 2013-03-08 07:04:58 -0800 Making more sophisticated cache flush on ARM Linux platform 2013-03-12 02:47:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Linux RESOLVED FIXED P2 Normal --- 1 rgabor webkit-unassigned barraclough fpizlo oliver ossy zherczeg oldest_to_newest 851159 0 rgabor 2013-03-08 07:04:58 -0800 Now the cache flush on ARM Linux is invalidate whole pages instead of just the required areas. 851213 1 192231 rgabor 2013-03-08 08:08:19 -0800 Created attachment 192231 proposed patch With this solution we go through all the affected pages and invalidate just the required areas. 852202 2 192231 zherczeg 2013-03-11 05:08:05 -0700 Comment on attachment 192231 proposed patch Nice patch, but: View in context: https://bugs.webkit.org/attachment.cgi?id=192231&action=review > Source/JavaScriptCore/assembler/ARMAssembler.h:1060 > + for (current = firstPageEnd; current < end; current += pageSize()) I think this is incorrect. Are you sure it is not "current + pageSize() < end"? 852224 3 192451 rgabor 2013-03-11 05:51:18 -0700 Created attachment 192451 proposed patch 2 I've fixed that condition in the for cycle. 853221 4 192451 zherczeg 2013-03-12 02:21:30 -0700 Comment on attachment 192451 proposed patch 2 r=me. View in context: https://bugs.webkit.org/attachment.cgi?id=192451&action=review > Source/JavaScriptCore/ChangeLog:9 > + The cache flush on ARM Linux is invalidate whole pages > + instead of just the required areas. Fix grammar please. 853244 5 rgabor 2013-03-12 02:47:08 -0700 Thanks! Patch landed: http://trac.webkit.org/changeset/145505 192231 2013-03-08 08:08:19 -0800 2013-03-11 05:51:18 -0700 proposed patch new_cahce_flush.patch text/plain 5923 rgabor ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGNmN2EwOTMuLmJjYTliY2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTAzLTA4ICBHYWJvciBSYXBjc2Fu eWkgIDxyZ2Fib3JAd2Via2l0Lm9yZz4KIAorICAgICAgICBNYWtpbmcgbW9yZSBzb3BoaXN0aWNh dGVkIGNhY2hlIGZsdXNoIG9uIEFSTSBMaW51eCBwbGF0Zm9ybQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExODU0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNhY2hlIGZsdXNoIG9uIEFSTSBMaW51 eCBpcyBpbnZhbGlkYXRlIHdob2xlIHBhZ2VzCisgICAgICAgIGluc3RlYWQgb2YganVzdCB0aGUg cmVxdWlyZWQgYXJlYXMuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmg6Cisg ICAgICAgIChBUk1Bc3NlbWJsZXIpOgorICAgICAgICAoSlNDOjpBUk1Bc3NlbWJsZXI6OmxpbnV4 UGFnZUZsdXNoKToKKyAgICAgICAgKEpTQzo6QVJNQXNzZW1ibGVyOjpjYWNoZUZsdXNoKToKKyAg ICAgICAgKiBhc3NlbWJsZXIvQVJNdjdBc3NlbWJsZXIuaDoKKyAgICAgICAgKEFSTXY3QXNzZW1i bGVyKToKKyAgICAgICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmxpbnV4UGFnZUZsdXNoKToKKyAg ICAgICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmNhY2hlRmx1c2gpOgorCisyMDEzLTAzLTA4ICBH YWJvciBSYXBjc2FueWkgIDxyZ2Fib3JAd2Via2l0Lm9yZz4KKwogICAgICAgICBDYWNoZSBmbHVz aCBwcm9ibGVtIG9uIEFSTXY3IEpTQwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTExNDQxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL0FSTUFzc2VtYmxlci5oCmluZGV4IDE4YjEwMTcuLmYxYWM3ZTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaApAQCAtMTAyMiwyOSArMTAy Miw0NSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAgIHJldHVybiBBTCB8IEIgfCAob2Zm c2V0ICYgQnJhbmNoT2Zmc2V0TWFzayk7CiAgICAgICAgIH0KIAorI2lmIE9TKExJTlVYKSAmJiBD T01QSUxFUihHQ0MpCisgICAgICAgIHN0YXRpYyBpbmxpbmUgdm9pZCBsaW51eFBhZ2VGbHVzaCh1 aW50cHRyX3QgYmVnaW4sIHVpbnRwdHJfdCBlbmQpCisgICAgICAgIHsKKyAgICAgICAgICAgIGFz bSB2b2xhdGlsZSgKKyAgICAgICAgICAgICAgICAicHVzaCAgICB7cjd9XG4iCisgICAgICAgICAg ICAgICAgIm1vdiAgICAgcjAsICUwXG4iCisgICAgICAgICAgICAgICAgIm1vdiAgICAgcjEsICUx XG4iCisgICAgICAgICAgICAgICAgIm1vdiAgICAgcjcsICMweGYwMDAwXG4iCisgICAgICAgICAg ICAgICAgImFkZCAgICAgcjcsIHI3LCAjMHgyXG4iCisgICAgICAgICAgICAgICAgIm1vdiAgICAg cjIsICMweDBcbiIKKyAgICAgICAgICAgICAgICAic3ZjICAgICAweDBcbiIKKyAgICAgICAgICAg ICAgICAicG9wICAgICB7cjd9XG4iCisgICAgICAgICAgICAgICAgOgorICAgICAgICAgICAgICAg IDogInIiIChiZWdpbiksICJyIiAoZW5kKQorICAgICAgICAgICAgICAgIDogInIwIiwgInIxIiwg InIyIik7CisgICAgICAgIH0KKyNlbmRpZgorCiAjaWYgT1MoTElOVVgpICYmIENPTVBJTEVSKFJW Q1QpCiAgICAgICAgIHN0YXRpYyBfX2FzbSB2b2lkIGNhY2hlRmx1c2godm9pZCogY29kZSwgc2l6 ZV90KTsKICNlbHNlCiAgICAgICAgIHN0YXRpYyB2b2lkIGNhY2hlRmx1c2godm9pZCogY29kZSwg c2l6ZV90IHNpemUpCiAgICAgICAgIHsKICNpZiBPUyhMSU5VWCkgJiYgQ09NUElMRVIoR0NDKQot ICAgICAgICAgICAgdWludHB0cl90IGN1cnJlbnRQYWdlID0gcmVpbnRlcnByZXRfY2FzdDx1aW50 cHRyX3Q+KGNvZGUpICYgfihwYWdlU2l6ZSgpIC0gMSk7Ci0gICAgICAgICAgICB1aW50cHRyX3Qg bGFzdFBhZ2UgPSAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGNvZGUpICsgc2l6ZSkgJiB+ KHBhZ2VTaXplKCkgLSAxKTsKLSAgICAgICAgICAgIGRvIHsKLSAgICAgICAgICAgICAgICBhc20g dm9sYXRpbGUoCi0gICAgICAgICAgICAgICAgICAgICJwdXNoICAgIHtyN31cbiIKLSAgICAgICAg ICAgICAgICAgICAgIm1vdiAgICAgcjAsICUwXG4iCi0gICAgICAgICAgICAgICAgICAgICJtb3Yg ICAgIHIxLCAlMVxuIgotICAgICAgICAgICAgICAgICAgICAibW92ICAgICByNywgIzB4ZjAwMDBc biIKLSAgICAgICAgICAgICAgICAgICAgImFkZCAgICAgcjcsIHI3LCAjMHgyXG4iCi0gICAgICAg ICAgICAgICAgICAgICJtb3YgICAgIHIyLCAjMHgwXG4iCi0gICAgICAgICAgICAgICAgICAgICJz dmMgICAgIDB4MFxuIgotICAgICAgICAgICAgICAgICAgICAicG9wICAgICB7cjd9XG4iCi0gICAg ICAgICAgICAgICAgICAgIDoKLSAgICAgICAgICAgICAgICAgICAgOiAiciIgKGN1cnJlbnRQYWdl KSwgInIiIChjdXJyZW50UGFnZSArIHBhZ2VTaXplKCkpCi0gICAgICAgICAgICAgICAgICAgIDog InIwIiwgInIxIiwgInIyIik7Ci0gICAgICAgICAgICAgICAgY3VycmVudFBhZ2UgKz0gcGFnZVNp emUoKTsKLSAgICAgICAgICAgIH0gd2hpbGUgKGxhc3RQYWdlID49IGN1cnJlbnRQYWdlKTsKKyAg ICAgICAgICAgIHVpbnRwdHJfdCBjdXJyZW50ID0gcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+ KGNvZGUpOworICAgICAgICAgICAgdWludHB0cl90IGVuZCA9IGN1cnJlbnQgKyBzaXplOworICAg ICAgICAgICAgdWludHB0cl90IGZpcnN0UGFnZUVuZCA9IChjdXJyZW50ICYgfihwYWdlU2l6ZSgp IC0gMSkpICsgcGFnZVNpemUoKTsKKworICAgICAgICAgICAgaWYgKGVuZCA8PSBmaXJzdFBhZ2VF bmQpIHsKKyAgICAgICAgICAgICAgICBsaW51eFBhZ2VGbHVzaChjdXJyZW50LCBlbmQpOworICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbGludXhQ YWdlRmx1c2goY3VycmVudCwgZmlyc3RQYWdlRW5kKTsKKworICAgICAgICAgICAgZm9yIChjdXJy ZW50ID0gZmlyc3RQYWdlRW5kOyBjdXJyZW50IDwgZW5kOyBjdXJyZW50ICs9IHBhZ2VTaXplKCkp CisgICAgICAgICAgICAgICAgbGludXhQYWdlRmx1c2goY3VycmVudCwgY3VycmVudCArIHBhZ2VT aXplKCkpOworCisgICAgICAgICAgICBsaW51eFBhZ2VGbHVzaChjdXJyZW50LCBlbmQpOwogI2Vs aWYgT1MoV0lOQ0UpCiAgICAgICAgICAgICBDYWNoZVJhbmdlRmx1c2goY29kZSwgc2l6ZSwgQ0FD SEVfU1lOQ19BTEwpOwogI2VsaWYgT1MoUU5YKSAmJiBFTkFCTEUoQVNTRU1CTEVSX1dYX0VYQ0xV U0lWRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNdjdB c3NlbWJsZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNdjdBc3NlbWJs ZXIuaAppbmRleCBlM2ZjNTkzLi42NDFiMzFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL0FSTXY3QXNzZW1ibGVyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oCkBAIC0yMjEzLDI4ICsyMjEzLDQ0IEBAIHB1 YmxpYzoKIAogICAgIHVuc2lnbmVkIGRlYnVnT2Zmc2V0KCkgeyByZXR1cm4gbV9mb3JtYXR0ZXIu ZGVidWdPZmZzZXQoKTsgfQogCisjaWYgT1MoTElOVVgpCisgICAgc3RhdGljIGlubGluZSB2b2lk IGxpbnV4UGFnZUZsdXNoKHVpbnRwdHJfdCBiZWdpbiwgdWludHB0cl90IGVuZCkKKyAgICB7Cisg ICAgICAgIGFzbSB2b2xhdGlsZSgKKyAgICAgICAgICAgICJwdXNoICAgIHtyN31cbiIKKyAgICAg ICAgICAgICJtb3YgICAgIHIwLCAlMFxuIgorICAgICAgICAgICAgIm1vdiAgICAgcjEsICUxXG4i CisgICAgICAgICAgICAibW92dyAgICByNywgIzB4MlxuIgorICAgICAgICAgICAgIm1vdnQgICAg cjcsICMweGZcbiIKKyAgICAgICAgICAgICJtb3ZzICAgIHIyLCAjMHgwXG4iCisgICAgICAgICAg ICAic3ZjICAgICAweDBcbiIKKyAgICAgICAgICAgICJwb3AgICAgIHtyN31cbiIKKyAgICAgICAg ICAgIDoKKyAgICAgICAgICAgIDogInIiIChiZWdpbiksICJyIiAoZW5kKQorICAgICAgICAgICAg OiAicjAiLCAicjEiLCAicjIiKTsKKyAgICB9CisjZW5kaWYKKwogICAgIHN0YXRpYyB2b2lkIGNh Y2hlRmx1c2godm9pZCogY29kZSwgc2l6ZV90IHNpemUpCiAgICAgewogI2lmIE9TKElPUykKICAg ICAgICAgc3lzX2NhY2hlX2NvbnRyb2woa0NhY2hlRnVuY3Rpb25QcmVwYXJlRm9yRXhlY3V0aW9u LCBjb2RlLCBzaXplKTsKICNlbGlmIE9TKExJTlVYKQotICAgICAgICB1aW50cHRyX3QgY3VycmVu dFBhZ2UgPSByZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oY29kZSkgJiB+KHBhZ2VTaXplKCkg LSAxKTsKLSAgICAgICAgdWludHB0cl90IGxhc3RQYWdlID0gKHJlaW50ZXJwcmV0X2Nhc3Q8dWlu dHB0cl90Pihjb2RlKSArIHNpemUpICYgfihwYWdlU2l6ZSgpIC0gMSk7Ci0gICAgICAgIGRvIHsK LSAgICAgICAgICAgIGFzbSB2b2xhdGlsZSgKLSAgICAgICAgICAgICAgICAicHVzaCAgICB7cjd9 XG4iCi0gICAgICAgICAgICAgICAgIm1vdiAgICAgcjAsICUwXG4iCi0gICAgICAgICAgICAgICAg Im1vdiAgICAgcjEsICUxXG4iCi0gICAgICAgICAgICAgICAgIm1vdncgICAgcjcsICMweDJcbiIK LSAgICAgICAgICAgICAgICAibW92dCAgICByNywgIzB4ZlxuIgotICAgICAgICAgICAgICAgICJt b3ZzICAgIHIyLCAjMHgwXG4iCi0gICAgICAgICAgICAgICAgInN2YyAgICAgMHgwXG4iCi0gICAg ICAgICAgICAgICAgInBvcCAgICAge3I3fVxuIgotICAgICAgICAgICAgICAgIDoKLSAgICAgICAg ICAgICAgICA6ICJyIiAoY3VycmVudFBhZ2UpLCAiciIgKGN1cnJlbnRQYWdlICsgcGFnZVNpemUo KSkKLSAgICAgICAgICAgICAgICA6ICJyMCIsICJyMSIsICJyMiIpOwotICAgICAgICAgICAgY3Vy cmVudFBhZ2UgKz0gcGFnZVNpemUoKTsKLSAgICAgICAgfSB3aGlsZSAobGFzdFBhZ2UgPj0gY3Vy cmVudFBhZ2UpOworICAgICAgICB1aW50cHRyX3QgY3VycmVudCA9IHJlaW50ZXJwcmV0X2Nhc3Q8 dWludHB0cl90Pihjb2RlKTsKKyAgICAgICAgdWludHB0cl90IGVuZCA9IGN1cnJlbnQgKyBzaXpl OworICAgICAgICB1aW50cHRyX3QgZmlyc3RQYWdlRW5kID0gKGN1cnJlbnQgJiB+KHBhZ2VTaXpl KCkgLSAxKSkgKyBwYWdlU2l6ZSgpOworCisgICAgICAgIGlmIChlbmQgPD0gZmlyc3RQYWdlRW5k KSB7CisgICAgICAgICAgICBsaW51eFBhZ2VGbHVzaChjdXJyZW50LCBlbmQpOworICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgbGludXhQYWdlRmx1c2goY3VycmVudCwg Zmlyc3RQYWdlRW5kKTsKKworICAgICAgICBmb3IgKGN1cnJlbnQgPSBmaXJzdFBhZ2VFbmQ7IGN1 cnJlbnQgPCBlbmQ7IGN1cnJlbnQgKz0gcGFnZVNpemUoKSkKKyAgICAgICAgICAgIGxpbnV4UGFn ZUZsdXNoKGN1cnJlbnQsIGN1cnJlbnQgKyBwYWdlU2l6ZSgpKTsKKworICAgICAgICBsaW51eFBh Z2VGbHVzaChjdXJyZW50LCBlbmQpOwogI2VsaWYgT1MoV0lOQ0UpCiAgICAgICAgIENhY2hlUmFu Z2VGbHVzaChjb2RlLCBzaXplLCBDQUNIRV9TWU5DX0FMTCk7CiAjZWxpZiBPUyhRTlgpCg== 192451 2013-03-11 05:51:18 -0700 2013-03-12 02:21:29 -0700 proposed patch 2 new_cahce_flush.patch2 text/plain 5922 rgabor ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDkxMTZhNDguLjc2NzI1NDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTExICBHYWJvciBSYXBjc2Fu eWkgIDxyZ2Fib3JAd2Via2l0Lm9yZz4KKworICAgICAgICBNYWtpbmcgbW9yZSBzb3BoaXN0aWNh dGVkIGNhY2hlIGZsdXNoIG9uIEFSTSBMaW51eCBwbGF0Zm9ybQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExODU0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNhY2hlIGZsdXNoIG9uIEFSTSBMaW51 eCBpcyBpbnZhbGlkYXRlIHdob2xlIHBhZ2VzCisgICAgICAgIGluc3RlYWQgb2YganVzdCB0aGUg cmVxdWlyZWQgYXJlYXMuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmg6Cisg ICAgICAgIChBUk1Bc3NlbWJsZXIpOgorICAgICAgICAoSlNDOjpBUk1Bc3NlbWJsZXI6OmxpbnV4 UGFnZUZsdXNoKToKKyAgICAgICAgKEpTQzo6QVJNQXNzZW1ibGVyOjpjYWNoZUZsdXNoKToKKyAg ICAgICAgKiBhc3NlbWJsZXIvQVJNdjdBc3NlbWJsZXIuaDoKKyAgICAgICAgKEFSTXY3QXNzZW1i bGVyKToKKyAgICAgICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmxpbnV4UGFnZUZsdXNoKToKKyAg ICAgICAgKEpTQzo6QVJNdjdBc3NlbWJsZXI6OmNhY2hlRmx1c2gpOgorCiAyMDEzLTAzLTEwICBB bmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBTcGVjdWxhdGl2ZUpJ VCBzaG91bGQgdXNlIE93blB0cjxTbG93UGF0aEdlbmVyYXRvcj4uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaAppbmRleCAxOGIxMDE3Li4zODg4MjI2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxl ci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmgK QEAgLTEwMjIsMjkgKzEwMjIsNDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1 cm4gQUwgfCBCIHwgKG9mZnNldCAmIEJyYW5jaE9mZnNldE1hc2spOwogICAgICAgICB9CiAKKyNp ZiBPUyhMSU5VWCkgJiYgQ09NUElMRVIoR0NDKQorICAgICAgICBzdGF0aWMgaW5saW5lIHZvaWQg bGludXhQYWdlRmx1c2godWludHB0cl90IGJlZ2luLCB1aW50cHRyX3QgZW5kKQorICAgICAgICB7 CisgICAgICAgICAgICBhc20gdm9sYXRpbGUoCisgICAgICAgICAgICAgICAgInB1c2ggICAge3I3 fVxuIgorICAgICAgICAgICAgICAgICJtb3YgICAgIHIwLCAlMFxuIgorICAgICAgICAgICAgICAg ICJtb3YgICAgIHIxLCAlMVxuIgorICAgICAgICAgICAgICAgICJtb3YgICAgIHI3LCAjMHhmMDAw MFxuIgorICAgICAgICAgICAgICAgICJhZGQgICAgIHI3LCByNywgIzB4MlxuIgorICAgICAgICAg ICAgICAgICJtb3YgICAgIHIyLCAjMHgwXG4iCisgICAgICAgICAgICAgICAgInN2YyAgICAgMHgw XG4iCisgICAgICAgICAgICAgICAgInBvcCAgICAge3I3fVxuIgorICAgICAgICAgICAgICAgIDoK KyAgICAgICAgICAgICAgICA6ICJyIiAoYmVnaW4pLCAiciIgKGVuZCkKKyAgICAgICAgICAgICAg ICA6ICJyMCIsICJyMSIsICJyMiIpOworICAgICAgICB9CisjZW5kaWYKKwogI2lmIE9TKExJTlVY KSAmJiBDT01QSUxFUihSVkNUKQogICAgICAgICBzdGF0aWMgX19hc20gdm9pZCBjYWNoZUZsdXNo KHZvaWQqIGNvZGUsIHNpemVfdCk7CiAjZWxzZQogICAgICAgICBzdGF0aWMgdm9pZCBjYWNoZUZs dXNoKHZvaWQqIGNvZGUsIHNpemVfdCBzaXplKQogICAgICAgICB7CiAjaWYgT1MoTElOVVgpICYm IENPTVBJTEVSKEdDQykKLSAgICAgICAgICAgIHVpbnRwdHJfdCBjdXJyZW50UGFnZSA9IHJlaW50 ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihjb2RlKSAmIH4ocGFnZVNpemUoKSAtIDEpOwotICAgICAg ICAgICAgdWludHB0cl90IGxhc3RQYWdlID0gKHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihj b2RlKSArIHNpemUpICYgfihwYWdlU2l6ZSgpIC0gMSk7Ci0gICAgICAgICAgICBkbyB7Ci0gICAg ICAgICAgICAgICAgYXNtIHZvbGF0aWxlKAotICAgICAgICAgICAgICAgICAgICAicHVzaCAgICB7 cjd9XG4iCi0gICAgICAgICAgICAgICAgICAgICJtb3YgICAgIHIwLCAlMFxuIgotICAgICAgICAg ICAgICAgICAgICAibW92ICAgICByMSwgJTFcbiIKLSAgICAgICAgICAgICAgICAgICAgIm1vdiAg ICAgcjcsICMweGYwMDAwXG4iCi0gICAgICAgICAgICAgICAgICAgICJhZGQgICAgIHI3LCByNywg IzB4MlxuIgotICAgICAgICAgICAgICAgICAgICAibW92ICAgICByMiwgIzB4MFxuIgotICAgICAg ICAgICAgICAgICAgICAic3ZjICAgICAweDBcbiIKLSAgICAgICAgICAgICAgICAgICAgInBvcCAg ICAge3I3fVxuIgotICAgICAgICAgICAgICAgICAgICA6Ci0gICAgICAgICAgICAgICAgICAgIDog InIiIChjdXJyZW50UGFnZSksICJyIiAoY3VycmVudFBhZ2UgKyBwYWdlU2l6ZSgpKQotICAgICAg ICAgICAgICAgICAgICA6ICJyMCIsICJyMSIsICJyMiIpOwotICAgICAgICAgICAgICAgIGN1cnJl bnRQYWdlICs9IHBhZ2VTaXplKCk7Ci0gICAgICAgICAgICB9IHdoaWxlIChsYXN0UGFnZSA+PSBj dXJyZW50UGFnZSk7CisgICAgICAgICAgICBzaXplX3QgcGFnZSA9IHBhZ2VTaXplKCk7CisgICAg ICAgICAgICB1aW50cHRyX3QgY3VycmVudCA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihj b2RlKTsKKyAgICAgICAgICAgIHVpbnRwdHJfdCBlbmQgPSBjdXJyZW50ICsgc2l6ZTsKKyAgICAg ICAgICAgIHVpbnRwdHJfdCBmaXJzdFBhZ2VFbmQgPSAoY3VycmVudCAmIH4ocGFnZSAtIDEpKSAr IHBhZ2U7CisKKyAgICAgICAgICAgIGlmIChlbmQgPD0gZmlyc3RQYWdlRW5kKSB7CisgICAgICAg ICAgICAgICAgbGludXhQYWdlRmx1c2goY3VycmVudCwgZW5kKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGxpbnV4UGFnZUZsdXNoKGN1cnJl bnQsIGZpcnN0UGFnZUVuZCk7CisKKyAgICAgICAgICAgIGZvciAoY3VycmVudCA9IGZpcnN0UGFn ZUVuZDsgY3VycmVudCArIHBhZ2UgPCBlbmQ7IGN1cnJlbnQgKz0gcGFnZSkKKyAgICAgICAgICAg ICAgICBsaW51eFBhZ2VGbHVzaChjdXJyZW50LCBjdXJyZW50ICsgcGFnZSk7CisKKyAgICAgICAg ICAgIGxpbnV4UGFnZUZsdXNoKGN1cnJlbnQsIGVuZCk7CiAjZWxpZiBPUyhXSU5DRSkKICAgICAg ICAgICAgIENhY2hlUmFuZ2VGbHVzaChjb2RlLCBzaXplLCBDQUNIRV9TWU5DX0FMTCk7CiAjZWxp ZiBPUyhRTlgpICYmIEVOQUJMRShBU1NFTUJMRVJfV1hfRVhDTFVTSVZFKQpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oCmluZGV4IGUzZmM1OTMu LmU4OTQ0MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJN djdBc3NlbWJsZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTXY3 QXNzZW1ibGVyLmgKQEAgLTIyMTMsMjggKzIyMTMsNDUgQEAgcHVibGljOgogCiAgICAgdW5zaWdu ZWQgZGVidWdPZmZzZXQoKSB7IHJldHVybiBtX2Zvcm1hdHRlci5kZWJ1Z09mZnNldCgpOyB9CiAK KyNpZiBPUyhMSU5VWCkKKyAgICBzdGF0aWMgaW5saW5lIHZvaWQgbGludXhQYWdlRmx1c2godWlu dHB0cl90IGJlZ2luLCB1aW50cHRyX3QgZW5kKQorICAgIHsKKyAgICAgICAgYXNtIHZvbGF0aWxl KAorICAgICAgICAgICAgInB1c2ggICAge3I3fVxuIgorICAgICAgICAgICAgIm1vdiAgICAgcjAs ICUwXG4iCisgICAgICAgICAgICAibW92ICAgICByMSwgJTFcbiIKKyAgICAgICAgICAgICJtb3Z3 ICAgIHI3LCAjMHgyXG4iCisgICAgICAgICAgICAibW92dCAgICByNywgIzB4ZlxuIgorICAgICAg ICAgICAgIm1vdnMgICAgcjIsICMweDBcbiIKKyAgICAgICAgICAgICJzdmMgICAgIDB4MFxuIgor ICAgICAgICAgICAgInBvcCAgICAge3I3fVxuIgorICAgICAgICAgICAgOgorICAgICAgICAgICAg OiAiciIgKGJlZ2luKSwgInIiIChlbmQpCisgICAgICAgICAgICA6ICJyMCIsICJyMSIsICJyMiIp OworICAgIH0KKyNlbmRpZgorCiAgICAgc3RhdGljIHZvaWQgY2FjaGVGbHVzaCh2b2lkKiBjb2Rl LCBzaXplX3Qgc2l6ZSkKICAgICB7CiAjaWYgT1MoSU9TKQogICAgICAgICBzeXNfY2FjaGVfY29u dHJvbChrQ2FjaGVGdW5jdGlvblByZXBhcmVGb3JFeGVjdXRpb24sIGNvZGUsIHNpemUpOwogI2Vs aWYgT1MoTElOVVgpCi0gICAgICAgIHVpbnRwdHJfdCBjdXJyZW50UGFnZSA9IHJlaW50ZXJwcmV0 X2Nhc3Q8dWludHB0cl90Pihjb2RlKSAmIH4ocGFnZVNpemUoKSAtIDEpOwotICAgICAgICB1aW50 cHRyX3QgbGFzdFBhZ2UgPSAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGNvZGUpICsgc2l6 ZSkgJiB+KHBhZ2VTaXplKCkgLSAxKTsKLSAgICAgICAgZG8gewotICAgICAgICAgICAgYXNtIHZv bGF0aWxlKAotICAgICAgICAgICAgICAgICJwdXNoICAgIHtyN31cbiIKLSAgICAgICAgICAgICAg ICAibW92ICAgICByMCwgJTBcbiIKLSAgICAgICAgICAgICAgICAibW92ICAgICByMSwgJTFcbiIK LSAgICAgICAgICAgICAgICAibW92dyAgICByNywgIzB4MlxuIgotICAgICAgICAgICAgICAgICJt b3Z0ICAgIHI3LCAjMHhmXG4iCi0gICAgICAgICAgICAgICAgIm1vdnMgICAgcjIsICMweDBcbiIK LSAgICAgICAgICAgICAgICAic3ZjICAgICAweDBcbiIKLSAgICAgICAgICAgICAgICAicG9wICAg ICB7cjd9XG4iCi0gICAgICAgICAgICAgICAgOgotICAgICAgICAgICAgICAgIDogInIiIChjdXJy ZW50UGFnZSksICJyIiAoY3VycmVudFBhZ2UgKyBwYWdlU2l6ZSgpKQotICAgICAgICAgICAgICAg IDogInIwIiwgInIxIiwgInIyIik7Ci0gICAgICAgICAgICBjdXJyZW50UGFnZSArPSBwYWdlU2l6 ZSgpOwotICAgICAgICB9IHdoaWxlIChsYXN0UGFnZSA+PSBjdXJyZW50UGFnZSk7CisgICAgICAg IHNpemVfdCBwYWdlID0gcGFnZVNpemUoKTsKKyAgICAgICAgdWludHB0cl90IGN1cnJlbnQgPSBy ZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oY29kZSk7CisgICAgICAgIHVpbnRwdHJfdCBlbmQg PSBjdXJyZW50ICsgc2l6ZTsKKyAgICAgICAgdWludHB0cl90IGZpcnN0UGFnZUVuZCA9IChjdXJy ZW50ICYgfihwYWdlIC0gMSkpICsgcGFnZTsKKworICAgICAgICBpZiAoZW5kIDw9IGZpcnN0UGFn ZUVuZCkgeworICAgICAgICAgICAgbGludXhQYWdlRmx1c2goY3VycmVudCwgZW5kKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGxpbnV4UGFnZUZsdXNoKGN1cnJl bnQsIGZpcnN0UGFnZUVuZCk7CisKKyAgICAgICAgZm9yIChjdXJyZW50ID0gZmlyc3RQYWdlRW5k OyBjdXJyZW50ICsgcGFnZSA8IGVuZDsgY3VycmVudCArPSBwYWdlKQorICAgICAgICAgICAgbGlu dXhQYWdlRmx1c2goY3VycmVudCwgY3VycmVudCArIHBhZ2UpOworCisgICAgICAgIGxpbnV4UGFn ZUZsdXNoKGN1cnJlbnQsIGVuZCk7CiAjZWxpZiBPUyhXSU5DRSkKICAgICAgICAgQ2FjaGVSYW5n ZUZsdXNoKGNvZGUsIHNpemUsIENBQ0hFX1NZTkNfQUxMKTsKICNlbGlmIE9TKFFOWCkK