126387 2014-01-02 10:41:36 -0800 Refactor LLInt C stack frame munging helpers so that 32-bit code paths can use them 2014-01-02 14:13:32 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 116888 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 963780 0 fpizlo 2014-01-02 10:41:36 -0800 Patch forthcoming. 963782 1 220232 fpizlo 2014-01-02 10:46:12 -0800 Created attachment 220232 the patch 963792 2 fpizlo 2014-01-02 11:17:19 -0800 Landed on the branch in http://trac.webkit.org/changeset/161211 963852 3 220232 msaboff 2014-01-02 13:11:08 -0800 Comment on attachment 220232 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=220232&action=review r=me with comments. > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:278 > + elsif ARM64 or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS > + pushLRAndFP Only ARM64 has the pushLRAndFP / popLRAndFP pseudo ops. The other platforms can push and pop individual registers. Therefore use the push cfr ; push lr instructions for the non-ARM64 platforms. > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:286 > + popLRAndFP Ditto, except use pop lr ; pop cfr > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:293 > + pushLRAndFP Same comment as functionPrologue. > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:305 > + popLRAndFP Same comment as functionEpilogue. 963878 4 fpizlo 2014-01-02 14:13:32 -0800 (In reply to comment #3) > (From update of attachment 220232 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=220232&action=review > > r=me with comments. > > > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:278 > > + elsif ARM64 or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS > > + pushLRAndFP > > Only ARM64 has the pushLRAndFP / popLRAndFP pseudo ops. The other platforms can push and pop individual registers. Therefore use the push cfr ; push lr instructions for the non-ARM64 platforms. > > > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:286 > > + popLRAndFP > > Ditto, except use pop lr ; pop cfr > > > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:293 > > + pushLRAndFP > > Same comment as functionPrologue. > > > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:305 > > + popLRAndFP > > Same comment as functionEpilogue. Thanks! Comments addressed in http://trac.webkit.org/changeset/161225. 220232 2014-01-02 10:46:12 -0800 2014-01-02 13:11:08 -0800 the patch blah.patch text/plain 6304 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYxMjEwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDE0LTAxLTAyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg UmVmYWN0b3IgTExJbnQgQyBzdGFjayBmcmFtZSBtdW5naW5nIGhlbHBlcnMgc28gdGhhdCAzMi1i aXQgY29kZSBwYXRocyBjYW4gdXNlIHRoZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNjM4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhpcyBnZXRzIHVzIGNsb3NlciB0byB0aGUgMzIt Yml0IExMSW50IHdvcmtpbmcgb24gdGhlIEMgc3RhY2sgYnkgZW5hYmxpbmcgdGhlCisgICAgICAg IDMyLWJpdCBjb2RlIHBhdGhzIHRvIHVzZSB0aGUgbG93LWxldmVsIHN0YWNrL2ZyYW1lIHBvaW50 ZXIgbXVuZ2luZyBoZWxwZXJzLiBUaGlzCisgICAgICAgIHBhdGNoIGRvZXNuJ3QgY29tcGxldGVs eSBlbnN1cmUgdGhhdCB0aGVzZSBoZWxwZXJzIGFjdHVhbGx5IHdvcmsgLSB0aGUgMzItYml0Cisg ICAgICAgIGJ1aWxkIGlzIHN0aWxsIGJyb2tlbiAtIGJ1dCBpdCdzIGEgZ29vZCBjaGFuZ2UgdG8g bGFuZCBzZXBhcmF0ZWx5IHNpbmNlIGl0IGFmZmVjdHMKKyAgICAgICAgNjQtYml0IGNvZGUgcGF0 aHMgYXMgd2VsbC4KKworICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtOgor ICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIzMl82NC5hc206CisgICAgICAgICog bGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbToKKwogMjAxMy0xMi0zMSAgTWFyayBMYW0g IDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQ1N0YWNrOiBOZWVkIGEgc2VwYXJhdGUg c3RhY2sgbGltaXQgZm9yIHRoZSBKUyBzdGFjayBhbmQgdGhlIEMgc3RhY2suCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRl cjMyXzY0LmFzbQkocmV2aXNpb24gMTYxMTkzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2xs aW50L0xvd0xldmVsSW50ZXJwcmV0ZXIzMl82NC5hc20JKHdvcmtpbmcgY29weSkKQEAgLTE0NSwz MSArMTQ1LDYgQEAgbWFjcm8gY2FsbFNsb3dQYXRoKHNsb3dQYXRoKQogICAgIG1vdmUgdDEsIGNm cgogZW5kCiAKLW1hY3JvIGZ1bmN0aW9uUHJvbG9ndWUoZXh0cmFTdGFja1NwYWNlKQotICAgIGlm IFg4NgotICAgICAgICBwdXNoIGNmcgotICAgICAgICBtb3ZlIHNwLCBjZnIKLSAgICBlbmQKLSAg ICBwdXNoQ2FsbGVlU2F2ZXMKLSAgICBpZiBBUk0gb3IgQVJNdjcgb3IgQVJNdjdfVFJBRElUSU9O QUwgb3IgTUlQUwotICAgICAgICBwdXNoIGNmcgotICAgICAgICBwdXNoIGxyCi0gICAgZW5kCi0g ICAgc3VicCBleHRyYVN0YWNrU3BhY2UsIHNwCi1lbmQKLQotbWFjcm8gZnVuY3Rpb25FcGlsb2d1 ZShleHRyYVN0YWNrU3BhY2UpCi0gICAgYWRkcCBleHRyYVN0YWNrU3BhY2UsIHNwCi0gICAgaWYg QVJNIG9yIEFSTXY3IG9yIEFSTXY3X1RSQURJVElPTkFMIG9yIE1JUFMKLSAgICAgICAgcG9wIGxy Ci0gICAgICAgIHBvcCBjZnIKLSAgICBlbmQKLSAgICBwb3BDYWxsZWVTYXZlcwotICAgIGlmIFg4 NgotICAgICAgICBwb3AgY2ZyCi0gICAgZW5kCi1lbmQKLQogbWFjcm8gZG9DYWxsVG9KYXZhU2Ny aXB0KG1ha2VDYWxsLCBkb1JldHVybikKICAgICBpZiBYODYKICAgICAgICAgY29uc3QgZW50cnkg PSB0NApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0 ZXI2NC5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xl dmVsSW50ZXJwcmV0ZXI2NC5hc20JKHJldmlzaW9uIDE2MTE5MykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCSh3b3JraW5nIGNvcHkpCkBA IC05MCw2NCArOTAsNiBAQCBtYWNybyBjQ2FsbDQoZnVuY3Rpb24sIGFyZzEsIGFyZzIsIGFyZzMs CiAgICAgZW5kCiBlbmQKIAotbWFjcm8gY2hlY2tTdGFja1BvaW50ZXJBbGlnbm1lbnQodGVtcFJl ZywgbG9jYXRpb24pCi0gICAgYW5kcCBzcCwgMHhmLCB0ZW1wUmVnCi0gICAgYnRweiB0ZW1wUmVn LCAuc3RhY2tQb2ludGVyT2theQotICAgIG1vdmUgbG9jYXRpb24sIHRlbXBSZWcKLSAgICBicmVh awotLnN0YWNrUG9pbnRlck9rYXk6Ci1lbmQKLQotCi1tYWNybyBmdW5jdGlvblByb2xvZ3VlKCkK LSAgICBpZiBYODZfNjQKLSAgICAgICAgcHVzaCBjZnIKLSAgICAgICAgbW92ZSBzcCwgY2ZyCi0g ICAgZWxzaWYgQVJNNjQKLSAgICAgICAgcHVzaExSQW5kRlAKLSAgICBlbmQKLWVuZAotCi1tYWNy byBmdW5jdGlvbkVwaWxvZ3VlKCkKLSAgICBpZiBYODZfNjQKLSAgICAgICAgcG9wIGNmcgotICAg IGVsc2lmIEFSTTY0Ci0gICAgICAgIHBvcExSQW5kRlAKLSAgICBlbmQKLWVuZAotCi1tYWNybyBj YWxsVG9KYXZhU2NyaXB0UHJvbG9ndWUoKQotICAgIGlmIFg4Nl82NAotICAgIGVsc2lmIEFSTTY0 Ci0gICAgICAgIHB1c2hMUkFuZEZQCi0gICAgZW5kCi0gICAgcHVzaENhbGxlZVNhdmVzCi1lbmQK LQotbWFjcm8gY2FsbFRvSmF2YVNjcmlwdEVwaWxvZ3VlKCkKLSAgICBhZGRwIENhbGxGcmFtZUhl YWRlclNsb3RzKjgsIGNmciwgc3AKLSAgICBsb2FkcCBDYWxsZXJGcmFtZVtjZnJdLCBjZnIKLQot ICAgIHBvcENhbGxlZVNhdmVzCi0gICAgaWYgWDg2XzY0Ci0gICAgZWxzaWYgQVJNNjQKLSAgICAg ICAgcG9wTFJBbmRGUAotICAgIGVuZAotZW5kCi0KLW1hY3JvIG1vdmVTdGFja1BvaW50ZXJGb3JD YWxsZnJhbWUoY29kZWJsb2NrKQotICAgIGxvYWRpIENvZGVCbG9jazo6bV9udW1DYWxsZWVSZWdp c3RlcnNbY29kZWJsb2NrXSwgdDEKLSAgICBsc2hpZnRwIDMsIHQxCi0gICAgc3VicCBjZnIsIHQx LCBzcAotZW5kCi0KLW1hY3JvIHJlc3RvcmVTdGFja1BvaW50ZXJBZnRlckNhbGwoKQotICAgIGxv YWRwIENvZGVCbG9ja1tjZnJdLCB0MQotICAgIGxvYWRpIENvZGVCbG9jazo6bV9udW1DYWxsZWVS ZWdpc3RlcnNbdDFdLCB0MQotICAgIGxzaGlmdHAgMywgdDEKLSAgICBzdWJwIGNmciwgdDEsIHNw Ci1lbmQKLQogbWFjcm8gZG9DYWxsVG9KYXZhU2NyaXB0KG1ha2VDYWxsKQogICAgIGlmIFg4Nl82 NAogICAgICAgICBjb25zdCBlbnRyeSA9IHQ0CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv bGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCShyZXZpc2lvbiAxNjExOTMp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20J KHdvcmtpbmcgY29weSkKQEAgLTIxNiw2ICsyMTYsMTQgQEAgbWFjcm8gYXNzZXJ0KGFzc2VydGlv bikKICAgICBlbmQKIGVuZAogCittYWNybyBjaGVja1N0YWNrUG9pbnRlckFsaWdubWVudCh0ZW1w UmVnLCBsb2NhdGlvbikKKyAgICBhbmRwIHNwLCAweGYsIHRlbXBSZWcKKyAgICBidHB6IHRlbXBS ZWcsIC5zdGFja1BvaW50ZXJPa2F5CisgICAgbW92ZSBsb2NhdGlvbiwgdGVtcFJlZworICAgIGJy ZWFrCisuc3RhY2tQb2ludGVyT2theToKK2VuZAorCiBtYWNybyBwcmVzZXJ2ZUNhbGxlclBDQW5k Q0ZSKCkKICAgICBpZiBDX0xPT1Agb3IgQVJNIG9yIEFSTXY3IG9yIEFSTXY3X1RSQURJVElPTkFM IG9yIEFSTTY0IG9yIE1JUFMgb3IgU0g0CiAgICAgICAgICMgSW4gQ19MT09QIGNhc2UsIHdlJ3Jl IG9ubHkgcHJlc2VydmluZyB0aGUgYnl0ZWNvZGUgdlBDLgpAQCAtMjI5LDcgKzIzNyw2IEBAIG1h Y3JvIHByZXNlcnZlQ2FsbGVyUENBbmRDRlIoKQogICAgIGVuZAogZW5kCiAKLQogbWFjcm8gcmVz dG9yZUNhbGxlclBDQW5kQ0ZSKCkKICAgICBpZiBDX0xPT1Agb3IgQVJNIG9yIEFSTXY3IG9yIEFS TXY3X1RSQURJVElPTkFMIG9yIEFSTTY0IG9yIE1JUFMgb3IgU0g0CiAgICAgICAgICMgSW4gQ19M T09QIGNhc2UsIHdlJ3JlIG9ubHkgcHJlc2VydmluZyB0aGUgYnl0ZWNvZGUgdlBDLgpAQCAtMjQx LDcgKzI0OCw2IEBAIG1hY3JvIHJlc3RvcmVDYWxsZXJQQ0FuZENGUigpCiAgICAgZW5kCiBlbmQK IAotCiBtYWNybyBwcmVzZXJ2ZVJldHVybkFkZHJlc3NBZnRlckNhbGwoZGVzdGluYXRpb25SZWdp c3RlcikKICAgICBpZiBDX0xPT1Agb3IgQVJNIG9yIEFSTXY3IG9yIEFSTXY3X1RSQURJVElPTkFM IG9yIEFSTTY0IG9yIE1JUFMgb3IgU0g0CiAgICAgICAgICMgSW4gQ19MT09QIGNhc2UsIHdlJ3Jl IG9ubHkgcHJlc2VydmluZyB0aGUgYnl0ZWNvZGUgdlBDLgpAQCAtMjY0LDYgKzI3MCw1NCBAQCBt YWNybyByZXN0b3JlUmV0dXJuQWRkcmVzc0JlZm9yZVJldHVybihzCiAgICAgZW5kCiBlbmQKIAor bWFjcm8gZnVuY3Rpb25Qcm9sb2d1ZSgpCisgICAgaWYgWDg2IG9yIFg4Nl82NAorICAgICAgICBw dXNoIGNmcgorICAgICAgICBtb3ZlIHNwLCBjZnIKKyAgICBlbHNpZiBBUk02NCBvciBBUk0gb3Ig QVJNdjcgb3IgQVJNdjdfVFJBRElUSU9OQUwgb3IgTUlQUworICAgICAgICBwdXNoTFJBbmRGUAor ICAgIGVuZAorZW5kCisKK21hY3JvIGZ1bmN0aW9uRXBpbG9ndWUoKQorICAgIGlmIFg4NiBvciBY ODZfNjQKKyAgICAgICAgcG9wIGNmcgorICAgIGVsc2lmIEFSTTY0IG9yIEFSTSBvciBBUk12NyBv ciBBUk12N19UUkFESVRJT05BTCBvciBNSVBTCisgICAgICAgIHBvcExSQW5kRlAKKyAgICBlbmQK K2VuZAorCittYWNybyBjYWxsVG9KYXZhU2NyaXB0UHJvbG9ndWUoKQorICAgIGlmIFg4NiBvciBY ODZfNjQKKyAgICBlbHNpZiBBUk02NCBvciBBUk0gb3IgQVJNdjcgb3IgQVJNdjdfVFJBRElUSU9O QUwgb3IgTUlQUworICAgICAgICBwdXNoTFJBbmRGUAorICAgIGVuZAorICAgIHB1c2hDYWxsZWVT YXZlcworZW5kCisKK21hY3JvIGNhbGxUb0phdmFTY3JpcHRFcGlsb2d1ZSgpCisgICAgYWRkcCBD YWxsRnJhbWVIZWFkZXJTbG90cyAqIDgsIGNmciwgc3AKKyAgICBsb2FkcCBDYWxsZXJGcmFtZVtj ZnJdLCBjZnIKKworICAgIHBvcENhbGxlZVNhdmVzCisgICAgaWYgWDg2IG9yIFg4Nl82NAorICAg IGVsc2lmIEFSTTY0IG9yIEFSTSBvciBBUk12NyBvciBBUk12N19UUkFESVRJT05BTCBvciBNSVBT CisgICAgICAgIHBvcExSQW5kRlAKKyAgICBlbmQKK2VuZAorCittYWNybyBtb3ZlU3RhY2tQb2lu dGVyRm9yQ29kZUJsb2NrKGNvZGVCbG9jaywgc2NyYXRjaCkKKyAgICBsb2FkaSBDb2RlQmxvY2s6 Om1fbnVtQ2FsbGVlUmVnaXN0ZXJzW2NvZGVCbG9ja10sIHQyCisgICAgbHNoaWZ0cCAzLCB0Mgor ICAgIGFkZHAgbWF4RnJhbWVFeHRlbnRGb3JTbG93UGF0aENhbGwsIHQyCisgICAgc3VicCBjZnIs IHQyLCBzcAorZW5kCisKK21hY3JvIHJlc3RvcmVTdGFja1BvaW50ZXJBZnRlckNhbGwoKQorICAg IGxvYWRwIENvZGVCbG9ja1tjZnJdLCB0MQorICAgIG1vdmVTdGFja1BvaW50ZXJGb3JDb2RlQmxv Y2sodDEsIHQyKQorZW5kCisKIG1hY3JvIHRyYWNlRXhlY3V0aW9uKCkKICAgICBpZiBFWEVDVVRJ T05fVFJBQ0lORwogICAgICAgICBjYWxsU2xvd1BhdGgoX2xsaW50X3RyYWNlKQpAQCAtMzc1LDkg KzQyOSw3IEBAIG1hY3JvIHByb2xvZ3VlKGNvZGVCbG9ja0dldHRlciwgY29kZUJsb2MKICAgICBl bmQKICAgICBjb2RlQmxvY2tTZXR0ZXIodDEpCiAgICAgCi0gICAgbG9hZGkgQ29kZUJsb2NrOjpt X251bUNhbGxlZVJlZ2lzdGVyc1t0MV0sIHQyCi0gICAgbHNoaWZ0cCAzLCB0MgotICAgIHN1YnAg dDIsIHNwCisgICAgbW92ZVN0YWNrUG9pbnRlckZvckNvZGVCbG9jayh0MSwgdDIpCiAKICAgICAj IFNldCB1cCB0aGUgUEMuCiAgICAgaWYgSlNWQUxVRTY0Cg==