31151 2009-11-04 20:51:18 -0800 Fix branchDouble behaviour on ARM THUMB2 JIT. 2009-11-04 21:02:22 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough loki zherczeg oldest_to_newest 160710 0 barraclough 2009-11-04 20:51:18 -0800 The ARMv7 JIT is currently using ARMv7Assembler::ConditionEQ to branch for DoubleEqualOrUnordered, however this is incorrect – ConditionEQ won't branch on unordered operands. Similarly, DoubleLessThanOrUnordered & DoubleLessThanOrEqualOrUnordered use ARMv7Assembler::ConditionLO & ARMv7Assembler::ConditionLS, whereas they should be using ARMv7Assembler::ConditionLT & ARMv7Assembler::ConditionLE. As a consequence, the JIT may currently incorrectly branch on double comparisons to NaN, for example, "if (Number.NaN < 0) print("Oh noes it isn't!");" Fix these, and fill out the missing DoubleConditions. 160711 1 42541 barraclough 2009-11-04 20:54:13 -0800 Created attachment 42541 The patch 160713 2 barraclough 2009-11-04 21:02:22 -0800 Sending JavaScriptCore/ChangeLog Sending JavaScriptCore/assembler/MacroAssemblerARMv7.h Transmitting file data .. Committed revision 50541. 42541 2009-11-04 20:54:13 -0800 2009-11-04 20:56:03 -0800 The patch patch.branchDoubarm.txt text/plain 3862 barraclough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNTQwKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMDQgIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMTE1MQorICAgICAgICBGaXggYnJhbmNoRG91YmxlIGJlaGF2aW91ciBvbiBB Uk0gVEhVTUIyIEpJVC4KKworICAgICAgICBUaGUgQVJNdjcgSklUIGlzIGN1cnJlbnRseSB1c2lu ZyBBUk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uRVEgdG8gYnJhbmNoCisgICAgICAgIGZvciBEb3Vi bGVFcXVhbE9yVW5vcmRlcmVkLCBob3dldmVyIHRoaXMgaXMgaW5jb3JyZWN0IOKAkyBDb25kaXRp b25FUSB3b24ndAorICAgICAgICBicmFuY2ggb24gdW5vcmRlcmVkIG9wZXJhbmRzLiAgU2ltaWxh cmx5LCBEb3VibGVMZXNzVGhhbk9yVW5vcmRlcmVkICYKKyAgICAgICAgRG91YmxlTGVzc1RoYW5P ckVxdWFsT3JVbm9yZGVyZWQgdXNlIEFSTXY3QXNzZW1ibGVyOjpDb25kaXRpb25MTyAmCisgICAg ICAgIEFSTXY3QXNzZW1ibGVyOjpDb25kaXRpb25MUywgd2hlcmVhcyB0aGV5IHNob3VsZCBiZSB1 c2luZworICAgICAgICBBUk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uTFQgJiBBUk12N0Fzc2VtYmxl cjo6Q29uZGl0aW9uTEUuCisKKyAgICAgICAgRml4IHRoZXNlLCBhbmQgZmlsbCBvdXQgdGhlIG1p c3NpbmcgRG91YmxlQ29uZGl0aW9ucy4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTXY3Lmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNdjc6Oik6CisgICAg ICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNdjc6OmJyYW5jaERvdWJsZSk6CisKIDIwMDktMTEt MDQgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAg IFJ1YmJlciBTdGFtcGVkIGJ5IE9saXZlciBIdW50LgpJbmRleDogSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNdjcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29y ZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk12Ny5oCShyZXZpc2lvbiA1MDUzNikKKysrIEph dmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTXY3LmgJKHdvcmtpbmcgY29w eSkKQEAgLTkzLDEzICs5MywyMSBAQCBwdWJsaWM6CiAgICAgICAgIFplcm8gPSBBUk12N0Fzc2Vt Ymxlcjo6Q29uZGl0aW9uRVEsCiAgICAgICAgIE5vblplcm8gPSBBUk12N0Fzc2VtYmxlcjo6Q29u ZGl0aW9uTkUKICAgICB9OwotCiAgICAgZW51bSBEb3VibGVDb25kaXRpb24gewotICAgICAgICBE b3VibGVFcXVhbE9yVW5vcmRlcmVkID0gQVJNdjdBc3NlbWJsZXI6OkNvbmRpdGlvbkVRLAorICAg ICAgICAvLyBUaGVzZSBjb25kaXRpb25zIHdpbGwgb25seSBldmFsdWF0ZSB0byB0cnVlIGlmIHRo ZSBjb21wYXJpc29uIGlzIG9yZGVyZWQgLSBpLmUuIG5laXRoZXIgb3BlcmFuZCBpcyBOYU4uCisg ICAgICAgIERvdWJsZUVxdWFsID0gQVJNdjdBc3NlbWJsZXI6OkNvbmRpdGlvbkVRLAorICAgICAg ICBEb3VibGVOb3RFcXVhbCA9IEFSTXY3QXNzZW1ibGVyOjpDb25kaXRpb25WQywgLy8gTm90IHRo ZSByaWdodCBmbGFnISBjaGVjayBmb3IgdGhpcyAmIGhhbmRsZSBkaWZmZXJlbnRseS4KICAgICAg ICAgRG91YmxlR3JlYXRlclRoYW4gPSBBUk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uR1QsCiAgICAg ICAgIERvdWJsZUdyZWF0ZXJUaGFuT3JFcXVhbCA9IEFSTXY3QXNzZW1ibGVyOjpDb25kaXRpb25H RSwKLSAgICAgICAgRG91YmxlTGVzc1RoYW5PclVub3JkZXJlZCA9IEFSTXY3QXNzZW1ibGVyOjpD b25kaXRpb25MTywKLSAgICAgICAgRG91YmxlTGVzc1RoYW5PckVxdWFsT3JVbm9yZGVyZWQgPSBB Uk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uTFMsCisgICAgICAgIERvdWJsZUxlc3NUaGFuID0gQVJN djdBc3NlbWJsZXI6OkNvbmRpdGlvbkxPLAorICAgICAgICBEb3VibGVMZXNzVGhhbk9yRXF1YWwg PSBBUk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uTFMsCisgICAgICAgIC8vIElmIGVpdGhlciBvcGVy YW5kIGlzIE5hTiwgdGhlc2UgY29uZGl0aW9ucyBhbHdheXMgZXZhbHVhdGUgdG8gdHJ1ZS4KKyAg ICAgICAgRG91YmxlRXF1YWxPclVub3JkZXJlZCA9IEFSTXY3QXNzZW1ibGVyOjpDb25kaXRpb25W UywgLy8gTm90IHRoZSByaWdodCBmbGFnISBjaGVjayBmb3IgdGhpcyAmIGhhbmRsZSBkaWZmZXJl bnRseS4KKyAgICAgICAgRG91YmxlTm90RXF1YWxPclVub3JkZXJlZCA9IEFSTXY3QXNzZW1ibGVy OjpDb25kaXRpb25ORSwKKyAgICAgICAgRG91YmxlR3JlYXRlclRoYW5PclVub3JkZXJlZCA9IEFS TXY3QXNzZW1ibGVyOjpDb25kaXRpb25ISSwKKyAgICAgICAgRG91YmxlR3JlYXRlclRoYW5PckVx dWFsT3JVbm9yZGVyZWQgPSBBUk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uSFMsCisgICAgICAgIERv dWJsZUxlc3NUaGFuT3JVbm9yZGVyZWQgPSBBUk12N0Fzc2VtYmxlcjo6Q29uZGl0aW9uTFQsCisg ICAgICAgIERvdWJsZUxlc3NUaGFuT3JFcXVhbE9yVW5vcmRlcmVkID0gQVJNdjdBc3NlbWJsZXI6 OkNvbmRpdGlvbkxFLAogICAgIH07CiAKICAgICBzdGF0aWMgY29uc3QgUmVnaXN0ZXJJRCBzdGFj a1BvaW50ZXJSZWdpc3RlciA9IEFSTVJlZ2lzdGVyczo6c3A7CkBAIC01MzEsNiArNTM5LDIzIEBA IHB1YmxpYzoKICAgICB7CiAgICAgICAgIG1fYXNzZW1ibGVyLnZjbXBfRjY0KGxlZnQsIHJpZ2h0 KTsKICAgICAgICAgbV9hc3NlbWJsZXIudm1yc19BUFNSX256Y3ZfRlBTQ1IoKTsKKworICAgICAg ICBpZiAoY29uZCA9PSBEb3VibGVOb3RFcXVhbCkgeworICAgICAgICAgICAgLy8gQ29uZGl0aW9u TkUganVtcHMgaWYgTm90RXF1YWwgKm9yKiB1bm9yZGVyZWQgLSBmb3JjZSB0aGUgdW5vcmRlcmVk IGNhc2VzIG5vdCB0byBqdW1wLgorICAgICAgICAgICAgSnVtcCB1bm9yZGVyZWQgPSBtYWtlQnJh bmNoKEFSTXY3QXNzZW1ibGVyOjpDb25kaXRpb25WUyk7CisgICAgICAgICAgICBKdW1wIHJlc3Vs dCA9IG1ha2VCcmFuY2goQVJNdjdBc3NlbWJsZXI6OkNvbmRpdGlvbk5FKTsKKyAgICAgICAgICAg IHVub3JkZXJlZC5saW5rKHRoaXMpOworICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICAg ICAgfQorICAgICAgICBpZiAoY29uZCA9PSBEb3VibGVFcXVhbE9yVW5vcmRlcmVkKSB7CisgICAg ICAgICAgICBKdW1wIHVub3JkZXJlZCA9IG1ha2VCcmFuY2goQVJNdjdBc3NlbWJsZXI6OkNvbmRp dGlvblZTKTsKKyAgICAgICAgICAgIEp1bXAgbm90RXF1YWwgPSBtYWtlQnJhbmNoKEFSTXY3QXNz ZW1ibGVyOjpDb25kaXRpb25ORSk7CisgICAgICAgICAgICB1bm9yZGVyZWQubGluayh0aGlzKTsK KyAgICAgICAgICAgIC8vIFdlIGdldCBoZXJlIGlmIGVpdGhlciB1bm9yZGVyZWQsIG9yIGVxdWFs LgorICAgICAgICAgICAgSnVtcCByZXN1bHQgPSBtYWtlSnVtcCgpOworICAgICAgICAgICAgbm90 RXF1YWwubGluayh0aGlzKTsKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuIG1ha2VCcmFuY2goY29uZCk7CiAgICAgfQogCg==