From patchwork Thu Sep 30 15:11:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 514913 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp278239jam; Thu, 30 Sep 2021 08:28:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFyqpdBrBudaY4FX0w/T3nPR7Z5UuaMrz07aTgRJiGj+oMtS5JJ94sXK9aTUik1GKE6NLf X-Received: by 2002:a17:906:5d1:: with SMTP id t17mr7467340ejt.120.1633015711972; Thu, 30 Sep 2021 08:28:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633015711; cv=none; d=google.com; s=arc-20160816; b=oZdYoQVzT9ekYnq52xSKpj97KmLwBU6UIP3Ur6FfBhw7auHgCnqMSLgYOydKTWZk1H +mbl1q+VcPivU6oqTDKKoMSXmjTclHp1ULQEY2up4XXsJyXwMQCnJbxVGjogbzmNj7qr MHB3oGUMZiNhMlOzetORBaMbErKdBMp5lQlp+kq9Glj6U+CQgpsy/C3t9QLJa0ZcieE2 tBvSRYpbWaBI1HRBhO041L8WJPn/ubUbhBx4wiCIK2nltOE1S6g2ooXua9iyk0tlAruY f+GFQ3VBhFLM2u8x4NZpIyeYRAgnTOehMjlYryktU63wIQNwqWDGMlYX3BWCIDTX/oxC HbhA== 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=fiYS5FCgMGXDlrIgAMDa81IO9f4zjGQxiSsB7/2wRaE=; b=VmUjwNLF0IPrZVb9URYodEMBqqqB1rFgrli3hW+x/pY7ToMD0dFkE51Jp/a6JOFJNc XTqW9B6ZHBwtN9rhgx1rPMFioJ+ylEEPCOeIsTx8j+nR1PUBef3RmruFt4hIW/cuOEFF su8VLOvB+Jng9lXI61YAWQsVXluoQIQnKnVAmcuFVYJRSM1gAwH58M2cjD/t167YJc0J SiwuJ48QJOJ6d7J1uj/R9GkzzPKswM37wEqnM4Tnxj2W9DF556Na9Xx8oUhcLHwfO4FA bSKti2/A3qQ5IT1IFWjkhlwJccpOyUQXjOvQwT7F1BqGGp5DNZYYvFpKggz29QcVeMWT xiwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rZfqMY/L"; 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 ka6si3573059ejc.26.2021.09.30.08.28.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Sep 2021 08:28:31 -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="rZfqMY/L"; 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]:60112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVxz4-0007wO-D3 for patch@linaro.org; Thu, 30 Sep 2021 11:28:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVxjP-0000Hx-Pa for qemu-devel@nongnu.org; Thu, 30 Sep 2021 11:12:21 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVxjN-000426-4T for qemu-devel@nongnu.org; Thu, 30 Sep 2021 11:12:18 -0400 Received: by mail-wr1-x42e.google.com with SMTP id d26so10653518wrb.6 for ; Thu, 30 Sep 2021 08:12:15 -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=fiYS5FCgMGXDlrIgAMDa81IO9f4zjGQxiSsB7/2wRaE=; b=rZfqMY/Lollarl/7PGVlJsMc/jAu6+ralbtVrOWwq+WQByPMLo9pRjp5gWLgtEtEed 1u4mYmU9H6bYIRzgi/oNks/hYRDt9M8/GpujQN59TA0BacXA6MPqg+HdiIxCXwrrTPtW hGC/8agv0FfHuz0GxrLP9JSsIiorTWFMVBAFjBWPtqiz/g1RaN7ZTk7yY5zmMIUD34Vf O39qetCaGc8YluFKoN03vwya2LBVvq4F6ZSO01urRHAvml/IKy+ymoRCbmyQwgXXixzA 0wuGCCVKYAUNbGHZdiI9K61DFgOkICY94X0/lDefWkG3vw0JU9ZuyhvEg9rjmRkcmBz6 drBA== 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=fiYS5FCgMGXDlrIgAMDa81IO9f4zjGQxiSsB7/2wRaE=; b=JIfOa5uICc41IYA+0UNDewgJFMgxzlzuG4sMwXBduPuYx14NG6ewQv1kOGV10ovjmO EUT5M6yzTMZIsPBIdwyd5AOV8m225tg+auM86aIJgtjtNTGtGfGAxIQ65fRO7Bft5oFW 0yO8x4FRe1wtMMdrHtSvYTvgGf3qm6g90HFfBa5xo3Af3t5M3ncaK6ZgRH7jlQnh07LM kEVR0OaW7y6TopXI+K2mCYF4KurvapHIU0Pi6v+6MzHKraK42LkWvEIsPyM6YCQ/2UVy YltOnnCamTaSj1B4lIcOrRzIVvQykZxJutQeddboj2CZ+pe3R0X15qn7Zza6JwV8G583 8Sbg== X-Gm-Message-State: AOAM530Ywb0OEygqEwwhhr94Ow8m+8ziv/Pv1j4EVJjOOad5mZzmzq/U dtONDtj0Le3p1MVRETfGToquIGZvsTfvEA== X-Received: by 2002:a5d:4704:: with SMTP id y4mr7051047wrq.138.1633014734659; Thu, 30 Sep 2021 08:12:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id g8sm1952098wrm.46.2021.09.30.08.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 08:12:14 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/22] target/arm: Fix coding style issues in gdbstub code in helper.c Date: Thu, 30 Sep 2021 16:11:52 +0100 Message-Id: <20210930151201.9407-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210930151201.9407-1-peter.maydell@linaro.org> References: <20210930151201.9407-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We're going to move this code to a different file; fix the coding style first so checkpatch doesn't complain. This includes deleting the spurious 'break' statements after returns in the vfp_gdb_get_reg() function. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20210921162901.17508-3-peter.maydell@linaro.org --- target/arm/helper.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 62742214473..84bba9a2244 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -72,9 +72,12 @@ static int vfp_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg) } } switch (reg - nregs) { - case 0: return gdb_get_reg32(buf, env->vfp.xregs[ARM_VFP_FPSID]); break; - case 1: return gdb_get_reg32(buf, vfp_get_fpscr(env)); break; - case 2: return gdb_get_reg32(buf, env->vfp.xregs[ARM_VFP_FPEXC]); break; + case 0: + return gdb_get_reg32(buf, env->vfp.xregs[ARM_VFP_FPSID]); + case 1: + return gdb_get_reg32(buf, vfp_get_fpscr(env)); + case 2: + return gdb_get_reg32(buf, env->vfp.xregs[ARM_VFP_FPEXC]); } return 0; } @@ -98,9 +101,15 @@ static int vfp_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg) } } switch (reg - nregs) { - case 0: env->vfp.xregs[ARM_VFP_FPSID] = ldl_p(buf); return 4; - case 1: vfp_set_fpscr(env, ldl_p(buf)); return 4; - case 2: env->vfp.xregs[ARM_VFP_FPEXC] = ldl_p(buf) & (1 << 30); return 4; + case 0: + env->vfp.xregs[ARM_VFP_FPSID] = ldl_p(buf); + return 4; + case 1: + vfp_set_fpscr(env, ldl_p(buf)); + return 4; + case 2: + env->vfp.xregs[ARM_VFP_FPEXC] = ldl_p(buf) & (1 << 30); + return 4; } return 0; } @@ -119,7 +128,7 @@ static int aarch64_fpu_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg) return gdb_get_reg32(buf, vfp_get_fpsr(env)); case 33: /* FPCR */ - return gdb_get_reg32(buf,vfp_get_fpcr(env)); + return gdb_get_reg32(buf, vfp_get_fpcr(env)); default: return 0; }