73432 2011-11-30 04:56:16 -0800 MacroAssemblerMIPS does not implement readCallTarget 2011-12-01 04:42:28 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P1 Blocker --- 1 ossy webkit-unassigned barraclough fpizlo fu loki ossy webkit.review.bot zecke zherczeg oldest_to_newest 511640 0 ossy 2011-11-30 04:56:16 -0800 It is blocker bug, beacuse after http://trac.webkit.org/changeset/101457 Qt-MIPS build is broken. (and all other MIPS build of course) 511964 1 fu 2011-11-30 11:39:48 -0800 Can you try this patch quickly? I haven't had time to test. Thanks a lot! Regards, Chao-ying Index: MIPSAssembler.h =================================================================== --- MIPSAssembler.h (revision 101454) +++ MIPSAssembler.h (working copy) @@ -772,6 +772,18 @@ return reinterpret_cast<void*>(readInt32(from)); } + static void* readCallTarget(void* from) + { + MIPSWord* insn = reinterpret_cast<MIPSWord*>(from); + insn -= 4; + ASSERT((*insn & 0xffe00000) == 0x3c000000); // lui + int32_t result = (*insn & 0x0000ffff) << 16; + insn++; + ASSERT((*insn & 0xfc000000) == 0x34000000); // ori + result |= *insn & 0x0000ffff; + return reinterpret_cast<void*>(result); + } + private: /* Update each jump in the buffer of newBase. */ void relocateJumps(void* oldBase, void* newBase) Index: MacroAssemblerMIPS.h =================================================================== --- MacroAssemblerMIPS.h (revision 101454) +++ MacroAssemblerMIPS.h (working copy) @@ -1815,6 +1815,11 @@ m_assembler.nop(); } + static FunctionPtr readCallTarget(CodeLocationCall call) + { + return FunctionPtr(reinterpret_cast<void(*)()>(MIPSAssembler::readCallTarget(call.dataLocation()))); + } + private: // If m_fixedWidth is true, we will generate a fixed number of instructions. // Otherwise, we can emit any number of instructions. 512164 2 117281 fu 2011-11-30 14:55:58 -0800 Created attachment 117281 Add MIPS readCallTarget() I tested release and debug versions of JSC by running run-javascriptcore-tests. The results are ok. Thanks a lot! Regards, Chao-ying 512666 3 117281 zherczeg 2011-12-01 03:31:31 -0800 Comment on attachment 117281 Add MIPS readCallTarget() r=me 512691 4 117281 webkit.review.bot 2011-12-01 04:42:23 -0800 Comment on attachment 117281 Add MIPS readCallTarget() Clearing flags on attachment: 117281 Committed r101658: <http://trac.webkit.org/changeset/101658> 512692 5 webkit.review.bot 2011-12-01 04:42:28 -0800 All reviewed patches have been landed. Closing bug. 117281 2011-11-30 14:55:58 -0800 2011-12-01 04:42:23 -0800 Add MIPS readCallTarget() mips-readCallTarget.diff text/plain 2359 fu SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTAxNTQ3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDExLTExLTMwICBDaGFvLXlpbmcgRnUgIDxmdUBtaXBzLmNvbT4KKworICAgICAgICBNYWNy b0Fzc2VtYmxlck1JUFMgZG9lcyBub3QgaW1wbGVtZW50IHJlYWRDYWxsVGFyZ2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzQzMgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYXNzZW1ibGVyL01JUFNB c3NlbWJsZXIuaDoKKyAgICAgICAgKEpTQzo6TUlQU0Fzc2VtYmxlcjo6cmVhZENhbGxUYXJnZXQp OgorICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaDoKKyAgICAgICAgKEpT Qzo6TWFjcm9Bc3NlbWJsZXJNSVBTOjpyZWFkQ2FsbFRhcmdldCk6CisKIDIwMTEtMTEtMzAgIE1h cmsgSGFobmVuYmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4KIAogICAgICAgICB0b1N0cmlu Z0NhbGxiYWNrIGFuZCB2YWx1ZU9mQ2FsbGJhY2sgZG8gbm90IGNoZWNrIHRoZSBlbnRpcmUgcHJv dG90eXBlIGNoYWluIGZvciBjb252ZXJ0VG9UeXBlIGNhbGxiYWNrCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYXNzZW1ibGVyL01JUFNBc3NlbWJsZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01JUFNBc3NlbWJsZXIuaAkocmV2aXNpb24gMTAx NDU0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNzZW1ibGVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTc3Miw2ICs3NzIsMTggQEAgcHVibGljOgogICAgICAgICByZXR1 cm4gcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4ocmVhZEludDMyKGZyb20pKTsKICAgICB9CiAKKyAg ICBzdGF0aWMgdm9pZCogcmVhZENhbGxUYXJnZXQodm9pZCogZnJvbSkKKyAgICB7CisgICAgICAg IE1JUFNXb3JkKiBpbnNuID0gcmVpbnRlcnByZXRfY2FzdDxNSVBTV29yZCo+KGZyb20pOworICAg ICAgICBpbnNuIC09IDQ7CisgICAgICAgIEFTU0VSVCgoKmluc24gJiAweGZmZTAwMDAwKSA9PSAw eDNjMDAwMDAwKTsgLy8gbHVpCisgICAgICAgIGludDMyX3QgcmVzdWx0ID0gKCppbnNuICYgMHgw MDAwZmZmZikgPDwgMTY7CisgICAgICAgIGluc24rKzsKKyAgICAgICAgQVNTRVJUKCgqaW5zbiAm IDB4ZmMwMDAwMDApID09IDB4MzQwMDAwMDApOyAvLyBvcmkKKyAgICAgICAgcmVzdWx0IHw9ICpp bnNuICYgMHgwMDAwZmZmZjsKKyAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+ KHJlc3VsdCk7CisgICAgfQorCiBwcml2YXRlOgogICAgIC8qIFVwZGF0ZSBlYWNoIGp1bXAgaW4g dGhlIGJ1ZmZlciBvZiBuZXdCYXNlLiAgKi8KICAgICB2b2lkIHJlbG9jYXRlSnVtcHModm9pZCog b2xkQmFzZSwgdm9pZCogbmV3QmFzZSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3Nl bWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAkocmV2aXNpb24gMTAxNDU0KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAko d29ya2luZyBjb3B5KQpAQCAtMTgxNSw2ICsxODE1LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9h c3NlbWJsZXIubm9wKCk7CiAgICAgfQogCisgICAgc3RhdGljIEZ1bmN0aW9uUHRyIHJlYWRDYWxs VGFyZ2V0KENvZGVMb2NhdGlvbkNhbGwgY2FsbCkKKyAgICB7CisgICAgICAgIHJldHVybiBGdW5j dGlvblB0cihyZWludGVycHJldF9jYXN0PHZvaWQoKikoKT4oTUlQU0Fzc2VtYmxlcjo6cmVhZENh bGxUYXJnZXQoY2FsbC5kYXRhTG9jYXRpb24oKSkpKTsKKyAgICB9CisKIHByaXZhdGU6CiAgICAg Ly8gSWYgbV9maXhlZFdpZHRoIGlzIHRydWUsIHdlIHdpbGwgZ2VuZXJhdGUgYSBmaXhlZCBudW1i ZXIgb2YgaW5zdHJ1Y3Rpb25zLgogICAgIC8vIE90aGVyd2lzZSwgd2UgY2FuIGVtaXQgYW55IG51 bWJlciBvZiBpbnN0cnVjdGlvbnMuCg==