From patchwork Tue Jun 28 00:38:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9201559 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DDDE660752 for ; Tue, 28 Jun 2016 00:40:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCAB1285E5 for ; Tue, 28 Jun 2016 00:40:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEE6C285E4; Tue, 28 Jun 2016 00:40:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3A872285E4 for ; Tue, 28 Jun 2016 00:40:29 +0000 (UTC) Received: from localhost ([::1]:33449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh4m-0002hr-43 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jun 2016 20:40:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh4B-0002gh-DI for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHh49-0004OL-CD for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:39:50 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh49-0004OH-76 for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:39:49 -0400 Received: by mail-qk0-x242.google.com with SMTP id b136so323092qkg.2 for ; Mon, 27 Jun 2016 17:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mS/KnYXjvvq7zlryrVeBkeZr1l6xf5AXyRTa1vFRGCk=; b=R9bLJRE5DAX+lEjlchRb2GKMqTfmSxVGfZJZS1VN60y24JrnkPdQZojyEpzI3seWUD hm3Ctmi8YVwfcAjEXhuAV+gHsd3D+dCVK2Urjz/dl7y+DY6D/YvCEHsDv7C6UQ4SNIdB 7zGUFwctIKYQI4RBV3ofXjZskcWVY/i+MUK3EiZELsGMQ0MbjeCOm6lgw2xYURvy+1zG +pIDkomF82Z1RZLlWztIkB9TZwVoiE05QrSvWUGhbYOcR+5CwGUVXldsCvYqGQQirWPi /SoE+okB7v5klbfrv07uf55P/rK5xDuCuN/kFrt1OgsKTPIJHBead5FOC4A0/y9gKapo l/BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mS/KnYXjvvq7zlryrVeBkeZr1l6xf5AXyRTa1vFRGCk=; b=V+xwy4zKb1Uzs8RQmrdi4yr1uqabl0svCsji6W5uVTGwvqVnF2azKCdfRGoAl2LroF 0MS8eZtEjIrqSce0B70cRbqgi0TDCr96R/AZGbWUYAz+Fqb7QTdnffgJtkMwMmomLA9J y0H2GRHHULxOIEM+56aMo0eC3w4Vpe8ni0lc3C9hm2L7I32hUC++xzuCbX1NJLQ7VFVI 6xq/m6vy+T/zPbSuq5rPpvsYup3HpS/CxWmysDkOh55YbcZ+JpGi/fN0y2WAYiH1dPcq w73JUFObUOaajdCEyl0pAxy8YUepQnRGWfUSWxmWfvKk5+4FfuIWpNVNryEYRCyndX9p jjOQ== X-Gm-Message-State: ALyK8tKRfT30n7ZkAG/vZzc1tV7vLVJx89RpWHM/6PeoR2clBet5Asp+VWwwZIRS/BKOmA== X-Received: by 10.55.119.66 with SMTP id s63mr208099qkc.63.1467074388866; Mon, 27 Jun 2016 17:39:48 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id 128sm190406qke.10.2016.06.27.17.39.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 17:39:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2016 17:38:53 -0700 Message-Id: <1467074353-26130-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467074353-26130-1-git-send-email-rth@twiddle.net> References: <1467074353-26130-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v4 04/24] target-sparc: Create gen_exception X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.cave-ayland@ilande.co.uk Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This unifies quite a few duplicate code fragments. Reviewed-By: Artyom Tarasenko Signed-off-by: Richard Henderson --- target-sparc/translate.c | 75 +++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 9000e9b..4fb26e7 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -1043,6 +1043,17 @@ static inline void save_state(DisasContext *dc) save_npc(dc); } +static void gen_exception(DisasContext *dc, int which) +{ + TCGv_i32 t; + + save_state(dc); + t = tcg_const_i32(which); + gen_helper_raise_exception(cpu_env, t); + tcg_temp_free_i32(t); + dc->is_br = 1; +} + static inline void gen_mov_pc_npc(DisasContext *dc) { if (dc->npc == JUMP_PC) { @@ -1633,28 +1644,18 @@ static inline void gen_op_fcmpeq(int fccno) } #endif -static inline void gen_op_fpexception_im(int fsr_flags) +static void gen_op_fpexception_im(DisasContext *dc, int fsr_flags) { - TCGv_i32 r_const; - tcg_gen_andi_tl(cpu_fsr, cpu_fsr, FSR_FTT_NMASK); tcg_gen_ori_tl(cpu_fsr, cpu_fsr, fsr_flags); - r_const = tcg_const_i32(TT_FP_EXCP); - gen_helper_raise_exception(cpu_env, r_const); - tcg_temp_free_i32(r_const); + gen_exception(dc, TT_FP_EXCP); } static int gen_trap_ifnofpu(DisasContext *dc) { #if !defined(CONFIG_USER_ONLY) if (!dc->fpu_enabled) { - TCGv_i32 r_const; - - save_state(dc); - r_const = tcg_const_i32(TT_NFPU_INSN); - gen_helper_raise_exception(cpu_env, r_const); - tcg_temp_free_i32(r_const); - dc->is_br = 1; + gen_exception(dc, TT_NFPU_INSN); return 1; } #endif @@ -5155,63 +5156,27 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn) jmp_insn: goto egress; illegal_insn: - { - TCGv_i32 r_const; - - save_state(dc); - r_const = tcg_const_i32(TT_ILL_INSN); - gen_helper_raise_exception(cpu_env, r_const); - tcg_temp_free_i32(r_const); - dc->is_br = 1; - } + gen_exception(dc, TT_ILL_INSN); goto egress; unimp_flush: - { - TCGv_i32 r_const; - - save_state(dc); - r_const = tcg_const_i32(TT_UNIMP_FLUSH); - gen_helper_raise_exception(cpu_env, r_const); - tcg_temp_free_i32(r_const); - dc->is_br = 1; - } + gen_exception(dc, TT_UNIMP_FLUSH); goto egress; #if !defined(CONFIG_USER_ONLY) priv_insn: - { - TCGv_i32 r_const; - - save_state(dc); - r_const = tcg_const_i32(TT_PRIV_INSN); - gen_helper_raise_exception(cpu_env, r_const); - tcg_temp_free_i32(r_const); - dc->is_br = 1; - } + gen_exception(dc, TT_PRIV_INSN); goto egress; #endif nfpu_insn: - save_state(dc); - gen_op_fpexception_im(FSR_FTT_UNIMPFPOP); - dc->is_br = 1; + gen_op_fpexception_im(dc, FSR_FTT_UNIMPFPOP); goto egress; #if !defined(CONFIG_USER_ONLY) && !defined(TARGET_SPARC64) nfq_insn: - save_state(dc); - gen_op_fpexception_im(FSR_FTT_SEQ_ERROR); - dc->is_br = 1; + gen_op_fpexception_im(dc, FSR_FTT_SEQ_ERROR); goto egress; #endif #ifndef TARGET_SPARC64 ncp_insn: - { - TCGv r_const; - - save_state(dc); - r_const = tcg_const_i32(TT_NCP_INSN); - gen_helper_raise_exception(cpu_env, r_const); - tcg_temp_free(r_const); - dc->is_br = 1; - } + gen_exception(dc, TT_NCP_INSN); goto egress; #endif egress: