59407 2011-04-25 17:28:18 -0700 Fix MIPS build due to the split of "Condition" enum 2011-05-01 13:26:57 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 fu webkit-unassigned barraclough commit-queue eric oldest_to_newest 392157 0 fu 2011-04-25 17:28:18 -0700 I need to fix MacroAssemblerMIPS.h to remove some incorrect code, due to the split of "Condition" enum. Will submit the patch soon. Thanks a lot! Regards, Chao-ying 392164 1 91031 fu 2011-04-25 17:40:07 -0700 Created attachment 91031 Fix branch32 and compare32 This patch fixes branch32 and compare32 to remove incorrect ResultCondition that appears in the comparison. This patch also fixes JSC::MIPSAssembler::debugOffset to use m_buffer.debugOffset(). JavaScriptCore tests are ok. Thanks! 396001 2 91031 eric 2011-05-01 12:32:43 -0700 Comment on attachment 91031 Fix branch32 and compare32 OK. 396016 3 91031 commit-queue 2011-05-01 13:26:52 -0700 Comment on attachment 91031 Fix branch32 and compare32 Clearing flags on attachment: 91031 Committed r85429: <http://trac.webkit.org/changeset/85429> 396017 4 commit-queue 2011-05-01 13:26:57 -0700 All reviewed patches have been landed. Closing bug. 91031 2011-04-25 17:40:07 -0700 2011-05-01 13:26:52 -0700 Fix branch32 and compare32 mips20110425.diff text/plain 5252 fu SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODQ4NTYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTEtMDQtMjUgIENoYW8teWluZyBGdSAgPGZ1QG1pcHMuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBNSVBTIGJ1aWxkIGR1ZSB0byB0 aGUgc3BsaXQgb2YgIkNvbmRpdGlvbiIgZW51bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk0MDcKKworICAgICAgICAqIGFzc2VtYmxlci9NSVBTQXNz ZW1ibGVyLmg6CisgICAgICAgIChKU0M6Ok1JUFNBc3NlbWJsZXI6OmRlYnVnT2Zmc2V0KToKKyAg ICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmg6CisgICAgICAgIChKU0M6Ok1h Y3JvQXNzZW1ibGVyTUlQUzo6YnJhbmNoMzIpOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxl ck1JUFM6OmNvbXBhcmUzMik6CisKIDIwMTEtMDQtMjUgIERhdmlkIExldmluICA8bGV2aW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNzZW1ibGVyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNzZW1ibGVyLmgJKHJl dmlzaW9uIDg0Nzg0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NSVBTQXNz ZW1ibGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTcyMCw3ICs3MjAsNyBAQCBwdWJsaWM6CiAgICAg fQogCiAjaWZuZGVmIE5ERUJVRwotICAgIHVuc2lnbmVkIGRlYnVnT2Zmc2V0KCkgeyByZXR1cm4g bV9mb3JtYXR0ZXIuZGVidWdPZmZzZXQoKTsgfQorICAgIHVuc2lnbmVkIGRlYnVnT2Zmc2V0KCkg eyByZXR1cm4gbV9idWZmZXIuZGVidWdPZmZzZXQoKTsgfQogI2VuZGlmCiAKICAgICBzdGF0aWMg dW5zaWduZWQgZ2V0Q2FsbFJldHVybk9mZnNldChKbXBTcmMgY2FsbCkKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJNSVBTLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlck1JUFMuaAko cmV2aXNpb24gODQ3ODQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyTUlQUy5oCSh3b3JraW5nIGNvcHkpCkBAIC05MTQsOSArOTE0LDkgQEAgcHVibGlj OgogCiAgICAgSnVtcCBicmFuY2gzMihSZWxhdGlvbmFsQ29uZGl0aW9uIGNvbmQsIFJlZ2lzdGVy SUQgbGVmdCwgUmVnaXN0ZXJJRCByaWdodCkKICAgICB7Ci0gICAgICAgIGlmIChjb25kID09IEVx dWFsIHx8IGNvbmQgPT0gWmVybykKKyAgICAgICAgaWYgKGNvbmQgPT0gRXF1YWwpCiAgICAgICAg ICAgICByZXR1cm4gYnJhbmNoRXF1YWwobGVmdCwgcmlnaHQpOwotICAgICAgICBpZiAoY29uZCA9 PSBOb3RFcXVhbCB8fCBjb25kID09IE5vblplcm8pCisgICAgICAgIGlmIChjb25kID09IE5vdEVx dWFsKQogICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKGxlZnQsIHJpZ2h0KTsKICAg ICAgICAgaWYgKGNvbmQgPT0gQWJvdmUpIHsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdHUo Y21wVGVtcFJlZ2lzdGVyLCByaWdodCwgbGVmdCk7CkBAIC05NTAsMzkgKzk1MCw2IEBAIHB1Ymxp YzoKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnNsdChjbXBUZW1wUmVnaXN0ZXIsIHJpZ2h0LCBs ZWZ0KTsKICAgICAgICAgICAgIHJldHVybiBicmFuY2hFcXVhbChjbXBUZW1wUmVnaXN0ZXIsIE1J UFNSZWdpc3RlcnM6Onplcm8pOwogICAgICAgICB9Ci0gICAgICAgIGlmIChjb25kID09IE92ZXJm bG93KSB7Ci0gICAgICAgICAgICAvKgotICAgICAgICAgICAgICAgIHhvciAgICAgY21wVGVtcCwg bGVmdCwgcmlnaHQKLSAgICAgICAgICAgICAgICBiZ2V6ICAgIE5vX292ZXJmbG93LCBjbXBUZW1w ICAgICMgc2FtZSBzaWduIGJpdCAtPiBubyBvdmVyZmxvdwotICAgICAgICAgICAgICAgIG5vcAot ICAgICAgICAgICAgICAgIHN1YnUgICAgY21wVGVtcCwgbGVmdCwgcmlnaHQKLSAgICAgICAgICAg ICAgICB4b3IgICAgIGNtcFRlbXAsIGNtcFRlbXAsIGxlZnQKLSAgICAgICAgICAgICAgICBiZ2V6 ICAgIE5vX292ZXJmbG93LCBjbXBUZW1wICAgICMgc2FtZSBzaWduIGJpdCAtPiBubyBvdmVyZmxv dwotICAgICAgICAgICAgICAgIG5vcAotICAgICAgICAgICAgICAgIGIgICAgICAgT3ZlcmZsb3cK LSAgICAgICAgICAgICAgICBub3AKLSAgICAgICAgICAgICAgICBub3AKLSAgICAgICAgICAgICAg ICBub3AKLSAgICAgICAgICAgICAgICBub3AKLSAgICAgICAgICAgICAgICBub3AKLSAgICAgICAg ICAgICAgTm9fb3ZlcmZsb3c6Ci0gICAgICAgICAgICAqLwotICAgICAgICAgICAgbV9hc3NlbWJs ZXIueG9ySW5zbihjbXBUZW1wUmVnaXN0ZXIsIGxlZnQsIHJpZ2h0KTsKLSAgICAgICAgICAgIG1f YXNzZW1ibGVyLmJnZXooY21wVGVtcFJlZ2lzdGVyLCAxMSk7Ci0gICAgICAgICAgICBtX2Fzc2Vt Ymxlci5ub3AoKTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN1YnUoY21wVGVtcFJlZ2lzdGVy LCBsZWZ0LCByaWdodCk7Ci0gICAgICAgICAgICBtX2Fzc2VtYmxlci54b3JJbnNuKGNtcFRlbXBS ZWdpc3RlciwgY21wVGVtcFJlZ2lzdGVyLCBsZWZ0KTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVy LmJnZXooY21wVGVtcFJlZ2lzdGVyLCA3KTsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLm5vcCgp OwotICAgICAgICAgICAgcmV0dXJuIGp1bXAoKTsKLSAgICAgICAgfQotICAgICAgICBpZiAoY29u ZCA9PSBTaWduZWQpIHsKLSAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN1YnUoY21wVGVtcFJlZ2lz dGVyLCBsZWZ0LCByaWdodCk7Ci0gICAgICAgICAgICAvLyBDaGVjayBpZiB0aGUgcmVzdWx0IGlz IG5lZ2F0aXZlLgotICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0KGNtcFRlbXBSZWdpc3Rlciwg Y21wVGVtcFJlZ2lzdGVyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1JUFNSZWdpc3Rl cnM6Onplcm8pOwotICAgICAgICAgICAgcmV0dXJuIGJyYW5jaE5vdEVxdWFsKGNtcFRlbXBSZWdp c3RlciwgTUlQU1JlZ2lzdGVyczo6emVybyk7Ci0gICAgICAgIH0KICAgICAgICAgQVNTRVJUKDAp OwogCiAgICAgICAgIHJldHVybiBKdW1wKCk7CkBAIC0xMzYwLDEwICsxMzI3LDEwIEBAIHB1Ymxp YzoKIAogICAgIHZvaWQgY29tcGFyZTMyKFJlbGF0aW9uYWxDb25kaXRpb24gY29uZCwgUmVnaXN0 ZXJJRCBsZWZ0LCBSZWdpc3RlcklEIHJpZ2h0LCBSZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAg ICAgICBpZiAoY29uZCA9PSBFcXVhbCB8fCBjb25kID09IFplcm8pIHsKKyAgICAgICAgaWYgKGNv bmQgPT0gRXF1YWwpIHsKICAgICAgICAgICAgIG1fYXNzZW1ibGVyLnhvckluc24oZGVzdCwgbGVm dCwgcmlnaHQpOwogICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0aXUoZGVzdCwgZGVzdCwgMSk7 Ci0gICAgICAgIH0gZWxzZSBpZiAoY29uZCA9PSBOb3RFcXVhbCB8fCBjb25kID09IE5vblplcm8p IHsKKyAgICAgICAgfSBlbHNlIGlmIChjb25kID09IE5vdEVxdWFsKSB7CiAgICAgICAgICAgICBt X2Fzc2VtYmxlci54b3JJbnNuKGRlc3QsIGxlZnQsIHJpZ2h0KTsKICAgICAgICAgICAgIG1fYXNz ZW1ibGVyLnNsdHUoZGVzdCwgTUlQU1JlZ2lzdGVyczo6emVybywgZGVzdCk7CiAgICAgICAgIH0g ZWxzZSBpZiAoY29uZCA9PSBBYm92ZSkKQEAgLTEzODYsMjYgKzEzNTMsNiBAQCBwdWJsaWM6CiAg ICAgICAgIGVsc2UgaWYgKGNvbmQgPT0gTGVzc1RoYW5PckVxdWFsKSB7CiAgICAgICAgICAgICBt X2Fzc2VtYmxlci5zbHQoZGVzdCwgcmlnaHQsIGxlZnQpOwogICAgICAgICAgICAgbV9hc3NlbWJs ZXIueG9yaShkZXN0LCBkZXN0LCAxKTsKLSAgICAgICAgfSBlbHNlIGlmIChjb25kID09IE92ZXJm bG93KSB7Ci0gICAgICAgICAgICAvKgotICAgICAgICAgICAgICAgIHhvciAgICAgY21wVGVtcCwg bGVmdCwgcmlnaHQKLSAgICAgICAgICAgICAgICBiZ2V6ICAgIERvbmUsIGNtcFRlbXAgICAjIHNh bWUgc2lnbiBiaXQgLT4gbm8gb3ZlcmZsb3cKLSAgICAgICAgICAgICAgICBtb3ZlICAgIGRlc3Qs IDAKLSAgICAgICAgICAgICAgICBzdWJ1ICAgIGNtcFRlbXAsIGxlZnQsIHJpZ2h0Ci0gICAgICAg ICAgICAgICAgeG9yICAgICBjbXBUZW1wLCBjbXBUZW1wLCBsZWZ0ICMgZGlmZiBzaWduIGJpdCAt PiBvdmVyZmxvdwotICAgICAgICAgICAgICAgIHNsdCAgICAgZGVzdCwgY21wVGVtcCwgMAotICAg ICAgICAgICAgICBEb25lOgotICAgICAgICAgICAgKi8KLSAgICAgICAgICAgIG1fYXNzZW1ibGVy Lnhvckluc24oY21wVGVtcFJlZ2lzdGVyLCBsZWZ0LCByaWdodCk7Ci0gICAgICAgICAgICBtX2Fz c2VtYmxlci5iZ2V6KGNtcFRlbXBSZWdpc3RlciwgNCk7Ci0gICAgICAgICAgICBtX2Fzc2VtYmxl ci5tb3ZlKGRlc3QsIE1JUFNSZWdpc3RlcnM6Onplcm8pOwotICAgICAgICAgICAgbV9hc3NlbWJs ZXIuc3VidShjbXBUZW1wUmVnaXN0ZXIsIGxlZnQsIHJpZ2h0KTsKLSAgICAgICAgICAgIG1fYXNz ZW1ibGVyLnhvckluc24oY21wVGVtcFJlZ2lzdGVyLCBjbXBUZW1wUmVnaXN0ZXIsIGxlZnQpOwot ICAgICAgICAgICAgbV9hc3NlbWJsZXIuc2x0KGRlc3QsIGNtcFRlbXBSZWdpc3RlciwgTUlQU1Jl Z2lzdGVyczo6emVybyk7Ci0gICAgICAgIH0gZWxzZSBpZiAoY29uZCA9PSBTaWduZWQpIHsKLSAg ICAgICAgICAgIG1fYXNzZW1ibGVyLnN1YnUoZGVzdCwgbGVmdCwgcmlnaHQpOwotICAgICAgICAg ICAgLy8gQ2hlY2sgaWYgdGhlIHJlc3VsdCBpcyBuZWdhdGl2ZS4KLSAgICAgICAgICAgIG1fYXNz ZW1ibGVyLnNsdChkZXN0LCBkZXN0LCBNSVBTUmVnaXN0ZXJzOjp6ZXJvKTsKICAgICAgICAgfQog ICAgIH0KIAo=