mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcg: Always define all of the TCGOpcode enum members.

Browse Source 
By always defining these symbols, we can eliminate a lot of ifdefs.

To allow this to be checked reliably, the semantics of the
TCG_TARGET_HAS_* macros must be changed from def/undef to true/false.
This allows even more ifdefs to be removed, converting them into
C if statements.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Richard Henderson 2011-08-17 14:11:46 -07:00 committed by Blue Swirl
parent 8399ad59e7
commit 25c4d9cc84
14 changed files with 832 additions and 1003 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tcg/arm/tcg-target.h
View File

@ -58,20 +58,22 @@ enum {
#define TCG_TARGET_CALL_STACK_OFFSET 0 #define TCG_TARGET_CALL_STACK_OFFSET 0
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_div_i32 0
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#undef TCG_TARGET_HAS_ext8u_i32 /* and r0, r1, #0xff */ #define TCG_TARGET_HAS_ext16s_i32 1
#define TCG_TARGET_HAS_ext16u_i32 #define TCG_TARGET_HAS_ext8u_i32 0 /* and r0, r1, #0xff */
#define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_ext16u_i32 1
#define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap16_i32 1
#define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_bswap32_i32 1
#define TCG_TARGET_HAS_neg_i32 #define TCG_TARGET_HAS_not_i32 1
#define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_neg_i32 1
#define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_rot_i32 1
// #define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_andc_i32 1
// #define TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_orc_i32 0
// #define TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_eqv_i32 0
// #define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nand_i32 0
#define TCG_TARGET_HAS_nor_i32 0
#define TCG_TARGET_HAS_deposit_i32 0
#define TCG_TARGET_HAS_GUEST_BASE #define TCG_TARGET_HAS_GUEST_BASE

29
tcg/hppa/tcg-target.h
View File

@ -85,21 +85,24 @@ enum {
#define TCG_TARGET_STACK_GROWSUP #define TCG_TARGET_STACK_GROWSUP
/* optional instructions */ /* optional instructions */
// #define TCG_TARGET_HAS_div_i32 #define TCG_TARGET_HAS_div_i32 0
#define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i32 1
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 1
#define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_bswap16_i32 1
#define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap32_i32 1
#define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_not_i32 1
#define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_andc_i32 1
// #define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_orc_i32 0
#define TCG_TARGET_HAS_deposit_i32 #define TCG_TARGET_HAS_eqv_i32 0
#define TCG_TARGET_HAS_nand_i32 0
#define TCG_TARGET_HAS_nor_i32 0
#define TCG_TARGET_HAS_deposit_i32 1
/* optional instructions automatically implemented */ /* optional instructions automatically implemented */
#undef TCG_TARGET_HAS_neg_i32 /* sub rd, 0, rs */ #define TCG_TARGET_HAS_neg_i32 0 /* sub rd, 0, rs */
#undef TCG_TARGET_HAS_ext8u_i32 /* and rd, rs, 0xff */ #define TCG_TARGET_HAS_ext8u_i32 0 /* and rd, rs, 0xff */
#undef TCG_TARGET_HAS_ext16u_i32 /* and rd, rs, 0xffff */ #define TCG_TARGET_HAS_ext16u_i32 0 /* and rd, rs, 0xffff */
#define TCG_TARGET_HAS_GUEST_BASE #define TCG_TARGET_HAS_GUEST_BASE

68
tcg/i386/tcg-target.h
View File

@ -75,41 +75,43 @@ enum {
#define TCG_TARGET_CALL_STACK_OFFSET 0 #define TCG_TARGET_CALL_STACK_OFFSET 0
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_div2_i32 #define TCG_TARGET_HAS_div2_i32 1
#define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i32 1
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 1
#define TCG_TARGET_HAS_ext8u_i32 #define TCG_TARGET_HAS_ext8u_i32 1
#define TCG_TARGET_HAS_ext16u_i32 #define TCG_TARGET_HAS_ext16u_i32 1
#define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_bswap16_i32 1
#define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap32_i32 1
#define TCG_TARGET_HAS_neg_i32 #define TCG_TARGET_HAS_neg_i32 1
#define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_not_i32 1
// #define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_andc_i32 0
// #define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_orc_i32 0
// #define TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_eqv_i32 0
// #define TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_nand_i32 0
// #define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nor_i32 0
#define TCG_TARGET_HAS_deposit_i32 0
#if TCG_TARGET_REG_BITS == 64 #if TCG_TARGET_REG_BITS == 64
#define TCG_TARGET_HAS_div2_i64 #define TCG_TARGET_HAS_div2_i64 1
#define TCG_TARGET_HAS_rot_i64 #define TCG_TARGET_HAS_rot_i64 1
#define TCG_TARGET_HAS_ext8s_i64 #define TCG_TARGET_HAS_ext8s_i64 1
#define TCG_TARGET_HAS_ext16s_i64 #define TCG_TARGET_HAS_ext16s_i64 1
#define TCG_TARGET_HAS_ext32s_i64 #define TCG_TARGET_HAS_ext32s_i64 1
#define TCG_TARGET_HAS_ext8u_i64 #define TCG_TARGET_HAS_ext8u_i64 1
#define TCG_TARGET_HAS_ext16u_i64 #define TCG_TARGET_HAS_ext16u_i64 1
#define TCG_TARGET_HAS_ext32u_i64 #define TCG_TARGET_HAS_ext32u_i64 1
#define TCG_TARGET_HAS_bswap16_i64 #define TCG_TARGET_HAS_bswap16_i64 1
#define TCG_TARGET_HAS_bswap32_i64 #define TCG_TARGET_HAS_bswap32_i64 1
#define TCG_TARGET_HAS_bswap64_i64 #define TCG_TARGET_HAS_bswap64_i64 1
#define TCG_TARGET_HAS_neg_i64 #define TCG_TARGET_HAS_neg_i64 1
#define TCG_TARGET_HAS_not_i64 #define TCG_TARGET_HAS_not_i64 1
// #define TCG_TARGET_HAS_andc_i64 #define TCG_TARGET_HAS_andc_i64 0
// #define TCG_TARGET_HAS_orc_i64 #define TCG_TARGET_HAS_orc_i64 0
// #define TCG_TARGET_HAS_eqv_i64 #define TCG_TARGET_HAS_eqv_i64 0
// #define TCG_TARGET_HAS_nand_i64 #define TCG_TARGET_HAS_nand_i64 0
// #define TCG_TARGET_HAS_nor_i64 #define TCG_TARGET_HAS_nor_i64 0
#define TCG_TARGET_HAS_deposit_i64 0
#endif #endif
#define TCG_TARGET_HAS_GUEST_BASE #define TCG_TARGET_HAS_GUEST_BASE

66
tcg/ia64/tcg-target.h
View File

@ -104,39 +104,43 @@ enum {
#define TCG_TARGET_CALL_STACK_OFFSET 16 #define TCG_TARGET_CALL_STACK_OFFSET 16
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_div_i32 0
#define TCG_TARGET_HAS_andc_i64 #define TCG_TARGET_HAS_div_i64 0
#define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_andc_i32 1
#define TCG_TARGET_HAS_bswap16_i64 #define TCG_TARGET_HAS_andc_i64 1
#define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap16_i32 1
#define TCG_TARGET_HAS_bswap32_i64 #define TCG_TARGET_HAS_bswap16_i64 1
#define TCG_TARGET_HAS_bswap64_i64 #define TCG_TARGET_HAS_bswap32_i32 1
#define TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_bswap32_i64 1
#define TCG_TARGET_HAS_eqv_i64 #define TCG_TARGET_HAS_bswap64_i64 1
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_eqv_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_eqv_i64 1
#define TCG_TARGET_HAS_ext8s_i64 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i64 #define TCG_TARGET_HAS_ext16s_i32 1
#define TCG_TARGET_HAS_ext32s_i64 #define TCG_TARGET_HAS_ext8s_i64 1
#define TCG_TARGET_HAS_ext8u_i32 #define TCG_TARGET_HAS_ext16s_i64 1
#define TCG_TARGET_HAS_ext16u_i32 #define TCG_TARGET_HAS_ext32s_i64 1
#define TCG_TARGET_HAS_ext8u_i64 #define TCG_TARGET_HAS_ext8u_i32 1
#define TCG_TARGET_HAS_ext16u_i64 #define TCG_TARGET_HAS_ext16u_i32 1
#define TCG_TARGET_HAS_ext32u_i64 #define TCG_TARGET_HAS_ext8u_i64 1
#define TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_ext16u_i64 1
#define TCG_TARGET_HAS_nand_i64 #define TCG_TARGET_HAS_ext32u_i64 1
#define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nand_i32 1
#define TCG_TARGET_HAS_nor_i64 #define TCG_TARGET_HAS_nand_i64 1
#define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_nor_i32 1
#define TCG_TARGET_HAS_orc_i64 #define TCG_TARGET_HAS_nor_i64 1
#define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_orc_i32 1
#define TCG_TARGET_HAS_rot_i64 #define TCG_TARGET_HAS_orc_i64 1
#define TCG_TARGET_HAS_rot_i32 1
#define TCG_TARGET_HAS_rot_i64 1
#define TCG_TARGET_HAS_deposit_i32 0
#define TCG_TARGET_HAS_deposit_i64 0
/* optional instructions automatically implemented */ /* optional instructions automatically implemented */
#undef TCG_TARGET_HAS_neg_i32 /* sub r1, r0, r3 */ #define TCG_TARGET_HAS_neg_i32 0 /* sub r1, r0, r3 */
#undef TCG_TARGET_HAS_neg_i64 /* sub r1, r0, r3 */ #define TCG_TARGET_HAS_neg_i64 0 /* sub r1, r0, r3 */
#undef TCG_TARGET_HAS_not_i32 /* xor r1, -1, r3 */ #define TCG_TARGET_HAS_not_i32 0 /* xor r1, -1, r3 */
#undef TCG_TARGET_HAS_not_i64 /* xor r1, -1, r3 */ #define TCG_TARGET_HAS_not_i64 0 /* xor r1, -1, r3 */
/* Note: must be synced with dyngen-exec.h */ /* Note: must be synced with dyngen-exec.h */
#define TCG_AREG0 TCG_REG_R7 #define TCG_AREG0 TCG_REG_R7

31
tcg/mips/tcg-target.h
View File

@ -78,23 +78,24 @@ enum {
#define TCG_TARGET_CALL_ALIGN_ARGS 1 #define TCG_TARGET_CALL_ALIGN_ARGS 1
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_div_i32 #define TCG_TARGET_HAS_div_i32 1
#define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_not_i32 1
#define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nor_i32 1
#undef TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i32 0
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 1
#undef TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap32_i32 0
#undef TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_bswap16_i32 0
#undef TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_andc_i32 0
#undef TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_orc_i32 0
#undef TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_eqv_i32 0
#undef TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_nand_i32 0
#define TCG_TARGET_HAS_deposit_i32 0
/* optional instructions automatically implemented */ /* optional instructions automatically implemented */
#undef TCG_TARGET_HAS_neg_i32 /* sub rd, zero, rt */ #define TCG_TARGET_HAS_neg_i32 0 /* sub rd, zero, rt */
#undef TCG_TARGET_HAS_ext8u_i32 /* andi rt, rs, 0xff */ #define TCG_TARGET_HAS_ext8u_i32 0 /* andi rt, rs, 0xff */
#undef TCG_TARGET_HAS_ext16u_i32 /* andi rt, rs, 0xffff */ #define TCG_TARGET_HAS_ext16u_i32 0 /* andi rt, rs, 0xffff */
/* Note: must be synced with dyngen-exec.h */ /* Note: must be synced with dyngen-exec.h */
#define TCG_AREG0 TCG_REG_S0 #define TCG_AREG0 TCG_REG_S0

146
tcg/optimize.c
View File

@ -31,14 +31,9 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "tcg-op.h" #include "tcg-op.h"
#if TCG_TARGET_REG_BITS == 64
#define CASE_OP_32_64(x) \ #define CASE_OP_32_64(x) \
glue(glue(case INDEX_op_, x), _i32): \ glue(glue(case INDEX_op_, x), _i32): \
glue(glue(case INDEX_op_, x), _i64) glue(glue(case INDEX_op_, x), _i64)
#else
#define CASE_OP_32_64(x) \
glue(glue(case INDEX_op_, x), _i32)
#endif
typedef enum { typedef enum {
TCG_TEMP_UNDEF = 0, TCG_TEMP_UNDEF = 0,
@ -103,10 +98,8 @@ static int op_to_movi(int op)
switch (op_bits(op)) { switch (op_bits(op)) {
case 32: case 32:
return INDEX_op_movi_i32; return INDEX_op_movi_i32;
#if TCG_TARGET_REG_BITS == 64
case 64: case 64:
return INDEX_op_movi_i64; return INDEX_op_movi_i64;
#endif
default: default:
fprintf(stderr, "op_to_movi: unexpected return value of " fprintf(stderr, "op_to_movi: unexpected return value of "
"function op_bits.\n"); "function op_bits.\n");
@ -155,10 +148,8 @@ static int op_to_mov(int op)
switch (op_bits(op)) { switch (op_bits(op)) {
case 32: case 32:
return INDEX_op_mov_i32; return INDEX_op_mov_i32;
#if TCG_TARGET_REG_BITS == 64
case 64: case 64:
return INDEX_op_mov_i64; return INDEX_op_mov_i64;
#endif
default: default:
fprintf(stderr, "op_to_mov: unexpected return value of " fprintf(stderr, "op_to_mov: unexpected return value of "
"function op_bits.\n"); "function op_bits.\n");
@ -190,124 +181,57 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y)
case INDEX_op_shl_i32: case INDEX_op_shl_i32:
return (uint32_t)x << (uint32_t)y; return (uint32_t)x << (uint32_t)y;
#if TCG_TARGET_REG_BITS == 64
case INDEX_op_shl_i64: case INDEX_op_shl_i64:
return (uint64_t)x << (uint64_t)y; return (uint64_t)x << (uint64_t)y;
#endif
case INDEX_op_shr_i32: case INDEX_op_shr_i32:
return (uint32_t)x >> (uint32_t)y; return (uint32_t)x >> (uint32_t)y;
#if TCG_TARGET_REG_BITS == 64
case INDEX_op_shr_i64: case INDEX_op_shr_i64:
return (uint64_t)x >> (uint64_t)y; return (uint64_t)x >> (uint64_t)y;
#endif
case INDEX_op_sar_i32: case INDEX_op_sar_i32:
return (int32_t)x >> (int32_t)y; return (int32_t)x >> (int32_t)y;
#if TCG_TARGET_REG_BITS == 64
case INDEX_op_sar_i64: case INDEX_op_sar_i64:
return (int64_t)x >> (int64_t)y; return (int64_t)x >> (int64_t)y;
#endif
#ifdef TCG_TARGET_HAS_rot_i32
case INDEX_op_rotr_i32: case INDEX_op_rotr_i32:
#if TCG_TARGET_REG_BITS == 64 x = ((uint32_t)x << (32 - y)) | ((uint32_t)x >> y);
x &= 0xffffffff;
y &= 0xffffffff;
#endif
x = (x << (32 - y)) | (x >> y);
return x; return x;
#endif
#ifdef TCG_TARGET_HAS_rot_i64
#if TCG_TARGET_REG_BITS == 64
case INDEX_op_rotr_i64: case INDEX_op_rotr_i64:
x = (x << (64 - y)) | (x >> y); x = ((uint64_t)x << (64 - y)) | ((uint64_t)x >> y);
return x; return x;
#endif
#endif
#ifdef TCG_TARGET_HAS_rot_i32
case INDEX_op_rotl_i32: case INDEX_op_rotl_i32:
#if TCG_TARGET_REG_BITS == 64 x = ((uint32_t)x << y) | ((uint32_t)x >> (32 - y));
x &= 0xffffffff;
y &= 0xffffffff;
#endif
x = (x << y) | (x >> (32 - y));
return x; return x;
#endif
#ifdef TCG_TARGET_HAS_rot_i64
#if TCG_TARGET_REG_BITS == 64
case INDEX_op_rotl_i64: case INDEX_op_rotl_i64:
x = (x << y) | (x >> (64 - y)); x = ((uint64_t)x << y) | ((uint64_t)x >> (64 - y));
return x; return x;
#endif
#endif
#if defined(TCG_TARGET_HAS_not_i32) || defined(TCG_TARGET_HAS_not_i64) CASE_OP_32_64(not):
#ifdef TCG_TARGET_HAS_not_i32
case INDEX_op_not_i32:
#endif
#ifdef TCG_TARGET_HAS_not_i64
case INDEX_op_not_i64:
#endif
return ~x; return ~x;
#endif
#if defined(TCG_TARGET_HAS_ext8s_i32) || defined(TCG_TARGET_HAS_ext8s_i64) CASE_OP_32_64(ext8s):
#ifdef TCG_TARGET_HAS_ext8s_i32
case INDEX_op_ext8s_i32:
#endif
#ifdef TCG_TARGET_HAS_ext8s_i64
case INDEX_op_ext8s_i64:
#endif
return (int8_t)x; return (int8_t)x;
#endif
#if defined(TCG_TARGET_HAS_ext16s_i32) || defined(TCG_TARGET_HAS_ext16s_i64) CASE_OP_32_64(ext16s):
#ifdef TCG_TARGET_HAS_ext16s_i32
case INDEX_op_ext16s_i32:
#endif
#ifdef TCG_TARGET_HAS_ext16s_i64
case INDEX_op_ext16s_i64:
#endif
return (int16_t)x; return (int16_t)x;
#endif
#if defined(TCG_TARGET_HAS_ext8u_i32) || defined(TCG_TARGET_HAS_ext8u_i64) CASE_OP_32_64(ext8u):
#ifdef TCG_TARGET_HAS_ext8u_i32
case INDEX_op_ext8u_i32:
#endif
#ifdef TCG_TARGET_HAS_ext8u_i64
case INDEX_op_ext8u_i64:
#endif
return (uint8_t)x; return (uint8_t)x;
#endif
#if defined(TCG_TARGET_HAS_ext16u_i32) || defined(TCG_TARGET_HAS_ext16u_i64) CASE_OP_32_64(ext16u):
#ifdef TCG_TARGET_HAS_ext16u_i32
case INDEX_op_ext16u_i32:
#endif
#ifdef TCG_TARGET_HAS_ext16u_i64
case INDEX_op_ext16u_i64:
#endif
return (uint16_t)x; return (uint16_t)x;
#endif
#if TCG_TARGET_REG_BITS == 64
#ifdef TCG_TARGET_HAS_ext32s_i64
case INDEX_op_ext32s_i64: case INDEX_op_ext32s_i64:
return (int32_t)x; return (int32_t)x;
#endif
#ifdef TCG_TARGET_HAS_ext32u_i64
case INDEX_op_ext32u_i64: case INDEX_op_ext32u_i64:
return (uint32_t)x; return (uint32_t)x;
#endif
#endif
default: default:
fprintf(stderr, fprintf(stderr,
@ -319,11 +243,9 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y)
static TCGArg do_constant_folding(int op, TCGArg x, TCGArg y) static TCGArg do_constant_folding(int op, TCGArg x, TCGArg y)
{ {
TCGArg res = do_constant_folding_2(op, x, y); TCGArg res = do_constant_folding_2(op, x, y);
#if TCG_TARGET_REG_BITS == 64
if (op_bits(op) == 32) { if (op_bits(op) == 32) {
res &= 0xffffffff; res &= 0xffffffff;
} }
#endif
return res; return res;
} }
@ -385,14 +307,8 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
CASE_OP_32_64(shl): CASE_OP_32_64(shl):
CASE_OP_32_64(shr): CASE_OP_32_64(shr):
CASE_OP_32_64(sar): CASE_OP_32_64(sar):
#ifdef TCG_TARGET_HAS_rot_i32 CASE_OP_32_64(rotl):
case INDEX_op_rotl_i32: CASE_OP_32_64(rotr):
case INDEX_op_rotr_i32:
#endif
#ifdef TCG_TARGET_HAS_rot_i64
case INDEX_op_rotl_i64:
case INDEX_op_rotr_i64:
#endif
if (temps[args[1]].state == TCG_TEMP_CONST) { if (temps[args[1]].state == TCG_TEMP_CONST) {
/* Proceed with possible constant folding. */ /* Proceed with possible constant folding. */
break; break;
@ -473,34 +389,12 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
args += 2; args += 2;
break; break;
CASE_OP_32_64(not): CASE_OP_32_64(not):
#ifdef TCG_TARGET_HAS_ext8s_i32 CASE_OP_32_64(ext8s):
case INDEX_op_ext8s_i32: CASE_OP_32_64(ext8u):
#endif CASE_OP_32_64(ext16s):
#ifdef TCG_TARGET_HAS_ext8s_i64 CASE_OP_32_64(ext16u):
case INDEX_op_ext8s_i64:
#endif
#ifdef TCG_TARGET_HAS_ext16s_i32
case INDEX_op_ext16s_i32:
#endif
#ifdef TCG_TARGET_HAS_ext16s_i64
case INDEX_op_ext16s_i64:
#endif
#ifdef TCG_TARGET_HAS_ext8u_i32
case INDEX_op_ext8u_i32:
#endif
#ifdef TCG_TARGET_HAS_ext8u_i64
case INDEX_op_ext8u_i64:
#endif
#ifdef TCG_TARGET_HAS_ext16u_i32
case INDEX_op_ext16u_i32:
#endif
#ifdef TCG_TARGET_HAS_ext16u_i64
case INDEX_op_ext16u_i64:
#endif
#if TCG_TARGET_REG_BITS == 64
case INDEX_op_ext32s_i64: case INDEX_op_ext32s_i64:
case INDEX_op_ext32u_i64: case INDEX_op_ext32u_i64:
#endif
if (temps[args[1]].state == TCG_TEMP_CONST) { if (temps[args[1]].state == TCG_TEMP_CONST) {
gen_opc_buf[op_index] = op_to_movi(op); gen_opc_buf[op_index] = op_to_movi(op);
tmp = do_constant_folding(op, temps[args[1]].val, 0); tmp = do_constant_folding(op, temps[args[1]].val, 0);
@ -525,14 +419,8 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
CASE_OP_32_64(shl): CASE_OP_32_64(shl):
CASE_OP_32_64(shr): CASE_OP_32_64(shr):
CASE_OP_32_64(sar): CASE_OP_32_64(sar):
#ifdef TCG_TARGET_HAS_rot_i32 CASE_OP_32_64(rotl):
case INDEX_op_rotl_i32: CASE_OP_32_64(rotr):
case INDEX_op_rotr_i32:
#endif
#ifdef TCG_TARGET_HAS_rot_i64
case INDEX_op_rotl_i64:
case INDEX_op_rotr_i64:
#endif
if (temps[args[1]].state == TCG_TEMP_CONST if (temps[args[1]].state == TCG_TEMP_CONST
&& temps[args[2]].state == TCG_TEMP_CONST) { && temps[args[2]].state == TCG_TEMP_CONST) {
gen_opc_buf[op_index] = op_to_movi(op); gen_opc_buf[op_index] = op_to_movi(op);

31
tcg/ppc/tcg-target.h
View File

@ -77,21 +77,22 @@ enum {
#endif #endif
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_div_i32 #define TCG_TARGET_HAS_div_i32 1
#define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i32 1
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 1
#define TCG_TARGET_HAS_ext8u_i32 #define TCG_TARGET_HAS_ext8u_i32 1
#define TCG_TARGET_HAS_ext16u_i32 #define TCG_TARGET_HAS_ext16u_i32 1
#define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_bswap16_i32 1
#define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap32_i32 1
#define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_not_i32 1
#define TCG_TARGET_HAS_neg_i32 #define TCG_TARGET_HAS_neg_i32 1
#define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_andc_i32 1
#define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_orc_i32 1
#define TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_eqv_i32 1
#define TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_nand_i32 1
#define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nor_i32 1
#define TCG_TARGET_HAS_deposit_i32 0
#define TCG_AREG0 TCG_REG_R27 #define TCG_AREG0 TCG_REG_R27

68
tcg/ppc64/tcg-target.h
View File

@ -68,40 +68,42 @@ enum {
#define TCG_TARGET_CALL_STACK_OFFSET 48 #define TCG_TARGET_CALL_STACK_OFFSET 48
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_div_i32 #define TCG_TARGET_HAS_div_i32 1
/* #define TCG_TARGET_HAS_rot_i32 */ #define TCG_TARGET_HAS_rot_i32 0
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 1
/* #define TCG_TARGET_HAS_ext8u_i32 */ #define TCG_TARGET_HAS_ext8u_i32 0
/* #define TCG_TARGET_HAS_ext16u_i32 */ #define TCG_TARGET_HAS_ext16u_i32 0
/* #define TCG_TARGET_HAS_bswap16_i32 */ #define TCG_TARGET_HAS_bswap16_i32 0
/* #define TCG_TARGET_HAS_bswap32_i32 */ #define TCG_TARGET_HAS_bswap32_i32 0
/* #define TCG_TARGET_HAS_not_i32 */ #define TCG_TARGET_HAS_not_i32 0
#define TCG_TARGET_HAS_neg_i32 #define TCG_TARGET_HAS_neg_i32 1
/* #define TCG_TARGET_HAS_andc_i32 */ #define TCG_TARGET_HAS_andc_i32 0
/* #define TCG_TARGET_HAS_orc_i32 */ #define TCG_TARGET_HAS_orc_i32 0
/* #define TCG_TARGET_HAS_eqv_i32 */ #define TCG_TARGET_HAS_eqv_i32 0
/* #define TCG_TARGET_HAS_nand_i32 */ #define TCG_TARGET_HAS_nand_i32 0
/* #define TCG_TARGET_HAS_nor_i32 */ #define TCG_TARGET_HAS_nor_i32 0
#define TCG_TARGET_HAS_deposit_i32 0
#define TCG_TARGET_HAS_div_i64 #define TCG_TARGET_HAS_div_i64 1
/* #define TCG_TARGET_HAS_rot_i64 */ #define TCG_TARGET_HAS_rot_i64 0
#define TCG_TARGET_HAS_ext8s_i64 #define TCG_TARGET_HAS_ext8s_i64 1
#define TCG_TARGET_HAS_ext16s_i64 #define TCG_TARGET_HAS_ext16s_i64 1
#define TCG_TARGET_HAS_ext32s_i64 #define TCG_TARGET_HAS_ext32s_i64 1
/* #define TCG_TARGET_HAS_ext8u_i64 */ #define TCG_TARGET_HAS_ext8u_i64 0
/* #define TCG_TARGET_HAS_ext16u_i64 */ #define TCG_TARGET_HAS_ext16u_i64 0
/* #define TCG_TARGET_HAS_ext32u_i64 */ #define TCG_TARGET_HAS_ext32u_i64 0
/* #define TCG_TARGET_HAS_bswap16_i64 */ #define TCG_TARGET_HAS_bswap16_i64 0
/* #define TCG_TARGET_HAS_bswap32_i64 */ #define TCG_TARGET_HAS_bswap32_i64 0
/* #define TCG_TARGET_HAS_bswap64_i64 */ #define TCG_TARGET_HAS_bswap64_i64 0
/* #define TCG_TARGET_HAS_not_i64 */ #define TCG_TARGET_HAS_not_i64 0
#define TCG_TARGET_HAS_neg_i64 #define TCG_TARGET_HAS_neg_i64 1
/* #define TCG_TARGET_HAS_andc_i64 */ #define TCG_TARGET_HAS_andc_i64 0
/* #define TCG_TARGET_HAS_orc_i64 */ #define TCG_TARGET_HAS_orc_i64 0
/* #define TCG_TARGET_HAS_eqv_i64 */ #define TCG_TARGET_HAS_eqv_i64 0
/* #define TCG_TARGET_HAS_nand_i64 */ #define TCG_TARGET_HAS_nand_i64 0
/* #define TCG_TARGET_HAS_nor_i64 */ #define TCG_TARGET_HAS_nor_i64 0
#define TCG_TARGET_HAS_deposit_i64 0
#define TCG_AREG0 TCG_REG_R27 #define TCG_AREG0 TCG_REG_R27

68
tcg/s390/tcg-target.h
View File

@ -53,41 +53,43 @@ typedef enum TCGReg {
#define TCG_TARGET_NB_REGS 16 #define TCG_TARGET_NB_REGS 16
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_div2_i32 #define TCG_TARGET_HAS_div2_i32 1
#define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i32 1
#define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 1
#define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 1
#define TCG_TARGET_HAS_ext8u_i32 #define TCG_TARGET_HAS_ext8u_i32 1
#define TCG_TARGET_HAS_ext16u_i32 #define TCG_TARGET_HAS_ext16u_i32 1
#define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_bswap16_i32 1
#define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap32_i32 1
// #define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_not_i32 0
#define TCG_TARGET_HAS_neg_i32 #define TCG_TARGET_HAS_neg_i32 1
// #define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_andc_i32 0
// #define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_orc_i32 0
// #define TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_eqv_i32 0
// #define TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_nand_i32 0
// #define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nor_i32 0
#define TCG_TARGET_HAS_deposit_i32 0
#if TCG_TARGET_REG_BITS == 64 #if TCG_TARGET_REG_BITS == 64
#define TCG_TARGET_HAS_div2_i64 #define TCG_TARGET_HAS_div2_i64 1
#define TCG_TARGET_HAS_rot_i64 #define TCG_TARGET_HAS_rot_i64 1
#define TCG_TARGET_HAS_ext8s_i64 #define TCG_TARGET_HAS_ext8s_i64 1
#define TCG_TARGET_HAS_ext16s_i64 #define TCG_TARGET_HAS_ext16s_i64 1
#define TCG_TARGET_HAS_ext32s_i64 #define TCG_TARGET_HAS_ext32s_i64 1
#define TCG_TARGET_HAS_ext8u_i64 #define TCG_TARGET_HAS_ext8u_i64 1
#define TCG_TARGET_HAS_ext16u_i64 #define TCG_TARGET_HAS_ext16u_i64 1
#define TCG_TARGET_HAS_ext32u_i64 #define TCG_TARGET_HAS_ext32u_i64 1
#define TCG_TARGET_HAS_bswap16_i64 #define TCG_TARGET_HAS_bswap16_i64 1
#define TCG_TARGET_HAS_bswap32_i64 #define TCG_TARGET_HAS_bswap32_i64 1
#define TCG_TARGET_HAS_bswap64_i64 #define TCG_TARGET_HAS_bswap64_i64 1
// #define TCG_TARGET_HAS_not_i64 #define TCG_TARGET_HAS_not_i64 0
#define TCG_TARGET_HAS_neg_i64 #define TCG_TARGET_HAS_neg_i64 1
// #define TCG_TARGET_HAS_andc_i64 #define TCG_TARGET_HAS_andc_i64 0
// #define TCG_TARGET_HAS_orc_i64 #define TCG_TARGET_HAS_orc_i64 0
// #define TCG_TARGET_HAS_eqv_i64 #define TCG_TARGET_HAS_eqv_i64 0
// #define TCG_TARGET_HAS_nand_i64 #define TCG_TARGET_HAS_nand_i64 0
// #define TCG_TARGET_HAS_nor_i64 #define TCG_TARGET_HAS_nor_i64 0
#define TCG_TARGET_HAS_deposit_i64 0
#endif #endif
#define TCG_TARGET_HAS_GUEST_BASE #define TCG_TARGET_HAS_GUEST_BASE

68
tcg/sparc/tcg-target.h
View File

@ -92,41 +92,43 @@ enum {
#endif #endif
/* optional instructions */ /* optional instructions */
#define TCG_TARGET_HAS_div_i32 #define TCG_TARGET_HAS_div_i32 1
// #define TCG_TARGET_HAS_rot_i32 #define TCG_TARGET_HAS_rot_i32 0
// #define TCG_TARGET_HAS_ext8s_i32 #define TCG_TARGET_HAS_ext8s_i32 0
// #define TCG_TARGET_HAS_ext16s_i32 #define TCG_TARGET_HAS_ext16s_i32 0
// #define TCG_TARGET_HAS_ext8u_i32 #define TCG_TARGET_HAS_ext8u_i32 0
// #define TCG_TARGET_HAS_ext16u_i32 #define TCG_TARGET_HAS_ext16u_i32 0
// #define TCG_TARGET_HAS_bswap16_i32 #define TCG_TARGET_HAS_bswap16_i32 0
// #define TCG_TARGET_HAS_bswap32_i32 #define TCG_TARGET_HAS_bswap32_i32 0
#define TCG_TARGET_HAS_neg_i32 #define TCG_TARGET_HAS_neg_i32 1
#define TCG_TARGET_HAS_not_i32 #define TCG_TARGET_HAS_not_i32 1
#define TCG_TARGET_HAS_andc_i32 #define TCG_TARGET_HAS_andc_i32 1
#define TCG_TARGET_HAS_orc_i32 #define TCG_TARGET_HAS_orc_i32 1
// #define TCG_TARGET_HAS_eqv_i32 #define TCG_TARGET_HAS_eqv_i32 0
// #define TCG_TARGET_HAS_nand_i32 #define TCG_TARGET_HAS_nand_i32 0
// #define TCG_TARGET_HAS_nor_i32 #define TCG_TARGET_HAS_nor_i32 0
#define TCG_TARGET_HAS_deposit_i32 0
#if TCG_TARGET_REG_BITS == 64 #if TCG_TARGET_REG_BITS == 64
#define TCG_TARGET_HAS_div_i64 #define TCG_TARGET_HAS_div_i64 1
// #define TCG_TARGET_HAS_rot_i64 #define TCG_TARGET_HAS_rot_i64 0
// #define TCG_TARGET_HAS_ext8s_i64 #define TCG_TARGET_HAS_ext8s_i64 0
// #define TCG_TARGET_HAS_ext16s_i64 #define TCG_TARGET_HAS_ext16s_i64 0
#define TCG_TARGET_HAS_ext32s_i64 #define TCG_TARGET_HAS_ext32s_i64 1
// #define TCG_TARGET_HAS_ext8u_i64 #define TCG_TARGET_HAS_ext8u_i64 0
// #define TCG_TARGET_HAS_ext16u_i64 #define TCG_TARGET_HAS_ext16u_i64 0
#define TCG_TARGET_HAS_ext32u_i64 #define TCG_TARGET_HAS_ext32u_i64 1
// #define TCG_TARGET_HAS_bswap16_i64 #define TCG_TARGET_HAS_bswap16_i64 0
// #define TCG_TARGET_HAS_bswap32_i64 #define TCG_TARGET_HAS_bswap32_i64 0
// #define TCG_TARGET_HAS_bswap64_i64 #define TCG_TARGET_HAS_bswap64_i64 0
#define TCG_TARGET_HAS_neg_i64 #define TCG_TARGET_HAS_neg_i64 1
#define TCG_TARGET_HAS_not_i64 #define TCG_TARGET_HAS_not_i64 1
#define TCG_TARGET_HAS_andc_i64 #define TCG_TARGET_HAS_andc_i64 1
#define TCG_TARGET_HAS_orc_i64 #define TCG_TARGET_HAS_orc_i64 1
// #define TCG_TARGET_HAS_eqv_i64 #define TCG_TARGET_HAS_eqv_i64 0
// #define TCG_TARGET_HAS_nand_i64 #define TCG_TARGET_HAS_nand_i64 0
// #define TCG_TARGET_HAS_nor_i64 #define TCG_TARGET_HAS_nor_i64 0
#define TCG_TARGET_HAS_deposit_i64 0
#endif #endif
/* Note: must be synced with dyngen-exec.h */ /* Note: must be synced with dyngen-exec.h */

946
tcg/tcg-op.h
View File

File diff suppressed because it is too large Load Diff

242
tcg/tcg-opc.h
View File

@ -41,6 +41,13 @@ DEF(call, 0, 1, 2, TCG_OPF_SIDE_EFFECTS) /* variable number of parameters */
DEF(jmp, 0, 1, 0, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS) DEF(jmp, 0, 1, 0, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS)
DEF(br, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS) DEF(br, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS)
#define IMPL(X) (X ? 0 : TCG_OPF_NOT_PRESENT)
#if TCG_TARGET_REG_BITS == 32
# define IMPL64 TCG_OPF_64BIT | TCG_OPF_NOT_PRESENT
#else
# define IMPL64 TCG_OPF_64BIT
#endif
DEF(mov_i32, 1, 1, 0, 0) DEF(mov_i32, 1, 1, 0, 0)
DEF(movi_i32, 1, 0, 1, 0) DEF(movi_i32, 1, 0, 1, 0)
DEF(setcond_i32, 1, 2, 1, 0) DEF(setcond_i32, 1, 2, 1, 0)
@ -57,16 +64,12 @@ DEF(st_i32, 0, 2, 1, TCG_OPF_SIDE_EFFECTS)
DEF(add_i32, 1, 2, 0, 0) DEF(add_i32, 1, 2, 0, 0)
DEF(sub_i32, 1, 2, 0, 0) DEF(sub_i32, 1, 2, 0, 0)
DEF(mul_i32, 1, 2, 0, 0) DEF(mul_i32, 1, 2, 0, 0)
#ifdef TCG_TARGET_HAS_div_i32 DEF(div_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_div_i32))
DEF(div_i32, 1, 2, 0, 0) DEF(divu_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_div_i32))
DEF(divu_i32, 1, 2, 0, 0) DEF(rem_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_div_i32))
DEF(rem_i32, 1, 2, 0, 0) DEF(remu_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_div_i32))
DEF(remu_i32, 1, 2, 0, 0) DEF(div2_i32, 2, 3, 0, IMPL(TCG_TARGET_HAS_div2_i32))
#endif DEF(divu2_i32, 2, 3, 0, IMPL(TCG_TARGET_HAS_div2_i32))
#ifdef TCG_TARGET_HAS_div2_i32
DEF(div2_i32, 2, 3, 0, 0)
DEF(divu2_i32, 2, 3, 0, 0)
#endif
DEF(and_i32, 1, 2, 0, 0) DEF(and_i32, 1, 2, 0, 0)
DEF(or_i32, 1, 2, 0, 0) DEF(or_i32, 1, 2, 0, 0)
DEF(xor_i32, 1, 2, 0, 0) DEF(xor_i32, 1, 2, 0, 0)
@ -74,157 +77,86 @@ DEF(xor_i32, 1, 2, 0, 0)
DEF(shl_i32, 1, 2, 0, 0) DEF(shl_i32, 1, 2, 0, 0)
DEF(shr_i32, 1, 2, 0, 0) DEF(shr_i32, 1, 2, 0, 0)
DEF(sar_i32, 1, 2, 0, 0) DEF(sar_i32, 1, 2, 0, 0)
#ifdef TCG_TARGET_HAS_rot_i32 DEF(rotl_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_rot_i32))
DEF(rotl_i32, 1, 2, 0, 0) DEF(rotr_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_rot_i32))
DEF(rotr_i32, 1, 2, 0, 0) DEF(deposit_i32, 1, 2, 2, IMPL(TCG_TARGET_HAS_deposit_i32))
#endif
#ifdef TCG_TARGET_HAS_deposit_i32
DEF(deposit_i32, 1, 2, 2, 0)
#endif
DEF(brcond_i32, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS) DEF(brcond_i32, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS)
#if TCG_TARGET_REG_BITS == 32
DEF(add2_i32, 2, 4, 0, 0)
DEF(sub2_i32, 2, 4, 0, 0)
DEF(brcond2_i32, 0, 4, 2, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS)
DEF(mulu2_i32, 2, 2, 0, 0)
DEF(setcond2_i32, 1, 4, 1, 0)
#endif
#ifdef TCG_TARGET_HAS_ext8s_i32
DEF(ext8s_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_ext16s_i32
DEF(ext16s_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_ext8u_i32
DEF(ext8u_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_ext16u_i32
DEF(ext16u_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_bswap16_i32
DEF(bswap16_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_bswap32_i32
DEF(bswap32_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_not_i32
DEF(not_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_neg_i32
DEF(neg_i32, 1, 1, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_andc_i32
DEF(andc_i32, 1, 2, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_orc_i32
DEF(orc_i32, 1, 2, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_eqv_i32
DEF(eqv_i32, 1, 2, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_nand_i32
DEF(nand_i32, 1, 2, 0, 0)
#endif
#ifdef TCG_TARGET_HAS_nor_i32
DEF(nor_i32, 1, 2, 0, 0)
#endif
#if TCG_TARGET_REG_BITS == 64 DEF(add2_i32, 2, 4, 0, IMPL(TCG_TARGET_REG_BITS == 32))
DEF(mov_i64, 1, 1, 0, TCG_OPF_64BIT) DEF(sub2_i32, 2, 4, 0, IMPL(TCG_TARGET_REG_BITS == 32))
DEF(movi_i64, 1, 0, 1, TCG_OPF_64BIT) DEF(brcond2_i32, 0, 4, 2,
DEF(setcond_i64, 1, 2, 1, TCG_OPF_64BIT) TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS | IMPL(TCG_TARGET_REG_BITS == 32))
DEF(mulu2_i32, 2, 2, 0, IMPL(TCG_TARGET_REG_BITS == 32))
DEF(setcond2_i32, 1, 4, 1, IMPL(TCG_TARGET_REG_BITS == 32))
DEF(ext8s_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext8s_i32))
DEF(ext16s_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext16s_i32))
DEF(ext8u_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext8u_i32))
DEF(ext16u_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_ext16u_i32))
DEF(bswap16_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_bswap16_i32))
DEF(bswap32_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_bswap32_i32))
DEF(not_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_not_i32))
DEF(neg_i32, 1, 1, 0, IMPL(TCG_TARGET_HAS_neg_i32))
DEF(andc_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_andc_i32))
DEF(orc_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_orc_i32))
DEF(eqv_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_eqv_i32))
DEF(nand_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_nand_i32))
DEF(nor_i32, 1, 2, 0, IMPL(TCG_TARGET_HAS_nor_i32))
DEF(mov_i64, 1, 1, 0, IMPL64)
DEF(movi_i64, 1, 0, 1, IMPL64)
DEF(setcond_i64, 1, 2, 1, IMPL64)
/* load/store */ /* load/store */
DEF(ld8u_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld8u_i64, 1, 1, 1, IMPL64)
DEF(ld8s_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld8s_i64, 1, 1, 1, IMPL64)
DEF(ld16u_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld16u_i64, 1, 1, 1, IMPL64)
DEF(ld16s_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld16s_i64, 1, 1, 1, IMPL64)
DEF(ld32u_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld32u_i64, 1, 1, 1, IMPL64)
DEF(ld32s_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld32s_i64, 1, 1, 1, IMPL64)
DEF(ld_i64, 1, 1, 1, TCG_OPF_64BIT) DEF(ld_i64, 1, 1, 1, IMPL64)
DEF(st8_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | TCG_OPF_64BIT) DEF(st8_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | IMPL64)
DEF(st16_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | TCG_OPF_64BIT) DEF(st16_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | IMPL64)
DEF(st32_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | TCG_OPF_64BIT) DEF(st32_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | IMPL64)
DEF(st_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | TCG_OPF_64BIT) DEF(st_i64, 0, 2, 1, TCG_OPF_SIDE_EFFECTS | IMPL64)
/* arith */ /* arith */
DEF(add_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(add_i64, 1, 2, 0, IMPL64)
DEF(sub_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(sub_i64, 1, 2, 0, IMPL64)
DEF(mul_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(mul_i64, 1, 2, 0, IMPL64)
#ifdef TCG_TARGET_HAS_div_i64 DEF(div_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_div_i64))
DEF(div_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(divu_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_div_i64))
DEF(divu_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(rem_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_div_i64))
DEF(rem_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(remu_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_div_i64))
DEF(remu_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(div2_i64, 2, 3, 0, IMPL64 | IMPL(TCG_TARGET_HAS_div2_i64))
#endif DEF(divu2_i64, 2, 3, 0, IMPL64 | IMPL(TCG_TARGET_HAS_div2_i64))
#ifdef TCG_TARGET_HAS_div2_i64 DEF(and_i64, 1, 2, 0, IMPL64)
DEF(div2_i64, 2, 3, 0, TCG_OPF_64BIT) DEF(or_i64, 1, 2, 0, IMPL64)
DEF(divu2_i64, 2, 3, 0, TCG_OPF_64BIT) DEF(xor_i64, 1, 2, 0, IMPL64)
#endif
DEF(and_i64, 1, 2, 0, TCG_OPF_64BIT)
DEF(or_i64, 1, 2, 0, TCG_OPF_64BIT)
DEF(xor_i64, 1, 2, 0, TCG_OPF_64BIT)
/* shifts/rotates */ /* shifts/rotates */
DEF(shl_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(shl_i64, 1, 2, 0, IMPL64)
DEF(shr_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(shr_i64, 1, 2, 0, IMPL64)
DEF(sar_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(sar_i64, 1, 2, 0, IMPL64)
#ifdef TCG_TARGET_HAS_rot_i64 DEF(rotl_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_rot_i64))
DEF(rotl_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(rotr_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_rot_i64))
DEF(rotr_i64, 1, 2, 0, TCG_OPF_64BIT) DEF(deposit_i64, 1, 2, 2, IMPL64 | IMPL(TCG_TARGET_HAS_deposit_i64))
#endif
#ifdef TCG_TARGET_HAS_deposit_i64
DEF(deposit_i64, 1, 2, 2, TCG_OPF_64BIT)
#endif
DEF(brcond_i64, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS | TCG_OPF_64BIT) DEF(brcond_i64, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_SIDE_EFFECTS | IMPL64)
#ifdef TCG_TARGET_HAS_ext8s_i64 DEF(ext8s_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext8s_i64))
DEF(ext8s_i64, 1, 1, 0, TCG_OPF_64BIT) DEF(ext16s_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext16s_i64))
#endif DEF(ext32s_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext32s_i64))
#ifdef TCG_TARGET_HAS_ext16s_i64 DEF(ext8u_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext8u_i64))
DEF(ext16s_i64, 1, 1, 0, TCG_OPF_64BIT) DEF(ext16u_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext16u_i64))
#endif DEF(ext32u_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_ext32u_i64))
#ifdef TCG_TARGET_HAS_ext32s_i64 DEF(bswap16_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_bswap16_i64))
DEF(ext32s_i64, 1, 1, 0, TCG_OPF_64BIT) DEF(bswap32_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_bswap32_i64))
#endif DEF(bswap64_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_bswap64_i64))
#ifdef TCG_TARGET_HAS_ext8u_i64 DEF(not_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_not_i64))
DEF(ext8u_i64, 1, 1, 0, TCG_OPF_64BIT) DEF(neg_i64, 1, 1, 0, IMPL64 | IMPL(TCG_TARGET_HAS_neg_i64))
#endif DEF(andc_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_andc_i64))
#ifdef TCG_TARGET_HAS_ext16u_i64 DEF(orc_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_orc_i64))
DEF(ext16u_i64, 1, 1, 0, TCG_OPF_64BIT) DEF(eqv_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_eqv_i64))
#endif DEF(nand_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_nand_i64))
#ifdef TCG_TARGET_HAS_ext32u_i64 DEF(nor_i64, 1, 2, 0, IMPL64 | IMPL(TCG_TARGET_HAS_nor_i64))
DEF(ext32u_i64, 1, 1, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_bswap16_i64
DEF(bswap16_i64, 1, 1, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_bswap32_i64
DEF(bswap32_i64, 1, 1, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_bswap64_i64
DEF(bswap64_i64, 1, 1, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_not_i64
DEF(not_i64, 1, 1, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_neg_i64
DEF(neg_i64, 1, 1, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_andc_i64
DEF(andc_i64, 1, 2, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_orc_i64
DEF(orc_i64, 1, 2, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_eqv_i64
DEF(eqv_i64, 1, 2, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_nand_i64
DEF(nand_i64, 1, 2, 0, TCG_OPF_64BIT)
#endif
#ifdef TCG_TARGET_HAS_nor_i64
DEF(nor_i64, 1, 2, 0, TCG_OPF_64BIT)
#endif
#endif
/* QEMU specific */ /* QEMU specific */
#if TARGET_LONG_BITS > TCG_TARGET_REG_BITS #if TARGET_LONG_BITS > TCG_TARGET_REG_BITS
@ -307,4 +239,6 @@ DEF(qemu_st64, 0, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS)
#endif /* TCG_TARGET_REG_BITS != 32 */ #endif /* TCG_TARGET_REG_BITS != 32 */
#undef IMPL
#undef IMPL64
#undef DEF #undef DEF

4
tcg/tcg.c
View File

@ -2124,6 +2124,10 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf,
case INDEX_op_end: case INDEX_op_end:
goto the_end; goto the_end;
default: default:
/* Sanity check that we've not introduced any unhandled opcodes. */
if (def->flags & TCG_OPF_NOT_PRESENT) {
tcg_abort();
}
/* Note: in order to speed up the code, it would be much /* Note: in order to speed up the code, it would be much
faster to have specialized register allocator functions for faster to have specialized register allocator functions for
some common argument patterns */ some common argument patterns */

38
tcg/tcg.h
View File

@ -47,6 +47,42 @@ typedef uint64_t TCGRegSet;
#error unsupported #error unsupported
#endif #endif
/* Turn some undef macros into false macros. */
#if TCG_TARGET_REG_BITS == 32
#define TCG_TARGET_HAS_div_i64 0
#define TCG_TARGET_HAS_div2_i64 0
#define TCG_TARGET_HAS_rot_i64 0
#define TCG_TARGET_HAS_ext8s_i64 0
#define TCG_TARGET_HAS_ext16s_i64 0
#define TCG_TARGET_HAS_ext32s_i64 0
#define TCG_TARGET_HAS_ext8u_i64 0
#define TCG_TARGET_HAS_ext16u_i64 0
#define TCG_TARGET_HAS_ext32u_i64 0
#define TCG_TARGET_HAS_bswap16_i64 0
#define TCG_TARGET_HAS_bswap32_i64 0
#define TCG_TARGET_HAS_bswap64_i64 0
#define TCG_TARGET_HAS_neg_i64 0
#define TCG_TARGET_HAS_not_i64 0
#define TCG_TARGET_HAS_andc_i64 0
#define TCG_TARGET_HAS_orc_i64 0
#define TCG_TARGET_HAS_eqv_i64 0
#define TCG_TARGET_HAS_nand_i64 0
#define TCG_TARGET_HAS_nor_i64 0
#define TCG_TARGET_HAS_deposit_i64 0
#endif
/* Only one of DIV or DIV2 should be defined. */
#if defined(TCG_TARGET_HAS_div_i32)
#define TCG_TARGET_HAS_div2_i32 0
#elif defined(TCG_TARGET_HAS_div2_i32)
#define TCG_TARGET_HAS_div_i32 0
#endif
#if defined(TCG_TARGET_HAS_div_i64)
#define TCG_TARGET_HAS_div2_i64 0
#elif defined(TCG_TARGET_HAS_div2_i64)
#define TCG_TARGET_HAS_div_i64 0
#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"
@ -456,6 +492,8 @@ enum {
TCG_OPF_SIDE_EFFECTS = 0x04, TCG_OPF_SIDE_EFFECTS = 0x04,
/* Instruction operands are 64-bits (otherwise 32-bits). */ /* Instruction operands are 64-bits (otherwise 32-bits). */
TCG_OPF_64BIT = 0x08, TCG_OPF_64BIT = 0x08,
/* Instruction is optional and not implemented by the host. */
TCG_OPF_NOT_PRESENT = 0x10,
}; };
typedef struct TCGOpDef { typedef struct TCGOpDef {