94 lines
3.5 KiB
Diff
94 lines
3.5 KiB
Diff
From 66588d01b8cb710d746c249a34f31f7f353bc697 Mon Sep 17 00:00:00 2001
|
|
From: Aurelien Jarno <aurelien@aurel32.net>
|
|
Date: Sat, 22 Sep 2012 23:08:38 +0200
|
|
Subject: [PATCH] tcg/mips: fix MIPS32(R2) detection
|
|
|
|
Fix the MIPS32(R2) cpu detection so that it also works with
|
|
-march=octeon. Thanks to Andrew Pinski for the hint.
|
|
|
|
Cc: Andrew Pinski <apinski@cavium.com>
|
|
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
tcg/mips/tcg-target.c | 10 +++++-----
|
|
tcg/mips/tcg-target.h | 8 ++++----
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
|
|
index c272b38..e9a1ffb 100644
|
|
--- a/tcg/mips/tcg-target.c
|
|
+++ b/tcg/mips/tcg-target.c
|
|
@@ -425,7 +425,7 @@ static inline void tcg_out_movi(TCGContext *s, TCGType type,
|
|
|
|
static inline void tcg_out_bswap16(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
{
|
|
-#ifdef _MIPS_ARCH_MIPS32R2
|
|
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
|
tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg);
|
|
#else
|
|
/* ret and arg can't be register at */
|
|
@@ -442,7 +442,7 @@ static inline void tcg_out_bswap16(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
|
|
static inline void tcg_out_bswap16s(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
{
|
|
-#ifdef _MIPS_ARCH_MIPS32R2
|
|
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
|
tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg);
|
|
tcg_out_opc_reg(s, OPC_SEH, ret, 0, ret);
|
|
#else
|
|
@@ -460,7 +460,7 @@ static inline void tcg_out_bswap16s(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
|
|
static inline void tcg_out_bswap32(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
{
|
|
-#ifdef _MIPS_ARCH_MIPS32R2
|
|
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
|
tcg_out_opc_reg(s, OPC_WSBH, ret, 0, arg);
|
|
tcg_out_opc_sa(s, OPC_ROTR, ret, ret, 16);
|
|
#else
|
|
@@ -486,7 +486,7 @@ static inline void tcg_out_bswap32(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
|
|
static inline void tcg_out_ext8s(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
{
|
|
-#ifdef _MIPS_ARCH_MIPS32R2
|
|
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
|
tcg_out_opc_reg(s, OPC_SEB, ret, 0, arg);
|
|
#else
|
|
tcg_out_opc_sa(s, OPC_SLL, ret, arg, 24);
|
|
@@ -496,7 +496,7 @@ static inline void tcg_out_ext8s(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
|
|
static inline void tcg_out_ext16s(TCGContext *s, TCGReg ret, TCGReg arg)
|
|
{
|
|
-#ifdef _MIPS_ARCH_MIPS32R2
|
|
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
|
tcg_out_opc_reg(s, OPC_SEH, ret, 0, arg);
|
|
#else
|
|
tcg_out_opc_sa(s, OPC_SLL, ret, arg, 16);
|
|
diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
|
|
index d147e70..7020d65 100644
|
|
--- a/tcg/mips/tcg-target.h
|
|
+++ b/tcg/mips/tcg-target.h
|
|
@@ -88,16 +88,16 @@ typedef enum {
|
|
#define TCG_TARGET_HAS_nand_i32 0
|
|
|
|
/* optional instructions only implemented on MIPS4, MIPS32 and Loongson 2 */
|
|
-#if defined(_MIPS_ARCH_MIPS4) || defined(_MIPS_ARCH_MIPS32) || \
|
|
- defined(_MIPS_ARCH_MIPS32R2) || defined(_MIPS_ARCH_LOONGSON2E) || \
|
|
- defined(_MIPS_ARCH_LOONGSON2F)
|
|
+#if (defined(__mips_isa_rev) && (__mips_isa_rev >= 1)) || \
|
|
+ defined(_MIPS_ARCH_LOONGSON2E) || defined(_MIPS_ARCH_LOONGSON2F) || \
|
|
+ defined(_MIPS_ARCH_MIPS4)
|
|
#define TCG_TARGET_HAS_movcond_i32 1
|
|
#else
|
|
#define TCG_TARGET_HAS_movcond_i32 0
|
|
#endif
|
|
|
|
/* optional instructions only implemented on MIPS32R2 */
|
|
-#ifdef _MIPS_ARCH_MIPS32R2
|
|
+#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
|
#define TCG_TARGET_HAS_bswap16_i32 1
|
|
#define TCG_TARGET_HAS_bswap32_i32 1
|
|
#define TCG_TARGET_HAS_rot_i32 1
|
|
--
|
|
1.7.12.1
|
|
|