149080 2015-09-11 16:45:44 -0700 Implement the relational instructions for floats in WebAssembly 2015-09-11 17:57:59 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 146064 1 sukolsak webkit-unassigned commit-queue fpizlo ggaren mark.lam saam sukolsak ysuzuki oldest_to_newest 1125298 0 sukolsak 2015-09-11 16:45:44 -0700 Implement the relational instructions for floats in WebAssembly 1125306 1 261032 sukolsak 2015-09-11 16:59:19 -0700 Created attachment 261032 Patch 1125315 2 261032 ggaren 2015-09-11 17:11:05 -0700 Comment on attachment 261032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=261032&action=review r=me > Source/JavaScriptCore/wasm/WASMFunctionCompiler.h:546 > + Jump trueCase = branchDouble(condition, FPRInfo::fpRegT0, FPRInfo::fpRegT1); It would be nice to use a simple compare rather than a compare-and-branch. But it looks like our assembler doesn't currently support that :(. 1125326 3 261032 commit-queue 2015-09-11 17:57:55 -0700 Comment on attachment 261032 Patch Clearing flags on attachment: 261032 Committed r189645: <http://trac.webkit.org/changeset/189645> 1125327 4 commit-queue 2015-09-11 17:57:59 -0700 All reviewed patches have been landed. Closing bug. 261032 2015-09-11 16:59:19 -0700 2015-09-11 17:57:55 -0700 Patch diff.txt text/plain 11411 sukolsak ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDRhYmNhNTBkZWM1YmQ2N2YxYzMxZjE4MGE3Yzhi MjliYTJjMThkMmQuLjY2OWFiYmU4NTljNGUzY2MzNGE4OGQ0MGRjMjI0MDZiODRlYzBiMmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTA5LTExICBTdWtv bHNhayBTYWtzaHV3b25nICA8c3Vrb2xzYWtAZ21haWwuY29tPgorCisgICAgICAgIEltcGxlbWVu dCB0aGUgcmVsYXRpb25hbCBpbnN0cnVjdGlvbnMgZm9yIGZsb2F0cyBpbiBXZWJBc3NlbWJseQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5MDgwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBpbXBsZW1lbnRzIHRoZSByZWxhdGlvbmFsIGluc3RydWN0aW9ucyBmb3IgZmxvYXRzIChmbG9h dDMyKQorICAgICAgICBpbiBXZWJBc3NlbWJseSBieSBjb252ZXJ0aW5nIGZsb2F0IG9wZXJhbmRz IHRvIGRvdWJsZXMgYW5kIHRoZW4KKyAgICAgICAgY29tcGFyaW5nIHRoZW0gdXNpbmcgdGhlIGV4 aXN0aW5nIGRvdWJsZSBjb21wYXJpc29uIGluc3RydWN0aW9ucyBpbiB0aGUKKyAgICAgICAgbWFj cm8gYXNzZW1ibGVyLgorCisgICAgICAgICogdGVzdHMvc3RyZXNzL3dhc20tcmVsYXRpb25hbC5q czoKKyAgICAgICAgKiB0ZXN0cy9zdHJlc3Mvd2FzbS9yZWxhdGlvbmFsLndhc206CisgICAgICAg ICogd2FzbS9XQVNNRnVuY3Rpb25Db21waWxlci5oOgorICAgICAgICAoSlNDOjpXQVNNRnVuY3Rp b25Db21waWxlcjo6YnVpbGRSZWxhdGlvbmFsRjMyKToKKyAgICAgICAgKiB3YXNtL1dBU01GdW5j dGlvblBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OldBU01GdW5jdGlvblBhcnNlcjo6cGFyc2VF eHByZXNzaW9uSTMyKToKKyAgICAgICAgKEpTQzo6V0FTTUZ1bmN0aW9uUGFyc2VyOjpwYXJzZVJl bGF0aW9uYWxGMzJFeHByZXNzaW9uSTMyKToKKyAgICAgICAgKiB3YXNtL1dBU01GdW5jdGlvblBh cnNlci5oOgorICAgICAgICAqIHdhc20vV0FTTUZ1bmN0aW9uU3ludGF4Q2hlY2tlci5oOgorICAg ICAgICAoSlNDOjpXQVNNRnVuY3Rpb25TeW50YXhDaGVja2VyOjpidWlsZFJlbGF0aW9uYWxGMzIp OgorCiAyMDE1LTA5LTExICBTdWtvbHNhayBTYWtzaHV3b25nICA8c3Vrb2xzYWtAZ21haWwuY29t PgogCiAgICAgICAgIEFkZCBpbml0aWFsIHN1cHBvcnQgZm9yIGZsb2F0cyBpbiBXZWJBc3NzZW1i bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3Mvd2FzbS1y ZWxhdGlvbmFsLmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy93YXNtLXJl bGF0aW9uYWwuanMKaW5kZXggYzIyZGViYWI3NjRjMDA1MWQ2NDFhOGU1MTAxZWM4MmZlMjI5OWM3 ZC4uZTllMDYyOGQ3MmZkMTA3NDViZjYzMjgxMzY1OThlYzBlOTUyZTRjOSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy93YXNtLXJlbGF0aW9uYWwuanMKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy93YXNtLXJlbGF0aW9uYWwuanMK QEAgLTcxLDYgKzcxLDQyIEBAIGZ1bmN0aW9uIGFzbU1vZHVsZShnbG9iYWwsIGVudiwgYnVmZmVy KSB7CiAgICAgICAgIHJldHVybiAoKHggPj4+IDApID49ICh5ID4+PiAwKSkgfCAwOwogICAgIH0K IAorICAgIGZ1bmN0aW9uIGZsb2F0RXF1YWwoeCwgeSkgeworICAgICAgICB4ID0gZnJvdW5kKHgp OworICAgICAgICB5ID0gZnJvdW5kKHkpOworICAgICAgICByZXR1cm4gKHggPT0geSkgfCAwOwor ICAgIH0KKworICAgIGZ1bmN0aW9uIGZsb2F0Tm90RXF1YWwoeCwgeSkgeworICAgICAgICB4ID0g ZnJvdW5kKHgpOworICAgICAgICB5ID0gZnJvdW5kKHkpOworICAgICAgICByZXR1cm4gKHggIT0g eSkgfCAwOworICAgIH0KKworICAgIGZ1bmN0aW9uIGZsb2F0TGVzc1RoYW4oeCwgeSkgeworICAg ICAgICB4ID0gZnJvdW5kKHgpOworICAgICAgICB5ID0gZnJvdW5kKHkpOworICAgICAgICByZXR1 cm4gKHggPCB5KSB8IDA7CisgICAgfQorCisgICAgZnVuY3Rpb24gZmxvYXRMZXNzVGhhbk9yRXF1 YWwoeCwgeSkgeworICAgICAgICB4ID0gZnJvdW5kKHgpOworICAgICAgICB5ID0gZnJvdW5kKHkp OworICAgICAgICByZXR1cm4gKHggPD0geSkgfCAwOworICAgIH0KKworICAgIGZ1bmN0aW9uIGZs b2F0R3JlYXRlclRoYW4oeCwgeSkgeworICAgICAgICB4ID0gZnJvdW5kKHgpOworICAgICAgICB5 ID0gZnJvdW5kKHkpOworICAgICAgICByZXR1cm4gKHggPiB5KSB8IDA7CisgICAgfQorCisgICAg ZnVuY3Rpb24gZmxvYXRHcmVhdGVyVGhhbk9yRXF1YWwoeCwgeSkgeworICAgICAgICB4ID0gZnJv dW5kKHgpOworICAgICAgICB5ID0gZnJvdW5kKHkpOworICAgICAgICByZXR1cm4gKHggPj0geSkg fCAwOworICAgIH0KKwogICAgIGZ1bmN0aW9uIGRvdWJsZUVxdWFsKHgsIHkpIHsKICAgICAgICAg eCA9ICt4OwogICAgICAgICB5ID0gK3k7CkBAIC0xMTksNiArMTU1LDEzIEBAIGZ1bmN0aW9uIGFz bU1vZHVsZShnbG9iYWwsIGVudiwgYnVmZmVyKSB7CiAgICAgICAgIHVuc2lnbmVkR3JlYXRlclRo YW46IHVuc2lnbmVkR3JlYXRlclRoYW4sCiAgICAgICAgIHVuc2lnbmVkR3JlYXRlclRoYW5PckVx dWFsOiB1bnNpZ25lZEdyZWF0ZXJUaGFuT3JFcXVhbCwKIAorICAgICAgICBmbG9hdEVxdWFsOiBm bG9hdEVxdWFsLAorICAgICAgICBmbG9hdE5vdEVxdWFsOiBmbG9hdE5vdEVxdWFsLAorICAgICAg ICBmbG9hdExlc3NUaGFuOiBmbG9hdExlc3NUaGFuLAorICAgICAgICBmbG9hdExlc3NUaGFuT3JF cXVhbDogZmxvYXRMZXNzVGhhbk9yRXF1YWwsCisgICAgICAgIGZsb2F0R3JlYXRlclRoYW46IGZs b2F0R3JlYXRlclRoYW4sCisgICAgICAgIGZsb2F0R3JlYXRlclRoYW5PckVxdWFsOiBmbG9hdEdy ZWF0ZXJUaGFuT3JFcXVhbCwKKwogICAgICAgICBkb3VibGVFcXVhbDogZG91YmxlRXF1YWwsCiAg ICAgICAgIGRvdWJsZU5vdEVxdWFsOiBkb3VibGVOb3RFcXVhbCwKICAgICAgICAgZG91YmxlTGVz c1RoYW46IGRvdWJsZUxlc3NUaGFuLApAQCAtMTUyLDYgKzE5NSwyOCBAQCBzaG91bGRCZShtb2R1 bGUudW5zaWduZWRHcmVhdGVyVGhhbigyLCAtMSksIDApOwogc2hvdWxkQmUobW9kdWxlLnVuc2ln bmVkR3JlYXRlclRoYW5PckVxdWFsKC0xLCAyKSwgMSk7CiBzaG91bGRCZShtb2R1bGUudW5zaWdu ZWRHcmVhdGVyVGhhbk9yRXF1YWwoMiwgLTEpLCAwKTsKIAorc2hvdWxkQmUobW9kdWxlLmZsb2F0 RXF1YWwoMC4xLCAwLjEpLCAxKTsKK3Nob3VsZEJlKG1vZHVsZS5mbG9hdEVxdWFsKDAuMSwgMC4y KSwgMCk7CitzaG91bGRCZShtb2R1bGUuZmxvYXROb3RFcXVhbCgwLjEsIDAuMiksIDEpOworc2hv dWxkQmUobW9kdWxlLmZsb2F0Tm90RXF1YWwoMC4xLCAwLjEpLCAwKTsKK3Nob3VsZEJlKG1vZHVs ZS5mbG9hdExlc3NUaGFuKC0wLjEsIDAuMiksIDEpOworc2hvdWxkQmUobW9kdWxlLmZsb2F0TGVz c1RoYW4oMC4xLCAwLjEpLCAwKTsKK3Nob3VsZEJlKG1vZHVsZS5mbG9hdExlc3NUaGFuT3JFcXVh bCgwLjEsIDAuMSksIDEpOworc2hvdWxkQmUobW9kdWxlLmZsb2F0TGVzc1RoYW5PckVxdWFsKDAu MiwgMC4xKSwgMCk7CitzaG91bGRCZShtb2R1bGUuZmxvYXRHcmVhdGVyVGhhbigwLjIsIC0wLjEp LCAxKTsKK3Nob3VsZEJlKG1vZHVsZS5mbG9hdEdyZWF0ZXJUaGFuKDAuMSwgMC4xKSwgMCk7Citz aG91bGRCZShtb2R1bGUuZmxvYXRHcmVhdGVyVGhhbk9yRXF1YWwoMC4xLCAwLjEpLCAxKTsKK3No b3VsZEJlKG1vZHVsZS5mbG9hdEdyZWF0ZXJUaGFuT3JFcXVhbCgwLjEsIDAuMiksIDApOworc2hv dWxkQmUobW9kdWxlLmZsb2F0RXF1YWwoTmFOLCBOYU4pLCAwKTsKK3Nob3VsZEJlKG1vZHVsZS5m bG9hdE5vdEVxdWFsKE5hTiwgTmFOKSwgMCk7CitzaG91bGRCZShtb2R1bGUuZmxvYXROb3RFcXVh bChOYU4sIDAuMSksIDApOworc2hvdWxkQmUobW9kdWxlLmZsb2F0R3JlYXRlclRoYW4oTmFOLCAw LjEpLCAwKTsKK3Nob3VsZEJlKG1vZHVsZS5mbG9hdExlc3NUaGFuKE5hTiwgMC4xKSwgMCk7Citz aG91bGRCZShtb2R1bGUuZmxvYXRFcXVhbChJbmZpbml0eSwgSW5maW5pdHkpLCAxKTsKK3Nob3Vs ZEJlKG1vZHVsZS5mbG9hdEdyZWF0ZXJUaGFuKEluZmluaXR5LCAwLjEpLCAxKTsKK3Nob3VsZEJl KG1vZHVsZS5mbG9hdEdyZWF0ZXJUaGFuKEluZmluaXR5LCBOYU4pLCAwKTsKK3Nob3VsZEJlKG1v ZHVsZS5mbG9hdExlc3NUaGFuKEluZmluaXR5LCBOYU4pLCAwKTsKKwogc2hvdWxkQmUobW9kdWxl LmRvdWJsZUVxdWFsKDAuMSwgMC4xKSwgMSk7CiBzaG91bGRCZShtb2R1bGUuZG91YmxlRXF1YWwo MC4xLCAwLjIpLCAwKTsKIHNob3VsZEJlKG1vZHVsZS5kb3VibGVOb3RFcXVhbCgwLjEsIDAuMiks IDEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy93YXNt L3JlbGF0aW9uYWwud2FzbSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3Mvd2Fz bS9yZWxhdGlvbmFsLndhc20KaW5kZXggZTM5YmExMzYzYWJjMDFhYjcyMWIyOGJhMTQ4YjVhNjQ5 MTAzN2U5Mi4uNjRjMDM4N2FkN2QwNTljNjk1N2E0ZjRkZDEyODg3YmEwYzM5ZGY4NSAxMDA2NDQK R0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDU3OQp6Y21adlhOcDhZRzVKa0oyRm9aRF45RF5CPmtj bU1rbjwjOSFLcUh6I0dQWXU0V3QqZUdPflBlempAWjhgJVFuPkYKenNzNjkyYCYmQWp6WU95dSFH dVNfSVRPT3E1RVYpbzt8UTxqbXckTXZgZ2AhJDBOZGFMX3pkPko0KV9TWmZDSTMkCnorazNOM3Vu WUZVUzh4Y3shNGBOQUs3bnVHWHQoRFRfMm8pfkcxSjxQayNSI2cmVTdWQkNNY1dPeHxDU2pOXlhe bgp6PlAxTFVMKCg7IV8wbS1INTg5RTZKSmd6eyFoMnxFPThRPUxta1l5XiQyVnE/ZjZ8azRraXBH LU1BQ2MjWnVuWDsKbD9vZXhLWm4tbDw9fSV2MjVnZmJMST1GVGQpd0pWUSt1P2g2Q2wpb0F7e2Ep cnl7WjVKCgpkZWx0YSAxNTgKemNtWEBpdldpKV5KaDM+fW03TV91bjFCI1NHSiF9aTVQJmZsNyNQ N3xxUGZHdyotREg4Nlpmc3VQMDI0ISUxTCFDCnpFS1NUfDtEVGBjQD1HOW1aVjJCZXdZV0dXQlFj TUdYWXprV0YrRTwwc0MhWHJWbzdRZFNiYDVqJGlFMDsxVX4/cApDTEBJIyoKCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XQVNNRnVuY3Rpb25Db21waWxlci5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV0FTTUZ1bmN0aW9uQ29tcGlsZXIuaAppbmRleCA2YTVk N2JjNmQ5NzVkNGYzYzljMjhiMDA0ZGYyOWUyNWRiZjIwYTcwLi5kOGJmNjUyODQ4MjQ2ZTMxZjNi MWI4ZDRhYzU3MzNjYWVkNzdjNDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d2FzbS9XQVNNRnVuY3Rpb25Db21waWxlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL1dBU01GdW5jdGlvbkNvbXBpbGVyLmgKQEAgLTUxMyw2ICs1MTMsNDUgQEAgcHVibGljOgog ICAgICAgICByZXR1cm4gVU5VU0VEOwogICAgIH0KIAorICAgIGludCBidWlsZFJlbGF0aW9uYWxG MzIoaW50LCBpbnQsIFdBU01PcEV4cHJlc3Npb25JMzIgb3ApCisgICAgeworICAgICAgICBsb2Fk RG91YmxlKHRlbXBvcmFyeUFkZHJlc3MobV90ZW1wU3RhY2tUb3AgLSAyKSwgRlBSSW5mbzo6ZnBS ZWdUMCk7CisgICAgICAgIGxvYWREb3VibGUodGVtcG9yYXJ5QWRkcmVzcyhtX3RlbXBTdGFja1Rv cCAtIDEpLCBGUFJJbmZvOjpmcFJlZ1QxKTsKKyAgICAgICAgY29udmVydEZsb2F0VG9Eb3VibGUo RlBSSW5mbzo6ZnBSZWdUMCwgRlBSSW5mbzo6ZnBSZWdUMCk7CisgICAgICAgIGNvbnZlcnRGbG9h dFRvRG91YmxlKEZQUkluZm86OmZwUmVnVDEsIEZQUkluZm86OmZwUmVnVDEpOworICAgICAgICBE b3VibGVDb25kaXRpb24gY29uZGl0aW9uOworICAgICAgICBzd2l0Y2ggKG9wKSB7CisgICAgICAg IGNhc2UgV0FTTU9wRXhwcmVzc2lvbkkzMjo6RXF1YWxGMzI6CisgICAgICAgICAgICBjb25kaXRp b24gPSBEb3VibGVFcXVhbDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdBU01P cEV4cHJlc3Npb25JMzI6Ok5vdEVxdWFsRjMyOgorICAgICAgICAgICAgY29uZGl0aW9uID0gRG91 YmxlTm90RXF1YWw7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBXQVNNT3BFeHBy ZXNzaW9uSTMyOjpMZXNzVGhhbkYzMjoKKyAgICAgICAgICAgIGNvbmRpdGlvbiA9IERvdWJsZUxl c3NUaGFuOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV0FTTU9wRXhwcmVzc2lv bkkzMjo6TGVzc1RoYW5PckVxdWFsRjMyOgorICAgICAgICAgICAgY29uZGl0aW9uID0gRG91Ymxl TGVzc1RoYW5PckVxdWFsOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV0FTTU9w RXhwcmVzc2lvbkkzMjo6R3JlYXRlclRoYW5GMzI6CisgICAgICAgICAgICBjb25kaXRpb24gPSBE b3VibGVHcmVhdGVyVGhhbjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdBU01P cEV4cHJlc3Npb25JMzI6OkdyZWF0ZXJUaGFuT3JFcXVhbEYzMjoKKyAgICAgICAgICAgIGNvbmRp dGlvbiA9IERvdWJsZUdyZWF0ZXJUaGFuT3JFcXVhbDsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBkZWZhdWx0OgorICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsK KyAgICAgICAgfQorICAgICAgICBtX3RlbXBTdGFja1RvcC0tOworICAgICAgICBKdW1wIHRydWVD YXNlID0gYnJhbmNoRG91YmxlKGNvbmRpdGlvbiwgRlBSSW5mbzo6ZnBSZWdUMCwgRlBSSW5mbzo6 ZnBSZWdUMSk7CisgICAgICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMyKDApLCB0ZW1wb3JhcnlBZGRy ZXNzKG1fdGVtcFN0YWNrVG9wIC0gMSkpOworICAgICAgICBKdW1wIGVuZCA9IGp1bXAoKTsKKyAg ICAgICAgdHJ1ZUNhc2UubGluayh0aGlzKTsKKyAgICAgICAgc3RvcmUzMihUcnVzdGVkSW1tMzIo MSksIHRlbXBvcmFyeUFkZHJlc3MobV90ZW1wU3RhY2tUb3AgLSAxKSk7CisgICAgICAgIGVuZC5s aW5rKHRoaXMpOworICAgICAgICByZXR1cm4gVU5VU0VEOworICAgIH0KKwogICAgIGludCBidWls ZFJlbGF0aW9uYWxGNjQoaW50LCBpbnQsIFdBU01PcEV4cHJlc3Npb25JMzIgb3ApCiAgICAgewog ICAgICAgICBsb2FkRG91YmxlKHRlbXBvcmFyeUFkZHJlc3MobV90ZW1wU3RhY2tUb3AgLSAyKSwg RlBSSW5mbzo6ZnBSZWdUMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2Fz bS9XQVNNRnVuY3Rpb25QYXJzZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV0FT TUZ1bmN0aW9uUGFyc2VyLmNwcAppbmRleCAzMWNmNjQ3NTVhYjQwZmZhMzNhYjBhNjAxOTgwOTVl MWViMWE0ZDlhLi5jZTczMGQ2YTljNjk3MzBmOThhZDQwMGIwNWZjMjkzZmE5NGNkYzZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XQVNNRnVuY3Rpb25QYXJzZXIuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dBU01GdW5jdGlvblBhcnNlci5jcHAK QEAgLTU2MSw2ICs1NjEsMTMgQEAgQ29udGV4dEV4cHJlc3Npb24gV0FTTUZ1bmN0aW9uUGFyc2Vy OjpwYXJzZUV4cHJlc3Npb25JMzIoQ29udGV4dCYgY29udGV4dCkKICAgICAgICAgY2FzZSBXQVNN T3BFeHByZXNzaW9uSTMyOjpTR3JlYXRlclRoYW5PckVxdWFsSTMyOgogICAgICAgICBjYXNlIFdB U01PcEV4cHJlc3Npb25JMzI6OlVHcmVhdGVyVGhhbk9yRXF1YWxJMzI6CiAgICAgICAgICAgICBy ZXR1cm4gcGFyc2VSZWxhdGlvbmFsSTMyRXhwcmVzc2lvbkkzMihjb250ZXh0LCBvcCk7CisgICAg ICAgIGNhc2UgV0FTTU9wRXhwcmVzc2lvbkkzMjo6RXF1YWxGMzI6CisgICAgICAgIGNhc2UgV0FT TU9wRXhwcmVzc2lvbkkzMjo6Tm90RXF1YWxGMzI6CisgICAgICAgIGNhc2UgV0FTTU9wRXhwcmVz c2lvbkkzMjo6TGVzc1RoYW5GMzI6CisgICAgICAgIGNhc2UgV0FTTU9wRXhwcmVzc2lvbkkzMjo6 TGVzc1RoYW5PckVxdWFsRjMyOgorICAgICAgICBjYXNlIFdBU01PcEV4cHJlc3Npb25JMzI6Okdy ZWF0ZXJUaGFuRjMyOgorICAgICAgICBjYXNlIFdBU01PcEV4cHJlc3Npb25JMzI6OkdyZWF0ZXJU aGFuT3JFcXVhbEYzMjoKKyAgICAgICAgICAgIHJldHVybiBwYXJzZVJlbGF0aW9uYWxGMzJFeHBy ZXNzaW9uSTMyKGNvbnRleHQsIG9wKTsKICAgICAgICAgY2FzZSBXQVNNT3BFeHByZXNzaW9uSTMy OjpFcXVhbEY2NDoKICAgICAgICAgY2FzZSBXQVNNT3BFeHByZXNzaW9uSTMyOjpOb3RFcXVhbEY2 NDoKICAgICAgICAgY2FzZSBXQVNNT3BFeHByZXNzaW9uSTMyOjpMZXNzVGhhbkY2NDoKQEAgLTU5 MiwxMiArNTk5LDYgQEAgQ29udGV4dEV4cHJlc3Npb24gV0FTTUZ1bmN0aW9uUGFyc2VyOjpwYXJz ZUV4cHJlc3Npb25JMzIoQ29udGV4dCYgY29udGV4dCkKICAgICAgICAgY2FzZSBXQVNNT3BFeHBy ZXNzaW9uSTMyOjpDb21tYToKICAgICAgICAgY2FzZSBXQVNNT3BFeHByZXNzaW9uSTMyOjpGcm9t RjMyOgogICAgICAgICBjYXNlIFdBU01PcEV4cHJlc3Npb25JMzI6OkZyb21GNjQ6Ci0gICAgICAg IGNhc2UgV0FTTU9wRXhwcmVzc2lvbkkzMjo6RXF1YWxGMzI6Ci0gICAgICAgIGNhc2UgV0FTTU9w RXhwcmVzc2lvbkkzMjo6Tm90RXF1YWxGMzI6Ci0gICAgICAgIGNhc2UgV0FTTU9wRXhwcmVzc2lv bkkzMjo6TGVzc1RoYW5GMzI6Ci0gICAgICAgIGNhc2UgV0FTTU9wRXhwcmVzc2lvbkkzMjo6TGVz c1RoYW5PckVxdWFsRjMyOgotICAgICAgICBjYXNlIFdBU01PcEV4cHJlc3Npb25JMzI6OkdyZWF0 ZXJUaGFuRjMyOgotICAgICAgICBjYXNlIFdBU01PcEV4cHJlc3Npb25JMzI6OkdyZWF0ZXJUaGFu T3JFcXVhbEYzMjoKICAgICAgICAgY2FzZSBXQVNNT3BFeHByZXNzaW9uSTMyOjpTTWluOgogICAg ICAgICBjYXNlIFdBU01PcEV4cHJlc3Npb25JMzI6OlVNaW46CiAgICAgICAgIGNhc2UgV0FTTU9w RXhwcmVzc2lvbkkzMjo6U01heDoKQEAgLTcxMiw2ICs3MTMsMTYgQEAgQ29udGV4dEV4cHJlc3Np b24gV0FTTUZ1bmN0aW9uUGFyc2VyOjpwYXJzZVJlbGF0aW9uYWxJMzJFeHByZXNzaW9uSTMyKENv bnRleHQmIGMKIH0KIAogdGVtcGxhdGUgPGNsYXNzIENvbnRleHQ+CitDb250ZXh0RXhwcmVzc2lv biBXQVNNRnVuY3Rpb25QYXJzZXI6OnBhcnNlUmVsYXRpb25hbEYzMkV4cHJlc3Npb25JMzIoQ29u dGV4dCYgY29udGV4dCwgV0FTTU9wRXhwcmVzc2lvbkkzMiBvcCkKK3sKKyAgICBDb250ZXh0RXhw cmVzc2lvbiBsZWZ0ID0gcGFyc2VFeHByZXNzaW9uRjMyKGNvbnRleHQpOworICAgIFBST1BBR0FU RV9FUlJPUigpOworICAgIENvbnRleHRFeHByZXNzaW9uIHJpZ2h0ID0gcGFyc2VFeHByZXNzaW9u RjMyKGNvbnRleHQpOworICAgIFBST1BBR0FURV9FUlJPUigpOworICAgIHJldHVybiBjb250ZXh0 LmJ1aWxkUmVsYXRpb25hbEYzMihsZWZ0LCByaWdodCwgb3ApOworfQorCit0ZW1wbGF0ZSA8Y2xh c3MgQ29udGV4dD4KIENvbnRleHRFeHByZXNzaW9uIFdBU01GdW5jdGlvblBhcnNlcjo6cGFyc2VS ZWxhdGlvbmFsRjY0RXhwcmVzc2lvbkkzMihDb250ZXh0JiBjb250ZXh0LCBXQVNNT3BFeHByZXNz aW9uSTMyIG9wKQogewogICAgIENvbnRleHRFeHByZXNzaW9uIGxlZnQgPSBwYXJzZUV4cHJlc3Np b25GNjQoY29udGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X QVNNRnVuY3Rpb25QYXJzZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dBU01GdW5j dGlvblBhcnNlci5oCmluZGV4IDA1YzE2N2QxMzZiYWE1ZjFiYTcxNDVmMzEwNmYyYjM4OTMyNGI5 MDkuLmRiOTA1ZTI3MjI2Y2E0MTJkOTljMDcyNzExNGY4NzU1YmQxMWY2MTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dBU01GdW5jdGlvblBhcnNlci5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dBU01GdW5jdGlvblBhcnNlci5oCkBAIC05Myw2ICs5 Myw3IEBAIHByaXZhdGU6CiAgICAgdGVtcGxhdGUgPGNsYXNzIENvbnRleHQ+IENvbnRleHRFeHBy ZXNzaW9uIHBhcnNlVW5hcnlFeHByZXNzaW9uSTMyKENvbnRleHQmLCBXQVNNT3BFeHByZXNzaW9u STMyKTsKICAgICB0ZW1wbGF0ZSA8Y2xhc3MgQ29udGV4dD4gQ29udGV4dEV4cHJlc3Npb24gcGFy c2VCaW5hcnlFeHByZXNzaW9uSTMyKENvbnRleHQmLCBXQVNNT3BFeHByZXNzaW9uSTMyKTsKICAg ICB0ZW1wbGF0ZSA8Y2xhc3MgQ29udGV4dD4gQ29udGV4dEV4cHJlc3Npb24gcGFyc2VSZWxhdGlv bmFsSTMyRXhwcmVzc2lvbkkzMihDb250ZXh0JiwgV0FTTU9wRXhwcmVzc2lvbkkzMik7CisgICAg dGVtcGxhdGUgPGNsYXNzIENvbnRleHQ+IENvbnRleHRFeHByZXNzaW9uIHBhcnNlUmVsYXRpb25h bEYzMkV4cHJlc3Npb25JMzIoQ29udGV4dCYsIFdBU01PcEV4cHJlc3Npb25JMzIpOwogICAgIHRl bXBsYXRlIDxjbGFzcyBDb250ZXh0PiBDb250ZXh0RXhwcmVzc2lvbiBwYXJzZVJlbGF0aW9uYWxG NjRFeHByZXNzaW9uSTMyKENvbnRleHQmLCBXQVNNT3BFeHByZXNzaW9uSTMyKTsKIAogICAgIHRl bXBsYXRlIDxjbGFzcyBDb250ZXh0PiBDb250ZXh0RXhwcmVzc2lvbiBwYXJzZUV4cHJlc3Npb25G MzIoQ29udGV4dCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV0FT TUZ1bmN0aW9uU3ludGF4Q2hlY2tlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV0FT TUZ1bmN0aW9uU3ludGF4Q2hlY2tlci5oCmluZGV4IDBiY2Y4ZDVmZDg0NjY1MmJhYzg3ZmM4YzM1 NDYzZGJiMTE2MmIxZDQuLjJlMzgyYWFiNzljZDQyMmNlOTZlYTI0YmZiM2NkZThiYjdmYjI1ZjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dBU01GdW5jdGlvblN5bnRh eENoZWNrZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XQVNNRnVuY3Rpb25T eW50YXhDaGVja2VyLmgKQEAgLTExOCw2ICsxMTgsMTIgQEAgcHVibGljOgogICAgICAgICByZXR1 cm4gVU5VU0VEOwogICAgIH0KIAorICAgIGludCBidWlsZFJlbGF0aW9uYWxGMzIoaW50LCBpbnQs IFdBU01PcEV4cHJlc3Npb25JMzIpCisgICAgeworICAgICAgICBtX3RlbXBTdGFja1RvcC0tOwor ICAgICAgICByZXR1cm4gVU5VU0VEOworICAgIH0KKwogICAgIGludCBidWlsZFJlbGF0aW9uYWxG NjQoaW50LCBpbnQsIFdBU01PcEV4cHJlc3Npb25JMzIpCiAgICAgewogICAgICAgICBtX3RlbXBT dGFja1RvcC0tOwo=