mirrors/tinycc
1
0
Fork 0
mirror of https://github.com/frida/tinycc synced 2024-11-28 10:33:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

x86-asm: Get rid of is_short_jump

Browse Source 
Can be implemented differently.
This commit is contained in:
Michael Matz 2016-05-11 23:45:14 +02:00
parent 55bd08c5ae
commit f3cee9ceff
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
i386-asm.c
View File

@ -499,7 +499,7 @@ static inline void asm_modrm(int reg, Operand *op)
ST_FUNC void asm_opcode(TCCState *s1, int opcode) ST_FUNC void asm_opcode(TCCState *s1, int opcode)
{ {
const ASMInstr *pa; const ASMInstr *pa;
int i, modrm_index, reg, v, op1, is_short_jmp, seg_prefix; int i, modrm_index, reg, v, op1, seg_prefix;
int nb_ops, s; int nb_ops, s;
Operand ops[MAX_OPERANDS], *pop; Operand ops[MAX_OPERANDS], *pop;
int op_type[3]; /* decoded op type */ int op_type[3]; /* decoded op type */
@ -540,7 +540,6 @@ ST_FUNC void asm_opcode(TCCState *s1, int opcode)
next(); next();
} }
is_short_jmp = 0;
s = 0; /* avoid warning */ s = 0; /* avoid warning */
/* optimize matching by using a lookup table (no hashing is needed /* optimize matching by using a lookup table (no hashing is needed
@ -759,8 +758,9 @@ ST_FUNC void asm_opcode(TCCState *s1, int opcode)
jmp_disp = ops[0].e.v + sym->jnext - ind - 2 - (v >= 0xff); jmp_disp = ops[0].e.v + sym->jnext - ind - 2 - (v >= 0xff);
if (jmp_disp == (int8_t)jmp_disp) { if (jmp_disp == (int8_t)jmp_disp) {
/* OK to generate jump */ /* OK to generate jump */
is_short_jmp = 1; ops[0].e.sym = 0;
ops[0].e.v = jmp_disp; ops[0].e.v = jmp_disp;
op_type[0] = OP_IM8S;
} else { } else {
no_short_jump: no_short_jump:
if (pa->instr_type & OPC_JMP) { if (pa->instr_type & OPC_JMP) {
@ -861,10 +861,7 @@ ST_FUNC void asm_opcode(TCCState *s1, int opcode)
gen_le16(ops[i].e.v); gen_le16(ops[i].e.v);
} else { } else {
if (pa->instr_type & (OPC_JMP | OPC_SHORTJMP)) { if (pa->instr_type & (OPC_JMP | OPC_SHORTJMP)) {
if (is_short_jmp) gen_disp32(&ops[i].e);
g(ops[i].e.v);
else
gen_disp32(&ops[i].e);
} else { } else {
#ifdef TCC_TARGET_X86_64 #ifdef TCC_TARGET_X86_64
if (v & OP_IM64) if (v & OP_IM64)