138315 2014-11-03 10:22:22 -0800 [JSC] Erratum (835769) in Cortex-A53 2019-10-08 06:49:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197192 P2 Normal --- 1 akiss webkit-unassigned commit-queue dbates fpizlo gyuyoung.kim loki msaboff rakuco ryuan.choi sergio oldest_to_newest 1045767 0 akiss 2014-11-03 10:22:22 -0800 There is an erratum (835769) in some Cortex-A53, which can only be worked around at code generation: It is possible for an A64 64-bit multiply-accumulate instruction to generate an incorrect result when immediately preceded by a memory instruction. In WebKit, that means 4 affected stages, potentially: 1. compilation with gcc or clang 2. processing LLInt asm sources with the offline assembler 3. MacroAssembler 4. LLVM in FTL 1. Fixes for both gcc and clang have already been submitted: https://gcc.gnu.org/ml/gcc-cvs/2014-10/msg00331.html https://gcc.gnu.org/ml/gcc-cvs/2014-10/msg00332.html https://gcc.gnu.org/ml/gcc-cvs/2014-10/msg00333.html https://gcc.gnu.org/ml/gcc-cvs/2014-10/msg00335.html http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20141006/239368.html http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20141006/116322.html So, if building WebKit for Cortex-A53, the build system should detect whether the compiler tool chain has support for the workaround and apply it if available. 2 & 3. Offlineasm & MacroAssembler should be amended with the workaround. 4. LLVM trunk already has the workaround, so as soon as ARM64 (for Linux) has FTL working, WebKit can rely on LLVM generating correct code. 1045768 1 fpizlo 2014-11-03 10:26:54 -0800 Please make sure that whatever this fix is, it is possible to disable it. It should be disabled by default on Darwin. 1045770 2 240860 akiss 2014-11-03 10:31:58 -0800 Created attachment 240860 Proposed patch. Built with Tools/Scripts/build-jsc --gtk --cmakeargs="-DWTF_CPU_ARM64_CORTEXA53=ON", no regression. Some extra comments: 1) The ARM64 assembler runs into the nop generating code path in 162 jsc tests. E.g., in sunspider-1.0/string-fasta.js.default it generates something like this below: 57:< 1:-4> GetLocal(@1, JS, Int32, arg1(B<Int32>/FlushedInt32), machine:arg1, R:Variables(7), bc#98) predicting Int32 0x7fa947f30c: ldur w0, [fp, #56] 58:< 2:-4> ArithMul(Int32:@45, Int32:@57, Number, Int32, CheckOverflowAndNegativeZero, bc#98) 0x7fa947f310: nop 0x7fa947f314: smaddl x1, w2, w0, x31 2) For now, offlineasm generates no extra nops, since the LLInt asm sources contain no patterns which would trigger the nop-inserting code. The offlineasm part of the patch has been tested with crafted code (of no real use), however, and the generated assembly was OK. E.g.: "\tldr x2, [x13, #16]\n" // /home/akiss/devel/WebKit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm:1375 #if CPU(ARM64_CORTEXA53) "\tnop\n" // /home/akiss/devel/WebKit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm:1376 #endif "\tmadd w1, w1, w1, wzr\n" // /home/akiss/devel/WebKit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm:1376 1045780 3 240860 fpizlo 2014-11-03 10:46:30 -0800 Comment on attachment 240860 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=240860&action=review LGTM with the one suggestion. > Source/JavaScriptCore/assembler/ARM64Assembler.h:1571 > +#if CPU(ARM64_CORTEXA53) You could remove this #if and instead have an #if inside the nopCortexA53Fix835769() method. That would beautify the code quite a bit without any change in perf or behavior. 1045816 4 240866 akiss 2014-11-03 12:10:51 -0800 Created attachment 240866 Updated patch Thanks for the suggestion. Applied. 1046011 5 240866 commit-queue 2014-11-03 23:36:15 -0800 Comment on attachment 240866 Updated patch Clearing flags on attachment: 240866 Committed r175514: <http://trac.webkit.org/changeset/175514> 1046012 6 commit-queue 2014-11-03 23:36:19 -0800 All reviewed patches have been landed. Closing bug. 240860 2014-11-03 10:31:58 -0800 2014-11-03 12:10:51 -0800 Proposed patch. a53-v10.patch text/plain 10912 akiss ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBhM2YyMjU3Li40YzJhMTEw IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTQtMTEtMDMgIEFrb3MgS2lzcyAgPGFraXNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAg ICBXb3JrYXJvdW5kIGZvciBDb3J0ZXgtQTUzIGVycmF0dW0gODM1NzY5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgzMTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGludHJvZHVjZXMg Q01ha2UgdmFyaWFibGUgYW5kIHByZXByb2Nlc3NvciBtYWNybworICAgICAgICBXVEZfQ1BVX0FS TTY0X0NPUlRFWEE1MyB3aXRoIHRoZSBhaW0gb2YgZW5hYmxpbmcgQ29ydGV4LUE1My1zcGVjaWZp YworICAgICAgICBjb2RlIHBhdGhzLCBpZiBzZXQgdHJ1ZS4KKworICAgICAgICAqIFNvdXJjZS9j bWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlOgorICAgICAgICBBZGQgLW1maXgtY29ydGV4LWE1My04 MzU3NjkgdG8gdGhlIGNvbXBpbGVyIGZsYWdzIGlmIGNvbXBpbGVyIHN1cHBvcnRzCisgICAgICAg IGl0LgorICAgICAgICAqIFNvdXJjZS9jbWFrZWNvbmZpZy5oLmNtYWtlOgorICAgICAgICAjY21h a2VkZWZpbmUwMSBmb3IgV1RGX0NQVV9BUk02NF9DT1JURVhBNTMKKwogMjAxNC0xMC0yOSAgUmFw aGFlbCBLdWJvIGRhIENvc3RhICA8cmFrdWNvQEZyZWVCU0Qub3JnPgogCiAgICAgICAgIFtHVEtd IEJ1bXAgbGlic291cCdzIG1pbmltdW0gdmVyc2lvbiB0byAyLjQyLjAuCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyZjYwMDE3Li40YTU2YTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSw0MiBAQAorMjAxNC0xMS0wMyAgQWtvcyBLaXNzICA8YWtpc3NAaW5mLnUtc3pl Z2VkLmh1PgorCisgICAgICAgIFdvcmthcm91bmQgZm9yIENvcnRleC1BNTMgZXJyYXR1bSA4MzU3 NjkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODMx NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggaW50cm9kdWNlcyBDTWFrZSB2YXJpYWJsZSBhbmQgcHJlcHJvY2Vzc29yIG1hY3JvCisg ICAgICAgIFdURl9DUFVfQVJNNjRfQ09SVEVYQTUzIHdpdGggdGhlIGFpbSBvZiBlbmFibGluZyBD b3J0ZXgtQTUzLXNwZWNpZmljCisgICAgICAgIGNvZGUgcGF0aHMsIGlmIHNldCB0cnVlLiBUaGUg cGF0Y2ggYWxzbyBpbXBsZW1lbnRzIG9uZSBjYXNlIHdoZXJlIHN1Y2gKKyAgICAgICAgY29kZSBw YXRocyBhcmUgbmVlZGVkOiB0aGUgd29ya2Fyb3VuZCBmb3IgQ29ydGV4LUE1MyBlcnJhdHVtIDgz NTc2OS4gSWYKKyAgICAgICAgV1RGX0NQVV9BUk02NF9DT1JURVhBNTMgaXMgc2V0IHRoZW46Cisg ICAgICAgIC0gQ01ha2UgY2hlY2tzIHdoZXRoZXIgdGhlIGNvbXBpbGVyIGFscmVhZHkgaGFzIHN1 cHBvcnQgZm9yIGEgd29ya2Fyb3VuZAorICAgICAgICAgIGFuZCBhZGRzIC1tZml4LWNvcnRleC1h NTMtODM1NzY5IHRvIHRoZSBjb21waWxlciBmbGFncyBpZiBzbywKKyAgICAgICAgLSB0aGUgQVJN NjQgYmFja2VuZCBvZiBvZmZsaW5lYXNtIGluc2VydHMgYSBub3AgYmV0d2VlbiBtZW1vcnkgYW5k CisgICAgICAgICAgbXVsdGlwbHktYWNjdW11bGF0ZSBpbnN0cnVjdGlvbnMsIGFuZAorICAgICAg ICAtIHRoZSBBUk02NCBhc3NlbWJsZXIgYWxzbyBpbnNlcnRzIGEgbm9wIGJldHdlZW4gbWVtb3J5 IGFuZCAoNjQtYml0KSAKKyAgICAgICAgICBtdWx0aXBseS1hY2N1bXVsYXRlIGluc3RydWN0aW9u cy4KKworICAgICAgICAqIGFzc2VtYmxlci9BUk02NEFzc2VtYmxlci5oOgorICAgICAgICAoSlND OjpBUk02NEFzc2VtYmxlcjo6bWFkZCk6CisgICAgICAgIENhbGwgbm9wQ29ydGV4QTUzRml4ODM1 NzY5KCkgdG8gaW5zZXJ0IGEgbm9wIGlmIENQVShBUk02NF9DT1JURVhBNTMpIGFuZAorICAgICAg ICBpZiBuZWNlc3NhcnkuCisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjptc3ViKTogTGlr ZXdpc2UuCisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjpzbWFkZGwpOiBMaWtld2lzZS4K KyAgICAgICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6OnNtc3VibCk6IExpa2V3aXNlLgorICAgICAg ICAoSlNDOjpBUk02NEFzc2VtYmxlcjo6dW1hZGRsKTogTGlrZXdpc2UuCisgICAgICAgIChKU0M6 OkFSTTY0QXNzZW1ibGVyOjp1bXN1YmwpOiBMaWtld2lzZS4KKyAgICAgICAgKEpTQzo6QVJNNjRB c3NlbWJsZXI6Om5vcENvcnRleEE1M0ZpeDgzNTc2OSk6CisgICAgICAgIEFkZGVkLiBJbnNlcnQg YSBub3AgaWYgdGhlIHByZXZpb3VzbHkgZW1pdHRlZCBpbnN0cnVjdGlvbiB3YXMgYSBsb2FkLCBh CisgICAgICAgIHN0b3JlLCBvciBhIHByZWZldGNoLCBhbmQgaWYgdGhlIGN1cnJlbnQgaW5zdHJ1 Y3Rpb24gaXMgNjQtYml0LgorICAgICAgICAqIG9mZmxpbmVhc20vYXJtNjQucmI6CisgICAgICAg IEFkZCB0aGUgYXJtNjRDb3J0ZXhBNTNGaXg4MzU3NjkgcGhhc2UgYW5kIGNhbGwgaXQgZnJvbQor ICAgICAgICBnZXRNb2RpZmllZExpc3RBUk02NCB0byBpbnNlcnQgbm9wQ29ydGV4QTUzRml4ODM1 NzY5IGJldHdlZW4gYXBwcm9wcmlhdGUKKyAgICAgICAgbWFjcm8gaW5zdHJ1Y3Rpb25zLiBBbHNv LCBsb3dlciBub3BDb3J0ZXhBNTNGaXg4MzU3NjkgdG8gbm9wIGlmCisgICAgICAgIENQVShBUk02 NF9DT1JURVhBNTMpLCB0byBub3RoaW5nIG90aGVyd2lzZS4KKyAgICAgICAgKiBvZmZsaW5lYXNt L2luc3RydWN0aW9ucy5yYjoKKyAgICAgICAgRGVmaW5lIG1hY3JvIGluc3RydWN0aW9uIG5vcEZp eENvcnRleEE1M0VycjgzNTc2OS4KKwogMjAxNC0xMC0zMCAgRGFuYSBCdXJrYXJ0ICA8ZGJ1cmth cnRAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODgyMTI2MD4gUHJlcGFy ZSBmb3IgdGhlIG15c3RlcmlvdXMgZnV0dXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL0FSTTY0QXNzZW1ibGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL0FSTTY0QXNzZW1ibGVyLmgKaW5kZXggN2EyNzNhYS4uNTIyMDVlNyAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk02NEFzc2VtYmxlci5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNNjRBc3NlbWJsZXIuaApAQCAt MTU2OCw2ICsxNTY4LDkgQEAgcHVibGljOgogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBtYWRkKFJl Z2lzdGVySUQgcmQsIFJlZ2lzdGVySUQgcm4sIFJlZ2lzdGVySUQgcm0sIFJlZ2lzdGVySUQgcmEp CiAgICAgewogICAgICAgICBDSEVDS19EQVRBU0laRSgpOworI2lmIENQVShBUk02NF9DT1JURVhB NTMpCisgICAgICAgIG5vcENvcnRleEE1M0ZpeDgzNTc2OTxkYXRhc2l6ZT4oKTsKKyNlbmRpZgog ICAgICAgICBpbnNuKGRhdGFQcm9jZXNzaW5nM1NvdXJjZShEQVRBU0laRSwgRGF0YU9wX01BREQs IHJtLCByYSwgcm4sIHJkKSk7CiAgICAgfQogCkBAIC0xNjIwLDYgKzE2MjMsOSBAQCBwdWJsaWM6 CiAgICAgQUxXQVlTX0lOTElORSB2b2lkIG1zdWIoUmVnaXN0ZXJJRCByZCwgUmVnaXN0ZXJJRCBy biwgUmVnaXN0ZXJJRCBybSwgUmVnaXN0ZXJJRCByYSkKICAgICB7CiAgICAgICAgIENIRUNLX0RB VEFTSVpFKCk7CisjaWYgQ1BVKEFSTTY0X0NPUlRFWEE1MykKKyAgICAgICAgbm9wQ29ydGV4QTUz Rml4ODM1NzY5PGRhdGFzaXplPigpOworI2VuZGlmCiAgICAgICAgIGluc24oZGF0YVByb2Nlc3Np bmczU291cmNlKERBVEFTSVpFLCBEYXRhT3BfTVNVQiwgcm0sIHJhLCBybiwgcmQpKTsKICAgICB9 CiAKQEAgLTE4MDYsNiArMTgxMiw5IEBAIHB1YmxpYzoKIAogICAgIEFMV0FZU19JTkxJTkUgdm9p ZCBzbWFkZGwoUmVnaXN0ZXJJRCByZCwgUmVnaXN0ZXJJRCBybiwgUmVnaXN0ZXJJRCBybSwgUmVn aXN0ZXJJRCByYSkKICAgICB7CisjaWYgQ1BVKEFSTTY0X0NPUlRFWEE1MykKKyAgICAgICAgbm9w Q29ydGV4QTUzRml4ODM1NzY5PDY0PigpOworI2VuZGlmCiAgICAgICAgIGluc24oZGF0YVByb2Nl c3NpbmczU291cmNlKERhdGFzaXplXzY0LCBEYXRhT3BfU01BRERMLCBybSwgcmEsIHJuLCByZCkp OwogICAgIH0KIApAQCAtMTgxNiw2ICsxODI1LDkgQEAgcHVibGljOgogCiAgICAgQUxXQVlTX0lO TElORSB2b2lkIHNtc3VibChSZWdpc3RlcklEIHJkLCBSZWdpc3RlcklEIHJuLCBSZWdpc3RlcklE IHJtLCBSZWdpc3RlcklEIHJhKQogICAgIHsKKyNpZiBDUFUoQVJNNjRfQ09SVEVYQTUzKQorICAg ICAgICBub3BDb3J0ZXhBNTNGaXg4MzU3Njk8NjQ+KCk7CisjZW5kaWYKICAgICAgICAgaW5zbihk YXRhUHJvY2Vzc2luZzNTb3VyY2UoRGF0YXNpemVfNjQsIERhdGFPcF9TTVNVQkwsIHJtLCByYSwg cm4sIHJkKSk7CiAgICAgfQogCkBAIC0yMDU5LDYgKzIwNzEsOSBAQCBwdWJsaWM6CiAKICAgICBB TFdBWVNfSU5MSU5FIHZvaWQgdW1hZGRsKFJlZ2lzdGVySUQgcmQsIFJlZ2lzdGVySUQgcm4sIFJl Z2lzdGVySUQgcm0sIFJlZ2lzdGVySUQgcmEpCiAgICAgeworI2lmIENQVShBUk02NF9DT1JURVhB NTMpCisgICAgICAgIG5vcENvcnRleEE1M0ZpeDgzNTc2OTw2ND4oKTsKKyNlbmRpZgogICAgICAg ICBpbnNuKGRhdGFQcm9jZXNzaW5nM1NvdXJjZShEYXRhc2l6ZV82NCwgRGF0YU9wX1VNQURETCwg cm0sIHJhLCBybiwgcmQpKTsKICAgICB9CiAKQEAgLTIwNjksNiArMjA4NCw5IEBAIHB1YmxpYzoK IAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bXN1YmwoUmVnaXN0ZXJJRCByZCwgUmVnaXN0ZXJJ RCBybiwgUmVnaXN0ZXJJRCBybSwgUmVnaXN0ZXJJRCByYSkKICAgICB7CisjaWYgQ1BVKEFSTTY0 X0NPUlRFWEE1MykKKyAgICAgICAgbm9wQ29ydGV4QTUzRml4ODM1NzY5PDY0PigpOworI2VuZGlm CiAgICAgICAgIGluc24oZGF0YVByb2Nlc3NpbmczU291cmNlKERhdGFzaXplXzY0LCBEYXRhT3Bf VU1TVUJMLCBybSwgcmEsIHJuLCByZCkpOwogICAgIH0KIApAQCAtMzYyOSw2ICszNjQ3LDI2IEBA IHByaXZhdGU6CiAgICAgICAgIHJldHVybiAoMHhkNjAwMDAwMCB8IG9wYyA8PCAyMSB8IG9wMiA8 PCAxNiB8IG9wMyA8PCAxMCB8IHhPclpyKHJuKSA8PCA1IHwgb3A0KTsKICAgICB9CiAKKyNpZiBD UFUoQVJNNjRfQ09SVEVYQTUzKQorICAgIC8vIEVtaXQgYW4gZXh0cmEgbm9wIGlmIHRoZSBsYXN0 IGluc3RydWN0aW9uIGluIHRoZSBidWZmZXIgaXMgYSBsb2FkLCBzdG9yZQorICAgIC8vIG9yIHBy ZWZldGNoLiBOZWVkZWQgYmVmb3JlIDY0LWJpdCBtdWx0aXBseS1hY2N1bXVsYXRlIGluc3RydWN0 aW9ucyB0bworICAgIC8vIHdvcmsgYXJvdW5kIENvcnRleC1BNTMgZXJyYXR1bSAoODM1NzY5KS4K KyAgICB0ZW1wbGF0ZTxpbnQgZGF0YXNpemU+CisgICAgQUxXQVlTX0lOTElORSB2b2lkIG5vcENv cnRleEE1M0ZpeDgzNTc2OSgpCisgICAgeworICAgICAgICBDSEVDS19EQVRBU0laRSgpOworICAg ICAgICBpZiAoZGF0YXNpemUgPT0gNjQpIHsKKyAgICAgICAgICAgIGlmIChMSUtFTFkobV9idWZm ZXIuY29kZVNpemUoKSA+PSBzaXplb2YoaW50MzJfdCkpKSB7CisgICAgICAgICAgICAgICAgLy8g RnJvbSBBUk12OCBSZWZlcmVuY2UgTWFudWFsLCBTZWN0aW9uIEM0LjE6IHRoZSBlbmNvZGluZyBv ZiB0aGUKKyAgICAgICAgICAgICAgICAvLyBpbnN0cnVjdGlvbnMgaW4gdGhlIExvYWRzIGFuZCBz dG9yZXMgaW5zdHJ1Y3Rpb24gZ3JvdXAgaXM6CisgICAgICAgICAgICAgICAgLy8gLS0tLSAxLTAt IC0tLS0gLS0tLSAtLS0tIC0tLS0gLS0tLSAtLS0tCisgICAgICAgICAgICAgICAgaWYgKFVOTElL RUxZKCgqcmVpbnRlcnByZXRfY2FzdF9wdHI8aW50MzJfdCo+KHJlaW50ZXJwcmV0X2Nhc3RfcHRy PGNoYXIqPihtX2J1ZmZlci5kYXRhKCkpICsgbV9idWZmZXIuY29kZVNpemUoKSAtIHNpemVvZihp bnQzMl90KSkgJiAweDBhMDAwMDAwKSA9PSAweDA4MDAwMDAwKSkKKyAgICAgICAgICAgICAgICAg ICAgbm9wKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisjZW5kaWYKKwogICAg IEFzc2VtYmxlckJ1ZmZlciBtX2J1ZmZlcjsKICAgICBWZWN0b3I8TGlua1JlY29yZCwgMCwgVW5z YWZlVmVjdG9yT3ZlcmZsb3c+IG1fanVtcHNUb0xpbms7CiAgICAgaW50IG1faW5kZXhPZkxhc3RX YXRjaHBvaW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v YXJtNjQucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hcm02NC5yYgppbmRl eCAxOTQwZDdkZS4uM2EwZDc4NiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29m ZmxpbmVhc20vYXJtNjQucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v YXJtNjQucmIKQEAgLTIyOCw2ICsyMjgsMzQgQEAgZGVmIGFybTY0TG93ZXJNYWxmb3JtZWRMb2Fk U3RvcmVBZGRyZXNzZXMobGlzdCkKICAgICBuZXdMaXN0CiBlbmQKIAorIyBXb3JrYXJvdW5kIGZv ciBDb3J0ZXgtQTUzIGVycmF0dW0gKDgzNTc2OSkKK2RlZiBhcm02NENvcnRleEE1M0ZpeDgzNTc2 OShsaXN0KQorICAgIG5ld0xpc3QgPSBbXQorICAgIGxhc3RPcGNvZGVVbnNhZmUgPSBmYWxzZQor CisgICAgbGlzdC5lYWNoIHsKKyAgICAgICAgfCBub2RlIHwKKyAgICAgICAgaWYgbm9kZS5pc19h PyBJbnN0cnVjdGlvbgorICAgICAgICAgICAgY2FzZSBub2RlLm9wY29kZQorICAgICAgICAgICAg d2hlbiAvXnN0b3JlLywgL15sb2FkLworICAgICAgICAgICAgICAgICMgTGlzdCBhbGwgbWFjcm8g aW5zdHJ1Y3Rpb25zIHRoYXQgY2FuIGJlIGxvd2VyZWQgdG8gYSBsb2FkLCBzdG9yZSBvciBwcmVm ZXRjaCBBUk02NCBhc3NlbWJseSBpbnN0cnVjdGlvbgorICAgICAgICAgICAgICAgIGxhc3RPcGNv ZGVVbnNhZmUgPSB0cnVlCisgICAgICAgICAgICB3aGVuICAibXVsaSIsICJtdWxwIiwgIm11bHEi LCAic211bGxpIgorICAgICAgICAgICAgICAgICMgTGlzdCBhbGwgbWFjcm8gaW5zdHJ1Y3Rpb25z IHRoYXQgY2FuIGJlIGxvd2VyZWQgdG8gYSA2NC1iaXQgbXVsdGlwbHktYWNjdW11bGF0ZSBBUk02 NCBhc3NlbWJseSBpbnN0cnVjdGlvbgorICAgICAgICAgICAgICAgICMgKGRlZmluZWQgYXMgb25l IG9mIE1BREQsIE1TVUIsIFNNQURETCwgU01TVUJMLCBVTUFEREwgb3IgVU1TVUJMKS4KKyAgICAg ICAgICAgICAgICBpZiBsYXN0T3Bjb2RlVW5zYWZlCisgICAgICAgICAgICAgICAgICAgIG5ld0xp c3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwgIm5vcENvcnRleEE1M0ZpeDgz NTc2OSIsIFtdKQorICAgICAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgICAgIGxhc3RPcGNv ZGVVbnNhZmUgPSBmYWxzZQorICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGxhc3RP cGNvZGVVbnNhZmUgPSBmYWxzZQorICAgICAgICAgICAgZW5kCisgICAgICAgIGVuZAorICAgICAg ICBuZXdMaXN0IDw8IG5vZGUKKyAgICB9CisgICAgbmV3TGlzdAorZW5kCisKIGNsYXNzIFNlcXVl bmNlCiAgICAgZGVmIGdldE1vZGlmaWVkTGlzdEFSTTY0CiAgICAgICAgIHJlc3VsdCA9IEBsaXN0 CkBAIC0yODQsNiArMzEyLDcgQEAgY2xhc3MgU2VxdWVuY2UKICAgICAgICAgcmVzdWx0ID0gcmlz Y0xvd2VyVGVzdChyZXN1bHQpCiAgICAgICAgIHJlc3VsdCA9IGFzc2lnblJlZ2lzdGVyc1RvVGVt cG9yYXJpZXMocmVzdWx0LCA6Z3ByLCBBUk02NF9FWFRSQV9HUFJTKQogICAgICAgICByZXN1bHQg PSBhc3NpZ25SZWdpc3RlcnNUb1RlbXBvcmFyaWVzKHJlc3VsdCwgOmZwciwgQVJNNjRfRVhUUkFf RlBSUykKKyAgICAgICAgcmVzdWx0ID0gYXJtNjRDb3J0ZXhBNTNGaXg4MzU3NjkocmVzdWx0KQog ICAgICAgICByZXR1cm4gcmVzdWx0CiAgICAgZW5kCiBlbmQKQEAgLTgzNyw3ICs4NjYsMTEgQEAg Y2xhc3MgSW5zdHJ1Y3Rpb24KICAgICAgICAgd2hlbiAibWVtZmVuY2UiCiAgICAgICAgICAgICAk YXNtLnB1dHMgImRtYiBzeSIKICAgICAgICAgd2hlbiAicGNydG9hZGRyIgotICAgICAgICAgICRh c20ucHV0cyAiYWRyICN7b3BlcmFuZHNbMV0uYXJtNjRPcGVyYW5kKDpwdHIpfSwgI3tvcGVyYW5k c1swXS52YWx1ZX0iCisgICAgICAgICAgICAkYXNtLnB1dHMgImFkciAje29wZXJhbmRzWzFdLmFy bTY0T3BlcmFuZCg6cHRyKX0sICN7b3BlcmFuZHNbMF0udmFsdWV9IgorICAgICAgICB3aGVuICJu b3BDb3J0ZXhBNTNGaXg4MzU3NjkiCisgICAgICAgICAgICAkYXNtLnB1dFN0cigiI2lmIENQVShB Uk02NF9DT1JURVhBNTMpIikKKyAgICAgICAgICAgICRhc20ucHV0cyAibm9wIgorICAgICAgICAg ICAgJGFzbS5wdXRTdHIoIiNlbmRpZiIpCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGxvd2Vy RGVmYXVsdAogICAgICAgICBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9v ZmZsaW5lYXNtL2luc3RydWN0aW9ucy5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5l YXNtL2luc3RydWN0aW9ucy5yYgppbmRleCA4NzI4ZWU0Li4xZDBkODY3IDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9pbnN0cnVjdGlvbnMucmIKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vaW5zdHJ1Y3Rpb25zLnJiCkBAIC0yNjYsNyAr MjY2LDggQEAgQVJNX0lOU1RSVUNUSU9OUyA9CiAKIEFSTTY0X0lOU1RSVUNUSU9OUyA9CiAgICAg WwotICAgICAicGNydG9hZGRyIiAgICAjIEFkZHJlc3MgZnJvbSBQQyByZWxhdGl2ZSBvZmZzZXQg LSBhZHIgaW5zdHJ1Y3Rpb24KKyAgICAgInBjcnRvYWRkciIsICAgIyBBZGRyZXNzIGZyb20gUEMg cmVsYXRpdmUgb2Zmc2V0IC0gYWRyIGluc3RydWN0aW9uCisgICAgICJub3BGaXhDb3J0ZXhBNTNF cnI4MzU3NjkiICMgbm9wIG9uIENvcnRleC1BNTMgKG5vdGhpbmcgb3RoZXJ3aXNlKQogICAgIF0K IAogUklTQ19JTlNUUlVDVElPTlMgPQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnND b21tb24uY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZQppbmRleCBmZmNk ZmU1Li5hYjIzMDliIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFr ZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZQpAQCAtMzAsNiArMzAsMjAg QEAgaWYgKENNQUtFX0NPTVBJTEVSX0lTX0dOVUNYWCBPUiAiJHtDTUFLRV9DWFhfQ09NUElMRVJf SUR9IiBTVFJFUVVBTCAiQ2xhbmciKQogICAgIHNldChDTUFLRV9DWFhfRkxBR1MgIiR7Q01BS0Vf Q1hYX0ZMQUdTfSAtc3RkPWMrKzExIikKIGVuZGlmICgpCiAKK2lmIChXVEZfQ1BVX0FSTTY0X0NP UlRFWEE1MykKKyAgICBpZiAoTk9UIFdURl9DUFVfQVJNNjQpCisgICAgICAgIG1lc3NhZ2UoRkFU QUxfRVJST1IgIldURl9DUFVfQVJNNjRfQ09SVEVYQTUzIHNldCB3aXRob3V0IFdURl9DUFVfQVJN NjQiKQorICAgIGVuZGlmICgpCisgICAgbWVzc2FnZSgiQ2hlY2tpbmcgaWYgY29tcGlsZXIgc3Vw cG9ydHMgLW1maXgtY29ydGV4LWE1My04MzU3NjkiKQorICAgIGV4ZWN1dGVfcHJvY2VzcyhDT01N QU5EICR7Q01BS0VfQ19DT01QSUxFUn0gLW1maXgtY29ydGV4LWE1My04MzU3NjkgRVJST1JfVkFS SUFCTEUgQ09NUElMRVJfT1VUUFVUKQorICAgIGlmICgoTk9UICIke0NPTVBJTEVSX09VVFBVVH0i IE1BVENIRVMgInVucmVjb2duaXplZCBjb21tYW5kIGxpbmUgb3B0aW9uIikKKyAgICAgICAgQU5E IChOT1QgIiR7Q09NUElMRVJfT1VUUFVUfSIgTUFUQ0hFUyAidW5rbm93biBhcmd1bWVudCIpKQor ICAgICAgICBzZXQoQ01BS0VfQ19GTEFHUyAiJHtDTUFLRV9DX0ZMQUdTfSAtbWZpeC1jb3J0ZXgt YTUzLTgzNTc2OSIpCisgICAgICAgIHNldChDTUFLRV9DWFhfRkxBR1MgIiR7Q01BS0VfQ1hYX0ZM QUdTfSAtbWZpeC1jb3J0ZXgtYTUzLTgzNTc2OSIpCisgICAgICAgIG1lc3NhZ2UoIkVuYWJsaW5n IENvcnRleC1BNTMgd29ya2Fyb3VuZCBmb3IgY29tcGlsZXIiKQorICAgIGVuZGlmICgpCitlbmRp ZiAoKQorCiBvcHRpb24oREVCVUdfRklTU0lPTiAiVXNlIERlYnVnIEZpc3Npb24gc3VwcG9ydCIp CiBpZiAoREVCVUdfRklTU0lPTikKICAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtF X0NfQ09NUElMRVJ9IC1mdXNlLWxkPWdvbGQgLVdsLC0tdmVyc2lvbiBFUlJPUl9RVUlFVCBPVVRQ VVRfVkFSSUFCTEUgTERfVkVSU0lPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZWNvbmZpZy5o LmNtYWtlIGIvU291cmNlL2NtYWtlY29uZmlnLmguY21ha2UKaW5kZXggYjI0MGZkOS4uOWFmNWU5 YSAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlY29uZmlnLmguY21ha2UKKysrIGIvU291cmNlL2Nt YWtlY29uZmlnLmguY21ha2UKQEAgLTEzOSw2ICsxMzksNyBAQAogI2NtYWtlZGVmaW5lMDEgV1RG X1VTRV9USUxFRF9CQUNLSU5HX1NUT1JFCiAjY21ha2VkZWZpbmUwMSBIQVZFX0xMVk0KICNjbWFr ZWRlZmluZTAxIEhBVkVfR1RLX1VOSVhfUFJJTlRJTkcKKyNjbWFrZWRlZmluZTAxIFdURl9DUFVf QVJNNjRfQ09SVEVYQTUzCiAKICNpZiBkZWZpbmVkKEJVSUxESU5HX0dUS19fKSAmJiAhZGVmaW5l ZChHVEtfQVBJX1ZFUlNJT05fMikKICNkZWZpbmUgR0RLX1ZFUlNJT05fTUlOX1JFUVVJUkVEIEBH REtfVkVSU0lPTl9NSU5fUkVRVUlSRURACg== 240866 2014-11-03 12:10:51 -0800 2014-11-03 23:36:15 -0800 Updated patch a53-v11.patch text/plain 10709 akiss ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBhM2YyMjU3Li40YzJhMTEw IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTQtMTEtMDMgIEFrb3MgS2lzcyAgPGFraXNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAg ICBXb3JrYXJvdW5kIGZvciBDb3J0ZXgtQTUzIGVycmF0dW0gODM1NzY5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgzMTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGludHJvZHVjZXMg Q01ha2UgdmFyaWFibGUgYW5kIHByZXByb2Nlc3NvciBtYWNybworICAgICAgICBXVEZfQ1BVX0FS TTY0X0NPUlRFWEE1MyB3aXRoIHRoZSBhaW0gb2YgZW5hYmxpbmcgQ29ydGV4LUE1My1zcGVjaWZp YworICAgICAgICBjb2RlIHBhdGhzLCBpZiBzZXQgdHJ1ZS4KKworICAgICAgICAqIFNvdXJjZS9j bWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlOgorICAgICAgICBBZGQgLW1maXgtY29ydGV4LWE1My04 MzU3NjkgdG8gdGhlIGNvbXBpbGVyIGZsYWdzIGlmIGNvbXBpbGVyIHN1cHBvcnRzCisgICAgICAg IGl0LgorICAgICAgICAqIFNvdXJjZS9jbWFrZWNvbmZpZy5oLmNtYWtlOgorICAgICAgICAjY21h a2VkZWZpbmUwMSBmb3IgV1RGX0NQVV9BUk02NF9DT1JURVhBNTMKKwogMjAxNC0xMC0yOSAgUmFw aGFlbCBLdWJvIGRhIENvc3RhICA8cmFrdWNvQEZyZWVCU0Qub3JnPgogCiAgICAgICAgIFtHVEtd IEJ1bXAgbGlic291cCdzIG1pbmltdW0gdmVyc2lvbiB0byAyLjQyLjAuCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAyZjYwMDE3Li40YTU2YTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSw0MiBAQAorMjAxNC0xMS0wMyAgQWtvcyBLaXNzICA8YWtpc3NAaW5mLnUtc3pl Z2VkLmh1PgorCisgICAgICAgIFdvcmthcm91bmQgZm9yIENvcnRleC1BNTMgZXJyYXR1bSA4MzU3 NjkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODMx NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggaW50cm9kdWNlcyBDTWFrZSB2YXJpYWJsZSBhbmQgcHJlcHJvY2Vzc29yIG1hY3JvCisg ICAgICAgIFdURl9DUFVfQVJNNjRfQ09SVEVYQTUzIHdpdGggdGhlIGFpbSBvZiBlbmFibGluZyBD b3J0ZXgtQTUzLXNwZWNpZmljCisgICAgICAgIGNvZGUgcGF0aHMsIGlmIHNldCB0cnVlLiBUaGUg cGF0Y2ggYWxzbyBpbXBsZW1lbnRzIG9uZSBjYXNlIHdoZXJlIHN1Y2gKKyAgICAgICAgY29kZSBw YXRocyBhcmUgbmVlZGVkOiB0aGUgd29ya2Fyb3VuZCBmb3IgQ29ydGV4LUE1MyBlcnJhdHVtIDgz NTc2OS4gSWYKKyAgICAgICAgV1RGX0NQVV9BUk02NF9DT1JURVhBNTMgaXMgc2V0IHRoZW46Cisg ICAgICAgIC0gQ01ha2UgY2hlY2tzIHdoZXRoZXIgdGhlIGNvbXBpbGVyIGFscmVhZHkgaGFzIHN1 cHBvcnQgZm9yIGEgd29ya2Fyb3VuZAorICAgICAgICAgIGFuZCBhZGRzIC1tZml4LWNvcnRleC1h NTMtODM1NzY5IHRvIHRoZSBjb21waWxlciBmbGFncyBpZiBzbywKKyAgICAgICAgLSB0aGUgQVJN NjQgYmFja2VuZCBvZiBvZmZsaW5lYXNtIGluc2VydHMgYSBub3AgYmV0d2VlbiBtZW1vcnkgYW5k CisgICAgICAgICAgbXVsdGlwbHktYWNjdW11bGF0ZSBpbnN0cnVjdGlvbnMsIGFuZAorICAgICAg ICAtIHRoZSBBUk02NCBhc3NlbWJsZXIgYWxzbyBpbnNlcnRzIGEgbm9wIGJldHdlZW4gbWVtb3J5 IGFuZCAoNjQtYml0KSAKKyAgICAgICAgICBtdWx0aXBseS1hY2N1bXVsYXRlIGluc3RydWN0aW9u cy4KKworICAgICAgICAqIGFzc2VtYmxlci9BUk02NEFzc2VtYmxlci5oOgorICAgICAgICAoSlND OjpBUk02NEFzc2VtYmxlcjo6bWFkZCk6CisgICAgICAgIENhbGwgbm9wQ29ydGV4QTUzRml4ODM1 NzY5KCkgdG8gaW5zZXJ0IGEgbm9wIGlmIENQVShBUk02NF9DT1JURVhBNTMpIGFuZAorICAgICAg ICBpZiBuZWNlc3NhcnkuCisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjptc3ViKTogTGlr ZXdpc2UuCisgICAgICAgIChKU0M6OkFSTTY0QXNzZW1ibGVyOjpzbWFkZGwpOiBMaWtld2lzZS4K KyAgICAgICAgKEpTQzo6QVJNNjRBc3NlbWJsZXI6OnNtc3VibCk6IExpa2V3aXNlLgorICAgICAg ICAoSlNDOjpBUk02NEFzc2VtYmxlcjo6dW1hZGRsKTogTGlrZXdpc2UuCisgICAgICAgIChKU0M6 OkFSTTY0QXNzZW1ibGVyOjp1bXN1YmwpOiBMaWtld2lzZS4KKyAgICAgICAgKEpTQzo6QVJNNjRB c3NlbWJsZXI6Om5vcENvcnRleEE1M0ZpeDgzNTc2OSk6CisgICAgICAgIEFkZGVkLiBJbnNlcnQg YSBub3AgaWYgdGhlIHByZXZpb3VzbHkgZW1pdHRlZCBpbnN0cnVjdGlvbiB3YXMgYSBsb2FkLCBh CisgICAgICAgIHN0b3JlLCBvciBhIHByZWZldGNoLCBhbmQgaWYgdGhlIGN1cnJlbnQgaW5zdHJ1 Y3Rpb24gaXMgNjQtYml0LgorICAgICAgICAqIG9mZmxpbmVhc20vYXJtNjQucmI6CisgICAgICAg IEFkZCB0aGUgYXJtNjRDb3J0ZXhBNTNGaXg4MzU3NjkgcGhhc2UgYW5kIGNhbGwgaXQgZnJvbQor ICAgICAgICBnZXRNb2RpZmllZExpc3RBUk02NCB0byBpbnNlcnQgbm9wQ29ydGV4QTUzRml4ODM1 NzY5IGJldHdlZW4gYXBwcm9wcmlhdGUKKyAgICAgICAgbWFjcm8gaW5zdHJ1Y3Rpb25zLiBBbHNv LCBsb3dlciBub3BDb3J0ZXhBNTNGaXg4MzU3NjkgdG8gbm9wIGlmCisgICAgICAgIENQVShBUk02 NF9DT1JURVhBNTMpLCB0byBub3RoaW5nIG90aGVyd2lzZS4KKyAgICAgICAgKiBvZmZsaW5lYXNt L2luc3RydWN0aW9ucy5yYjoKKyAgICAgICAgRGVmaW5lIG1hY3JvIGluc3RydWN0aW9uIG5vcEZp eENvcnRleEE1M0VycjgzNTc2OS4KKwogMjAxNC0xMC0zMCAgRGFuYSBCdXJrYXJ0ICA8ZGJ1cmth cnRAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODgyMTI2MD4gUHJlcGFy ZSBmb3IgdGhlIG15c3RlcmlvdXMgZnV0dXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL0FSTTY0QXNzZW1ibGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv YXNzZW1ibGVyL0FSTTY0QXNzZW1ibGVyLmgKaW5kZXggN2EyNzNhYS4uMGQyMmU4MSAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk02NEFzc2VtYmxlci5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNNjRBc3NlbWJsZXIuaApAQCAt MTU2OCw2ICsxNTY4LDcgQEAgcHVibGljOgogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBtYWRkKFJl Z2lzdGVySUQgcmQsIFJlZ2lzdGVySUQgcm4sIFJlZ2lzdGVySUQgcm0sIFJlZ2lzdGVySUQgcmEp CiAgICAgewogICAgICAgICBDSEVDS19EQVRBU0laRSgpOworICAgICAgICBub3BDb3J0ZXhBNTNG aXg4MzU3Njk8ZGF0YXNpemU+KCk7CiAgICAgICAgIGluc24oZGF0YVByb2Nlc3NpbmczU291cmNl KERBVEFTSVpFLCBEYXRhT3BfTUFERCwgcm0sIHJhLCBybiwgcmQpKTsKICAgICB9CiAKQEAgLTE2 MjAsNiArMTYyMSw3IEBAIHB1YmxpYzoKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgbXN1YihSZWdp c3RlcklEIHJkLCBSZWdpc3RlcklEIHJuLCBSZWdpc3RlcklEIHJtLCBSZWdpc3RlcklEIHJhKQog ICAgIHsKICAgICAgICAgQ0hFQ0tfREFUQVNJWkUoKTsKKyAgICAgICAgbm9wQ29ydGV4QTUzRml4 ODM1NzY5PGRhdGFzaXplPigpOwogICAgICAgICBpbnNuKGRhdGFQcm9jZXNzaW5nM1NvdXJjZShE QVRBU0laRSwgRGF0YU9wX01TVUIsIHJtLCByYSwgcm4sIHJkKSk7CiAgICAgfQogCkBAIC0xODA2 LDYgKzE4MDgsNyBAQCBwdWJsaWM6CiAKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc21hZGRsKFJl Z2lzdGVySUQgcmQsIFJlZ2lzdGVySUQgcm4sIFJlZ2lzdGVySUQgcm0sIFJlZ2lzdGVySUQgcmEp CiAgICAgeworICAgICAgICBub3BDb3J0ZXhBNTNGaXg4MzU3Njk8NjQ+KCk7CiAgICAgICAgIGlu c24oZGF0YVByb2Nlc3NpbmczU291cmNlKERhdGFzaXplXzY0LCBEYXRhT3BfU01BRERMLCBybSwg cmEsIHJuLCByZCkpOwogICAgIH0KIApAQCAtMTgxNiw2ICsxODE5LDcgQEAgcHVibGljOgogCiAg ICAgQUxXQVlTX0lOTElORSB2b2lkIHNtc3VibChSZWdpc3RlcklEIHJkLCBSZWdpc3RlcklEIHJu LCBSZWdpc3RlcklEIHJtLCBSZWdpc3RlcklEIHJhKQogICAgIHsKKyAgICAgICAgbm9wQ29ydGV4 QTUzRml4ODM1NzY5PDY0PigpOwogICAgICAgICBpbnNuKGRhdGFQcm9jZXNzaW5nM1NvdXJjZShE YXRhc2l6ZV82NCwgRGF0YU9wX1NNU1VCTCwgcm0sIHJhLCBybiwgcmQpKTsKICAgICB9CiAKQEAg LTIwNTksNiArMjA2Myw3IEBAIHB1YmxpYzoKIAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCB1bWFk ZGwoUmVnaXN0ZXJJRCByZCwgUmVnaXN0ZXJJRCBybiwgUmVnaXN0ZXJJRCBybSwgUmVnaXN0ZXJJ RCByYSkKICAgICB7CisgICAgICAgIG5vcENvcnRleEE1M0ZpeDgzNTc2OTw2ND4oKTsKICAgICAg ICAgaW5zbihkYXRhUHJvY2Vzc2luZzNTb3VyY2UoRGF0YXNpemVfNjQsIERhdGFPcF9VTUFEREws IHJtLCByYSwgcm4sIHJkKSk7CiAgICAgfQogCkBAIC0yMDY5LDYgKzIwNzQsNyBAQCBwdWJsaWM6 CiAKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgdW1zdWJsKFJlZ2lzdGVySUQgcmQsIFJlZ2lzdGVy SUQgcm4sIFJlZ2lzdGVySUQgcm0sIFJlZ2lzdGVySUQgcmEpCiAgICAgeworICAgICAgICBub3BD b3J0ZXhBNTNGaXg4MzU3Njk8NjQ+KCk7CiAgICAgICAgIGluc24oZGF0YVByb2Nlc3NpbmczU291 cmNlKERhdGFzaXplXzY0LCBEYXRhT3BfVU1TVUJMLCBybSwgcmEsIHJuLCByZCkpOwogICAgIH0K IApAQCAtMzYyOSw2ICszNjM1LDI2IEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiAoMHhkNjAw MDAwMCB8IG9wYyA8PCAyMSB8IG9wMiA8PCAxNiB8IG9wMyA8PCAxMCB8IHhPclpyKHJuKSA8PCA1 IHwgb3A0KTsKICAgICB9CiAKKyAgICAvLyBXb3JrYXJvdW5kIGZvciBDb3J0ZXgtQTUzIGVycmF0 dW0gKDgzNTc2OSkuIEVtaXQgYW4gZXh0cmEgbm9wIGlmIHRoZQorICAgIC8vIGxhc3QgaW5zdHJ1 Y3Rpb24gaW4gdGhlIGJ1ZmZlciBpcyBhIGxvYWQsIHN0b3JlIG9yIHByZWZldGNoLiBOZWVkZWQK KyAgICAvLyBiZWZvcmUgNjQtYml0IG11bHRpcGx5LWFjY3VtdWxhdGUgaW5zdHJ1Y3Rpb25zLgor ICAgIHRlbXBsYXRlPGludCBkYXRhc2l6ZT4KKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgbm9wQ29y dGV4QTUzRml4ODM1NzY5KCkKKyAgICB7CisjaWYgQ1BVKEFSTTY0X0NPUlRFWEE1MykKKyAgICAg ICAgQ0hFQ0tfREFUQVNJWkUoKTsKKyAgICAgICAgaWYgKGRhdGFzaXplID09IDY0KSB7CisgICAg ICAgICAgICBpZiAoTElLRUxZKG1fYnVmZmVyLmNvZGVTaXplKCkgPj0gc2l6ZW9mKGludDMyX3Qp KSkgeworICAgICAgICAgICAgICAgIC8vIEZyb20gQVJNdjggUmVmZXJlbmNlIE1hbnVhbCwgU2Vj dGlvbiBDNC4xOiB0aGUgZW5jb2Rpbmcgb2YgdGhlCisgICAgICAgICAgICAgICAgLy8gaW5zdHJ1 Y3Rpb25zIGluIHRoZSBMb2FkcyBhbmQgc3RvcmVzIGluc3RydWN0aW9uIGdyb3VwIGlzOgorICAg ICAgICAgICAgICAgIC8vIC0tLS0gMS0wLSAtLS0tIC0tLS0gLS0tLSAtLS0tIC0tLS0gLS0tLQor ICAgICAgICAgICAgICAgIGlmIChVTkxJS0VMWSgoKnJlaW50ZXJwcmV0X2Nhc3RfcHRyPGludDMy X3QqPihyZWludGVycHJldF9jYXN0X3B0cjxjaGFyKj4obV9idWZmZXIuZGF0YSgpKSArIG1fYnVm ZmVyLmNvZGVTaXplKCkgLSBzaXplb2YoaW50MzJfdCkpICYgMHgwYTAwMDAwMCkgPT0gMHgwODAw MDAwMCkpCisgICAgICAgICAgICAgICAgICAgIG5vcCgpOworICAgICAgICAgICAgfQorICAgICAg ICB9CisjZW5kaWYKKyAgICB9CisKICAgICBBc3NlbWJsZXJCdWZmZXIgbV9idWZmZXI7CiAgICAg VmVjdG9yPExpbmtSZWNvcmQsIDAsIFVuc2FmZVZlY3Rvck92ZXJmbG93PiBtX2p1bXBzVG9MaW5r OwogICAgIGludCBtX2luZGV4T2ZMYXN0V2F0Y2hwb2ludDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0LnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L29mZmxpbmVhc20vYXJtNjQucmIKaW5kZXggMTk0MGQ3ZGUuLjNhMGQ3ODYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0LnJiCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0LnJiCkBAIC0yMjgsNiArMjI4LDM0IEBAIGRl ZiBhcm02NExvd2VyTWFsZm9ybWVkTG9hZFN0b3JlQWRkcmVzc2VzKGxpc3QpCiAgICAgbmV3TGlz dAogZW5kCiAKKyMgV29ya2Fyb3VuZCBmb3IgQ29ydGV4LUE1MyBlcnJhdHVtICg4MzU3NjkpCitk ZWYgYXJtNjRDb3J0ZXhBNTNGaXg4MzU3NjkobGlzdCkKKyAgICBuZXdMaXN0ID0gW10KKyAgICBs YXN0T3Bjb2RlVW5zYWZlID0gZmFsc2UKKworICAgIGxpc3QuZWFjaCB7CisgICAgICAgIHwgbm9k ZSB8CisgICAgICAgIGlmIG5vZGUuaXNfYT8gSW5zdHJ1Y3Rpb24KKyAgICAgICAgICAgIGNhc2Ug bm9kZS5vcGNvZGUKKyAgICAgICAgICAgIHdoZW4gL15zdG9yZS8sIC9ebG9hZC8KKyAgICAgICAg ICAgICAgICAjIExpc3QgYWxsIG1hY3JvIGluc3RydWN0aW9ucyB0aGF0IGNhbiBiZSBsb3dlcmVk IHRvIGEgbG9hZCwgc3RvcmUgb3IgcHJlZmV0Y2ggQVJNNjQgYXNzZW1ibHkgaW5zdHJ1Y3Rpb24K KyAgICAgICAgICAgICAgICBsYXN0T3Bjb2RlVW5zYWZlID0gdHJ1ZQorICAgICAgICAgICAgd2hl biAgIm11bGkiLCAibXVscCIsICJtdWxxIiwgInNtdWxsaSIKKyAgICAgICAgICAgICAgICAjIExp c3QgYWxsIG1hY3JvIGluc3RydWN0aW9ucyB0aGF0IGNhbiBiZSBsb3dlcmVkIHRvIGEgNjQtYml0 IG11bHRpcGx5LWFjY3VtdWxhdGUgQVJNNjQgYXNzZW1ibHkgaW5zdHJ1Y3Rpb24KKyAgICAgICAg ICAgICAgICAjIChkZWZpbmVkIGFzIG9uZSBvZiBNQURELCBNU1VCLCBTTUFEREwsIFNNU1VCTCwg VU1BRERMIG9yIFVNU1VCTCkuCisgICAgICAgICAgICAgICAgaWYgbGFzdE9wY29kZVVuc2FmZQor ICAgICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVP cmlnaW4sICJub3BDb3J0ZXhBNTNGaXg4MzU3NjkiLCBbXSkKKyAgICAgICAgICAgICAgICBlbmQK KyAgICAgICAgICAgICAgICBsYXN0T3Bjb2RlVW5zYWZlID0gZmFsc2UKKyAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICBsYXN0T3Bjb2RlVW5zYWZlID0gZmFsc2UKKyAgICAgICAgICAg IGVuZAorICAgICAgICBlbmQKKyAgICAgICAgbmV3TGlzdCA8PCBub2RlCisgICAgfQorICAgIG5l d0xpc3QKK2VuZAorCiBjbGFzcyBTZXF1ZW5jZQogICAgIGRlZiBnZXRNb2RpZmllZExpc3RBUk02 NAogICAgICAgICByZXN1bHQgPSBAbGlzdApAQCAtMjg0LDYgKzMxMiw3IEBAIGNsYXNzIFNlcXVl bmNlCiAgICAgICAgIHJlc3VsdCA9IHJpc2NMb3dlclRlc3QocmVzdWx0KQogICAgICAgICByZXN1 bHQgPSBhc3NpZ25SZWdpc3RlcnNUb1RlbXBvcmFyaWVzKHJlc3VsdCwgOmdwciwgQVJNNjRfRVhU UkFfR1BSUykKICAgICAgICAgcmVzdWx0ID0gYXNzaWduUmVnaXN0ZXJzVG9UZW1wb3Jhcmllcyhy ZXN1bHQsIDpmcHIsIEFSTTY0X0VYVFJBX0ZQUlMpCisgICAgICAgIHJlc3VsdCA9IGFybTY0Q29y dGV4QTUzRml4ODM1NzY5KHJlc3VsdCkKICAgICAgICAgcmV0dXJuIHJlc3VsdAogICAgIGVuZAog ZW5kCkBAIC04MzcsNyArODY2LDExIEBAIGNsYXNzIEluc3RydWN0aW9uCiAgICAgICAgIHdoZW4g Im1lbWZlbmNlIgogICAgICAgICAgICAgJGFzbS5wdXRzICJkbWIgc3kiCiAgICAgICAgIHdoZW4g InBjcnRvYWRkciIKLSAgICAgICAgICAkYXNtLnB1dHMgImFkciAje29wZXJhbmRzWzFdLmFybTY0 T3BlcmFuZCg6cHRyKX0sICN7b3BlcmFuZHNbMF0udmFsdWV9IgorICAgICAgICAgICAgJGFzbS5w dXRzICJhZHIgI3tvcGVyYW5kc1sxXS5hcm02NE9wZXJhbmQoOnB0cil9LCAje29wZXJhbmRzWzBd LnZhbHVlfSIKKyAgICAgICAgd2hlbiAibm9wQ29ydGV4QTUzRml4ODM1NzY5IgorICAgICAgICAg ICAgJGFzbS5wdXRTdHIoIiNpZiBDUFUoQVJNNjRfQ09SVEVYQTUzKSIpCisgICAgICAgICAgICAk YXNtLnB1dHMgIm5vcCIKKyAgICAgICAgICAgICRhc20ucHV0U3RyKCIjZW5kaWYiKQogICAgICAg ICBlbHNlCiAgICAgICAgICAgICBsb3dlckRlZmF1bHQKICAgICAgICAgZW5kCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9pbnN0cnVjdGlvbnMucmIgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9pbnN0cnVjdGlvbnMucmIKaW5kZXggODcyOGVl NC4uMWQwZDg2NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v aW5zdHJ1Y3Rpb25zLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2lu c3RydWN0aW9ucy5yYgpAQCAtMjY2LDcgKzI2Niw4IEBAIEFSTV9JTlNUUlVDVElPTlMgPQogCiBB Uk02NF9JTlNUUlVDVElPTlMgPQogICAgIFsKLSAgICAgInBjcnRvYWRkciIgICAgIyBBZGRyZXNz IGZyb20gUEMgcmVsYXRpdmUgb2Zmc2V0IC0gYWRyIGluc3RydWN0aW9uCisgICAgICJwY3J0b2Fk ZHIiLCAgICMgQWRkcmVzcyBmcm9tIFBDIHJlbGF0aXZlIG9mZnNldCAtIGFkciBpbnN0cnVjdGlv bgorICAgICAibm9wRml4Q29ydGV4QTUzRXJyODM1NzY5IiAjIG5vcCBvbiBDb3J0ZXgtQTUzIChu b3RoaW5nIG90aGVyd2lzZSkKICAgICBdCiAKIFJJU0NfSU5TVFJVQ1RJT05TID0KZGlmZiAtLWdp dCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlIGIvU291cmNlL2NtYWtlL09wdGlv bnNDb21tb24uY21ha2UKaW5kZXggZmZjZGZlNS4uYWIyMzA5YiAxMDA2NDQKLS0tIGEvU291cmNl L2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNDb21t b24uY21ha2UKQEAgLTMwLDYgKzMwLDIwIEBAIGlmIChDTUFLRV9DT01QSUxFUl9JU19HTlVDWFgg T1IgIiR7Q01BS0VfQ1hYX0NPTVBJTEVSX0lEfSIgU1RSRVFVQUwgIkNsYW5nIikKICAgICBzZXQo Q01BS0VfQ1hYX0ZMQUdTICIke0NNQUtFX0NYWF9GTEFHU30gLXN0ZD1jKysxMSIpCiBlbmRpZiAo KQogCitpZiAoV1RGX0NQVV9BUk02NF9DT1JURVhBNTMpCisgICAgaWYgKE5PVCBXVEZfQ1BVX0FS TTY0KQorICAgICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJXVEZfQ1BVX0FSTTY0X0NPUlRFWEE1 MyBzZXQgd2l0aG91dCBXVEZfQ1BVX0FSTTY0IikKKyAgICBlbmRpZiAoKQorICAgIG1lc3NhZ2Uo IkNoZWNraW5nIGlmIGNvbXBpbGVyIHN1cHBvcnRzIC1tZml4LWNvcnRleC1hNTMtODM1NzY5IikK KyAgICBleGVjdXRlX3Byb2Nlc3MoQ09NTUFORCAke0NNQUtFX0NfQ09NUElMRVJ9IC1tZml4LWNv cnRleC1hNTMtODM1NzY5IEVSUk9SX1ZBUklBQkxFIENPTVBJTEVSX09VVFBVVCkKKyAgICBpZiAo KE5PVCAiJHtDT01QSUxFUl9PVVRQVVR9IiBNQVRDSEVTICJ1bnJlY29nbml6ZWQgY29tbWFuZCBs aW5lIG9wdGlvbiIpCisgICAgICAgIEFORCAoTk9UICIke0NPTVBJTEVSX09VVFBVVH0iIE1BVENI RVMgInVua25vd24gYXJndW1lbnQiKSkKKyAgICAgICAgc2V0KENNQUtFX0NfRkxBR1MgIiR7Q01B S0VfQ19GTEFHU30gLW1maXgtY29ydGV4LWE1My04MzU3NjkiKQorICAgICAgICBzZXQoQ01BS0Vf Q1hYX0ZMQUdTICIke0NNQUtFX0NYWF9GTEFHU30gLW1maXgtY29ydGV4LWE1My04MzU3NjkiKQor ICAgICAgICBtZXNzYWdlKCJFbmFibGluZyBDb3J0ZXgtQTUzIHdvcmthcm91bmQgZm9yIGNvbXBp bGVyIikKKyAgICBlbmRpZiAoKQorZW5kaWYgKCkKKwogb3B0aW9uKERFQlVHX0ZJU1NJT04gIlVz ZSBEZWJ1ZyBGaXNzaW9uIHN1cHBvcnQiKQogaWYgKERFQlVHX0ZJU1NJT04pCiAgICAgZXhlY3V0 ZV9wcm9jZXNzKENPTU1BTkQgJHtDTUFLRV9DX0NPTVBJTEVSfSAtZnVzZS1sZD1nb2xkIC1XbCwt LXZlcnNpb24gRVJST1JfUVVJRVQgT1VUUFVUX1ZBUklBQkxFIExEX1ZFUlNJT04pCmRpZmYgLS1n aXQgYS9Tb3VyY2UvY21ha2Vjb25maWcuaC5jbWFrZSBiL1NvdXJjZS9jbWFrZWNvbmZpZy5oLmNt YWtlCmluZGV4IGIyNDBmZDkuLjlhZjVlOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZWNvbmZp Zy5oLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZWNvbmZpZy5oLmNtYWtlCkBAIC0xMzksNiArMTM5 LDcgQEAKICNjbWFrZWRlZmluZTAxIFdURl9VU0VfVElMRURfQkFDS0lOR19TVE9SRQogI2NtYWtl ZGVmaW5lMDEgSEFWRV9MTFZNCiAjY21ha2VkZWZpbmUwMSBIQVZFX0dUS19VTklYX1BSSU5USU5H CisjY21ha2VkZWZpbmUwMSBXVEZfQ1BVX0FSTTY0X0NPUlRFWEE1MwogCiAjaWYgZGVmaW5lZChC VUlMRElOR19HVEtfXykgJiYgIWRlZmluZWQoR1RLX0FQSV9WRVJTSU9OXzIpCiAjZGVmaW5lIEdE S19WRVJTSU9OX01JTl9SRVFVSVJFRCBAR0RLX1ZFUlNJT05fTUlOX1JFUVVJUkVEQAo=