65830 2011-08-07 13:46:50 -0700 DFG JIT verbose mode does not report the generated types of nodes 2011-08-11 17:11:27 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo webkit-unassigned dglazkov webkit.review.bot oldest_to_newest 447770 0 fpizlo 2011-08-07 13:46:50 -0700 The DFG JIT has a verbose mode that is intended for debugging, where it currently dumps the IR and the machine code offsets at which nodes in the IR were generated. The IR is mostly untyped, with types being selected on-the-fly in the backend. But the backend does not report the types that are selected for nodes, making it difficult to reason about what kind of code the JIT is emitting unless a machine code dump is produced. The simplest solution is to have the DFG backends (both speculative and non-speculative) dump the DataFormat selected for the register into which the result of each node is placed. 447771 1 103187 fpizlo 2011-08-07 13:49:09 -0700 Created attachment 103187 the patch 447828 2 103187 webkit.review.bot 2011-08-07 21:14:53 -0700 Comment on attachment 103187 the patch Attachment 103187 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9324802 New failing tests: svg/zoom/page/zoom-svg-through-object-with-percentage-size.xhtml svg/custom/svg-fonts-word-spacing.html 447833 3 103187 sam 2011-08-07 21:59:27 -0700 Comment on attachment 103187 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=103187&action=review > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp:1300 > if (!m_compileOkay) > return; > +#if DFG_DEBUG_VERBOSE > + if (node.hasResult()) > + fprintf(stderr, "-> %s\n", dataFormatToString(m_generationInfo[node.virtualRegister()].registerFormat())); > + else > + fprintf(stderr, "\n"); > +#endif It seems like this might give output without a newline in the case that the compile fails. 447843 4 fpizlo 2011-08-07 22:37:54 -0700 (In reply to comment #3) > (From update of attachment 103187 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103187&action=review > > > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp:1300 > > if (!m_compileOkay) > > return; > > +#if DFG_DEBUG_VERBOSE > > + if (node.hasResult()) > > + fprintf(stderr, "-> %s\n", dataFormatToString(m_generationInfo[node.virtualRegister()].registerFormat())); > > + else > > + fprintf(stderr, "\n"); > > +#endif > > It seems like this might give output without a newline in the case that the compile fails. Actually it just changes the format of the output when speculation fails. Previously it would have printed: SpeculativeJIT generating Node @150 at JIT offset 0x73e SpeculativeJIT generating Node @151 at JIT offset 0x742 SpeculativeJIT generating Node @152 at JIT offset 0x742 SpeculativeJIT generating Node @156 at JIT offset 0x74b SpeculativeJIT generating Node @159 at JIT offset 0x74f SpeculativeJIT generating Node @160 at JIT offset 0x753 SpeculativeJIT generating Node @162 at JIT offset 0x7c0 SpeculativeJIT generating Node @164 at JIT offset 0x7e6 SpeculativeJIT generating Node @165 at JIT offset 0x7e6 SpeculativeJIT generating Node @167 at JIT offset 0x7f9 SpeculativeJIT generating Node @169 at JIT offset 0x86f SpeculativeJIT generating Node @170 at JIT offset 0x873 SpeculativeJIT was terminated. NonSpeculativeJIT generating Node @8 at code offset 0x2d NonSpeculativeJIT generating Node @9 at code offset 0x31 NonSpeculativeJIT generating Node @10 at code offset 0x5e Now it'll print: SpeculativeJIT generating Node @150 at JIT offset 0x73e -> Integer SpeculativeJIT generating Node @151 at JIT offset 0x742 -> None SpeculativeJIT generating Node @152 at JIT offset 0x742 -> None SpeculativeJIT generating Node @156 at JIT offset 0x74b -> JSCell SpeculativeJIT generating Node @159 at JIT offset 0x74f -> JS SpeculativeJIT generating Node @160 at JIT offset 0x753 -> JS SpeculativeJIT generating Node @162 at JIT offset 0x7c0 -> Double SpeculativeJIT generating Node @164 at JIT offset 0x7e6 -> None SpeculativeJIT generating Node @165 at JIT offset 0x7e6 -> Double SpeculativeJIT generating Node @167 at JIT offset 0x7f9 SpeculativeJIT generating Node @169 at JIT offset 0x86f -> Integer SpeculativeJIT generating Node @170 at JIT offset 0x873 SpeculativeJIT was terminated. NonSpeculativeJIT generating Node @8 at code offset 0x2d -> JS NonSpeculativeJIT generating Node @9 at code offset 0x31 -> Cell NonSpeculativeJIT generating Node @10 at code offset 0x5e If anyone feels strongly about having "SpeculativeJIT was terminated" printed after a newline after the line that reports the node on which the speculation fails, then I can certainly make that change! But I left it this way because to me, this actually kind of looks better. It implements the invariant that verbose mode prints one line per node, per JIT backend, and this one line contains all the info you want (the node number, the machine code offset, the result if there is one, and whether or not speculation terminated). 450079 5 103187 sam 2011-08-11 15:24:34 -0700 Comment on attachment 103187 the patch My mistake, r=me. 450121 6 103696 fpizlo 2011-08-11 16:11:12 -0700 Created attachment 103696 the patch (fix merge) 450174 7 103696 webkit.review.bot 2011-08-11 17:11:23 -0700 Comment on attachment 103696 the patch (fix merge) Clearing flags on attachment: 103696 Committed r92892: <http://trac.webkit.org/changeset/92892> 450175 8 webkit.review.bot 2011-08-11 17:11:27 -0700 All reviewed patches have been landed. Closing bug. 103187 2011-08-07 13:49:09 -0700 2011-08-11 16:11:12 -0700 the patch verboseresult_patch_1.diff text/plain 4153 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTI1NzQpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMDgtMDcgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KKworICAgICAgICBE RkcgSklUIHZlcmJvc2UgbW9kZSBkb2VzIG5vdCByZXBvcnQgdGhlIGdlbmVyYXRlZCB0eXBlcyBv ZiBub2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjU4MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIEFkZGVkIGNvZGUgdGhhdCBwcmludHMgdGhlIHR5cGUgc2VsZWN0ZWQgZm9yIGVhY2gg bm9kZSdzIHJlc3VsdC4KKworICAgICAgICAqIGRmZy9ERkdHZW5lcmF0aW9uSW5mby5oOgorICAg ICAgICAoSlNDOjpERkc6OmRhdGFGb3JtYXRUb1N0cmluZyk6CisgICAgICAgICogZGZnL0RGR05v blNwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpOb25TcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKIDIwMTEtMDgtMDcgIE1h cnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIERpc3RyaWJ1 dGlvbiBmaXggZm9yIEdUSysuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dl bmVyYXRpb25JbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdHZW5lcmF0aW9uSW5mby5oCShyZXZpc2lvbiA5MjU3NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHR2VuZXJhdGlvbkluZm8uaAkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDks MzIgQEAgZW51bSBEYXRhRm9ybWF0IHsKICAgICBEYXRhRm9ybWF0SlNDZWxsID0gRGF0YUZvcm1h dEpTIHwgRGF0YUZvcm1hdENlbGwsCiB9OwogCisjaWZuZGVmIE5ERUJVRworaW5saW5lIGNvbnN0 IGNoYXIqIGRhdGFGb3JtYXRUb1N0cmluZyhEYXRhRm9ybWF0IGRhdGFGb3JtYXQpCit7CisgICAg c3dpdGNoIChkYXRhRm9ybWF0KSB7CisgICAgY2FzZSBEYXRhRm9ybWF0Tm9uZToKKyAgICAgICAg cmV0dXJuICJOb25lIjsKKyAgICBjYXNlIERhdGFGb3JtYXRJbnRlZ2VyOgorICAgICAgICByZXR1 cm4gIkludGVnZXIiOworICAgIGNhc2UgRGF0YUZvcm1hdERvdWJsZToKKyAgICAgICAgcmV0dXJu ICJEb3VibGUiOworICAgIGNhc2UgRGF0YUZvcm1hdENlbGw6CisgICAgICAgIHJldHVybiAiQ2Vs bCI7CisgICAgY2FzZSBEYXRhRm9ybWF0SlM6CisgICAgICAgIHJldHVybiAiSlMiOworICAgIGNh c2UgRGF0YUZvcm1hdEpTSW50ZWdlcjoKKyAgICAgICAgcmV0dXJuICJKU0ludGVnZXIiOworICAg IGNhc2UgRGF0YUZvcm1hdEpTRG91YmxlOgorICAgICAgICByZXR1cm4gIkpTRG91YmxlIjsKKyAg ICBjYXNlIERhdGFGb3JtYXRKU0NlbGw6CisgICAgICAgIHJldHVybiAiSlNDZWxsIjsKKyAgICBk ZWZhdWx0OgorICAgICAgICByZXR1cm4gIlVua25vd24iOworICAgIH0KK30KKyNlbmRpZgorCiBp bmxpbmUgYm9vbCBuZWVkRGF0YUZvcm1hdENvbnZlcnNpb24oRGF0YUZvcm1hdCBmcm9tLCBEYXRh Rm9ybWF0IHRvKQogewogICAgIEFTU0VSVChmcm9tICE9IERhdGFGb3JtYXROb25lKTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9uU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9uU3BlY3VsYXRpdmVKSVQu Y3BwCShyZXZpc2lvbiA5MjU3NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9u U3BlY3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTg0LDcgKzExODQsNyBAQCB2 b2lkIE5vblNwZWN1bGF0aXZlSklUOjpjb21waWxlKFNwZWN1bGF0CiAgICAgICAgICAgICBjb250 aW51ZTsKIAogI2lmIERGR19ERUJVR19WRVJCT1NFCi0gICAgICAgIGZwcmludGYoc3RkZXJyLCAi Tm9uU3BlY3VsYXRpdmVKSVQgZ2VuZXJhdGluZyBOb2RlIEAlZCBhdCBjb2RlIG9mZnNldCAweCV4 XG4iLCAoaW50KW1fY29tcGlsZUluZGV4LCBtX2ppdC5kZWJ1Z09mZnNldCgpKTsKKyAgICAgICAg ZnByaW50ZihzdGRlcnIsICJOb25TcGVjdWxhdGl2ZUpJVCBnZW5lcmF0aW5nIE5vZGUgQCVkIGF0 IGNvZGUgb2Zmc2V0IDB4JXggICAiLCAoaW50KW1fY29tcGlsZUluZGV4LCBtX2ppdC5kZWJ1Z09m ZnNldCgpKTsKICNlbmRpZgogI2lmIERGR19KSVRfQlJFQUtfT05fRVZFUllfTk9ERQogICAgICAg ICBtX2ppdC5icmVha3BvaW50KCk7CkBAIC0xMTkyLDYgKzExOTIsMTIgQEAgdm9pZCBOb25TcGVj dWxhdGl2ZUpJVDo6Y29tcGlsZShTcGVjdWxhdAogCiAgICAgICAgIGNoZWNrQ29uc2lzdGVuY3ko KTsKICAgICAgICAgY29tcGlsZShjaGVja0l0ZXJhdG9yLCBub2RlKTsKKyNpZiBERkdfREVCVUdf VkVSQk9TRQorICAgICAgICBpZiAobm9kZS5oYXNSZXN1bHQoKSkKKyAgICAgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAiLT4gJXNcbiIsIGRhdGFGb3JtYXRUb1N0cmluZyhtX2dlbmVyYXRpb25JbmZv W25vZGUudmlydHVhbFJlZ2lzdGVyKCldLnJlZ2lzdGVyRm9ybWF0KCkpKTsKKyAgICAgICAgZWxz ZQorICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJcbiIpOworI2VuZGlmCiAgICAgICAgIGNo ZWNrQ29uc2lzdGVuY3koKTsKICAgICB9CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkocmV2aXNpb24gOTI1NzQpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTI4Myw3ICsxMjgzLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShCYXNp Y0Jsb2NrJgogICAgICAgICAgICAgY29udGludWU7CiAKICNpZiBERkdfREVCVUdfVkVSQk9TRQot ICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlNwZWN1bGF0aXZlSklUIGdlbmVyYXRpbmcgTm9kZSBA JWQgYXQgSklUIG9mZnNldCAweCV4XG4iLCAoaW50KW1fY29tcGlsZUluZGV4LCBtX2ppdC5kZWJ1 Z09mZnNldCgpKTsKKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJTcGVjdWxhdGl2ZUpJVCBnZW5l cmF0aW5nIE5vZGUgQCVkIGF0IEpJVCBvZmZzZXQgMHgleCAgICIsIChpbnQpbV9jb21waWxlSW5k ZXgsIG1faml0LmRlYnVnT2Zmc2V0KCkpOwogI2VuZGlmCiAjaWYgREZHX0pJVF9CUkVBS19PTl9F VkVSWV9OT0RFCiAgICAgICAgIG1faml0LmJyZWFrcG9pbnQoKTsKQEAgLTEyOTIsNiArMTI5Miwx MiBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKEJhc2ljQmxvY2smCiAgICAgICAgIGNv bXBpbGUobm9kZSk7CiAgICAgICAgIGlmICghbV9jb21waWxlT2theSkKICAgICAgICAgICAgIHJl dHVybjsKKyNpZiBERkdfREVCVUdfVkVSQk9TRQorICAgICAgICBpZiAobm9kZS5oYXNSZXN1bHQo KSkKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiLT4gJXNcbiIsIGRhdGFGb3JtYXRUb1N0 cmluZyhtX2dlbmVyYXRpb25JbmZvW25vZGUudmlydHVhbFJlZ2lzdGVyKCldLnJlZ2lzdGVyRm9y bWF0KCkpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJcbiIp OworI2VuZGlmCiAgICAgICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKICAgICB9CiB9Cg== 103696 2011-08-11 16:11:12 -0700 2011-08-11 17:11:23 -0700 the patch (fix merge) verboseresult_patch_2.diff text/plain 4157 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTI4ODQpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMDgtMDcgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KKworICAgICAgICBE RkcgSklUIHZlcmJvc2UgbW9kZSBkb2VzIG5vdCByZXBvcnQgdGhlIGdlbmVyYXRlZCB0eXBlcyBv ZiBub2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjU4MzAKKworICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgorICAgICAgICAKKyAgICAg ICAgQWRkZWQgY29kZSB0aGF0IHByaW50cyB0aGUgdHlwZSBzZWxlY3RlZCBmb3IgZWFjaCBub2Rl J3MgcmVzdWx0LgorCisgICAgICAgICogZGZnL0RGR0dlbmVyYXRpb25JbmZvLmg6CisgICAgICAg IChKU0M6OkRGRzo6ZGF0YUZvcm1hdFRvU3RyaW5nKToKKyAgICAgICAgKiBkZmcvREZHTm9uU3Bl Y3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6Ok5vblNwZWN1bGF0aXZlSklUOjpj b21waWxlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAo SlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlKToKKwogMjAxMS0wOC0xMSAgSmFtZXMg Um9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIG51bGxwdHIgY2FuJ3Qg YmUgdXNlZCBmb3IgUGFzc1JlZlB0cgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdHZW5lcmF0aW9uSW5mby5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHR2VuZXJhdGlvbkluZm8uaAkocmV2aXNpb24gOTI4ODQpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0dlbmVyYXRpb25JbmZvLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYg KzQ5LDMyIEBAIGVudW0gRGF0YUZvcm1hdCB7CiAgICAgRGF0YUZvcm1hdEpTQ2VsbCA9IERhdGFG b3JtYXRKUyB8IERhdGFGb3JtYXRDZWxsLAogfTsKIAorI2lmbmRlZiBOREVCVUcKK2lubGluZSBj b25zdCBjaGFyKiBkYXRhRm9ybWF0VG9TdHJpbmcoRGF0YUZvcm1hdCBkYXRhRm9ybWF0KQorewor ICAgIHN3aXRjaCAoZGF0YUZvcm1hdCkgeworICAgIGNhc2UgRGF0YUZvcm1hdE5vbmU6CisgICAg ICAgIHJldHVybiAiTm9uZSI7CisgICAgY2FzZSBEYXRhRm9ybWF0SW50ZWdlcjoKKyAgICAgICAg cmV0dXJuICJJbnRlZ2VyIjsKKyAgICBjYXNlIERhdGFGb3JtYXREb3VibGU6CisgICAgICAgIHJl dHVybiAiRG91YmxlIjsKKyAgICBjYXNlIERhdGFGb3JtYXRDZWxsOgorICAgICAgICByZXR1cm4g IkNlbGwiOworICAgIGNhc2UgRGF0YUZvcm1hdEpTOgorICAgICAgICByZXR1cm4gIkpTIjsKKyAg ICBjYXNlIERhdGFGb3JtYXRKU0ludGVnZXI6CisgICAgICAgIHJldHVybiAiSlNJbnRlZ2VyIjsK KyAgICBjYXNlIERhdGFGb3JtYXRKU0RvdWJsZToKKyAgICAgICAgcmV0dXJuICJKU0RvdWJsZSI7 CisgICAgY2FzZSBEYXRhRm9ybWF0SlNDZWxsOgorICAgICAgICByZXR1cm4gIkpTQ2VsbCI7Cisg ICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuICJVbmtub3duIjsKKyAgICB9Cit9CisjZW5kaWYK KwogaW5saW5lIGJvb2wgbmVlZERhdGFGb3JtYXRDb252ZXJzaW9uKERhdGFGb3JtYXQgZnJvbSwg RGF0YUZvcm1hdCB0bykKIHsKICAgICBBU1NFUlQoZnJvbSAhPSBEYXRhRm9ybWF0Tm9uZSk7Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZlSklULmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vblNwZWN1bGF0aXZl SklULmNwcAkocmV2aXNpb24gOTI4ODQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R05vblNwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE4Niw3ICsxMTg2LDcg QEAgdm9pZCBOb25TcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShTcGVjdWxhdAogICAgICAgICAgICAg Y29udGludWU7CiAKICNpZiBERkdfREVCVUdfVkVSQk9TRQotICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgIk5vblNwZWN1bGF0aXZlSklUIGdlbmVyYXRpbmcgTm9kZSBAJWQgYXQgY29kZSBvZmZzZXQg MHgleFxuIiwgKGludCltX2NvbXBpbGVJbmRleCwgbV9qaXQuZGVidWdPZmZzZXQoKSk7CisgICAg ICAgIGZwcmludGYoc3RkZXJyLCAiTm9uU3BlY3VsYXRpdmVKSVQgZ2VuZXJhdGluZyBOb2RlIEAl ZCBhdCBjb2RlIG9mZnNldCAweCV4ICAgIiwgKGludCltX2NvbXBpbGVJbmRleCwgbV9qaXQuZGVi dWdPZmZzZXQoKSk7CiAjZW5kaWYKICNpZiBERkdfSklUX0JSRUFLX09OX0VWRVJZX05PREUKICAg ICAgICAgbV9qaXQuYnJlYWtwb2ludCgpOwpAQCAtMTE5NCw2ICsxMTk0LDEyIEBAIHZvaWQgTm9u U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoU3BlY3VsYXQKIAogICAgICAgICBjaGVja0NvbnNpc3Rl bmN5KCk7CiAgICAgICAgIGNvbXBpbGUoY2hlY2tJdGVyYXRvciwgbm9kZSk7CisjaWYgREZHX0RF QlVHX1ZFUkJPU0UKKyAgICAgICAgaWYgKG5vZGUuaGFzUmVzdWx0KCkpCisgICAgICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIi0+ICVzXG4iLCBkYXRhRm9ybWF0VG9TdHJpbmcobV9nZW5lcmF0aW9u SW5mb1tub2RlLnZpcnR1YWxSZWdpc3RlcigpXS5yZWdpc3RlckZvcm1hdCgpKSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiXG4iKTsKKyNlbmRpZgogICAgICAg ICBjaGVja0NvbnNpc3RlbmN5KCk7CiAgICAgfQogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlzaW9uIDkyODg0KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyODMsNyArMTI4Myw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUo QmFzaWNCbG9jayYKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAjaWYgREZHX0RFQlVHX1ZFUkJP U0UKLSAgICAgICAgZnByaW50ZihzdGRlcnIsICJTcGVjdWxhdGl2ZUpJVCBnZW5lcmF0aW5nIE5v ZGUgQCVkIGF0IEpJVCBvZmZzZXQgMHgleFxuIiwgKGludCltX2NvbXBpbGVJbmRleCwgbV9qaXQu ZGVidWdPZmZzZXQoKSk7CisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiU3BlY3VsYXRpdmVKSVQg Z2VuZXJhdGluZyBOb2RlIEAlZCBhdCBKSVQgb2Zmc2V0IDB4JXggICAiLCAoaW50KW1fY29tcGls ZUluZGV4LCBtX2ppdC5kZWJ1Z09mZnNldCgpKTsKICNlbmRpZgogI2lmIERGR19KSVRfQlJFQUtf T05fRVZFUllfTk9ERQogICAgICAgICBtX2ppdC5icmVha3BvaW50KCk7CkBAIC0xMjkyLDYgKzEy OTIsMTIgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShCYXNpY0Jsb2NrJgogICAgICAg ICBjb21waWxlKG5vZGUpOwogICAgICAgICBpZiAoIW1fY29tcGlsZU9rYXkpCiAgICAgICAgICAg ICByZXR1cm47CisjaWYgREZHX0RFQlVHX1ZFUkJPU0UKKyAgICAgICAgaWYgKG5vZGUuaGFzUmVz dWx0KCkpCisgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIi0+ICVzXG4iLCBkYXRhRm9ybWF0 VG9TdHJpbmcobV9nZW5lcmF0aW9uSW5mb1tub2RlLnZpcnR1YWxSZWdpc3RlcigpXS5yZWdpc3Rl ckZvcm1hdCgpKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAi XG4iKTsKKyNlbmRpZgogICAgICAgICBjaGVja0NvbnNpc3RlbmN5KCk7CiAgICAgfQogfQo=