From patchwork Mon Dec 20 21:05:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 526069 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp4449769imb; Mon, 20 Dec 2021 13:07:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwv5ozrio+8EJ168yxil4LZ9suBwBqv11+N0sXn80H7HnbLMc76agLsi2rEzxnnmeZLREF6 X-Received: by 2002:a05:6602:150b:: with SMTP id g11mr9355808iow.119.1640034438110; Mon, 20 Dec 2021 13:07:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640034438; cv=none; d=google.com; s=arc-20160816; b=UH0mJyxCcyJU8If0xbD83ZZ06ig7mwpGfr5aOAdF+lkcmzgOYs2grFCHxUjKoDHp3X eo3h82DFrw8WguuoEf8BR5JxmJLWJ89oDpzPhlOaklznuWFz425Y1LSf8vZ2BuaEkIFa Z4Wp2H0DceAxQe4JEp7eIy4c6Ymra5PZM2tPhiNrAyE0XC8KTwOZ44XnsH9DFIhIDlEn xxPOLPph8Ndni3uVtAGBL36J9GCLLi1NiiegsuX4BrGK///vL8l5O/YpnjR+ZHMj0iRp /u21xdpsS36TmiCnW9yfmbWzQ+6J61sx7G2ghzUalT/X0zpKP1QR5hnMCc6ABOncm4Hb iVeQ== 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=nlfMa3uLcCkh+T3g7LsRxXaJmvJxKY8lfYOrMw7+gaI=; b=CK5ydfjFsMxoT/YqvbobehQgNYJIGOhJ2UbBswoPLWulsZktn/NqmzIedClO6GrkuK BqAkz3or5L2waAP9sF51qEgkhduRdm1WTKS4yEVoDyYQUCe/ShAimz/QK16xFoQo/NYY ZEql934HJ8Dt4ULuUpwKfDJApHszzCCzVRP5/JurKNojhMceT3s/xCYPEzDNt+WbZ8qq sicbwGDBW9pQ7yqBo4ZRdGuKM10HkJK85OwpeHfX/ZTg+Z/Z0ToUnp6F5Zkat1HDdjly SkVe7D+pMstSgdL6di2fTdiSeV+Z8vVO1yxk8usehxQfx1l0Gp7HYJbvTuszwZVy44pi RArg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CVNxuUUQ; 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 q4si5524065ilv.106.2021.12.20.13.07.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Dec 2021 13:07:18 -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=CVNxuUUQ; 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]:52524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzPsL-0000AS-LE for patch@linaro.org; Mon, 20 Dec 2021 16:07:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzPqi-000084-4n for qemu-devel@nongnu.org; Mon, 20 Dec 2021 16:05:36 -0500 Received: from [2607:f8b0:4864:20::530] (port=42896 helo=mail-pg1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzPqe-0005sj-Ky for qemu-devel@nongnu.org; Mon, 20 Dec 2021 16:05:34 -0500 Received: by mail-pg1-x530.google.com with SMTP id g2so7853168pgo.9 for ; Mon, 20 Dec 2021 13:05:32 -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=nlfMa3uLcCkh+T3g7LsRxXaJmvJxKY8lfYOrMw7+gaI=; b=CVNxuUUQ8ySBdygCRof3fYHri1OVqTLp04xF1FhKmNN6tIAOanbKE7WelEJlIWyLWB oKiA0NRdbU6fh7VJjASUAElUR64/fdXQsWgnJhz8DnYr9N1RviW6ZSKRZlTz+3o4w5e1 Rtgc5EYRY+nVoHYdNaa8EMlEfxazBpnJ7EOwaKMGRa+535+4COw9E4uYwYGC8uV++TBH 3XclSAAqoeVS2JEGSZqhd3qy/wiOUNOBlaPA34aki+uMV0lefv78BrSRLMJfneSXT7yE 7+Dri9+jWj5RuBX3toi8quA6bkc+/LkNF+09B8RsSNFFbLA5gAtpiVNY1I2mj6DedxwY 7p4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nlfMa3uLcCkh+T3g7LsRxXaJmvJxKY8lfYOrMw7+gaI=; b=GY0A3WIQ9J+vQRpJ+3RwFA7KGCseLxUyO4PQAt0PHxSIjR7JwYtItUAHjeL9GnOl7a kWgljJoHkOQQA0t1KiGUoOgd9N4PW65aTu5lMtP+iOHkzLpdmjXW8fzUsHvgH0CVm6Oo vRQVEfkn3vTmGH9Q9JlPNIGg4IBVIofh4kPFlnx2OAvnMrtx1Gp1w2UASqIc/vugyrun 7oDHT7l+Xe+AJCcFLxq+j6J7x5PA286jeK5/6us2nxhHCDjRXPHJd1yPgn5Xlx2Pls81 tawJe8v+RMNot1jaiwA+IDEOzagHW6+XJoXmTSaCHEc30RRP3EbUTVyMJZxdJvr7cbTg xAvA== X-Gm-Message-State: AOAM531zyYPjeUmPvho9dD3Hn/hjecEIcBOIkk8eRuYxY2krY9Duv/rw jolWHM60gMcxa7sb8YrthziutY6qrs3YQQ== X-Received: by 2002:aa7:9e9e:0:b0:4bb:39a:b85c with SMTP id p30-20020aa79e9e000000b004bb039ab85cmr2332652pfq.68.1640034331182; Mon, 20 Dec 2021 13:05:31 -0800 (PST) Received: from localhost.localdomain ([156.19.246.20]) by smtp.gmail.com with ESMTPSA id d13sm20091021pfu.213.2021.12.20.13.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 13:05:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 01/24] linux-user/alpha: Set TRAP_UNK for bugchk and unknown gentrap Date: Mon, 20 Dec 2021 13:05:05 -0800 Message-Id: <20211220210529.150423-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211220210529.150423-1-richard.henderson@linaro.org> References: <20211220210529.150423-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::530 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x530.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Peter Maydell , laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These si_codes were changed in 535906c684fca, for linux 4.17. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/syscall_defs.h | 1 + linux-user/alpha/cpu_loop.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 0b13975937..bc18a4f248 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -715,6 +715,7 @@ typedef struct target_siginfo { #define TARGET_TRAP_TRACE (2) /* process trace trap */ #define TARGET_TRAP_BRANCH (3) /* process taken branch trap */ #define TARGET_TRAP_HWBKPT (4) /* hardware breakpoint/watchpoint */ +#define TARGET_TRAP_UNK (5) /* undiagnosed trap */ struct target_rlimit { abi_ulong rlim_cur; diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c index 4029849d5c..b039369198 100644 --- a/linux-user/alpha/cpu_loop.c +++ b/linux-user/alpha/cpu_loop.c @@ -86,7 +86,7 @@ void cpu_loop(CPUAlphaState *env) /* BUGCHK */ info.si_signo = TARGET_SIGTRAP; info.si_errno = 0; - info.si_code = 0; + info.si_code = TARGET_TRAP_UNK; info._sifields._sigfault._addr = env->pc; queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); break; @@ -155,7 +155,7 @@ void cpu_loop(CPUAlphaState *env) break; default: info.si_signo = TARGET_SIGTRAP; - info.si_code = 0; + info.si_code = TARGET_TRAP_UNK; break; } info.si_errno = 0;