From nobody Fri May 17 13:22:05 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684309390; cv=none; d=zohomail.com; s=zohoarc; b=FIjHkrI42inZhkOVROJtjfh9AZ5pbGsbtl5rZtCY83IP/n1UXbkmBiinX05ir/0EO/lNHlbswn6LA+64NrAJBh50eeJ9woNXSpTlfGNf1y7r7VENz/2Lgkllmlk2shN91OfkvZJyCpjUP8diqaBRRdv7ol5T/RrHG6ORY5VSfs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684309390; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y0rwCbODQhlolH+DuUamkdk3WLjSdNqIQfdIQCvz/fE=; b=gbkRXHmgRkdvGWGX3NsZXrllFbP671oXveeZTnEH6rwaOJcfXeZmBPr4blmoLvn2rX1RHtmaFSFjNLnD8aigU79yP55gEooEc5R6ArxuCb43z0ZaxYH1K7xnCvir7yCadQGlXqSty7PzGzNM8140ueuxrxSTEvW5ZGW70HHIpMw= 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 1684309390586358.658308383816; Wed, 17 May 2023 00:43:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzBnt-0005lU-3f; Wed, 17 May 2023 03:42:33 -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 1pzBnr-0005lM-Pb for qemu-devel@nongnu.org; Wed, 17 May 2023 03:42:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzBnq-0005ZU-0w for qemu-devel@nongnu.org; Wed, 17 May 2023 03:42:31 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-649-cVU3UXRUPTiHbEF1fQirnQ-1; Wed, 17 May 2023 03:42:27 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F08A8026E8; Wed, 17 May 2023 07:42:27 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id F176B492B00; Wed, 17 May 2023 07:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684309349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y0rwCbODQhlolH+DuUamkdk3WLjSdNqIQfdIQCvz/fE=; b=LDx0Mc1FEdfqJX7uG74CYOsHXQEJAheedNhQ1oqI3/eOOSQZrMdHMcvSG/MJxmYcpflhjC JOHOufv5Z4RcVLBNlRTJu0CD1RIPmSrUTTfiXxAab2ZkIJc7MJ1rHkZpTnwN+3zoOc/w8G GClBM7+escyTcfvq2MBj1GXo6f/32N4= X-MC-Unique: cVU3UXRUPTiHbEF1fQirnQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, David Hildenbrand , Peter Xu Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Richard Henderson , Mark Burton Subject: [PATCH 1/2] include/exec: Make ld*_p and st*_p functions available for generic code, too Date: Wed, 17 May 2023 09:42:21 +0200 Message-Id: <20230517074222.766683-2-thuth@redhat.com> In-Reply-To: <20230517074222.766683-1-thuth@redhat.com> References: <20230517074222.766683-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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 @redhat.com) X-ZM-MESSAGEID: 1684309391122100001 Content-Type: text/plain; charset="utf-8" This will allow to move more code into the target independent source set. Signed-off-by: Thomas Huth --- include/exec/cpu-all.h | 25 ---------------- include/exec/tswap.h | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index ad824fee52..0daa4c06e5 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -55,31 +55,6 @@ #define bswaptls(s) bswap64s(s) #endif =20 -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ =20 #if defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 68944a880b..2774820bbe 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -69,4 +69,70 @@ static inline void tswap64s(uint64_t *s) } } =20 +/* + * Target-endianness CPU memory access functions. These fit into the + * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. + */ + +static inline int lduw_p(const void *ptr) +{ + return (uint16_t)tswap16(lduw_he_p(ptr)); +} + +static inline int ldsw_p(const void *ptr) +{ + return (int16_t)tswap16(lduw_he_p(ptr)); +} + +static inline int ldl_p(const void *ptr) +{ + return tswap32(ldl_he_p(ptr)); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + return tswap64(ldq_he_p(ptr)); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + if (target_needs_bswap()) { +#if HOST_BIG_ENDIAN + return ldn_le_p(ptr, sz); +#else + return ldn_be_p(ptr, sz); +#endif + } else { + return ldn_he_p(ptr, sz); + } +} + +static inline void stw_p(void *ptr, uint16_t v) +{ + stw_he_p(ptr, tswap16(v)); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + stl_he_p(ptr, tswap32(v)); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + stq_he_p(ptr, tswap64(v)); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + if (target_needs_bswap()) { +#if HOST_BIG_ENDIAN + stn_le_p(ptr, sz, v); +#else + stn_be_p(ptr, sz, v); +#endif + } else { + stn_he_p(ptr, sz, v); + } +} + #endif /* TSWAP_H */ --=20 2.31.1 From nobody Fri May 17 13:22:05 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684309390; cv=none; d=zohomail.com; s=zohoarc; b=InUiVVOV2h84kbNL21XY5aOnM4151ubpHW4Bp1WBg4qRfXjywhB8E+PQ3cCmHLFNcROyeGyhFHVAGwHqyxZlvu4OeElqmjN/mznQoA/TPS1Srd8z59cK5eTNJSeebcw6qyHkVWrIFhFHPeE3hzVTyECX6m1ltHdaaEi7N1NPjLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684309390; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Lh3d8AKzcpUp8w4icgh0W8EI00eOhnO4qcdyULNmGTA=; b=aYJ1Mu9abknKhIytGz6aCfpxJhWNnAVGqyOFilKvbZc0QGAHbCeXSNjPZ/qTySW/xxqzRPNznzG26FLqjxsur7mDyW+23P1U/BS+PyPL21dGFCIj3GdQWX+lxPTb4IhiuVGwzqhuCo2r/mr0hpcMdyjM3ZIE9ghA150Ueb9JIJ0= 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 1684309390680387.03792740297445; Wed, 17 May 2023 00:43:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzBnu-0005lz-OI; Wed, 17 May 2023 03:42:34 -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 1pzBnt-0005lW-55 for qemu-devel@nongnu.org; Wed, 17 May 2023 03:42:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzBnr-0005Zh-5X for qemu-devel@nongnu.org; Wed, 17 May 2023 03:42:32 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-290-pZ592hOmPJ-MzdFTlvNCHQ-1; Wed, 17 May 2023 03:42:29 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E78A61C05134; Wed, 17 May 2023 07:42:28 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94905492B00; Wed, 17 May 2023 07:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684309350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lh3d8AKzcpUp8w4icgh0W8EI00eOhnO4qcdyULNmGTA=; b=B4bp0KoY3qWv71p6xj65KAeC76Tc605yyMv0H9/7dZ/6CjMXqO9YUrCdppjsKgHjSMTFo5 I+3vzet4/39A+30g477AIFUsR3SXMqjN/ntOVnNCYhukTO1IZ7S7jq7mvGf45B6kg81HC1 aGsgxB/pN+uBaxXE0R/YiGOATxtKMKM= X-MC-Unique: pZ592hOmPJ-MzdFTlvNCHQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, David Hildenbrand , Peter Xu Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Richard Henderson , Mark Burton Subject: [PATCH 2/2] softmmu: Move ioport.c into the target-independent source set Date: Wed, 17 May 2023 09:42:22 +0200 Message-Id: <20230517074222.766683-3-thuth@redhat.com> In-Reply-To: <20230517074222.766683-1-thuth@redhat.com> References: <20230517074222.766683-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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 @redhat.com) X-ZM-MESSAGEID: 1684309391335100005 Content-Type: text/plain; charset="utf-8" Now that the st*_p and ld*_p functions can be used from common code, too, we can move ioport.c from specific_ss into softmmu_ss to avoid that we have to compile it multiple times. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson --- softmmu/ioport.c | 2 +- softmmu/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/softmmu/ioport.c b/softmmu/ioport.c index cb8adb0b93..8d9d1e5b40 100644 --- a/softmmu/ioport.c +++ b/softmmu/ioport.c @@ -26,10 +26,10 @@ */ =20 #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" +#include "exec/tswap.h" #include "trace.h" =20 typedef struct MemoryRegionPortioList { diff --git a/softmmu/meson.build b/softmmu/meson.build index 974732b0f3..e572af54ab 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( 'arch_init.c', - 'ioport.c', 'memory.c', 'physmem.c', 'watchpoint.c', @@ -20,6 +19,7 @@ softmmu_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'qdev-monitor.c', 'qtest.c', --=20 2.31.1