{"id":2228895,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228895/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427124738.966578-19-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260427124738.966578-19-peter.maydell@linaro.org>","date":"2026-04-27T12:46:52","name":"[PULL,18/63] target/arm: Explode MO_TExx -> MO_TE | MO_xx","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"2acbde88758c395a7b6e9ebe1057e19444183738","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/1.1/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427124738.966578-19-peter.maydell@linaro.org/mbox/","series":[{"id":501642,"url":"http://patchwork.ozlabs.org/api/1.1/series/501642/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501642","date":"2026-04-27T12:46:34","name":"[PULL,01/63] docs/system: add FEAT_AA32 and FEAT_AA64 to emulation list","version":1,"mbox":"http://patchwork.ozlabs.org/series/501642/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228895/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228895/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=k+sRKpsP;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g43cY2NVmz1yHX\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 27 Apr 2026 23:02:05 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wHLa9-0004Qt-HP; Mon, 27 Apr 2026 09:01:04 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1wHLZy-0004Hk-U5\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 09:00:51 -0400","from mail-ed1-x532.google.com ([2a00:1450:4864:20::532])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1wHLZw-0002Z2-42\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 09:00:50 -0400","by mail-ed1-x532.google.com with SMTP id\n 4fb4d7f45d1cf-678adefbd26so4721243a12.3\n for <qemu-devel@nongnu.org>; Mon, 27 Apr 2026 06:00:47 -0700 (PDT)","from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488ffc5e3f4sm448974115e9.2.2026.04.27.05.47.54\n for <qemu-devel@nongnu.org>\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 27 Apr 2026 05:47:54 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777294846; x=1777899646; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=HVojIB/7QdY0Ot24jw0NheQh8MehpPZMmEg2nTnK4fY=;\n b=k+sRKpsPbvBwgMWFRP1W9ctz61+X+2kVZIhGSuncVdqL/YhkfNoju94ZiAPmx9AMSi\n PBFTMjEiO5H5ENNl+nW4ucLG/vs8lNVuFha0gPY56Bj5/Wjvn58F/UD7qeR+VMfKxTVQ\n L+hE1FJgoq6jT1uVVXvZDR7xeo0tuU2OxcDhZuxl+yR8vMm8Gh0r8Fp7rqBddKnJBzmn\n Ga3M6MZKJhkD9WDecwKw9l6+PfyP26SohZRSpq0FZZGZUQiUuznav0cUn17rf/lI64+k\n oWvMFn0ruryWizv7pxQ5H5UqtvXqoDlyziFYLBCTsb3SoR9ZxjW4LSMIbRZdBrIVxKOM\n QVOA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777294846; x=1777899646;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=HVojIB/7QdY0Ot24jw0NheQh8MehpPZMmEg2nTnK4fY=;\n b=hgPCCHMYgwQjKQ28MlW0dMPCpD5kVq8RqNB9d+PNSm1EJFqQQDYqvvVuGBsFXxuk44\n +skWI7lK2k+ytiA1MteaI8T2DDQCQkSEtc6PBfIp8R503+mKA7Jzxkmope6l3MEc9Oo7\n grB1YcB5QMWnwuvBfMfJpMVghk97Cpp6k8yOCscAbWmkJbWnFtjhfvyKe+Au5gqg004E\n KDUhAD6hwYocjlKDpBdJIz13kFB7ZZxtWOnQUmOS8ofurvZEbbjRhWk+w1JCQoeuCP5v\n d9hdakqtYhu775UHCxLFfFSMKSY0ivg0ndn1j3uW6gtyapt3FJguKgLii1REUChPNyKr\n KzBQ==","X-Gm-Message-State":"AOJu0Yyop/uZ4WwGh33pw4aGvHwIFR5r83K0DSySBy0VQDFyujodgwGM\n 8acId/yclcDSKyBoeLPqoE3ZlP21j+/P+yhN1FixHWG/h5M6tO45OHuCj0D4hrt46Zm11C2Erog\n U/aBM","X-Gm-Gg":"AeBDieuf3DEtAJEKmwGlg7g1FzDQ4IrxUQA8YZmKufI9yRSKzb+o40Yy8SocWrXlI68\n m1Avq5w89/oG6Q27oUT1p1gLFdwAKvCxiw1sDhn1csIRhN3j7pSOKgfIgd/lLvMw+Rp6czkmmvz\n 7Hg3Fuq2wLb6P994x8AxhdiGqE4A1c86SyO7maRLOyKxqZFW1j+ckgu+bsKBXabkP0lDfJUP+9F\n Iw+Kz4PmqkRc9kVeC0s4fkBRUGE6kyPEOB9/ENJj8CM9UHvYTgfGUprpoqeBWXmwYfx0NHdvYYS\n h43+VU7b536Wz5in2E7IIA/HauDppFgxbUtCphBjklLosablHcgoz77lDMlYAWWEMx6PfVazFBa\n P9p41MAeUPjF7wLysZ6LHI4FrTuCx7GBatQ43b2TKXsdb+WmPtNdJkR6H9EW/9NTDO1np9vIuuG\n Iia+S7Jtk/wRoh8yqU7qwZanAgMeywr5LKYgt/Ov/knMYESqB8KZiXRyebRrZvQPWj6r5AJNN5N\n UwuFjsT6Fh5rMnLN2X/yOedHjmKPpT4LUxtMIZ1gQ==","X-Received":"by 2002:a05:600c:a404:b0:47e:e2eb:bc22 with SMTP id\n 5b1f17b1804b1-488fb73b2a3mr509332295e9.5.1777294075168;\n Mon, 27 Apr 2026 05:47:55 -0700 (PDT)","From":"Peter Maydell <peter.maydell@linaro.org>","To":"qemu-devel@nongnu.org","Subject":"[PULL 18/63] target/arm: Explode MO_TExx -> MO_TE | MO_xx","Date":"Mon, 27 Apr 2026 13:46:52 +0100","Message-ID":"<20260427124738.966578-19-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260427124738.966578-1-peter.maydell@linaro.org>","References":"<20260427124738.966578-1-peter.maydell@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::532;\n envelope-from=peter.maydell@linaro.org; helo=mail-ed1-x532.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Philippe Mathieu-Daudé <philmd@linaro.org>\n\nExtract the implicit MO_TE definition in order to replace\nit in the next commit.\n\nMechanical change using:\n\n  $ for n in UW UL UQ UO SW SL SQ; do \\\n      sed -i -e \"s/MO_TE$n/MO_TE | MO_$n/\" \\\n           $(git grep -l MO_TE$n target/arm); \\\n    done\n\nSigned-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nMessage-id: 20260414005348.4767-3-philmd@linaro.org\nSigned-off-by: Peter Maydell <peter.maydell@linaro.org>\n---\n target/arm/tcg/m_helper.c   |  6 +--\n target/arm/tcg/mve_helper.c | 79 ++++++++++++++++++++-----------------\n 2 files changed, 45 insertions(+), 40 deletions(-)","diff":"diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c\nindex a0cb8cb021..f5954ce9bf 100644\n--- a/target/arm/tcg/m_helper.c\n+++ b/target/arm/tcg/m_helper.c\n@@ -634,7 +634,7 @@ void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest)\n \n     /* Note that these stores can throw exceptions on MPU faults */\n     ARMMMUIdx mmu_idx = arm_mmu_idx(env);\n-    MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN,\n+    MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN,\n                                  arm_to_core_mmu_idx(mmu_idx));\n     cpu_stl_mmu(env, sp, nextinst, oi, GETPC());\n     cpu_stl_mmu(env, sp + 4, saved_psr, oi, GETPC());\n@@ -1055,7 +1055,7 @@ void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fptr)\n     bool lspact = env->v7m.fpccr[s] & R_V7M_FPCCR_LSPACT_MASK;\n     uintptr_t ra = GETPC();\n     ARMMMUIdx mmu_idx = arm_mmu_idx(env);\n-    MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN,\n+    MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN,\n                                  arm_to_core_mmu_idx(mmu_idx));\n \n     assert(env->v7m.secure);\n@@ -1131,7 +1131,7 @@ void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t fptr)\n     ARMCPU *cpu = env_archcpu(env);\n     uintptr_t ra = GETPC();\n     ARMMMUIdx mmu_idx = arm_mmu_idx(env);\n-    MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN,\n+    MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN,\n                                  arm_to_core_mmu_idx(mmu_idx));\n \n     /* fptr is the value of Rn, the frame pointer we load the FP regs from */\ndiff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c\nindex a67d90d6c7..cc58e0502f 100644\n--- a/target/arm/tcg/mve_helper.c\n+++ b/target/arm/tcg/mve_helper.c\n@@ -194,23 +194,23 @@ static void mve_advance_vpt(CPUARMState *env)\n     }\n \n DO_VLDR(vldrb, MO_UB, 1, uint8_t, ldb, 1, uint8_t)\n-DO_VLDR(vldrh, MO_TEUW, 2, uint16_t, ldw, 2, uint16_t)\n-DO_VLDR(vldrw, MO_TEUL, 4, uint32_t, ldl, 4, uint32_t)\n+DO_VLDR(vldrh, MO_TE | MO_UW, 2, uint16_t, ldw, 2, uint16_t)\n+DO_VLDR(vldrw, MO_TE | MO_UL, 4, uint32_t, ldl, 4, uint32_t)\n \n DO_VSTR(vstrb, MO_UB, 1, stb, 1, uint8_t)\n-DO_VSTR(vstrh, MO_TEUW, 2, stw, 2, uint16_t)\n-DO_VSTR(vstrw, MO_TEUL, 4, stl, 4, uint32_t)\n+DO_VSTR(vstrh, MO_TE | MO_UW, 2, stw, 2, uint16_t)\n+DO_VSTR(vstrw, MO_TE | MO_UL, 4, stl, 4, uint32_t)\n \n DO_VLDR(vldrb_sh, MO_SB, 1, int8_t, ldb, 2, int16_t)\n DO_VLDR(vldrb_sw, MO_SB, 1, int8_t, ldb, 4, int32_t)\n DO_VLDR(vldrb_uh, MO_UB, 1, uint8_t, ldb, 2, uint16_t)\n DO_VLDR(vldrb_uw, MO_UB, 1, uint8_t, ldb, 4, uint32_t)\n-DO_VLDR(vldrh_sw, MO_TESW, 2, int16_t, ldw, 4, int32_t)\n-DO_VLDR(vldrh_uw, MO_TEUW, 2, uint16_t, ldw, 4, uint32_t)\n+DO_VLDR(vldrh_sw, MO_TE | MO_SW, 2, int16_t, ldw, 4, int32_t)\n+DO_VLDR(vldrh_uw, MO_TE | MO_UW, 2, uint16_t, ldw, 4, uint32_t)\n \n DO_VSTR(vstrb_h, MO_UB, 1, stb, 2, int16_t)\n DO_VSTR(vstrb_w, MO_UB, 1, stb, 4, int32_t)\n-DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t)\n+DO_VSTR(vstrh_w, MO_TE | MO_UW, 2, stw, 4, int32_t)\n \n #undef DO_VLDR\n #undef DO_VSTR\n@@ -295,7 +295,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t)\n         unsigned e;                                                     \\\n         uint32_t addr;                                                  \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (e = 0; e < 16 / 4; e++, mask >>= 4, eci_mask >>= 4) {      \\\n             if (!(eci_mask & 1)) {                                      \\\n                 continue;                                               \\\n@@ -321,7 +321,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t)\n         unsigned e;                                                     \\\n         uint32_t addr;                                                  \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (e = 0; e < 16 / 4; e++, mask >>= 4, eci_mask >>= 4) {      \\\n             if (!(eci_mask & 1)) {                                      \\\n                 continue;                                               \\\n@@ -345,42 +345,47 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t)\n \n DO_VLDR_SG(vldrb_sg_sh, MO_SB, int8_t, ldb, 2, int16_t, uint16_t, ADDR_ADD, false)\n DO_VLDR_SG(vldrb_sg_sw, MO_SB, int8_t, ldb, 4, int32_t, uint32_t, ADDR_ADD, false)\n-DO_VLDR_SG(vldrh_sg_sw, MO_TESW, int16_t, ldw, 4, int32_t, uint32_t, ADDR_ADD, false)\n+DO_VLDR_SG(vldrh_sg_sw, MO_TE | MO_SW, int16_t, ldw, 4,\n+           int32_t, uint32_t, ADDR_ADD, false)\n \n DO_VLDR_SG(vldrb_sg_ub, MO_UB, uint8_t, ldb, 1, uint8_t, uint8_t, ADDR_ADD, false)\n DO_VLDR_SG(vldrb_sg_uh, MO_UB, uint8_t, ldb, 2, uint16_t, uint16_t, ADDR_ADD, false)\n DO_VLDR_SG(vldrb_sg_uw, MO_UB, uint8_t, ldb, 4, uint32_t, uint32_t, ADDR_ADD, false)\n-DO_VLDR_SG(vldrh_sg_uh, MO_TEUW, uint16_t, ldw, 2, uint16_t, uint16_t, ADDR_ADD, false)\n-DO_VLDR_SG(vldrh_sg_uw, MO_TEUW, uint16_t, ldw, 4, uint32_t, uint32_t, ADDR_ADD, false)\n-DO_VLDR_SG(vldrw_sg_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, ADDR_ADD, false)\n+DO_VLDR_SG(vldrh_sg_uh, MO_TE | MO_UW, uint16_t, ldw, 2,\n+           uint16_t, uint16_t, ADDR_ADD, false)\n+DO_VLDR_SG(vldrh_sg_uw, MO_TE | MO_UW, uint16_t, ldw, 4,\n+           uint32_t, uint32_t, ADDR_ADD, false)\n+DO_VLDR_SG(vldrw_sg_uw, MO_TE | MO_UL, uint32_t, ldl, 4,\n+           uint32_t, uint32_t, ADDR_ADD, false)\n DO_VLDR64_SG(vldrd_sg_ud, ADDR_ADD, false)\n \n-DO_VLDR_SG(vldrh_sg_os_sw, MO_TESW, int16_t, ldw, 4,\n+DO_VLDR_SG(vldrh_sg_os_sw, MO_TE | MO_SW, int16_t, ldw, 4,\n            int32_t, uint32_t, ADDR_ADD_OSH, false)\n-DO_VLDR_SG(vldrh_sg_os_uh, MO_TEUW, uint16_t, ldw, 2,\n+DO_VLDR_SG(vldrh_sg_os_uh, MO_TE | MO_UW, uint16_t, ldw, 2,\n            uint16_t, uint16_t, ADDR_ADD_OSH, false)\n-DO_VLDR_SG(vldrh_sg_os_uw, MO_TEUW, uint16_t, ldw, 4,\n+DO_VLDR_SG(vldrh_sg_os_uw, MO_TE | MO_UW, uint16_t, ldw, 4,\n            uint32_t, uint32_t, ADDR_ADD_OSH, false)\n-DO_VLDR_SG(vldrw_sg_os_uw, MO_TEUL, uint32_t, ldl, 4,\n+DO_VLDR_SG(vldrw_sg_os_uw, MO_TE | MO_UL, uint32_t, ldl, 4,\n            uint32_t, uint32_t, ADDR_ADD_OSW, false)\n DO_VLDR64_SG(vldrd_sg_os_ud, ADDR_ADD_OSD, false)\n \n DO_VSTR_SG(vstrb_sg_ub, MO_UB, stb, 1, uint8_t, ADDR_ADD, false)\n DO_VSTR_SG(vstrb_sg_uh, MO_UB, stb, 2, uint16_t, ADDR_ADD, false)\n DO_VSTR_SG(vstrb_sg_uw, MO_UB, stb, 4, uint32_t, ADDR_ADD, false)\n-DO_VSTR_SG(vstrh_sg_uh, MO_TEUW, stw, 2, uint16_t, ADDR_ADD, false)\n-DO_VSTR_SG(vstrh_sg_uw, MO_TEUW, stw, 4, uint32_t, ADDR_ADD, false)\n-DO_VSTR_SG(vstrw_sg_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD, false)\n+DO_VSTR_SG(vstrh_sg_uh, MO_TE | MO_UW, stw, 2, uint16_t, ADDR_ADD, false)\n+DO_VSTR_SG(vstrh_sg_uw, MO_TE | MO_UW, stw, 4, uint32_t, ADDR_ADD, false)\n+DO_VSTR_SG(vstrw_sg_uw, MO_TE | MO_UL, stl, 4, uint32_t, ADDR_ADD, false)\n DO_VSTR64_SG(vstrd_sg_ud, ADDR_ADD, false)\n \n-DO_VSTR_SG(vstrh_sg_os_uh, MO_TEUW, stw, 2, uint16_t, ADDR_ADD_OSH, false)\n-DO_VSTR_SG(vstrh_sg_os_uw, MO_TEUW, stw, 4, uint32_t, ADDR_ADD_OSH, false)\n-DO_VSTR_SG(vstrw_sg_os_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD_OSW, false)\n+DO_VSTR_SG(vstrh_sg_os_uh, MO_TE | MO_UW, stw, 2, uint16_t, ADDR_ADD_OSH, false)\n+DO_VSTR_SG(vstrh_sg_os_uw, MO_TE | MO_UW, stw, 4, uint32_t, ADDR_ADD_OSH, false)\n+DO_VSTR_SG(vstrw_sg_os_uw, MO_TE | MO_UL, stl, 4, uint32_t, ADDR_ADD_OSW, false)\n DO_VSTR64_SG(vstrd_sg_os_ud, ADDR_ADD_OSD, false)\n \n-DO_VLDR_SG(vldrw_sg_wb_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, ADDR_ADD, true)\n+DO_VLDR_SG(vldrw_sg_wb_uw, MO_TE | MO_UL, uint32_t, ldl, 4,\n+           uint32_t, uint32_t, ADDR_ADD, true)\n DO_VLDR64_SG(vldrd_sg_wb_ud, ADDR_ADD, true)\n-DO_VSTR_SG(vstrw_sg_wb_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD, true)\n+DO_VSTR_SG(vstrw_sg_wb_uw, MO_TE | MO_UL, stl, 4, uint32_t, ADDR_ADD, true)\n DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true)\n \n /*\n@@ -408,7 +413,7 @@ DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true)\n         static const uint8_t off[4] = { O1, O2, O3, O4 };               \\\n         uint32_t addr, data;                                            \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -434,7 +439,7 @@ DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true)\n         int y; /* y counts 0 2 0 2 */                                   \\\n         uint16_t *qd;                                                   \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0, y = 0; beat < 4; beat++, mask >>= 4, y ^= 2) {   \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -461,7 +466,7 @@ DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true)\n         uint32_t *qd;                                                   \\\n         int y;                                                          \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -500,7 +505,7 @@ DO_VLD4W(vld43w, 6, 7, 8, 9)\n         uint32_t addr, data;                                            \\\n         uint8_t *qd;                                                    \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -526,7 +531,7 @@ DO_VLD4W(vld43w, 6, 7, 8, 9)\n         int e;                                                          \\\n         uint16_t *qd;                                                   \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -551,7 +556,7 @@ DO_VLD4W(vld43w, 6, 7, 8, 9)\n         uint32_t addr, data;                                            \\\n         uint32_t *qd;                                                   \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -582,7 +587,7 @@ DO_VLD2W(vld21w, 8, 12, 16, 20)\n         static const uint8_t off[4] = { O1, O2, O3, O4 };               \\\n         uint32_t addr, data;                                            \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -609,7 +614,7 @@ DO_VLD2W(vld21w, 8, 12, 16, 20)\n         int y; /* y counts 0 2 0 2 */                                   \\\n         uint16_t *qd;                                                   \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0, y = 0; beat < 4; beat++, mask >>= 4, y ^= 2) {   \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -635,7 +640,7 @@ DO_VLD2W(vld21w, 8, 12, 16, 20)\n         uint32_t *qd;                                                   \\\n         int y;                                                          \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -674,7 +679,7 @@ DO_VST4W(vst43w, 6, 7, 8, 9)\n         uint32_t addr, data;                                            \\\n         uint8_t *qd;                                                    \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -701,7 +706,7 @@ DO_VST4W(vst43w, 6, 7, 8, 9)\n         int e;                                                          \\\n         uint16_t *qd;                                                   \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n@@ -727,7 +732,7 @@ DO_VST4W(vst43w, 6, 7, 8, 9)\n         uint32_t addr, data;                                            \\\n         uint32_t *qd;                                                   \\\n         int mmu_idx = arm_to_core_mmu_idx(arm_mmu_idx(env));            \\\n-        MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx);      \\\n+        MemOpIdx oi = make_memop_idx(MO_TE | MO_UL | MO_ALIGN, mmu_idx);\\\n         for (beat = 0; beat < 4; beat++, mask >>= 4) {                  \\\n             if ((mask & 1) == 0) {                                      \\\n                 /* ECI says skip this beat */                           \\\n","prefixes":["PULL","18/63"]}