Commit 7d8f787d authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Paolo Bonzini
Browse files

tcg: split tcg_op_defs to -common 



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.

Cc: Stefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Message-Id: <4b607425886d85aee65878e4935dfad46b3e6085.1441614289.git.crosthwaite.peter@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9b68a775

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -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)/

tcg/tcg-common.c

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * 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);

tcg/tcg.c

+1 −7
Original line number Diff line number Diff line
@@ -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? */

tcg/tci/tcg-target.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,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,