78145 2012-02-08 13:02:10 -0800 updateTopCallframe in the baseline JIT doesn't provide enough information to the stubs 2012-02-10 10:03:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 78237 1 oliver oliver ossy oldest_to_newest 552416 0 oliver 2012-02-08 13:02:10 -0800 updateTopCallframe in the baseline JIT doesn't provide enough information to the stubs 552421 1 126138 oliver 2012-02-08 13:05:31 -0800 Created attachment 126138 Patch 552435 2 oliver 2012-02-08 13:23:11 -0800 Committed r107126: <http://trac.webkit.org/changeset/107126> 553147 3 ossy 2012-02-09 07:30:12 -0800 Reopen, because it broke zillion tests on Qt ARM, see https://bugs.webkit.org/show_bug.cgi?id=78237 for details. 553213 4 oliver 2012-02-09 09:08:36 -0800 Ossy, can you attach the text of the assertion failure? It should include correct offset info -- all this should require is changing a single number, I thought i had it right already 553214 5 ossy 2012-02-09 09:12:34 -0800 (In reply to comment #4) > Ossy, can you attach the text of the assertion failure? It should include correct offset info -- all this should require is changing a single number, I thought i had it right already Unfortunately I can't run tests on ARM board (and the bot didn't give us useable logs), only Zoltán and Gábor can, but they went home. I hope they can check it tomorrow. 553216 6 oliver 2012-02-09 09:15:02 -0800 (In reply to comment #5) > (In reply to comment #4) > > Ossy, can you attach the text of the assertion failure? It should include correct offset info -- all this should require is changing a single number, I thought i had it right already > > Unfortunately I can't run tests on ARM board (and the bot didn't give us useable logs), only Zoltán and Gábor can, but they went home. > > I hope they can check it tomorrow. Gah, I'll work through the maths again and see if I get a different size for the ARM path. 553987 7 126138 zherczeg 2012-02-10 03:28:59 -0800 Comment on attachment 126138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126138&action=review > Source/JavaScriptCore/jit/JITInlineMethods.h:269 > + ASSERT(static_cast<int>(m_bytecodeOffset) >= 0); > + if (m_bytecodeOffset) > + store32(Imm32(m_bytecodeOffset + 1), intTagFor(RegisterFile::ArgumentCount)); This is not necessary fixed length in ARM. (And what happens if m_bytecodeOffset == 0?) Would it be possible to move this to a point where patchOffsetGetByIdSlowCaseCall unaffected? 554135 8 oliver 2012-02-10 10:03:34 -0800 (In reply to comment #7) > (From update of attachment 126138 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=126138&action=review > > > Source/JavaScriptCore/jit/JITInlineMethods.h:269 > > + ASSERT(static_cast<int>(m_bytecodeOffset) >= 0); > > + if (m_bytecodeOffset) > > + store32(Imm32(m_bytecodeOffset + 1), intTagFor(RegisterFile::ArgumentCount)); > > This is not necessary fixed length in ARM. (And what happens if m_bytecodeOffset == 0?) You hit m_bytecodeOffset = 0 in some of the very early codeine, basically stack bounds checking, etc - you're guaranteed not to be in a fixed size region. The only times we depend on exact code lengths are inside blocks where we have told the assembler to emit fixed size instructions. If the assembler is not doing that, it's a bug in the assembler. > > Would it be possible to move this to a point where patchOffsetGetByIdSlowCaseCall unaffected? Nope, we need it in the general updateTopCallFrame case. 126138 2012-02-08 13:05:31 -0800 2012-02-10 03:28:59 -0800 Patch bug-78145-20120208130530.patch text/plain 9310 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 YWM1NzhiODBiYzY5ZDEzODBkYjZhOTE0MDY5MWVmMTk2NjdmMGFiLi4xMTY3MGY0MWY5ZmJiNWQx N2JlMjZiZTAzOGU2MTVjOWUwMWI4NGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxMi0wMi0wOCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIHVwZGF0ZVRvcENhbGxmcmFtZSBpbiB0aGUgYmFzZWxpbmUgSklUIGRvZXNuJ3Qg cHJvdmlkZSBlbm91Z2ggaW5mb3JtYXRpb24gdG8gdGhlIHN0dWJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODE0NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgdXBkYXRlVG9wQ2FsbEZyYW1l IGhlbHBlciB0byBzdG9yZSBhZGRpdGlvbmFsIGluZm9ybWF0aW9uCisgICAgICAgIHRoYXQgYmVj b21lcyBuZWNlc3Nhcnkgd2hlbiB3ZSBhcmUgdHJ5aW5nIHRvIHByb3ZpZGUgbW9yZSBzdGFjawor ICAgICAgICBmcmFtZSBpbmZvcm1hdGlvbi4KKworICAgICAgICAqIGludGVycHJldGVyL0NhbGxG cmFtZS5oOgorICAgICAgICAoSlNDOjpFeGVjU3RhdGU6OmJ5dGVjb2RlT2Zmc2V0Rm9yQmFzZWxp bmVKSVQpOgorICAgICAgICAoRXhlY1N0YXRlKToKKyAgICAgICAgKiBqaXQvSklULmNwcDoKKyAg ICAgICAgKEpTQzo6SklUOjpwcml2YXRlQ29tcGlsZSk6CisgICAgICAgICogaml0L0pJVC5oOgor ICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVHZXRCeUlkUHJvdG8pOgorICAgICAgICAoSlNDOjpK SVQ6OmNvbXBpbGVHZXRCeUlkU2VsZkxpc3QpOgorICAgICAgICAoSlNDOjpKSVQ6OmNvbXBpbGVH ZXRCeUlkUHJvdG9MaXN0KToKKyAgICAgICAgKEpTQzo6SklUOjpjb21waWxlR2V0QnlJZENoYWlu TGlzdCk6CisgICAgICAgIChKU0M6OkpJVDo6Y29tcGlsZUdldEJ5SWRDaGFpbik6CisgICAgICAg IChKU0M6OkpJVDo6Y29tcGlsZVB1dEJ5SWRUcmFuc2l0aW9uKToKKyAgICAgICAgKEpJVCk6Cisg ICAgICAgICogaml0L0pJVElubGluZU1ldGhvZHMuaDoKKyAgICAgICAgKEpTQzo6SklUOjp1cGRh dGVUb3BDYWxsRnJhbWUpOgorCiAyMDEyLTAyLTA3ICBSb2JlcnQgS3JvZWdlciAgPHJqa3JvZWdl QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSB0aGUgZW5hYmxlIG1h cmNybyBmb3IgdGhlIG5vIGxvbmdlciBuZWNlc3NhcnkgQ2hyb21pdW0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuaAppbmRleCBlMGEyOTFmOGI2NTMwNzhl Njk3MjlhZjc3Mjk5ZjVmYjQ5NzM5OTViLi40ZmFkZmFiMjhlMDY4MzZiZmFkYTAxZDdiYjU4ZGEy ZTEyYjQxZWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIv Q2FsbEZyYW1lLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0NhbGxG cmFtZS5oCkBAIC0xMDYsNiArMTA2LDggQEAgbmFtZXNwYWNlIEpTQyAgewogICAgICAgICBSZXR1 cm5BZGRyZXNzUHRyIHJldHVyblBDKCkgY29uc3QgeyByZXR1cm4gUmV0dXJuQWRkcmVzc1B0cih0 aGlzW1JlZ2lzdGVyRmlsZTo6UmV0dXJuUENdLnZQQygpKTsgfQogI2VuZGlmCiAgICAgICAgIEFi c3RyYWN0UEMgYWJzdHJhY3RSZXR1cm5QQyhKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEpIHsgcmV0 dXJuIEFic3RyYWN0UEMoZ2xvYmFsRGF0YSwgdGhpcyk7IH0KKyAgICAgICAgdW5zaWduZWQgYnl0 ZWNvZGVPZmZzZXRGb3JCYXNlbGluZUpJVCgpIHsgcmV0dXJuIHRoaXNbUmVnaXN0ZXJGaWxlOjpB cmd1bWVudENvdW50XS50YWcoKTsgfQorCiAjaWYgRU5BQkxFKERGR19KSVQpCiAgICAgICAgIElu bGluZUNhbGxGcmFtZSogaW5saW5lQ2FsbEZyYW1lKCkgY29uc3QgeyByZXR1cm4gdGhpc1tSZWdp c3RlckZpbGU6OlJldHVyblBDXS5hc0lubGluZUNhbGxGcmFtZSgpOyB9CiAgICAgICAgIHVuc2ln bmVkIGNvZGVPcmlnaW5JbmRleEZvckRGR1dpdGhJbmxpbmluZygpIGNvbnN0IHsgcmV0dXJuIHRo aXNbUmVnaXN0ZXJGaWxlOjpBcmd1bWVudENvdW50XS50YWcoKTsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9KSVQuY3BwCmluZGV4IDI0NzQ5NWFhZmNkODk1ODMyZTI1MDIyYmMyOGQyOTRiMmY1OGM5ZmYu LmM4NTg0YTMxNmNkNGRlZGNjNjE0ZWM5ODYwY2Y3ODE5MGJjOTU0NmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVC5jcHAKQEAgLTYwNiw3ICs2MDYsMTEgQEAgSklUQ29kZSBKSVQ6OnByaXZhdGVD b21waWxlKENvZGVQdHIqIGZ1bmN0aW9uRW50cnlBcml0eUNoZWNrKQogICAgICAgICBsb2FkMzIo cGF5bG9hZEZvcihSZWdpc3RlckZpbGU6OkFyZ3VtZW50Q291bnQpLCByZWdUMSk7CiAgICAgICAg IGJyYW5jaDMyKEFib3ZlT3JFcXVhbCwgcmVnVDEsIFRydXN0ZWRJbW0zMihtX2NvZGVCbG9jay0+ bV9udW1QYXJhbWV0ZXJzKSkubGlua1RvKGJlZ2luTGFiZWwsIHRoaXMpOwogCisgICAgICAgIG1f Ynl0ZWNvZGVPZmZzZXQgPSAwOwogICAgICAgICBKSVRTdHViQ2FsbCh0aGlzLCBtX2NvZGVCbG9j ay0+bV9pc0NvbnN0cnVjdG9yID8gY3RpX29wX2NvbnN0cnVjdF9hcml0eUNoZWNrIDogY3RpX29w X2NhbGxfYXJpdHlDaGVjaykuY2FsbChjYWxsRnJhbWVSZWdpc3Rlcik7CisjaWYgIUFTU0VSVF9E SVNBQkxFRAorICAgICAgICBtX2J5dGVjb2RlT2Zmc2V0ID0gKHVuc2lnbmVkKS0xOyAvLyBSZXNl dCB0aGlzLCBpbiBvcmRlciB0byBndWFyZCBpdHMgdXNlIHdpdGggQVNTRVJUcy4KKyNlbmRpZgog CiAgICAgICAgIGp1bXAoYmVnaW5MYWJlbCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9KSVQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgK aW5kZXggYzM1N2U4YzM5YjI0ZWJmNzM2NDJiZWE2MmRhZjdiNDYwYzc3NmVmOS4uOGRkMzMyODkz YWFmYWEwMjZkNDA4N2YxZjdiN2UwZGNlMWE0NWM5YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5o CkBAIC0yMDcsMzQgKzIwNyw0MCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgc3RhdGljIHZv aWQgY29tcGlsZUdldEJ5SWRQcm90byhKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIENhbGxGcmFt ZSogY2FsbEZyYW1lLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgU3RydWN0dXJlU3R1YkluZm8qIHN0 dWJJbmZvLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgU3RydWN0dXJlKiBwcm90b3R5cGVTdHJ1Y3R1 cmUsIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBjb25zdCBQcm9wZXJ0eVNsb3QmIHNsb3QsIHNp emVfdCBjYWNoZWRPZmZzZXQsIFJldHVybkFkZHJlc3NQdHIgcmV0dXJuQWRkcmVzcykKICAgICAg ICAgewogICAgICAgICAgICAgSklUIGppdChnbG9iYWxEYXRhLCBjb2RlQmxvY2spOworICAgICAg ICAgICAgaml0Lm1fYnl0ZWNvZGVPZmZzZXQgPSBzdHViSW5mby0+Ynl0ZWNvZGVJbmRleDsKICAg ICAgICAgICAgIGppdC5wcml2YXRlQ29tcGlsZUdldEJ5SWRQcm90byhzdHViSW5mbywgc3RydWN0 dXJlLCBwcm90b3R5cGVTdHJ1Y3R1cmUsIGlkZW50LCBzbG90LCBjYWNoZWRPZmZzZXQsIHJldHVy bkFkZHJlc3MsIGNhbGxGcmFtZSk7CiAgICAgICAgIH0KIAogICAgICAgICBzdGF0aWMgdm9pZCBj b21waWxlR2V0QnlJZFNlbGZMaXN0KEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgQ29kZUJsb2Nr KiBjb2RlQmxvY2ssIFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViSW5mbywgUG9seW1vcnBoaWNBY2Nl c3NTdHJ1Y3R1cmVMaXN0KiBwb2x5bW9ycGhpY1N0cnVjdHVyZXMsIGludCBjdXJyZW50SW5kZXgs IFN0cnVjdHVyZSogc3RydWN0dXJlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgY29uc3QgUHJv cGVydHlTbG90JiBzbG90LCBzaXplX3QgY2FjaGVkT2Zmc2V0KQogICAgICAgICB7CiAgICAgICAg ICAgICBKSVQgaml0KGdsb2JhbERhdGEsIGNvZGVCbG9jayk7CisgICAgICAgICAgICBqaXQubV9i eXRlY29kZU9mZnNldCA9IHN0dWJJbmZvLT5ieXRlY29kZUluZGV4OwogICAgICAgICAgICAgaml0 LnByaXZhdGVDb21waWxlR2V0QnlJZFNlbGZMaXN0KHN0dWJJbmZvLCBwb2x5bW9ycGhpY1N0cnVj dHVyZXMsIGN1cnJlbnRJbmRleCwgc3RydWN0dXJlLCBpZGVudCwgc2xvdCwgY2FjaGVkT2Zmc2V0 KTsKICAgICAgICAgfQogICAgICAgICBzdGF0aWMgdm9pZCBjb21waWxlR2V0QnlJZFByb3RvTGlz dChKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIENhbGxGcmFtZSogY2FsbEZyYW1lLCBDb2RlQmxv Y2sqIGNvZGVCbG9jaywgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJbmZvLCBQb2x5bW9ycGhpY0Fj Y2Vzc1N0cnVjdHVyZUxpc3QqIHByb3RvdHlwZVN0cnVjdHVyZUxpc3QsIGludCBjdXJyZW50SW5k ZXgsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBTdHJ1Y3R1cmUqIHByb3RvdHlwZVN0cnVjdHVyZSwg Y29uc3QgSWRlbnRpZmllciYgaWRlbnQsIGNvbnN0IFByb3BlcnR5U2xvdCYgc2xvdCwgc2l6ZV90 IGNhY2hlZE9mZnNldCkKICAgICAgICAgewogICAgICAgICAgICAgSklUIGppdChnbG9iYWxEYXRh LCBjb2RlQmxvY2spOworICAgICAgICAgICAgaml0Lm1fYnl0ZWNvZGVPZmZzZXQgPSBzdHViSW5m by0+Ynl0ZWNvZGVJbmRleDsKICAgICAgICAgICAgIGppdC5wcml2YXRlQ29tcGlsZUdldEJ5SWRQ cm90b0xpc3Qoc3R1YkluZm8sIHByb3RvdHlwZVN0cnVjdHVyZUxpc3QsIGN1cnJlbnRJbmRleCwg c3RydWN0dXJlLCBwcm90b3R5cGVTdHJ1Y3R1cmUsIGlkZW50LCBzbG90LCBjYWNoZWRPZmZzZXQs IGNhbGxGcmFtZSk7CiAgICAgICAgIH0KICAgICAgICAgc3RhdGljIHZvaWQgY29tcGlsZUdldEJ5 SWRDaGFpbkxpc3QoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBDYWxsRnJhbWUqIGNhbGxGcmFt ZSwgQ29kZUJsb2NrKiBjb2RlQmxvY2ssIFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViSW5mbywgUG9s eW1vcnBoaWNBY2Nlc3NTdHJ1Y3R1cmVMaXN0KiBwcm90b3R5cGVTdHJ1Y3R1cmVMaXN0LCBpbnQg Y3VycmVudEluZGV4LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgU3RydWN0dXJlQ2hhaW4qIGNoYWlu LCBzaXplX3QgY291bnQsIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBjb25zdCBQcm9wZXJ0eVNs b3QmIHNsb3QsIHNpemVfdCBjYWNoZWRPZmZzZXQpCiAgICAgICAgIHsKICAgICAgICAgICAgIEpJ VCBqaXQoZ2xvYmFsRGF0YSwgY29kZUJsb2NrKTsKKyAgICAgICAgICAgIGppdC5tX2J5dGVjb2Rl T2Zmc2V0ID0gc3R1YkluZm8tPmJ5dGVjb2RlSW5kZXg7CiAgICAgICAgICAgICBqaXQucHJpdmF0 ZUNvbXBpbGVHZXRCeUlkQ2hhaW5MaXN0KHN0dWJJbmZvLCBwcm90b3R5cGVTdHJ1Y3R1cmVMaXN0 LCBjdXJyZW50SW5kZXgsIHN0cnVjdHVyZSwgY2hhaW4sIGNvdW50LCBpZGVudCwgc2xvdCwgY2Fj aGVkT2Zmc2V0LCBjYWxsRnJhbWUpOwogICAgICAgICB9CiAKICAgICAgICAgc3RhdGljIHZvaWQg Y29tcGlsZUdldEJ5SWRDaGFpbihKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIENhbGxGcmFtZSog Y2FsbEZyYW1lLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJ bmZvLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgU3RydWN0dXJlQ2hhaW4qIGNoYWluLCBzaXplX3Qg Y291bnQsIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBjb25zdCBQcm9wZXJ0eVNsb3QmIHNsb3Qs IHNpemVfdCBjYWNoZWRPZmZzZXQsIFJldHVybkFkZHJlc3NQdHIgcmV0dXJuQWRkcmVzcykKICAg ICAgICAgewogICAgICAgICAgICAgSklUIGppdChnbG9iYWxEYXRhLCBjb2RlQmxvY2spOworICAg ICAgICAgICAgaml0Lm1fYnl0ZWNvZGVPZmZzZXQgPSBzdHViSW5mby0+Ynl0ZWNvZGVJbmRleDsK ICAgICAgICAgICAgIGppdC5wcml2YXRlQ29tcGlsZUdldEJ5SWRDaGFpbihzdHViSW5mbywgc3Ry dWN0dXJlLCBjaGFpbiwgY291bnQsIGlkZW50LCBzbG90LCBjYWNoZWRPZmZzZXQsIHJldHVybkFk ZHJlc3MsIGNhbGxGcmFtZSk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIHN0YXRpYyB2 b2lkIGNvbXBpbGVQdXRCeUlkVHJhbnNpdGlvbihKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIENv ZGVCbG9jayogY29kZUJsb2NrLCBTdHJ1Y3R1cmVTdHViSW5mbyogc3R1YkluZm8sIFN0cnVjdHVy ZSogb2xkU3RydWN0dXJlLCBTdHJ1Y3R1cmUqIG5ld1N0cnVjdHVyZSwgc2l6ZV90IGNhY2hlZE9m ZnNldCwgU3RydWN0dXJlQ2hhaW4qIGNoYWluLCBSZXR1cm5BZGRyZXNzUHRyIHJldHVybkFkZHJl c3MsIGJvb2wgZGlyZWN0KQogICAgICAgICB7CiAgICAgICAgICAgICBKSVQgaml0KGdsb2JhbERh dGEsIGNvZGVCbG9jayk7CisgICAgICAgICAgICBqaXQubV9ieXRlY29kZU9mZnNldCA9IHN0dWJJ bmZvLT5ieXRlY29kZUluZGV4OwogICAgICAgICAgICAgaml0LnByaXZhdGVDb21waWxlUHV0QnlJ ZFRyYW5zaXRpb24oc3R1YkluZm8sIG9sZFN0cnVjdHVyZSwgbmV3U3RydWN0dXJlLCBjYWNoZWRP ZmZzZXQsIGNoYWluLCByZXR1cm5BZGRyZXNzLCBkaXJlY3QpOwogICAgICAgICB9CiAKQEAgLTM5 OCw5ICs0MDQsOSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgc3RhdGljIGNvbnN0IGludCBw YXRjaE9mZnNldEdldEJ5SWRQcm9wZXJ0eU1hcE9mZnNldDIgPSAyMjsKICAgICAgICAgc3RhdGlj IGNvbnN0IGludCBwYXRjaE9mZnNldEdldEJ5SWRQdXRSZXN1bHQgPSAyMjsKICNpZiBFTkFCTEUo T1BDT0RFX1NBTVBMSU5HKQotICAgICAgICBzdGF0aWMgY29uc3QgaW50IHBhdGNoT2Zmc2V0R2V0 QnlJZFNsb3dDYXNlQ2FsbCA9IDM3OworICAgICAgICBzdGF0aWMgY29uc3QgaW50IHBhdGNoT2Zm c2V0R2V0QnlJZFNsb3dDYXNlQ2FsbCA9IDQ0OwogI2Vsc2UKLSAgICAgICAgc3RhdGljIGNvbnN0 IGludCBwYXRjaE9mZnNldEdldEJ5SWRTbG93Q2FzZUNhbGwgPSAzMzsKKyAgICAgICAgc3RhdGlj IGNvbnN0IGludCBwYXRjaE9mZnNldEdldEJ5SWRTbG93Q2FzZUNhbGwgPSA0MDsKICNlbmRpZgog ICAgICAgICBzdGF0aWMgY29uc3QgaW50IHBhdGNoT2Zmc2V0T3BDYWxsQ29tcGFyZVRvSnVtcCA9 IDY7CiAKQEAgLTQyMSw3ICs0MjcsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICNpZiBFTkFCTEUoT1BD T0RFX1NBTVBMSU5HKQogICAgICAgICAjZXJyb3IgIk9QQ09ERV9TQU1QTElORyBpcyBub3QgeWV0 IHN1cHBvcnRlZCIKICNlbHNlCi0gICAgICAgIHN0YXRpYyBjb25zdCBpbnQgcGF0Y2hPZmZzZXRH ZXRCeUlkU2xvd0Nhc2VDYWxsID0gNDA7CisgICAgICAgIHN0YXRpYyBjb25zdCBpbnQgcGF0Y2hP ZmZzZXRHZXRCeUlkU2xvd0Nhc2VDYWxsID0gNDg7CiAjZW5kaWYKICAgICAgICAgc3RhdGljIGNv bnN0IGludCBwYXRjaE9mZnNldE9wQ2FsbENvbXBhcmVUb0p1bXAgPSAxMjsKIApAQCAtNDU4LDcg KzQ2NCw3IEBAIG5hbWVzcGFjZSBKU0MgewogI2lmIEVOQUJMRShPUENPREVfU0FNUExJTkcpCiAg ICAgICAgICNlcnJvciAiT1BDT0RFX1NBTVBMSU5HIGlzIG5vdCB5ZXQgc3VwcG9ydGVkIgogI2Vs c2UKLSAgICAgICAgc3RhdGljIGNvbnN0IGludCBwYXRjaE9mZnNldEdldEJ5SWRTbG93Q2FzZUNh bGwgPSA0MDsKKyAgICAgICAgc3RhdGljIGNvbnN0IGludCBwYXRjaE9mZnNldEdldEJ5SWRTbG93 Q2FzZUNhbGwgPSA0ODsKICNlbmRpZgogICAgICAgICBzdGF0aWMgY29uc3QgaW50IHBhdGNoT2Zm c2V0T3BDYWxsQ29tcGFyZVRvSnVtcCA9IDE2OwogCkBAIC02MzQsOSArNjQwLDkgQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgIHN0YXRpYyBjb25zdCBpbnQgcGF0Y2hPZmZzZXRHZXRCeUlkUHJv cGVydHlNYXBPZmZzZXQgPSAyODsKICAgICAgICAgc3RhdGljIGNvbnN0IGludCBwYXRjaE9mZnNl dEdldEJ5SWRQdXRSZXN1bHQgPSAyODsKICNpZiBFTkFCTEUoT1BDT0RFX1NBTVBMSU5HKQotICAg ICAgICBzdGF0aWMgY29uc3QgaW50IHBhdGNoT2Zmc2V0R2V0QnlJZFNsb3dDYXNlQ2FsbCA9IDY0 OworICAgICAgICBzdGF0aWMgY29uc3QgaW50IHBhdGNoT2Zmc2V0R2V0QnlJZFNsb3dDYXNlQ2Fs bCA9IDcyOwogI2Vsc2UKLSAgICAgICAgc3RhdGljIGNvbnN0IGludCBwYXRjaE9mZnNldEdldEJ5 SWRTbG93Q2FzZUNhbGwgPSA1NDsKKyAgICAgICAgc3RhdGljIGNvbnN0IGludCBwYXRjaE9mZnNl dEdldEJ5SWRTbG93Q2FzZUNhbGwgPSA2MjsKICNlbmRpZgogICAgICAgICBzdGF0aWMgY29uc3Qg aW50IHBhdGNoT2Zmc2V0T3BDYWxsQ29tcGFyZVRvSnVtcCA9IDk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUSW5saW5lTWV0aG9kcy5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVNZXRob2RzLmgKaW5kZXggMDE1NDVmYjhjNzI3NDUwOThi NGI2YTdlODg0MDI2Y2E3MTM0M2QxNS4uZGZjZmJkNDk5MGVlMTQwMjRkMTU3ODhjYmM2OWU1NmIy OWU3OGE4NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVN ZXRob2RzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRJbmxpbmVNZXRob2Rz LmgKQEAgLTI2NCw2ICsyNjQsOSBAQCBBTFdBWVNfSU5MSU5FIHZvaWQgSklUOjpyZXN0b3JlQXJn dW1lbnRSZWZlcmVuY2UoKQogCiBBTFdBWVNfSU5MSU5FIHZvaWQgSklUOjp1cGRhdGVUb3BDYWxs RnJhbWUoKQogeworICAgIEFTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KG1fYnl0ZWNvZGVPZmZzZXQp ID49IDApOworICAgIGlmIChtX2J5dGVjb2RlT2Zmc2V0KQorICAgICAgICBzdG9yZTMyKEltbTMy KG1fYnl0ZWNvZGVPZmZzZXQgKyAxKSwgaW50VGFnRm9yKFJlZ2lzdGVyRmlsZTo6QXJndW1lbnRD b3VudCkpOwogICAgIHN0b3JlUHRyKGNhbGxGcmFtZVJlZ2lzdGVyLCAmbV9nbG9iYWxEYXRhLT50 b3BDYWxsRnJhbWUpOwogfQogCg==