[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/24] tcg-ppc64: Use getauxval for ISA detection
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 24/24] tcg-ppc64: Use getauxval for ISA detection |
Date: |
Mon, 18 Feb 2013 12:21:13 -0800 |
Glibc 2.16 includes an easy way to get feature bits previously
buried in /proc or the program startup auxiliary vector. Use it.
Signed-off-by: Richard Henderson <address@hidden>
---
configure | 18 ++++++++++++++++++
tcg/ppc64/tcg-target.c | 20 +++++++++++++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index bf5970f..7bb1461 100755
--- a/configure
+++ b/configure
@@ -3167,6 +3167,20 @@ if compile_prog "" "" ; then
int128=yes
fi
+########################################
+# check if getauxval is available.
+
+getauxval=no
+cat > $TMPC << EOF
+#include <sys/auxv.h>
+int main(void) {
+ return getauxval(AT_HWCAP) == 0;
+}
+EOF
+if compile_prog "" "" ; then
+ getauxval=yes
+fi
+
##########################################
# End of CC checks
# After here, no more $cc or $ld runs
@@ -3712,6 +3726,10 @@ if test "$int128" = "yes" ; then
echo "CONFIG_INT128=y" >> $config_host_mak
fi
+if test "$getauxval" = "yes" ; then
+ echo "CONFIG_GETAUXVAL=y" >> $config_host_mak
+fi
+
if test "$glusterfs" = "yes" ; then
echo "CONFIG_GLUSTERFS=y" >> $config_host_mak
fi
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index ca81456..8b38047 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -44,8 +44,16 @@ static uint8_t *tb_ret_addr;
#define GUEST_BASE 0
#endif
+#ifdef CONFIG_GETAUXVAL
+#include <sys/auxv.h>
+static bool have_isa_2_05;
+static bool have_isa_2_06;
+#define HAVE_ISA_2_05 have_isa_2_05
+#define HAVE_ISEL have_isa_2_06
+#else
#define HAVE_ISA_2_05 0
-#define HAVE_ISEL 0
+#define HAVE_ISA_ISEL 0
+#endif
#ifdef CONFIG_USE_GUEST_BASE
#define TCG_GUEST_BASE_REG 30
@@ -2060,6 +2068,16 @@ static const TCGTargetOpDef ppc_op_defs[] = {
static void tcg_target_init (TCGContext *s)
{
+#ifdef CONFIG_GETAUXVAL
+ unsigned long hwcap = getauxval(AT_HWCAP);
+ /* Bizzarely, the linux kernel doesn't set *all* applicable bits. */
+ if (hwcap & PPC_FEATURE_ARCH_2_06) {
+ have_isa_2_05 = have_isa_2_06 = true;
+ } else if (hwcap & PPC_FEATURE_ARCH_2_05) {
+ have_isa_2_05 = true;
+ }
+#endif
+
tcg_regset_set32 (tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffffffff);
tcg_regset_set32 (tcg_target_available_regs[TCG_TYPE_I64], 0, 0xffffffff);
tcg_regset_set32 (tcg_target_call_clobber_regs, 0,
--
1.8.1.2
- [Qemu-devel] [PATCH 12/24] tcg-ppc64: Improve and_i32 with constant, (continued)
- [Qemu-devel] [PATCH 12/24] tcg-ppc64: Improve and_i32 with constant, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 10/24] tcg-ppc64: Improve constant add and sub ops., Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 17/24] tcg-ppc64: Implement bswap64, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 14/24] tcg-ppc64: Streamline qemu_ld/st insn selection, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 15/24] tcg-ppc64: Implement rotates, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 22/24] tcg-ppc64: Rewrite setcond, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 19/24] tcg-ppc64: Implement deposit, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 20/24] tcg-ppc64: Use I constraint for mul, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 18/24] tcg-ppc64: Implement compound logicals, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 21/24] tcg-ppc64: Use TCGType throughout compares, Richard Henderson, 2013/02/18
- [Qemu-devel] [PATCH 24/24] tcg-ppc64: Use getauxval for ISA detection,
Richard Henderson <=
- [Qemu-devel] [PATCH 23/24] tcg-ppc64: Implement movcond, Richard Henderson, 2013/02/18