From patchwork Sat Apr 30 15:42:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 93504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2912B6F4F for ; Sun, 1 May 2011 01:42:40 +1000 (EST) Received: from localhost ([::1]:53271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGCJX-0006Sd-Qd for incoming@patchwork.ozlabs.org; Sat, 30 Apr 2011 11:42:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGCJQ-0006SV-3A for qemu-devel@nongnu.org; Sat, 30 Apr 2011 11:42:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QGCJP-0001vq-0l for qemu-devel@nongnu.org; Sat, 30 Apr 2011 11:42:28 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:62774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QGCJO-0001vm-Uh for qemu-devel@nongnu.org; Sat, 30 Apr 2011 11:42:26 -0400 Received: by qwj8 with SMTP id 8so2493568qwj.4 for ; Sat, 30 Apr 2011 08:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to :content-type; bh=7jXky6BJ7dRbs+8cHuTfUhCqYHuZhWIVQI5ffnv5jzA=; b=HRhmbYW5u4RS6EnuKGG7zUgicq6ibI7e8AYy7pikYq7Ba8jvCYfENXIa548wyUxHb5 bpI1MJfNN/aixtE20auVe6lzzuFdN2suMb++iEcNJTumGFaFo8Eo2QE9F0/mII0q6I4F DIzE4A9PhRvO234+93vqHth3y7CF+UzLry+64= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=Nl8qf6ylNAVbA6F2YG5mtD+yhswl7xk8Tpl+bpXu81XIZDXm9ui3EFo1DTl9zpDYDE aWvKsIBa2HxVS1jGBf5gr/gUI91pWOGklZ/hvBXZ/b1CWs7oVkl4OXsYrPM4cYc9Sj9h d6AZlGWQLJesQcCCKmVHwuPWosuUMolRBZujw= Received: by 10.224.183.17 with SMTP id ce17mr4777316qab.352.1304178146420; Sat, 30 Apr 2011 08:42:26 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.20.16 with HTTP; Sat, 30 Apr 2011 08:42:06 -0700 (PDT) From: Blue Swirl Date: Sat, 30 Apr 2011 18:42:06 +0300 Message-ID: To: qemu-devel , Artyom Tarasenko , Igor Kovalenko , Aurelien Jarno X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.45 Subject: [Qemu-devel] [PATCH] sparc64: fix wrpstate and wrtl on delay slot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use TCG local to work around TCG register flush due to a branch. Thanks to Artyom Tarasenko, Igor Kovalenko and Aurelien Jarno. Signed-off-by: Blue Swirl --- I analyzed the call tree in target-sparc/translate.c for brcond* usage. In the following lines, first level function uses brcond* directly, second level calls the first level etc. gen_add_tv >gen_op_tadd_ccTV >>taddcctv gen_tag_tv >gen_op_tadd_ccTV >>taddcctv >gen_op_tsub_ccTV >>tsubcctv gen_sub_tv >gen_op_tsub_ccTV >>tsubcctv gen_op_mulscc >mulscc gen_trap_ifdivzero_tl >gen_op_sdivx >>sdivx >udivx gen_op_sdivx >sdivx gen_branch2 >disas_sparc_insn gen_branch_a >do_branch >>bpcc >>bn+x >do_fbranch >>fbpcc >>fbn+x >do_branch_reg >>bpr gen_generic_branch >flush_cond >>do_branch >>>bpcc >>>bn+x >>do_fbranch >>>fbpcc >>>fbn+x >>do_branch_reg >>>bpr >save_npc >>save_state >>>gen_trap_ifnofpu >>>trap >>>flushw >>>FPU Operations >>>taddcctv >>>tsubcctv >>>wrfprs >>>wrpsr >>>wrpstate >>>wrtl >>>wrhpstate >>>return >>>save >>>restore >>>ldd >>>lda >>>lduba >>>lduha >>>ldda >>>ldsba >>>ldsha >>>ldstuba >>>swapa >>>ldswa >>>ldxa >>>ldfa >>>lddfa >>>ldqfa >>>ldf >>>ldfsr >>>lddqf >>>lddf >>>std >>>sta >>>stba >>>stha >>>stda >>>stxa >>>stf >>>stfsr >>>stqf >>>stdf >>>stfa >>>stqfa >>>stdfa >>>casa >>>casxa >>gen_intermediate_code_internal >gen_mov_pc_npc >>call >>return >>jmpl >>rett gen_cond_reg >do_branch_reg >>bpr trap fmovsr fmovdr fmovqr fmovscc fmovdcc fmovqcc movcc movr I only found wrtl in addition to wrpstate discovered earlier, other use cases looked OK. target-sparc/translate.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) gen_helper_wrpil(cpu_tmp0); diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 3c958b2..9222cde 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -3505,16 +3505,28 @@ static void disas_sparc_insn(DisasContext * dc) tcg_gen_mov_tl(cpu_tbr, cpu_tmp0); break; case 6: // pstate - save_state(dc, cpu_cond); - gen_helper_wrpstate(cpu_tmp0); - dc->npc = DYNAMIC_PC; + { + TCGv r_tmp = tcg_temp_local_new(); + + tcg_gen_mov_tl(r_tmp, cpu_tmp0); + save_state(dc, cpu_cond); + gen_helper_wrpstate(r_tmp); + tcg_temp_free(r_tmp); + dc->npc = DYNAMIC_PC; + } break; case 7: // tl - save_state(dc, cpu_cond); - tcg_gen_trunc_tl_i32(cpu_tmp32, cpu_tmp0); - tcg_gen_st_i32(cpu_tmp32, cpu_env, - offsetof(CPUSPARCState, tl)); - dc->npc = DYNAMIC_PC; + { + TCGv r_tmp = tcg_temp_local_new(); + + tcg_gen_mov_tl(r_tmp, cpu_tmp0); + save_state(dc, cpu_cond); + tcg_gen_trunc_tl_i32(cpu_tmp32, r_tmp); + tcg_temp_free(r_tmp); + tcg_gen_st_i32(cpu_tmp32, cpu_env, + offsetof(CPUSPARCState, tl)); + dc->npc = DYNAMIC_PC; + } break; case 8: // pil