From patchwork Mon Feb 25 21:26:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Green X-Patchwork-Id: 223045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E6FBA2C0296 for ; Tue, 26 Feb 2013 08:28:32 +1100 (EST) Received: from localhost ([::1]:41635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA5b5-0003NH-4r for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 16:28:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA5Zv-0000Qt-Bo for qemu-devel@nongnu.org; Mon, 25 Feb 2013 16:27:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UA5Zt-0000hr-46 for qemu-devel@nongnu.org; Mon, 25 Feb 2013 16:27:19 -0500 Received: from mail-qe0-f43.google.com ([209.85.128.43]:50226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA5Zs-0000hi-W8 for qemu-devel@nongnu.org; Mon, 25 Feb 2013 16:27:17 -0500 Received: by mail-qe0-f43.google.com with SMTP id s14so1966225qeb.30 for ; Mon, 25 Feb 2013 13:27:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=uhYF+/24x1fs9gWtu/8NBquFsYZd53XhHZUDYWXaxh0=; b=U8sX1JMSZMCn7CCRTwOE5v2gp4sH+5U5JK04gS8Wd90E3Lm7AxYwQonIa25sY880wd hhu2JVWUP6jBtgtHSYUMK8lojlooEwUN5lRwB8i3tQjqZMUynncStT85xQFS6m0kgoz0 /mPt6i4CP8BDyyfm35kG+SRMv9lDyd7iaAuxkBNfHS0MNa7Uf3O6LbWXcjiNdWDcIUVu SqkSuPJuuEssGtbfi5dizHY7sILCK0BXBAzqsKNr2w0D3Upwy1wZnbq7KUBGyNysMuLT spopgjYM4DMKDaW4L1uGy3Zk7CHieXa6WT7QKTPdcEzvuoS3OMpu2Gx0AWPESx3lZsHG 1yWA== X-Received: by 10.224.26.196 with SMTP id f4mr13679465qac.58.1361827636298; Mon, 25 Feb 2013 13:27:16 -0800 (PST) Received: from dev.moxielogic.com (nat-pool-3-rdu.redhat.com. [66.187.233.203]) by mx.google.com with ESMTPS id u8sm18176509qeu.2.2013.02.25.13.27.14 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Feb 2013 13:27:15 -0800 (PST) Received: by dev.moxielogic.com (sSMTP sendmail emulation); Mon, 25 Feb 2013 16:27:11 -0500 From: Anthony Green To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 16:26:53 -0500 Message-Id: <1361827613-11172-5-git-send-email-green@moxielogic.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361827613-11172-1-git-send-email-green@moxielogic.com> References: <1361827613-11172-1-git-send-email-green@moxielogic.com> X-Gm-Message-State: ALoCoQkyI/wvVKdfS1cHdOv4zhwq0XVNDB5iezr0WNw1F8GwK+akSY3jNJ1usv1/Fl03MRcnB7bl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.128.43 Cc: Anthony Green Subject: [Qemu-devel] [PATCH v3 4/4] Add top level changes for moxie 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 Signed-off-by: Anthony Green --- MAINTAINERS | 5 +++++ arch_init.c | 2 ++ configure | 12 +++++++++++- cpu-exec.c | 2 ++ default-configs/moxie-softmmu.mak | 2 ++ qapi-schema.json | 6 +++--- 6 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 default-configs/moxie-softmmu.mak diff --git a/MAINTAINERS b/MAINTAINERS index 21043e4..b970159 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -91,6 +91,11 @@ M: Aurelien Jarno S: Odd Fixes F: target-mips/ +Moxie +M: Anthony Green +S: Maintained +F: target-moxie/ + PowerPC M: Alexander Graf L: qemu-ppc@nongnu.org diff --git a/arch_init.c b/arch_init.c index 8da868b..f82ed2d 100644 --- a/arch_init.c +++ b/arch_init.c @@ -85,6 +85,8 @@ int graphic_depth = 15; #define QEMU_ARCH QEMU_ARCH_MICROBLAZE #elif defined(TARGET_MIPS) #define QEMU_ARCH QEMU_ARCH_MIPS +#elif defined(TARGET_MOXIE) +#define QEMU_ARCH QEMU_ARCH_MOXIE #elif defined(TARGET_OPENRISC) #define QEMU_ARCH QEMU_ARCH_OPENRISC #elif defined(TARGET_PPC) diff --git a/configure b/configure index dcaa67c..02d75db 100755 --- a/configure +++ b/configure @@ -955,6 +955,7 @@ mips-softmmu \ mipsel-softmmu \ mips64-softmmu \ mips64el-softmmu \ +moxie-softmmu \ or32-softmmu \ ppc-softmmu \ ppcemb-softmmu \ @@ -3898,7 +3899,7 @@ target_arch2=`echo $target | cut -d '-' -f 1` target_bigendian="no" case "$target_arch2" in - armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) + armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) target_bigendian=yes ;; esac @@ -4003,6 +4004,11 @@ case "$target_arch2" in echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak target_long_alignment=8 ;; + moxie) + TARGET_ARCH=moxie + bflt="yes" + target_phys_bits=32 + ;; or32) TARGET_ARCH=openrisc TARGET_BASE_ARCH=openrisc @@ -4247,6 +4253,10 @@ for i in $ARCH $TARGET_BASE_ARCH ; do echo "CONFIG_MIPS_DIS=y" >> $config_target_mak echo "CONFIG_MIPS_DIS=y" >> config-all-disas.mak ;; + moxie*) + echo "CONFIG_MOXIE_DIS=y" >> $config_target_mak + echo "CONFIG_MOXIE_DIS=y" >> config-all-disas.mak + ;; or32) echo "CONFIG_OPENRISC_DIS=y" >> $config_target_mak echo "CONFIG_OPENRISC_DIS=y" >> config-all-disas.mak diff --git a/cpu-exec.c b/cpu-exec.c index afbe497..ba7ea41 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -221,6 +221,7 @@ int cpu_exec(CPUArchState *env) #elif defined(TARGET_LM32) #elif defined(TARGET_MICROBLAZE) #elif defined(TARGET_MIPS) +#elif defined(TARGET_MOXIE) #elif defined(TARGET_OPENRISC) #elif defined(TARGET_SH4) #elif defined(TARGET_CRIS) @@ -655,6 +656,7 @@ int cpu_exec(CPUArchState *env) | env->cc_dest | (env->cc_x << 4); #elif defined(TARGET_MICROBLAZE) #elif defined(TARGET_MIPS) +#elif defined(TARGET_MOXIE) #elif defined(TARGET_OPENRISC) #elif defined(TARGET_SH4) #elif defined(TARGET_ALPHA) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak new file mode 100644 index 0000000..d378363 --- /dev/null +++ b/default-configs/moxie-softmmu.mak @@ -0,0 +1,2 @@ +# Default configuration for moxie-softmmu + diff --git a/qapi-schema.json b/qapi-schema.json index cd7ea25..cf5cd60 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2944,9 +2944,9 @@ ## { 'enum': 'TargetType', 'data': [ 'alpha', 'arm', 'cris', 'i386', 'lm32', 'm68k', 'microblazeel', - 'microblaze', 'mips64el', 'mips64', 'mipsel', 'mips', 'or32', - 'ppc64', 'ppcemb', 'ppc', 's390x', 'sh4eb', 'sh4', 'sparc64', - 'sparc', 'unicore32', 'x86_64', 'xtensaeb', 'xtensa' ] } + 'microblaze', 'mips64el', 'mips64', 'mipsel', 'mips', 'moxie', + 'or32', 'ppc64', 'ppcemb', 'ppc', 's390x', 'sh4eb', 'sh4', + 'sparc64', 'sparc', 'unicore32', 'x86_64', 'xtensaeb', 'xtensa' ] } ## # @TargetInfo: