From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAp8f-00027n-VN for qemu-devel@nongnu.org; Sat, 17 Aug 2013 18:38:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAp8X-0004x8-Ig for qemu-devel@nongnu.org; Sat, 17 Aug 2013 18:38:29 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:54948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAp8X-0004wj-CK for qemu-devel@nongnu.org; Sat, 17 Aug 2013 18:38:21 -0400 Received: by mail-pa0-f44.google.com with SMTP id fz6so3259940pac.17 for ; Sat, 17 Aug 2013 15:38:20 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Sat, 17 Aug 2013 15:38:07 -0700 Message-Id: <1376779088-9648-6-git-send-email-rth@twiddle.net> In-Reply-To: <1376779088-9648-1-git-send-email-rth@twiddle.net> References: <1376779088-9648-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 5/6] util: Provide fallback hwcap and platform for powerpc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Allow host "detection" on non-linux hosts. Signed-off-by: Richard Henderson --- util/getauxval.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/util/getauxval.c b/util/getauxval.c index 55b639c..2e93a14 100644 --- a/util/getauxval.c +++ b/util/getauxval.c @@ -60,12 +60,64 @@ void qemu_init_auxval(char **envp) static const char *default_platform(void) { - return NULL; + const char *ret = NULL; + +#ifdef _ARCH_PPC +# if defined(_ARCH_PWR8) + ret = "power8"; +# elif defined(_ARCH_PWR7) + ret = "power7"; +# elif defined(_ARCH_PWR6X) || defined(_ARCH_PWR6) + ret = "power6"; +# elif defined(_ARCH_PWR5X) + ret = "power5+"; +# elif defined(_ARCH_PWR5) + ret = "power5"; +# elif defined(_ARCH_PWR4) + ret = "power4"; +# else + ret = "power3"; +# endif +#endif /* _ARCH_PPC */ + + return ret; } static unsigned long default_hwcap(void) { - return 0; + unsigned long ret = 0; + +#ifdef _ARCH_PPC +# if defined(_ARCH_PWR8) || defined(_ARCH_PWR7) + ret |= PPC_FEATURE_ARCH_2_06; +# elif defined(_ARCH_PWR6X) || defined(_ARCH_PWR6) + ret |= PPC_FEATURE_ARCH_2_05; +# elif defined(_ARCH_PWR5X) + ret |= PPC_FEATURE_POWER5_PLUS; +# elif defined(_ARCH_PWR5) + ret |= PPC_FEATURE_POWER5; +# elif defined(_ARCH_PWR4) + ret |= PPC_FEATURE_POWER4; +# endif +# if defined(_ARCH_PWR6) /* and later */ + ret |= PPC_FEATURE_TRUE_LE | PPC_FEATURE_PSERIES_PERFMON_COMPAT; +# endif +# if defined(_ARCH_PWR5) /* and later */ + ret |= PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP; +# endif +# if defined(_ARCH_PPC64) + ret |= PPC_FEATURE_64; +# endif +# if defined(__VSX__) + ret |= PPC_FEATURE_HAS_VSX; +# endif +# if defined(__ALTIVEC__) + ret |= PPC_FEATURE_HAS_ALTIVEC; +# endif + ret |= PPC_FEATURE_32 | PPC_FEATURE_HAS_FPU | PPC_FEATURE_HAS_MMU; +#endif /* _ARCH_PPC */ + + return ret; } unsigned long qemu_getauxval(unsigned long type) -- 1.8.1.4