From patchwork Thu Mar 22 18:09:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 889525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HvfjMuUv"; dkim-atps=neutral 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 406ZV40sGjz9s27 for ; Fri, 23 Mar 2018 05:10:52 +1100 (AEDT) Received: from localhost ([::1]:34095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez4fp-0001es-BW for incoming@patchwork.ozlabs.org; Thu, 22 Mar 2018 14:10:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez4f7-0001aw-Gy for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez4f6-0002fM-19 for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:05 -0400 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]:40685) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ez4f5-0002eb-LR for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:03 -0400 Received: by mail-lf0-x242.google.com with SMTP id e5-v6so14559527lfb.7 for ; Thu, 22 Mar 2018 11:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q0my/4GGcKKCt3lqH16AeD/g14BsO+ibcdpQRyqk69w=; b=HvfjMuUvulYV1HQHEMR4yYHq4fjIMjPfhE3z0kwXH8+X6AuT71SqsXX4QGUuahLaFr 6SFH0HGWamzAIrlBpBMhf8sXcGVx50rEwMW2aUQhG8kKKlmEs+qFe+rgVLJvhiG3hZht tB3VGfe3QzdqFvEfJ+3s5dovKz1FLZkmAm55KxdSwdZ5moJOGLxGhOxyQ/zUWROy2AD+ P4Ex68su387K11FYkBv90AapYUD3TCZuGU/WBHVChhTtJl9Y4zurgveYpTOpmIkJ4+95 MXtXH34r0RlkI9btTeSCrHQAt9O34omIL8+/Jk1JCGOmscliIWS+7ZKQoY3m1+7LRe3e LAgA== 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; bh=Q0my/4GGcKKCt3lqH16AeD/g14BsO+ibcdpQRyqk69w=; b=ZhXlHnzmbTBm8lJU5lfjHMbrKiO/dUChfUecgVjjCWyv1nMnIqohUBpySB3gn4bct/ xgnoUZAkZ8CghIpGUksydSRuFRiNF01JpcqRygPV7rso6dC6x2tguFOzTwnLu9T8RncS MtYEG57BJDzlMfOZSf3L2BnxzBGB3UrLBG+pz1W0ZYGZHp8e2+xNkhYBGQ6zlu3YDm5d lYdPlAyKIulDlKI+HnJG0QJcIDCBhpz/eWCbZ+IhO2wlAiEmhEskP4F1xs5Tay0Vl/VI SZvEdk3+zHsLAtaa/ADTqTHVFwyyzdlPV4B9SboM93XwbTuyqOzH69ytKzdmEH2YXGRu 0X/g== X-Gm-Message-State: AElRT7F/9OK9TTKQjmV46C+Q6vfy4Hfbdi5R3ThkRvUEceGZsYJYYC11 xxX2mhDp8FBIFhbOPng0Grs0kM3q X-Google-Smtp-Source: AG47ELveWmC7rbndEJAnRMbzM59PGZwo2MDoFTZlSVZiIgRn47/hCco0OXRska1s7fxWI4IUOEAHZA== X-Received: by 2002:a19:b2d1:: with SMTP id t78-v6mr18354643lfk.78.1521742202048; Thu, 22 Mar 2018 11:10:02 -0700 (PDT) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id m23sm1532138ljg.21.2018.03.22.11.09.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 11:10:01 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 11:09:38 -0700 Message-Id: <20180322180940.8253-2-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322180940.8253-1-jcmvbkbc@gmail.com> References: <20180322180940.8253-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::242 Subject: [Qemu-devel] [PATCH 1/3] target/xtensa: add .inc. to non-top level source file names 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: Laurent Vivier , Peter Maydell , Max Filippov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fix definitions of existing cores and core importing script. Signed-off-by: Max Filippov Reviewed-by: Philippe Mathieu-Daudé --- target/xtensa/core-dc232b.c | 4 ++-- target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} | 0 target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-dc233c.c | 4 ++-- target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} | 0 target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-de212.c | 4 ++-- target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} | 0 target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-fsf.c | 2 +- target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} | 0 target/xtensa/core-sample_controller.c | 4 ++-- .../xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} | 0 .../core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} | 0 14 files changed, 9 insertions(+), 9 deletions(-) rename target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} (100%) rename target/xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} (100%) rename target/xtensa/core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} (100%) diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c index fe80582df465..aa07018af4e7 100644 --- a/target/xtensa/core-dc232b.c +++ b/target/xtensa/core-dc232b.c @@ -35,7 +35,7 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_dc232b -#include "core-dc232b/xtensa-modules.c" +#include "core-dc232b/xtensa-modules.inc.c" static XtensaConfig dc232b __attribute__((unused)) = { .name = "dc232b", @@ -43,7 +43,7 @@ static XtensaConfig dc232b __attribute__((unused)) = { .num_regs = 120, .num_core_regs = 52, .reg = { -#include "core-dc232b/gdb-config.c" +#include "core-dc232b/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules, diff --git a/target/xtensa/core-dc232b/gdb-config.c b/target/xtensa/core-dc232b/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-dc232b/gdb-config.c rename to target/xtensa/core-dc232b/gdb-config.inc.c diff --git a/target/xtensa/core-dc232b/xtensa-modules.c b/target/xtensa/core-dc232b/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-dc232b/xtensa-modules.c rename to target/xtensa/core-dc232b/xtensa-modules.inc.c diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c index 00301c28a2e8..8296e6fa109a 100644 --- a/target/xtensa/core-dc233c.c +++ b/target/xtensa/core-dc233c.c @@ -36,7 +36,7 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_dc233c -#include "core-dc233c/xtensa-modules.c" +#include "core-dc233c/xtensa-modules.inc.c" static XtensaConfig dc233c __attribute__((unused)) = { .name = "dc233c", @@ -44,7 +44,7 @@ static XtensaConfig dc233c __attribute__((unused)) = { .num_regs = 121, .num_core_regs = 52, .reg = { -#include "core-dc233c/gdb-config.c" +#include "core-dc233c/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules, diff --git a/target/xtensa/core-dc233c/gdb-config.c b/target/xtensa/core-dc233c/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-dc233c/gdb-config.c rename to target/xtensa/core-dc233c/gdb-config.inc.c diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/core-dc233c/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-dc233c/xtensa-modules.c rename to target/xtensa/core-dc233c/xtensa-modules.inc.c diff --git a/target/xtensa/core-de212.c b/target/xtensa/core-de212.c index 466a467f7fa0..53775a97fae0 100644 --- a/target/xtensa/core-de212.c +++ b/target/xtensa/core-de212.c @@ -36,13 +36,13 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_de212 -#include "core-de212/xtensa-modules.c" +#include "core-de212/xtensa-modules.inc.c" static XtensaConfig de212 __attribute__((unused)) = { .name = "de212", .gdb_regmap = { .reg = { -#include "core-de212/gdb-config.c" +#include "core-de212/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules, diff --git a/target/xtensa/core-de212/gdb-config.c b/target/xtensa/core-de212/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-de212/gdb-config.c rename to target/xtensa/core-de212/gdb-config.inc.c diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/core-de212/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-de212/xtensa-modules.c rename to target/xtensa/core-de212/xtensa-modules.inc.c diff --git a/target/xtensa/core-fsf.c b/target/xtensa/core-fsf.c index f41de9a1aa05..01932bdc8b15 100644 --- a/target/xtensa/core-fsf.c +++ b/target/xtensa/core-fsf.c @@ -36,7 +36,7 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_fsf -#include "core-fsf/xtensa-modules.c" +#include "core-fsf/xtensa-modules.inc.c" static XtensaConfig fsf __attribute__((unused)) = { .name = "fsf", diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core-fsf/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-fsf/xtensa-modules.c rename to target/xtensa/core-fsf/xtensa-modules.inc.c diff --git a/target/xtensa/core-sample_controller.c b/target/xtensa/core-sample_controller.c index 879e853a9224..c622335ca5a2 100644 --- a/target/xtensa/core-sample_controller.c +++ b/target/xtensa/core-sample_controller.c @@ -36,13 +36,13 @@ #include "overlay_tool.h" #define xtensa_modules xtensa_modules_sample_controller -#include "core-sample_controller/xtensa-modules.c" +#include "core-sample_controller/xtensa-modules.inc.c" static XtensaConfig sample_controller __attribute__((unused)) = { .name = "sample_controller", .gdb_regmap = { .reg = { -#include "core-sample_controller/gdb-config.c" +#include "core-sample_controller/gdb-config.inc.c" } }, .isa_internal = &xtensa_modules, diff --git a/target/xtensa/core-sample_controller/gdb-config.c b/target/xtensa/core-sample_controller/gdb-config.inc.c similarity index 100% rename from target/xtensa/core-sample_controller/gdb-config.c rename to target/xtensa/core-sample_controller/gdb-config.inc.c diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/target/xtensa/core-sample_controller/xtensa-modules.inc.c similarity index 100% rename from target/xtensa/core-sample_controller/xtensa-modules.c rename to target/xtensa/core-sample_controller/xtensa-modules.inc.c From patchwork Thu Mar 22 18:09:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 889527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JKaLEjw1"; dkim-atps=neutral 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 406ZXY5Kd4z9s1R for ; Fri, 23 Mar 2018 05:13:01 +1100 (AEDT) Received: from localhost ([::1]:34106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez4hv-0004pY-6M for incoming@patchwork.ozlabs.org; Thu, 22 Mar 2018 14:12:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez4fB-0001gs-W2 for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez4fB-0002km-7p for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:09 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:45638) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ez4fB-0002iy-0q for qemu-devel@nongnu.org; Thu, 22 Mar 2018 14:10:09 -0400 Received: by mail-lf0-x243.google.com with SMTP id l4-v6so10221303lfg.12 for ; Thu, 22 Mar 2018 11:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sMznaKwEt5M4xHqoXbgOZXq+b0M1+ACRePBp+psf3C4=; b=JKaLEjw1n3eG/muBToaTiQ93oNQ/PvlK+xnSHkJvR1bbOlfyGfIthtjU1Xsy2mwT/F MQuc3Uz+oCEU5wibNJw/jowZEG9g9FwZ3COD5kptOR9Y+v2PzkyGa9o7SW47lnIDu7xR VsiNKICqFvrzoJp/8D+rfNcNKZsTsF6VOlB0Qv1TalufXQtEaGIa/FeeGVT8I0TU7N0R nxBZBXrgzDUFoWtVwLKxuv9FGVeNFQfvcXaw39rYaMlZjFKqC4Mb46LVWLVgro5kma4e yCE6PD8s8EOyIYuLzqaqKYhxQD8INxw06QtpJimoUR7qzm9yXs5S9ll3qNWo5zeobbDd ZPcw== 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; bh=sMznaKwEt5M4xHqoXbgOZXq+b0M1+ACRePBp+psf3C4=; b=a/6uH+AfepYUb4IUbl0M3/xaeuUzMPcEaYfVgWEdwmT9WlNT6dMu1QlkL85Bgu8r/i vCrTuB9rPg5VU80wYMtYCtEfJT2e9Msti6Rjhcd2/x1vChPoCAaidmQtI+JJ6OCPNaSS oc7+QoiKGv4lcuvMz9LwOC8XHcCoQendCEMGev2LE7Qc/zJXIlyRkgFBHlcVz3cRLsf6 1VJOibUGODzP2Od1eI3CtoPnsVUbsRw+dXpb9bkVdtgik5wANWmsURjjIFXnN2oadXfd 4gTLxIIf2v5AZ9j2TA+L9deIusA50Qo/V1/g2RpjK++RWg7XlLflN8MbVTFQ4e3k4BfF WWVQ== X-Gm-Message-State: AElRT7ED9HD4U71QYYu5r8n2Fptb3lQriTZleS75ocwGU+ce444J9Bjy /2ucWepLGNXcjCnajs2VSg4XE2Ji X-Google-Smtp-Source: AG47ELthTPpZzKNlNzKRnE1WkZeefXM6NkwV4FzC66VMWkmkbQHw8VMdEMZyHveEKzYdG2VcB76g9A== X-Received: by 10.46.144.72 with SMTP id n8mr16627198ljg.40.1521742207693; Thu, 22 Mar 2018 11:10:07 -0700 (PDT) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id m23sm1532138ljg.21.2018.03.22.11.10.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 11:10:07 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2018 11:09:40 -0700 Message-Id: <20180322180940.8253-4-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322180940.8253-1-jcmvbkbc@gmail.com> References: <20180322180940.8253-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PATCH 3/3] target/xtensa/import_core.sh: fix #include 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: Laurent Vivier , Peter Maydell , Max Filippov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Change #include to #include "xtensa-isa.h" in imported files to make references to local files consistent. Signed-off-by: Max Filippov Reviewed-by: Philippe Mathieu-Daudé --- target/xtensa/import_core.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh index 58a42987d853..af6c6104792d 100755 --- a/target/xtensa/import_core.sh +++ b/target/xtensa/import_core.sh @@ -33,6 +33,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \ -e '/^uint32 \*bypass_entry(int i)/,/}/d' \ -e '/^#include "ansidecl.h"/d' \ -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^ return 0;$/ return XTENSA_UNDEFINED;/' \ + -e 's/#include /#include "xtensa-isa.h"/' \ > "$TARGET"/xtensa-modules.inc.c cat < "${TARGET}.c"