From patchwork Tue May 3 19:47:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 568955 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp9770693map; Tue, 3 May 2022 12:50:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySV561gYIw6IxJj86x6frRllExyq2tUsRB1MtqW0BJ+7oyJr8ASjkzpgu7aZdsGLeDH9qw X-Received: by 2002:a25:378a:0:b0:645:7945:c1b6 with SMTP id e132-20020a25378a000000b006457945c1b6mr15186985yba.436.1651607454056; Tue, 03 May 2022 12:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651607454; cv=none; d=google.com; s=arc-20160816; b=b1+QlrW+Cx6jJ3hcWp/kmBmsG9H9lOOtlejPXTMA8ZpXbVXQ1lcW2VNWYVyAe5VIXh Qw2aLNqxi0o+RY/oPpcYD8qvPBZVmREc0HLQ8m3IVkfJzX6LLVPGh8SBxJxWyNXTDZ49 Kwte+AvQ8P7FfrD6EGizp6xU8F3xEUWAIaizc8ET+NpklLuCRnIxj9KpeLq+XNtq+O9B MMB0XNsjOxOVBHnukQgotwXTJBA3XQkYq+o7c0mX+C8sGJcB6rsCGGgO0qKA4VNNHAwt VRQq97mCvmzVIXgP/EfoKM9vThMXCVUXrItCDqBaOGtwpSk416co3fgdjy48krEJuBtn l1Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=96XCoIxFXWNe7OzxTXGAkWBiSUjrkUaQNrXa5Y9vDmM=; b=kZMzibBE27LDNiwrVidrvVsxxREIFZDjT0tF7fru8cRRA6s85/X90jEsqn8xX8dZW7 0bBd7J8/v3LLxCkLsqDy+5HiduQEroA95mKzOtk7eN/M5MFI/QTF426ayfPY9qdIh6tk mWxgmDprHueU58EFNi7wzAB26SxAccvNksp+DlX+9c4mgJB957+oqgBg86Uo/jud6mRp j84ezI788yN23rY78aTD4WkC03a4SNZRC+At8VwU0qwIwthL5dKpHgSodnEALC3SLqCU Qvg0GrgTUUoX3R45hRKloSKYgoQ7VN+m7x3biFsKFaNBI6W6ONUsoIq/l1QJpHQTeSML GxqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FxosJmDe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d136-20020a81368e000000b002f907750411si4301127ywa.301.2022.05.03.12.50.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 May 2022 12:50:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FxosJmDe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlyXt-0000uQ-11 for patch@linaro.org; Tue, 03 May 2022 15:50:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlyVu-0000sc-2Q for qemu-devel@nongnu.org; Tue, 03 May 2022 15:48:50 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:35711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlyVs-0003Vd-Ad for qemu-devel@nongnu.org; Tue, 03 May 2022 15:48:49 -0400 Received: by mail-pj1-x102b.google.com with SMTP id w5-20020a17090aaf8500b001d74c754128so3245656pjq.0 for ; Tue, 03 May 2022 12:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=96XCoIxFXWNe7OzxTXGAkWBiSUjrkUaQNrXa5Y9vDmM=; b=FxosJmDeLkZQSNaEv1jIraPAwjHrnUm3Lm9a+ZR5TTHrAOfHMe6LbKQU2AyCxlGHiW gNxuZVqONK0TCZIzeNP6jOyiOhkeUggVPU7HCV/rBbLl/pNybzEZvg3Tgltjqvf8r7/X EB0LTob5lcR3ndVV190FNwSC7kZ/qrszqlk9Y8LNzFAXyuXFpXLtMMK+/K3c0CmYq07A yxcLiAw56sAvm8nHL8BtmBJX9l3qW/VP4r0yxFxzEoCoSCDtnPRcLpH9hdH6zKpM2JqY oY5SW9OCD02SPPL5/0sNyqFZG56YvEbyhhh6AA+lffO43c3mHShFp7oSy3S/wp1MQmnt MtcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=96XCoIxFXWNe7OzxTXGAkWBiSUjrkUaQNrXa5Y9vDmM=; b=1UWryq+gYrVRg7tWwbumzILiElLf1s2iM+kulHDd2u3JZVM+lEriaUimqDi7c06RLi 2gxpbzy5jxbB7nfjULuywleUQnNLwiF3c9Nm6tvynuBlvLzW2QhH+dTgBEyE6VwGa6q2 wtPIdFRnK9n2Npy1XcVnJAkqu27Zbj9+B5T9C1JsoJsO7ZQDz1yCQmOpxrPdw4WDnwoq bYOl3Bqxfkb3cuwYZk/XFiHHNCEhwadn3TSXMDHi55BAw9cYS82Vc5ht5Ymxk87hcIBY hspdLjr+YExFS9K4AJn/Latlcxn5ke5MmUtvF96yt5jaHLIMYiK4P3svZJ95lmWa427V O+rg== X-Gm-Message-State: AOAM530E2z0IUdWxdAyDYbQ4XVrWHCn/eFZsa9zJ5PrC3Et9V6M0O4sm bL5fczsBT8k9hJLV5yYYiKpZsK2qwfH8kA== X-Received: by 2002:a17:902:7e0d:b0:156:47a4:a7c4 with SMTP id b13-20020a1709027e0d00b0015647a4a7c4mr18662653plm.141.1651607326238; Tue, 03 May 2022 12:48:46 -0700 (PDT) Received: from stoup.. ([71.212.142.129]) by smtp.gmail.com with ESMTPSA id p11-20020a17090ad30b00b001cd4989fed3sm1712383pju.31.2022.05.03.12.48.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 12:48:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 01/74] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Date: Tue, 3 May 2022 12:47:30 -0700 Message-Id: <20220503194843.1379101-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220503194843.1379101-1-richard.henderson@linaro.org> References: <20220503194843.1379101-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.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, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have a subdirectory for semihosting; move this file out of exec. Rename to emphasize the contents are a replacement for the functions in linux-user/bsd-user uaccess.c. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- .../{exec/softmmu-semi.h => semihosting/softmmu-uaccess.h} | 6 +++--- semihosting/arm-compat-semi.c | 2 +- target/m68k/m68k-semi.c | 2 +- target/mips/tcg/sysemu/mips-semi.c | 2 +- target/nios2/nios2-semi.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename include/{exec/softmmu-semi.h => semihosting/softmmu-uaccess.h} (95%) diff --git a/include/exec/softmmu-semi.h b/include/semihosting/softmmu-uaccess.h similarity index 95% rename from include/exec/softmmu-semi.h rename to include/semihosting/softmmu-uaccess.h index fbcae88f4b..e69e3c8548 100644 --- a/include/exec/softmmu-semi.h +++ b/include/semihosting/softmmu-uaccess.h @@ -7,8 +7,8 @@ * This code is licensed under the GPL */ -#ifndef SOFTMMU_SEMI_H -#define SOFTMMU_SEMI_H +#ifndef SEMIHOSTING_SOFTMMU_UACCESS_H +#define SEMIHOSTING_SOFTMMU_UACCESS_H #include "cpu.h" @@ -98,4 +98,4 @@ static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr, } #define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len) -#endif +#endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */ diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 7a51fd0737..dbef280b87 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -370,7 +370,7 @@ static GuestFD *get_guestfd(int guestfd) #ifndef CONFIG_USER_ONLY static target_ulong syscall_err; -#include "exec/softmmu-semi.h" +#include "semihosting/softmmu-uaccess.h" #endif static inline uint32_t set_swi_errno(CPUState *cs, uint32_t code) diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 37343d47e2..a31db38fc3 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -25,7 +25,7 @@ #include "qemu.h" #define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024) #else -#include "exec/softmmu-semi.h" +#include "semihosting/softmmu-uaccess.h" #include "hw/boards.h" #endif #include "qemu/log.h" diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c index b4a383ae90..6d6296e709 100644 --- a/target/mips/tcg/sysemu/mips-semi.c +++ b/target/mips/tcg/sysemu/mips-semi.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "qemu/log.h" #include "exec/helper-proto.h" -#include "exec/softmmu-semi.h" +#include "semihosting/softmmu-uaccess.h" #include "semihosting/semihost.h" #include "semihosting/console.h" diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c index ec88474a73..373e6b9436 100644 --- a/target/nios2/nios2-semi.c +++ b/target/nios2/nios2-semi.c @@ -28,7 +28,7 @@ #if defined(CONFIG_USER_ONLY) #include "qemu.h" #else -#include "exec/softmmu-semi.h" +#include "semihosting/softmmu-uaccess.h" #endif #include "qemu/log.h"