From nobody Thu Oct 30 15:17:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526013346692353.1096036564436; Thu, 10 May 2018 21:35:46 -0700 (PDT) Received: from localhost ([::1]:36730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGzmT-0004kc-Ue for importer@patchew.org; Fri, 11 May 2018 00:35:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGzav-0000kx-Sq for qemu-devel@nongnu.org; Fri, 11 May 2018 00:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGzas-0008Ah-Qa for qemu-devel@nongnu.org; Fri, 11 May 2018 00:23:49 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:43685) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGzas-0008AP-LS for qemu-devel@nongnu.org; Fri, 11 May 2018 00:23:46 -0400 Received: by mail-pl0-x243.google.com with SMTP id a39-v6so2536424pla.10 for ; Thu, 10 May 2018 21:23:46 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id r76-v6sm4509462pfl.1.2018.05.10.21.23.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 May 2018 21:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yg0xUOuQh/q5/fKTd9F65rB9ebwPsYTBtK543/i/CMc=; b=WqNfSa8vWar+iMXxPWezzJciHhEhIhuCnIveujGULHHipbKXQ8WZX/+5W3XyZtoR6v p1bQuxyPy/hOyUrKOTcX4UsEq7HiFuuBkbz7o8lTMfgm4B7yYkqKuGUpDIFUAAGb8ZFx ejEM/YGxV6ECin/QInuJi6ggxXSLkznWWDM98= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Yg0xUOuQh/q5/fKTd9F65rB9ebwPsYTBtK543/i/CMc=; b=p2aTqTG55/j/ySt2AVzSYIbrU5+oHMdnDgsep+CP8++Mwl2WFLwr0ICHM+Jkr861MZ LgkJcgxAGkj9yO6tSqmPsr+iA+AnQMPFre7SOxCdwcuAX3NdXW66oLo0BBBO37YtZehI Du4YhakyG85YJ+mYmI+XdEcqEHAjpUi++ZggfUCAR7IaJ7m7nUR84pHQK5UUuglSL1ti FDdwcGpnvL7dnSuayjySg7af2YglOy78e7TO8MTANqtkLs2K7mnNlbCyWt1aXFV+7iNB yx56v4Hw+BuGmpFXR9g0zNF5or6Pi9HtaPxbhPRg/z1L5g9oSW5ng+6ENzKvno8AoDgA z/2g== X-Gm-Message-State: ALKqPwczsdlLLtBPeweVmJX3I1CBB1WQ8aKbO+HmtEISmdSx86+xSV9h 3D7vCULA4rqqeGLzNv22wEQmM5laZVg= X-Google-Smtp-Source: AB8JxZqlHW56ElctjfREn8jdpqweBpXmTmn8ygyUBOV6fC0up1qv6sI53fRMUGufZy282lfWHMpuJw== X-Received: by 2002:a17:902:b942:: with SMTP id h2-v6mr4043572pls.312.1526012625525; Thu, 10 May 2018 21:23:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 10 May 2018 21:23:24 -0700 Message-Id: <20180511042324.5070-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511042324.5070-1-richard.henderson@linaro.org> References: <20180511042324.5070-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 Subject: [Qemu-devel] [PULL 13/13] target/openrisc: Merge disas_openrisc_insn 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: peter.maydell@linaro.org, Stafford Horne Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Acked-by: Stafford Horne Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 66e493220e..3866106bf6 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1373,14 +1373,6 @@ static bool trans_lf_sfle_s(DisasContext *dc, arg_ab= *a, uint32_t insn) return true; } =20 -static void disas_openrisc_insn(DisasContext *dc, OpenRISCCPU *cpu) -{ - uint32_t insn =3D cpu_ldl_code(&cpu->env, dc->pc); - if (!decode(dc, insn)) { - gen_illegal_exception(dc); - } -} - void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) { CPUOpenRISCState *env =3D cs->env_ptr; @@ -1388,6 +1380,7 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) struct DisasContext ctx, *dc =3D &ctx; uint32_t pc_start; uint32_t next_page_start; + uint32_t insn; int num_insns; int max_insns; =20 @@ -1449,7 +1442,11 @@ void gen_intermediate_code(CPUState *cs, struct Tran= slationBlock *tb) if (num_insns =3D=3D max_insns && (tb_cflags(tb) & CF_LAST_IO)) { gen_io_start(); } - disas_openrisc_insn(dc, cpu); + + insn =3D cpu_ldl_code(&cpu->env, dc->pc); + if (!decode(dc, insn)) { + gen_illegal_exception(dc); + } dc->pc =3D dc->pc + 4; =20 /* delay slot */ --=20 2.17.0