ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE----- 

iQIcBAABAgAGBQJasM9rAAoJEPMMOL0/L748mH0P/15/JdnZDRVbyYlSESEksev2
 cvBcN/7d++SBu2qADUlW8vHi6OU/CcR5Yj/TmeQJnvohw477hQg6pVrWiDUxyEOb
 KBzFYh6/wheQYeCEXub1aCFhdcHpNwvlBuZDYKp8UHOss8kUDjSTUEVKUi3k6aLr
 uoAtQqMLOnG7d78c29IfROcE/Z45d2qMMAJyDWMengJZ6wn3IVJZkwpvEPlr2Tla
 NKur8EoGVJWlKZ2wLo0rnTbiQQMvLxxbQeMs7W6IRmX8EWARdzT7T/1iF9WDb9WL
 68SWa/1CVawmnI5+m+rlcqXtia8EQmskxwFEuts6uL7DF2CcE/6kK6krg47R2bGi
 NIt5vmIQrfKaE6FkSG9lT8CJuZoOBFcPds4maBB/1Hl3uQ9X+bruuHQrp/SHlB/S
 sFnlXO7fBDYmRcKw4edVLlOKld5bd2LcP0mqI3+Snqd9ugZfPD2LFemi6LmdkZgU
 rjza3DLP3lt+9sciuDMCFRFj0aqVANtx50lWihsX1GqZEvOZvsaxrtTnfuBD1Ie1
 HNqxvnN+8UzkyR9ude4CYXoznKRd76oQYE2aPA/+Ct7v+WnOzl9LvCnfIyFn4TsK
 GO9KX1EocEUeiXj7XoHdo55zNONJ2tZK39feEsBLuXrhLUfhmJsLHtW9VNUh9MEj
 Pf7kr8jBGcAbPtnISpPS
 =iorn
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging

# gpg: Signature made Tue 20 Mar 2018 09:07:55 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-2.12-pull-request:
  target/m68k: add a mechanism to automatically free TCGv
  target/m68k: add DisasContext parameter to gen_extend()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-03-20 14:19:23 +00:00
parent 036793aebf ecc207d2fc
commit 4aafb1b192
1 changed files with 66 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
target/m68k/translate.c
View File

