From patchwork Mon Aug 19 12:17:09 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: 171612 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp2939162ily; Mon, 19 Aug 2019 05:55:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxm4HLX32w38MMkf1PgHyscMtBt5Fda3BnAysDL/Rk1dLRB8EZA0poUgSbCW8KJov8j5K5x X-Received: by 2002:ac8:e4e:: with SMTP id j14mr2890823qti.113.1566219337695; Mon, 19 Aug 2019 05:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566219337; cv=none; d=google.com; s=arc-20160816; b=kFqUe/cSpw4LqyKCYzwS/2szHf8DHdLZlOK+8SemkZU9FUFT9fYiPwbhLgiMn9UoZ2 EeUoIcbHiNGDjXN6vAIvjCObrZEsZm+SeW/6gHbQadzeAh5ARwHF+QXyq+GpQOyv6NQK N4ZZF8TS6kbn/RsgUsnBrtnuxD6JR6s2VPTD5pVUCYmZXY/2FQ1Mem3q+cgdECVrO5LU x37wo6dKheRnQpxmj7QP2zNTqoPxfODmCEh9bfC/Cn2hWKhGes1yUuLc8D3kp2m1uoWx JOQnnxjpFzidY7nvwToI8GKTsU4j6Kta+kKv0nYeiKKLNWWZrDMUbRv4h9rmfAOYbVWG 5FVA== 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=3EgZAgrLHmvjFmEihZ2FxaGJcoIsHosX2efs7meYYq8=; b=gpgwYz1iJqcBMdpEZix54IR83MXVyiS/iCU2+HcpFGDT8zoQH1vhx5ylt3xq57zshX Ga3olRE5WueGfMIkxl+z3wAR7pOIjPKyEMXY5scMmX2PsjShqLQDdEWkeYz/jz5oFsFw 2L9QjGRxquz1G6Z/17Howcy+De9ov7V2nPTIGrcQN46wNv+QGUiDd7uBg+2emFeV2ilh vHgZwdrFY4W3kDJsIcyGa49x0zVTjt8ZMzlPlak9PMElRoydxy4jwz2N9ydIjg5HGCj9 vLLzE2pIP4EFtM939qfa3VF0AbOhah8hxl1jG/YjVzTDWppBxQaeSTBWs4Lh4lvVUSrw KoYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="iUu+Fci/"; 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 u4si8610979qta.248.2019.08.19.05.55.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Aug 2019 05:55:37 -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="iUu+Fci/"; 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]:49684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzhCC-00085x-LV for patch@linaro.org; Mon, 19 Aug 2019 08:55:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39100) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzggg-0000h2-3f for qemu-devel@nongnu.org; Mon, 19 Aug 2019 08:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzggd-0001W0-Cx for qemu-devel@nongnu.org; Mon, 19 Aug 2019 08:23:01 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hzggc-0001Tw-AT for qemu-devel@nongnu.org; Mon, 19 Aug 2019 08:22:58 -0400 Received: by mail-wr1-x42b.google.com with SMTP id g17so8520086wrr.5 for ; Mon, 19 Aug 2019 05:22:54 -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=3EgZAgrLHmvjFmEihZ2FxaGJcoIsHosX2efs7meYYq8=; b=iUu+Fci/hO0Elm1PK6rlbzXcG2nxwvk3KeNotk+hOPwxKIJ3i6hxw8+0yaaOp4DAfl X9dbvTw3EJtPK3eze6OVJMn+Z144JMtsVR8Vx3BvwnwEBwdXlQbgbkh42+UkFALNcWSf W0zmCpZyD2AzEfbSw2rVuRYinzsALZ97sgJPuKSrMX8AJndH/V8td4iytXEBBOccSr0C Ial+SiPzm0d+SMicif5GyS+nczdLSAWb2wpky+qy9WE2otWOOykA1htgvt/acUZSHJES uhqja74AykbvMlOGHXfEtJLT5aGJLO8dvGy9nWV1FscUq9dBFUbRJ2B2ElL3RkIWtvh2 bERA== 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=3EgZAgrLHmvjFmEihZ2FxaGJcoIsHosX2efs7meYYq8=; b=hDJFNOKisQN4Y8VCUdqDR65nw9ws074M3pVuyNIU7b7dzNgu1wD/4clv5wWADrXvE9 Neu/40B+sQWi6kPerUqJziemu34h2UOzwGXiziEoPnYT4Fcwdnn1kotuduYwy0IfUe9h FNUJIuh+gINhseFsV8DncjT0h14hK6wl/n8VVxacjmwVdAdkviVPoETHwb6f+d7fJbgE EUgHOu03kNQV6a5CkR9pP5fpYsnCxy5TgMhtgSD9RKdsOEA26WlOpezPagKk6kgOZucI NYFsEH87GHZYS+fZBy1aYgnlN3qrcwz6cp68pCeNsSW3M5C8kW+wsn3v7Suyniuk/Lym QcPA== X-Gm-Message-State: APjAAAWXQn4+WR0BvL2FKMkI9mMwcN0z5bKRen0vX05LloiXCMM/uPH+ qtr1yt8oetAkuLGrjY/yE2HTNQ== X-Received: by 2002:a5d:6a49:: with SMTP id t9mr2290783wrw.134.1566217373446; Mon, 19 Aug 2019 05:22:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e6sm15359993wrr.14.2019.08.19.05.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 05:22:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 08CBA1FF87; Mon, 19 Aug 2019 13:17:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 19 Aug 2019 13:17:09 +0100 Message-Id: <20190819121709.31597-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190819121709.31597-1-alex.bennee@linaro.org> References: <20190819121709.31597-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::42b Subject: [Qemu-devel] [PULL 12/12] targets (various): use softfloat-helpers.h where we can 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: David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , Richard Henderson , qemu-devel@nongnu.org, "open list:S390 TCG CPUs" , Bastian Koppelmann , "Edgar E. Iglesias" , Guan Xuetao , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Generally the cpu and non-FP helper files just want to manipulate the softfloat flags. For this they can just use the -helpers.h include which brings in a minimal number of inline helpers. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 93b8e788b18..c6998348df4 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-types.h" #include "exec/helper-proto.h" #include "qemu/qemu-print.h" diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 0bec54b2f8a..9cfd7445e7d 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -28,7 +28,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-helpers.h" static const struct { const char *name; diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 9466cd832d4..3abe7e80fd0 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -42,7 +42,7 @@ #include "sysemu/sysemu.h" #include "sysemu/tcg.h" #endif -#include "fpu/softfloat.h" +#include "fpu/softfloat-helpers.h" #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 816d6d7f311..d0a7707991f 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -25,8 +25,7 @@ #include "cpu.h" #include "migration/vmstate.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" - +#include "fpu/softfloat-helpers.h" static void superh_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/tricore/helper.c b/target/tricore/helper.c index a6803368506..d5db7b2c03f 100644 --- a/target/tricore/helper.c +++ b/target/tricore/helper.c @@ -19,7 +19,7 @@ #include "cpu.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-helpers.h" #include "qemu/qemu-print.h" enum { diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 802e2f1eba5..b27fb9689ff 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -17,7 +17,6 @@ #include "cpu.h" #include "migration/vmstate.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" static void uc32_cpu_set_pc(CPUState *cs, vaddr value) {