72047 2011-11-10 13:02:20 -0800 #ifdef CPU(X86) specific div/mod code in DFGSpeculativeJIT32_64 2011-11-10 13:08:27 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 500174 0 barraclough 2011-11-10 13:02:20 -0800 We currently don't attempt to abstract divide through the macro assembler, due to these instructions commonly having specific requirements. This means there is architecture specific code in the JIT - #ifdef it, and provide a common implementation. 500178 1 114550 barraclough 2011-11-10 13:05:08 -0800 Created attachment 114550 Fix 500183 2 114550 ggaren 2011-11-10 13:07:00 -0800 Comment on attachment 114550 Fix r=me 500189 3 barraclough 2011-11-10 13:08:27 -0800 Fixed in r99892 114550 2011-11-10 13:05:08 -0800 2011-11-10 13:07:00 -0800 Fix 72047.patch text/plain 6768 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTk4ODkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTEtMTEtMTAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgICNpZmRlZiBDUFUoWDg2KSBzcGVjaWZpYyBkaXYvbW9kIGNvZGUgaW4gREZHU3Bl Y3VsYXRpdmVKSVQzMl82NAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzIwNDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZSBjdXJyZW50bHkgZG9uJ3QgYXR0ZW1wdCB0byBhYnN0cmFjdCBkaXZpZGUgdGhy b3VnaCB0aGUgbWFjcm8gYXNzZW1ibGVyLAorICAgICAgICBkdWUgdG8gdGhlc2UgaW5zdHJ1Y3Rp b25zIGNvbW1vbmx5IGhhdmluZyBzcGVjaWZpYyByZXF1aXJlbWVudHMuIFRoaXMgbWVhbnMKKyAg ICAgICAgdGhlcmUgaXMgYXJjaGl0ZWN0dXJlIHNwZWNpZmljIGNvZGUgaW4gdGhlIEpJVCAtICNp ZmRlZiBpdCwgYW5kIHByb3ZpZGUgYQorICAgICAgICBjb21tb24gaW1wbGVtZW50YXRpb24uCisK KyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHA6CisgICAgICAgIChKU0M6 OkRGRzo6Zm1vZEFzREZHT3BlcmF0aW9uKToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZSk6CisKIDIwMTEtMTEtMTAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFj bG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBFTkFCTEVfVkFMVUVfUFJPRklMRVIgc3Vw cG9ydCBmb3IgQVJNdjcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3Vs YXRpdmVKSVQzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkocmV2aXNpb24gOTk4ODgpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNiwxMiArMzYsMTIgQEAgbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBERkcgewog CiAvLyBPbiBXaW5kb3dzIHdlIG5lZWQgdG8gd3JhcCBmbW9kOyBvbiBvdGhlciBwbGF0Zm9ybXMg d2UgY2FuIGNhbGwgaXQgZGlyZWN0bHkuCiAjaWYgQ0FMTElOR19DT05WRU5USU9OX0lTX1NURENB TEwKLXN0YXRpYyBkb3VibGUgQ0RFQ0wgZm1vZFdpdGhDRGVjbChkb3VibGUgeCwgZG91YmxlIHkp CitzdGF0aWMgZG91YmxlIERGR19PUEVSQVRJT04gZm1vZEFzREZHT3BlcmF0aW9uKGRvdWJsZSB4 LCBkb3VibGUgeSkKIHsKICAgICByZXR1cm4gZm1vZCh4LCB5KTsKIH0KICNlbHNlCi0jZGVmaW5l IGZtb2RXaXRoQ0RlY2wgZm1vZAorI2RlZmluZSBmbW9kQXNERkdPcGVyYXRpb24gZm1vZAogI2Vu ZGlmCiAKICNpZiBVU0UoSlNWQUxVRTMyXzY0KQpAQCAtMTE0Miw2ICsxMTQyLDcgQEAgdm9pZCBT cGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlJiBub2RlKQogICAgIH0KIAogICAgIGNhc2UgQXJp dGhEaXY6IHsKKyNpZiBDUFUoWDg2KQogICAgICAgICBpZiAoTm9kZTo6c2hvdWxkU3BlY3VsYXRl SW50ZWdlcihhdChub2RlLmNoaWxkMSgpKSwgYXQobm9kZS5jaGlsZDIoKSkpICYmIG5vZGUuY2Fu U3BlY3VsYXRlSW50ZWdlcigpKSB7CiAgICAgICAgICAgICBTcGVjdWxhdGVJbnRlZ2VyT3BlcmFu ZCBvcDEodGhpcywgbm9kZS5jaGlsZDEoKSk7CiAgICAgICAgICAgICBTcGVjdWxhdGVJbnRlZ2Vy T3BlcmFuZCBvcDIodGhpcywgbm9kZS5jaGlsZDIoKSk7CkBAIC0xMTgxLDYgKzExODIsNyBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAgICAgICAgICBpbnRl Z2VyUmVzdWx0KGVheC5ncHIoKSwgbV9jb21waWxlSW5kZXgpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KKyNlbmRpZgogICAgICAgICAKICAgICAgICAgU3BlY3VsYXRlRG91YmxlT3Bl cmFuZCBvcDEodGhpcywgbm9kZS5jaGlsZDEoKSk7CiAgICAgICAgIFNwZWN1bGF0ZURvdWJsZU9w ZXJhbmQgb3AyKHRoaXMsIG5vZGUuY2hpbGQyKCkpOwpAQCAtMTE5MCw1MyArMTE5Miw4NCBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAgICAgIEZQUlJlZyBy ZWcyID0gb3AyLmZwcigpOwogICAgICAgICBtX2ppdC5kaXZEb3VibGUocmVnMSwgcmVnMiwgcmVz dWx0LmZwcigpKTsKIAorI2lmICFDUFUoWDg2KQorICAgICAgICBpZiAoTm9kZTo6c2hvdWxkU3Bl Y3VsYXRlSW50ZWdlcihhdChub2RlLmNoaWxkMSgpKSwgYXQobm9kZS5jaGlsZDIoKSkpICYmIG5v ZGUuY2FuU3BlY3VsYXRlSW50ZWdlcigpKSB7CisgICAgICAgICAgICBGUFJUZW1wb3Jhcnkgc2Ny YXRjaCh0aGlzLCBvcDIpOworICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IGludFJlc3VsdCh0aGlz KTsKKworICAgICAgICAgICAgSklUQ29tcGlsZXI6Okp1bXBMaXN0IGZhaWx1cmVDYXNlczsKKyAg ICAgICAgICAgIG1faml0LmJyYW5jaENvbnZlcnREb3VibGVUb0ludDMyKHJlc3VsdC5mcHIoKSwg aW50UmVzdWx0LmdwcigpLCBmYWlsdXJlQ2FzZXMsIHNjcmF0Y2guZnByKCkpOworICAgICAgICAg ICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlUmVncygpLCBOb05vZGUsIGZhaWx1cmVDYXNlcyk7 CisKKyAgICAgICAgICAgIGludGVnZXJSZXN1bHQoaW50UmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJ bmRleCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorI2VuZGlmCisKICAgICAgICAg ZG91YmxlUmVzdWx0KHJlc3VsdC5mcHIoKSwgbV9jb21waWxlSW5kZXgpOwogICAgICAgICBicmVh azsKICAgICB9CiAKICAgICBjYXNlIEFyaXRoTW9kOiB7Ci0gICAgICAgIGlmIChhdChub2RlLmNo aWxkMSgpKS5zaG91bGROb3RTcGVjdWxhdGVJbnRlZ2VyKCkgfHwgYXQobm9kZS5jaGlsZDIoKSku c2hvdWxkTm90U3BlY3VsYXRlSW50ZWdlcigpCi0gICAgICAgICAgICB8fCAhbm9kZS5jYW5TcGVj dWxhdGVJbnRlZ2VyKCkpIHsKLSAgICAgICAgICAgIFNwZWN1bGF0ZURvdWJsZU9wZXJhbmQgb3Ax KHRoaXMsIG5vZGUuY2hpbGQxKCkpOwotICAgICAgICAgICAgU3BlY3VsYXRlRG91YmxlT3BlcmFu ZCBvcDIodGhpcywgbm9kZS5jaGlsZDIoKSk7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIEZQ UlJlZyBvcDFGUFIgPSBvcDEuZnByKCk7Ci0gICAgICAgICAgICBGUFJSZWcgb3AyRlBSID0gb3Ay LmZwcigpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBmbHVzaFJlZ2lzdGVycygpOwotICAg ICAgICAgICAgCi0gICAgICAgICAgICBGUFJSZXN1bHQgcmVzdWx0KHRoaXMpOworI2lmIENQVShY ODYpCisgICAgICAgIGlmICghYXQobm9kZS5jaGlsZDEoKSkuc2hvdWxkTm90U3BlY3VsYXRlSW50 ZWdlcigpICYmICFhdChub2RlLmNoaWxkMigpKS5zaG91bGROb3RTcGVjdWxhdGVJbnRlZ2VyKCkK KyAgICAgICAgICAgICYmIG5vZGUuY2FuU3BlY3VsYXRlSW50ZWdlcigpKSB7CisgICAgICAgICAg ICBTcGVjdWxhdGVJbnRlZ2VyT3BlcmFuZCBvcDEodGhpcywgbm9kZS5jaGlsZDEoKSk7CisgICAg ICAgICAgICBTcGVjdWxhdGVJbnRlZ2VyT3BlcmFuZCBvcDIodGhpcywgbm9kZS5jaGlsZDIoKSk7 CisgICAgICAgICAgICBHUFJUZW1wb3JhcnkgZWF4KHRoaXMsIFg4NlJlZ2lzdGVyczo6ZWF4KTsK KyAgICAgICAgICAgIEdQUlRlbXBvcmFyeSBlZHgodGhpcywgWDg2UmVnaXN0ZXJzOjplZHgpOwor ICAgICAgICAgICAgR1BSUmVnIG9wMUdwciA9IG9wMS5ncHIoKTsKKyAgICAgICAgICAgIEdQUlJl ZyBvcDJHcHIgPSBvcDIuZ3ByKCk7CiAKLSAgICAgICAgICAgIGNhbGxPcGVyYXRpb24oZm1vZFdp dGhDRGVjbCwgcmVzdWx0LmZwcigpLCBvcDFGUFIsIG9wMkZQUik7Ci0gICAgICAgICAgICAKLSAg ICAgICAgICAgIGRvdWJsZVJlc3VsdChyZXN1bHQuZnByKCksIG1fY29tcGlsZUluZGV4KTsKKyAg ICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soSlNWYWx1ZVJlZ3MoKSwgTm9Ob2RlLCBtX2ppdC5i cmFuY2hUZXN0MzIoSklUQ29tcGlsZXI6Olplcm8sIG9wMkdwcikpOworCisgICAgICAgICAgICBH UFJSZWcgdGVtcDIgPSBJbnZhbGlkR1BSUmVnOworICAgICAgICAgICAgaWYgKG9wMkdwciA9PSBY ODZSZWdpc3RlcnM6OmVheCB8fCBvcDJHcHIgPT0gWDg2UmVnaXN0ZXJzOjplZHgpIHsKKyAgICAg ICAgICAgICAgICB0ZW1wMiA9IGFsbG9jYXRlKCk7CisgICAgICAgICAgICAgICAgbV9qaXQubW92 ZShvcDJHcHIsIHRlbXAyKTsKKyAgICAgICAgICAgICAgICBvcDJHcHIgPSB0ZW1wMjsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgbV9qaXQubW92ZShvcDFHcHIsIGVheC5ncHIoKSk7Cisg ICAgICAgICAgICBtX2ppdC5hc3NlbWJsZXIoKS5jZHEoKTsKKyAgICAgICAgICAgIG1faml0LmFz c2VtYmxlcigpLmlkaXZsX3Iob3AyR3ByKTsKKworICAgICAgICAgICAgaWYgKHRlbXAyICE9IElu dmFsaWRHUFJSZWcpCisgICAgICAgICAgICAgICAgdW5sb2NrKHRlbXAyKTsKKworICAgICAgICAg ICAgaW50ZWdlclJlc3VsdChlZHguZ3ByKCksIG1fY29tcGlsZUluZGV4KTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9CisjZW5kaWYKICAgICAgICAgCi0gICAgICAgIFNwZWN1bGF0ZUlu dGVnZXJPcGVyYW5kIG9wMSh0aGlzLCBub2RlLmNoaWxkMSgpKTsKLSAgICAgICAgU3BlY3VsYXRl SW50ZWdlck9wZXJhbmQgb3AyKHRoaXMsIG5vZGUuY2hpbGQyKCkpOwotICAgICAgICBHUFJUZW1w b3JhcnkgZWF4KHRoaXMsIFg4NlJlZ2lzdGVyczo6ZWF4KTsKLSAgICAgICAgR1BSVGVtcG9yYXJ5 IGVkeCh0aGlzLCBYODZSZWdpc3RlcnM6OmVkeCk7Ci0gICAgICAgIEdQUlJlZyBvcDFHcHIgPSBv cDEuZ3ByKCk7Ci0gICAgICAgIEdQUlJlZyBvcDJHcHIgPSBvcDIuZ3ByKCk7Ci0KLSAgICAgICAg c3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlUmVncygpLCBOb05vZGUsIG1faml0LmJyYW5jaFRlc3Qz MihKSVRDb21waWxlcjo6WmVybywgb3AyR3ByKSk7CisgICAgICAgIFNwZWN1bGF0ZURvdWJsZU9w ZXJhbmQgb3AxKHRoaXMsIG5vZGUuY2hpbGQxKCkpOworICAgICAgICBTcGVjdWxhdGVEb3VibGVP cGVyYW5kIG9wMih0aGlzLCBub2RlLmNoaWxkMigpKTsKKyAgICAgICAgCisgICAgICAgIEZQUlJl ZyBvcDFGUFIgPSBvcDEuZnByKCk7CisgICAgICAgIEZQUlJlZyBvcDJGUFIgPSBvcDIuZnByKCk7 CisgICAgICAgIAorICAgICAgICBmbHVzaFJlZ2lzdGVycygpOworICAgICAgICAKKyAgICAgICAg RlBSUmVzdWx0IHJlc3VsdCh0aGlzKTsKIAotICAgICAgICBHUFJSZWcgdGVtcDIgPSBJbnZhbGlk R1BSUmVnOwotICAgICAgICBpZiAob3AyR3ByID09IFg4NlJlZ2lzdGVyczo6ZWF4IHx8IG9wMkdw ciA9PSBYODZSZWdpc3RlcnM6OmVkeCkgewotICAgICAgICAgICAgdGVtcDIgPSBhbGxvY2F0ZSgp OwotICAgICAgICAgICAgbV9qaXQubW92ZShvcDJHcHIsIHRlbXAyKTsKLSAgICAgICAgICAgIG9w MkdwciA9IHRlbXAyOwotICAgICAgICB9CisgICAgICAgIGNhbGxPcGVyYXRpb24oZm1vZEFzREZH T3BlcmF0aW9uLCByZXN1bHQuZnByKCksIG9wMUZQUiwgb3AyRlBSKTsKKyAgICAgICAgCisjaWYg IUNQVShYODYpCisgICAgICAgIGlmICghYXQobm9kZS5jaGlsZDEoKSkuc2hvdWxkTm90U3BlY3Vs YXRlSW50ZWdlcigpICYmICFhdChub2RlLmNoaWxkMigpKS5zaG91bGROb3RTcGVjdWxhdGVJbnRl Z2VyKCkKKyAgICAgICAgICAgICYmIG5vZGUuY2FuU3BlY3VsYXRlSW50ZWdlcigpKSB7CisgICAg ICAgICAgICBGUFJUZW1wb3Jhcnkgc2NyYXRjaCh0aGlzLCBvcDIpOworICAgICAgICAgICAgR1BS VGVtcG9yYXJ5IGludFJlc3VsdCh0aGlzKTsKIAotICAgICAgICBtX2ppdC5tb3ZlKG9wMUdwciwg ZWF4LmdwcigpKTsKLSAgICAgICAgbV9qaXQuYXNzZW1ibGVyKCkuY2RxKCk7Ci0gICAgICAgIG1f aml0LmFzc2VtYmxlcigpLmlkaXZsX3Iob3AyR3ByKTsKKyAgICAgICAgICAgIEpJVENvbXBpbGVy OjpKdW1wTGlzdCBmYWlsdXJlQ2FzZXM7CisgICAgICAgICAgICBtX2ppdC5icmFuY2hDb252ZXJ0 RG91YmxlVG9JbnQzMihyZXN1bHQuZnByKCksIGludFJlc3VsdC5ncHIoKSwgZmFpbHVyZUNhc2Vz LCBzY3JhdGNoLmZwcigpKTsKKyAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soSlNWYWx1ZVJl Z3MoKSwgTm9Ob2RlLCBmYWlsdXJlQ2FzZXMpOwogCi0gICAgICAgIGlmICh0ZW1wMiAhPSBJbnZh bGlkR1BSUmVnKQotICAgICAgICAgICAgdW5sb2NrKHRlbXAyKTsKKyAgICAgICAgICAgIGludGVn ZXJSZXN1bHQoaW50UmVzdWx0LmdwcigpLCBtX2NvbXBpbGVJbmRleCk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQorI2VuZGlmCiAKLSAgICAgICAgaW50ZWdlclJlc3VsdChlZHguZ3By KCksIG1fY29tcGlsZUluZGV4KTsKKyAgICAgICAgZG91YmxlUmVzdWx0KHJlc3VsdC5mcHIoKSwg bV9jb21waWxlSW5kZXgpOwogICAgICAgICBicmVhazsKICAgICB9CiAK