OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg-i386: Implement small forward branches.

Browse Source 
There are places, like brcond2, where we know that the destination
of a forward branch will be within 127 bytes.

Add the R_386_PC8 relocation type to support this.  Add a flag to
tcg_out_jxx and tcg_out_brcond* to enable it.  Set the flag in the
brcond2 label_next branches; pass along the input flag otherwise.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Richard Henderson 2010-02-06 11:47:58 -08:00 committed by Aurelien Jarno
parent 7942769317
commit f75b56c1ec
2 changed files with 81 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elf.h
View File

@ -243,6 +243,8 @@ typedef struct {
#define R_386_GOTOFF 9 #define R_386_GOTOFF 9
#define R_386_GOTPC 10 #define R_386_GOTPC 10
#define R_386_NUM 11 #define R_386_NUM 11
/* Not a dynamic reloc, so not included in R_386_NUM. Used in TCG. */
#define R_386_PC8 23
#define R_MIPS_NONE 0 #define R_MIPS_NONE 0
#define R_MIPS_16 1 #define R_MIPS_16 1

117
tcg/i386/tcg-target.c
View File

@ -61,6 +61,13 @@ static void patch_reloc(uint8_t *code_ptr, int type,
case R_386_PC32: case R_386_PC32:
*(uint32_t *)code_ptr = value - (long)code_ptr; *(uint32_t *)code_ptr = value - (long)code_ptr;
break; break;
case R_386_PC8:
value -= (long)code_ptr;
if (value != (int8_t)value) {
tcg_abort();
}
*(uint8_t *)code_ptr = value;
break;
default: default:
tcg_abort(); tcg_abort();
} }
@ -305,7 +312,8 @@ static void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val)
tgen_arithi(s, ARITH_ADD, reg, val, 0); tgen_arithi(s, ARITH_ADD, reg, val, 0);
} }
static void tcg_out_jxx(TCGContext *s, int opc, int label_index) /* Use SMALL != 0 to force a short forward branch. */
static void tcg_out_jxx(TCGContext *s, int opc, int label_index, int small)
{ {
int32_t val, val1; int32_t val, val1;
TCGLabel *l = &s->labels[label_index]; TCGLabel *l = &s->labels[label_index];
@ -314,12 +322,16 @@ static void tcg_out_jxx(TCGContext *s, int opc, int label_index)
val = l->u.value - (tcg_target_long)s->code_ptr; val = l->u.value - (tcg_target_long)s->code_ptr;
val1 = val - 2; val1 = val - 2;
if ((int8_t)val1 == val1) { if ((int8_t)val1 == val1) {
if (opc == -1) if (opc == -1) {
tcg_out8(s, 0xeb); tcg_out8(s, 0xeb);
else } else {
tcg_out8(s, 0x70 + opc); tcg_out8(s, 0x70 + opc);
}
tcg_out8(s, val1); tcg_out8(s, val1);
} else { } else {
if (small) {
tcg_abort();
}
if (opc == -1) { if (opc == -1) {
tcg_out8(s, 0xe9); tcg_out8(s, 0xe9);
tcg_out32(s, val - 5); tcg_out32(s, val - 5);
@ -329,6 +341,14 @@ static void tcg_out_jxx(TCGContext *s, int opc, int label_index)
tcg_out32(s, val - 6); tcg_out32(s, val - 6);
} }
} }
} else if (small) {
if (opc == -1) {
tcg_out8(s, 0xeb);
} else {
tcg_out8(s, 0x70 + opc);
}
tcg_out_reloc(s, s->code_ptr, R_386_PC8, label_index, -1);
s->code_ptr += 1;
} else { } else {
if (opc == -1) { if (opc == -1) {
tcg_out8(s, 0xe9); tcg_out8(s, 0xe9);
@ -343,7 +363,7 @@ static void tcg_out_jxx(TCGContext *s, int opc, int label_index)
static void tcg_out_brcond(TCGContext *s, int cond, static void tcg_out_brcond(TCGContext *s, int cond,
TCGArg arg1, TCGArg arg2, int const_arg2, TCGArg arg1, TCGArg arg2, int const_arg2,
int label_index) int label_index, int small)
{ {
if (const_arg2) { if (const_arg2) {
if (arg2 == 0) { if (arg2 == 0) {
@ -355,64 +375,84 @@ static void tcg_out_brcond(TCGContext *s, int cond,
} else { } else {
tcg_out_modrm(s, 0x01 | (ARITH_CMP << 3), arg2, arg1); tcg_out_modrm(s, 0x01 | (ARITH_CMP << 3), arg2, arg1);
} }
tcg_out_jxx(s, tcg_cond_to_jcc[cond], label_index); tcg_out_jxx(s, tcg_cond_to_jcc[cond], label_index, small);
} }
/* XXX: we implement it at the target level to avoid having to /* XXX: we implement it at the target level to avoid having to
handle cross basic blocks temporaries */ handle cross basic blocks temporaries */
static void tcg_out_brcond2(TCGContext *s, static void tcg_out_brcond2(TCGContext *s, const TCGArg *args,
const TCGArg *args, const int *const_args) const int *const_args, int small)
{ {
int label_next; int label_next;
label_next = gen_new_label(); label_next = gen_new_label();
switch(args[4]) { switch(args[4]) {
case TCG_COND_EQ: case TCG_COND_EQ:
tcg_out_brcond(s, TCG_COND_NE, args[0], args[2], const_args[2], label_next); tcg_out_brcond(s, TCG_COND_NE, args[0], args[2], const_args[2],
tcg_out_brcond(s, TCG_COND_EQ, args[1], args[3], const_args[3], args[5]); label_next, 1);
tcg_out_brcond(s, TCG_COND_EQ, args[1], args[3], const_args[3],
args[5], small);
break; break;
case TCG_COND_NE: case TCG_COND_NE:
tcg_out_brcond(s, TCG_COND_NE, args[0], args[2], const_args[2], args[5]); tcg_out_brcond(s, TCG_COND_NE, args[0], args[2], const_args[2],
tcg_out_brcond(s, TCG_COND_NE, args[1], args[3], const_args[3], args[5]); args[5], small);
tcg_out_brcond(s, TCG_COND_NE, args[1], args[3], const_args[3],
args[5], small);
break; break;
case TCG_COND_LT: case TCG_COND_LT:
tcg_out_brcond(s, TCG_COND_LT, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_LT, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_LTU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_LTU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_LE: case TCG_COND_LE:
tcg_out_brcond(s, TCG_COND_LT, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_LT, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_LEU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_LEU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_GT: case TCG_COND_GT:
tcg_out_brcond(s, TCG_COND_GT, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_GT, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_GTU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_GTU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_GE: case TCG_COND_GE:
tcg_out_brcond(s, TCG_COND_GT, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_GT, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_GEU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_GEU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_LTU: case TCG_COND_LTU:
tcg_out_brcond(s, TCG_COND_LTU, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_LTU, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_LTU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_LTU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_LEU: case TCG_COND_LEU:
tcg_out_brcond(s, TCG_COND_LTU, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_LTU, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_LEU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_LEU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_GTU: case TCG_COND_GTU:
tcg_out_brcond(s, TCG_COND_GTU, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_GTU, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_GTU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_GTU, args[0], args[2], const_args[2],
args[5], small);
break; break;
case TCG_COND_GEU: case TCG_COND_GEU:
tcg_out_brcond(s, TCG_COND_GTU, args[1], args[3], const_args[3], args[5]); tcg_out_brcond(s, TCG_COND_GTU, args[1], args[3], const_args[3],
tcg_out_jxx(s, JCC_JNE, label_next); args[5], small);
tcg_out_brcond(s, TCG_COND_GEU, args[0], args[2], const_args[2], args[5]); tcg_out_jxx(s, JCC_JNE, label_next, 1);
tcg_out_brcond(s, TCG_COND_GEU, args[0], args[2], const_args[2],
args[5], small);
break; break;
default: default:
tcg_abort(); tcg_abort();
@ -913,7 +953,7 @@ static inline void tcg_out_op(TCGContext *s, int opc,
} }
break; break;
case INDEX_op_br: case INDEX_op_br:
tcg_out_jxx(s, JCC_JMP, args[0]); tcg_out_jxx(s, JCC_JMP, args[0], 0);
break; break;
case INDEX_op_movi_i32: case INDEX_op_movi_i32:
tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]); tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]);
@ -1044,10 +1084,11 @@ static inline void tcg_out_op(TCGContext *s, int opc,
tcg_out_modrm(s, 0x01 | (ARITH_SBB << 3), args[5], args[1]); tcg_out_modrm(s, 0x01 | (ARITH_SBB << 3), args[5], args[1]);
break; break;
case INDEX_op_brcond_i32: case INDEX_op_brcond_i32:
tcg_out_brcond(s, args[2], args[0], args[1], const_args[1], args[3]); tcg_out_brcond(s, args[2], args[0], args[1], const_args[1],
args[3], 0);
break; break;
case INDEX_op_brcond2_i32: case INDEX_op_brcond2_i32:
tcg_out_brcond2(s, args, const_args); tcg_out_brcond2(s, args, const_args, 0);
break; break;
case INDEX_op_bswap16_i32: case INDEX_op_bswap16_i32: