From patchwork Thu Nov 26 13:23:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 39517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 33A561007D1 for ; Fri, 27 Nov 2009 00:54:53 +1100 (EST) Received: from localhost ([127.0.0.1]:43017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDeo5-0001OS-U9 for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 08:54:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDeJq-00018b-US for qemu-devel@nongnu.org; Thu, 26 Nov 2009 08:23:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDeJi-00011S-Bj for qemu-devel@nongnu.org; Thu, 26 Nov 2009 08:23:30 -0500 Received: from [199.232.76.173] (port=42022 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDeJe-0000za-Km for qemu-devel@nongnu.org; Thu, 26 Nov 2009 08:23:23 -0500 Received: from cantor2.suse.de ([195.135.220.15]:60093 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDeJd-0007Zs-WC for qemu-devel@nongnu.org; Thu, 26 Nov 2009 08:23:22 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 0985987567; Thu, 26 Nov 2009 14:23:21 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 14:23:12 +0100 Message-Id: <1259241800-2810-4-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1259241800-2810-1-git-send-email-agraf@suse.de> References: <1259241800-2810-1-git-send-email-agraf@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Carsten Otte , Aurelien Jarno Subject: [Qemu-devel] [PATCH 03/11] S/390 fake TCG implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Qemu won't let us run a KVM target without having host TCG support. Well, for now we don't have any so let's implement a fake target that only stubs out everything. I tried to keep the patch as close to Uli's source as possible, so whenever he feels like it he can easily diff his version against this one. Signed-off-by: Alexander Graf --- dyngen-exec.h | 2 +- target-s390x/helper.c | 5 ++ tcg/s390/tcg-target.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ tcg/s390/tcg-target.h | 48 +++++++++++++++++++++++ 4 files changed, 157 insertions(+), 1 deletions(-) create mode 100644 tcg/s390/tcg-target.c create mode 100644 tcg/s390/tcg-target.h diff --git a/dyngen-exec.h b/dyngen-exec.h index 86e61c3..0353f36 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -117,7 +117,7 @@ extern int printf(const char *, ...); /* The return address may point to the start of the next instruction. Subtracting one gets us the call instruction itself. */ -#if defined(__s390__) +#if defined(__s390__) && !defined(__s390x__) # define GETPC() ((void*)(((unsigned long)__builtin_return_address(0) & 0x7fffffffUL) - 1)) #elif defined(__arm__) /* Thumb return addresses have the low bit set, so we need to subtract two. diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 4e23b4a..0e222e3 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -44,6 +44,11 @@ CPUS390XState *cpu_s390x_init(const char *cpu_model) return env; } +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) +{ + return addr; +} + void cpu_reset(CPUS390XState *env) { if (qemu_loglevel_mask(CPU_LOG_RESET)) { diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c new file mode 100644 index 0000000..53bbf69 --- /dev/null +++ b/tcg/s390/tcg-target.c @@ -0,0 +1,103 @@ +/* + * Tiny Code Generator for QEMU + * + * Copyright (c) 2009 Ulrich Hecht + * + * 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. + */ + +static const int tcg_target_reg_alloc_order[] = { +}; + +static const int tcg_target_call_iarg_regs[] = { +}; + +static const int tcg_target_call_oarg_regs[] = { +}; + +static void patch_reloc(uint8_t *code_ptr, int type, + tcg_target_long value, tcg_target_long addend) +{ + tcg_abort(); +} + +static inline int tcg_target_get_call_iarg_regs_count(int flags) +{ + tcg_abort(); + return 0; +} + +/* parse target specific constraints */ +static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) +{ + tcg_abort(); + return 0; +} + +/* Test if a constant matches the constraint. */ +static inline int tcg_target_const_match(tcg_target_long val, + const TCGArgConstraint *arg_ct) +{ + tcg_abort(); + return 0; +} + +/* load a register with an immediate value */ +static inline void tcg_out_movi(TCGContext *s, TCGType type, + int ret, tcg_target_long arg) +{ + tcg_abort(); +} + +/* load data without address translation or endianness conversion */ +static inline void tcg_out_ld(TCGContext *s, TCGType type, int arg, + int arg1, tcg_target_long arg2) +{ + tcg_abort(); +} + +static inline void tcg_out_st(TCGContext *s, TCGType type, int arg, + int arg1, tcg_target_long arg2) +{ + tcg_abort(); +} + +static inline void tcg_out_op(TCGContext *s, int opc, + const TCGArg *args, const int *const_args) +{ + tcg_abort(); +} + +void tcg_target_init(TCGContext *s) +{ +} + +void tcg_target_qemu_prologue(TCGContext *s) +{ +} + +static inline void tcg_out_mov(TCGContext *s, int ret, int arg) +{ + tcg_abort(); +} + +static inline void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val) +{ + tcg_abort(); +} diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h new file mode 100644 index 0000000..2e66553 --- /dev/null +++ b/tcg/s390/tcg-target.h @@ -0,0 +1,48 @@ +/* + * Tiny Code Generator for QEMU + * + * Copyright (c) 2009 Ulrich Hecht + * + * 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. + */ +#define TCG_TARGET_S390 1 + +#define TCG_TARGET_REG_BITS 64 +#define TCG_TARGET_WORDS_BIGENDIAN + +#define TCG_TARGET_NB_REGS 0 + +enum { + TCG_AREG0 = 0, +}; + +/* used for function call generation */ +#define TCG_REG_CALL_STACK 0 +#define TCG_TARGET_STACK_ALIGN 8 +#define TCG_TARGET_CALL_STACK_OFFSET 0 + +static inline void flush_icache_range(unsigned long start, unsigned long stop) +{ +#if QEMU_GNUC_PREREQ(4, 1) + void __clear_cache(char *beg, char *end); + __clear_cache((char *) start, (char *) stop); +#else +#error not implemented +#endif +}