From patchwork Thu Aug 8 16:41:15 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: 170823 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp8817610ile; Thu, 8 Aug 2019 09:45:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxI4TNWbB3igmHX2QSgeoWEtX7MduUB+agWXC53wgpQj6RNNX5XEAHrlr5EZX0mIwVNt5yK X-Received: by 2002:aa7:ca54:: with SMTP id j20mr17072236edt.50.1565282722956; Thu, 08 Aug 2019 09:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565282722; cv=none; d=google.com; s=arc-20160816; b=YEzU9u+tSA/damgKrTgtaM11K369bFNXFuw20M34hnqn5rvniBGf2pnS+BmAKlyDev V8swPYJMt+QyC47tMKU8HIU931DJrDriXkwkLp/tuesKBlAuJAf7hDoepPRtTHBRn908 1iFZBBiunVv/nKpL1lviMljLBZkGHdwuqCEbQqPOEZCCfgo5MKqOGHEqTdIIDQuZvKhD FP/zXjk0eczpXgHjLoJNmb2tWjuFzS9GZ1CFK2HZ65b9JbHpxP6w7bsLMHy4aDpD0/Wa n0Xa0gfScjbLV0Hf6iUTHrcOtCMTxkqTmJPHscDhvGD3xuZU1+EP88Gux9370GQBJtGq fWGA== 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=LIEv4P2C0/9YawvAT5IGyHCWDJnkHqheUeFneAyCCc4=; b=okTmCiAFRGiwIuSbYyVO0nq4CEcIDRvwjq+OVaq5XfFlXnftVIYFncukTX88FeqsAz mox2B+JE84wewoVDmlX/9Yn4TVilwNfpwA5/eXPlBtoceqzM2mJ0/zR7Tg3POrJSK/Ik DYbcIUGr8OCWkj5ej5JCQtoo2X4CfnZ8zlBMZOAJ+GUBeFbiMEqea64GQ/mmewKBXKr1 3Fpi5Pkx4HvKHsP38hwtKA+E21s66uH1FGDgC4t8zCyaqae7Di7dggRbjSfcnpn+TtIf 0yeysB0uuUhOQJNcIZTozGbs3B2OYddIMB/RFnggy1G4AaCmvI4rxFB/HvrM7eZmsaLL s/PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="EKyvj/8+"; 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 m22si31840567ejx.164.2019.08.08.09.45.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Aug 2019 09:45:22 -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="EKyvj/8+"; 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]:54118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvlXV-0001Xi-Tm for patch@linaro.org; Thu, 08 Aug 2019 12:45:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55154) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvlTi-0004TJ-HX for qemu-devel@nongnu.org; Thu, 08 Aug 2019 12:41:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvlTg-0007aj-H8 for qemu-devel@nongnu.org; Thu, 08 Aug 2019 12:41:26 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvlTg-0007WT-Aa for qemu-devel@nongnu.org; Thu, 08 Aug 2019 12:41:24 -0400 Received: by mail-wm1-x343.google.com with SMTP id v15so3054017wml.0 for ; Thu, 08 Aug 2019 09:41:23 -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=LIEv4P2C0/9YawvAT5IGyHCWDJnkHqheUeFneAyCCc4=; b=EKyvj/8+60PxD75cfBZDjxeJr/WUJFAsLaDwf7Ub5i3HIyCVIrtlNXVuQ/WDivflGV sRyYFmWy8hERER1LXm6YAtRNcwSR6EBZgx/Uz69nOfJUyUiZJU3oqGZEJyxy1KGlLpcG CEt7Q6LcN4wgfWspEVynO7vJJ0yjv0yH9mLy1im/j9dpt6EsDR82zkwe86NHIzkFkTaG r7xt6n0Hr4th50lpdcdRLq/mSFA9GhowVGvKMhE1/+bUmz16KFC0dBw649XbsSyHlUlV HEoAwhcobzcK8xDiLv6ehqWFIuSAerWuY5Ewq2QeSdv2OLFEHYNZuPE37Sjt0rvm6EBu 6hCQ== 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=LIEv4P2C0/9YawvAT5IGyHCWDJnkHqheUeFneAyCCc4=; b=npdrHADPa2VmiyG461HPynu0Eln5n5SHc1LZ+jWW1HWojo/n8Tvk+aPFKkb4KY1QfK cQ2x7z9xMBckFL7ir1j/JLC7ojXf2AWCgzJ9hWFjuBsR1VkkE56ZvV8cGn5tRdOn5imh mO+cQ9iDUNfqLoedS9OWB6NpGSo3ddR1F43B2ocQ384FSV+KnP1FDXbg6uGp9exM0zk7 /9RdN+Oq1WMlPvT8aYvsAqycBWtiTU035CQ6c/STXAosAGd8BlVvZUogoLpLxikvxeLP j1N61vVfSTk57BHdHoare9L4DIDQOuznQ/OK0GMcIdxUYTKh1jMt35C71RM1JAvXSuzo dk7Q== X-Gm-Message-State: APjAAAXS3RvDxWN9hEaT7JDlvzVarGHnj+QgUCZm5xg35KOHGZwplqEI k6UIXmjvxj8WVe/lVCxvOe4eyfdwlxw= X-Received: by 2002:a7b:c4c1:: with SMTP id g1mr5591465wmk.14.1565282482437; Thu, 08 Aug 2019 09:41:22 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h8sm3438803wmf.12.2019.08.08.09.41.19 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 08 Aug 2019 09:41:21 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3A721FF92; Thu, 8 Aug 2019 17:41:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 8 Aug 2019 17:41:15 +0100 Message-Id: <20190808164117.23348-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190808164117.23348-1-alex.bennee@linaro.org> References: <20190808164117.23348-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::343 Subject: [Qemu-devel] [PATCH v1 5/7] target/mips: 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: Aleksandar Rikalo , Aleksandar Markovic , =?utf-8?q?Alex_Benn=C3=A9e?= , armbru@redhat.com, Aurelien Jarno 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 --- target/mips/cpu.h | 3 ++- target/mips/msa_helper.c | 1 + target/mips/op_helper.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 21c0615e020..f146924623c 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -5,7 +5,8 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-types.h" +#include "fpu/softfloat-helpers.h" #include "mips-defs.h" #define TCG_GUEST_DEFAULT_MO (0) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index a5a86572b4a..f24061e2af7 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -22,6 +22,7 @@ #include "internal.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" +#include "fpu/softfloat.h" /* Data format min and max values */ #define DF_BITS(df) (1 << ((df) + 3)) diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 9e2e02f8586..f88a3ab9043 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -25,6 +25,7 @@ #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "sysemu/kvm.h" +#include "fpu/softfloat.h" /*****************************************************************************/ /* Exceptions processing helpers */