tcg: Relax requirement for mulu2_i32 on 32-bit hosts
Instead require either mulu2_i32 or muluh_i32. The code in tcg-op.h already supports looking for both. Previous incomplete conversion? Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
671c835b7d
commit
df9ebea53e
|
@ -79,6 +79,7 @@ extern bool use_idiv_instructions;
|
||||||
#define TCG_TARGET_HAS_nor_i32 0
|
#define TCG_TARGET_HAS_nor_i32 0
|
||||||
#define TCG_TARGET_HAS_deposit_i32 1
|
#define TCG_TARGET_HAS_deposit_i32 1
|
||||||
#define TCG_TARGET_HAS_movcond_i32 1
|
#define TCG_TARGET_HAS_movcond_i32 1
|
||||||
|
#define TCG_TARGET_HAS_mulu2_i32 1
|
||||||
#define TCG_TARGET_HAS_muls2_i32 1
|
#define TCG_TARGET_HAS_muls2_i32 1
|
||||||
#define TCG_TARGET_HAS_muluh_i32 0
|
#define TCG_TARGET_HAS_muluh_i32 0
|
||||||
#define TCG_TARGET_HAS_mulsh_i32 0
|
#define TCG_TARGET_HAS_mulsh_i32 0
|
||||||
|
|
|
@ -109,6 +109,7 @@ extern bool use_mips32r2_instructions;
|
||||||
#define TCG_TARGET_HAS_orc_i32 0
|
#define TCG_TARGET_HAS_orc_i32 0
|
||||||
#define TCG_TARGET_HAS_eqv_i32 0
|
#define TCG_TARGET_HAS_eqv_i32 0
|
||||||
#define TCG_TARGET_HAS_nand_i32 0
|
#define TCG_TARGET_HAS_nand_i32 0
|
||||||
|
#define TCG_TARGET_HAS_mulu2_i32 1
|
||||||
#define TCG_TARGET_HAS_muls2_i32 1
|
#define TCG_TARGET_HAS_muls2_i32 1
|
||||||
#define TCG_TARGET_HAS_muluh_i32 1
|
#define TCG_TARGET_HAS_muluh_i32 1
|
||||||
#define TCG_TARGET_HAS_mulsh_i32 1
|
#define TCG_TARGET_HAS_mulsh_i32 1
|
||||||
|
|
|
@ -95,6 +95,7 @@ typedef enum {
|
||||||
#define TCG_TARGET_HAS_nor_i32 1
|
#define TCG_TARGET_HAS_nor_i32 1
|
||||||
#define TCG_TARGET_HAS_deposit_i32 1
|
#define TCG_TARGET_HAS_deposit_i32 1
|
||||||
#define TCG_TARGET_HAS_movcond_i32 1
|
#define TCG_TARGET_HAS_movcond_i32 1
|
||||||
|
#define TCG_TARGET_HAS_mulu2_i32 1
|
||||||
#define TCG_TARGET_HAS_muls2_i32 0
|
#define TCG_TARGET_HAS_muls2_i32 0
|
||||||
#define TCG_TARGET_HAS_muluh_i32 0
|
#define TCG_TARGET_HAS_muluh_i32 0
|
||||||
#define TCG_TARGET_HAS_mulsh_i32 0
|
#define TCG_TARGET_HAS_mulsh_i32 0
|
||||||
|
|
|
@ -97,7 +97,6 @@ typedef uint64_t TCGRegSet;
|
||||||
/* Turn some undef macros into true macros. */
|
/* Turn some undef macros into true macros. */
|
||||||
#define TCG_TARGET_HAS_add2_i32 1
|
#define TCG_TARGET_HAS_add2_i32 1
|
||||||
#define TCG_TARGET_HAS_sub2_i32 1
|
#define TCG_TARGET_HAS_sub2_i32 1
|
||||||
#define TCG_TARGET_HAS_mulu2_i32 1
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef TCG_TARGET_deposit_i32_valid
|
#ifndef TCG_TARGET_deposit_i32_valid
|
||||||
|
@ -121,6 +120,13 @@ typedef uint64_t TCGRegSet;
|
||||||
#define TCG_TARGET_HAS_rem_i64 0
|
#define TCG_TARGET_HAS_rem_i64 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* For 32-bit targets, some sort of unsigned widening multiply is required. */
|
||||||
|
#if TCG_TARGET_REG_BITS == 32 \
|
||||||
|
&& !(defined(TCG_TARGET_HAS_mulu2_i32) \
|
||||||
|
|| defined(TCG_TARGET_HAS_muluh_i32))
|
||||||
|
# error "Missing unsigned widening multiply"
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef enum TCGOpcode {
|
typedef enum TCGOpcode {
|
||||||
#define DEF(name, oargs, iargs, cargs, flags) INDEX_op_ ## name,
|
#define DEF(name, oargs, iargs, cargs, flags) INDEX_op_ ## name,
|
||||||
#include "tcg-opc.h"
|
#include "tcg-opc.h"
|
||||||
|
|
|
@ -118,6 +118,8 @@
|
||||||
#define TCG_TARGET_HAS_mulu2_i64 0
|
#define TCG_TARGET_HAS_mulu2_i64 0
|
||||||
#define TCG_TARGET_HAS_muluh_i64 0
|
#define TCG_TARGET_HAS_muluh_i64 0
|
||||||
#define TCG_TARGET_HAS_mulsh_i64 0
|
#define TCG_TARGET_HAS_mulsh_i64 0
|
||||||
|
#else
|
||||||
|
#define TCG_TARGET_HAS_mulu2_i32 1
|
||||||
#endif /* TCG_TARGET_REG_BITS == 64 */
|
#endif /* TCG_TARGET_REG_BITS == 64 */
|
||||||
|
|
||||||
#define TCG_TARGET_HAS_new_ldst 0
|
#define TCG_TARGET_HAS_new_ldst 0
|
||||||
|
|
Loading…
Reference in New Issue