From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14311 invoked by alias); 15 Jan 2013 08:09:40 -0000 Received: (qmail 14301 invoked by uid 22791); 15 Jan 2013 08:09:39 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KHOP_RCVD_TRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,TW_ZJ X-Spam-Check-By: sourceware.org Received: from mail-oa0-f53.google.com (HELO mail-oa0-f53.google.com) (209.85.219.53) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 Jan 2013 08:09:33 +0000 Received: by mail-oa0-f53.google.com with SMTP id j6so4918378oag.26 for ; Tue, 15 Jan 2013 00:09:32 -0800 (PST) MIME-Version: 1.0 Received: by 10.60.0.138 with SMTP id 10mr53218898oee.142.1358237372823; Tue, 15 Jan 2013 00:09:32 -0800 (PST) Received: by 10.182.153.201 with HTTP; Tue, 15 Jan 2013 00:09:32 -0800 (PST) Date: Tue, 15 Jan 2013 08:09:00 -0000 Message-ID: Subject: [PATCH, RFA]: Properly mask memory model argument with MEMMODEL_MASK From: Uros Bizjak To: gcc-patches@gcc.gnu.org Content-Type: multipart/mixed; boundary=e89a8fb204c420b6df04d34f48b7 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-01/txt/msg00763.txt.bz2 --e89a8fb204c420b6df04d34f48b7 Content-Type: text/plain; charset=ISO-8859-1 Content-length: 795 Hello! Attached fairly mechanical patch adds missing memory model argument masks when comparing comparing with various MEMMODEL_* types. Please note that we can modify the memory model with target flags, IX86_HLE_* in case of x86. Also, please note that this patch doesn't touch tsan.c. 2013-01-15 Uros Bizjak * emit-rtl.c (need_atomic_barrier_p): Mask memory model argument with MEMMODEL_MASK before comparing with MEMMODEL_* memory types. * optabs.c (maybe_emit_sync_lock_test_and_set): Ditto. (expand_mem_thread_fence): Ditto. (expand_mem_signal_fence): Ditto. (expand_atomic_load): Ditto. (expand_atomic_store): Ditto. Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}. OK for mainline? Uros. --e89a8fb204c420b6df04d34f48b7 Content-Type: text/plain; charset=US-ASCII; name="m.diff.txt" Content-Disposition: attachment; filename="m.diff.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hbyrg08s0 Content-length: 3754 SW5kZXg6IGVtaXQtcnRsLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g ZW1pdC1ydGwuYwkocmV2aXNpb24gMTk1MTUyKQorKysgZW1pdC1ydGwuYwko d29ya2luZyBjb3B5KQpAQCAtNjAxNCw3ICs2MDE0LDcgQEAgaW5zbl9maWxl IChjb25zdF9ydHggaW5zbikKIGJvb2wKIG5lZWRfYXRvbWljX2JhcnJpZXJf cCAoZW51bSBtZW1tb2RlbCBtb2RlbCwgYm9vbCBwcmUpCiB7Ci0gIHN3aXRj aCAobW9kZWwpCisgIHN3aXRjaCAobW9kZWwgJiBNRU1NT0RFTF9NQVNLKQog ICAgIHsKICAgICBjYXNlIE1FTU1PREVMX1JFTEFYRUQ6CiAgICAgY2FzZSBN RU1NT0RFTF9DT05TVU1FOgpJbmRleDogb3B0YWJzLmMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gb3B0YWJzLmMJKHJldmlzaW9uIDE5NTE1MikKKysr IG9wdGFicy5jCSh3b3JraW5nIGNvcHkpCkBAIC03MDA4LDkgKzcwMDgsOSBA QCBtYXliZV9lbWl0X3N5bmNfbG9ja190ZXN0X2FuZF9zZXQgKHJ0eCB0YXJn ZXQsIHJ0eAogICAgICBleGlzdHMsIGFuZCB0aGUgbWVtb3J5IG1vZGVsIGlz IHN0cm9uZ2VyIHRoYW4gYWNxdWlyZSwgYWRkIGEgcmVsZWFzZSAKICAgICAg YmFycmllciBiZWZvcmUgdGhlIGluc3RydWN0aW9uLiAgKi8KIAotICBpZiAo bW9kZWwgPT0gTUVNTU9ERUxfU0VRX0NTVAotICAgICAgfHwgbW9kZWwgPT0g TUVNTU9ERUxfUkVMRUFTRQotICAgICAgfHwgbW9kZWwgPT0gTUVNTU9ERUxf QUNRX1JFTCkKKyAgaWYgKChtb2RlbCAmIE1FTU1PREVMX01BU0spID09IE1F TU1PREVMX1NFUV9DU1QKKyAgICAgIHx8IChtb2RlbCAmIE1FTU1PREVMX01B U0spID09IE1FTU1PREVMX1JFTEVBU0UKKyAgICAgIHx8IChtb2RlbCAmIE1F TU1PREVMX01BU0spID09IE1FTU1PREVMX0FDUV9SRUwpCiAgICAgZXhwYW5k X21lbV90aHJlYWRfZmVuY2UgKG1vZGVsKTsKIAogICBpZiAoaWNvZGUgIT0g Q09ERV9GT1Jfbm90aGluZykKQEAgLTczODgsNyArNzM4OCw3IEBAIGV4cGFu ZF9tZW1fdGhyZWFkX2ZlbmNlIChlbnVtIG1lbW1vZGVsIG1vZGVsKQogewog ICBpZiAoSEFWRV9tZW1fdGhyZWFkX2ZlbmNlKQogICAgIGVtaXRfaW5zbiAo Z2VuX21lbV90aHJlYWRfZmVuY2UgKEdFTl9JTlQgKG1vZGVsKSkpOwotICBl bHNlIGlmIChtb2RlbCAhPSBNRU1NT0RFTF9SRUxBWEVEKQorICBlbHNlIGlm ICgobW9kZWwgJiBNRU1NT0RFTF9NQVNLKSAhPSBNRU1NT0RFTF9SRUxBWEVE KQogICAgIHsKICAgICAgIGlmIChIQVZFX21lbW9yeV9iYXJyaWVyKQogCWVt aXRfaW5zbiAoZ2VuX21lbW9yeV9iYXJyaWVyICgpKTsKQEAgLTc0MTIsNyAr NzQxMiw3IEBAIGV4cGFuZF9tZW1fc2lnbmFsX2ZlbmNlIChlbnVtIG1lbW1v ZGVsIG1vZGVsKQogewogICBpZiAoSEFWRV9tZW1fc2lnbmFsX2ZlbmNlKQog ICAgIGVtaXRfaW5zbiAoZ2VuX21lbV9zaWduYWxfZmVuY2UgKEdFTl9JTlQg KG1vZGVsKSkpOwotICBlbHNlIGlmIChtb2RlbCAhPSBNRU1NT0RFTF9SRUxB WEVEKQorICBlbHNlIGlmICgobW9kZWwgJiBNRU1NT0RFTF9NQVNLKSAhPSBN RU1NT0RFTF9SRUxBWEVEKQogICAgIHsKICAgICAgIC8qIEJ5IGRlZmF1bHQg dGFyZ2V0cyBhcmUgY29oZXJlbnQgYmV0d2VlbiBhIHRocmVhZCBhbmQgdGhl IHNpZ25hbAogCSBoYW5kbGVyIHJ1bm5pbmcgb24gdGhlIHNhbWUgdGhyZWFk LiAgVGh1cyB0aGlzIHJlYWxseSBiZWNvbWVzIGEKQEAgLTc0NjcsNyArNzQ2 Nyw3IEBAIGV4cGFuZF9hdG9taWNfbG9hZCAocnR4IHRhcmdldCwgcnR4IG1l bSwgZW51bSBtZW1tCiAgICAgdGFyZ2V0ID0gZ2VuX3JlZ19ydHggKG1vZGUp OwogCiAgIC8qIEZvciBTRVFfQ1NULCBlbWl0IGEgYmFycmllciBiZWZvcmUg dGhlIGxvYWQuICAqLwotICBpZiAobW9kZWwgPT0gTUVNTU9ERUxfU0VRX0NT VCkKKyAgaWYgKChtb2RlbCAmIE1FTU1PREVMX01BU0spID09IE1FTU1PREVM X1NFUV9DU1QpCiAgICAgZXhwYW5kX21lbV90aHJlYWRfZmVuY2UgKG1vZGVs KTsKIAogICBlbWl0X21vdmVfaW5zbiAodGFyZ2V0LCBtZW0pOwpAQCAtNzUx Myw3ICs3NTEzLDcgQEAgZXhwYW5kX2F0b21pY19zdG9yZSAocnR4IG1lbSwg cnR4IHZhbCwgZW51bSBtZW1tb2QKIAkgIGlmIChtYXliZV9leHBhbmRfaW5z biAoaWNvZGUsIDIsIG9wcykpCiAJICAgIHsKIAkgICAgICAvKiBsb2NrX3Jl bGVhc2UgaXMgb25seSBhIHJlbGVhc2UgYmFycmllci4gICovCi0JICAgICAg aWYgKG1vZGVsID09IE1FTU1PREVMX1NFUV9DU1QpCisJICAgICAgaWYgKCht b2RlbCAmIE1FTU1PREVMX01BU0spID09IE1FTU1PREVMX1NFUV9DU1QpCiAJ CWV4cGFuZF9tZW1fdGhyZWFkX2ZlbmNlIChtb2RlbCk7CiAJICAgICAgcmV0 dXJuIGNvbnN0MF9ydHg7CiAJICAgIH0KQEAgLTc1NDAsNyArNzU0MCw3IEBA IGV4cGFuZF9hdG9taWNfc3RvcmUgKHJ0eCBtZW0sIHJ0eCB2YWwsIGVudW0g bWVtbW9kCiAgIGVtaXRfbW92ZV9pbnNuIChtZW0sIHZhbCk7CiAKICAgLyog Rm9yIFNFUV9DU1QsIGFsc28gZW1pdCBhIGJhcnJpZXIgYWZ0ZXIgdGhlIHN0 b3JlLiAgKi8KLSAgaWYgKG1vZGVsID09IE1FTU1PREVMX1NFUV9DU1QpCisg IGlmICgobW9kZWwgJiBNRU1NT0RFTF9NQVNLKSA9PSBNRU1NT0RFTF9TRVFf Q1NUKQogICAgIGV4cGFuZF9tZW1fdGhyZWFkX2ZlbmNlIChtb2RlbCk7CiAK ICAgcmV0dXJuIGNvbnN0MF9ydHg7Cg== --e89a8fb204c420b6df04d34f48b7--