169139 2017-03-03 11:57:14 -0800 Add MacroAssembler::isBreakpoint() query function. 2017-03-03 13:36:48 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 168920 1 mark.lam mark.lam fpizlo ggaren jfbastien keith_miller msaboff saam oldest_to_newest 1283206 0 mark.lam 2017-03-03 11:57:14 -0800 This will be needed soon when we use breakpoint instructions to implement non-polling VM traps, and need to discern between a VM trap signal and a genuine assertion breakpoint. 1283213 1 303334 mark.lam 2017-03-03 12:20:11 -0800 Created attachment 303334 proposed patch. 1283222 2 303334 msaboff 2017-03-03 12:56:54 -0800 Comment on attachment 303334 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=303334&action=review r=me > Source/JavaScriptCore/assembler/ARM64Assembler.h:874 > + int mask = excepnGenerationImmMask(); The name "mask" is a little misleading. It is really a mask of the immediate. > Source/JavaScriptCore/assembler/ARMAssembler.h:708 > + ARMWord mask = (0xff0 << 4) | 0xf); Ditto on the name "mask". > Source/JavaScriptCore/assembler/ARMv7Assembler.h:993 > + unsigned short mask = 0xff; Ditto 1283228 3 mark.lam 2017-03-03 13:30:46 -0800 Thanks for the review. I renames the mask variables to immediateMask. Landed in r213367: <http://trac.webkit.org/r213367>. 1283230 4 mark.lam 2017-03-03 13:36:48 -0800 Landed a ARM64 build fix for this patch in r213381: <http://trac.webkit.org/r213381>. 303334 2017-03-03 12:20:11 -0800 2017-03-03 12:56:54 -0800 proposed patch. bug-169139.patch text/plain 11026 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjEzMzc1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBA CisyMDE3LTAzLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgTWFjcm9Bc3NlbWJsZXI6OmlzQnJlYWtwb2ludCgpIHF1ZXJ5IGZ1bmN0aW9uLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MTM5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3aWxsIGJlIG5l ZWRlZCBzb29uIHdoZW4gd2UgdXNlIGJyZWFrcG9pbnQgaW5zdHJ1Y3Rpb25zIHRvIGltcGxlbWVu dAorICAgICAgICBub24tcG9sbGluZyBWTSB0cmFwcywgYW5kIG5lZWQgdG8gZGlzY2VybiBiZXR3 ZWVuIGEgVk0gdHJhcCBzaWduYWwgYW5kIGEgZ2VudWluZQorICAgICAgICBhc3NlcnRpb24gYnJl YWtwb2ludC4KKworICAgICAgICAqIGFzc2VtYmxlci9BUk02NEFzc2VtYmxlci5oOgorICAgICAg ICAoSlNDOjpBUk02NEFzc2VtYmxlcjo6aXNCcmspOgorICAgICAgICAoSlNDOjpBUk02NEFzc2Vt Ymxlcjo6ZXhjZXBuR2VuZXJhdGlvbkltbU1hc2spOgorICAgICAgICAqIGFzc2VtYmxlci9BUk1B c3NlbWJsZXIuaDoKKyAgICAgICAgKEpTQzo6QVJNQXNzZW1ibGVyOjppc0JrcHQpOgorICAgICAg ICAqIGFzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oOgorICAgICAgICAoSlNDOjpBUk12N0Fzc2Vt Ymxlcjo6aXNCa3B0KToKKyAgICAgICAgKiBhc3NlbWJsZXIvTUlQU0Fzc2VtYmxlci5oOgorICAg ICAgICAoSlNDOjpNSVBTQXNzZW1ibGVyOjppc0JrcHQpOgorICAgICAgICAqIGFzc2VtYmxlci9N YWNyb0Fzc2VtYmxlckFSTS5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTo6aXNC cmVha3BvaW50KToKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0Ojppc0JyZWFrcG9pbnQpOgorICAgICAg ICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3Lmg6CisgICAgICAgIChKU0M6Ok1hY3Jv QXNzZW1ibGVyQVJNdjc6OmlzQnJlYWtwb2ludCk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyTUlQUy5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlck1JUFM6OmlzQnJl YWtwb2ludCk6CisgICAgICAgICogYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyWDg2Q29tbW9uLmg6 CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyWDg2Q29tbW9uOjppc0JyZWFrcG9pbnQpOgor ICAgICAgICAqIGFzc2VtYmxlci9YODZBc3NlbWJsZXIuaDoKKyAgICAgICAgKEpTQzo6WDg2QXNz ZW1ibGVyOjppc0ludDMpOgorCiAyMDE3LTAzLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxl LmNvbT4KIAogICAgICAgICBXZSBzaG91bGQgb25seSBjaGVjayBmb3IgdHJhcHMgdGhhdCB3ZSdy ZSBhYmxlIHRvIGhhbmRsZS4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIv QVJNNjRBc3NlbWJsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL0FSTTY0QXNzZW1ibGVyLmgJKHJldmlzaW9uIDIxMzM3MikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNNjRBc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAt MSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIsIDIwMTQsIDIwMTcgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyLTIwMTcgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC04NjgsNiArODY4LDE0IEBAIHB1YmxpYzoKICAgICAgICAgaW5zbihleGNlcG5HZW5l cmF0aW9uKEV4Y2Vwbk9wX0JSRUFLUE9JTlQsIGltbSwgMCkpOwogICAgIH0KICAgICAKKyAgICBB TFdBWVNfSU5MSU5FIHN0YXRpYyBib29sIGlzQnJrKHZvaWQqIGFkZHJlc3MpCisgICAgeworICAg ICAgICBpbnQgZXhwZWN0ZWQgPSBleGNlcG5HZW5lcmF0aW9uKEV4Y2Vwbk9wX0JSRUFLUE9JTlQs IDAsIDApOworICAgICAgICBpbnQgbWFzayA9IGV4Y2VwbkdlbmVyYXRpb25JbW1NYXNrKCk7Cisg ICAgICAgIGludCBjYW5kaWRhdGVJbnN0cnVjdGlvbiA9ICpyZWludGVycHJldF9jYXN0PGludCo+ KGFkZHJlc3MpOworICAgICAgICByZXR1cm4gKGNhbmRpZGF0ZUluc3RydWN0aW9uICYgfm1hc2sp ID09IGV4cGVjdGVkOworICAgIH0KKwogICAgIHRlbXBsYXRlPGludCBkYXRhc2l6ZT4KICAgICBB TFdBWVNfSU5MSU5FIHZvaWQgY2JueihSZWdpc3RlcklEIHJ0LCBpbnQzMl90IG9mZnNldCA9IDAp CiAgICAgewpAQCAtMzI4Miw2ICszMjkwLDExIEBAIHByaXZhdGU6CiAgICAgICAgIGNvbnN0IGlu dCBvcDIgPSAwOwogICAgICAgICByZXR1cm4gKDB4ZDQwMDAwMDAgfCBvcGMgPDwgMjEgfCBpbW0x NiA8PCA1IHwgb3AyIDw8IDIgfCBMTCk7CiAgICAgfQorICAgIEFMV0FZU19JTkxJTkUgc3RhdGlj IGludCBleGNlcG5HZW5lcmF0aW9uSW1tTWFzaygpCisgICAgeworICAgICAgICB1aW50MTZfdCBp bW0xNiA9ICBzdGQ6Om51bWVyaWNfbGltaXQ8dWludDE2X3Q+OjptYXgoKTsKKyAgICAgICAgcmV0 dXJuIChzdGF0aWNfY2FzdDxpbnQ+KGltbTE2KSA8PCA1KTsKKyAgICB9CiAKICAgICBBTFdBWVNf SU5MSU5FIHN0YXRpYyBpbnQgZXh0cmFjdChEYXRhc2l6ZSBzZiwgUmVnaXN0ZXJJRCBybSwgaW50 IGltbXMsIFJlZ2lzdGVySUQgcm4sIFJlZ2lzdGVySUQgcmQpCiAgICAgewpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5oCShyZXZpc2lvbiAy MTMzNzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAw OSwgMjAxMCBVbml2ZXJzaXR5IG9mIFN6ZWdlZAorICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxl IEluYy4KICAqIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC03MDEs NiArNzAyLDE0IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgbV9idWZmZXIucHV0SW50 KEJLUFQgfCAoKHZhbHVlICYgMHhmZjApIDw8IDQpIHwgKHZhbHVlICYgMHhmKSk7CiAgICAgICAg IH0KIAorICAgICAgICBzdGF0aWMgYm9vbCBpc0JrcHQodm9pZCogYWRkcmVzcykKKyAgICAgICAg eworICAgICAgICAgICAgQVJNV29yZCBleHBlY3RlZCA9IEJLUFQ7CisgICAgICAgICAgICBBUk1X b3JkIG1hc2sgPSAoMHhmZjAgPDwgNCkgfCAweGYpOworICAgICAgICAgICAgQVJNV29yZCBjYW5k aWRhdGVJbnN0cnVjdGlvbiA9ICpyZWludGVycHJldF9jYXN0PEFSTVdvcmQqPihhZGRyZXNzKTsK KyAgICAgICAgICAgIHJldHVybiAoY2FuZGlkYXRlSW5zdHJ1Y3Rpb24gJiB+bWFzaykgPT0gZXhw ZWN0ZWQ7CisgICAgICAgIH0KKwogICAgICAgICB2b2lkIG5vcCgpCiAgICAgICAgIHsKICAgICAg ICAgICAgIG1fYnVmZmVyLnB1dEludChOT1ApOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2Fzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvQVJNdjdBc3NlbWJsZXIuaAkocmV2aXNpb24gMjEzMzcyKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk12N0Fzc2VtYmxlci5oCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCwg MjAxMiwgMjAxMywgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5 cmlnaHQgKEMpIDIwMDktMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBD b3B5cmlnaHQgKEMpIDIwMTAgVW5pdmVyc2l0eSBvZiBTemVnZWQKICAqCiAgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK QEAgLTk4Nyw2ICs5ODcsMTQgQEAgcHVibGljOgogICAgICAgICBtX2Zvcm1hdHRlci5vbmVXb3Jk T3A4SW1tOChPUF9CS1BULCBpbW0pOwogICAgIH0KIAorICAgIHN0YXRpYyBib29sIGlzQmtwdCh2 b2lkKiBhZGRyZXNzKQorICAgIHsKKyAgICAgICAgdW5zaWduZWQgc2hvcnQgZXhwZWN0ZWQgPSBP UF9CS1BUOworICAgICAgICB1bnNpZ25lZCBzaG9ydCBtYXNrID0gMHhmZjsKKyAgICAgICAgdW5z aWduZWQgc2hvcnQgY2FuZGlkYXRlSW5zdHJ1Y3Rpb24gPSAqcmVpbnRlcnByZXRfY2FzdDx1bnNp Z25lZCBzaG9ydCo+KGFkZHJlc3MpOworICAgICAgICByZXR1cm4gKGNhbmRpZGF0ZUluc3RydWN0 aW9uICYgfm1hc2spID09IGV4cGVjdGVkOworICAgIH0KKwogICAgIEFMV0FZU19JTkxJTkUgdm9p ZCBjbHooUmVnaXN0ZXJJRCByZCwgUmVnaXN0ZXJJRCBybSkKICAgICB7CiAgICAgICAgIEFTU0VS VCghQmFkUmVnKHJkKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01J UFNBc3NlbWJsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01JUFNBc3NlbWJsZXIuaAkocmV2aXNpb24gMjEzMzcyKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNzZW1ibGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOS0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOSBVbml2ZXJzaXR5IG9mIFN6ZWdlZAog ICogQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMCBNSVBTIFRlY2hu b2xvZ2llcywgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgpAQCAtNDQ3LDYgKzQ0NywxNCBAQCBw dWJsaWM6CiAgICAgICAgIGVtaXRJbnN0KDB4MDAwMDAwMGQgfCAoKHZhbHVlICYgMHgzZmYpIDw8 IE9QX1NIX0NPREUpKTsKICAgICB9CiAKKyAgICBzdGF0aWMgYm9vbCBpc0JrcHQodm9pZCogYWRk cmVzcykKKyAgICB7CisgICAgICAgIGludCB2YWx1ZSA9IDUxMjsgLyogQlJLX0JVRyAqLworICAg ICAgICBNSVBTV29yZCBleHBlY3RlZCA9ICgweDAwMDAwMDBkIHwgKCh2YWx1ZSAmIDB4M2ZmKSA8 PCBPUF9TSF9DT0RFKSk7CisgICAgICAgIE1JUFNXb3JkIGNhbmRpZGF0ZUluc3RydWN0aW9uID0g KnJlaW50ZXJwcmV0X2Nhc3Q8TUlQU1dvcmQqPihhZGRyZXNzKTsKKyAgICAgICAgcmV0dXJuIGNh bmRpZGF0ZUluc3RydWN0aW9uID09IGV4cGVjdGVkOworICAgIH0KKwogICAgIHZvaWQgYmdleihS ZWdpc3RlcklEIHJzLCBpbnQgaW1tKQogICAgIHsKICAgICAgICAgZW1pdEluc3QoMHgwNDAxMDAw MCB8IChycyA8PCBPUF9TSF9SUykgfCAoaW1tICYgMHhmZmZmKSk7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNNjQuaAko cmV2aXNpb24gMjEzMzcyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlckFSTTY0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICog Q29weXJpZ2h0IChDKSAyMDEyLCAyMDE0LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEyLTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMzQ4LDYgKzMzNDgs OCBAQCBwdWJsaWM6CiAgICAgICAgIG1fYXNzZW1ibGVyLmJyayhpbW0pOwogICAgIH0KIAorICAg IHN0YXRpYyBib29sIGlzQnJlYWtwb2ludCh2b2lkKiBhZGRyZXNzKSB7IHJldHVybiBBUk02NEFz c2VtYmxlcjo6aXNCcmsoYWRkcmVzcyk7IH0KKwogICAgIHZvaWQgbm9wKCkKICAgICB7CiAgICAg ICAgIG1fYXNzZW1ibGVyLm5vcCgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAkocmV2aXNpb24gMjEzMzcyKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAx My0yMDE2IEFwcGxlIEluYy4KKyAqIENvcHlyaWdodCAoQykgMjAwOC0yMDE3IEFwcGxlIEluYy4K ICAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCBVbml2ZXJzaXR5IG9mIFN6ZWdlZAogICogQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCkBAIC05NTUsNiArOTU1LDggQEAgcHVibGljOgogICAgICAg ICBtX2Fzc2VtYmxlci5ia3B0KDApOwogICAgIH0KIAorICAgIHN0YXRpYyBib29sIGlzQnJlYWtw b2ludCh2b2lkKiBhZGRyZXNzKSB7IHJldHVybiBBUk1Bc3NlbWJsZXI6OmlzQmtwdChhZGRyZXNz KTsgfQorCiAgICAgQ2FsbCBuZWFyQ2FsbCgpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxlci5s b2FkQnJhbmNoVGFyZ2V0KEFSTVJlZ2lzdGVyczo6UzEsIEFSTUFzc2VtYmxlcjo6QUwsIHRydWUp OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFS TXY3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlckFSTXY3LmgJKHJldmlzaW9uIDIxMzM3MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCSh3b3JraW5nIGNvcHkpCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOS0yMDEwLCAyMDE0LTIwMTYgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5LTIwMTcg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDEwIFVu aXZlcnNpdHkgb2YgU3plZ2VkCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0xNzUyLDYgKzE3NTIsOCBA QCBwdWJsaWM6CiAgICAgICAgIG1fYXNzZW1ibGVyLmJrcHQoaW1tKTsKICAgICB9CiAKKyAgICBz dGF0aWMgYm9vbCBpc0JyZWFrcG9pbnQodm9pZCogYWRkcmVzcykgeyByZXR1cm4gQVJNdjdBc3Nl bWJsZXI6OmlzQmtwdChhZGRyZXNzKTsgfQorCiAgICAgQUxXQVlTX0lOTElORSBDYWxsIG5lYXJD YWxsKCkKICAgICB7CiAgICAgICAgIG1vdmVGaXhlZFdpZHRoRW5jb2RpbmcoVHJ1c3RlZEltbTMy KDApLCBkYXRhVGVtcFJlZ2lzdGVyKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAkocmV2aXNpb24gMjEzMzcyKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDgs IDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA4LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChD KSAyMDEwIE1JUFMgVGVjaG5vbG9naWVzLCBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CkBAIC0yMTU4LDYgKzIxNTgsOCBAQCBwdWJsaWM6CiAgICAgICAgIG1fYXNz ZW1ibGVyLmJrcHQoKTsKICAgICB9CiAKKyAgICBzdGF0aWMgYm9vbCBpc0JyZWFrcG9pbnQodm9p ZCogYWRkcmVzcykgeyByZXR1cm4gTUlQU0Fzc2VtYmxlcjo6aXNCa3B0KGFkZHJlc3MpOyB9CisK ICAgICBDYWxsIG5lYXJDYWxsKCkKICAgICB7CiAgICAgICAgIC8qIFdlIG5lZWQgdHdvIHdvcmRz IGZvciByZWxheGF0aW9uLiAqLwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxl ci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uaAkocmV2aXNpb24gMjEz MzcyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4 NkNvbW1vbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdo dCAoQykgMjAwOCwgMjAxNC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAwOC0yMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjU1Nyw2ICsyNTU3LDggQEAgcHVi bGljOgogICAgICAgICBtX2Fzc2VtYmxlci5pbnQzKCk7CiAgICAgfQogCisgICAgc3RhdGljIGJv b2wgaXNCcmVha3BvaW50KHZvaWQqIGFkZHJlc3MpIHsgcmV0dXJuIFg4NkFzc2VtYmxlcjo6aXNJ bnQzKGFkZHJlc3MpOyB9CisKICAgICBDYWxsIG5lYXJUYWlsQ2FsbCgpCiAgICAgewogICAgICAg ICByZXR1cm4gQ2FsbChtX2Fzc2VtYmxlci5qbXAoKSwgQ2FsbDo6TGlua2FibGVOZWFyVGFpbCk7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1g4NkFzc2VtYmxlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvWDg2QXNzZW1ibGVy LmgJKHJldmlzaW9uIDIxMzM3MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIv WDg2QXNzZW1ibGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29w eXJpZ2h0IChDKSAyMDA4LCAyMDEyLTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDA4LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNzYwLDYgKzI3NjAsMTIg QEAgcHVibGljOgogICAgICAgICBtX2Zvcm1hdHRlci5vbmVCeXRlT3AoT1BfSU5UMyk7CiAgICAg fQogICAgIAorICAgIHN0YXRpYyBib29sIGlzSW50Myh2b2lkKiBhZGRyZXNzKQorICAgIHsKKyAg ICAgICAgdWludDhfdCBjYW5kaWRhdGVJbnN0cnVjdGlvbiA9ICpyZWludGVycHJldF9jYXN0PHVp bnQ4X3QqPihhZGRyZXNzKTsKKyAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZUluc3RydWN0aW9uID09 IE9QX0lOVDM7CisgICAgfQorCiAgICAgdm9pZCByZXQoKQogICAgIHsKICAgICAgICAgbV9mb3Jt YXR0ZXIub25lQnl0ZU9wKE9QX1JFVCk7Cg==