From patchwork Fri May 14 09:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Zou X-Patchwork-Id: 12257773 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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 B992CC433B4 for ; Fri, 14 May 2021 13:02:52 +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 0348F613B5 for ; Fri, 14 May 2021 13:02:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0348F613B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhXSs-00041s-PE for qemu-devel@archiver.kernel.org; Fri, 14 May 2021 09:02:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhU2R-0006Yx-9U for qemu-devel@nongnu.org; Fri, 14 May 2021 05:23:19 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]:40890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lhU2P-0002zb-AL for qemu-devel@nongnu.org; Fri, 14 May 2021 05:23:18 -0400 Received: by mail-lj1-x231.google.com with SMTP id c15so22576412ljr.7 for ; Fri, 14 May 2021 02:23:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=5AJUh2TVprtRiUIoo6oXARgimbroTTvCGcmu/Omqka4=; b=gzOsizQbcECtjTK/R49kmY3f+hczWmtyIra2mVuQp4uBiNFYVWlJrPXgL88JPWHrdq 9Nr+M84EKqHjB80zjJVsjSVj4Wf3tRX9A09BLW//RpIuhaDBylNjJC7jX2Ei9bf9L3WO qN/3tVVzXp4ayhdDofFOtl3KAGTJnTy1d3nYIoaCUNoPcK1iHvQSLEUvzwS2OGWpOULK oWtCmh2PSMCZvi3mZ6Nby8GBJf0ZVUFcpkbttRl+zo3lo0KhmYSOuZkmsf0SMnfKoIeF 7WIL80uMgt3K0Rtd7ELEhQK7yf1e5l9Bhj6ts8kN3v3OjBIvvmP5HU3+Fq6c9VFMAdN5 JqDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=5AJUh2TVprtRiUIoo6oXARgimbroTTvCGcmu/Omqka4=; b=EzrWUYAVGu8tUR/1oLUnQfUYXYBsrKjBa5m1lPwgFPmkxSdCdTvc2Rm1w6NUZRS+/r TaWl44Co1ooIdZy+ypx5LEGngaONFgmnMtKKwDdi5bp20TOGonGs+/BETeoJsJuq4CqD W48a35Cf0OMsEr/FZ5cST/vH0jtKqZGv4gEbMsApZSoERIsC5M2zCUkcHSyoXEGWPF4w HsPogAnuXgWR91Wyj2yX+6GrhE4JPqcfcnmzZ+EcWTZ97hKt6vVXqRRu+e6MBqGR43/K xSsnKD/YmaAhhWyH+h3ZitpAjkxsQAqD7nd6lJVx9exhkgry4+P4NNhxttslT8jk8d40 Z6jg== X-Gm-Message-State: AOAM532gWgzswXterBFjdIuS+8OX8eXgKdE9kQKjKIhLGOjdFNYJwxks oFRnJlzz9VDfG+FOsRMhyi8d0OGTedOnnGKPczI9ckCZbmoejw== X-Google-Smtp-Source: ABdhPJwtemQhXnaYj9WGqGxp3h1XUZw+aVC4+u+moRqkLTTu1sYuzBmyE6vI1I1GOVi6stfCqDc4ySf8Aqy00i9XQ4M= X-Received: by 2002:a2e:b8d6:: with SMTP id s22mr7625319ljp.117.1620984194735; Fri, 14 May 2021 02:23:14 -0700 (PDT) MIME-Version: 1.0 From: =?utf-8?b?6YK55pet?= Date: Fri, 14 May 2021 17:23:03 +0800 Message-ID: Subject: [PATCH] linux-user: Handle EXCP10_COPR properly for i386 To: qemu-devel@nongnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=sendtozouxu@gmail.com; helo=mail-lj1-x231.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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, 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-Mailman-Approved-At: Fri, 14 May 2021 09:01:36 -0400 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: laurent@vivier.eu, sendtozouxu@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From e805b793f7d4b3e8c37d540b7d6cc0c6ac682311 Mon Sep 17 00:00:00 2001 From: Xu Zou Date: Fri, 14 May 2021 15:55:07 +0800 Subject: [PATCH] linux-user: Handle EXCP10_COPR properly for i386 Handle EXCP10_COPR properly for i386 in cpu loop. NE flag is set to select native mode for handling floating-point exceptions. FWAIT instruction can raise EXCP10_COPR exception by using fpu_raise_exception() function. The code is based on kernel's function fpu__exception_code() in arch/x86/kernel/fpu/core.c. Signed-off-by: Xu Zou --- linux-user/i386/cpu_loop.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) aborting\n", @@ -327,7 +351,7 @@ void cpu_loop(CPUX86State *env) void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { - env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK; + env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK | CR0_NE_MASK; env->hflags |= HF_PE_MASK | HF_CPL_MASK; if (env->features[FEAT_1_EDX] & CPUID_SSE) { env->cr[4] |= CR4_OSFXSR_MASK; diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index f813e87294..e1f2911554 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -199,6 +199,8 @@ void cpu_loop(CPUX86State *env) { CPUState *cs = env_cpu(env); int trapnr; + int si_code; + uint8_t status; abi_ulong pc; abi_ulong ret; @@ -315,6 +317,28 @@ void cpu_loop(CPUX86State *env) case EXCP_ATOMIC: cpu_exec_step_atomic(cs); break; + case EXCP10_COPR: + si_code = 0; + status = env->fp_status.float_exception_flags; + if (status & float_flag_invalid) { + si_code = TARGET_FPE_FLTINV; + } + if (status & float_flag_divbyzero) { + si_code = TARGET_FPE_FLTDIV; + } + if (status & float_flag_overflow) { + si_code = TARGET_FPE_FLTOVF; + } + if ((status & float_flag_underflow) || + (status & float_flag_input_denormal) || + (status & float_flag_output_denormal)) { + si_code = TARGET_FPE_FLTUND; + } + if (status & float_flag_inexact) { + si_code = TARGET_FPE_FLTRES; + } + gen_signal(env, TARGET_SIGFPE, si_code, env->eip); + break; default: pc = env->segs[R_CS].base + env->eip; EXCP_DUMP(env, "qemu: 0x%08lx: unhandled CPU exception 0x%x -