From patchwork Tue Jun 7 20:45:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 579421 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp5571178max; Tue, 7 Jun 2022 15:33:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPaLd5kcU7kDgt0ScvjnTUSj98KRabL1au3J8lsohhB67qXVqM2YNXPRkDv+2IStrExETk X-Received: by 2002:a0c:fe48:0:b0:462:6a02:a17d with SMTP id u8-20020a0cfe48000000b004626a02a17dmr23569964qvs.108.1654641198421; Tue, 07 Jun 2022 15:33:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654641198; cv=none; d=google.com; s=arc-20160816; b=BFWNfC7sTP8P7ZDAtSuw0p1RTp+q6a1OAOvhYnicNM5ljNqIFgo3siSxe0Un5wa0dZ t6tI8bmS60QptbXxRRY49BOAFc15WRuHXGrqn+76oAJxJanFPXuiZHk62xeKxJiPMLRU EYrLnERQxfTYO41n7+QFUSLqOMYgKsn1ksLtA/jV3DdM0PzqIfT3hjApxcdUO9bf7C8v L7r46QKxg3/tWqfvd8vN3vcRWU6ncfcUgVBo/2AM4pzVI+Scb2FVR+f4YqUO+En2/wd3 SnHeoVzKbIFWPW/AkJNTEdFKpYoOZJpYS3nNSv4OBjSHVvvcgcdqujDkcSeJ22V01eqD YtFg== 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=EuRn4zS6JF83w7ZKExtBXrrlNlKkOsGtWU334MtZYfk=; b=tjGoBKi5/uhTalNEZaNXim4iZvUpL51X7aFOvx1is/K+1WHKP3Lr5KgyZa2Y3MKFnW 7Q/4tzhM+xk+GvJfvC7SI4RNGR0m9KSNbzxTMZpE+cXo+zjTtoMSSEClG1gCOlUTpq0X 2kTTvzHBweXb587Kw9+1Lv8FSI+Yb+OQQQygYorNHO4Q6nvtsdzGp9EoDwb57wmjinq2 L0wkdA8D4IvUCakO0St02TdC0ujj6eUy3EvDs/OYrKprzYzQE4EhA/Sf2xL0phQyNHQ4 SD+G21NZjNX0MctTPO/6NF+9DFhxRV4Vt/SOQwr6pkLCaE5Q8xom2UsSXUeiBmM0X2fW kzLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SW5hHhPc; 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 v12-20020a05622a188c00b002f347192afesi10080400qtc.125.2022.06.07.15.33.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jun 2022 15:33:18 -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=SW5hHhPc; 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]:58908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyhlF-0004gF-TD for patch@linaro.org; Tue, 07 Jun 2022 18:33:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyg5p-0007J5-2X for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:46:25 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:34783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyg5n-0001Rb-Hd for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:46:24 -0400 Received: by mail-pf1-x432.google.com with SMTP id c196so16548579pfb.1 for ; Tue, 07 Jun 2022 13:46:22 -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=EuRn4zS6JF83w7ZKExtBXrrlNlKkOsGtWU334MtZYfk=; b=SW5hHhPczZVFvnyL8PFr7Vd8VWT8xJgHFuGBlrh/6vOl/oCFm5D63BZ7xgGs2SNHsE jS/aCWl8IcpiqbWvwpVfjWesEoWpyz/YO9PU1/Ni2tna5FDwpSmf8PLvquLom/OOwUQQ u3MSRguA0GEknjKxcWvQxb8mTutqRBoXSSaiDnD4cswXm4LGc84VCazbBFo9U3P799ua 3ZPfwbvACw1jl+btWXLd7RUHm1MOxhpXbhkig/awsO8//QM/XKe0hxoQZmXNClY9+xPG UXk3YJ5t1SGg6Hj8/W/Ehh8Z0VRNBvR3XjHJQ//PQEw7MvbwkNBZ/9G8nnI4jHvA8jL3 ADEQ== 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=EuRn4zS6JF83w7ZKExtBXrrlNlKkOsGtWU334MtZYfk=; b=vYIFzVMk8KDKR527P5lFMZx7STPLrWvf7gM0+iQeaofec4NSqgkO/Yg6nApza2sMT5 Iu9sfgNFAXcm84tqCUHLpOfjsCsfkrNJ3E3ZIm9LmvQk7iC04cCaY4NmsCVO63Z6/Vp/ xqN1uXNzqhR9Us0WXQZMwDUssaV/CEDWgzV2o9aAyPzF3gg8WhI0pXrieHM0McwPIKxu nbHhopM/zV2eTSmhpy7nNQiSNkKJ7R24ZK0Br6XzDIFNRPYyCbNN44TZhg+wgCtGZhrs cRDh80pvruHL0lLoL4KQT2oR5qKNQ1sdK3KIFlXkrbmAIOfsIayj3WrTq0L0F7N4mNrH sYPg== X-Gm-Message-State: AOAM533/3yHQjIbNNHMAagBIjlaAAIWQ5gVoCBYnbjlZ5uwe4hlSrMfs XXLomqj9u402FrdYAcHGCoZb+cHUrcOcsA== X-Received: by 2002:a63:e018:0:b0:3fd:94e9:aa0 with SMTP id e24-20020a63e018000000b003fd94e90aa0mr13095613pgh.618.1654634781849; Tue, 07 Jun 2022 13:46:21 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:3cf2:c634:5b19:25f6]) by smtp.gmail.com with ESMTPSA id r6-20020a170902be0600b00162037fbacdsm12971279pls.187.2022.06.07.13.46.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 13:46:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 25/53] semihosting: Use env more often in do_common_semihosting Date: Tue, 7 Jun 2022 13:45:29 -0700 Message-Id: <20220607204557.658541-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607204557.658541-1-richard.henderson@linaro.org> References: <20220607204557.658541-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.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've already loaded cs->env_ptr into a local variable; use it. Since env is unconditionally used, we don't need a dummy use. Signed-off-by: Richard Henderson Reviewed-by: Luc Michel --- semihosting/arm-compat-semi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 5e442e549d..adb4e5b581 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -553,7 +553,6 @@ void do_common_semihosting(CPUState *cs) GuestFD *gf; int64_t elapsed; - (void) env; /* Used implicitly by arm lock_user macro */ nr = common_semi_arg(cs, 0) & 0xffffffffU; args = common_semi_arg(cs, 1); @@ -636,12 +635,12 @@ void do_common_semihosting(CPUState *cs) break; case TARGET_SYS_WRITEC: - qemu_semihosting_console_outc(cs->env_ptr, args); + qemu_semihosting_console_outc(env, args); common_semi_set_ret(cs, 0xdeadbeef); break; case TARGET_SYS_WRITE0: - ret = qemu_semihosting_console_outs(cs->env_ptr, args); + ret = qemu_semihosting_console_outs(env, args); common_semi_set_ret(cs, ret); break; @@ -672,7 +671,7 @@ void do_common_semihosting(CPUState *cs) break; case TARGET_SYS_READC: - ret = qemu_semihosting_console_inc(cs->env_ptr); + ret = qemu_semihosting_console_inc(env); common_semi_set_ret(cs, ret); break;