From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbuAZ-00075q-EC for qemu-devel@nongnu.org; Fri, 14 Aug 2009 06:37:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbuAT-00071Z-JN for qemu-devel@nongnu.org; Fri, 14 Aug 2009 06:37:57 -0400 Received: from [199.232.76.173] (port=60421 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbuAT-00071W-Aa for qemu-devel@nongnu.org; Fri, 14 Aug 2009 06:37:53 -0400 Received: from mail-yx0-f188.google.com ([209.85.210.188]:57109) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbuAS-0006zE-HZ for qemu-devel@nongnu.org; Fri, 14 Aug 2009 06:37:52 -0400 Received: by yxe26 with SMTP id 26so1803823yxe.4 for ; Fri, 14 Aug 2009 03:37:51 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: From: Artyom Tarasenko Date: Fri, 14 Aug 2009 12:37:31 +0200 Message-ID: Subject: Re: [Qemu-devel] [Patch] sparc32 remove an unnecessary cpu irq set Content-Type: multipart/mixed; boundary=0016361e8806dff6de047117a443 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: qemu-devel --0016361e8806dff6de047117a443 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 2009/8/13 Blue Swirl : > On Thu, Aug 13, 2009 at 6:44 PM, Artyom > Tarasenko wrote: >> 2009/8/12 Igor Kovalenko : >>> PUT_PSR is asking to be made inline function with arch-specific parts, >>> the sparc64 counterpart is too similar. >> Ok, here we go: > > Sorry, it does not apply. Ups, copy&paste error, sorry. This time I send it as an attachment. >> -#if !defined(CONFIG_USER_ONLY) >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_check_irqs(= env); >> -#endif > > This should be in a separate patch, preferably one with the check > moved to helper_wrpsr. But that's the purpose of the patch. The check is moved to PUT_PSR, not to helper_wrpsr, because helper_wrpsr is not the only function calling PUT_PSR. From the code I can't tell that the other calls can not trigger an irq as well. >> +/* sum4m.c, sun4u.c */ >> +void cpu_check_irqs(CPUSPARCState *env); > > The prototypes should remain in header files. The two lines are moved from the line number 481 to the line number 588 within the same file. Btw there's a typo, I guess it should be su_n_4m. :) Fixed this too. --0016361e8806dff6de047117a443 Content-Type: text/plain; charset=US-ASCII; name="0001-fix-multiple-irq-set.patch" Content-Disposition: attachment; filename="0001-fix-multiple-irq-set.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fycs9e4a0 U2lnbmVkLW9mZi1ieTogQXJ0eW9tIFRhcmFzZW5rbyA8YXRhcjRxZW11QGdtYWlsLmNvbT4KLS0t CmRpZmYgLS1naXQgYS9jcHUtZXhlYy5jIGIvY3B1LWV4ZWMuYwppbmRleCAxNzE4ZGM0Li4yYjc0 YWVlIDEwMDY0NAotLS0gYS9jcHUtZXhlYy5jCisrKyBiL2NwdS1leGVjLmMKQEAgLTQ4NSw5ICs0 ODUsNiBAQCBpbnQgY3B1X2V4ZWMoQ1BVU3RhdGUgKmVudjEpCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZW52LT5leGNlcHRpb25faW5kZXggPSBlbnYtPmludGVycnVwdF9pbmRleDsKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkb19pbnRlcnJ1cHQoZW52KTsKIAkJCSAgICBlbnYt PmludGVycnVwdF9pbmRleCA9IDA7Ci0jaWYgIWRlZmluZWQoQ09ORklHX1VTRVJfT05MWSkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjcHVfY2hlY2tfaXJxcyhlbnYpOwotI2VuZGlmCiAg ICAgICAgICAgICAgICAgICAgICAgICBuZXh0X3RiID0gMDsKIAkJCX0KIAkJICAgIH0gZWxzZSBp ZiAoaW50ZXJydXB0X3JlcXVlc3QgJiBDUFVfSU5URVJSVVBUX1RJTUVSKSB7CmRpZmYgLS1naXQg YS90YXJnZXQtc3BhcmMvY3B1LmggYi90YXJnZXQtc3BhcmMvY3B1LmgKaW5kZXggMjQyOGJiMi4u MTlhODFjNCAxMDA2NDQKLS0tIGEvdGFyZ2V0LXNwYXJjL2NwdS5oCisrKyBiL3RhcmdldC1zcGFy Yy9jcHUuaApAQCAtNDM5LDYgKzQzOSwyMSBAQCBpbnQgY3B1X3NwYXJjX2V4ZWMoQ1BVU1BBUkNT dGF0ZSAqcyk7CiAjZW5kaWYKIAogI2lmbmRlZiBOT19DUFVfSU9fREVGUworCitzdGF0aWMgaW5s aW5lIGludCBjcHVfY3dwX2luYyhDUFVTUEFSQ1N0YXRlICplbnYxLCBpbnQgY3dwKQoreworICAg IGlmICh1bmxpa2VseShjd3AgPj0gZW52MS0+bndpbmRvd3MpKQorICAgICAgICBjd3AgLT0gZW52 MS0+bndpbmRvd3M7CisgICAgcmV0dXJuIGN3cDsKK30KKworc3RhdGljIGlubGluZSBpbnQgY3B1 X2N3cF9kZWMoQ1BVU1BBUkNTdGF0ZSAqZW52MSwgaW50IGN3cCkKK3sKKyAgICBpZiAodW5saWtl bHkoY3dwIDwgMCkpCisgICAgICAgIGN3cCArPSBlbnYxLT5ud2luZG93czsKKyAgICByZXR1cm4g Y3dwOworfQorI2VuZGlmCiBzdGF0aWMgaW5saW5lIHZvaWQgbWVtY3B5MzIodGFyZ2V0X3Vsb25n ICpkc3QsIGNvbnN0IHRhcmdldF91bG9uZyAqc3JjKQogewogICAgIGRzdFswXSA9IHNyY1swXTsK QEAgLTQ2Myw0MyArNDc4LDMwIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBjcHVfc2V0X2N3cChDUFVT UEFSQ1N0YXRlICplbnYxLCBpbnQgbmV3X2N3cCkKICAgICBlbnYxLT5yZWd3cHRyID0gZW52MS0+ cmVnYmFzZSArIChuZXdfY3dwICogMTYpOwogfQogCi1zdGF0aWMgaW5saW5lIGludCBjcHVfY3dw X2luYyhDUFVTUEFSQ1N0YXRlICplbnYxLCBpbnQgY3dwKQotewotICAgIGlmICh1bmxpa2VseShj d3AgPj0gZW52MS0+bndpbmRvd3MpKQotICAgICAgICBjd3AgLT0gZW52MS0+bndpbmRvd3M7Ci0g ICAgcmV0dXJuIGN3cDsKLX0KKy8qIHN1bjRtLmMsIHN1bjR1LmMgKi8KK3ZvaWQgY3B1X2NoZWNr X2lycXMoQ1BVU1BBUkNTdGF0ZSAqZW52KTsKIAotc3RhdGljIGlubGluZSBpbnQgY3B1X2N3cF9k ZWMoQ1BVU1BBUkNTdGF0ZSAqZW52MSwgaW50IGN3cCkKK3N0YXRpYyBpbmxpbmUgdm9pZCBQVVRf UFNSKENQVVNQQVJDU3RhdGUgKmVudiwgdGFyZ2V0X3Vsb25nIHZhbCkKIHsKLSAgICBpZiAodW5s aWtlbHkoY3dwIDwgMCkpCi0gICAgICAgIGN3cCArPSBlbnYxLT5ud2luZG93czsKLSAgICByZXR1 cm4gY3dwOwotfQorICAgIGVudi0+cHNyID0gdmFsICYgUFNSX0lDQzsKKyAgICBlbnYtPnBzcmVm ID0gKHZhbCAmIFBTUl9FRik/IDEgOiAwOworI2lmICgoIWRlZmluZWQgKFRBUkdFVF9TUEFSQzY0 KSkgJiYgIWRlZmluZWQoQ09ORklHX1VTRVJfT05MWSkpCisgICAgaW50IF9uZXdwc3JwaWw9KHZh bCAmIFBTUl9QSUwpID4+IDg7CisgICAgaWYoKF9uZXdwc3JwaWw+ZW52LT5wc3JwaWwpJiYgKChl bnYtPnBpbF9pbiYxNSk+X25ld3BzcnBpbCkpIHsKKyAgICAgICBlbnYtPnBzcnBpbCA9IF9uZXdw c3JwaWw7CisgICAgICAgY3B1X2NoZWNrX2lycXMoZW52KTsKKyAgICB9IGVsc2UgZW52LT5wc3Jw aWwgPSBfbmV3cHNycGlsOworI2Vsc2UKKyAgICBlbnYtPnBzcnBpbCA9ICh2YWwgJiBQU1JfUElM KSA+PiA4OwogI2VuZGlmCi0KKyAgICBlbnYtPnBzcnMgPSAodmFsICYgUFNSX1MpPyAxIDogMDsK KyAgICBlbnYtPnBzcnBzID0gKHZhbCAmIFBTUl9QUyk/IDEgOiAwOwogI2lmICFkZWZpbmVkIChU QVJHRVRfU1BBUkM2NCkKLSNkZWZpbmUgUFVUX1BTUihlbnYsIHZhbCkgZG8geyBpbnQgX3RtcCA9 IHZhbDsgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgZW52LT5wc3IgPSBfdG1w ICYgUFNSX0lDQzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAg ICAgZW52LT5wc3JlZiA9IChfdG1wICYgUFNSX0VGKT8gMSA6IDA7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKLSAgICAgICAgZW52LT5wc3JwaWwgPSAoX3RtcCAmIFBTUl9QSUwpID4+IDg7 ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgZW52LT5wc3JzID0gKF90bXAg JiBQU1JfUyk/IDEgOiAwOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg ZW52LT5wc3JwcyA9IChfdG1wICYgUFNSX1BTKT8gMSA6IDA7ICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKLSAgICAgICAgZW52LT5wc3JldCA9IChfdG1wICYgUFNSX0VUKT8gMSA6IDA7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgY3B1X3NldF9jd3AoZW52LCBfdG1w ICYgUFNSX0NXUCk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgQ0Nf T1AgPSBDQ19PUF9GTEFHUzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKLSAgICB9IHdoaWxlICgwKQotI2Vsc2UKLSNkZWZpbmUgUFVUX1BTUihlbnYsIHZhbCkg ZG8geyBpbnQgX3RtcCA9IHZhbDsgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg ZW52LT5wc3IgPSBfdG1wICYgUFNSX0lDQzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKLSAgICAgICAgZW52LT5wc3JlZiA9IChfdG1wICYgUFNSX0VGKT8gMSA6IDA7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgZW52LT5wc3JwaWwgPSAoX3RtcCAm IFBTUl9QSUwpID4+IDg7ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgZW52 LT5wc3JzID0gKF90bXAgJiBQU1JfUyk/IDEgOiAwOyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKLSAgICAgICAgZW52LT5wc3JwcyA9IChfdG1wICYgUFNSX1BTKT8gMSA6IDA7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgY3B1X3NldF9jd3AoZW52LCBfdG1wICYg UFNSX0NXUCk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgQ0NfT1Ag PSBDQ19PUF9GTEFHUzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICB9IHdoaWxlICgwKQorICAgIGVudi0+cHNyZXQgPSAodmFsICYgUFNSX0VUKT8gMSA6 IDA7CiAjZW5kaWYKKyAgICBjcHVfc2V0X2N3cChlbnYsIHZhbCAmIFBTUl9DV1ApOworICAgIEND X09QID0gQ0NfT1BfRkxBR1M7Cit9CiAKICNpZmRlZiBUQVJHRVRfU1BBUkM2NAogI2RlZmluZSBH RVRfQ0NSKGVudikgKCgoZW52LT54Y2MgPj4gMjApIDw8IDQpIHwgKChlbnYtPnBzciAmIFBTUl9J Q0MpID4+IDIwKSkKQEAgLTU4NSw5ICs1ODcsNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY3B1X2Ns b25lX3JlZ3MoQ1BVU3RhdGUgKmVudiwgdGFyZ2V0X3Vsb25nIG5ld3NwKQogI2luY2x1ZGUgImNw dS1hbGwuaCIKICNpbmNsdWRlICJleGVjLWFsbC5oIgogCi0vKiBzdW00bS5jLCBzdW40dS5jICov Ci12b2lkIGNwdV9jaGVja19pcnFzKENQVVNQQVJDU3RhdGUgKmVudik7Ci0KICNpZmRlZiBUQVJH RVRfU1BBUkM2NAogLyogc3VuNHUuYyAqLwogdm9pZCBjcHVfdGlja19zZXRfY291bnQodm9pZCAq b3BhcXVlLCB1aW50NjRfdCBjb3VudCk7Cg== --0016361e8806dff6de047117a443--