@ -123,8 +123,34 @@ typedef struct DisasContext {
int done_mac; int done_mac;
int writeback_mask; int writeback_mask;
TCGv writeback[8]; TCGv writeback[8];
#define MAX_TO_RELEASE 8
int release_count;
TCGv release[MAX_TO_RELEASE];
} DisasContext; } DisasContext;
static void init_release_array(DisasContext *s)
{
#ifdef CONFIG_DEBUG_TCG
memset(s->release, 0, sizeof(s->release));
#endif
s->release_count = 0;
}
static void do_release(DisasContext *s)
{
int i;
for (i = 0; i < s->release_count; i++) {
tcg_temp_free(s->release[i]);
}
init_release_array(s);
}
static TCGv mark_to_release(DisasContext *s, TCGv tmp)
{
g_assert(s->release_count < MAX_TO_RELEASE);
return s->release[s->release_count++] = tmp;
}
static TCGv get_areg(DisasContext *s, unsigned regno) static TCGv get_areg(DisasContext *s, unsigned regno)
{ {
if (s->writeback_mask & (1 << regno)) { if (s->writeback_mask & (1 << regno)) {
@ -347,7 +373,8 @@ static TCGv gen_ldst(DisasContext *s, int opsize, TCGv addr, TCGv val,
gen_store(s, opsize, addr, val, index); gen_store(s, opsize, addr, val, index);
return store_dummy; return store_dummy;
} else { } else {
return gen_load(s, opsize, addr, what == EA_LOADS, index); return mark_to_release(s, gen_load(s, opsize, addr,
what == EA_LOADS, index));
} }
} }
@ -439,7 +466,7 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base)
} else { } else {
bd = 0; bd = 0;
} }
tmp = tcg_temp_new(); tmp = mark_to_release(s, tcg_temp_new());
if ((ext & 0x44) == 0) { if ((ext & 0x44) == 0) {
/* pre-index */ /* pre-index */
add = gen_addr_index(s, ext, tmp); add = gen_addr_index(s, ext, tmp);
@ -449,7 +476,7 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base)
if ((ext & 0x80) == 0) { if ((ext & 0x80) == 0) {
/* base not suppressed */ /* base not suppressed */
if (IS_NULL_QREG(base)) { if (IS_NULL_QREG(base)) {
base = tcg_const_i32(offset + bd); base = mark_to_release(s, tcg_const_i32(offset + bd));
bd = 0; bd = 0;
} }
if (!IS_NULL_QREG(add)) { if (!IS_NULL_QREG(add)) {
@ -465,11 +492,11 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base)
add = tmp; add = tmp;
} }
} else { } else {
add = tcg_const_i32(bd); add = mark_to_release(s, tcg_const_i32(bd));
} }
if ((ext & 3) != 0) { if ((ext & 3) != 0) {
/* memory indirect */ /* memory indirect */
base = gen_load(s, OS_LONG, add, 0, IS_USER(s)); base = mark_to_release(s, gen_load(s, OS_LONG, add, 0, IS_USER(s)));
if ((ext & 0x44) == 4) { if ((ext & 0x44) == 4) {
add = gen_addr_index(s, ext, tmp); add = gen_addr_index(s, ext, tmp);
tcg_gen_add_i32(tmp, add, base); tcg_gen_add_i32(tmp, add, base);
@ -494,7 +521,7 @@ static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base)
} }
} else { } else {
/* brief extension word format */ /* brief extension word format */
tmp = tcg_temp_new(); tmp = mark_to_release(s, tcg_temp_new());
add = gen_addr_index(s, ext, tmp); add = gen_addr_index(s, ext, tmp);
if (!IS_NULL_QREG(base)) { if (!IS_NULL_QREG(base)) {
tcg_gen_add_i32(tmp, add, base); tcg_gen_add_i32(tmp, add, base);
@ -617,14 +644,14 @@ static void gen_flush_flags(DisasContext *s)
s->cc_op = CC_OP_FLAGS; s->cc_op = CC_OP_FLAGS;
} }
static inline TCGv gen_extend(TCGv val, int opsize, int sign) static inline TCGv gen_extend(DisasContext *s, TCGv val, int opsize, int sign)
{ {
TCGv tmp; TCGv tmp;
if (opsize == OS_LONG) { if (opsize == OS_LONG) {
tmp = val; tmp = val;
} else { } else {
tmp = tcg_temp_new(); tmp = mark_to_release(s, tcg_temp_new());
gen_ext(tmp, val, opsize, sign); gen_ext(tmp, val, opsize, sign);
} }
@ -746,7 +773,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s,
return NULL_QREG; return NULL_QREG;
} }
reg = get_areg(s, reg0); reg = get_areg(s, reg0);
tmp = tcg_temp_new(); tmp = mark_to_release(s, tcg_temp_new());
if (reg0 == 7 && opsize == OS_BYTE && if (reg0 == 7 && opsize == OS_BYTE &&
m68k_feature(s->env, M68K_FEATURE_M68000)) { m68k_feature(s->env, M68K_FEATURE_M68000)) {
tcg_gen_subi_i32(tmp, reg, 2); tcg_gen_subi_i32(tmp, reg, 2);
@ -756,7 +783,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s,
return tmp; return tmp;
case 5: /* Indirect displacement. */ case 5: /* Indirect displacement. */
reg = get_areg(s, reg0); reg = get_areg(s, reg0);
tmp = tcg_temp_new(); tmp = mark_to_release(s, tcg_temp_new());
ext = read_im16(env, s); ext = read_im16(env, s);
tcg_gen_addi_i32(tmp, reg, (int16_t)ext); tcg_gen_addi_i32(tmp, reg, (int16_t)ext);
return tmp; return tmp;
@ -767,14 +794,14 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s,
switch (reg0) { switch (reg0) {
case 0: /* Absolute short. */ case 0: /* Absolute short. */
offset = (int16_t)read_im16(env, s); offset = (int16_t)read_im16(env, s);
return tcg_const_i32(offset); return mark_to_release(s, tcg_const_i32(offset));
case 1: /* Absolute long. */ case 1: /* Absolute long. */
offset = read_im32(env, s); offset = read_im32(env, s);
return tcg_const_i32(offset); return mark_to_release(s, tcg_const_i32(offset));
case 2: /* pc displacement */ case 2: /* pc displacement */
offset = s->pc; offset = s->pc;
offset += (int16_t)read_im16(env, s); offset += (int16_t)read_im16(env, s);
return tcg_const_i32(offset); return mark_to_release(s, tcg_const_i32(offset));
case 3: /* pc index+displacement. */ case 3: /* pc index+displacement. */
return gen_lea_indexed(env, s, NULL_QREG); return gen_lea_indexed(env, s, NULL_QREG);
case 4: /* Immediate. */ case 4: /* Immediate. */
@ -811,7 +838,7 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0,
gen_partset_reg(opsize, reg, val); gen_partset_reg(opsize, reg, val);
return store_dummy; return store_dummy;
} else { } else {
return gen_extend(reg, opsize, what == EA_LOADS); return gen_extend(s, reg, opsize, what == EA_LOADS);
} }
case 1: /* Address register direct. */ case 1: /* Address register direct. */
reg = get_areg(s, reg0); reg = get_areg(s, reg0);
@ -819,7 +846,7 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0,
tcg_gen_mov_i32(reg, val); tcg_gen_mov_i32(reg, val);
return store_dummy; return store_dummy;
} else { } else {
return gen_extend(reg, opsize, what == EA_LOADS); return gen_extend(s, reg, opsize, what == EA_LOADS);
} }
case 2: /* Indirect register */ case 2: /* Indirect register */
reg = get_areg(s, reg0); reg = get_areg(s, reg0);
@ -900,7 +927,7 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0,
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
return tcg_const_i32(offset); return mark_to_release(s, tcg_const_i32(offset));
default: default:
return NULL_QREG; return NULL_QREG;
} }
@ -1759,8 +1786,8 @@ DISAS_INSN(abcd_reg)
gen_flush_flags(s); /* !Z is sticky */ gen_flush_flags(s); /* !Z is sticky */
src = gen_extend(DREG(insn, 0), OS_BYTE, 0); src = gen_extend(s, DREG(insn, 0), OS_BYTE, 0);
dest = gen_extend(DREG(insn, 9), OS_BYTE, 0); dest = gen_extend(s, DREG(insn, 9), OS_BYTE, 0);
bcd_add(dest, src); bcd_add(dest, src);
gen_partset_reg(OS_BYTE, DREG(insn, 9), dest); gen_partset_reg(OS_BYTE, DREG(insn, 9), dest);
@ -1794,8 +1821,8 @@ DISAS_INSN(sbcd_reg)
gen_flush_flags(s); /* !Z is sticky */ gen_flush_flags(s); /* !Z is sticky */
src = gen_extend(DREG(insn, 0), OS_BYTE, 0); src = gen_extend(s, DREG(insn, 0), OS_BYTE, 0);
dest = gen_extend(DREG(insn, 9), OS_BYTE, 0); dest = gen_extend(s, DREG(insn, 9), OS_BYTE, 0);
bcd_sub(dest, src); bcd_sub(dest, src);
@ -1856,7 +1883,7 @@ DISAS_INSN(addsub)
add = (insn & 0x4000) != 0; add = (insn & 0x4000) != 0;
opsize = insn_opsize(insn); opsize = insn_opsize(insn);
reg = gen_extend(DREG(insn, 9), opsize, 1); reg = gen_extend(s, DREG(insn, 9), opsize, 1);
dest = tcg_temp_new(); dest = tcg_temp_new();
if (insn & 0x100) { if (insn & 0x100) {
SRC_EA(env, tmp, opsize, 1, &addr); SRC_EA(env, tmp, opsize, 1, &addr);
@ -2386,7 +2413,7 @@ DISAS_INSN(cas)
return; return;
} }
cmp = gen_extend(DREG(ext, 0), opsize, 1); cmp = gen_extend(s, DREG(ext, 0), opsize, 1);
/* if <EA> == Dc then /* if <EA> == Dc then
* <EA> = Du * <EA> = Du
@ -3055,7 +3082,7 @@ DISAS_INSN(or)
int opsize; int opsize;
opsize = insn_opsize(insn); opsize = insn_opsize(insn);
reg = gen_extend(DREG(insn, 9), opsize, 0); reg = gen_extend(s, DREG(insn, 9), opsize, 0);
dest = tcg_temp_new(); dest = tcg_temp_new();
if (insn & 0x100) { if (insn & 0x100) {
SRC_EA(env, src, opsize, 0, &addr); SRC_EA(env, src, opsize, 0, &addr);
@ -3120,8 +3147,8 @@ DISAS_INSN(subx_reg)
opsize = insn_opsize(insn); opsize = insn_opsize(insn);
src = gen_extend(DREG(insn, 0), opsize, 1); src = gen_extend(s, DREG(insn, 0), opsize, 1);
dest = gen_extend(DREG(insn, 9), opsize, 1); dest = gen_extend(s, DREG(insn, 9), opsize, 1);
gen_subx(s, src, dest, opsize); gen_subx(s, src, dest, opsize);
@ -3176,7 +3203,7 @@ DISAS_INSN(cmp)
opsize = insn_opsize(insn); opsize = insn_opsize(insn);
SRC_EA(env, src, opsize, 1, NULL); SRC_EA(env, src, opsize, 1, NULL);
reg = gen_extend(DREG(insn, 9), opsize, 1); reg = gen_extend(s, DREG(insn, 9), opsize, 1);
gen_update_cc_cmp(s, reg, src, opsize); gen_update_cc_cmp(s, reg, src, opsize);
} }
@ -3329,8 +3356,8 @@ DISAS_INSN(addx_reg)
opsize = insn_opsize(insn); opsize = insn_opsize(insn);
dest = gen_extend(DREG(insn, 9), opsize, 1); dest = gen_extend(s, DREG(insn, 9), opsize, 1);
src = gen_extend(DREG(insn, 0), opsize, 1); src = gen_extend(s, DREG(insn, 0), opsize, 1);
gen_addx(s, src, dest, opsize); gen_addx(s, src, dest, opsize);
@ -3369,7 +3396,7 @@ static inline void shift_im(DisasContext *s, uint16_t insn, int opsize)
int logical = insn & 8; int logical = insn & 8;
int left = insn & 0x100; int left = insn & 0x100;
int bits = opsize_bytes(opsize) * 8; int bits = opsize_bytes(opsize) * 8;
TCGv reg = gen_extend(DREG(insn, 0), opsize, !logical); TCGv reg = gen_extend(s, DREG(insn, 0), opsize, !logical);
if (count == 0) { if (count == 0) {
count = 8; count = 8;
@ -3419,7 +3446,7 @@ static inline void shift_reg(DisasContext *s, uint16_t insn, int opsize)
int logical = insn & 8; int logical = insn & 8;
int left = insn & 0x100; int left = insn & 0x100;
int bits = opsize_bytes(opsize) * 8; int bits = opsize_bytes(opsize) * 8;
TCGv reg = gen_extend(DREG(insn, 0), opsize, !logical); TCGv reg = gen_extend(s, DREG(insn, 0), opsize, !logical);
TCGv s32; TCGv s32;
TCGv_i64 t64, s64; TCGv_i64 t64, s64;
@ -3556,7 +3583,7 @@ DISAS_INSN(shift_mem)
while M68000 sets if the most significant bit is changed at while M68000 sets if the most significant bit is changed at
any time during the shift operation */ any time during the shift operation */
if (!logical && m68k_feature(s->env, M68K_FEATURE_M68000)) { if (!logical && m68k_feature(s->env, M68K_FEATURE_M68000)) {
src = gen_extend(src, OS_WORD, 1); src = gen_extend(s, src, OS_WORD, 1);
tcg_gen_xor_i32(QREG_CC_V, QREG_CC_N, src); tcg_gen_xor_i32(QREG_CC_V, QREG_CC_N, src);
} }
} else { } else {
@ -3789,7 +3816,7 @@ DISAS_INSN(rotate8_im)
TCGv shift; TCGv shift;
int tmp; int tmp;
reg = gen_extend(DREG(insn, 0), OS_BYTE, 0); reg = gen_extend(s, DREG(insn, 0), OS_BYTE, 0);
tmp = (insn >> 9) & 7; tmp = (insn >> 9) & 7;
if (tmp == 0) { if (tmp == 0) {
@ -3816,7 +3843,7 @@ DISAS_INSN(rotate16_im)
TCGv shift; TCGv shift;
int tmp; int tmp;
reg = gen_extend(DREG(insn, 0), OS_WORD, 0); reg = gen_extend(s, DREG(insn, 0), OS_WORD, 0);
tmp = (insn >> 9) & 7; tmp = (insn >> 9) & 7;
if (tmp == 0) { if (tmp == 0) {
tmp = 8; tmp = 8;
@ -3876,7 +3903,7 @@ DISAS_INSN(rotate8_reg)
TCGv t0, t1; TCGv t0, t1;
int left = (insn & 0x100); int left = (insn & 0x100);
reg = gen_extend(DREG(insn, 0), OS_BYTE, 0); reg = gen_extend(s, DREG(insn, 0), OS_BYTE, 0);
src = DREG(insn, 9); src = DREG(insn, 9);
/* shift in [0..63] */ /* shift in [0..63] */
t0 = tcg_temp_new_i32(); t0 = tcg_temp_new_i32();
@ -3911,7 +3938,7 @@ DISAS_INSN(rotate16_reg)
TCGv t0, t1; TCGv t0, t1;
int left = (insn & 0x100); int left = (insn & 0x100);
reg = gen_extend(DREG(insn, 0), OS_WORD, 0); reg = gen_extend(s, DREG(insn, 0), OS_WORD, 0);
src = DREG(insn, 9); src = DREG(insn, 9);
/* shift in [0..63] */ /* shift in [0..63] */
t0 = tcg_temp_new_i32(); t0 = tcg_temp_new_i32();
@ -4353,7 +4380,7 @@ DISAS_INSN(chk)
return; return;
} }
SRC_EA(env, src, opsize, 1, NULL); SRC_EA(env, src, opsize, 1, NULL);
reg = gen_extend(DREG(insn, 9), opsize, 1); reg = gen_extend(s, DREG(insn, 9), opsize, 1);
gen_flush_flags(s); gen_flush_flags(s);
gen_helper_chk(cpu_env, reg, src); gen_helper_chk(cpu_env, reg, src);
@ -6033,6 +6060,7 @@ static void disas_m68k_insn(CPUM68KState * env, DisasContext *s)
uint16_t insn = read_im16(env, s); uint16_t insn = read_im16(env, s);
opcode_table[insn](env, s, insn); opcode_table[insn](env, s, insn);
do_writebacks(s); do_writebacks(s);
do_release(s);
} }
/* generate intermediate code for basic block 'tb'. */ /* generate intermediate code for basic block 'tb'. */
@ -6067,6 +6095,8 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
max_insns = TCG_MAX_INSNS; max_insns = TCG_MAX_INSNS;
} }
init_release_array(dc);
gen_tb_start(tb); gen_tb_start(tb);
do { do {
pc_offset = dc->pc - pc_start; pc_offset = dc->pc - pc_start;