50008 2010-11-24 00:38:57 -0800 Merge the usage of jumps and calls at ARM-JIT 2010-11-24 05:05:00 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other All RESOLVED FIXED P2 Enhancement --- 1 loki loki commit-queue oldest_to_newest 313161 0 loki 2010-11-24 00:38:57 -0800 Currently, those JmpSrc objects which represent jumps point to the address of branches, and the JmpSrc objects which represent calls point to the return address of calls (after the branch instruction). The JmpSrc objects point to after the jump instruction on all other JITs. So, the ARM JIT should follow this method also. 313163 1 74730 loki 2010-11-24 00:50:36 -0800 Created attachment 74730 Merge the usage of jumps and calls at ARM-JIT I have not seen any performance issues. 313239 2 74730 commit-queue 2010-11-24 05:04:55 -0800 Comment on attachment 74730 Merge the usage of jumps and calls at ARM-JIT Clearing flags on attachment: 74730 Committed r72663: <http://trac.webkit.org/changeset/72663> 313240 3 commit-queue 2010-11-24 05:05:00 -0800 All reviewed patches have been landed. Closing bug. 74730 2010-11-24 00:50:36 -0800 2010-11-24 05:04:55 -0800 Merge the usage of jumps and calls at ARM-JIT 0001-Merge-the-usage-of-jumps-and-calls-at-ARM-JIT.patch text/plain 6520 loki RnJvbSBlZjYwYjBmMjY4OWU4NzM2NmFjZTlhMWZhZDE2MDZkNzRjNmY1NmRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHYWJvciBMb2tpIDxsb2tpQGluZi51LXN6ZWdlZC5odT4KRGF0 ZTogV2VkLCAyNCBOb3YgMjAxMCAwOTo0MzoxNiArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIE1lcmdl IHRoZSB1c2FnZSBvZiBqdW1wcyBhbmQgY2FsbHMgYXQgQVJNLUpJVAoKU2lnbmVkLW9mZi1ieTog R2Fib3IgTG9raSA8bG9raUBpbmYudS1zemVnZWQuaHU+Ci0tLQogSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrKysrCiBK YXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmggICAgICB8ICAgMzEgKysrKysr KysrKysrKy0tLS0tLS0tLS0tLQogSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyQVJNLmggfCAgICA0ICstLQogMyBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCAx OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggZjRlMDM2Ny4uNmQ1YjI3MiAxMDA2NDQKLS0t IGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI3IEBACisyMDEwLTExLTI0ICBHYWJvciBMb2tpICA8bG9raUB3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1l cmdlIHRoZSB1c2FnZSBvZiBqdW1wcyBhbmQgY2FsbHMgYXQgQVJNLUpJVAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAwMDgKKworICAgICAgICBUaG9z ZSBKbXBTcmMgb2JqZWN0cyB3aGljaCByZXByZXNlbnQganVtcHMgKG5vdCBjYWxscykgc2hvdWxk IHBvaW50IHRvCisgICAgICAgIGFmdGVyIHRoZSBqdW1wIGluc3RydWN0aW9uLgorCisgICAgICAg ICogYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5oOgorICAgICAgICAoSlNDOjpBUk1Bc3NlbWJsZXI6 OmJseCk6CisgICAgICAgIChKU0M6OkFSTUFzc2VtYmxlcjo6bG9hZEJyYW5jaFRhcmdldCk6Cisg ICAgICAgIChKU0M6OkFSTUFzc2VtYmxlcjo6Z2V0QWJzb2x1dGVKdW1wQWRkcmVzcyk6CisgICAg ICAgIChKU0M6OkFSTUFzc2VtYmxlcjo6bGlua0p1bXApOgorICAgICAgICAoSlNDOjpBUk1Bc3Nl bWJsZXI6OnJlbGlua0p1bXApOgorICAgICAgICAoSlNDOjpBUk1Bc3NlbWJsZXI6OmxpbmtDYWxs KToKKyAgICAgICAgKEpTQzo6QVJNQXNzZW1ibGVyOjpyZWxpbmtDYWxsKToKKyAgICAgICAgKEpT Qzo6QVJNQXNzZW1ibGVyOjpnZXRSZWxvY2F0ZWRBZGRyZXNzKToKKyAgICAgICAgKEpTQzo6QVJN QXNzZW1ibGVyOjpnZXREaWZmZXJlbmNlQmV0d2VlbkxhYmVscyk6CisgICAgICAgIChKU0M6OkFS TUFzc2VtYmxlcjo6Z2V0Q2FsbFJldHVybk9mZnNldCk6CisgICAgICAgICogYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyQVJNLmg6CisgICAgICAgIChKU0M6Ok1hY3JvQXNzZW1ibGVyQVJNOjpjYWxs KToKKwogMjAxMC0xMS0xOSAgUGV0ZXIgVmFyZ2EgIDxwdmFyZ2FAaW5mLnUtc3plZ2VkLmh1Pgog CiAgICAgICAgIFJldmlld2VkIGJ5IEdhdmluIEJhcnJhY2xvdWdoLgpkaWZmIC0tZ2l0IGEvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL0FSTUFzc2VtYmxlci5oIGIvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL0FSTUFzc2VtYmxlci5oCmluZGV4IDkwMGY2NTUuLjFkMjRkZDMgMTAwNjQ0Ci0tLSBh L0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9BUk1Bc3NlbWJsZXIuaAorKysgYi9KYXZhU2NyaXB0 Q29yZS9hc3NlbWJsZXIvQVJNQXNzZW1ibGVyLmgKQEAgLTYyNCwxNiArNjI0LDE0IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICBKbXBTcmMgYmx4KGludCBybSwgQ29uZGl0aW9uIGNjID0gQUwp CiAgICAgICAgIHsKICNpZiBXVEZfQVJNX0FSQ0hfQVRfTEVBU1QoNSkKLSAgICAgICAgICAgIGlu dCBzID0gbV9idWZmZXIudW5jaGVja2VkU2l6ZSgpOwogICAgICAgICAgICAgZW1pdEluc3Qoc3Rh dGljX2Nhc3Q8QVJNV29yZD4oY2MpIHwgQkxYLCAwLCAwLCBSTShybSkpOwogI2Vsc2UKICAgICAg ICAgICAgIEFTU0VSVChybSAhPSAxNCk7CiAgICAgICAgICAgICBlbnN1cmVTcGFjZSgyICogc2l6 ZW9mKEFSTVdvcmQpLCAwKTsKICAgICAgICAgICAgIG1vdl9yKEFSTVJlZ2lzdGVyczo6bHIsIEFS TVJlZ2lzdGVyczo6cGMsIGNjKTsKLSAgICAgICAgICAgIGludCBzID0gbV9idWZmZXIudW5jaGVj a2VkU2l6ZSgpOwogICAgICAgICAgICAgYngocm0sIGNjKTsKICNlbmRpZgotICAgICAgICAgICAg cmV0dXJuIEptcFNyYyhzKTsKKyAgICAgICAgICAgIHJldHVybiBKbXBTcmMobV9idWZmZXIudW5j aGVja2VkU2l6ZSgpKTsKICAgICAgICAgfQogCiAgICAgICAgIHN0YXRpYyBBUk1Xb3JkIGxzbChp bnQgcmVnLCBBUk1Xb3JkIHZhbHVlKQpAQCAtNzExLDEwICs3MDksOSBAQCBuYW1lc3BhY2UgSlND IHsKICAgICAgICAgSm1wU3JjIGxvYWRCcmFuY2hUYXJnZXQoaW50IHJkLCBDb25kaXRpb24gY2Mg PSBBTCwgaW50IHVzZUNvbnN0YW50UG9vbCA9IDApCiAgICAgICAgIHsKICAgICAgICAgICAgIGVu c3VyZVNwYWNlKHNpemVvZihBUk1Xb3JkKSwgc2l6ZW9mKEFSTVdvcmQpKTsKLSAgICAgICAgICAg IGludCBzID0gbV9idWZmZXIudW5jaGVja2VkU2l6ZSgpOworICAgICAgICAgICAgbV9qdW1wcy5h cHBlbmQobV9idWZmZXIudW5jaGVja2VkU2l6ZSgpIHwgKHVzZUNvbnN0YW50UG9vbCAmIDB4MSkp OwogICAgICAgICAgICAgbGRyX3VuX2ltbShyZCwgSW52YWxpZEJyYW5jaFRhcmdldCwgY2MpOwot ICAgICAgICAgICAgbV9qdW1wcy5hcHBlbmQocyB8ICh1c2VDb25zdGFudFBvb2wgJiAweDEpKTsK LSAgICAgICAgICAgIHJldHVybiBKbXBTcmMocyk7CisgICAgICAgICAgICByZXR1cm4gSm1wU3Jj KG1fYnVmZmVyLnVuY2hlY2tlZFNpemUoKSk7CiAgICAgICAgIH0KIAogICAgICAgICBKbXBTcmMg am1wKENvbmRpdGlvbiBjYyA9IEFMLCBpbnQgdXNlQ29uc3RhbnRQb29sID0gMCkKQEAgLTgwMCw1 MSArNzk3LDU1IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB9CiAKICAgICAgICAgLy8gTGlu a2VycworICAgICAgICBzdGF0aWMgaW50cHRyX3QgZ2V0QWJzb2x1dGVKdW1wQWRkcmVzcyh2b2lk KiBiYXNlLCBpbnQgb2Zmc2V0ID0gMCkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIHJl aW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGJhc2UpICsgb2Zmc2V0IC0gc2l6ZW9mKEFSTVdvcmQp OworICAgICAgICB9CiAKICAgICAgICAgdm9pZCBsaW5rSnVtcChKbXBTcmMgZnJvbSwgSm1wRHN0 IHRvKQogICAgICAgICB7Ci0gICAgICAgICAgICBBUk1Xb3JkKiBpbnNuID0gcmVpbnRlcnByZXRf Y2FzdDxBUk1Xb3JkKj4obV9idWZmZXIuZGF0YSgpKSArIChmcm9tLm1fb2Zmc2V0IC8gc2l6ZW9m KEFSTVdvcmQpKTsKKyAgICAgICAgICAgIEFSTVdvcmQqIGluc24gPSByZWludGVycHJldF9jYXN0 PEFSTVdvcmQqPihnZXRBYnNvbHV0ZUp1bXBBZGRyZXNzKG1fYnVmZmVyLmRhdGEoKSwgZnJvbS5t X29mZnNldCkpOwogICAgICAgICAgICAgQVJNV29yZCogYWRkciA9IGdldExkckltbUFkZHJlc3NP blBvb2woaW5zbiwgbV9idWZmZXIucG9vbEFkZHJlc3MoKSk7CiAgICAgICAgICAgICAqYWRkciA9 IHN0YXRpY19jYXN0PEFSTVdvcmQ+KHRvLm1fb2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAg IHN0YXRpYyB2b2lkIGxpbmtKdW1wKHZvaWQqIGNvZGUsIEptcFNyYyBmcm9tLCB2b2lkKiB0bykK ICAgICAgICAgewotICAgICAgICAgICAgcGF0Y2hQb2ludGVySW50ZXJuYWwocmVpbnRlcnByZXRf Y2FzdDxpbnRwdHJfdD4oY29kZSkgKyBmcm9tLm1fb2Zmc2V0LCB0byk7CisgICAgICAgICAgICBw YXRjaFBvaW50ZXJJbnRlcm5hbChnZXRBYnNvbHV0ZUp1bXBBZGRyZXNzKGNvZGUsIGZyb20ubV9v ZmZzZXQpLCB0byk7CiAgICAgICAgIH0KIAogICAgICAgICBzdGF0aWMgdm9pZCByZWxpbmtKdW1w KHZvaWQqIGZyb20sIHZvaWQqIHRvKQogICAgICAgICB7Ci0gICAgICAgICAgICBwYXRjaFBvaW50 ZXJJbnRlcm5hbChyZWludGVycHJldF9jYXN0PGludHB0cl90Pihmcm9tKSAtIHNpemVvZihBUk1X b3JkKSwgdG8pOworICAgICAgICAgICAgcGF0Y2hQb2ludGVySW50ZXJuYWwoZ2V0QWJzb2x1dGVK dW1wQWRkcmVzcyhmcm9tKSwgdG8pOwogICAgICAgICB9CiAKICAgICAgICAgc3RhdGljIHZvaWQg bGlua0NhbGwodm9pZCogY29kZSwgSm1wU3JjIGZyb20sIHZvaWQqIHRvKQogICAgICAgICB7Ci0g ICAgICAgICAgICBwYXRjaFBvaW50ZXJJbnRlcm5hbChyZWludGVycHJldF9jYXN0PGludHB0cl90 Pihjb2RlKSArIGZyb20ubV9vZmZzZXQsIHRvKTsKKyAgICAgICAgICAgIHBhdGNoUG9pbnRlcklu dGVybmFsKGdldEFic29sdXRlSnVtcEFkZHJlc3MoY29kZSwgZnJvbS5tX29mZnNldCksIHRvKTsK ICAgICAgICAgfQogCiAgICAgICAgIHN0YXRpYyB2b2lkIHJlbGlua0NhbGwodm9pZCogZnJvbSwg dm9pZCogdG8pCiAgICAgICAgIHsKLSAgICAgICAgICAgIHBhdGNoUG9pbnRlckludGVybmFsKHJl aW50ZXJwcmV0X2Nhc3Q8aW50cHRyX3Q+KGZyb20pIC0gc2l6ZW9mKEFSTVdvcmQpLCB0byk7Cisg ICAgICAgICAgICBwYXRjaFBvaW50ZXJJbnRlcm5hbChnZXRBYnNvbHV0ZUp1bXBBZGRyZXNzKGZy b20pLCB0byk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBBZGRyZXNzIG9wZXJhdGlvbnMKIAog ICAgICAgICBzdGF0aWMgdm9pZCogZ2V0UmVsb2NhdGVkQWRkcmVzcyh2b2lkKiBjb2RlLCBKbXBT cmMganVtcCkKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8 dm9pZCo+KHJlaW50ZXJwcmV0X2Nhc3Q8QVJNV29yZCo+KGNvZGUpICsganVtcC5tX29mZnNldCAv IHNpemVvZihBUk1Xb3JkKSArIDEpOworICAgICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nh c3Q8dm9pZCo+KHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGNvZGUpICsganVtcC5tX29mZnNldCk7 CiAgICAgICAgIH0KIAogICAgICAgICBzdGF0aWMgdm9pZCogZ2V0UmVsb2NhdGVkQWRkcmVzcyh2 b2lkKiBjb2RlLCBKbXBEc3QgbGFiZWwpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBy ZWludGVycHJldF9jYXN0PHZvaWQqPihyZWludGVycHJldF9jYXN0PEFSTVdvcmQqPihjb2RlKSAr IGxhYmVsLm1fb2Zmc2V0IC8gc2l6ZW9mKEFSTVdvcmQpKTsKKyAgICAgICAgICAgIHJldHVybiBy ZWludGVycHJldF9jYXN0PHZvaWQqPihyZWludGVycHJldF9jYXN0PGNoYXIqPihjb2RlKSArIGxh YmVsLm1fb2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEFkZHJlc3MgZGlmZmVyZW5j ZXMKIAogICAgICAgICBzdGF0aWMgaW50IGdldERpZmZlcmVuY2VCZXR3ZWVuTGFiZWxzKEptcERz dCBmcm9tLCBKbXBTcmMgdG8pCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiAodG8ubV9v ZmZzZXQgKyBzaXplb2YoQVJNV29yZCkpIC0gZnJvbS5tX29mZnNldDsKKyAgICAgICAgICAgIHJl dHVybiB0by5tX29mZnNldCAtIGZyb20ubV9vZmZzZXQ7CiAgICAgICAgIH0KIAogICAgICAgICBz dGF0aWMgaW50IGdldERpZmZlcmVuY2VCZXR3ZWVuTGFiZWxzKEptcERzdCBmcm9tLCBKbXBEc3Qg dG8pCkBAIC04NTQsNyArODU1LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgc3RhdGlj IHVuc2lnbmVkIGdldENhbGxSZXR1cm5PZmZzZXQoSm1wU3JjIGNhbGwpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIHJldHVybiBjYWxsLm1fb2Zmc2V0ICsgc2l6ZW9mKEFSTVdvcmQpOworICAgICAg ICAgICAgcmV0dXJuIGNhbGwubV9vZmZzZXQ7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBIYW5k bGUgaW1tZWRpYXRlcwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyQVJNLmggYi9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJB Uk0uaAppbmRleCBhYjYxMDRkLi5jNTE2ODZhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaAorKysgYi9KYXZhU2NyaXB0Q29yZS9hc3NlbWJs ZXIvTWFjcm9Bc3NlbWJsZXJBUk0uaApAQCAtNjE1LDkgKzYxNSw3IEBAIHB1YmxpYzoKIAogICAg IENhbGwgY2FsbChSZWdpc3RlcklEIHRhcmdldCkKICAgICB7Ci0gICAgICAgIG1fYXNzZW1ibGVy LmJseCh0YXJnZXQpOwotICAgICAgICBKbXBTcmMgam1wU3JjOwotICAgICAgICByZXR1cm4gQ2Fs bChqbXBTcmMsIENhbGw6Ok5vbmUpOworICAgICAgICByZXR1cm4gQ2FsbChtX2Fzc2VtYmxlci5i bHgodGFyZ2V0KSwgQ2FsbDo6Tm9uZSk7CiAgICAgfQogCiAgICAgdm9pZCBjYWxsKEFkZHJlc3Mg YWRkcmVzcykKLS0gCjEuNy4wLjQKCg==