104103 2012-12-05 02:02:12 -0800 Implement add64 for ARM traditional assembler after r136601 2012-12-12 00:01:40 -0800 1 1 1 Unclassified WebKit JavaScriptCore 420+ Unspecified Unspecified RESOLVED FIXED P2 Normal --- 102999 1 ossy webkit-unassigned barraclough cmarcelo fpizlo gaborb galpeter laszlo.gombos loki rgabor vivek.vg webkit.review.bot zherczeg oldest_to_newest 783544 0 ossy 2012-12-05 02:02:12 -0800 r136601 broke the ARM traditional build: /mnt/raptor2/slaves/qt5-linux-armv7-release/build/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp: In member function 'void JSC::DFG::SpeculativeJIT::compile(JSC::DFG::Node&)': /mnt/raptor2/slaves/qt5-linux-armv7-release/build/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp:5048:15: error: 'class JSC::DFG::JITCompiler' has no member named 'add64' It seems ARM traditional assembler needs add64. 783565 1 177706 gaborb 2012-12-05 02:29:15 -0800 Created attachment 177706 Fix 783568 2 177706 zherczeg 2012-12-05 02:33:17 -0800 Comment on attachment 177706 Fix good direction, but it is not finished. View in context: https://bugs.webkit.org/attachment.cgi?id=177706&action=review > Source/JavaScriptCore/assembler/MacroAssemblerARM.h:127 > + move(TrustedImmPtr(address.m_ptr), ARMRegisters::S0); > + load32(Address(ARMRegisters::S0), ARMRegisters::S1); > + add32(imm, ARMRegisters::S1); > + store32(ARMRegisters::S1, ARMRegisters::S0); This is actually the add32 version. You need to take care about the higher 32 bit with addc/subc. And you should use the adds directly (I know add32 now uses adds, but that may be go away. I mean I want it to go away :) ) 783713 3 177742 gaborb 2012-12-05 07:12:12 -0800 Created attachment 177742 Patch 784832 4 177742 zherczeg 2012-12-06 04:02:06 -0800 Comment on attachment 177742 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177742&action=review > Source/JavaScriptCore/assembler/MacroAssemblerARM.h:905 > + if (imm.m_value <= 0xff) > + m_assembler.adds(ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::getOp2Byte(imm.m_value)); > + else { > + m_assembler.adds(ARMRegisters::S0, ARMRegisters::S0, m_assembler.getImm(imm.m_value, ARMRegisters::S1)); > + move(TrustedImmPtr(address.m_ptr), ARMRegisters::S1); > + } This is not how we do at the moment. This should be a simple: m_assembler.adds(dest, dest, m_assembler.getImm(imm.m_value, ARMRegisters::S0)); 788323 5 178778 gaborb 2012-12-11 04:33:02 -0800 Created attachment 178778 Patch 789127 6 vivek.vg 2012-12-11 19:37:03 -0800 *** Bug 104085 has been marked as a duplicate of this bug. *** 789265 7 178778 zherczeg 2012-12-11 23:51:41 -0800 Comment on attachment 178778 Patch r=me 789271 8 178778 webkit.review.bot 2012-12-12 00:01:34 -0800 Comment on attachment 178778 Patch Clearing flags on attachment: 178778 Committed r137426: <http://trac.webkit.org/changeset/137426> 789272 9 webkit.review.bot 2012-12-12 00:01:40 -0800 All reviewed patches have been landed. Closing bug. 177706 2012-12-05 02:29:15 -0800 2012-12-05 07:12:12 -0800 Fix add64fix.patch text/plain 1520 gaborb ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDExZDE2ZTYuLjRmZDAwYjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTEyLTA1ICBHYWJvciBCYWxsYWJh cyAgPGdhYm9yYkBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgSW1wbGVtZW50IGFkZDY0IGZv ciBBUk0gdHJhZGl0aW9uYWwgYXNzZW1ibGVyIGFmdGVyIHIxMzY2MDEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDEwMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudGVkIGFkZCA2NCBmb3Ig QVJNIHRyYWRpdGlvbmFsIG1hY3JvYXNzZW1ibGVyLgorCisgICAgICAgICogYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyQVJNLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjphZGQ2 NCk6CisgICAgICAgIChNYWNyb0Fzc2VtYmxlckFSTSk6CisKIDIwMTItMTItMDQgIEZpbGlwIFBp emxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBkaXNwbGF5LXByb2ZpbGVyLW91dHB1 dCBzaG91bGQgYmUgYWJsZSB0byBzaG93IHNvdXJjZSBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJNLmgKaW5kZXggZTZiNWFkMy4u ZDUwNTZiMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNy b0Fzc2VtYmxlckFSTS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXJBUk0uaApAQCAtMTE5LDYgKzExOSwxNCBAQCBwdWJsaWM6CiAgICAgICAgIGFk ZDMyKEFSTVJlZ2lzdGVyczo6UzEsIGRlc3QpOwogICAgIH0KIAorICAgIHZvaWQgYWRkNjQoVHJ1 c3RlZEltbTMyIGltbSwgQWJzb2x1dGVBZGRyZXNzIGFkZHJlc3MpCisgICAgeworICAgICAgICBt b3ZlKFRydXN0ZWRJbW1QdHIoYWRkcmVzcy5tX3B0ciksIEFSTVJlZ2lzdGVyczo6UzApOworICAg ICAgICBsb2FkMzIoQWRkcmVzcyhBUk1SZWdpc3RlcnM6OlMwKSwgQVJNUmVnaXN0ZXJzOjpTMSk7 CisgICAgICAgIGFkZDMyKGltbSwgQVJNUmVnaXN0ZXJzOjpTMSk7CisgICAgICAgIHN0b3JlMzIo QVJNUmVnaXN0ZXJzOjpTMSwgQVJNUmVnaXN0ZXJzOjpTMCk7CisgICAgfQorCiAgICAgdm9pZCBh ZGQzMihSZWdpc3RlcklEIHNyYywgVHJ1c3RlZEltbTMyIGltbSwgUmVnaXN0ZXJJRCBkZXN0KQog ICAgIHsKICAgICAgICAgbV9hc3NlbWJsZXIuYWRkcyhkZXN0LCBzcmMsIG1fYXNzZW1ibGVyLmdl dEltbShpbW0ubV92YWx1ZSwgQVJNUmVnaXN0ZXJzOjpTMCkpOwo= 177742 2012-12-05 07:12:12 -0800 2012-12-11 04:33:02 -0800 Patch add64fix.patch text/plain 2421 gaborb ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDExZDE2ZTYuLmMxNzU4ODcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTEyLTA1ICBHYWJvciBCYWxsYWJh cyAgPGdhYm9yYkBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgSW1wbGVtZW50IGFkZDY0IGZv ciBBUk0gdHJhZGl0aW9uYWwgYXNzZW1ibGVyIGFmdGVyIHIxMzY2MDEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDEwMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudGVkIGFkZDY0IGZ1bmN0 aW9uIGZvIEFSTSB0cmFkaXRpb25hbCBtYWNyb2Fzc2VtYmxlci4KKworICAgICAgICAqIGFzc2Vt Ymxlci9NYWNyb0Fzc2VtYmxlckFSTS5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFS TTo6YWRkNjQpOgorICAgICAgICAoTWFjcm9Bc3NlbWJsZXJBUk0pOgorCiAyMDEyLTEyLTA0ICBG aWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgZGlzcGxheS1wcm9maWxl ci1vdXRwdXQgc2hvdWxkIGJlIGFibGUgdG8gc2hvdyBzb3VyY2UgY29kZQpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTS5oCmluZGV4IGU2 YjVhZDMuLmJjN2RhNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyQVJNLmgKQEAgLTg5Myw2ICs4OTMsMjYgQEAgcHVibGljOgogICAg ICAgICBtX2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJsZXI6OlN0b3JlVWludDMyLCBBUk1SZWdp c3RlcnM6OlMxLCBBUk1SZWdpc3RlcnM6OlMwLCAwKTsKICAgICB9CiAKKyAgICB2b2lkIGFkZDY0 KFRydXN0ZWRJbW0zMiBpbW0sIEFic29sdXRlQWRkcmVzcyBhZGRyZXNzKQorICAgIHsKKyAgICAg ICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MubV9wdHIpLCBBUk1SZWdpc3RlcnM6OlMxKTsK KyAgICAgICAgbV9hc3NlbWJsZXIuZHRyVXAoQVJNQXNzZW1ibGVyOjpMb2FkVWludDMyLCBBUk1S ZWdpc3RlcnM6OlMwLCBBUk1SZWdpc3RlcnM6OlMxLCAwKTsKKyAgICAgICAgaWYgKGltbS5tX3Zh bHVlIDw9IDB4ZmYpCisgICAgICAgICAgICBtX2Fzc2VtYmxlci5hZGRzKEFSTVJlZ2lzdGVyczo6 UzAsIEFSTVJlZ2lzdGVyczo6UzAsIEFSTUFzc2VtYmxlcjo6Z2V0T3AyQnl0ZShpbW0ubV92YWx1 ZSkpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZHMoQVJNUmVn aXN0ZXJzOjpTMCwgQVJNUmVnaXN0ZXJzOjpTMCwgbV9hc3NlbWJsZXIuZ2V0SW1tKGltbS5tX3Zh bHVlLCBBUk1SZWdpc3RlcnM6OlMxKSk7CisgICAgICAgICAgICBtb3ZlKFRydXN0ZWRJbW1QdHIo YWRkcmVzcy5tX3B0ciksIEFSTVJlZ2lzdGVyczo6UzEpOworICAgICAgICB9CisgICAgICAgIG1f YXNzZW1ibGVyLmR0clVwKEFSTUFzc2VtYmxlcjo6U3RvcmVVaW50MzIsIEFSTVJlZ2lzdGVyczo6 UzAsIEFSTVJlZ2lzdGVyczo6UzEsIDApOworCisgICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFS TUFzc2VtYmxlcjo6TG9hZFVpbnQzMiwgQVJNUmVnaXN0ZXJzOjpTMCwgQVJNUmVnaXN0ZXJzOjpT MSwgc2l6ZW9mKEFSTVdvcmQpKTsKKyAgICAgICAgaWYgKGltbS5tX3ZhbHVlID49IDApCisgICAg ICAgICAgICBtX2Fzc2VtYmxlci5hZGMoQVJNUmVnaXN0ZXJzOjpTMCwgQVJNUmVnaXN0ZXJzOjpT MCwgQVJNQXNzZW1ibGVyOjpnZXRPcDJCeXRlKDApKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgbV9hc3NlbWJsZXIuc2JjKEFSTVJlZ2lzdGVyczo6UzAsIEFSTVJlZ2lzdGVyczo6UzAsIEFS TUFzc2VtYmxlcjo6Z2V0T3AyQnl0ZSgxKSk7CisgICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFS TUFzc2VtYmxlcjo6U3RvcmVVaW50MzIsIEFSTVJlZ2lzdGVyczo6UzAsIEFSTVJlZ2lzdGVyczo6 UzEsIHNpemVvZihBUk1Xb3JkKSk7CisgICAgfQorCiAgICAgdm9pZCBzdWIzMihUcnVzdGVkSW1t MzIgaW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKICAgICB7CiAgICAgICAgIG1fYXNzZW1i bGVyLmxkclVuaXF1ZUltbWVkaWF0ZShBUk1SZWdpc3RlcnM6OlMxLCByZWludGVycHJldF9jYXN0 PEFSTVdvcmQ+KGFkZHJlc3MubV9wdHIpKTsK 178778 2012-12-11 04:33:02 -0800 2012-12-12 00:01:34 -0800 Patch add64fix.patch text/plain 2623 gaborb ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDRlYThlYjkuLjdhYzQ5MzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTEyLTExICBHYWJvciBCYWxsYWJh cyAgPGdhYm9yYkBpbmYudS1zemVnZWQuaHU+CisKKyAgICAgICAgSW1wbGVtZW50IGFkZDY0IGZv ciBBUk0gdHJhZGl0aW9uYWwgYXNzZW1ibGVyIGFmdGVyIHIxMzY2MDEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDEwMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBhZGQ2NCBmdW5jdGlv biBmb3IgQVJNIHRyYWRpdGlvbmFsIG1hY3JvYXNzZW1ibGVyLgorCisgICAgICAgICogYXNzZW1i bGVyL01hY3JvQXNzZW1ibGVyQVJNLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJN OjphZGQ2NCk6CisgICAgICAgIChNYWNyb0Fzc2VtYmxlckFSTSk6CisKIDIwMTItMTItMDUgIEhh bHRvbiBIdW8gIDxoYWx0b24uaHVvQGludGVsLmNvbT4KIAogICAgICAgICBbQ01ha2VdIFVuaWZ5 IGNvZGluZyBzdHlsZSBmb3IgQ01ha2UgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAppbmRleCBlNmI1YWQzLi41MjcxMjZi IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyQVJNLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2Vt YmxlckFSTS5oCkBAIC04OTMsNiArODkzLDMxIEBAIHB1YmxpYzoKICAgICAgICAgbV9hc3NlbWJs ZXIuZHRyVXAoQVJNQXNzZW1ibGVyOjpTdG9yZVVpbnQzMiwgQVJNUmVnaXN0ZXJzOjpTMSwgQVJN UmVnaXN0ZXJzOjpTMCwgMCk7CiAgICAgfQogCisgICAgdm9pZCBhZGQ2NChUcnVzdGVkSW1tMzIg aW1tLCBBYnNvbHV0ZUFkZHJlc3MgYWRkcmVzcykKKyAgICB7CisgICAgICAgIEFSTVdvcmQgdG1w OworCisgICAgICAgIG1vdmUoVHJ1c3RlZEltbVB0cihhZGRyZXNzLm1fcHRyKSwgQVJNUmVnaXN0 ZXJzOjpTMSk7CisgICAgICAgIG1fYXNzZW1ibGVyLmR0clVwKEFSTUFzc2VtYmxlcjo6TG9hZFVp bnQzMiwgQVJNUmVnaXN0ZXJzOjpTMCwgQVJNUmVnaXN0ZXJzOjpTMSwgMCk7CisKKyAgICAgICAg aWYgKCh0bXAgPSBBUk1Bc3NlbWJsZXI6OmdldE9wMihpbW0ubV92YWx1ZSkpICE9IEFSTUFzc2Vt Ymxlcjo6SW52YWxpZEltbWVkaWF0ZSkKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLmFkZHMoQVJN UmVnaXN0ZXJzOjpTMCwgQVJNUmVnaXN0ZXJzOjpTMCwgdG1wKTsKKyAgICAgICAgZWxzZSBpZiAo KHRtcCA9IEFSTUFzc2VtYmxlcjo6Z2V0T3AyKC1pbW0ubV92YWx1ZSkpICE9IEFSTUFzc2VtYmxl cjo6SW52YWxpZEltbWVkaWF0ZSkKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN1YnMoQVJNUmVn aXN0ZXJzOjpTMCwgQVJNUmVnaXN0ZXJzOjpTMCwgdG1wKTsKKyAgICAgICAgZWxzZSB7CisgICAg ICAgICAgICBtX2Fzc2VtYmxlci5hZGRzKEFSTVJlZ2lzdGVyczo6UzAsIEFSTVJlZ2lzdGVyczo6 UzAsIG1fYXNzZW1ibGVyLmdldEltbShpbW0ubV92YWx1ZSwgQVJNUmVnaXN0ZXJzOjpTMSkpOwor ICAgICAgICAgICAgbW92ZShUcnVzdGVkSW1tUHRyKGFkZHJlc3MubV9wdHIpLCBBUk1SZWdpc3Rl cnM6OlMxKTsKKyAgICAgICAgfQorICAgICAgICBtX2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJs ZXI6OlN0b3JlVWludDMyLCBBUk1SZWdpc3RlcnM6OlMwLCBBUk1SZWdpc3RlcnM6OlMxLCAwKTsK KworICAgICAgICBtX2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJsZXI6OkxvYWRVaW50MzIsIEFS TVJlZ2lzdGVyczo6UzAsIEFSTVJlZ2lzdGVyczo6UzEsIHNpemVvZihBUk1Xb3JkKSk7CisgICAg ICAgIGlmIChpbW0ubV92YWx1ZSA+PSAwKQorICAgICAgICAgICAgbV9hc3NlbWJsZXIuYWRjKEFS TVJlZ2lzdGVyczo6UzAsIEFSTVJlZ2lzdGVyczo6UzAsIEFSTUFzc2VtYmxlcjo6Z2V0T3AyQnl0 ZSgwKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNiYyhBUk1SZWdp c3RlcnM6OlMwLCBBUk1SZWdpc3RlcnM6OlMwLCBBUk1Bc3NlbWJsZXI6OmdldE9wMkJ5dGUoMCkp OworICAgICAgICBtX2Fzc2VtYmxlci5kdHJVcChBUk1Bc3NlbWJsZXI6OlN0b3JlVWludDMyLCBB Uk1SZWdpc3RlcnM6OlMwLCBBUk1SZWdpc3RlcnM6OlMxLCBzaXplb2YoQVJNV29yZCkpOworICAg IH0KKwogICAgIHZvaWQgc3ViMzIoVHJ1c3RlZEltbTMyIGltbSwgQWJzb2x1dGVBZGRyZXNzIGFk ZHJlc3MpCiAgICAgewogICAgICAgICBtX2Fzc2VtYmxlci5sZHJVbmlxdWVJbW1lZGlhdGUoQVJN UmVnaXN0ZXJzOjpTMSwgcmVpbnRlcnByZXRfY2FzdDxBUk1Xb3JkPihhZGRyZXNzLm1fcHRyKSk7 Cg==