From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KyPhP-0007Vw-3Q for qemu-devel@nongnu.org; Fri, 07 Nov 2008 06:40:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KyPhN-0007Uk-LM for qemu-devel@nongnu.org; Fri, 07 Nov 2008 06:40:22 -0500 Received: from [199.232.76.173] (port=34168 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KyPhN-0007UZ-15 for qemu-devel@nongnu.org; Fri, 07 Nov 2008 06:40:21 -0500 Received: from rv-out-0708.google.com ([209.85.198.245]:25480) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KyPcI-0002ta-E7 for qemu-devel@nongnu.org; Fri, 07 Nov 2008 06:35:07 -0500 Received: by rv-out-0708.google.com with SMTP id f25so1014926rvb.22 for ; Fri, 07 Nov 2008 03:34:29 -0800 (PST) Message-ID: <761ea48b0811070334lb817c00x38624ca7bb41bb57@mail.gmail.com> Date: Fri, 7 Nov 2008 12:34:29 +0100 From: "Laurent Desnogues" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_49466_6969016.1226057669544" Subject: [Qemu-devel] [PATCH] Alpha: fix locked loads/stores Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_49466_6969016.1226057669544 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, this patch is based on Vince Weaver patch for locked loads/stores. It was checked against Alpha architecture manual. Two fixes were done to Vince's patch: - use a comparison to 1 for lock instead of 0 to be closer to the Alpha spec - fix reading of cpu_lock in gen_qemu_stql_c. On top of Vince's modifications, a new flag was added to gen_store_mem to allocate local temps instead of temps; this flag should be set when the tcg_gen_qemu_store callback uses brcond before using the temps or else liveness analysis will get rid of the temps. This also adds lock printing in cpu_dump_state which can help debug. Laurent Signed-off-by: Laurent Desnogues ------=_Part_49466_6969016.1226057669544 Content-Type: text/x-patch; name=alpha-ld-st-lock.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fn8r0cd70 Content-Disposition: attachment; filename=alpha-ld-st-lock.patch SW5kZXg6IHRhcmdldC1hbHBoYS9oZWxwZXIuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0YXJnZXQtYWxwaGEv aGVscGVyLmMJKHJldmlzaW9uIDU2NDMpCisrKyB0YXJnZXQtYWxwaGEvaGVscGVyLmMJKHdvcmtp bmcgY29weSkKQEAgLTQzNCw1ICs0MzQsNiBAQAogICAgICAgICBpZiAoKGkgJSAzKSA9PSAyKQog ICAgICAgICAgICAgY3B1X2ZwcmludGYoZiwgIlxuIik7CiAgICAgfQorICAgIGNwdV9mcHJpbnRm KGYsICJcbmxvY2sgJWRcbiIsIGVudi0+bG9jayk7CiB9CiAKSW5kZXg6IHRhcmdldC1hbHBoYS90 cmFuc2xhdGUuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSB0YXJnZXQtYWxwaGEvdHJhbnNsYXRlLmMJKHJldmlz aW9uIDU2NDMpCisrKyB0YXJnZXQtYWxwaGEvdHJhbnNsYXRlLmMJKHdvcmtpbmcgY29weSkKQEAg LTEzOCwxMyArMTM4LDEzIEBACiAKIHN0YXRpYyBhbHdheXNfaW5saW5lIHZvaWQgZ2VuX3FlbXVf bGRsX2wgKFRDR3YgdDAsIFRDR3YgdDEsIGludCBmbGFncykKIHsKLSAgICB0Y2dfZ2VuX21vdl9p NjQoY3B1X2xvY2ssIHQxKTsKKyAgICB0Y2dfZ2VuX21vdmlfaTY0KGNwdV9sb2NrLCAxKTsKICAg ICB0Y2dfZ2VuX3FlbXVfbGQzMnModDAsIHQxLCBmbGFncyk7CiB9CiAKIHN0YXRpYyBhbHdheXNf aW5saW5lIHZvaWQgZ2VuX3FlbXVfbGRxX2wgKFRDR3YgdDAsIFRDR3YgdDEsIGludCBmbGFncykK IHsKLSAgICB0Y2dfZ2VuX21vdl9pNjQoY3B1X2xvY2ssIHQxKTsKKyAgICB0Y2dfZ2VuX21vdmlf aTY0KGNwdV9sb2NrLCAxKTsKICAgICB0Y2dfZ2VuX3FlbXVfbGQ2NCh0MCwgdDEsIGZsYWdzKTsK IH0KIApAQCAtMjAxLDQyICsyMDEsMzggQEAKIAogc3RhdGljIGFsd2F5c19pbmxpbmUgdm9pZCBn ZW5fcWVtdV9zdGxfYyAoVENHdiB0MCwgVENHdiB0MSwgaW50IGZsYWdzKQogewotICAgIGludCBs MSwgbDI7CisgICAgaW50IGwxOwogCiAgICAgbDEgPSBnZW5fbmV3X2xhYmVsKCk7Ci0gICAgbDIg PSBnZW5fbmV3X2xhYmVsKCk7Ci0gICAgdGNnX2dlbl9icmNvbmRfaTY0KFRDR19DT05EX05FLCBj cHVfbG9jaywgdDEsIGwxKTsKKyAgICB0Y2dfZ2VuX2JyY29uZGlfaTY0KFRDR19DT05EX05FLCBj cHVfbG9jaywgMSwgbDEpOwogICAgIHRjZ19nZW5fcWVtdV9zdDMyKHQwLCB0MSwgZmxhZ3MpOwot ICAgIHRjZ19nZW5fbW92aV9pNjQodDAsIDApOwotICAgIHRjZ19nZW5fYnIobDIpOwogICAgIGdl bl9zZXRfbGFiZWwobDEpOwotICAgIHRjZ19nZW5fbW92aV9pNjQodDAsIDEpOwotICAgIGdlbl9z ZXRfbGFiZWwobDIpOwotICAgIHRjZ19nZW5fbW92aV9pNjQoY3B1X2xvY2ssIC0xKTsKKyAgICB0 Y2dfZ2VuX21vdl9pNjQodDAsIGNwdV9sb2NrKTsKKyAgICB0Y2dfZ2VuX21vdmlfaTY0KGNwdV9s b2NrLCAwKTsKIH0KIAogc3RhdGljIGFsd2F5c19pbmxpbmUgdm9pZCBnZW5fcWVtdV9zdHFfYyAo VENHdiB0MCwgVENHdiB0MSwgaW50IGZsYWdzKQogewotICAgIGludCBsMSwgbDI7CisgICAgaW50 IGwxOwogCiAgICAgbDEgPSBnZW5fbmV3X2xhYmVsKCk7Ci0gICAgbDIgPSBnZW5fbmV3X2xhYmVs KCk7Ci0gICAgdGNnX2dlbl9icmNvbmRfaTY0KFRDR19DT05EX05FLCBjcHVfbG9jaywgdDEsIGwx KTsKKyAgICB0Y2dfZ2VuX2JyY29uZGlfaTY0KFRDR19DT05EX05FLCBjcHVfbG9jaywgMSwgbDEp OwogICAgIHRjZ19nZW5fcWVtdV9zdDY0KHQwLCB0MSwgZmxhZ3MpOwotICAgIHRjZ19nZW5fbW92 aV9pNjQodDAsIDApOwotICAgIHRjZ19nZW5fYnIobDIpOwogICAgIGdlbl9zZXRfbGFiZWwobDEp OwotICAgIHRjZ19nZW5fbW92aV9pNjQodDAsIDEpOwotICAgIGdlbl9zZXRfbGFiZWwobDIpOwot ICAgIHRjZ19nZW5fbW92aV9pNjQoY3B1X2xvY2ssIC0xKTsKKyAgICB0Y2dfZ2VuX21vdl9pNjQo dDAsIGNwdV9sb2NrKTsKKyAgICB0Y2dfZ2VuX21vdmlfaTY0KGNwdV9sb2NrLCAwKTsKIH0KIAog c3RhdGljIGFsd2F5c19pbmxpbmUgdm9pZCBnZW5fc3RvcmVfbWVtIChEaXNhc0NvbnRleHQgKmN0 eCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAoKnRjZ19n ZW5fcWVtdV9zdG9yZSkoVENHdiB0MCwgVENHdiB0MSwgaW50IGZsYWdzKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHJhLCBpbnQgcmIsIGludDMyX3QgZGlz cDE2LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgZnAsIGlu dCBjbGVhcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGZw LCBpbnQgY2xlYXIsIGludCBsb2NhbCkKIHsKICAgICBUQ0d2IGFkZHIgPSB0Y2dfdGVtcF9uZXco VENHX1RZUEVfSTY0KTsKKyAgICBpZiAobG9jYWwpCisgICAgICAgIGFkZHIgPSB0Y2dfdGVtcF9s b2NhbF9uZXcoVENHX1RZUEVfSTY0KTsKKyAgICBlbHNlCisgICAgICAgIGFkZHIgPSB0Y2dfdGVt cF9uZXcoVENHX1RZUEVfSTY0KTsKICAgICBpZiAocmIgIT0gMzEpIHsKICAgICAgICAgdGNnX2dl bl9hZGRpX2k2NChhZGRyLCBjcHVfaXJbcmJdLCBkaXNwMTYpOwogICAgICAgICBpZiAoY2xlYXIp CkBAIC0yNTIsNyArMjQ4LDExIEBACiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRjZ19nZW5f cWVtdV9zdG9yZShjcHVfaXJbcmFdLCBhZGRyLCBjdHgtPm1lbV9pZHgpOwogICAgIH0gZWxzZSB7 Ci0gICAgICAgIFRDR3YgemVybyA9IHRjZ19jb25zdF9pNjQoMCk7CisgICAgICAgIFRDR3YgemVy bzsKKyAgICAgICAgaWYgKGxvY2FsKQorICAgICAgICAgICAgemVybyA9IHRjZ19jb25zdF9sb2Nh bF9pNjQoMCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHplcm8gPSB0Y2dfY29uc3RfaTY0 KDApOwogICAgICAgICB0Y2dfZ2VuX3FlbXVfc3RvcmUoemVybywgYWRkciwgY3R4LT5tZW1faWR4 KTsKICAgICAgICAgdGNnX3RlbXBfZnJlZSh6ZXJvKTsKICAgICB9CkBAIC02MzYsMTUgKzYzNiwx NSBAQAogICAgICAgICBicmVhazsKICAgICBjYXNlIDB4MEQ6CiAgICAgICAgIC8qIFNUVyAqLwot ICAgICAgICBnZW5fc3RvcmVfbWVtKGN0eCwgJnRjZ19nZW5fcWVtdV9zdDE2LCByYSwgcmIsIGRp c3AxNiwgMCwgMCk7CisgICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAmdGNnX2dlbl9xZW11X3N0 MTYsIHJhLCByYiwgZGlzcDE2LCAwLCAwLCAwKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSAw eDBFOgogICAgICAgICAvKiBTVEIgKi8KLSAgICAgICAgZ2VuX3N0b3JlX21lbShjdHgsICZ0Y2df Z2VuX3FlbXVfc3Q4LCByYSwgcmIsIGRpc3AxNiwgMCwgMCk7CisgICAgICAgIGdlbl9zdG9yZV9t ZW0oY3R4LCAmdGNnX2dlbl9xZW11X3N0OCwgcmEsIHJiLCBkaXNwMTYsIDAsIDAsIDApOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIDB4MEY6CiAgICAgICAgIC8qIFNUUV9VICovCi0gICAgICAg IGdlbl9zdG9yZV9tZW0oY3R4LCAmdGNnX2dlbl9xZW11X3N0NjQsIHJhLCByYiwgZGlzcDE2LCAw LCAxKTsKKyAgICAgICAgZ2VuX3N0b3JlX21lbShjdHgsICZ0Y2dfZ2VuX3FlbXVfc3Q2NCwgcmEs IHJiLCBkaXNwMTYsIDAsIDEsIDApOwogICAgICAgICBicmVhazsKICAgICBjYXNlIDB4MTA6CiAg ICAgICAgIHN3aXRjaCAoZm43KSB7CkBAIC0yMDkwLDE5ICsyMDkwLDE5IEBACiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgMHgyNDoKICAgICAgICAgLyogU1RGICovCi0gICAgICAgIGdlbl9zdG9y ZV9tZW0oY3R4LCAmZ2VuX3FlbXVfc3RmLCByYSwgcmIsIGRpc3AxNiwgMSwgMCk7CisgICAgICAg IGdlbl9zdG9yZV9tZW0oY3R4LCAmZ2VuX3FlbXVfc3RmLCByYSwgcmIsIGRpc3AxNiwgMSwgMCwg MCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgMHgyNToKICAgICAgICAgLyogU1RHICovCi0g ICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAmZ2VuX3FlbXVfc3RnLCByYSwgcmIsIGRpc3AxNiwg MSwgMCk7CisgICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAmZ2VuX3FlbXVfc3RnLCByYSwgcmIs IGRpc3AxNiwgMSwgMCwgMCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgMHgyNjoKICAgICAg ICAgLyogU1RTICovCi0gICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAmZ2VuX3FlbXVfc3RzLCBy YSwgcmIsIGRpc3AxNiwgMSwgMCk7CisgICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAmZ2VuX3Fl bXVfc3RzLCByYSwgcmIsIGRpc3AxNiwgMSwgMCwgMCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgMHgyNzoKICAgICAgICAgLyogU1RUICovCi0gICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAm dGNnX2dlbl9xZW11X3N0NjQsIHJhLCByYiwgZGlzcDE2LCAxLCAwKTsKKyAgICAgICAgZ2VuX3N0 b3JlX21lbShjdHgsICZ0Y2dfZ2VuX3FlbXVfc3Q2NCwgcmEsIHJiLCBkaXNwMTYsIDEsIDAsIDAp OwogICAgICAgICBicmVhazsKICAgICBjYXNlIDB4Mjg6CiAgICAgICAgIC8qIExETCAqLwpAQCAt MjEyMiwxOSArMjEyMiwxOSBAQAogICAgICAgICBicmVhazsKICAgICBjYXNlIDB4MkM6CiAgICAg ICAgIC8qIFNUTCAqLwotICAgICAgICBnZW5fc3RvcmVfbWVtKGN0eCwgJnRjZ19nZW5fcWVtdV9z dDMyLCByYSwgcmIsIGRpc3AxNiwgMCwgMCk7CisgICAgICAgIGdlbl9zdG9yZV9tZW0oY3R4LCAm dGNnX2dlbl9xZW11X3N0MzIsIHJhLCByYiwgZGlzcDE2LCAwLCAwLCAwKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSAweDJEOgogICAgICAgICAvKiBTVFEgKi8KLSAgICAgICAgZ2VuX3N0b3Jl X21lbShjdHgsICZ0Y2dfZ2VuX3FlbXVfc3Q2NCwgcmEsIHJiLCBkaXNwMTYsIDAsIDApOworICAg ICAgICBnZW5fc3RvcmVfbWVtKGN0eCwgJnRjZ19nZW5fcWVtdV9zdDY0LCByYSwgcmIsIGRpc3Ax NiwgMCwgMCwgMCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgMHgyRToKICAgICAgICAgLyog U1RMX0MgKi8KLSAgICAgICAgZ2VuX3N0b3JlX21lbShjdHgsICZnZW5fcWVtdV9zdGxfYywgcmEs IHJiLCBkaXNwMTYsIDAsIDApOworICAgICAgICBnZW5fc3RvcmVfbWVtKGN0eCwgJmdlbl9xZW11 X3N0bF9jLCByYSwgcmIsIGRpc3AxNiwgMCwgMCwgMSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgMHgyRjoKICAgICAgICAgLyogU1RRX0MgKi8KLSAgICAgICAgZ2VuX3N0b3JlX21lbShjdHgs ICZnZW5fcWVtdV9zdHFfYywgcmEsIHJiLCBkaXNwMTYsIDAsIDApOworICAgICAgICBnZW5fc3Rv cmVfbWVtKGN0eCwgJmdlbl9xZW11X3N0cV9jLCByYSwgcmIsIGRpc3AxNiwgMCwgMCwgMSk7CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgMHgzMDoKICAgICAgICAgLyogQlIgKi8K ------=_Part_49466_6969016.1226057669544--