From patchwork Fri Jan 15 13:08:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 363631 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp292399jap; Fri, 15 Jan 2021 05:26:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKMynuv9jAU2j8jQNYcABGYgzT3AsIyUCdh/kiizgdopXUUDHntTe2MtQxirTumA8PqMQv X-Received: by 2002:a25:31c1:: with SMTP id x184mr18472540ybx.365.1610717181135; Fri, 15 Jan 2021 05:26:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610717181; cv=none; d=google.com; s=arc-20160816; b=LOLhV6fpaqexbrhWVXAgxV7dS86XrJQQthPhcwSdMYg2VtGMfx9Wyqtm7i9h5hVvRn /9vCg7h4RgriHbY8FW41aho0fZTfOmeopD0WIJfeGwvLEtqWPcO4LZmd6k97pdpzex3j ylSdw8MEWGsi7ytbmpzT1uv7JNlvIijiAAlRAkayDrcpc0LKtde8XUFN94NXT7T2GGAu E8MsM87KjRDGGIn8tyH22JDGuRAfW9B5AtiNl5OKTEl7U8iqt7jfx/oiodyifOmH1Mi2 K1Uz45opbI9Epuo/wrgoW/YoEW46nx/GWIA42AtwbOipBmCx3TbYadgzBMBdSVBBIHcQ iX0w== 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=7M7Vxt1PgYxvSdpOyx8xpXMm+2OhKwvGp+AnPAxmwB4=; b=DQ1/4vcw6FFf3l3F9be8oodRG+/LMdCMzvlSj7CHoTUl1ZqgXjQCRlQN5yQgq33Dnd jzIdFE3RjFUb2xm7mwmSas41hmAS01RDu2d5DWjulhqQH2o7bHWFDgNU4Gna65Iyb1GC JrxFY4m2U9LnvHgosiUhprY7TcNcc+edkenpMMhCf3x0p9Q2EJk01qVIUf92ynvh2gNd dJh7nUySNS4QDik7a7t1HbMtExcQfAs9H3eaWo4ALZYMW1VoRrkTRpztpds5aXl9IcmI AdaEry7CpWrzyVddi+A3QFPHR/SDFUWBn0vOIhVpkV5X5YLPz0fDjGMb+ktDvV3+73r1 3k7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dvK34jng; 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 b63si8755315ybg.240.2021.01.15.05.26.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jan 2021 05:26:21 -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=dvK34jng; 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]:50478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0P7M-0001rP-Hy for patch@linaro.org; Fri, 15 Jan 2021 08:26:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0P0Y-0005N3-Sh for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:19:20 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0P0L-0002Pt-Jh for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:19:10 -0500 Received: by mail-wr1-x432.google.com with SMTP id 6so1952675wri.3 for ; Fri, 15 Jan 2021 05:18:58 -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=7M7Vxt1PgYxvSdpOyx8xpXMm+2OhKwvGp+AnPAxmwB4=; b=dvK34jngeVjNhpIo6OuGqVHWL9V0Rph5hWt1vPduc+EBba00/PLzMb5FFnITHpydhr x0mw8icclClvYmRh1VNHbqAiMFpjiak83gPhPaOOkqocPsx0wEqqe7NBwxYhYLcO3UXT vw5AmOQyTguStkFlANTmE4AYbM+LWJjxpfxb0TYBWfKmPG+hIiDIgsuwnDbnbt3oTVEQ mbuvybwydJczsBBLb4uHHLmxzVdN2HhZljg+MXTbAx0Ycj3bcewN5rajWs5a5sDN6B3e 2QFwp20WXaW1MmRr40R8ZOnweE4G9wB6kV3jZ0Z7aJEgLeb9yQfFSiuNUTBH5tISSTMZ lfNQ== 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=7M7Vxt1PgYxvSdpOyx8xpXMm+2OhKwvGp+AnPAxmwB4=; b=fhm46oVCzPSIfojNTvPDa17KGCuOMWmuDMLP067f3gk5gpKS+7WNceprhF7OsaF51j XqF5kDYsPsHkhAmFeL/JLNuNGrrCokgYXfjH6RbQN9QXqE1K1WJ2/a8sBhyCxTaNMVUT iJzHmUbDq9g8m9grDPxuVQCfZLOr9ZVayrST6yIAepwe/M8xR0NAtGBDF73qElt6kSrv s2aLDZoX0Axih8PHBALsNbwbWQpDRMWUGg+4NcdX9wKzpL14S5cg+0gIi37gEZcUOIze eKw2vTtzlQ17jLT7gSZ7JBUag64plP6ioI8YVUFXfBFKMe4n5+Tgr9q8ljkJMhF9SNUH E3ag== X-Gm-Message-State: AOAM5313b9aso03O8xazj0n0yfAaP+YIpNBBTIuzsLAm6GRSF9l+HpBG r1BOPV8ihji23vxnS8rHs+6KUg== X-Received: by 2002:a05:6000:1624:: with SMTP id v4mr13554747wrb.210.1610716737821; Fri, 15 Jan 2021 05:18:57 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g10sm6491497wmq.3.2021.01.15.05.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 05:18:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A537A1FFA5; Fri, 15 Jan 2021 13:08:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 18/30] gdbstub: drop CPUEnv from gdb_exit() Date: Fri, 15 Jan 2021 13:08:16 +0000 Message-Id: <20210115130828.23968-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115130828.23968-1-alex.bennee@linaro.org> References: <20210115130828.23968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-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 autolearn=ham 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: Marek Vasut , =?utf-8?q?Alex_Benn=C3=A9e?= , Chris Wulff , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "open list:ARM TCG CPUs" , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" gdb_exit() has never needed anything from env and I doubt we are going to start now. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210108224256.2321-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 94d8f83e92..492db0f512 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -46,7 +46,7 @@ void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...); void gdb_do_syscallv(gdb_syscall_complete_cb cb, const char *fmt, va_list va); int use_gdb_syscalls(void); void gdb_set_stop_cpu(CPUState *cpu); -void gdb_exit(CPUArchState *, int); +void gdb_exit(int); #ifdef CONFIG_USER_ONLY /** * gdb_handlesig: yield control to gdb diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index d38ec7a162..adc3d21b54 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -333,7 +333,7 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1, #ifdef CONFIG_GPROF _mcleanup(); #endif - gdb_exit(cpu_env, arg1); + gdb_exit(arg1); qemu_plugin_atexit_cb(); /* XXX: should free thread stack and CPU env */ _exit(arg1); @@ -435,7 +435,7 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1, #ifdef CONFIG_GPROF _mcleanup(); #endif - gdb_exit(cpu_env, arg1); + gdb_exit(arg1); qemu_plugin_atexit_cb(); /* XXX: should free thread stack and CPU env */ _exit(arg1); @@ -514,7 +514,7 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1, #ifdef CONFIG_GPROF _mcleanup(); #endif - gdb_exit(cpu_env, arg1); + gdb_exit(arg1); qemu_plugin_atexit_cb(); /* XXX: should free thread stack and CPU env */ _exit(arg1); diff --git a/gdbstub.c b/gdbstub.c index 15d3a8e1f5..afa553e8fc 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -3068,7 +3068,7 @@ static void gdb_read_byte(uint8_t ch) } /* Tell the remote gdb that the process has exited. */ -void gdb_exit(CPUArchState *env, int code) +void gdb_exit(int code) { char buf[4]; diff --git a/linux-user/exit.c b/linux-user/exit.c index 1594015444..70b344048c 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -34,6 +34,6 @@ void preexit_cleanup(CPUArchState *env, int code) #ifdef CONFIG_GCOV __gcov_dump(); #endif - gdb_exit(env, code); + gdb_exit(code); qemu_plugin_atexit_cb(); } diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c index f7b7bff522..93360e28c7 100644 --- a/target/arm/arm-semi.c +++ b/target/arm/arm-semi.c @@ -1101,7 +1101,7 @@ target_ulong do_arm_semihosting(CPUARMState *env) */ ret = (args == ADP_Stopped_ApplicationExit) ? 0 : 1; } - gdb_exit(env, ret); + gdb_exit(ret); exit(ret); case TARGET_SYS_SYNCCACHE: /* diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 27600e0cc0..d919245e4f 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -195,7 +195,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr) args = env->dregs[1]; switch (nr) { case HOSTED_EXIT: - gdb_exit(env, env->dregs[0]); + gdb_exit(env->dregs[0]); exit(env->dregs[0]); case HOSTED_OPEN: GET_ARG(0); diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c index d7a80dd303..e508b2fafc 100644 --- a/target/nios2/nios2-semi.c +++ b/target/nios2/nios2-semi.c @@ -215,7 +215,7 @@ void do_nios2_semihosting(CPUNios2State *env) args = env->regs[R_ARG1]; switch (nr) { case HOSTED_EXIT: - gdb_exit(env, env->regs[R_ARG0]); + gdb_exit(env->regs[R_ARG0]); exit(env->regs[R_ARG0]); case HOSTED_OPEN: GET_ARG(0);