From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.86_2) id 1hqaTv-0007T5-J8 for mharc-qemu-riscv@gnu.org; Thu, 25 Jul 2019 05:56:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45709) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqaTt-0007RB-3L for qemu-riscv@nongnu.org; Thu, 25 Jul 2019 05:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqaTs-0001US-1E for qemu-riscv@nongnu.org; Thu, 25 Jul 2019 05:56:13 -0400 Received: from smtpe1.intersmtp.com ([213.121.35.79]:35214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqaTl-0001Kt-H0; Thu, 25 Jul 2019 05:56:07 -0400 Received: from tpw09926dag18h.domain1.systemhost.net (10.9.212.42) by BWP09926084.bt.com (10.36.82.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1713.5; Thu, 25 Jul 2019 10:55:57 +0100 Received: from tpw09926dag18e.domain1.systemhost.net (10.9.212.18) by tpw09926dag18h.domain1.systemhost.net (10.9.212.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 25 Jul 2019 10:55:59 +0100 Received: from tpw09926dag18e.domain1.systemhost.net ([fe80::a946:6348:ccf4:fa6c]) by tpw09926dag18e.domain1.systemhost.net ([fe80::a946:6348:ccf4:fa6c%12]) with mapi id 15.00.1395.000; Thu, 25 Jul 2019 10:55:59 +0100 From: To: CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , Thread-Topic: [Qemu-devel] [PATCH v4 10/15] memory: Access MemoryRegion with MemOp semantics Thread-Index: AQHVQs8px7kJYyCpkkqn1mCQ3wVnbg== Date: Thu, 25 Jul 2019 09:55:59 +0000 Message-ID: <1564048559228.36766@bt.com> References: <45d1ebe4b2ed4c039c9da20a738652df@tpw09926dag18e.domain1.systemhost.net> In-Reply-To: <45d1ebe4b2ed4c039c9da20a738652df@tpw09926dag18e.domain1.systemhost.net> Accept-Language: en-AU, en-GB, en-US Content-Language: en-AU X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.187.101.42] Content-Type: multipart/alternative; boundary="_000_156404855922836766btcom_" MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 213.121.35.79 Subject: [Qemu-riscv] [Qemu-devel] [PATCH v4 10/15] memory: Access MemoryRegion with MemOp semantics X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jul 2019 09:56:14 -0000 --_000_156404855922836766btcom_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To convert interfaces of MemoryRegion access, MEMOP_SIZE and SIZE_MEMOP no-op stubs were introduced to change syntax while keeping the existing semantics. Now with interfaces converted, we fill the stubs and use MemOp semantics. Signed-off-by: Tony Nguyen --- include/exec/memop.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/exec/memop.h b/include/exec/memop.h index 09c8d20..f2847e8 100644 --- a/include/exec/memop.h +++ b/include/exec/memop.h @@ -106,8 +106,7 @@ typedef enum MemOp { MO_SSIZE =3D MO_SIZE | MO_SIGN, } MemOp; -/* No-op while memory_region_dispatch_[read|write] is converted to MemOp *= / -#define MEMOP_SIZE(op) (op) /* MemOp to size. */ -#define SIZE_MEMOP(ul) (ul) /* Size to MemOp. */ +#define MEMOP_SIZE(op) (1 << ((op) & MO_SIZE)) /* MemOp to size. */ +#define SIZE_MEMOP(ul) (ctzl(ul)) /* Size to MemOp. */ #endif -- 1.8.3.1 --_000_156404855922836766btcom_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

To convert interfaces of MemoryRegion= access, MEMOP_SIZE and
SIZE_MEMOP no-op stubs were introduced to change syntax while keeping<= /div>
the existing semantics.

Now with interfaces converted, we fill the stubs and use MemOp
semantics.

Signed-off-by: Tony Nguyen <tony.nguyen@bt.com>
---
 include/exec/memop.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/exec/memop.h b/include/exec/memop.h
index 09c8d20..f2847e8 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -106,8 +106,7 @@ typedef enum MemOp {
     MO_SSIZE =3D MO_SIZE | MO_SIGN,
 } MemOp;
 
-/* No-op while memory_region_dispatch_[read|write] is converted to Me= mOp */
-#define MEMOP_SIZE(op)  (op)    /* MemOp to size. &nbs= p;*/
-#define SIZE_MEMOP(ul)  (ul)    /* Size to MemOp. &nbs= p;*/
+#define MEMOP_SIZE(op)  (1 << ((op) & MO_SIZE)) /*= MemOp to size.  */
+#define SIZE_MEMOP(ul)  (ctzl(ul))       &nbs= p;      /* Size to MemOp.  */
 
 #endif
-- 
1.8.3.1



--_000_156404855922836766btcom_-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:51d0:0:0:0:0:0 with SMTP id n16csp10424753wrv; Thu, 25 Jul 2019 02:56:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIA3mT/OOoA3T/jr0TwzJ/jfdNtfsQKytga7ylUZx8rDpbe/1Q1aY8Rvpl3xIfeZATWuwh X-Received: by 2002:a50:a3f5:: with SMTP id t50mr75732959edb.273.1564048579498; Thu, 25 Jul 2019 02:56:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564048579; cv=none; d=google.com; s=arc-20160816; b=CEJvxx+UY702OLj3/tMDiOnEVgpHDuibyHUHuWaNiZ6LBX+4FNyLO36YxKfeNrq0HO 5FKPrysLOizZFWrt8SyFX0uXE2gPAHh4Cey6kl9QAUR071SbZpmxo6HXtJcVnB5Eb5R2 voznYAHKGN/UhRv8wkrOVQkXHU8UBFw+Oj7ViJGcn36bw43M4JZnqz4wx7HOVW2xwEO6 oAzFkNLhRDQ3Rrq/dcUws9fXn8G51rugGaIyQq/jHHQi1PJHjwt8+t8g09eSq3wfKiNY HZLxCfq7Efalc4YESXTK3DbTat71MbtbbNPiugP1UgIY6cl0yGVkYNSnd7vECelqnliN bHrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:mime-version :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:to:from; bh=4LKhjJHHfBYaNQYRupKjgmfQ8aK7ai85cYO9pR6UoJQ=; b=abXA6cKMret24O/V2Dd2Sbpw4+TFvO0jl2yAA3zsgtt+owFNqyuAe9MjBERuwDIqQz h2y5z0f1OTnmntlil2EiIfRqutyAol/nCTAwlrFFTZjFUQh86YfOsEL2ZX2sOsUFSaVG TIkdnb/FNLjncqQhk47sQbO1tIg2olyWF0ZV+BWY+FM2uRKSFiAceSI+bpJdxBoXRace SAwPPbQw4WP2S/Tp8IbI1krWGzsOJUZW1ezxWUo2NSOs+uzC34LrbtojMuH3/UXnFZjO CZOXWbg8r1WcVYo0ltiHhxwH3KB8WwS+rx7mXIBelTAdYCt3jqDDV3jFinz/FQ9eW2DD am0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bt.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l31si12190949edc.248.2019.07.25.02.56.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jul 2019 02:56:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=bt.com Received: from localhost ([::1]:57940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqaTy-0007U7-Jn for alex.bennee@linaro.org; Thu, 25 Jul 2019 05:56:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45728) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqaTv-0007SQ-6x for qemu-arm@nongnu.org; Thu, 25 Jul 2019 05:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqaTu-0001VU-2p for qemu-arm@nongnu.org; Thu, 25 Jul 2019 05:56:15 -0400 Received: from smtpe1.intersmtp.com ([213.121.35.79]:35214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqaTl-0001Kt-H0; Thu, 25 Jul 2019 05:56:07 -0400 Received: from tpw09926dag18h.domain1.systemhost.net (10.9.212.42) by BWP09926084.bt.com (10.36.82.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1713.5; Thu, 25 Jul 2019 10:55:57 +0100 Received: from tpw09926dag18e.domain1.systemhost.net (10.9.212.18) by tpw09926dag18h.domain1.systemhost.net (10.9.212.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 25 Jul 2019 10:55:59 +0100 Received: from tpw09926dag18e.domain1.systemhost.net ([fe80::a946:6348:ccf4:fa6c]) by tpw09926dag18e.domain1.systemhost.net ([fe80::a946:6348:ccf4:fa6c%12]) with mapi id 15.00.1395.000; Thu, 25 Jul 2019 10:55:59 +0100 From: To: Thread-Topic: [Qemu-devel] [PATCH v4 10/15] memory: Access MemoryRegion with MemOp semantics Thread-Index: AQHVQs8px7kJYyCpkkqn1mCQ3wVnbg== Date: Thu, 25 Jul 2019 09:55:59 +0000 Message-ID: <1564048559228.36766@bt.com> References: <45d1ebe4b2ed4c039c9da20a738652df@tpw09926dag18e.domain1.systemhost.net> In-Reply-To: <45d1ebe4b2ed4c039c9da20a738652df@tpw09926dag18e.domain1.systemhost.net> Accept-Language: en-AU, en-GB, en-US Content-Language: en-AU X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.187.101.42] Content-Type: multipart/alternative; boundary="_000_156404855922836766btcom_" MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 213.121.35.79 Subject: [Qemu-arm] [Qemu-devel] [PATCH v4 10/15] memory: Access MemoryRegion with MemOp semantics X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, walling@linux.ibm.com, sagark@eecs.berkeley.edu, david@redhat.com, palmer@sifive.com, mark.cave-ayland@ilande.co.uk, laurent@vivier.eu, Alistair.Francis@wdc.com, arikalo@wavecomp.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, rth@twiddle.net, atar4qemu@gmail.com, ehabkost@redhat.com, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, stefanha@redhat.com, shorne@gmail.com, david@gibson.dropbear.id.au, qemu-riscv@nongnu.org, kbastian@mail.uni-paderborn.de, cohuck@redhat.com, alex.williamson@redhat.com, qemu-ppc@nongnu.org, amarkovic@wavecomp.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: xjVUMoiiRCc6 --_000_156404855922836766btcom_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To convert interfaces of MemoryRegion access, MEMOP_SIZE and SIZE_MEMOP no-op stubs were introduced to change syntax while keeping the existing semantics. Now with interfaces converted, we fill the stubs and use MemOp semantics. Signed-off-by: Tony Nguyen --- include/exec/memop.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/exec/memop.h b/include/exec/memop.h index 09c8d20..f2847e8 100644 --- a/include/exec/memop.h +++ b/include/exec/memop.h @@ -106,8 +106,7 @@ typedef enum MemOp { MO_SSIZE =3D MO_SIZE | MO_SIGN, } MemOp; -/* No-op while memory_region_dispatch_[read|write] is converted to MemOp *= / -#define MEMOP_SIZE(op) (op) /* MemOp to size. */ -#define SIZE_MEMOP(ul) (ul) /* Size to MemOp. */ +#define MEMOP_SIZE(op) (1 << ((op) & MO_SIZE)) /* MemOp to size. */ +#define SIZE_MEMOP(ul) (ctzl(ul)) /* Size to MemOp. */ #endif -- 1.8.3.1 --_000_156404855922836766btcom_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

To convert interfaces of MemoryRegion= access, MEMOP_SIZE and
SIZE_MEMOP no-op stubs were introduced to change syntax while keeping<= /div>
the existing semantics.

Now with interfaces converted, we fill the stubs and use MemOp
semantics.

Signed-off-by: Tony Nguyen <tony.nguyen@bt.com>
---
 include/exec/memop.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/exec/memop.h b/include/exec/memop.h
index 09c8d20..f2847e8 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -106,8 +106,7 @@ typedef enum MemOp {
     MO_SSIZE =3D MO_SIZE | MO_SIGN,
 } MemOp;
 
-/* No-op while memory_region_dispatch_[read|write] is converted to Me= mOp */
-#define MEMOP_SIZE(op)  (op)    /* MemOp to size. &nbs= p;*/
-#define SIZE_MEMOP(ul)  (ul)    /* Size to MemOp. &nbs= p;*/
+#define MEMOP_SIZE(op)  (1 << ((op) & MO_SIZE)) /*= MemOp to size.  */
+#define SIZE_MEMOP(ul)  (ctzl(ul))       &nbs= p;      /* Size to MemOp.  */
 
 #endif
-- 
1.8.3.1



--_000_156404855922836766btcom_-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EDFEC7618B for ; Thu, 25 Jul 2019 09:56:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A208C20840 for ; Thu, 25 Jul 2019 09:56:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A208C20840 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bt.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqaU8-00080p-M3 for qemu-devel@archiver.kernel.org; Thu, 25 Jul 2019 05:56:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45750) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqaTx-0007U6-8G for qemu-devel@nongnu.org; Thu, 25 Jul 2019 05:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqaTw-0001Wi-9K for qemu-devel@nongnu.org; Thu, 25 Jul 2019 05:56:17 -0400 Received: from smtpe1.intersmtp.com ([213.121.35.79]:35214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqaTl-0001Kt-H0; Thu, 25 Jul 2019 05:56:07 -0400 Received: from tpw09926dag18h.domain1.systemhost.net (10.9.212.42) by BWP09926084.bt.com (10.36.82.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1713.5; Thu, 25 Jul 2019 10:55:57 +0100 Received: from tpw09926dag18e.domain1.systemhost.net (10.9.212.18) by tpw09926dag18h.domain1.systemhost.net (10.9.212.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 25 Jul 2019 10:55:59 +0100 Received: from tpw09926dag18e.domain1.systemhost.net ([fe80::a946:6348:ccf4:fa6c]) by tpw09926dag18e.domain1.systemhost.net ([fe80::a946:6348:ccf4:fa6c%12]) with mapi id 15.00.1395.000; Thu, 25 Jul 2019 10:55:59 +0100 From: To: Thread-Topic: [Qemu-devel] [PATCH v4 10/15] memory: Access MemoryRegion with MemOp semantics Thread-Index: AQHVQs8px7kJYyCpkkqn1mCQ3wVnbg== Date: Thu, 25 Jul 2019 09:55:59 +0000 Message-ID: <1564048559228.36766@bt.com> References: <45d1ebe4b2ed4c039c9da20a738652df@tpw09926dag18e.domain1.systemhost.net> In-Reply-To: <45d1ebe4b2ed4c039c9da20a738652df@tpw09926dag18e.domain1.systemhost.net> Accept-Language: en-AU, en-GB, en-US Content-Language: en-AU X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.187.101.42] MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 213.121.35.79 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 Subject: [Qemu-devel] [PATCH v4 10/15] memory: Access MemoryRegion with MemOp semantics X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, walling@linux.ibm.com, sagark@eecs.berkeley.edu, david@redhat.com, palmer@sifive.com, mark.cave-ayland@ilande.co.uk, laurent@vivier.eu, Alistair.Francis@wdc.com, edgar.iglesias@gmail.com, arikalo@wavecomp.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, rth@twiddle.net, atar4qemu@gmail.com, ehabkost@redhat.com, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, stefanha@redhat.com, shorne@gmail.com, david@gibson.dropbear.id.au, qemu-riscv@nongnu.org, kbastian@mail.uni-paderborn.de, cohuck@redhat.com, alex.williamson@redhat.com, qemu-ppc@nongnu.org, amarkovic@wavecomp.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To convert interfaces of MemoryRegion access, MEMOP_SIZE and SIZE_MEMOP no-op stubs were introduced to change syntax while keeping the existing semantics. Now with interfaces converted, we fill the stubs and use MemOp semantics. Signed-off-by: Tony Nguyen --- include/exec/memop.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/exec/memop.h b/include/exec/memop.h index 09c8d20..f2847e8 100644 --- a/include/exec/memop.h +++ b/include/exec/memop.h @@ -106,8 +106,7 @@ typedef enum MemOp { MO_SSIZE =3D MO_SIZE | MO_SIGN, } MemOp; -/* No-op while memory_region_dispatch_[read|write] is converted to MemOp *= / -#define MEMOP_SIZE(op) (op) /* MemOp to size. */ -#define SIZE_MEMOP(ul) (ul) /* Size to MemOp. */ +#define MEMOP_SIZE(op) (1 << ((op) & MO_SIZE)) /* MemOp to size. */ +#define SIZE_MEMOP(ul) (ctzl(ul)) /* Size to MemOp. */ #endif -- 1.8.3.1