From patchwork Wed Nov 3 14:08:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516756 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp711920iml; Wed, 3 Nov 2021 07:24:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8Omz3kQxJIvVCzoslOhbbA0ibkler497NJu1IhogGhO2mFc3jK/3U+O/EqlErDiAL+ZmR X-Received: by 2002:a4a:d244:: with SMTP id e4mr7454864oos.51.1635949488759; Wed, 03 Nov 2021 07:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635949488; cv=none; d=google.com; s=arc-20160816; b=yRXxPitl3EHwDwTp3Bh2d6I9QCyOXTyFVo7AWJh4v+GHjU4MJXPfZld3pZ61vVJiRo tm+Kar0OSGxWuPxIjaoqKq+TOxo6DHGfJjaUVo+jjJ7Adacyu+D5+zyTHwyMEDIiZIlw k53B+AUcEulAhJL41kKjVvXzhowDkPvWLkWr6bKyCV5SdTzAZ6GgLObCrOff30KUWGnT 5yDGDFfI+mYlNpg8XftA3lB++nmMCGDYGjQmC3n4n1xleyBfa0181VvpvbqHq34BtK9N uW1PQfBqoaihFfux7IDFzqvXV5WrWWaio9gXrE3l1Ji/eSaUA97b2edzuNI4aP6VhmCb C9oA== 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=RWV9WOum/EgcRXAB9OWJGs5V6nSAWvrKYW5XslI2s0c=; b=C1tjlrr7C+k5CKrwkwZV2l/LZYah1PosCUCes2yBV0Jp8aZ1pKr4Zf3+GIrFYw6NHM K5jcIsAv/+BWIsBuUuGcJz4fqV6+0dgLDgHqFXqNoOoT/U6KKoqN2HzFzOigAwqbHJKR 1fJUyDwBBfQC5+kjt6720iIebSfYGh5CCIV9xPagrq9ptoHuo+jIhPZ9KN4fkFA+65ed F5l55H5aOaNjJqVAlSUhvVVeGz5iDlELBknG4DGvsVn/N+Hi4EE5mjVg22MO6zPJAhJr eT4OZEP78+7sA6QawTfoRFnv6M7g+nEtt2Vm5OND5NFfgi4E2PFC7tjOScdOO8epLhID ounQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ioUvExLc; 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 s15si3996011otv.298.2021.11.03.07.24.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Nov 2021 07:24:48 -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=fail header.i=@linaro.org header.s=google header.b=ioUvExLc; 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]:47044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHC4-00051B-4F for patch@linaro.org; Wed, 03 Nov 2021 10:24:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miGwl-0002JW-0D for qemu-devel@nongnu.org; Wed, 03 Nov 2021 10:08:59 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:34538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miGwj-00054i-1c for qemu-devel@nongnu.org; Wed, 03 Nov 2021 10:08:58 -0400 Received: by mail-qt1-x82a.google.com with SMTP id u7so944902qtc.1 for ; Wed, 03 Nov 2021 07:08:56 -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=RWV9WOum/EgcRXAB9OWJGs5V6nSAWvrKYW5XslI2s0c=; b=ioUvExLcJdcJ8BXkJH2ISa4o3F9qaE690mucceUqVokG/ITAprIe+LDHVmEaFIQ2Hd BFuSNVJ7Ep2G1uNBSozXzzdZzOP0cyYbxdjqxDeKiZKVd40pMClmd6RR/u/mwGUXMXo2 wUYoGBoezJWRdrbhSnQpPPzhe+1TLtvhNPVlejTiCrx508HQ+UzLbRV6kMxtk5ucL6+U oz6lBG/tE4jRs3l/kJZKX0+q6q9IoVCrzLtdWya+CZiCXh76Dvd6hbA8j8K3OUsKeq0q WImV+gY+vCQIEUbUiBR8yCpUugYTT6+N3j5sAmP/DyOj80nQ7MtnIE3j6R0Oe/aEzhMm extA== 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=RWV9WOum/EgcRXAB9OWJGs5V6nSAWvrKYW5XslI2s0c=; b=tm8akv4vhXNCrdN2JJt4BOxijsY5W1tipYHEJTdP6UNgeGgv66BpuMAWNYDIOVYswR QykrUKd9dkeIXcsorc3nHcbYXZ9yZmBrUW5gmiAGrL0eFkKd4mvHQNmuw8HCVpziEbsM W+Ca6mzSVJkfmb+iS98Ddyn7rdb3zy7wN11puyJMP+tNHq95Tp6kRlhu5/ATzBIM6797 h73TypRqO9iMO9IGu/HfVi53kJ6N9RFOXcvcKNoH6W3XUD7VSmY+vvcTK7MbHwF67T+R t5qNUC1EcLPjPKxBFAjLHrckiwNKE+ezCMMlUoducrEGa2wNYLGrtjNDxbbM0EpY2erc af8g== X-Gm-Message-State: AOAM530E/axXRcZK6EIfXFKenxNpGoXigfEgieCPUN0qP56zGSgIQogw zKirX0NkUdVisQBdWGdw3CeXJuRiVj6Vug== X-Received: by 2002:a05:622a:1a1e:: with SMTP id f30mr3063718qtb.292.1635948536148; Wed, 03 Nov 2021 07:08:56 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-57.nyc.biz.rr.com. [172.254.253.57]) by smtp.gmail.com with ESMTPSA id z5sm1669377qtw.71.2021.11.03.07.08.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 07:08:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 11/23] linux-user/microblaze: Use force_sig_fault Date: Wed, 3 Nov 2021 10:08:35 -0400 Message-Id: <20211103140847.454070-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211103140847.454070-1-richard.henderson@linaro.org> References: <20211103140847.454070-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82a; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x82a.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use the new function instead of setting up a target_siginfo_t and calling queue_signal. Fill in the missing PC for SIGTRAP. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/microblaze/cpu_loop.c | 61 +++++++++++++------------------- 1 file changed, 25 insertions(+), 36 deletions(-) -- 2.25.1 diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c index a94467dd2d..263b68aea1 100644 --- a/linux-user/microblaze/cpu_loop.c +++ b/linux-user/microblaze/cpu_loop.c @@ -27,9 +27,8 @@ void cpu_loop(CPUMBState *env) { CPUState *cs = env_cpu(env); - int trapnr, ret; - target_siginfo_t info; - + int trapnr, ret, si_code; + while (1) { cpu_exec_start(cs); trapnr = cpu_exec(cs); @@ -38,8 +37,8 @@ void cpu_loop(CPUMBState *env) switch (trapnr) { case EXCP_INTERRUPT: - /* just indicate that signals should be handled asap */ - break; + /* just indicate that signals should be handled asap */ + break; case EXCP_SYSCALL: /* Return address is 4 bytes after the call. */ env->regs[14] += 4; @@ -67,6 +66,7 @@ void cpu_loop(CPUMBState *env) */ env->regs[14] = env->pc; break; + case EXCP_HW_EXCP: env->regs[17] = env->pc + 4; if (env->iflags & D_FLAG) { @@ -74,42 +74,31 @@ void cpu_loop(CPUMBState *env) env->pc -= 4; /* FIXME: if branch was immed, replay the imm as well. */ } - env->iflags &= ~(IMM_FLAG | D_FLAG); - switch (env->esr & 31) { - case ESR_EC_DIVZERO: - info.si_signo = TARGET_SIGFPE; - info.si_errno = 0; - info.si_code = TARGET_FPE_FLTDIV; - info._sifields._sigfault._addr = 0; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case ESR_EC_FPU: - info.si_signo = TARGET_SIGFPE; - info.si_errno = 0; - if (env->fsr & FSR_IO) { - info.si_code = TARGET_FPE_FLTINV; - } - if (env->fsr & FSR_DZ) { - info.si_code = TARGET_FPE_FLTDIV; - } - info._sifields._sigfault._addr = 0; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - default: - fprintf(stderr, "Unhandled hw-exception: 0x%x\n", - env->esr & ESR_EC_MASK); - cpu_dump_state(cs, stderr, 0); - exit(EXIT_FAILURE); - break; + case ESR_EC_DIVZERO: + si_code = TARGET_FPE_FLTDIV; + break; + case ESR_EC_FPU: + si_code = 0; + if (env->fsr & FSR_IO) { + si_code = TARGET_FPE_FLTINV; + } + if (env->fsr & FSR_DZ) { + si_code = TARGET_FPE_FLTDIV; + } + break; + default: + fprintf(stderr, "Unhandled hw-exception: 0x%x\n", + env->esr & ESR_EC_MASK); + cpu_dump_state(cs, stderr, 0); + exit(EXIT_FAILURE); } + force_sig_fault(TARGET_SIGFPE, si_code, env->pc); break; + case EXCP_DEBUG: - info.si_signo = TARGET_SIGTRAP; - info.si_errno = 0; - info.si_code = TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc); break; case EXCP_ATOMIC: cpu_exec_step_atomic(cs);