From patchwork Thu Jul 28 13:37:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 107257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 56C1FB6F18 for ; Thu, 28 Jul 2011 23:38:56 +1000 (EST) Received: from localhost ([::1]:54018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmQnY-0006aS-EB for incoming@patchwork.ozlabs.org; Thu, 28 Jul 2011 09:38:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmQn1-00054g-H1 for qemu-devel@nongnu.org; Thu, 28 Jul 2011 09:38:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QmQn0-0008Ob-Eo for qemu-devel@nongnu.org; Thu, 28 Jul 2011 09:38:15 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:63141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmQn0-0008OT-2r for qemu-devel@nongnu.org; Thu, 28 Jul 2011 09:38:14 -0400 Received: from aspire-one.lan (dynamic-adsl-78-14-106-154.clienti.tiscali.it [78.14.106.154]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MOkKM-1QjgxX3K3a-005gHy; Thu, 28 Jul 2011 15:38:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 28 Jul 2011 15:37:53 +0200 Message-Id: <1311860276-24690-2-git-send-email-Laurent@Vivier.EU> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1311860276-24690-1-git-send-email-Laurent@Vivier.EU> References: <1311860276-24690-1-git-send-email-Laurent@Vivier.EU> X-Provags-ID: V02:K0:JGH8RfOEw6K0D75PmNAzAIKdVgxeXxBUr6iSEYorzQD uirXi4HBQPfIm++lVzU3W/hJ6E/J4JAWA5dbpGnGiQTU8I8Aow YnqIdOB2420mrS2k5uGgslYmnhN73Uf12Bxev0IsNHeAlE8tbE 8eCNy4kBYR25nhGo2eyrUZXA2hw1IrLrKBckCVv3R2ujy0+2/o ms6gF0m4gMQ9aXcsJ0VRjJcD1KI0UYAnwbHSCHyZTM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.126.171 Cc: Riku Voipio , Laurent Vivier Subject: [Qemu-devel] [PATCH 1/4] linux-user: define default cpu model in configure instead of linux-user/main.c 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: Laurent Vivier --- configure | 15 +++++++++++++++ linux-user/main.c | 34 +--------------------------------- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/configure b/configure index fb8819b..c74a5f9 100755 --- a/configure +++ b/configure @@ -3075,6 +3075,7 @@ target_dir="$target" config_target_mak=$target_dir/config-target.mak target_arch2=`echo $target | cut -d '-' -f 1` target_bigendian="no" +target_default_cpu="any" case "$target_arch2" in armeb|lm32|m68k|microblaze|mips|mipsn32|mips64|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus) @@ -3151,11 +3152,13 @@ TARGET_ABI_DIR="" case "$target_arch2" in i386) target_phys_bits=64 + target_default_cpu="qemu32" ;; x86_64) TARGET_BASE_ARCH=i386 target_phys_bits=64 target_long_alignment=8 + target_default_cpu="qemu64" ;; alpha) target_phys_bits=64 @@ -3173,6 +3176,7 @@ case "$target_arch2" in cris) target_nptl="yes" target_phys_bits=32 + target_default_cpu="" ;; lm32) target_phys_bits=32 @@ -3198,12 +3202,14 @@ case "$target_arch2" in echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak target_nptl="yes" target_phys_bits=64 + target_default_cpu="24Kf" ;; mipsn32|mipsn32el) TARGET_ARCH=mipsn32 TARGET_BASE_ARCH=mips echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak target_phys_bits=64 + target_default_cpu="20Kc" ;; mips64|mips64el) TARGET_ARCH=mips64 @@ -3211,12 +3217,14 @@ case "$target_arch2" in echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak target_phys_bits=64 target_long_alignment=8 + target_default_cpu="20Kc" ;; ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_phys_bits=32 target_nptl="yes" target_libs_softmmu="$fdt_libs" + target_default_cpu="750" ;; ppcemb) TARGET_BASE_ARCH=ppc @@ -3225,6 +3233,7 @@ case "$target_arch2" in target_phys_bits=64 target_nptl="yes" target_libs_softmmu="$fdt_libs" + target_default_cpu="750" ;; ppc64) TARGET_BASE_ARCH=ppc @@ -3233,6 +3242,7 @@ case "$target_arch2" in target_phys_bits=64 target_long_alignment=8 target_libs_softmmu="$fdt_libs" + target_default_cpu="970fx" ;; ppc64abi32) TARGET_ARCH=ppc64 @@ -3242,6 +3252,7 @@ case "$target_arch2" in gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_phys_bits=64 target_libs_softmmu="$fdt_libs" + target_default_cpu="750" ;; sh4|sh4eb) TARGET_ARCH=sh4 @@ -3251,11 +3262,13 @@ case "$target_arch2" in ;; sparc) target_phys_bits=64 + target_default_cpu="Fujitsu MB86904" ;; sparc64) TARGET_BASE_ARCH=sparc target_phys_bits=64 target_long_alignment=8 + target_default_cpu="TI UltraSparc II" ;; sparc32plus) TARGET_ARCH=sparc64 @@ -3263,6 +3276,7 @@ case "$target_arch2" in TARGET_ABI_DIR=sparc echo "TARGET_ABI32=y" >> $config_target_mak target_phys_bits=64 + target_default_cpu="Fujitsu MB86904" ;; s390x) target_nptl="yes" @@ -3281,6 +3295,7 @@ echo "TARGET_SHORT_ALIGNMENT=$target_short_alignment" >> $config_target_mak echo "TARGET_INT_ALIGNMENT=$target_int_alignment" >> $config_target_mak echo "TARGET_LONG_ALIGNMENT=$target_long_alignment" >> $config_target_mak echo "TARGET_LLONG_ALIGNMENT=$target_llong_alignment" >> $config_target_mak +echo "TARGET_DEFAULT_CPU=\"$target_default_cpu\"" >> $config_target_mak echo "TARGET_ARCH=$TARGET_ARCH" >> $config_target_mak target_arch_name="`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`" echo "TARGET_$target_arch_name=y" >> $config_target_mak diff --git a/linux-user/main.c b/linux-user/main.c index 2135b9c..7180cee 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3082,39 +3082,7 @@ int main(int argc, char **argv, char **envp) init_paths(interp_prefix); if (cpu_model == NULL) { -#if defined(TARGET_I386) -#ifdef TARGET_X86_64 - cpu_model = "qemu64"; -#else - cpu_model = "qemu32"; -#endif -#elif defined(TARGET_ARM) - cpu_model = "any"; -#elif defined(TARGET_UNICORE32) - cpu_model = "any"; -#elif defined(TARGET_M68K) - cpu_model = "any"; -#elif defined(TARGET_SPARC) -#ifdef TARGET_SPARC64 - cpu_model = "TI UltraSparc II"; -#else - cpu_model = "Fujitsu MB86904"; -#endif -#elif defined(TARGET_MIPS) -#if defined(TARGET_ABI_MIPSN32) || defined(TARGET_ABI_MIPSN64) - cpu_model = "20Kc"; -#else - cpu_model = "24Kf"; -#endif -#elif defined(TARGET_PPC) -#ifdef TARGET_PPC64 - cpu_model = "970fx"; -#else - cpu_model = "750"; -#endif -#else - cpu_model = "any"; -#endif + cpu_model = TARGET_DEFAULT_CPU; } cpu_exec_init_all(0); /* NOTE: we need to init the CPU at this stage to get