33426 2010-01-09 13:03:26 -0800 Implement JIT_OPTIMIZE_NATIVE_CALL for WinCE 2010-03-06 03:31:27 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 paroga webkit-unassigned commit-queue joybro201 laszlo.gombos skyul zherczeg oldest_to_newest 179027 0 paroga 2010-01-09 13:03:26 -0800 See patch 179031 1 46214 paroga 2010-01-09 13:16:51 -0800 Created attachment 46214 The patch It was a hard task, but i think it's working now. Because i couldn't find any valuable information about the calling conventions an WinCE, i've done this via a kind of reverse engineering :-/ Since run-javascriptcore-tests isn't woking, i only wan't some feedback if this patch looks sane. I'll post a comment when i've run all the tests to ensure that i doesn't introduce a regression. 179236 2 46214 oliver 2010-01-10 20:16:47 -0800 Comment on attachment 46214 The patch I don't think it's right to be detecting wince based on the compiler, isn't there a PLATFORM(WINCE) ? 181510 3 paroga 2010-01-16 08:11:35 -0800 (In reply to comment #2) > I don't think it's right to be detecting wince based on the compiler, isn't > there a PLATFORM(WINCE) ? Yes, but all other ifdefs are COMPILER(XY) too. So the other COMPILER(MSVC) should be changed to OS(WIN)? But anyway, can you give me feedback about my implementation? Does it look sane? 184645 4 47424 paroga 2010-01-26 11:21:08 -0800 Created attachment 47424 The patch changed COMPILER(MSVC) to OS(WINCE) 186355 5 zherczeg 2010-02-01 04:06:00 -0800 Patch seems OK for me. However, the patch supports only JSvalue32. We plan to enable JSValue32_64 support for ARM (as 75% voted for it). The NATIVE call support for this mode started from line 252 in the very same file (JITOpcodes.cpp). Could you add WinCE support for this mode as well? 192187 6 49128 paroga 2010-02-20 09:52:10 -0800 Created attachment 49128 The patch (added JSVALUE32_64) Sorry for the long delay. It was like reverse engineering again. 192192 7 zherczeg 2010-02-20 10:30:08 -0800 > Sorry for the long delay. > It was like reverse engineering again. GCC is no better. The patch looks good to me. (but I am not a reviewer) 196626 8 49128 eric 2010-03-05 13:46:44 -0800 Comment on attachment 49128 The patch (added JSVALUE32_64) Looks non-harmful. rs=me. 196877 9 49128 commit-queue 2010-03-06 03:31:22 -0800 Comment on attachment 49128 The patch (added JSVALUE32_64) Clearing flags on attachment: 49128 Committed r55615: <http://trac.webkit.org/changeset/55615> 196878 10 commit-queue 2010-03-06 03:31:27 -0800 All reviewed patches have been landed. Closing bug. 46214 2010-01-09 13:16:51 -0800 2010-01-26 11:21:08 -0800 The patch JITOpcodes.patch text/plain 2519 paroga SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUzMDM5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDEtMDkgIFBhdHJpY2sg R2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50ZWQgSklUX09QVElNSVpFX05BVElWRV9D QUxMIGZvciBXaW5DRQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzM0MjYKKworICAgICAgICAqIGppdC9KSVRPcGNvZGVzLmNwcDoKKyAgICAgICAgKEpT Qzo6SklUOjpwcml2YXRlQ29tcGlsZUNUSU1hY2hpbmVUcmFtcG9saW5lcyk6CisKIDIwMTAtMDEt MDggIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gQmFydGguCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3BwCShyZXZpc2lv biA1MzAxNSkKKysrIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwIFBhdHJpY2sgR2Fu c3RlcmVyIDxwYXJvZ2FAcGFyb2dhLmNvbT4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtMTc1Myw3ICsxNzU0LDMwIEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUNUSU1hY2hp bmVUcmFtcG8KICAgICAvLyBwdXNoIHBvaW50ZXIgdG8gYXJndW1lbnRzCiAgICAgc3RvcmVQdHIo cmVnVDEsIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIsIE9CSkVDVF9PRkZTRVRPRihBcmdM aXN0LCBtX2FyZ3MpKSk7CiAKLSAgICAvLyBTZXR1cCBhcmczOiByZWdUMSBjdXJyZW50bHkgcG9p bnRzIHRvIHRoZSBmaXJzdCBhcmd1bWVudCwgcmVnVDEtc2l6ZW9mKFJlZ2lzdGVyKSBwb2ludHMg dG8gJ3RoaXMnCisgICAgLy8gcmVnVDEgY3VycmVudGx5IHBvaW50cyB0byB0aGUgZmlyc3QgYXJn dW1lbnQsIHJlZ1QxLXNpemVvZihSZWdpc3RlcikgcG9pbnRzIHRvICd0aGlzJworCisjaWYgQ09N UElMRVIoTVNWQykKKyAgICAvLyBTZXR1cCBhcmczOgorICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdU MSwgLShpbnQzMl90KXNpemVvZihSZWdpc3RlcikpLCBBUk1SZWdpc3RlcnM6OnIzKTsKKworICAg IC8vIFNldHVwIGFyZzI6CisgICAgZW1pdEdldEZyb21DYWxsRnJhbWVIZWFkZXJQdHIoUmVnaXN0 ZXJGaWxlOjpDYWxsZWUsIHJlZ1QyKTsKKworICAgIC8vIFNldHVwIGFyZzE6CisgICAgbW92ZShj YWxsRnJhbWVSZWdpc3RlciwgcmVnVDEpOworCisgICAgLy8gU2V0dXAgYXJnMDoKKyAgICBtb3Zl KHN0YWNrUG9pbnRlclJlZ2lzdGVyLCByZWdUMCk7CisgICAgc3ViUHRyKEltbTMyKHNpemVvZihS ZWdpc3RlcikpLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CisgICAgc3RvcmVQdHIocmVnVDAsIEFk ZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIpKTsKKworICAgIGNhbGwoQWRkcmVzcyhyZWdUMiwg T0JKRUNUX09GRlNFVE9GKEpTRnVuY3Rpb24sIG1fZGF0YSkpKTsKKworICAgIGxvYWRQdHIoQWRk cmVzcyhyZWdUMCksIHJlZ1QwKTsKKworICAgIGFkZFB0cihJbW0zMihzaXplb2YoUmVnaXN0ZXIp ICsgc2l6ZW9mKEFyZ0xpc3QpKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOworI2Vsc2UKKyAgICAv LyBTZXR1cCBhcmczOgogICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMSwgLShpbnQzMl90KXNpemVv ZihSZWdpc3RlcikpLCByZWdUMik7CiAKICAgICAvLyBTZXR1cCBhcmcyOgpAQCAtMTc2OCw2ICsx NzkyLDcgQEAgdm9pZCBKSVQ6OnByaXZhdGVDb21waWxlQ1RJTWFjaGluZVRyYW1wbwogICAgIGNh bGwoQWRkcmVzcyhyZWdUMSwgT0JKRUNUX09GRlNFVE9GKEpTRnVuY3Rpb24sIG1fZGF0YSkpKTsK IAogICAgIGFkZFB0cihJbW0zMihzaXplb2YoQXJnTGlzdCkpLCBzdGFja1BvaW50ZXJSZWdpc3Rl cik7CisjZW5kaWYKIAogI2VsaWYgRU5BQkxFKEpJVF9PUFRJTUlaRV9OQVRJVkVfQ0FMTCkKICNl cnJvciAiSklUX09QVElNSVpFX05BVElWRV9DQUxMIG5vdCB5ZXQgc3VwcG9ydGVkIG9uIHRoaXMg cGxhdGZvcm0uIgo= 47424 2010-01-26 11:21:08 -0800 2010-02-20 09:52:10 -0800 The patch JITOpcodes.patch text/plain 2514 paroga SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUzMDM5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDEtMDkgIFBhdHJpY2sg R2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50ZWQgSklUX09QVElNSVpFX05BVElWRV9D QUxMIGZvciBXaW5DRQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzM0MjYKKworICAgICAgICAqIGppdC9KSVRPcGNvZGVzLmNwcDoKKyAgICAgICAgKEpT Qzo6SklUOjpwcml2YXRlQ29tcGlsZUNUSU1hY2hpbmVUcmFtcG9saW5lcyk6CisKIDIwMTAtMDEt MDggIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gQmFydGguCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3BwCShyZXZpc2lv biA1MzAxNSkKKysrIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwIFBhdHJpY2sgR2Fu c3RlcmVyIDxwYXJvZ2FAcGFyb2dhLmNvbT4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtMTc1Myw3ICsxNzU0LDMwIEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUNUSU1hY2hp bmVUcmFtcG8KICAgICAvLyBwdXNoIHBvaW50ZXIgdG8gYXJndW1lbnRzCiAgICAgc3RvcmVQdHIo cmVnVDEsIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIsIE9CSkVDVF9PRkZTRVRPRihBcmdM aXN0LCBtX2FyZ3MpKSk7CiAKLSAgICAvLyBTZXR1cCBhcmczOiByZWdUMSBjdXJyZW50bHkgcG9p bnRzIHRvIHRoZSBmaXJzdCBhcmd1bWVudCwgcmVnVDEtc2l6ZW9mKFJlZ2lzdGVyKSBwb2ludHMg dG8gJ3RoaXMnCisgICAgLy8gcmVnVDEgY3VycmVudGx5IHBvaW50cyB0byB0aGUgZmlyc3QgYXJn dW1lbnQsIHJlZ1QxLXNpemVvZihSZWdpc3RlcikgcG9pbnRzIHRvICd0aGlzJworCisjaWYgT1Mo V0lOQ0UpCisgICAgLy8gU2V0dXAgYXJnMzoKKyAgICBsb2FkUHRyKEFkZHJlc3MocmVnVDEsIC0o aW50MzJfdClzaXplb2YoUmVnaXN0ZXIpKSwgQVJNUmVnaXN0ZXJzOjpyMyk7CisKKyAgICAvLyBT ZXR1cCBhcmcyOgorICAgIGVtaXRHZXRGcm9tQ2FsbEZyYW1lSGVhZGVyUHRyKFJlZ2lzdGVyRmls ZTo6Q2FsbGVlLCByZWdUMik7CisKKyAgICAvLyBTZXR1cCBhcmcxOgorICAgIG1vdmUoY2FsbEZy YW1lUmVnaXN0ZXIsIHJlZ1QxKTsKKworICAgIC8vIFNldHVwIGFyZzA6CisgICAgbW92ZShzdGFj a1BvaW50ZXJSZWdpc3RlciwgcmVnVDApOworICAgIHN1YlB0cihJbW0zMihzaXplb2YoUmVnaXN0 ZXIpKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOworICAgIHN0b3JlUHRyKHJlZ1QwLCBBZGRyZXNz KHN0YWNrUG9pbnRlclJlZ2lzdGVyKSk7CisKKyAgICBjYWxsKEFkZHJlc3MocmVnVDIsIE9CSkVD VF9PRkZTRVRPRihKU0Z1bmN0aW9uLCBtX2RhdGEpKSk7CisKKyAgICBsb2FkUHRyKEFkZHJlc3Mo cmVnVDApLCByZWdUMCk7CisKKyAgICBhZGRQdHIoSW1tMzIoc2l6ZW9mKFJlZ2lzdGVyKSArIHNp emVvZihBcmdMaXN0KSksIHN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKKyNlbHNlCisgICAgLy8gU2V0 dXAgYXJnMzoKICAgICBsb2FkUHRyKEFkZHJlc3MocmVnVDEsIC0oaW50MzJfdClzaXplb2YoUmVn aXN0ZXIpKSwgcmVnVDIpOwogCiAgICAgLy8gU2V0dXAgYXJnMjoKQEAgLTE3NjgsNiArMTc5Miw3 IEBAIHZvaWQgSklUOjpwcml2YXRlQ29tcGlsZUNUSU1hY2hpbmVUcmFtcG8KICAgICBjYWxsKEFk ZHJlc3MocmVnVDEsIE9CSkVDVF9PRkZTRVRPRihKU0Z1bmN0aW9uLCBtX2RhdGEpKSk7CiAKICAg ICBhZGRQdHIoSW1tMzIoc2l6ZW9mKEFyZ0xpc3QpKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOwor I2VuZGlmCiAKICNlbGlmIEVOQUJMRShKSVRfT1BUSU1JWkVfTkFUSVZFX0NBTEwpCiAjZXJyb3Ig IkpJVF9PUFRJTUlaRV9OQVRJVkVfQ0FMTCBub3QgeWV0IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRm b3JtLiIK 49128 2010-02-20 09:52:10 -0800 2010-03-06 03:31:22 -0800 The patch (added JSVALUE32_64) JITOpcodes.patch text/plain 4327 paroga SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU1MDI0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDItMjAgIFBhdHJpY2sg R2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50ZWQgSklUX09QVElNSVpFX05BVElWRV9D QUxMIGZvciBXaW5DRQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzM0MjYKKworICAgICAgICAqIGppdC9KSVRPcGNvZGVzLmNwcDoKKyAgICAgICAgKEpT Qzo6SklUOjpwcml2YXRlQ29tcGlsZUNUSU1hY2hpbmVUcmFtcG9saW5lcyk6CisKIDIwMTAtMDIt MTkgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgTGFzemxvIEdvbWJvcy4NCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bj b2Rlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3Bw CShyZXZpc2lvbiA1NTAxNikKKysrIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwIFBh dHJpY2sgR2Fuc3RlcmVyIDxwYXJvZ2FAcGFyb2dhLmNvbT4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMjgyLDYgKzI4MywzMyBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVD VElNYWNoaW5lVHJhbXBvCiAgICAgLy8gcjIgLSBjYWxsZWUKICAgICAvLyBzdGFjazogdGhpcyhK U1ZhbHVlKSBhbmQgYSBwb2ludGVyIHRvIEFyZ0xpc3QKIAorI2lmIE9TKFdJTkNFKQorICAgIC8v IFNldHVwIGFyZzQ6CisgICAgcHVzaChzdGFja1BvaW50ZXJSZWdpc3Rlcik7CisKKyAgICAvLyBT ZXR1cCBhcmczOgorICAgIC8vIHJlZ1QxIGN1cnJlbnRseSBwb2ludHMgdG8gdGhlIGZpcnN0IGFy Z3VtZW50LCByZWdUMS1zaXplb2YoUmVnaXN0ZXIpIHBvaW50cyB0byAndGhpcycKKyAgICBsb2Fk MzIoQWRkcmVzcyhyZWdUMSwgLShpbnQzMl90KXNpemVvZih2b2lkKikgKiAyKSwgQVJNUmVnaXN0 ZXJzOjpyMyk7CisgICAgcHVzaChBUk1SZWdpc3RlcnM6OnIzKTsKKyAgICBsb2FkMzIoQWRkcmVz cyhyZWdUMSwgLShpbnQzMl90KXNpemVvZih2b2lkKikpLCByZWdUMyk7CisgICAgc3RvcmVQdHIo cmVnVDMsIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIpKTsKKworICAgIC8vIFNldHVwIGFy ZzI6CisgICAgZW1pdEdldEZyb21DYWxsRnJhbWVIZWFkZXJQdHIoUmVnaXN0ZXJGaWxlOjpDYWxs ZWUsIHJlZ1QyKTsKKworICAgIC8vIFNldHVwIGFyZzE6CisgICAgbW92ZShjYWxsRnJhbWVSZWdp c3RlciwgcmVnVDEpOworCisgICAgLy8gU2V0dXAgYXJnMDoKKyAgICBtb3ZlKHN0YWNrUG9pbnRl clJlZ2lzdGVyLCByZWdUMCk7CisKKyAgICBjYWxsKEFkZHJlc3MocmVnVDIsIE9CSkVDVF9PRkZT RVRPRihKU0Z1bmN0aW9uLCBtX2RhdGEpKSk7CisKKyAgICBsb2FkMzIoQWRkcmVzcyhzdGFja1Bv aW50ZXJSZWdpc3RlciwgMCksIHJlZ1QwKTsKKyAgICBsb2FkMzIoQWRkcmVzcyhzdGFja1BvaW50 ZXJSZWdpc3RlciwgNCksIHJlZ1QxKTsKKworICAgIGFkZFB0cihJbW0zMihzaXplb2YoQXJnTGlz dCkgKyA4KSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOworI2Vsc2UgLy8gT1MoV0lOQ0UpCiAgICAg bW92ZShzdGFja1BvaW50ZXJSZWdpc3RlciwgcmVnVDMpOwogICAgIHN1YlB0cihJbW0zMig4KSwg c3RhY2tQb2ludGVyUmVnaXN0ZXIpOwogICAgIG1vdmUoc3RhY2tQb2ludGVyUmVnaXN0ZXIsIHJl Z1QwKTsKQEAgLTI5MCw3ICszMTgsNyBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVDVElNYWNo aW5lVHJhbXBvCiAgICAgLy8gU2V0dXAgYXJnNDoKICAgICBzdG9yZVB0cihyZWdUMywgQWRkcmVz cyhzdGFja1BvaW50ZXJSZWdpc3RlciwgOCkpOwogCi0gICAgLy8gU2V0dXAgYXJnMworICAgIC8v IFNldHVwIGFyZzM6CiAgICAgLy8gcmVnVDEgY3VycmVudGx5IHBvaW50cyB0byB0aGUgZmlyc3Qg YXJndW1lbnQsIHJlZ1QxLXNpemVvZihSZWdpc3RlcikgcG9pbnRzIHRvICd0aGlzJwogICAgIGxv YWQzMihBZGRyZXNzKHJlZ1QxLCAtKGludDMyX3Qpc2l6ZW9mKHZvaWQqKSAqIDIpLCByZWdUMyk7 CiAgICAgc3RvcmVQdHIocmVnVDMsIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIsIDApKTsK QEAgLTMxMCw2ICszMzgsOCBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVDVElNYWNoaW5lVHJh bXBvCiAgICAgbG9hZDMyKEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIsIDIwKSwgcmVnVDEp OwogCiAgICAgYWRkUHRyKEltbTMyKHNpemVvZihBcmdMaXN0KSArIDE2ICsgOCksIHN0YWNrUG9p bnRlclJlZ2lzdGVyKTsKKyNlbmRpZiAvLyBPUyhXSU5DRSkKKwogI2VuZGlmCiAKICAgICAvLyBD aGVjayBmb3IgYW4gZXhjZXB0aW9uCkBAIC0xNzY0LDcgKzE3OTQsMzAgQEAgdm9pZCBKSVQ6OnBy aXZhdGVDb21waWxlQ1RJTWFjaGluZVRyYW1wbwogICAgIC8vIHB1c2ggcG9pbnRlciB0byBhcmd1 bWVudHMKICAgICBzdG9yZVB0cihyZWdUMSwgQWRkcmVzcyhzdGFja1BvaW50ZXJSZWdpc3Rlciwg T0JKRUNUX09GRlNFVE9GKEFyZ0xpc3QsIG1fYXJncykpKTsKIAotICAgIC8vIFNldHVwIGFyZzM6 IHJlZ1QxIGN1cnJlbnRseSBwb2ludHMgdG8gdGhlIGZpcnN0IGFyZ3VtZW50LCByZWdUMS1zaXpl b2YoUmVnaXN0ZXIpIHBvaW50cyB0byAndGhpcycKKyAgICAvLyByZWdUMSBjdXJyZW50bHkgcG9p bnRzIHRvIHRoZSBmaXJzdCBhcmd1bWVudCwgcmVnVDEtc2l6ZW9mKFJlZ2lzdGVyKSBwb2ludHMg dG8gJ3RoaXMnCisKKyNpZiBPUyhXSU5DRSkKKyAgICAvLyBTZXR1cCBhcmczOgorICAgIGxvYWRQ dHIoQWRkcmVzcyhyZWdUMSwgLShpbnQzMl90KXNpemVvZihSZWdpc3RlcikpLCBBUk1SZWdpc3Rl cnM6OnIzKTsKKworICAgIC8vIFNldHVwIGFyZzI6CisgICAgZW1pdEdldEZyb21DYWxsRnJhbWVI ZWFkZXJQdHIoUmVnaXN0ZXJGaWxlOjpDYWxsZWUsIHJlZ1QyKTsKKworICAgIC8vIFNldHVwIGFy ZzE6CisgICAgbW92ZShjYWxsRnJhbWVSZWdpc3RlciwgcmVnVDEpOworCisgICAgLy8gU2V0dXAg YXJnMDoKKyAgICBtb3ZlKHN0YWNrUG9pbnRlclJlZ2lzdGVyLCByZWdUMCk7CisgICAgc3ViUHRy KEltbTMyKHNpemVvZihSZWdpc3RlcikpLCBzdGFja1BvaW50ZXJSZWdpc3Rlcik7CisgICAgc3Rv cmVQdHIocmVnVDAsIEFkZHJlc3Moc3RhY2tQb2ludGVyUmVnaXN0ZXIpKTsKKworICAgIGNhbGwo QWRkcmVzcyhyZWdUMiwgT0JKRUNUX09GRlNFVE9GKEpTRnVuY3Rpb24sIG1fZGF0YSkpKTsKKwor ICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCksIHJlZ1QwKTsKKworICAgIGFkZFB0cihJbW0zMihz aXplb2YoUmVnaXN0ZXIpICsgc2l6ZW9mKEFyZ0xpc3QpKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIp OworI2Vsc2UgLy8gT1MoV0lOQ0UpCisgICAgLy8gU2V0dXAgYXJnMzoKICAgICBsb2FkUHRyKEFk ZHJlc3MocmVnVDEsIC0oaW50MzJfdClzaXplb2YoUmVnaXN0ZXIpKSwgcmVnVDIpOwogCiAgICAg Ly8gU2V0dXAgYXJnMjoKQEAgLTE3NzksNiArMTgzMiw3IEBAIHZvaWQgSklUOjpwcml2YXRlQ29t cGlsZUNUSU1hY2hpbmVUcmFtcG8KICAgICBjYWxsKEFkZHJlc3MocmVnVDEsIE9CSkVDVF9PRkZT RVRPRihKU0Z1bmN0aW9uLCBtX2RhdGEpKSk7CiAKICAgICBhZGRQdHIoSW1tMzIoc2l6ZW9mKEFy Z0xpc3QpKSwgc3RhY2tQb2ludGVyUmVnaXN0ZXIpOworI2VuZGlmIC8vIE9TKFdJTkNFKQogCiAj ZWxpZiBFTkFCTEUoSklUX09QVElNSVpFX05BVElWRV9DQUxMKQogI2Vycm9yICJKSVRfT1BUSU1J WkVfTkFUSVZFX0NBTEwgbm90IHlldCBzdXBwb3J0ZWQgb24gdGhpcyBwbGF0Zm9ybS4iCg==