From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzpiZ-00070L-3A for qemu-devel@nongnu.org; Thu, 08 Apr 2010 07:16:15 -0400 Received: from [140.186.70.92] (port=37004 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzpiX-0006zO-ET for qemu-devel@nongnu.org; Thu, 08 Apr 2010 07:16:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzpiU-0002cC-FM for qemu-devel@nongnu.org; Thu, 08 Apr 2010 07:16:13 -0400 Received: from hall.aurel32.net ([88.191.82.174]:43159) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzpiU-0002c4-78 for qemu-devel@nongnu.org; Thu, 08 Apr 2010 07:16:10 -0400 Date: Thu, 8 Apr 2010 11:57:53 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH 3/4] tcg-hppa: Fix in/out register overlap in add2/sub2. Message-ID: <20100408095753.GB5700@volta.aurel32.net> References: <4BBC7304.7020508@aurel32.net> <5936e37308999fbe0c758dd4e03fd35124ed5da4.1270682952.git.rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <5936e37308999fbe0c758dd4e03fd35124ed5da4.1270682952.git.rth@twiddle.net> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org On Wed, Apr 07, 2010 at 04:46:33PM +0200, Richard Henderson wrote: > Handle the output log part overlapping the input high parts. > Also, improve sub2 to handle some constants the second input low part. Thanks, applied. > Signed-off-by: Richard Henderson > --- > tcg/hppa/tcg-target.c | 60 +++++++++++++++++++++++++++++++++++++----------- > tcg/hppa/tcg-target.h | 1 + > 2 files changed, 47 insertions(+), 14 deletions(-) > > diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c > index 4e15256..aaa39e3 100644 > --- a/tcg/hppa/tcg-target.c > +++ b/tcg/hppa/tcg-target.c > @@ -210,6 +210,9 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) > case 'J': > ct->ct |= TCG_CT_CONST_S5; > break; > + case 'K': > + ct->ct |= TCG_CT_CONST_MS11; > + break; > default: > return -1; > } > @@ -231,6 +234,8 @@ static int tcg_target_const_match(tcg_target_long val, > return check_fit_tl(val, 5); > } else if (ct & TCG_CT_CONST_S11) { > return check_fit_tl(val, 11); > + } else if (ct & TCG_CT_CONST_MS11) { > + return check_fit_tl(-val, 11); > } > return 0; > } > @@ -675,6 +680,42 @@ static void tcg_out_xmpyu(TCGContext *s, int retl, int reth, > } > } > > +static void tcg_out_add2(TCGContext *s, int destl, int desth, > + int al, int ah, int bl, int bh, int blconst) > +{ > + int tmp = (destl == ah || destl == bh ? TCG_REG_R20 : destl); > + > + if (blconst) { > + tcg_out_arithi(s, tmp, al, bl, INSN_ADDI); > + } else { > + tcg_out_arith(s, tmp, al, bl, INSN_ADD); > + } > + tcg_out_arith(s, desth, ah, bh, INSN_ADDC); > + > + tcg_out_mov(s, destl, tmp); > +} > + > +static void tcg_out_sub2(TCGContext *s, int destl, int desth, int al, int ah, > + int bl, int bh, int alconst, int blconst) > +{ > + int tmp = (destl == ah || destl == bh ? TCG_REG_R20 : destl); > + > + if (alconst) { > + if (blconst) { > + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_R20, bl); > + bl = TCG_REG_R20; > + } > + tcg_out_arithi(s, tmp, bl, al, INSN_SUBI); > + } else if (blconst) { > + tcg_out_arithi(s, tmp, al, -bl, INSN_ADDI); > + } else { > + tcg_out_arith(s, tmp, al, bl, INSN_SUB); > + } > + tcg_out_arith(s, desth, ah, bh, INSN_SUBB); > + > + tcg_out_mov(s, destl, tmp); > +} > + > static void tcg_out_branch(TCGContext *s, int label_index, int nul) > { > TCGLabel *l = &s->labels[label_index]; > @@ -1427,22 +1468,13 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, > break; > > case INDEX_op_add2_i32: > - if (const_args[4]) { > - tcg_out_arithi(s, args[0], args[2], args[4], INSN_ADDI); > - } else { > - tcg_out_arith(s, args[0], args[2], args[4], INSN_ADD); > - } > - tcg_out_arith(s, args[1], args[3], args[5], INSN_ADDC); > + tcg_out_add2(s, args[0], args[1], args[2], args[3], > + args[4], args[5], const_args[4]); > break; > > case INDEX_op_sub2_i32: > - if (const_args[2]) { > - /* Recall that SUBI is a reversed subtract. */ > - tcg_out_arithi(s, args[0], args[4], args[2], INSN_SUBI); > - } else { > - tcg_out_arith(s, args[0], args[2], args[4], INSN_SUB); > - } > - tcg_out_arith(s, args[1], args[3], args[5], INSN_SUBB); > + tcg_out_sub2(s, args[0], args[1], args[2], args[3], > + args[4], args[5], const_args[2], const_args[4]); > break; > > case INDEX_op_qemu_ld8u: > @@ -1536,7 +1568,7 @@ static const TCGTargetOpDef hppa_op_defs[] = { > { INDEX_op_setcond2_i32, { "r", "rZ", "rZ", "rI", "rI" } }, > > { INDEX_op_add2_i32, { "r", "r", "rZ", "rZ", "rI", "rZ" } }, > - { INDEX_op_sub2_i32, { "r", "r", "rI", "rZ", "rZ", "rZ" } }, > + { INDEX_op_sub2_i32, { "r", "r", "rI", "rZ", "rK", "rZ" } }, > > #if TARGET_LONG_BITS == 32 > { INDEX_op_qemu_ld8u, { "r", "L" } }, > diff --git a/tcg/hppa/tcg-target.h b/tcg/hppa/tcg-target.h > index 36b6949..b76e389 100644 > --- a/tcg/hppa/tcg-target.h > +++ b/tcg/hppa/tcg-target.h > @@ -72,6 +72,7 @@ enum { > #define TCG_CT_CONST_0 0x0100 > #define TCG_CT_CONST_S5 0x0200 > #define TCG_CT_CONST_S11 0x0400 > +#define TCG_CT_CONST_MS11 0x0800 > > /* used for function call generation */ > #define TCG_REG_CALL_STACK TCG_REG_SP > -- > 1.6.2.5 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net