51866 2011-01-03 21:14:29 -0800 Use __builtin_expect when compiling using RVCT in GNU mode 2011-01-10 16:52:01 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 dbates s.mathur commit-queue joybro201 koshuin laszlo.gombos skyul s.mathur webkit.review.bot oldest_to_newest 328889 0 dbates 2011-01-03 21:14:29 -0800 When in GNU mode, RVCT supports the GNU language intrinsic __builtin_expect, which is used to provide the compiler with branch prediction information. We should favor using this intrinsic if we are compiling with RVCT in GNU mode (i.e. COMPILER(RVCT) && defined(__GNUC__)). 328890 1 77867 dbates 2011-01-03 21:20:05 -0800 Created attachment 77867 Patch 328892 2 77867 darin 2011-01-03 21:29:07 -0800 Comment on attachment 77867 Patch OK 329005 3 laszlo.gombos 2011-01-04 08:47:33 -0800 Looks good to me too. A simpler way to express this is to test for defined(__GNUC__), instead of "COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__))". 329021 4 dbates 2011-01-04 09:31:00 -0800 (In reply to comment #3) > Looks good to me too. A simpler way to express this is to test for defined(__GNUC__), instead of "COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__))". Will change before I land. 329026 5 dbates 2011-01-04 09:44:51 -0800 Committed r74973: <http://trac.webkit.org/changeset/74973> 331816 6 78423 s.mathur 2011-01-10 12:08:33 -0800 Created attachment 78423 Exclude RVCT2.2 from using this intrinsic According to ARM's documentation (http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0202h/Cjabddedbde.html), this GNU-style intrinsic is only available with RVCT 3 and later , so exclude previous major version from using it. 331820 7 78425 s.mathur 2011-01-10 12:11:20 -0800 Created attachment 78425 Same patch as above, but with Changelog format issue corrected. 331916 8 78425 eric 2011-01-10 13:50:40 -0800 Comment on attachment 78425 Same patch as above, but with Changelog format issue corrected. rs=me. 331917 9 77867 eric 2011-01-10 13:51:19 -0800 Comment on attachment 77867 Patch I'm confused by the status of this bug. Did this get landed? 331931 10 s.mathur 2011-01-10 14:03:14 -0800 (In reply to comment #9) > (From update of attachment 77867 [details]) > I'm confused by the status of this bug. Did this get landed? Sorry Eric for the confusion. I reopened a previously closed bug (manually landed by Daniel Bates) to add an amendment, which you just r+ed. 331950 11 78425 dbates 2011-01-10 14:36:20 -0800 Comment on attachment 78425 Same patch as above, but with Changelog format issue corrected. Why are we hardcoding __ARMCC_2_2__ instead of checking __ARMCC_VERSION >= 300000? 331953 12 dbates 2011-01-10 14:37:49 -0800 (In reply to comment #11) > (From update of attachment 78425 [details]) > Why are we hardcoding __ARMCC_2_2__ instead of checking __ARMCC_VERSION >= 300000? I mean checking that __ARMCC_VERSION <= 300000 331976 13 dbates 2011-01-10 15:05:33 -0800 (In reply to comment #12) > (In reply to comment #11) > > (From update of attachment 78425 [details] [details]) > > Why are we hardcoding __ARMCC_2_2__ instead of checking __ARMCC_VERSION >= 300000? > > I mean checking that __ARMCC_VERSION <= 300000 Disregard this comment. The inequality in the previous comment (comment 11) was correct. That is, we should change the check from: #if defined(__GNUC__) to #if COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__) && __ARMCC_VERSION >= 300000) so that we only use __builtin_expect if we are compiling with GCC or compiling with RVCT version 3.0 or higher in GNU mode. 331999 14 78461 dbates 2011-01-10 15:37:35 -0800 Created attachment 78461 Patch 332002 15 webkit.review.bot 2011-01-10 15:39:40 -0800 Attachment 78461 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/wtf/Platform.h:1016: Missing space after , [whitespace/comma] [3] Source/JavaScriptCore/wtf/AlwaysInline.h:44: Missing space after , [whitespace/comma] [3] Source/JavaScriptCore/wtf/AlwaysInline.h:52: Missing space after , [whitespace/comma] [3] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 332003 16 78461 darin 2011-01-10 15:40:35 -0800 Comment on attachment 78461 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78461&action=review > Source/JavaScriptCore/wtf/Platform.h:79 > +/* Define this for !RVCT compilers, just so we can write things like COMPILER(RVCT) && RVCT_VERSION_AT_LEAST(3,0,0,0). */ It occurs to me that this means that you could always just use RVCT_VERSION_AT_LEAST(3,0,0,0) without COMPILER(RVCT); maybe we should. > Source/JavaScriptCore/wtf/Platform.h:91 > -/* define this for !GCC compilers, just so we can write things like COMPILER(GCC) && GCC_VERSION_AT_LEAST(4,1,0) */ > +/* Define this for !GCC compilers, just so we can write things like COMPILER(GCC) && GCC_VERSION_AT_LEAST(4,1,0). */ > #define GCC_VERSION_AT_LEAST(major, minor, patch) 0 It occurs to me that this means that you could always just use GCC_VERSION_AT_LEAST(3,0,0,0) without COMPILER(GCC); maybe we should. 332021 17 dbates 2011-01-10 16:03:44 -0800 (In reply to comment #16) > (From update of attachment 78461 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=78461&action=review > > > Source/JavaScriptCore/wtf/Platform.h:79 > > +/* Define this for !RVCT compilers, just so we can write things like COMPILER(RVCT) && RVCT_VERSION_AT_LEAST(3,0,0,0). */ > > It occurs to me that this means that you could always just use RVCT_VERSION_AT_LEAST(3,0,0,0) without COMPILER(RVCT); maybe we should. Correct. Will change both comment and callsites before landing. > > > Source/JavaScriptCore/wtf/Platform.h:91 > > -/* define this for !GCC compilers, just so we can write things like COMPILER(GCC) && GCC_VERSION_AT_LEAST(4,1,0) */ > > +/* Define this for !GCC compilers, just so we can write things like COMPILER(GCC) && GCC_VERSION_AT_LEAST(4,1,0). */ > > #define GCC_VERSION_AT_LEAST(major, minor, patch) 0 > > It occurs to me that this means that you could always just use GCC_VERSION_AT_LEAST(3,0,0,0) without COMPILER(GCC); maybe we should. Correct. Will change comment before landing. I suggest that we update the callsites in a separate bug. 332030 18 dbates 2011-01-10 16:18:21 -0800 Committed r75447: <http://trac.webkit.org/changeset/75447> 332048 19 dbates 2011-01-10 16:52:01 -0800 (In reply to comment #17) > (In reply to comment #16) > > It occurs to me that this means that you could always just use GCC_VERSION_AT_LEAST(3,0,0,0) without COMPILER(GCC); maybe we should. > > Correct. Will change comment before landing. I suggest that we update the callsites in a separate bug. Filed bug #52178 for this and decided to make the comment change in the patch for this bug. 77867 2011-01-03 21:20:05 -0800 2011-01-10 13:51:18 -0800 Patch Bug51866.patch text/plain 1239 dbates SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzQ5NTQpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTEtMDEtMDMgIERhbmllbCBCYXRlcyAgPGRiYXRlc0ByaW0uY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBfX2J1aWx0aW5fZXhwZWN0 IHdoZW4gY29tcGlsaW5nIHVzaW5nIFJWQ1QgaW4gR05VIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxODY2CisKKyAgICAgICAgRGVyaXZlZCBm cm9tIGEgcGF0Y2ggYnkgRGF2ZSBUYXB1c2thLgorCisgICAgICAgICogd3RmL0Fsd2F5c0lubGlu ZS5oOgorCiAyMDExLTAxLTAzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBCcmFkeSBFaWRzb24uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvd3RmL0Fsd2F5c0lubGluZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS93dGYvQWx3YXlzSW5saW5lLmgJKHJldmlzaW9uIDc0ODk2KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3d0Zi9BbHdheXNJbmxpbmUuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBA QAogI2VuZGlmCiAKICNpZm5kZWYgVU5MSUtFTFkKLSNpZiBDT01QSUxFUihHQ0MpCisjaWYgQ09N UElMRVIoR0NDKSB8fCAoQ09NUElMRVIoUlZDVCkgJiYgZGVmaW5lZChfX0dOVUNfXykpCiAjZGVm aW5lIFVOTElLRUxZKHgpIF9fYnVpbHRpbl9leHBlY3QoKHgpLCAwKQogI2Vsc2UKICNkZWZpbmUg VU5MSUtFTFkoeCkgKHgpCkBAIC00OSw3ICs0OSw3IEBACiAjZW5kaWYKIAogI2lmbmRlZiBMSUtF TFkKLSNpZiBDT01QSUxFUihHQ0MpCisjaWYgQ09NUElMRVIoR0NDKSB8fCAoQ09NUElMRVIoUlZD VCkgJiYgZGVmaW5lZChfX0dOVUNfXykpCiAjZGVmaW5lIExJS0VMWSh4KSBfX2J1aWx0aW5fZXhw ZWN0KCh4KSwgMSkKICNlbHNlCiAjZGVmaW5lIExJS0VMWSh4KSAoeCkK 78423 2011-01-10 12:08:33 -0800 2011-01-10 12:11:20 -0800 Exclude RVCT2.2 from using this intrinsic 51866_sm.patch text/plain 1183 s.mathur SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvQWx3YXlzSW5saW5lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9BbHdheXNJbmxpbmUuaAkocmV2aXNpb24g NzUzODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0Fsd2F5c0lubGluZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00MSw3ICs0MSw3IEBACiAjZW5kaWYKIAogI2lmbmRlZiBVTkxJS0VMWQot I2lmIGRlZmluZWQoX19HTlVDX18pCisjaWYgZGVmaW5lZChfX0dOVUNfXykgJiYgIWRlZmluZWQo X19BUk1DQ18yXzJfXykKICNkZWZpbmUgVU5MSUtFTFkoeCkgX19idWlsdGluX2V4cGVjdCgoeCks IDApCiAjZWxzZQogI2RlZmluZSBVTkxJS0VMWSh4KSAoeCkKQEAgLTQ5LDcgKzQ5LDcgQEAKICNl bmRpZgogCiAjaWZuZGVmIExJS0VMWQotI2lmIGRlZmluZWQoX19HTlVDX18pCisjaWYgZGVmaW5l ZChfX0dOVUNfXykgJiYgIWRlZmluZWQoX19BUk1DQ18yXzJfXykKICNkZWZpbmUgTElLRUxZKHgp IF9fYnVpbHRpbl9leHBlY3QoKHgpLCAxKQogI2Vsc2UKICNkZWZpbmUgTElLRUxZKHgpICh4KQpJ bmRleDogU291cmNlL0phdmFzY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YXNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NTM4MykKKysrIFNvdXJjZS9K YXZhc2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAor MjAxMS0wMS0xMCAgU2lkZGhhcnRoIE1hdGh1ciAgPHNpZGRoYXJ0aC5tYXRodXJAbm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBf X2J1aWx0aW5fZXhwZWN0IGZvciBSVkNUIDMgYW5kIGhpZ2hlciBvbmx5CisJaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxODY2CisKKyAgICAgICAgKiB3dGYvQWx3YXlz SW5saW5lLmg6CisKIDIwMTEtMDEtMDggIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCg== 78425 2011-01-10 12:11:20 -0800 2011-01-10 15:37:35 -0800 Same patch as above, but with Changelog format issue corrected. 51866_sm.patch text/plain 1190 s.mathur SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvQWx3YXlzSW5saW5lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9BbHdheXNJbmxpbmUuaAkocmV2aXNpb24g NzUzODEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0Fsd2F5c0lubGluZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00MSw3ICs0MSw3IEBACiAjZW5kaWYKIAogI2lmbmRlZiBVTkxJS0VMWQot I2lmIGRlZmluZWQoX19HTlVDX18pCisjaWYgZGVmaW5lZChfX0dOVUNfXykgJiYgIWRlZmluZWQo X19BUk1DQ18yXzJfXykKICNkZWZpbmUgVU5MSUtFTFkoeCkgX19idWlsdGluX2V4cGVjdCgoeCks IDApCiAjZWxzZQogI2RlZmluZSBVTkxJS0VMWSh4KSAoeCkKQEAgLTQ5LDcgKzQ5LDcgQEAKICNl bmRpZgogCiAjaWZuZGVmIExJS0VMWQotI2lmIGRlZmluZWQoX19HTlVDX18pCisjaWYgZGVmaW5l ZChfX0dOVUNfXykgJiYgIWRlZmluZWQoX19BUk1DQ18yXzJfXykKICNkZWZpbmUgTElLRUxZKHgp IF9fYnVpbHRpbl9leHBlY3QoKHgpLCAxKQogI2Vsc2UKICNkZWZpbmUgTElLRUxZKHgpICh4KQpJ bmRleDogU291cmNlL0phdmFzY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YXNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NTM4MykKKysrIFNvdXJjZS9K YXZhc2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAor MjAxMS0wMS0xMCAgU2lkZGhhcnRoIE1hdGh1ciAgPHNpZGRoYXJ0aC5tYXRodXJAbm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBf X2J1aWx0aW5fZXhwZWN0IGZvciBSVkNUIDMgYW5kIGhpZ2hlciBvbmx5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTg2NgorCisgICAgICAgICogd3Rm L0Fsd2F5c0lubGluZS5oOgorCiAyMDExLTAxLTA4ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9n YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgo= 78461 2011-01-10 15:37:35 -0800 2011-01-10 15:40:35 -0800 Patch Bug51866_1.patch text/plain 3497 dbates SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzU0NDEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAK KzIwMTEtMDEtMTAgIERhbmllbCBCYXRlcyAgPGRiYXRlc0ByaW0uY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBfX2J1aWx0aW5fZXhwZWN0 IHdoZW4gY29tcGlsaW5nIHVzaW5nIFJWQ1QgaW4gR05VIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxODY2CisKKyAgICAgICAgV2Ugc2hvdWxk IG9ubHkgdXNlIF9fYnVpbHRpbl9leHBlY3QgaWYgd2UgYXJlIGNvbXBpbGluZyB3aXRoIEdDQyBv ciBSVkNUIDMgb3IgaGlnaGVyIGluIEdOVSBtb2RlCisgICAgICAgIGFzIHBvaW50ZWQgb3V0IGJ5 IFNpZGRoYXJ0aCBNYXRodXIgcGVyIDxodHRwOi8vaW5mb2NlbnRlci5hcm0uY29tL2hlbHAvaW5k ZXguanNwP3RvcGljPS9jb20uYXJtLmRvYy5kdWkwMjAyaC9DamFiZGRlZGJkZS5odG1sPi4KKwor ICAgICAgICAqIHd0Zi9BbHdheXNJbmxpbmUuaDoKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDog UmVtb3ZlZCBkZWZpbmUgV1RGX0NPTVBJTEVSX1JWQ1Q0X09SX0dSRUFURVIuIEluc3RlYWQgYWRk ZWQgbWFjcm8KKyAgICAgICAgZnVuY3Rpb24gUlZDVF9WRVJTSU9OX0FUX0xFQVNUIHNvIHRoYXQg d2UgY2FuIHRlc3QgZm9yIGFuIGFyYml0cmFyeSBtaW5pbXVtIFJWQ1QKKyAgICAgICAgdmVyc2lv bi4gQWxzbywgbWFkZSB0aGUgY29tbWVudCBhYm92ZSB0aGUgI2RlZmluZSBHQ0NfVkVSU0lPTl9B VF9MRUFTVCguLi4pIGEgZnVsbCBzZW50ZW5jZS4KKwogMjAxMS0wMS0xMCAgWGFuIExvcGV6ICA8 eGxvcGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2F2aW4gQmFycmFjbG91 Z2guCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0Fsd2F5c0lubGluZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvQWx3YXlzSW5saW5lLmgJKHJldmlz aW9uIDc1NDI4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9BbHdheXNJbmxpbmUuaAko d29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQAogI2VuZGlmCiAKICNpZm5kZWYgVU5MSUtF TFkKLSNpZiBkZWZpbmVkKF9fR05VQ19fKQorI2lmIENPTVBJTEVSKEdDQykgfHwgKENPTVBJTEVS KFJWQ1QpICYmIFJWQ1RfVkVSU0lPTl9BVF9MRUFTVCgzLDAsMCwwKSAmJiBkZWZpbmVkKF9fR05V Q19fKSkKICNkZWZpbmUgVU5MSUtFTFkoeCkgX19idWlsdGluX2V4cGVjdCgoeCksIDApCiAjZWxz ZQogI2RlZmluZSBVTkxJS0VMWSh4KSAoeCkKQEAgLTQ5LDcgKzQ5LDcgQEAKICNlbmRpZgogCiAj aWZuZGVmIExJS0VMWQotI2lmIGRlZmluZWQoX19HTlVDX18pCisjaWYgQ09NUElMRVIoR0NDKSB8 fCAoQ09NUElMRVIoUlZDVCkgJiYgUlZDVF9WRVJTSU9OX0FUX0xFQVNUKDMsMCwwLDApICYmIGRl ZmluZWQoX19HTlVDX18pKQogI2RlZmluZSBMSUtFTFkoeCkgX19idWlsdGluX2V4cGVjdCgoeCks IDEpCiAjZWxzZQogI2RlZmluZSBMSUtFTFkoeCkgKHgpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvd3RmL1BsYXRmb3JtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiA3NTQyOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS93dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtNzQsOSArNzQsMTAgQEAKIC8qIENP TVBJTEVSKFJWQ1Q0X09SX0dSRUFURVIpIC0gQVJNIFJlYWxWaWV3IENvbXBpbGF0aW9uIFRvb2xz IDQuMCBvciBncmVhdGVyICovCiAjaWYgZGVmaW5lZChfX0NDX0FSTSkgfHwgZGVmaW5lZChfX0FS TUNDX18pCiAjZGVmaW5lIFdURl9DT01QSUxFUl9SVkNUIDEKLSNpZiBfX0FSTUNDX1ZFUlNJT04g Pj0gNDAwMDAwCi0jZGVmaW5lIFdURl9DT01QSUxFUl9SVkNUNF9PUl9HUkVBVEVSIDEKLSNlbmRp ZgorI2RlZmluZSBSVkNUX1ZFUlNJT05fQVRfTEVBU1QobWFqb3IsIG1pbm9yLCBwYXRjaCwgYnVp bGQpIChfX0FSTUNDX1ZFUlNJT04gPj0gKG1ham9yICogMTAwMDAwICsgbWlub3IgKiAxMDAwMCAr IHBhdGNoICogMTAwMCArIGJ1aWxkKSkKKyNlbHNlCisvKiBEZWZpbmUgdGhpcyBmb3IgIVJWQ1Qg Y29tcGlsZXJzLCBqdXN0IHNvIHdlIGNhbiB3cml0ZSB0aGluZ3MgbGlrZSBDT01QSUxFUihSVkNU KSAmJiBSVkNUX1ZFUlNJT05fQVRfTEVBU1QoMywwLDAsMCkuICovCisjZGVmaW5lIFJWQ1RfVkVS U0lPTl9BVF9MRUFTVChtYWpvciwgbWlub3IsIHBhdGNoLCBidWlsZCkgMAogI2VuZGlmCiAKIC8q IENPTVBJTEVSKEdDQykgLSBHTlUgQ29tcGlsZXIgQ29sbGVjdGlvbiAqLwpAQCAtODYsNyArODcs NyBAQAogI2RlZmluZSBHQ0NfVkVSU0lPTiAoX19HTlVDX18gKiAxMDAwMCArIF9fR05VQ19NSU5P Ul9fICogMTAwICsgX19HTlVDX1BBVENITEVWRUxfXykKICNkZWZpbmUgR0NDX1ZFUlNJT05fQVRf TEVBU1QobWFqb3IsIG1pbm9yLCBwYXRjaCkgKEdDQ19WRVJTSU9OID49IChtYWpvciAqIDEwMDAw ICsgbWlub3IgKiAxMDAgKyBwYXRjaCkpCiAjZWxzZQotLyogZGVmaW5lIHRoaXMgZm9yICFHQ0Mg Y29tcGlsZXJzLCBqdXN0IHNvIHdlIGNhbiB3cml0ZSB0aGluZ3MgbGlrZSBDT01QSUxFUihHQ0Mp ICYmIEdDQ19WRVJTSU9OX0FUX0xFQVNUKDQsMSwwKSAqLworLyogRGVmaW5lIHRoaXMgZm9yICFH Q0MgY29tcGlsZXJzLCBqdXN0IHNvIHdlIGNhbiB3cml0ZSB0aGluZ3MgbGlrZSBDT01QSUxFUihH Q0MpICYmIEdDQ19WRVJTSU9OX0FUX0xFQVNUKDQsMSwwKS4gKi8KICNkZWZpbmUgR0NDX1ZFUlNJ T05fQVRfTEVBU1QobWFqb3IsIG1pbm9yLCBwYXRjaCkgMAogI2VuZGlmCiAKQEAgLTEwMTIsNyAr MTAxMyw3IEBACiAjZW5kaWYKIAogLyogQ29uZmlndXJlIHRoZSBpbnRlcnByZXRlciAqLwotI2lm IENPTVBJTEVSKEdDQykgfHwgKENPTVBJTEVSKFJWQ1Q0X09SX0dSRUFURVIpICYmIGRlZmluZWQo X19HTlVDX18pKQorI2lmIENPTVBJTEVSKEdDQykgfHwgKENPTVBJTEVSKFJWQ1QpICYmIFJWQ1Rf VkVSU0lPTl9BVF9MRUFTVCg0LDAsMCwwKSAmJiBkZWZpbmVkKF9fR05VQ19fKSkKICNkZWZpbmUg SEFWRV9DT01QVVRFRF9HT1RPIDEKICNlbmRpZgogI2lmIEhBVkUoQ09NUFVURURfR09UTykgJiYg RU5BQkxFKElOVEVSUFJFVEVSKQo=