From patchwork Fri Aug 9 09:19:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 170901 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp9735788ile; Fri, 9 Aug 2019 02:22:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyKlvS0DZASG/3Ahscv/RD45wpvIo7cOp53d9jgVLyfX18+7A2+ZykO6p+d4uh0pr9YQNcJ X-Received: by 2002:a37:97c1:: with SMTP id z184mr17354001qkd.198.1565342570320; Fri, 09 Aug 2019 02:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565342570; cv=none; d=google.com; s=arc-20160816; b=lsON1c6KJ9H4C9tTFN0hJWhSBhO0d8GkHzrE1yu3NC0Pdgp3m3qKY0xfLlu55e1ut0 yghGpdN/AEd6hNVWREugJbLEoRUaiwB4x1tfxUDuEUGJjnpsILgth16rSALwZPbJIEht kzvhzAkYBo8SP95DccJT+dCKWtGsJn6637qbfCe6nGOd9E3bI47b/hvyKdD3CHCH+8A2 zDPPoibxplzyLheMu85uFJWSB9ViV5c4GivDhSyawKS9x8VZgWOnZc3OYbVsksI8Pidc OPEUltcnStZLcWJP35n1+aJtWvKGpW1Y+Eny/k+IlD7u7LFWenW9BntZtOMR7nCDn1PC WC5w== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ECv7P3HJHBY/e1Rr1VXbOKCzKrV4OGAXQsEe8ka+MiU=; b=MVtHE1v7mhaFlq0ZH9BFvcuJfoA1Jd6/GOxAnlyYOHq+UgCU3+CMYvSLOIQ3945irh NmXspAcr9RS3jvkQP1H9wSur/+5N77viBtirBgmMEZYADOWLFNmtihe1ghfVySeWRSWd 4heK7TNJZjweleI92w7IqPlsas262S6EE5OMXjdz9KjjQy9D1kieif9Sro0Jq/vBNisa 0xDAR0GwmLe1HsMduxsWSmDpKHqsndONxyCA20caaAxoGyhYgArsnullSDsQvD6aSGbY /htwlFjB5KgT+fHQLEsnOWFHshH6QHn/yn/4LL5AI6l1dZyYAfLZvxZ83wXcA/yUtdxy CUjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=POyAZCZo; 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 q30si5754277qtb.258.2019.08.09.02.22.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Aug 2019 02:22:50 -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=POyAZCZo; 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]:57601 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw16n-0004Mz-Vf for patch@linaro.org; Fri, 09 Aug 2019 05:22:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48074) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw13s-0005zo-19 for qemu-devel@nongnu.org; Fri, 09 Aug 2019 05:19:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw13r-0007e1-10 for qemu-devel@nongnu.org; Fri, 09 Aug 2019 05:19:47 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hw13q-0007cv-Q7 for qemu-devel@nongnu.org; Fri, 09 Aug 2019 05:19:46 -0400 Received: by mail-wr1-x443.google.com with SMTP id b16so864691wrq.9 for ; Fri, 09 Aug 2019 02:19:46 -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=ECv7P3HJHBY/e1Rr1VXbOKCzKrV4OGAXQsEe8ka+MiU=; b=POyAZCZo37L7qmzJ2UiFAtXuV52U+/+i4UscFsPLALzPiWP9jFiCZO3Z415eD8TNgN egZ9HD9uJUJzs/lBfi7+PHYOpKqOm8toJ90fSrkPlbTNYxPU0UUGNkFVXzMVehUuSYUj KaTOYp/nN6S9NuEozulvRnjJOUFSkKGtGOv5J1MqPZfm4ekfp+ZDOyObGnHem3Lz7D6p DpIjSsFaJw8ee3zcLbGU0BwjGQZyz3DGjPr8tNWEh6v1EBQOLtEYOeGPFtNzcemRFLMP LpKlIc9a7RyESKZEQWPtFSi+EWvc/3+Vd/QO4j/I+ytSLNC68xEt3NqYmLaf0LlZ2K3Y NHyw== 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=ECv7P3HJHBY/e1Rr1VXbOKCzKrV4OGAXQsEe8ka+MiU=; b=NFvMQjDLchY+ittPwH5cyL00rQru6Osij+zj8QLYDv+gWV7+FJ0WrkEH8MQtKY3O01 liN6FEU8nYX9loVA+ZivgRRt38y3wH9S4+XdrMMbsZSZQaeDZL+J30gPMo7XczOxipBK F2d2F0Yyk+NNeMJmqXRIAoHX/w6QYc1eLAV3Be7Bzh/PDXuHTUeiZmkH5pH5uPKRGSNW tGh+pi2Hh+m7kstY+vz9poaisp6AnBzlhCizguAsggQ6SghgF+ISYDnNOOdbNXOHiyqZ iUzA+MSO8s2ltZK7xC60hxn7SLGSzddk5kLZu7iWSLYlvjMyqshaoyxqV37QevOju8Y1 oYWg== X-Gm-Message-State: APjAAAV4LYkDuiG5e/Je0M+AGpANk+LeJNgWZAUKhj0QqS4rD3QyDgV6 HFA5ab0FzaCwqjfK+Xst6yLAr5qWkLo= X-Received: by 2002:adf:eb49:: with SMTP id u9mr23604502wrn.215.1565342385660; Fri, 09 Aug 2019 02:19:45 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q18sm121726388wrw.36.2019.08.09.02.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2019 02:19:43 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 70F571FF93; Fri, 9 Aug 2019 10:19:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 9 Aug 2019 10:19:39 +0100 Message-Id: <20190809091940.1223-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190809091940.1223-1-alex.bennee@linaro.org> References: <20190809091940.1223-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v2 6/7] target/riscv: rationalise softfloat includes 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: "open list:RISC-V TCG CPUs" , Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Richard Henderson , armbru@redhat.com, Alistair Francis , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We should avoid including the whole of softfloat headers in cpu.h and explicitly include it only where we will be calling softfloat functions. We can use the -types.h and -helpers.h in cpu.h for the few bits that are global. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 +- target/riscv/fpu_helper.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Alistair Francis Acked-by: Palmer Dabbelt diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index f8d07bd20ad..6d52f97d7c3 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "fpu/softfloat-helpers.h" /* RISC-V CPU definitions */ diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 0adb307f329..240b31e2ebb 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -22,7 +22,7 @@ #include "qom/cpu.h" #include "exec/cpu-defs.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-types.h" #define TCG_GUEST_DEFAULT_MO 0 diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c index b4f818a6465..0b79562a690 100644 --- a/target/riscv/fpu_helper.c +++ b/target/riscv/fpu_helper.c @@ -21,6 +21,7 @@ #include "qemu/host-utils.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" +#include "fpu/softfloat.h" target_ulong riscv_cpu_get_fflags(CPURISCVState *env) {