From nobody Sat May 30 18:35:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778658550; cv=none; d=zohomail.com; s=zohoarc; b=Rpu2EFqTchJow1+zjCPIWW+r+TfKAWQXwGD24UpHvLw5i09UUaB1ugtPdU6kxPxE7IBswUnDoXRkdsweEKs5vgh0kHPvl4WECBIE1NLP/rT7gS7V4ZZSWxq0zRkv3GAyS7tZCIbVXnPs44zEkYevVR06SXW7CVqNSmb5yBowOoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778658550; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UerYm6b2Z3yY8W3Pc16lGAPFBiqbGIQwj+tuPPjT5qU=; b=dOySh6BJi2NSNn+5H77g6dZvMgC1vkgEWXqOzMnuaRgslFl/D9u/Ll+LnTsQ2RfQHvuRotR2CUwjcvhAVqIMgEIf6RxCo2Rouvzkh2Sl6utzkoKQwqSFJRG9wJwjuqzGIVrIBnz0RCgrCxrXf8uheTaXu6C/Ot+OtROfJKa53OA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778658550954140.54236471988702; Wed, 13 May 2026 00:49:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wN4Ks-0000z3-Kl; Wed, 13 May 2026 03:48:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wN4Kq-0000ym-Q2 for qemu-devel@nongnu.org; Wed, 13 May 2026 03:48:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wN4Kp-0003cX-8B for qemu-devel@nongnu.org; Wed, 13 May 2026 03:48:52 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-44e1860558fso4128701f8f.0 for ; Wed, 13 May 2026 00:48:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45491bae13csm37249819f8f.29.2026.05.13.00.48.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 00:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778658529; x=1779263329; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UerYm6b2Z3yY8W3Pc16lGAPFBiqbGIQwj+tuPPjT5qU=; b=VOFpAoXT6+ZSLiaS2Ayim5GhD79Tc+IyqE63rD1U4QUangGw1kpfyzCEi5dP+ARAX6 /Slh+60xUn7EV+9rlIBnrWlC7cx2pXHpSnat/YHRm7QKh9ak+92CAuggVOKmQsi0Jtob XGgfi5tD9GJPGuA+7e5DQ3CT9UoFr6FWS7xz0sx6hJfJaKJWvbHw2mUNYpiqUzGMm71t D2b3D18wFhMBJjQ0dxb0M4JRjQFsXaLxLvgruqsoClEya3oqJru2W4Q2lo4gZ48j2mAE LvsChDOJVTSN6IpCU9BBugLQN0gab3oEezIpAl4LaAHbTiB/mbl9QmJtlTzO77atBVUf d9tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778658529; x=1779263329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UerYm6b2Z3yY8W3Pc16lGAPFBiqbGIQwj+tuPPjT5qU=; b=PGBTUd3n45jGgkVrlizkw7CStjRlGo99QIzhr0Wft0hMqXtC48AhLU8A7a4Uwo7sga tqF6ub84yV8frxRYCUrH2H0nUTqVl2TFa82XYGQRjxWLUXQJxUdmw7iXajOYnyBF3Vvl JpNs91arn5vqfC/W1G4NC6OevRgyiHfG2PIGs1oQY8fdMRF21xC5R89aBKwDIOoSbOKQ /8urxYsVyUVf3E71mQcPQC8Pg1ZivvAawx6aXmqMI5F/SGECEnkt0ZyAmNP47ITjMd1B XOdUBC7zFHIPB2CRzdrMp+H86rg/Ien58J0X9hZKlDm64qOgmFYuSBjcvHIGoJkHev0D NW0w== X-Gm-Message-State: AOJu0YxOtnrww2KVc/x6xz4hGz2KSk1A81gnsHBcGKyKNfMFsF+Wtiue PVqRlBuZ4LPDwpE30s4yQIwLWbJ7GslbzpxDOkSTh9H8PDQ6YBygBYKMyrN/ahrcxZj4DDrfrmn he1WzMoE= X-Gm-Gg: Acq92OGFvEFfsko3SCR2wFUnRdibK8ql4ybEUE5dKO2cDMz7sd6pavc+Hhfj9Ipi8YI tFSCSe1RPlBaCG5FHjq5UcXvuU36ZYcH0a0rDI5BUEssknqL7jw6cx+IfnK+T/Ul79aGpZtgcKD 7+llSNAArbdVbjEa9R/7u1oGURqXG3xEuxan6B8VJ4b4l995UFPXH3KY/6ubRnzoWcpAtnGLm+O 9VJoh21/0WmFMY73aDVevcqwZ1YjKreATS1L4Se1Mx02d8Lape+JYMTbGHvzFU07Ezg0mF6Y+5L q9P2ToofD/ts2zO5EIinGkm/+oWzFqRbKTK2W++iTzu8e25qM+jRvJi2NkJOeLq2MeWWR4JQfuO KeTA/raOyAthvSjBg31E0yWbR8C9VrFTTGsiCET9ZsjPZfQ/Fe4yi5KGOWtobAYOwDPpAtpgrZQ EoW90g0DSJk5N+v5O+r0OQrMkk2RWeXBJ87KNfoaf9Wy2plpxviTudk5oRWDXI/cYEoqXWle6l X-Received: by 2002:a05:6000:26c2:b0:45a:1b61:9f9a with SMTP id ffacd0b85a97d-45c580cdfccmr3079463f8f.1.1778658529387; Wed, 13 May 2026 00:48:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] target/alpha: Use DisasContext::mo_align in system emulation Date: Wed, 13 May 2026 09:48:38 +0200 Message-ID: <20260513074840.11398-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513074840.11398-1-philmd@linaro.org> References: <20260513074840.11398-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778658551794158500 Rename 'unalign' as 'mo_align' and use it in system emulation too. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/translate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index d2d1467a812..120ef5f8ab5 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -46,9 +46,7 @@ typedef struct DisasContext DisasContext; struct DisasContext { DisasContextBase base; =20 -#ifdef CONFIG_USER_ONLY - MemOp unalign; -#endif + MemOp mo_align; uint32_t tbflags; int mem_idx; =20 @@ -73,9 +71,9 @@ struct DisasContext { }; =20 #ifdef CONFIG_USER_ONLY -#define UNALIGN(C) (C)->unalign +#define UNALIGN(C) (C)->mo_align #else -#define UNALIGN(C) MO_ALIGN +#define UNALIGN(C) (C)->mo_align #endif =20 /* Target-specific return values from translate_one, indicating the @@ -2867,9 +2865,10 @@ static void alpha_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cpu) =20 #ifdef CONFIG_USER_ONLY ctx->ir =3D cpu_std_ir; - ctx->unalign =3D (ctx->tbflags & TB_FLAG_UNALIGN ? MO_UNALN : MO_ALIGN= ); + ctx->mo_align =3D (ctx->tbflags & TB_FLAG_UNALIGN) ? MO_UNALN : MO_ALI= GN; #else ctx->ir =3D (ctx->tbflags & ENV_FLAG_PAL_MODE ? cpu_pal_ir : cpu_std_i= r); + ctx->mo_align =3D MO_ALIGN; #endif =20 /* ??? Every TB begins with unset rounding mode, to be initialized on --=20 2.53.0 From nobody Sat May 30 18:35:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1778658552; cv=none; d=zohomail.com; s=zohoarc; b=PY6mYS4BFo0KXOeYl2MmGQ71PZ8qCrYz0TtKAiks9Ytb50JJ70xaKme/CRWATuLfr06xTMS5nKIDTmGSbozKevP96CXMPUTETbVpd4MsGLk0SoJj6/UiA32Qf4pJtMHC40ZuFd+gImCRTN0Ye0B9NklmzNxesuQeSFvnKLUkCvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778658552; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ICzC7UGJjqGK/86IacnrTrurhebXutr2Ptur7vjdEP4=; b=ELe6n3sOWabmd63xUVYDzK7xOYr0L45nH/8oyB1cWBv4T8JoEh/8P31F4BAfRPmz/sPU62v8ky1X236STtEjfgWu9O4bYdCXkVn8RzwNhTJ5D3fjn+kLhY+bciJboVJxlayb4oifydGuF9htRsW34h1jlOkYD4y8TveC/6VAkYE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177865855283078.7218012648957; Wed, 13 May 2026 00:49:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wN4L0-00011s-0r; Wed, 13 May 2026 03:49:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wN4Kx-0000zO-EV for qemu-devel@nongnu.org; Wed, 13 May 2026 03:48:59 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wN4Kv-0003dq-Sb for qemu-devel@nongnu.org; Wed, 13 May 2026 03:48:59 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-44985f4ab0fso3734940f8f.0 for ; Wed, 13 May 2026 00:48:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45491f8d4c3sm38470516f8f.34.2026.05.13.00.48.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 00:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778658536; x=1779263336; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ICzC7UGJjqGK/86IacnrTrurhebXutr2Ptur7vjdEP4=; b=sXWgrFSEKdoNz0a0ZCqLbiG8rF7uEzfUhxrnbsLdE4MuIJhuMihuyFPPffwss1NiLr Db8bJenmvQdfNDKCd37vCpFjpab2NNKgFLmPZSqxsmk2reeO5WxR98co6iqGsEuNj0mp kZQp5Di7+hXzWtMis5tpg6C5iqOjwqq8qvu4dai0S7+jG9m4PS4S512PFWxUTLUHcdxR nz26FPtTYibeg1Mvbi3Y6r2EQqfZWHQMwSHc4gLPkVy6qRiSAqAS/fr75gYdqycbjqWr /1UCvCsuV7gKL5MU5X6jNs6YaqLzdnbWeNsbxRcVgUkhcrXeVQBjahW7auD/R6ffrSeC +QDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778658536; x=1779263336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ICzC7UGJjqGK/86IacnrTrurhebXutr2Ptur7vjdEP4=; b=pcjOoclZCH1Iw0JCQsdU8TzVbdKHSJ0zlX92dB6qN3/dKO/350y/0mVG89a7fAUdKS NxEMHnoPTnUq8Uup9QXDhcRV3v4CARH3auQHXFWgmoVoTV2pDlEAUIp1ieJiDzbvW/N/ ISFU7g7HNV/QuRmVTY6zFNQV7Czz80+gQj/qk8hGYJP73r5f0fB0kfMLqVAimSk5sJpP SY9eC4BP4HDoV2MivKvmvzDjX44SqsOzoCBFFdHLavZYwT/3HnfFt4n9OmySYZekzgCt 5fzHqQd9/gNn6CZAIGnmwKzl5/2zSDUmrPIvw4glc3JLmfphkxbaGNZTUrTt/EMHRwYG Unag== X-Gm-Message-State: AOJu0YxSWoTA7rr/4Jo41QZVNtVFjjaxvDYsbTshMCIhx1i0KI6IyeP5 h2xFVP9Sv9jAR78pSgpCPfvakqY4wzwWet2y63QYTmJ4lkL2VAiDiD2v2T9ucFJpThIxhZMUAo3 Qz/8dDTc= X-Gm-Gg: Acq92OHsWhKtfFWmEA7k/JfptJXV4Qid9mYWWeRRTBaY9xTx0ENDa/W1ctJJbs3PVO/ SijW0bsKRcwMJ5urGf4Dw7j7LNKkh3IkZwel8rpFvX10TszJAVOsjA3BBW3YNSJvdAVRsRhdEmQ y2JClxMn6n/zWepAO4gk7Jia0zjNZhj8w9vrX1/0mP20HTcgRcsLNtfcoBl1R/O+2XgfsO65I5g aC3R8UdtnyTOPj9uiT56H2kSp01lQcZremlpw5jxf8USqT4yaI3GpkiZ2bxXUwLB3cJPfHJpk5l THme780BEjVlzjA7D0RvDhT6IWBjlQgxYYFE7WesGUD7w9nRwcPhvgypOfoXtxQaBfG2t0X/jd2 Dhh4gs5YnfFTabTP28un7EdkgAWfO8OA7lzAVajI41OxL4Y6D4+TW1veBWN5Gn40U1VQaghGFoz W51iQrXaWW0EVhE3qfG1NwARmxXyRnu+OXTuT6KmO2V7QhSzvfoRFFCDevkKzT9dbXDvWtwoegg l+bVCe0tPg= X-Received: by 2002:a05:6000:2203:b0:44a:aa3c:5927 with SMTP id ffacd0b85a97d-45c5a782750mr3180124f8f.29.1778658536090; Wed, 13 May 2026 00:48:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] target/alpha: Inline UNALIGN() macro Date: Wed, 13 May 2026 09:48:39 +0200 Message-ID: <20260513074840.11398-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513074840.11398-1-philmd@linaro.org> References: <20260513074840.11398-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1778658553666158500 Directly access DisasContext::mo_align in place. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/translate.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 120ef5f8ab5..d0c18e38765 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -70,12 +70,6 @@ struct DisasContext { TCGv_i64 sink; }; =20 -#ifdef CONFIG_USER_ONLY -#define UNALIGN(C) (C)->mo_align -#else -#define UNALIGN(C) (C)->mo_align -#endif - /* Target-specific return values from translate_one, indicating the state of the TB. Note that DISAS_NEXT indicates that we are not exiting the TB. */ @@ -285,27 +279,27 @@ static inline DisasJumpType gen_invalid(DisasContext = *ctx) static void gen_ldf(DisasContext *ctx, TCGv_i64 dest, TCGv_i64 addr) { TCGv_i32 tmp32 =3D tcg_temp_new_i32(); - tcg_gen_qemu_ld_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | UNALIGN(ctx)); + tcg_gen_qemu_ld_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | ctx->mo_align= ); gen_helper_memory_to_f(dest, tmp32); } =20 static void gen_ldg(DisasContext *ctx, TCGv_i64 dest, TCGv_i64 addr) { TCGv_i64 tmp =3D tcg_temp_new_i64(); - tcg_gen_qemu_ld_i64(tmp, addr, ctx->mem_idx, MO_LEUQ | UNALIGN(ctx)); + tcg_gen_qemu_ld_i64(tmp, addr, ctx->mem_idx, MO_LEUQ | ctx->mo_align); gen_helper_memory_to_g(dest, tmp); } =20 static void gen_lds(DisasContext *ctx, TCGv_i64 dest, TCGv_i64 addr) { TCGv_i32 tmp32 =3D tcg_temp_new_i32(); - tcg_gen_qemu_ld_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | UNALIGN(ctx)); + tcg_gen_qemu_ld_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | ctx->mo_align= ); gen_helper_memory_to_s(dest, tmp32); } =20 static void gen_ldt(DisasContext *ctx, TCGv_i64 dest, TCGv_i64 addr) { - tcg_gen_qemu_ld_i64(dest, addr, ctx->mem_idx, MO_LEUQ | UNALIGN(ctx)); + tcg_gen_qemu_ld_i64(dest, addr, ctx->mem_idx, MO_LEUQ | ctx->mo_align); } =20 static void gen_load_fp(DisasContext *ctx, int ra, int rb, int32_t disp16, @@ -336,7 +330,7 @@ static void gen_load_int(DisasContext *ctx, int ra, int= rb, int32_t disp16, if (clear) { tcg_gen_andi_i64(addr, addr, ~0x7); } else if (!locked) { - op |=3D UNALIGN(ctx); + op |=3D ctx->mo_align; } =20 dest =3D ctx->ir[ra]; @@ -352,26 +346,26 @@ static void gen_stf(DisasContext *ctx, TCGv_i64 src, = TCGv_i64 addr) { TCGv_i32 tmp32 =3D tcg_temp_new_i32(); gen_helper_f_to_memory(tmp32, addr); - tcg_gen_qemu_st_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | UNALIGN(ctx)); + tcg_gen_qemu_st_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | ctx->mo_align= ); } =20 static void gen_stg(DisasContext *ctx, TCGv_i64 src, TCGv_i64 addr) { TCGv_i64 tmp =3D tcg_temp_new_i64(); gen_helper_g_to_memory(tmp, src); - tcg_gen_qemu_st_i64(tmp, addr, ctx->mem_idx, MO_LEUQ | UNALIGN(ctx)); + tcg_gen_qemu_st_i64(tmp, addr, ctx->mem_idx, MO_LEUQ | ctx->mo_align); } =20 static void gen_sts(DisasContext *ctx, TCGv_i64 src, TCGv_i64 addr) { TCGv_i32 tmp32 =3D tcg_temp_new_i32(); gen_helper_s_to_memory(tmp32, src); - tcg_gen_qemu_st_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | UNALIGN(ctx)); + tcg_gen_qemu_st_i32(tmp32, addr, ctx->mem_idx, MO_LEUL | ctx->mo_align= ); } =20 static void gen_stt(DisasContext *ctx, TCGv_i64 src, TCGv_i64 addr) { - tcg_gen_qemu_st_i64(src, addr, ctx->mem_idx, MO_LEUQ | UNALIGN(ctx)); + tcg_gen_qemu_st_i64(src, addr, ctx->mem_idx, MO_LEUQ | ctx->mo_align); } =20 static void gen_store_fp(DisasContext *ctx, int ra, int rb, int32_t disp16, @@ -392,7 +386,7 @@ static void gen_store_int(DisasContext *ctx, int ra, in= t rb, int32_t disp16, if (clear) { tcg_gen_andi_i64(addr, addr, ~0x7); } else { - op |=3D UNALIGN(ctx); + op |=3D ctx->mo_align; } =20 src =3D load_gpr(ctx, ra); --=20 2.53.0