From patchwork Mon Apr 19 20:22:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12212723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30E44C433B4 for ; Mon, 19 Apr 2021 21:10:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A5BF061104 for ; Mon, 19 Apr 2021 21:10:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5BF061104 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYb9q-0005x4-Jy for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 17:10:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYaQO-0006yV-E0 for qemu-devel@nongnu.org; Mon, 19 Apr 2021 16:23:16 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:34723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYaQM-0002TB-Pv for qemu-devel@nongnu.org; Mon, 19 Apr 2021 16:23:16 -0400 Received: by mail-qk1-x733.google.com with SMTP id y136so5097234qkb.1 for ; Mon, 19 Apr 2021 13:23:14 -0700 (PDT) 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=Yfv64dvMhdyEtoyrk3pC9NLOz70qBRB1xfI2zMRjLVI=; b=d6DmnOsKPEMOwJIhV5jigan/+j0IzvKP4qJwp/AFeFhul7j/0FhxT82VykeWS+Xj/Z m85bTLoMRFKdNFqZ1Kafs1wsw0u6BJLyv/7nqbIW+tBzCwgsSmc6FChtj+/0AAAav9CP f2jLtZuT2DH4sPg8MLdRGWmElyCSB4BHNM1V7Np+RqBH0jZ8Y9iMuJ28Lpo3yY7LO9iC wCzRp6huA1F4ubaty+6YCrW1PQcSILz2JR1aWPmSGfRoTOUuuBxhkb6+D4KE5UNM2wx4 DCvTmUVb93Ddd8X++2rA6fPkhj06oGI/r/u7f2harn5vtuYpjmkCFj9J01mmSJF07So/ haQw== 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=Yfv64dvMhdyEtoyrk3pC9NLOz70qBRB1xfI2zMRjLVI=; b=X7DdFJ9KdHgiQRDzcB4Ow7xhS9MI/LANRzQlYuG/aisUcwtaXlIdBh87RcOLrM5pbm oBSzXWOk3A644qFfGOW3EDflq9/+Zf+0X0Daq7TcmD6c2VUN1AZFmFmAkoW0LnUIBPn6 zjGd70P+1x2WBvMRW8m7gTTGndyUItU38tWd3eSri3qZ6itZMzVRsP66LqEikd4sPjDR tLBmRN4uqQ9iqAxauOla9rADBo0MZO1TPOoVhv8+qXx9cgRFYtpkuKeEmQsXNnAgENOm kts5LOBx3XvkC/pTI5/f3jTq2+6qC7A7yHgAyYurUHZeBMSeUauRXVmSUBHS3KYwbm6l UFDQ== X-Gm-Message-State: AOAM533chXrKoSjHlHcpbo980Q8+u/gBFgPucR01l1gDV1abcqRaC+Xj 5MrB7SWM+wvbbxdOoSW0uE96Avvn33Wa7zVm X-Google-Smtp-Source: ABdhPJxak8XSvc9sO557NIpOTFS9zHU6lsN4K5EyG1AcH1cCkM6yht/STccZfKEpje501vmI0mF4JA== X-Received: by 2002:a05:620a:1254:: with SMTP id a20mr13950049qkl.15.1618863793832; Mon, 19 Apr 2021 13:23:13 -0700 (PDT) Received: from localhost.localdomain ([2607:fb90:80c7:aba4:3594:91a:8889:c77a]) by smtp.gmail.com with ESMTPSA id c23sm10007835qtm.46.2021.04.19.13.23.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 13:23:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 07/31] target/arm: Use cpu_abort in assert_hflags_rebuild_correctly Date: Mon, 19 Apr 2021 13:22:33 -0700 Message-Id: <20210419202257.161730-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210419202257.161730-1-richard.henderson@linaro.org> References: <20210419202257.161730-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::733; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x733.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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Using cpu_abort takes care of things like unregistering a SIGABRT handler for user-only. Signed-off-by: Richard Henderson --- target/arm/helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 4aa7650d3a..8275eb2e65 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -13257,11 +13257,10 @@ static inline void assert_hflags_rebuild_correctly(CPUARMState *env) CPUARMTBFlags r = rebuild_hflags_internal(env); if (unlikely(c.flags != r.flags || c.flags2 != r.flags2)) { - fprintf(stderr, "TCG hflags mismatch " - "(current:(0x%08x,0x" TARGET_FMT_lx ")" - " rebuilt:(0x%08x,0x" TARGET_FMT_lx ")\n", - c.flags, c.flags2, r.flags, r.flags2); - abort(); + cpu_abort(env_cpu(env), "TCG hflags mismatch " + "(current:(0x%08x,0x" TARGET_FMT_lx ")" + " rebuilt:(0x%08x,0x" TARGET_FMT_lx ")\n", + c.flags, c.flags2, r.flags, r.flags2); } #endif }