From nobody Sat Apr 11 20:09:21 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=1775529108; cv=none; d=zohomail.com; s=zohoarc; b=Db4viFKJUYTmKpwJt2+Z52J5aCIisUUFNjnWD9L5cVZp0+gVm//iTmcKtB7x+TtnDOaDx/1ZjWvfak/jn3Vk3YVDQDmxpOafLm9r4M8CfrN2ddJ2b/3NxKMkq+qAyMlm5RnNjBMC+TJlw01PASaZ0hSY0KF3qDiJ7cX9pEJDHOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775529108; h=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=huvcXnMs/4HjTKO88sCRvIdI93uZJ7KONvYohCQFmDE=; b=Hss1kkM3JZlxOvP9pkmVwNAQ/SroIIgltfNzgxOeBDrHp9A+Ul7zjIH1wtlVEV96UbVZNfrU+2yBJM51HiwlMulioZMcDoguJ0E2YtcuuIEMTDZryVptF+lo9vb9dmyfxA1YgxUW7qoCCM73w6bi3VV2xVwqCrt477KOKHHn52k= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775529108196922.3168861208329; Mon, 6 Apr 2026 19:31:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w9wBP-00080Y-2l; Mon, 06 Apr 2026 22:28:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w9wAr-0007eR-9l for qemu-devel@nongnu.org; Mon, 06 Apr 2026 22:28:17 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w9wAn-000713-4x for qemu-devel@nongnu.org; Mon, 06 Apr 2026 22:28:16 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2aae4816912so28515145ad.2 for ; Mon, 06 Apr 2026 19:28:11 -0700 (PDT) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749794e8sm161423685ad.53.2026.04.06.19.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 19:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775528891; x=1776133691; 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=huvcXnMs/4HjTKO88sCRvIdI93uZJ7KONvYohCQFmDE=; b=QKnYFBu8Dg5apEXbZHuB7UrYq2aU3r5V+IrY+nZXnmg1qDaiwm8hE+s32HNrePPu3y BaC1y2kX3QhRPBXkaUalo8saSdvrF31zd33sFITci7UCw0ghrxqmulMiyhQ5P4BkMc80 j7R5mfwoIeDqzlPpz028ulpSJDVWAWnJD16Sj+BlSgkvJsEm1+bdTedKZ8P4xgDH26wT hrj6okjJKAyYIttRX9s+10IYfnJ/xUboqx8vPoqW/0ae2u+Kq3mNyK/temlxpluidHHO QVqXz6ivBI9bkbvnsdkDaaIEswhOP7sDFfWSeFJ3CRi6N5EoRc4jSl5kBSy9a1/ZVf/r 7aqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775528891; x=1776133691; 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=huvcXnMs/4HjTKO88sCRvIdI93uZJ7KONvYohCQFmDE=; b=Pi67Bd0Rj2iiJLDbICN5KghVp2r8kAuYgquim+ChaygYXDtTBkSHf8wbUSm0NBhIwL H3Zfe5IK8grlY3niJIa0QiEcapG5U4HQ+BsjD4RivHL3dUXnbWv8ctEKjsQzp8A6IzLK 2tswjpk0eqABbYNY9JKHlLhigIrD78kKbreasxm37XSEyXCsqnFKt84y4HitPfn7axjZ BVQEQVYY4+/wmSHrMelPk6Ep5E9jYD61htcoWnIesMmQH7tSxZi7R8RoRJTQFBeues9B +2fSCKjlbWSOLTsl28SVN1xjAuUHrevTdRPQIX6H7HS63Cp5mwSAU1/DHfsntuEiDrhv 1RvQ== X-Gm-Message-State: AOJu0YxM2qV6c0oVWxYZ7WK8QYWoA1bvsia+nS6PnhKFe+gTdhQ6r9ve XkN+2Lt9po0sxLuo0k8QSB+9Nv8AlTnLBnObKNdZ+oRCw66RIzzG9RcdAnq2RWsWmFyWfyiXmk9 nkLEp6Zh0/Q== X-Gm-Gg: AeBDiesPSf317P8m6DsPXCvjAtZxi1IQHPiiDeG2uY5EQlQ69qhUwbHdUb8EnBy/iRg 1jWh4QnoBRyo1DrSn6pq04cid7ffxDrCD6DTD585kowXpjCs4iso6gFsjeHn4pojUI5Wz1wZTgn mSfMzXz9G4RK8yZzVMECMm0nFu5rJa6DeH7rwb5js6ohpkMhgrwayTKytk/JsUnJ8eFcIsdMSV3 64IZPE/HgOaSdEbWZ/UYrIIgrvbq4YHLst18wt+hM+o5YNHiP51R3vj8puHTTUVn+pbm7HXbBZ8 opM1sFnerMBmrvUMQF1lZGvjs8TQTKzBRiX7LLbc4kYZryy4jTkNLb74A+d3AT8zvyN4gcS3Hfs XAHAT9qO8te1DlALtajzqfK0UV/JuEY/0ZXHTi09EQ0P+wythszatXQsfKkyj21wwiRNy88jEMP 8XdRDjls+j+mHtpNDgFHvynn/vAorS71xcxII0NB/K7pPf1wpEoZoGhzw6/hF1+hL8/Rxv+kYZF hfb X-Received: by 2002:a17:903:3c47:b0:2b2:4ded:954e with SMTP id d9443c01a7336-2b281801b5amr175135735ad.24.1775528890538; Mon, 06 Apr 2026 19:28:10 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , Peter Maydell , Richard Henderson , Pierrick Bouvier , jim.macarthur@linaro.org, qemu-arm@nongnu.org Subject: [PATCH v9 17/20] target/arm/tcg/arm_ldst.h: merge in translate.c Date: Mon, 6 Apr 2026 19:27:45 -0700 Message-ID: <20260407022748.57629-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260407022748.57629-1-pierrick.bouvier@linaro.org> References: <20260407022748.57629-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.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: 1775529109011154100 Content-Type: text/plain; charset="utf-8" Only translate.c uses those functions, thus move them back to this file. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/tcg/arm_ldst.h | 47 -------------------------------------- target/arm/tcg/translate.c | 22 +++++++++++++++++- 2 files changed, 21 insertions(+), 48 deletions(-) diff --git a/target/arm/tcg/arm_ldst.h b/target/arm/tcg/arm_ldst.h index cee0548a1c7..e69de29bb2d 100644 --- a/target/arm/tcg/arm_ldst.h +++ b/target/arm/tcg/arm_ldst.h @@ -1,47 +0,0 @@ -/* - * ARM load/store instructions for code (armeb-user support) - * - * Copyright (c) 2012 CodeSourcery, LLC - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#ifndef ARM_LDST_H -#define ARM_LDST_H - -#include "exec/translator.h" -#include "qemu/bswap.h" - -/* Load an instruction and return it in the standard little-endian order */ -static inline uint32_t arm_ldl_code(CPUARMState *env, DisasContextBase *s, - target_ulong addr, bool sctlr_b) -{ - return translator_ldl_swap(env, s, addr, bswap_code(sctlr_b)); -} - -/* Ditto, for a halfword (Thumb) instruction */ -static inline uint16_t arm_lduw_code(CPUARMState *env, DisasContextBase* s, - target_ulong addr, bool sctlr_b) -{ -#ifndef CONFIG_USER_ONLY - /* In big-endian (BE32) mode, adjacent Thumb instructions have been sw= apped - within each word. Undo that now. */ - if (sctlr_b) { - addr ^=3D 2; - } -#endif - return translator_lduw_swap(env, s, addr, bswap_code(sctlr_b)); -} - -#endif diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index b3c95fb66cb..1fbe41ec643 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -25,7 +25,6 @@ #define TCG_ADDRESS_BITS 32 #include "tcg/tcg-op-mem.h" #include "qemu/log.h" -#include "arm_ldst.h" #include "semihosting/semihost.h" #include "cpregs.h" #include "exec/target_page.h" @@ -6280,6 +6279,20 @@ static void disas_thumb_insn(DisasContext *s, uint32= _t insn) } } =20 +/* Ditto, for a halfword (Thumb) instruction */ +static uint16_t arm_lduw_code(CPUARMState *env, DisasContextBase* s, + target_ulong addr, bool sctlr_b) +{ +#ifndef CONFIG_USER_ONLY + /* In big-endian (BE32) mode, adjacent Thumb instructions have been sw= apped + within each word. Undo that now. */ + if (sctlr_b) { + addr ^=3D 2; + } +#endif + return translator_lduw_swap(env, s, addr, bswap_code(sctlr_b)); +} + static bool insn_crosses_page(CPUARMState *env, DisasContext *s) { /* Return true if the insn at dc->base.pc_next might cross a page boun= dary. @@ -6514,6 +6527,13 @@ static void arm_post_translate_insn(DisasContext *dc) } } =20 +/* Load an instruction and return it in the standard little-endian order */ +static uint32_t arm_ldl_code(CPUARMState *env, DisasContextBase *s, + target_ulong addr, bool sctlr_b) +{ + return translator_ldl_swap(env, s, addr, bswap_code(sctlr_b)); +} + static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); --=20 2.47.3