175724 2017-08-18 10:22:05 -0700 Implement 64-bit MacroAssembler::probe support for Windows. 2017-08-22 12:26:47 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen benjamin bfulgham buildbot cdumez cmarcelo dbates keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1340132 0 pvollan 2017-08-18 10:22:05 -0700 This is needed in order to enable the DFG. 1341077 1 318761 pvollan 2017-08-22 09:44:19 -0700 Created attachment 318761 Patch 1341081 2 318761 mark.lam 2017-08-22 10:08:07 -0700 Comment on attachment 318761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318761&action=review r=me with fixes. > Source/JavaScriptCore/ChangeLog:8 > + This is needed to enable the DFG. Please add a comment about why you went with putting the code in an asm file instead of inline assembly. We spoke offline about this, but I think it's good to document the reason here in the ChangeLog. > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:48 > +PTR_SIZE EQU 8 > + > +PROBE_PROBE_FUNCTION_OFFSET EQU (0 * PTR_SIZE) > +PROBE_ARG_OFFSET EQU (1 * PTR_SIZE) > +PROBE_INIT_STACK_FUNCTION_OFFSET EQU (2 * PTR_SIZE) > +PROBE_INIT_STACK_ARG_OFFSET EQU (3 * PTR_SIZE) It's unfortunate that MSVC does not allow us to use inline asm. Apart from all these duplicate definitions, we lost the ability to validate the correctness of these values via the static_asserts. Please put a comment above this blob of constant defines to state that these constant values should patch the x86_64 version in MacroAssemblerX86Common.cpp. > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:109 > + ; esp[0 * ptrSize]: rflags > + ; esp[1 * ptrSize]: return address / saved rip > + ; esp[2 * ptrSize]: probe handler function > + ; esp[3 * ptrSize]: probe arg > + ; esp[4 * ptrSize]: saved rax > + ; esp[5 * ptrSize]: saved rsp This comment is now stale (see MacroAssemblerX86Common.cpp). Please update it. 1341082 3 pvollan 2017-08-22 10:11:36 -0700 (In reply to Mark Lam from comment #2) > Comment on attachment 318761 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=318761&action=review > > r=me with fixes. > > > Source/JavaScriptCore/ChangeLog:8 > > + This is needed to enable the DFG. > > Please add a comment about why you went with putting the code in an asm file > instead of inline assembly. We spoke offline about this, but I think it's > good to document the reason here in the ChangeLog. > > > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:48 > > +PTR_SIZE EQU 8 > > + > > +PROBE_PROBE_FUNCTION_OFFSET EQU (0 * PTR_SIZE) > > +PROBE_ARG_OFFSET EQU (1 * PTR_SIZE) > > +PROBE_INIT_STACK_FUNCTION_OFFSET EQU (2 * PTR_SIZE) > > +PROBE_INIT_STACK_ARG_OFFSET EQU (3 * PTR_SIZE) > > It's unfortunate that MSVC does not allow us to use inline asm. Apart from > all these duplicate definitions, we lost the ability to validate the > correctness of these values via the static_asserts. Please put a comment > above this blob of constant defines to state that these constant values > should patch the x86_64 version in MacroAssemblerX86Common.cpp. > > > Source/JavaScriptCore/jit/JITStubsMSVC64.asm:109 > > + ; esp[0 * ptrSize]: rflags > > + ; esp[1 * ptrSize]: return address / saved rip > > + ; esp[2 * ptrSize]: probe handler function > > + ; esp[3 * ptrSize]: probe arg > > + ; esp[4 * ptrSize]: saved rax > > + ; esp[5 * ptrSize]: saved rsp > > This comment is now stale (see MacroAssemblerX86Common.cpp). Please update > it. Thanks for reviewing, Mark! I will update the patch before landing. 1341186 4 pvollan 2017-08-22 12:25:41 -0700 Committed r221032: <https://trac.webkit.org/changeset/221032/webkit> 1341187 5 webkit-bug-importer 2017-08-22 12:26:47 -0700 <rdar://problem/34018595> 318761 2017-08-22 09:44:19 -0700 2017-08-22 10:08:07 -0700 Patch bug-175724-20170822184419.patch text/plain 14211 pvollan SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIxMDE5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDE3LTA4LTIyICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAg ICAgICBJbXBsZW1lbnQgNjQtYml0IE1hY3JvQXNzZW1ibGVyOjpwcm9iZSBzdXBwb3J0IGZvciBX aW5kb3dzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc1NzI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBpcyBuZWVkZWQgdG8gZW5hYmxlIHRoZSBERkcuCisKKyAgICAgICAgKiBhc3NlbWJsZXIv TWFjcm9Bc3NlbWJsZXJYODZDb21tb24uY3BwOgorICAgICAgICAoSlNDOjpib29sZWFuVHJ1ZUZv ckF2b2lkaW5nTm9SZXR1cm5EZWNsYXJhdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogaml0L0pJ VFN0dWJzTVNWQzY0LmFzbToKKwogMjAxNy0wOC0yMiAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFw cGxlLmNvbT4KIAogICAgICAgICBXZSBhcmUgdXNpbmcgdmFsdWVQcm9maWxlRm9yQnl0ZWNvZGVP ZmZzZXQgd2hlbiB0aGVyZSBtYXkgbm90IGJlIGEgdmFsdWUgcHJvZmlsZQpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1vbi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxl clg4NkNvbW1vbi5jcHAJKHJldmlzaW9uIDIyMTAxMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZDb21tb24uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC03MDQsMTYgKzcwNCw2IEBAIGFzbSAoCiAjZW5kaWYgLy8gQ09NUElMRVIoR0NDX09SX0NMQU5H KQogI2VuZGlmIC8vIENQVShYODZfNjQpCiAKLSNpZiBPUyhXSU5ET1dTKSAmJiBDUFUoWDg2XzY0 KQotc3RhdGljIGJvb2wgYm9vbGVhblRydWVGb3JBdm9pZGluZ05vUmV0dXJuRGVjbGFyYXRpb24o KSB7IHJldHVybiB0cnVlOyB9Ci0KLWV4dGVybiAiQyIgdm9pZCBjdGlNYXNtUHJvYmVUcmFtcG9s aW5lKCkKLXsKLSAgICBpZiAoYm9vbGVhblRydWVGb3JBdm9pZGluZ05vUmV0dXJuRGVjbGFyYXRp b24oKSkKLSAgICAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLX0KLSNlbmRpZiAv LyBPUyhXSU5ET1dTKQotCiAvLyBXaGF0IGNvZGUgaXMgZW1pdHRlZCBmb3IgdGhlIHByb2JlPwog Ly8gPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogLy8gV2Ugd2FudCB0byBrZWVw IHRoZSBzaXplIG9mIHRoZSBlbWl0dGVkIHByb2JlIGludm9jYXRpb24gY29kZSBhcyBjb21wYWN0 IGFzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFzbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFz bQkocmV2aXNpb24gMjIxMDEwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVi c01TVkM2NC5hc20JKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKIEVYVEVSTiBnZXRI b3N0Q2FsbFJldHVyblZhbHVlV2l0aEV4ZWNTdGF0ZSA6IG5lYXIKIAogUFVCTElDIGdldEhvc3RD YWxsUmV0dXJuVmFsdWUKK1BVQkxJQyBjdGlNYXNtUHJvYmVUcmFtcG9saW5lCiAKIF9URVhUICAg U0VHTUVOVAogCkBAIC0zOSw2ICs0MCwyNTEgQEAgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSBQUk9D CiAgICAgcmV0CiBnZXRIb3N0Q2FsbFJldHVyblZhbHVlIEVORFAKIAorUFRSX1NJWkUgRVFVIDgK KworUFJPQkVfUFJPQkVfRlVOQ1RJT05fT0ZGU0VUIEVRVSAoMCAqIFBUUl9TSVpFKQorUFJPQkVf QVJHX09GRlNFVCBFUVUgKDEgKiBQVFJfU0laRSkKK1BST0JFX0lOSVRfU1RBQ0tfRlVOQ1RJT05f T0ZGU0VUIEVRVSAoMiAqIFBUUl9TSVpFKQorUFJPQkVfSU5JVF9TVEFDS19BUkdfT0ZGU0VUIEVR VSAoMyAqIFBUUl9TSVpFKQorCitQUk9CRV9GSVJTVF9HUFJfT0ZGU0VUIEVRVSAoNCAqIFBUUl9T SVpFKQorUFJPQkVfQ1BVX0VBWF9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9HUFJfT0ZGU0VUICsg KDAgKiBQVFJfU0laRSkpCitQUk9CRV9DUFVfRUNYX09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX0dQ Ul9PRkZTRVQgKyAoMSAqIFBUUl9TSVpFKSkKK1BST0JFX0NQVV9FRFhfT0ZGU0VUIEVRVSAoUFJP QkVfRklSU1RfR1BSX09GRlNFVCArICgyICogUFRSX1NJWkUpKQorUFJPQkVfQ1BVX0VCWF9PRkZT RVQgRVFVIChQUk9CRV9GSVJTVF9HUFJfT0ZGU0VUICsgKDMgKiBQVFJfU0laRSkpCitQUk9CRV9D UFVfRVNQX09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9PRkZTRVQgKyAoNCAqIFBUUl9TSVpF KSkKK1BST0JFX0NQVV9FQlBfT0ZGU0VUIEVRVSAoUFJPQkVfRklSU1RfR1BSX09GRlNFVCArICg1 ICogUFRSX1NJWkUpKQorUFJPQkVfQ1BVX0VTSV9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9HUFJf T0ZGU0VUICsgKDYgKiBQVFJfU0laRSkpCitQUk9CRV9DUFVfRURJX09GRlNFVCBFUVUgKFBST0JF X0ZJUlNUX0dQUl9PRkZTRVQgKyAoNyAqIFBUUl9TSVpFKSkKKworUFJPQkVfQ1BVX1I4X09GRlNF VCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9PRkZTRVQgKyAoOCAqIFBUUl9TSVpFKSkKK1BST0JFX0NQ VV9SOV9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9HUFJfT0ZGU0VUICsgKDkgKiBQVFJfU0laRSkp CitQUk9CRV9DUFVfUjEwX09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9PRkZTRVQgKyAoMTAg KiBQVFJfU0laRSkpCitQUk9CRV9DUFVfUjExX09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9P RkZTRVQgKyAoMTEgKiBQVFJfU0laRSkpCitQUk9CRV9DUFVfUjEyX09GRlNFVCBFUVUgKFBST0JF X0ZJUlNUX0dQUl9PRkZTRVQgKyAoMTIgKiBQVFJfU0laRSkpCitQUk9CRV9DUFVfUjEzX09GRlNF VCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9PRkZTRVQgKyAoMTMgKiBQVFJfU0laRSkpCitQUk9CRV9D UFVfUjE0X09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9PRkZTRVQgKyAoMTQgKiBQVFJfU0la RSkpCitQUk9CRV9DUFVfUjE1X09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX0dQUl9PRkZTRVQgKyAo MTUgKiBQVFJfU0laRSkpCitQUk9CRV9GSVJTVF9TUFJfT0ZGU0VUIEVRVSAoUFJPQkVfRklSU1Rf R1BSX09GRlNFVCArICgxNiAqIFBUUl9TSVpFKSkKKworUFJPQkVfQ1BVX0VJUF9PRkZTRVQgRVFV IChQUk9CRV9GSVJTVF9TUFJfT0ZGU0VUICsgKDAgKiBQVFJfU0laRSkpCitQUk9CRV9DUFVfRUZM QUdTX09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX1NQUl9PRkZTRVQgKyAoMSAqIFBUUl9TSVpFKSkK K1BST0JFX0ZJUlNUX1hNTV9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9TUFJfT0ZGU0VUICsgKDIg KiBQVFJfU0laRSkpCisKK1hNTV9TSVpFIEVRVSA4CitQUk9CRV9DUFVfWE1NMF9PRkZTRVQgRVFV IChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDAgKiBYTU1fU0laRSkpCitQUk9CRV9DUFVfWE1N MV9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDEgKiBYTU1fU0laRSkpCitQ Uk9CRV9DUFVfWE1NMl9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDIgKiBY TU1fU0laRSkpCitQUk9CRV9DUFVfWE1NM19PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZG U0VUICsgKDMgKiBYTU1fU0laRSkpCitQUk9CRV9DUFVfWE1NNF9PRkZTRVQgRVFVIChQUk9CRV9G SVJTVF9YTU1fT0ZGU0VUICsgKDQgKiBYTU1fU0laRSkpCitQUk9CRV9DUFVfWE1NNV9PRkZTRVQg RVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDUgKiBYTU1fU0laRSkpCitQUk9CRV9DUFVf WE1NNl9PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDYgKiBYTU1fU0laRSkp CitQUk9CRV9DUFVfWE1NN19PRkZTRVQgRVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDcg KiBYTU1fU0laRSkpCisKK1BST0JFX0NQVV9YTU04X09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX1hN TV9PRkZTRVQgKyAoOCAqIFhNTV9TSVpFKSkKK1BST0JFX0NQVV9YTU05X09GRlNFVCBFUVUgKFBS T0JFX0ZJUlNUX1hNTV9PRkZTRVQgKyAoOSAqIFhNTV9TSVpFKSkKK1BST0JFX0NQVV9YTU0xMF9P RkZTRVQgRVFVIChQUk9CRV9GSVJTVF9YTU1fT0ZGU0VUICsgKDEwICogWE1NX1NJWkUpKQorUFJP QkVfQ1BVX1hNTTExX09GRlNFVCBFUVUgKFBST0JFX0ZJUlNUX1hNTV9PRkZTRVQgKyAoMTEgKiBY TU1fU0laRSkpCitQUk9CRV9DUFVfWE1NMTJfT0ZGU0VUIEVRVSAoUFJPQkVfRklSU1RfWE1NX09G RlNFVCArICgxMiAqIFhNTV9TSVpFKSkKK1BST0JFX0NQVV9YTU0xM19PRkZTRVQgRVFVIChQUk9C RV9GSVJTVF9YTU1fT0ZGU0VUICsgKDEzICogWE1NX1NJWkUpKQorUFJPQkVfQ1BVX1hNTTE0X09G RlNFVCBFUVUgKFBST0JFX0ZJUlNUX1hNTV9PRkZTRVQgKyAoMTQgKiBYTU1fU0laRSkpCitQUk9C RV9DUFVfWE1NMTVfT0ZGU0VUIEVRVSAoUFJPQkVfRklSU1RfWE1NX09GRlNFVCArICgxNSAqIFhN TV9TSVpFKSkKK1BST0JFX1NJWkUgRVFVIChQUk9CRV9DUFVfWE1NMTVfT0ZGU0VUICsgWE1NX1NJ WkUpCisKK1BST0JFX0VYRUNVVE9SX09GRlNFVCBFUVUgUFJPQkVfU0laRSA7IFN0YXNoIHRoZSBl eGVjdXRlUHJvYmUgZnVuY3Rpb24gcG9pbnRlciBhdCB0aGUgZW5kIG9mIHRoZSBQcm9iZUNvbnRl eHQuCisKK09VVF9TSVpFIEVRVSAoNSAqIFBUUl9TSVpFKQorCitjdGlNYXNtUHJvYmVUcmFtcG9s aW5lIFBST0MKKyAgICBwdXNoZnEKKworICAgIDsgTWFjcm9Bc3NlbWJsZXJYODZDb21tb246OnBy b2JlKCkgaGFzIGFscmVhZHkgZ2VuZXJhdGVkIGNvZGUgdG8gc3RvcmUgc29tZSB2YWx1ZXMuCisg ICAgOyBUb2dldGhlciB3aXRoIHRoZSByZmxhZ3MgcHVzaGVkIGFib3ZlLCB0aGUgdG9wIG9mIHN0 YWNrIG5vdyBsb29rcyBsaWtlCisgICAgOyB0aGlzOgorICAgIDsgICAgIGVzcFswICogcHRyU2l6 ZV06IHJmbGFncworICAgIDsgICAgIGVzcFsxICogcHRyU2l6ZV06IHJldHVybiBhZGRyZXNzIC8g c2F2ZWQgcmlwCisgICAgOyAgICAgZXNwWzIgKiBwdHJTaXplXTogcHJvYmUgaGFuZGxlciBmdW5j dGlvbgorICAgIDsgICAgIGVzcFszICogcHRyU2l6ZV06IHByb2JlIGFyZworICAgIDsgICAgIGVz cFs0ICogcHRyU2l6ZV06IHNhdmVkIHJheAorICAgIDsgICAgIGVzcFs1ICogcHRyU2l6ZV06IHNh dmVkIHJzcAorCisgICAgbW92IHJheCwgcnNwIAorICAgIHN1YiByc3AsIFBST0JFX1NJWkUgKyBP VVRfU0laRQorCisgICAgOyBUaGUgWDg2XzY0IEFCSSBzcGVjaWZpZXMgdGhhdCB0aGUgd29yc2Ug Y2FzZSBzdGFjayBhbGlnbm1lbnQgcmVxdWlyZW1lbnQgaXMgMzIgYnl0ZXMuCisgICAgYW5kIHJz cCwgbm90IDAxZmgKKyAgICA7IFNpbmNlIHNwIHBvaW50cyB0byB0aGUgUHJvYmVDb250ZXh0LCB3 ZSd2ZSBlbnN1cmVkIHRoYXQgaXQncyBwcm90ZWN0ZWQgZnJvbSBpbnRlcnJ1cHRzIGJlZm9yZSB3 ZSBpbml0aWFsaXplIGl0LgorCisgICAgbW92IFtQUk9CRV9DUFVfRUJQX09GRlNFVCArIHJzcF0s IHJicAorICAgIG1vdiByYnAsIHJzcCA7IFNhdmUgdGhlIFByb2JlQ29udGV4dCouCisKKyAgICBt b3YgW1BST0JFX0VYRUNVVE9SX09GRlNFVCArIHJicF0sIHJjeAorICAgIG1vdiBbUFJPQkVfUFJP QkVfRlVOQ1RJT05fT0ZGU0VUICsgcmJwXSwgcmR4CisgICAgbW92IFtQUk9CRV9BUkdfT0ZGU0VU ICsgcmJwXSwgcmJ4CisgICAgbW92IFtQUk9CRV9DUFVfRVNJX09GRlNFVCArIHJicF0sIHJzaQor ICAgIG1vdiBbUFJPQkVfQ1BVX0VESV9PRkZTRVQgKyByYnBdLCByZGkKKworICAgIG1vdiByY3gs IFswICogUFRSX1NJWkUgKyByYXhdCisgICAgbW92IFtQUk9CRV9DUFVfRUZMQUdTX09GRlNFVCAr IHJicF0sIHJjeAorICAgIG1vdiByY3gsIFsxICogIFBUUl9TSVpFICsgcmF4XQorICAgIG1vdiBb UFJPQkVfQ1BVX0VJUF9PRkZTRVQgKyByYnBdLCByY3gKKyAgICBtb3YgcmN4LCBbMiAqIFBUUl9T SVpFICsgcmF4XQorICAgIG1vdiBbUFJPQkVfQ1BVX0VCWF9PRkZTRVQgKyByYnBdLCByY3gKKyAg ICBtb3YgcmN4LCBbMyAqIFBUUl9TSVpFICsgcmF4XQorICAgIG1vdiBbUFJPQkVfQ1BVX0VEWF9P RkZTRVQgKyByYnBdLCByY3gKKyAgICBtb3YgcmN4LCBbNCAqIFBUUl9TSVpFICsgcmF4XQorICAg IG1vdiBbUFJPQkVfQ1BVX0VDWF9PRkZTRVQgKyByYnBdLCByY3gKKyAgICBtb3YgcmN4LCBbNSAq IFBUUl9TSVpFICsgcmF4XQorICAgIG1vdiBbUFJPQkVfQ1BVX0VBWF9PRkZTRVQgKyByYnBdLCBy Y3gKKworICAgIG1vdiByY3gsIHJheAorICAgIGFkZCByY3gsIDYgKiBQVFJfU0laRQorICAgIG1v diBbUFJPQkVfQ1BVX0VTUF9PRkZTRVQgKyByYnBdLCByY3gKKworICAgIG1vdiBbUFJPQkVfQ1BV X1I4X09GRlNFVCArIHJicF0sIHI4CisgICAgbW92IFtQUk9CRV9DUFVfUjlfT0ZGU0VUICsgcmJw XSwgcjkKKyAgICBtb3YgW1BST0JFX0NQVV9SMTBfT0ZGU0VUICsgcmJwXSwgcjEwCisgICAgbW92 IFtQUk9CRV9DUFVfUjExX09GRlNFVCArIHJicF0sIHIxMQorICAgIG1vdiBbUFJPQkVfQ1BVX1Ix Ml9PRkZTRVQgKyByYnBdLCByMTIKKyAgICBtb3YgW1BST0JFX0NQVV9SMTNfT0ZGU0VUICsgcmJw XSwgcjEzCisgICAgbW92IFtQUk9CRV9DUFVfUjE0X09GRlNFVCArIHJicF0sIHIxNAorICAgIG1v diBbUFJPQkVfQ1BVX1IxNV9PRkZTRVQgKyByYnBdLCByMTUKKworICAgIG1vdnEgcXdvcmQgcHRy IFtQUk9CRV9DUFVfWE1NMF9PRkZTRVQgKyByYnBdLCB4bW0wCisgICAgbW92cSBxd29yZCBwdHIg W1BST0JFX0NQVV9YTU0xX09GRlNFVCArIHJicF0sIHhtbTEKKyAgICBtb3ZxIHF3b3JkIHB0ciBb UFJPQkVfQ1BVX1hNTTJfT0ZGU0VUICsgcmJwXSwgeG1tMgorICAgIG1vdnEgcXdvcmQgcHRyIFtQ Uk9CRV9DUFVfWE1NM19PRkZTRVQgKyByYnBdLCB4bW0zCisgICAgbW92cSBxd29yZCBwdHIgW1BS T0JFX0NQVV9YTU00X09GRlNFVCArIHJicF0sIHhtbTQKKyAgICBtb3ZxIHF3b3JkIHB0ciBbUFJP QkVfQ1BVX1hNTTVfT0ZGU0VUICsgcmJwXSwgeG1tNQorICAgIG1vdnEgcXdvcmQgcHRyIFtQUk9C RV9DUFVfWE1NNl9PRkZTRVQgKyByYnBdLCB4bW02CisgICAgbW92cSBxd29yZCBwdHIgW1BST0JF X0NQVV9YTU03X09GRlNFVCArIHJicF0sIHhtbTcKKyAgICBtb3ZxIHF3b3JkIHB0ciBbUFJPQkVf Q1BVX1hNTThfT0ZGU0VUICsgcmJwXSwgeG1tOAorICAgIG1vdnEgcXdvcmQgcHRyIFtQUk9CRV9D UFVfWE1NOV9PRkZTRVQgKyByYnBdLCB4bW05CisgICAgbW92cSBxd29yZCBwdHIgW1BST0JFX0NQ VV9YTU0xMF9PRkZTRVQgKyByYnBdLCB4bW0xMAorICAgIG1vdnEgcXdvcmQgcHRyIFtQUk9CRV9D UFVfWE1NMTFfT0ZGU0VUICsgcmJwXSwgeG1tMTEKKyAgICBtb3ZxIHF3b3JkIHB0ciBbUFJPQkVf Q1BVX1hNTTEyX09GRlNFVCArIHJicF0sIHhtbTEyCisgICAgbW92cSBxd29yZCBwdHIgW1BST0JF X0NQVV9YTU0xM19PRkZTRVQgKyByYnBdLCB4bW0xMworICAgIG1vdnEgcXdvcmQgcHRyIFtQUk9C RV9DUFVfWE1NMTRfT0ZGU0VUICsgcmJwXSwgeG1tMTQKKyAgICBtb3ZxIHF3b3JkIHB0ciBbUFJP QkVfQ1BVX1hNTTE1X09GRlNFVCArIHJicF0sIHhtbTE1CisKKyAgICBtb3YgcmN4LCByYnAgOyB0 aGUgUHJvYmU6OlN0YXRlKiBhcmcuCisgICAgc3ViIHJzcCwgMzIgOyBzaGFkb3cgc3BhY2UKKyAg ICBjYWxsIHF3b3JkIHB0cltQUk9CRV9FWEVDVVRPUl9PRkZTRVQgKyByYnBdCisgICAgYWRkIHJz cCwgMzIKKworICAgIDsgTWFrZSBzdXJlIHRoZSBQcm9iZUNvbnRleHQgaXMgZW50aXJlbHkgYmVs b3cgdGhlIHJlc3VsdCBzdGFjayBwb2ludGVyIHNvCisgICAgOyB0aGF0IHJlZ2lzdGVyIHZhbHVl cyBhcmUgc3RpbGwgcHJlc2VydmVkIHdoZW4gd2UgY2FsbCB0aGUgaW5pdGlhbGl6ZVN0YWNrCisg ICAgOyBmdW5jdGlvbi4KKyAgICBtb3YgcmN4LCBQUk9CRV9TSVpFICsgT1VUX1NJWkUKKyAgICBt b3YgcmF4LCByYnAKKyAgICBtb3YgcmR4LCBbUFJPQkVfQ1BVX0VTUF9PRkZTRVQgKyByYnBdCisg ICAgYWRkIHJheCwgcmN4CisgICAgY21wIHJkeCwgcmF4IAorICAgIGpnZSBjdGlNYXNtUHJvYmVU cmFtcG9saW5lUHJvYmVDb250ZXh0SXNTYWZlCisKKyAgICA7IEFsbG9jYXRlIGEgc2FmZSBwbGFj ZSBvbiB0aGUgc3RhY2sgYmVsb3cgdGhlIHJlc3VsdCBzdGFjayBwb2ludGVyIHRvIHN0YXNoIHRo ZSBQcm9iZUNvbnRleHQuCisgICAgc3ViIHJkeCwgcmN4CisgICAgYW5kIHJkeCwgbm90IDAxZmgg OyBLZWVwIHRoZSBzdGFjayBwb2ludGVyIDMyIGJ5dGVzIGFsaWduZWQuCisgICAgeG9yIHJheCwg cmF4CisgICAgbW92IHJzcCwgcmR4CisKKyAgICBtb3YgcmN4LCBQUk9CRV9TSVpFCisKKyAgICA7 IENvcHkgdGhlIFByb2JlQ29udGV4dCB0byB0aGUgc2FmZSBwbGFjZS4KKyAgICBjdGlNYXNtUHJv YmVUcmFtcG9saW5lQ29weUxvb3A6CisgICAgbW92IHJkeCwgW3JicCArIHJheF0KKyAgICBtb3Yg W3JzcCArIHJheF0sIHJkeAorICAgIGFkZCByYXgsIFBUUl9TSVpFCisgICAgY21wIHJjeCwgcmF4 CisgICAgamcgY3RpTWFzbVByb2JlVHJhbXBvbGluZUNvcHlMb29wCisKKyAgICBtb3YgcmJwLCBy c3AKKworICAgIDsgQ2FsbCBpbml0aWFsaXplU3RhY2tGdW5jdGlvbiBpZiBwcmVzZW50LgorICAg IGN0aU1hc21Qcm9iZVRyYW1wb2xpbmVQcm9iZUNvbnRleHRJc1NhZmU6CisgICAgeG9yIHJjeCwg cmN4CisgICAgYWRkIHJjeCwgW1BST0JFX0lOSVRfU1RBQ0tfRlVOQ1RJT05fT0ZGU0VUICsgcmJw XQorICAgIGplIGN0aU1hc21Qcm9iZVRyYW1wb2xpbmVSZXN0b3JlUmVnaXN0ZXJzCisKKyAgICBt b3YgcmR4LCByY3gKKyAgICBtb3YgcmN4LCByYnAgOyB0aGUgUHJvYmU6OlN0YXRlKiBhcmcuCisg ICAgc3ViIHJzcCwgMzIgOyBzaGFkb3cgc3BhY2UKKyAgICBjYWxsIHJkeAorICAgIGFkZCByc3As IDMyCisKKyAgICBjdGlNYXNtUHJvYmVUcmFtcG9saW5lUmVzdG9yZVJlZ2lzdGVyczoKKworICAg IDsgVG8gZW5hYmxlIHByb2JlcyB0byBtb2RpZnkgcmVnaXN0ZXIgc3RhdGUsIHdlIGNvcHkgYWxs IHJlZ2lzdGVycworICAgIDsgb3V0IG9mIHRoZSBQcm9iZUNvbnRleHQgYmVmb3JlIHJldHVybmlu Zy4KKworICAgIG1vdiByZHgsIFtQUk9CRV9DUFVfRURYX09GRlNFVCArIHJicF0KKyAgICBtb3Yg cmJ4LCBbUFJPQkVfQ1BVX0VCWF9PRkZTRVQgKyByYnBdCisgICAgbW92IHJzaSwgW1BST0JFX0NQ VV9FU0lfT0ZGU0VUICsgcmJwXQorICAgIG1vdiByZGksIFtQUk9CRV9DUFVfRURJX09GRlNFVCAr IHJicF0KKworICAgIG1vdiByOCwgW1BST0JFX0NQVV9SOF9PRkZTRVQgKyByYnBdCisgICAgbW92 IHI5LCBbUFJPQkVfQ1BVX1I5X09GRlNFVCArIHJicF0KKyAgICBtb3YgcjEwLCBbUFJPQkVfQ1BV X1IxMF9PRkZTRVQgKyByYnBdCisgICAgbW92IHIxMSwgW1BST0JFX0NQVV9SMTFfT0ZGU0VUICsg cmJwXQorICAgIG1vdiByMTIsIFtQUk9CRV9DUFVfUjEyX09GRlNFVCArIHJicF0KKyAgICBtb3Yg cjEzLCBbUFJPQkVfQ1BVX1IxM19PRkZTRVQgKyByYnBdCisgICAgbW92IHIxNCwgW1BST0JFX0NQ VV9SMTRfT0ZGU0VUICsgcmJwXQorICAgIG1vdiByMTUsIFtQUk9CRV9DUFVfUjE1X09GRlNFVCAr IHJicF0KKworICAgIG1vdnEgeG1tMCwgcXdvcmQgcHRyW1BST0JFX0NQVV9YTU0wX09GRlNFVCAr IHJicF0KKyAgICBtb3ZxIHhtbTEsIHF3b3JkIHB0cltQUk9CRV9DUFVfWE1NMV9PRkZTRVQgKyBy YnBdCisgICAgbW92cSB4bW0yLCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTJfT0ZGU0VUICsgcmJw XQorICAgIG1vdnEgeG1tMywgcXdvcmQgcHRyW1BST0JFX0NQVV9YTU0zX09GRlNFVCArIHJicF0K KyAgICBtb3ZxIHhtbTQsIHF3b3JkIHB0cltQUk9CRV9DUFVfWE1NNF9PRkZTRVQgKyByYnBdCisg ICAgbW92cSB4bW01LCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTVfT0ZGU0VUICsgcmJwXQorICAg IG1vdnEgeG1tNiwgcXdvcmQgcHRyW1BST0JFX0NQVV9YTU02X09GRlNFVCArIHJicF0KKyAgICBt b3ZxIHhtbTcsIHF3b3JkIHB0cltQUk9CRV9DUFVfWE1NN19PRkZTRVQgKyByYnBdCisgICAgbW92 cSB4bW04LCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTThfT0ZGU0VUICsgcmJwXQorICAgIG1vdnEg eG1tOSwgcXdvcmQgcHRyW1BST0JFX0NQVV9YTU05X09GRlNFVCArIHJicF0KKyAgICBtb3ZxIHht bTEwLCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTEwX09GRlNFVCArIHJicF0KKyAgICBtb3ZxIHht bTExLCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTExX09GRlNFVCArIHJicF0KKyAgICBtb3ZxIHht bTEyLCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTEyX09GRlNFVCArIHJicF0KKyAgICBtb3ZxIHht bTEzLCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTEzX09GRlNFVCArIHJicF0KKyAgICBtb3ZxIHht bTE0LCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTE0X09GRlNFVCArIHJicF0KKyAgICBtb3ZxIHht bTE1LCBxd29yZCBwdHJbUFJPQkVfQ1BVX1hNTTE1X09GRlNFVCArIHJicF0KKworICAgIDsgVGhl cmUgYXJlIDYgbW9yZSByZWdpc3RlcnMgbGVmdCB0byByZXN0b3JlOgorICAgIDsgICAgIHJheCwg cmN4LCByYnAsIHJzcCwgcmlwLCBhbmQgcmZsYWdzLgorCisgICAgOyBUaGUgcmVzdG9yYXRpb24g cHJvY2VzcyBhdCBjdGlNYXNtUHJvYmVUcmFtcG9saW5lRW5kIGJlbG93IHdvcmtzIGJ5IHBvcHBp bmcKKyAgICA7IDUgd29yZHMgb2ZmIHRoZSBzdGFjayBpbnRvIHJmbGFncywgcmF4LCByY3gsIHJi cCwgYW5kIHJpcC4gVGhlc2UgNSB3b3JkcyBuZWVkCisgICAgOyB0byBiZSBwdXNoZWQgb24gdG9w IG9mIHRoZSBmaW5hbCBlc3AgdmFsdWUgc28gdGhhdCBqdXN0IGJ5IHBvcHBpbmcgdGhlIDUgd29y ZHMsCisgICAgOyB3ZSdsbCBnZXQgdGhlIGVzcCB0aGF0IHRoZSBwcm9iZSB3YW50cyB0byBzZXQu IExldCdzIGNhbGwgdGhpcyBhcmVhIChmb3Igc3RvcmluZworICAgIDsgdGhlc2UgNSB3b3Jkcykg dGhlIHJlc3RvcmUgYXJlYS4KKyAgICBtb3YgcmN4LCBbUFJPQkVfQ1BVX0VTUF9PRkZTRVQgKyBy YnBdCisgICAgc3ViIHJjeCwgNSAqIFBUUl9TSVpFCisKKyAgICA7IHJjeCBub3cgcG9pbnRzIHRv IHRoZSByZXN0b3JlIGFyZWEuCisKKyAgICA7IENvcHkgcmVtYWluaW5nIHJlc3RvcmUgdmFsdWVz IGZyb20gdGhlIFByb2JlQ29udGV4dCB0byB0aGUgcmVzdG9yZSBhcmVhLgorICAgIDsgTm90ZTog V2UgYWxyZWFkeSBlbnN1cmVkIGFib3ZlIHRoYXQgdGhlIFByb2JlQ29udGV4dCBpcyBpbiBhIHNh ZmUgbG9jYXRpb24gYmVmb3JlCisgICAgOyBjYWxsaW5nIHRoZSBpbml0aWFsaXplU3RhY2tGdW5j dGlvbi4gVGhlIGluaXRpYWxpemVTdGFja0Z1bmN0aW9uIGlzIG5vdCBhbGxvd2VkIHRvCisgICAg OyBjaGFuZ2UgdGhlIHN0YWNrIHBvaW50ZXIgYWdhaW4uCisgICAgbW92IHJheCwgW1BST0JFX0NQ VV9FRkxBR1NfT0ZGU0VUICsgcmJwXQorICAgIG1vdiBbMCAqIFBUUl9TSVpFICsgcmN4XSwgcmF4 CisgICAgbW92IHJheCwgW1BST0JFX0NQVV9FQVhfT0ZGU0VUICsgcmJwXQorICAgIG1vdiBbMSAq IFBUUl9TSVpFICsgcmN4XSwgcmF4CisgICAgbW92IHJheCwgW1BST0JFX0NQVV9FQ1hfT0ZGU0VU ICsgcmJwXSAKKyAgICBtb3YgWzIgKiBQVFJfU0laRSArIHJjeF0sIHJheAorICAgIG1vdiByYXgs IFtQUk9CRV9DUFVfRUJQX09GRlNFVCArIHJicF0KKyAgICBtb3YgWzMgKiBQVFJfU0laRSArIHJj eF0sIHJheAorICAgIG1vdiByYXgsIFtQUk9CRV9DUFVfRUlQX09GRlNFVCArIHJicF0KKyAgICBt b3YgWzQgKiBQVFJfU0laRSArIHJjeF0sIHJheAorICAgIG1vdiByc3AsIHJjeAorCisgICAgOyBE byB0aGUgcmVtYWluaW5nIHJlc3RvcmF0aW9uIGJ5IHBvcHBpbmcgb2ZmIHRoZSByZXN0b3JlIGFy ZWEuCisgICAgcG9wZnEKKyAgICBwb3AgcmF4CisgICAgcG9wIHJjeAorICAgIHBvcCByYnAKKyAg ICByZXQKK2N0aU1hc21Qcm9iZVRyYW1wb2xpbmUgRU5EUAorCiBfVEVYVCAgIEVORFMKIAogRU5E CkluZGV4OiBTb3VyY2UvV1RGL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL0No YW5nZUxvZwkocmV2aXNpb24gMjIxMDEwKQorKysgU291cmNlL1dURi9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wOC0yMiAgUGVyIEFybmUgVm9sbGFuICA8 cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wbGVtZW50IDY0LWJpdCBNYWNyb0Fzc2Vt Ymxlcjo6cHJvYmUgc3VwcG9ydCBmb3IgV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTcyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBtYXNtIHByb2JlIGFuZCBERkcuCisKKyAg ICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKwogMjAxNy0wOC0yMSAgTWFyayBMYW0gIDxtYXJrLmxh bUBhcHBsZS5jb20+CiAKICAgICAgICAgW0ZvbGxvdyB1cF06IEFkZCBiYWNrIHRoZSBhYmlsaXR5 IHRvIGRpc2FibGUgTUFTTV9QUk9CRSBmcm9tIHRoZSBidWlsZC4KSW5kZXg6IFNvdXJjZS9XVEYv d3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAko cmV2aXNpb24gMjIxMDEwKQorKysgU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAkod29ya2luZyBj b3B5KQpAQCAtNzgzLDcgKzc4Myw3IEBACiAKICNpZiAhZGVmaW5lZChFTkFCTEVfREZHX0pJVCkg JiYgRU5BQkxFKEpJVCkKIC8qIEVuYWJsZSB0aGUgREZHIEpJVCBvbiBYODYgYW5kIFg4Nl82NC4g Ki8KLSNpZiAoQ1BVKFg4NikgfHwgQ1BVKFg4Nl82NCkpICYmIChPUyhEQVJXSU4pIHx8IE9TKExJ TlVYKSB8fCBPUyhGUkVFQlNEKSB8fCBPUyhIVVJEKSkKKyNpZiAoQ1BVKFg4NikgfHwgQ1BVKFg4 Nl82NCkpICYmIChPUyhEQVJXSU4pIHx8IE9TKExJTlVYKSB8fCBPUyhGUkVFQlNEKSB8fCBPUyhI VVJEKSB8fCBPUyhXSU5ET1dTKSkKICNkZWZpbmUgRU5BQkxFX0RGR19KSVQgMQogI2VuZGlmCiAv KiBFbmFibGUgdGhlIERGRyBKSVQgb24gQVJNdjcuICBPbmx5IHRlc3RlZCBvbiBpT1MgYW5kIEdU SysvV1BFIExpbnV4LiAqLwpAQCAtNzk3LDEyICs3OTcsNiBAQAogLyogRklYTUU6IE1JUFMgY2Fu bm90IGVuYWJsZSB0aGUgREZHIHVudGlsIGl0IGhhcyBzdXBwb3J0IGZvciBNYWNyb0Fzc2VtYmxl cjo6cHJvYmUoKS4KICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzU0NDcKICovCi0vKiBGSVhNRTogV2luNjQgY2Fubm90IGVuYWJsZSB0aGUgREZHIHVudGlsIGl0 IGhhcyBzdXBwb3J0IGZvciBNYWNyb0Fzc2VtYmxlcjo6cHJvYmUoKS4KLSAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU3MjQKLSovCi0jaWYgQ1BVKFg4NikgJiYg T1MoV0lORE9XUykKLSNkZWZpbmUgRU5BQkxFX0RGR19KSVQgMQotI2VuZGlmCiAjZW5kaWYKIAog LyogQ29uY3VycmVudCBKUyBvbmx5IHdvcmtzIG9uIDY0LWJpdCBwbGF0Zm9ybXMgYmVjYXVzZSBp dCByZXF1aXJlcyB0aGF0CkBAIC04MjcsNyArODIxLDcgQEAKICNkZWZpbmUgRU5BQkxFX01BU01f UFJPQkUgMAogI2VuZGlmCiAKLSNpZiAhRU5BQkxFKEpJVCkgfHwgT1MoV0lORE9XUykKKyNpZiAh RU5BQkxFKEpJVCkKICN1bmRlZiBFTkFCTEVfTUFTTV9QUk9CRQogI2RlZmluZSBFTkFCTEVfTUFT TV9QUk9CRSAwCiAjZW5kaWYK