From patchwork Mon Jun 26 11:28:09 2017 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: 780672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wx6HC2Qkcz9s0g for ; Mon, 26 Jun 2017 21:27:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="PaYoZE1+"; dkim-atps=neutral Received: from localhost ([::1]:45960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPSBH-0007LM-7z for incoming@patchwork.ozlabs.org; Mon, 26 Jun 2017 07:27:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPSAx-0007LD-LT for qemu-devel@nongnu.org; Mon, 26 Jun 2017 07:27:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPSAu-0002W6-IS for qemu-devel@nongnu.org; Mon, 26 Jun 2017 07:27:27 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:37439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPSAu-0002VV-BE for qemu-devel@nongnu.org; Mon, 26 Jun 2017 07:27:24 -0400 Received: by mail-wm0-x236.google.com with SMTP id i127so4896078wma.0 for ; Mon, 26 Jun 2017 04:27:24 -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=BdqEamWo5YfFh6ZviGwCdqZwdck8jsiHieYoDebfFXo=; b=PaYoZE1+H60pwJzdT3FQdK9JH5a2BJtFN5usE3Gf7aJhSLYdrcHRM2VyR5z2p31MuS piqcIzPcHnpkbVZsCzX1yO3bhflWOy9KERxc9VG+5XGEpvc8Q1Ht5v7pGM76FaTNfR+U /dL98+ZLD5NxK311vW3CKLf3fWtJ9vzbQhjVs= 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=BdqEamWo5YfFh6ZviGwCdqZwdck8jsiHieYoDebfFXo=; b=jmNSVqY9pr1u5DBTgevezYI2pCGbqlOt7XcQNbU/1QXuhwgpTcxaMrxLD3GgELRwgn 26fgOD82htubrq3c+/ZVhJL/c9ckHb2PEA7t8jOmDzpezNxndpbfCNFmKa2Mx+eb2moa 0gJqTBbAZu7Ph0uA50VUJ5Me237yGj7N2MLolaGFInF4SU9P5Fg/AkJE1TC4YQCLspGp Ug6Oh+rL2DtlpXHWj7TvcBFgdTxTQtssPF50YJo2btrfpfrUQXD2MtjVeI3rkSV8jz55 bFzidYVu9n71aj5kvP9FlnbFRW/qbdgYAn2KFhKS6NtwSUBLeUB1K66XFzAHfOY/lpd0 A2zg== X-Gm-Message-State: AKS2vOwyRpIxrQKw/lNGJHWIaqHYyv8KTGd764PQYjiM/PYx6YY2kgbz 0YgbrTntQhfbkcso X-Received: by 10.28.50.200 with SMTP id y191mr8096586wmy.104.1498476442921; Mon, 26 Jun 2017 04:27:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r142sm12989991wmg.24.2017.06.26.04.27.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 04:27:21 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 579153E0141; Mon, 26 Jun 2017 12:28:12 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: vilanova@ac.upc.edu Date: Mon, 26 Jun 2017 12:28:09 +0100 Message-Id: <20170626112809.15020-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <149838143590.6497.11184953059640962891.stgit@frigg.lan> References: <149838143590.6497.11184953059640962891.stgit@frigg.lan> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PATCH] maybe fixup! target: [tcg] Redefine DISAS_* onto the generic translation framework (DJ_*) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Chris Wulff , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Arguably these should be applied to nios2 before these changes. Signed-off-by: Alex Bennée --- target/nios2/cpu.h | 2 -- target/nios2/op_helper.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 13931f3f0b..b6a97c131e 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -259,8 +259,6 @@ static inline int cpu_interrupts_enabled(CPUNios2State *env) } #include "exec/cpu-all.h" -#include "exec/exec-all.h" - static inline void cpu_get_tb_cpu_state(CPUNios2State *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) { diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index efb1c489c9..04c16e8701 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" +#include "exec/exec-all.h" #include "qemu/main-loop.h" #if !defined(CONFIG_USER_ONLY)