aboutsummaryrefslogtreecommitdiff
path: root/target-mips
diff options
context:
space:
mode:
Diffstat (limited to 'target-mips')
-rw-r--r--target-mips/exec.h2
-rw-r--r--target-mips/op.c67
-rw-r--r--target-mips/op_helper.c13
3 files changed, 33 insertions, 49 deletions
diff --git a/target-mips/exec.h b/target-mips/exec.h
index c6dc25cf6e..61c09acb66 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -70,6 +70,8 @@ void do_dsllv (void);
void do_dsrav (void);
void do_dsrlv (void);
void do_drotrv (void);
+void do_dclo (void);
+void do_dclz (void);
#endif
#endif
diff --git a/target-mips/op.c b/target-mips/op.c
index 1ecec9a57a..9e8324d49b 100644
--- a/target-mips/op.c
+++ b/target-mips/op.c
@@ -22,6 +22,7 @@
#include "config.h"
#include "exec.h"
+#include "host-utils.h"
#ifndef CALL_FROM_TB0
#define CALL_FROM_TB0(func) func()
@@ -537,35 +538,13 @@ void op_rotrv (void)
void op_clo (void)
{
- int n;
-
- if (T0 == ~((target_ulong)0)) {
- T0 = 32;
- } else {
- for (n = 0; n < 32; n++) {
- if (!(((int32_t)T0) & (1 << 31)))
- break;
- T0 <<= 1;
- }
- T0 = n;
- }
+ T0 = clo32(T0);
RETURN();
}
void op_clz (void)
{
- int n;
-
- if (T0 == 0) {
- T0 = 32;
- } else {
- for (n = 0; n < 32; n++) {
- if (T0 & (1 << 31))
- break;
- T0 <<= 1;
- }
- T0 = n;
- }
+ T0 = clz32(T0);
RETURN();
}
@@ -645,6 +624,18 @@ void op_drotrv (void)
RETURN();
}
+void op_dclo (void)
+{
+ CALL_FROM_TB0(do_dclo);
+ RETURN();
+}
+
+void op_dclz (void)
+{
+ CALL_FROM_TB0(do_dclz);
+ RETURN();
+}
+
#else /* TARGET_LONG_BITS > HOST_LONG_BITS */
void op_dsll (void)
@@ -735,41 +726,19 @@ void op_drotrv (void)
T0 = T1;
RETURN();
}
-#endif /* TARGET_LONG_BITS > HOST_LONG_BITS */
void op_dclo (void)
{
- int n;
-
- if (T0 == ~((target_ulong)0)) {
- T0 = 64;
- } else {
- for (n = 0; n < 64; n++) {
- if (!(T0 & (1ULL << 63)))
- break;
- T0 <<= 1;
- }
- T0 = n;
- }
+ T0 = clo64(T0);
RETURN();
}
void op_dclz (void)
{
- int n;
-
- if (T0 == 0) {
- T0 = 64;
- } else {
- for (n = 0; n < 64; n++) {
- if (T0 & (1ULL << 63))
- break;
- T0 <<= 1;
- }
- T0 = n;
- }
+ T0 = clz64(T0);
RETURN();
}
+#endif /* TARGET_LONG_BITS > HOST_LONG_BITS */
#endif /* TARGET_MIPSN32 || TARGET_MIPS64 */
/* 64 bits arithmetic */
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index f3e01202e6..ff26ab5afa 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -20,6 +20,8 @@
#include <stdlib.h>
#include "exec.h"
+#include "host-utils.h"
+
#define GETPC() (__builtin_return_address(0))
/*****************************************************************************/
@@ -141,6 +143,17 @@ void do_drotrv (void)
} else
T0 = T1;
}
+
+void do_dclo (void)
+{
+ T0 = clo64(T0);
+}
+
+void do_dclz (void)
+{
+ T0 = clz64(T0);
+}
+
#endif /* TARGET_LONG_BITS > HOST_LONG_BITS */
#endif /* TARGET_MIPSN32 || TARGET_MIPS64 */