From patchwork Sat Jul 18 09:40:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 497334 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 0A66D140D24 for ; Sat, 18 Jul 2015 19:41:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=XviEh34L; dkim-atps=neutral Received: from localhost ([::1]:47600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOcy-00085w-W9 for incoming@patchwork.ozlabs.org; Sat, 18 Jul 2015 05:41:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOcL-0006rY-EV for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGOcJ-0004Zf-8X for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:13 -0400 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:36764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOcI-0004Za-Ua for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:11 -0400 Received: by pdjr16 with SMTP id r16so75466585pdj.3 for ; Sat, 18 Jul 2015 02:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=+aXQE7mciHkqO2YmwJFZVenVVGZwzHMi2c2bAcsOzSc=; b=XviEh34LIGgTPCLkXY3F4ouFgwFvbsFMBdyJfxfyARuj3E50pA6bUPN4WQOpLoe8Fl W+qInnefEwo7QyAnR6eLodzpLhDAK8RMsWEToYOi2RhITd/W3NTW8b6b7trWdg0Hqs/D ZJMcQxv2hRP+yqIK6nampebRtsDY9gsDEnumOxboW1vEte2kbWzl6W73E70uy26rKot/ NwP5gDxBdrYivL0c4v4LRlgMpQhaRf9EghVgNxhbsQIBmgQMKRwNz9pjJmyBZzIw4Hn2 q9LzBgOCWKxZLKo2M+16a1u2Lyd/LLGZ4ktHzsSbHOXHJHkgNxNVEDmvBp+yNcKdHB9X Oq2Q== X-Received: by 10.68.178.229 with SMTP id db5mr38225158pbc.17.1437212470279; Sat, 18 Jul 2015 02:41:10 -0700 (PDT) Received: from pcrost-box.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by smtp.gmail.com with ESMTPSA id j5sm8460034pdi.7.2015.07.18.02.41.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Jul 2015 02:41:08 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Sat, 18 Jul 2015 02:40:14 -0700 Message-Id: <8da9a2ec9b2d9560bef969e18e7566fac11c6c70.1437212383.git.crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22f Cc: peter.maydell@linaro.org, Peter Crosthwaite , edgar.iglesias@gmail.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 04/35] tcg: split tcg_op_defs to -common X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org tcg_op_defs (and the _max) are both needed by the TCI disassembler. For multi-arch, tcg.c will be multiple-compiled (arch-obj) with its symbols hidden from common code. So split the definition off to new file, tcg-common.c which will remain a regular obj-y for use by both the TCI disas as well as the multiple tcg.c's. Signed-off-by: Peter Crosthwaite --- Makefile.target | 1 + tcg/tcg-common.c | 32 ++++++++++++++++++++++++++++++++ tcg/tcg.c | 8 +------- tcg/tci/tcg-target.c | 2 +- 4 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 tcg/tcg-common.c diff --git a/Makefile.target b/Makefile.target index 7dc6d0c..6186f03 100644 --- a/Makefile.target +++ b/Makefile.target @@ -89,6 +89,7 @@ obj-y += translate-common.o obj-y += cpu-exec-common.o obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o +obj-y += tcg/tcg-common.o obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o obj-y += fpu/softfloat.o obj-y += target-$(TARGET_BASE_ARCH)/ diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c new file mode 100644 index 0000000..8a848d0 --- /dev/null +++ b/tcg/tcg-common.c @@ -0,0 +1,32 @@ +/* + * Tiny Code Generator for QEMU + * + * Copyright (c) 2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "tcg/tcg.h" + +TCGOpDef tcg_op_defs[] = { +#define DEF(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags }, +#include "tcg-opc.h" +#undef DEF +}; +const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs); diff --git a/tcg/tcg.c b/tcg/tcg.c index 7e088b1..32475c2 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -113,12 +113,6 @@ static void tcg_out_tb_init(TCGContext *s); static void tcg_out_tb_finalize(TCGContext *s); -TCGOpDef tcg_op_defs[] = { -#define DEF(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags }, -#include "tcg-opc.h" -#undef DEF -}; -const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs); static TCGRegSet tcg_target_available_regs[2]; static TCGRegSet tcg_target_call_clobber_regs; @@ -1240,7 +1234,7 @@ void tcg_add_target_add_op_defs(const TCGTargetOpDef *tdefs) #if defined(CONFIG_DEBUG_TCG) i = 0; - for (op = 0; op < ARRAY_SIZE(tcg_op_defs); op++) { + for (op = 0; op < tcg_op_defs_max; op++) { const TCGOpDef *def = &tcg_op_defs[op]; if (def->flags & TCG_OPF_NOT_PRESENT) { /* Wrong entry in op definitions? */ diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c index 83472db..183ca36 100644 --- a/tcg/tci/tcg-target.c +++ b/tcg/tci/tcg-target.c @@ -846,7 +846,7 @@ static void tcg_target_init(TCGContext *s) #endif /* The current code uses uint8_t for tcg operations. */ - assert(ARRAY_SIZE(tcg_op_defs) <= UINT8_MAX); + assert(tcg_op_defs_max <= UINT8_MAX); /* Registers available for 32 bit operations. */ tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0,