From patchwork Fri Jan 15 22:46:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 363792 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp271324jap; Fri, 15 Jan 2021 14:50:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJysunPgkDbOxMuyOpm/US0mLTt8NROcUbg5Bq7cs4LqkcOtHGIVIZT6vy3AAr+C4ECnqXB7 X-Received: by 2002:a25:bfc7:: with SMTP id q7mr19653777ybm.130.1610751057437; Fri, 15 Jan 2021 14:50:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610751057; cv=none; d=google.com; s=arc-20160816; b=w+7OR8b0LJ0kwhi4CriBxZD8JiNgOc9z383LLlTs/D60y+dW73HmMx1qzLVKY2RcL8 ZneTVGkrWJAr/QTD7cyRoyy9jpg/1m8llpJK77T3Zpy9UIVV9jRcxvdOLyvDttnbiYbh D3rXRu5rM/GApiEpuVhu1478X1E/V2IsY3f6OBEpSMPrz6YnVh5LXU58UQH8gxwMwSKf al08GIEZLJSnZCv7S7jBFyiCNBc1592L9dzQXM4dKd8tRv7B18F1tNhZk6m66ElGNvjF OSCg1UTdxrhWrbSKC2zX/HK2vXnxKNyIY5lLoAhwmNrXs9KVwzAFHAdXVm1rsz4g1fIF fJNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=Q6Vn8EuRt3zWEIGcR+Vsso1EpzS5NZb4Sjnv0xY+IUE=; b=Py61iV6eLpRlSVwtO86IV8baJQSH46mVLAOwztdqbQHrlrfh2fpM2X22UGSQkmCrYj 4RrTy0Iwzsw4NHIOq7JlRNZtZ+iCdNrwNxiM5K8vX1+rxv+D8hOOoMkPXmRs6d7BzwLx zCbndt3bPvIlIKzn/oQkc2QmaricH1FGF9EwuPZkBr+Wy2KfAi/Y9JMbX8MzBOw0sgX/ HWMDIK3/0BKvlmPcq5c4WiWZ8I5JqN5ZusuHHwlJ4D+nklL2OJ6bLyP8XHH4Xwg2Fde2 W+enK3s0Pk388FGFRsn+QSbT86cc+GraumnJZ1B14BqosOhptQpfNzwnTZcunit+3SY2 VVXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PaMRsJ4A; 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=fail (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 t1si9451611ybo.308.2021.01.15.14.50.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jan 2021 14:50:57 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=PaMRsJ4A; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0Xvk-0007kt-Ti for patch@linaro.org; Fri, 15 Jan 2021 17:50:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0Xs0-0003XQ-BK for qemu-devel@nongnu.org; Fri, 15 Jan 2021 17:47:11 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:44766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0Xrr-0005Cc-0p for qemu-devel@nongnu.org; Fri, 15 Jan 2021 17:47:00 -0500 Received: by mail-pl1-x62d.google.com with SMTP id r4so5433205pls.11 for ; Fri, 15 Jan 2021 14:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q6Vn8EuRt3zWEIGcR+Vsso1EpzS5NZb4Sjnv0xY+IUE=; b=PaMRsJ4AsTRmfgunMw9G8wCbtxV4VxB1Y1z9QfOjPTRXIaAdiK3IdR+RcWr7+RQjVV +5NEQMFyR4LvlAwjdEjoQ97GxyFyzv+Igw+PjGZnPtWaKBdm2i2I62Lt3mhEShKDLWKb RQVHuBB0r5K009sLlE/7GuVkX8lqY/NWLZKu9WwpBL0WTWSYLqokrupSOpy2itAf/I8r xzKYdyff9RMsNShrlrPEytol4MLV4QYtcmIHF9d17/OvZ34GN+wYxIRoVJy4rVvkegJ6 1DN2OBlmCZw2Q4pRc2GZ8uYn0/uzok7N19XV7hNiy5EMdYYwoHXDn/jPqInbKKV2oEaA Pm5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q6Vn8EuRt3zWEIGcR+Vsso1EpzS5NZb4Sjnv0xY+IUE=; b=uF5POL/xeVXnZavmKV0O7NRxVo4/Lx/zmIufbnWn4CyMwAY1WoVF+1DxzhxvTvLhIE 5ngwIFbQ4GNDfii2OEl8BjE2rtVRlGpz3SB2Zuvk5a+zZ8DGhAblCauXV/IP0o63+YnO Ks+rGI75HOllFtUB0ETHV0Hv/Gr7ZimE8m/ZFEcuYPXkPltznYhtxHHDxwA6A9kp5oYO 2vfunfckL5ol7XsIBH+QSmgroHX17X9eP/3BaPUHhEEbVKRpic3l6bsDTL0HOSPxBiUf wW7X03abWrTiWq+HLhkvSi/JZg5664PNlXVagyCtDQVfitqbUmrfErC3pCGhXBSPZRP1 Aicw== X-Gm-Message-State: AOAM531IuHLhZQ3EnRNVJcvxQ0F3pNsN7d25Hf4oYgAEay9d7/oHHd2P utcOpKjbrwQq0EXIqC7f9A8aUIEzIGMLifjr X-Received: by 2002:a17:902:8341:b029:dc:27b:be2d with SMTP id z1-20020a1709028341b02900dc027bbe2dmr15083974pln.30.1610750813805; Fri, 15 Jan 2021 14:46:53 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id s13sm9521700pfd.99.2021.01.15.14.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 14:46:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 03/21] exec: Use uintptr_t for guest_base Date: Fri, 15 Jan 2021 12:46:27 -1000 Message-Id: <20210115224645.1196742-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210115224645.1196742-1-richard.henderson@linaro.org> References: <20210115224645.1196742-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is more descriptive than 'unsigned long'. No functional change, since these match on all linux+bsd hosts. Signed-off-by: Richard Henderson --- include/exec/cpu-all.h | 2 +- bsd-user/main.c | 2 +- linux-user/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index c23c77589b..c52180e8e6 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -158,7 +158,7 @@ static inline void tswap64s(uint64_t *s) /* On some host systems the guest address space is reserved on the host. * This allows the guest address space to be offset to a convenient location. */ -extern unsigned long guest_base; +extern uintptr_t guest_base; extern bool have_guest_base; extern unsigned long reserved_va; diff --git a/bsd-user/main.c b/bsd-user/main.c index 65163e1396..5c8e6a4acd 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -41,7 +41,7 @@ int singlestep; unsigned long mmap_min_addr; -unsigned long guest_base; +uintptr_t guest_base; bool have_guest_base; unsigned long reserved_va; diff --git a/linux-user/main.c b/linux-user/main.c index bb4e55e8fc..2600245300 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -58,7 +58,7 @@ static const char *cpu_model; static const char *cpu_type; static const char *seed_optarg; unsigned long mmap_min_addr; -unsigned long guest_base; +uintptr_t guest_base; bool have_guest_base; /*