From patchwork Mon May 14 22:27:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135801 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp219738lji; Mon, 14 May 2018 15:57:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpuQF6OaVZSSl4H9wNMUUFW84S4VdSWvEO76BXSJ+nUBcLhfOec81oMm+Sbu30gsmHMlSUj X-Received: by 2002:ac8:19c2:: with SMTP id s2-v6mr10694319qtk.384.1526338668408; Mon, 14 May 2018 15:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526338668; cv=none; d=google.com; s=arc-20160816; b=nAtVoEEJbotJBG6GhMb4hVImIBvmrv+bIRoHmW+vtrc+Xckaqno6uEWVwKk2txWZeH taDbZVnAL2qxUIYoLZ1lhccfESkbdnrHmt9bVT2SAnYOfW+pCDJCR2A372eIgOXHbofp qY/95E0e7b2+18Yrhadu8djIN3cS7cDjlN3j4XX0+MmCJ+eI9c32HHa8gLKpY7E/tAKo vnyUxDnvBKQy7G0YYwx0sDCrnt5cpb9Qq2J329v1ki+bSrJII/424qjLCUp0xCJDlBrg hOKksZ9qKKi0Te1DhhqyHB+0Q40IGaO6m/UhVqYP26aKooT/KO8Gb6VRp5X0K5Muvh8c JP6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=nyy0ngksXONn0dGFkmMbZRSj0SjSDaD3Vn/uWcIdgOQ=; b=osjX2jtu4xT+xHtQZD9lFbplGrNzhmA4uK4llGqi7ZzQWKWXEZ1XgFZfbu2n15C/F/ a8d1gL9/MIwVjuVkxL4xNEwn8I2HNbJV0sFuETEsENRjdx/i62NZ5AJ+hxnAafXxlc+6 VN0aKgMk1dnynesGomFmdjRXoSdvNNbAvW06V5er7VxYNVR7jHX8YJ0KWDlZaa/hlWBm 9cxawBf1tzCTNq+a27VEKWRLEyOnuv556e3S0dJPxsjJGFXjp2akZAaShmj9HnncJBQi D82a2+AwYhqasbVvp65emDfGFoqA5muGvMYhIMbigmwvsH0d9QoIetLbIHnZPQXSFp/c Eh8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GY8LQxyz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m8-v6si6438790qvk.180.2018.05.14.15.57.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 May 2018 15:57:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GY8LQxyz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIMPb-0002MY-JA for patch@linaro.org; Mon, 14 May 2018 18:57:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fILwQ-0004Kb-CX for qemu-devel@nongnu.org; Mon, 14 May 2018 18:27:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fILwO-00008l-Pp for qemu-devel@nongnu.org; Mon, 14 May 2018 18:27:38 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:44341) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fILwO-000085-Jc for qemu-devel@nongnu.org; Mon, 14 May 2018 18:27:36 -0400 Received: by mail-pg0-x242.google.com with SMTP id x145-v6so6070720pgx.11 for ; Mon, 14 May 2018 15:27:36 -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=nyy0ngksXONn0dGFkmMbZRSj0SjSDaD3Vn/uWcIdgOQ=; b=GY8LQxyzBvzhNo5CufpeF9Bh6PobGQgI+csH7Glos+ExJDygkMARl62QOG+26wYR2r ClUQBa+yQdI3IleHXzwPON71dwUqGhEShRRd77mtTeCdKwWCfbTwkkpWJHd6qC1CEIBH D3XXb9VLZ7SHxaXbEzg/afw/f12gjN3e+Sazc= 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=nyy0ngksXONn0dGFkmMbZRSj0SjSDaD3Vn/uWcIdgOQ=; b=FHRpThyxeMIddnQqqaVK3JhZH02Gmv3JzkMElbCkvjhU5W6yhhciPNDGCoCc7g1aJf DtHYzgWj6OHQE45reauilTwIwDT/Dcm3KQHHAWBEUd3NlNDVqixGv2mE51W90cA/Tq3X 1r37rtDd1YuYmCq91j9lPzXFri39gXHgCheYP6FCxvdSQXg0+1wg1fcOOkPzqaeFuLxe LdOSNDcLuZwBXda2xX5jTVUmon2K4Ja+xC2Msa4EEhaAJ6xbVIRR8Ezx7NtlOzqqB4m7 pvk7J66wAgkaebkFy36WDFm6q8eH5/N+Eh0/cif4RIMV2LMncy6hJ24OYW2L7p9c/vf8 v8zA== X-Gm-Message-State: ALKqPwcpCGjevb7kw9J6KPqVquyQzq0SydBD4H727KM3fspmnet4i6/6 wSk64va+YKxSDKzUYMo8YPPJSOfvILc= X-Received: by 2002:a63:be4b:: with SMTP id g11-v6mr9959938pgo.41.1526336855400; Mon, 14 May 2018 15:27:35 -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 g13-v6sm19517976pfm.67.2018.05.14.15.27.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 15:27:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 15:27:14 -0700 Message-Id: <20180514222714.7982-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514222714.7982-1-richard.henderson@linaro.org> References: <20180514222714.7982-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:c05::242 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Acked-by: Stafford Horne Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.17.0 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 1f87ad6b2e..e7c96ca990 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; } -static void disas_openrisc_insn(DisasContext *dc, OpenRISCCPU *cpu) -{ - uint32_t insn = cpu_ldl_code(&cpu->env, dc->base.pc_next); - if (!decode(dc, insn)) { - gen_illegal_exception(dc); - } -} - static void openrisc_tr_init_disas_context(DisasContextBase *dcb, CPUState *cs) { DisasContext *dc = container_of(dcb, DisasContext, base); @@ -1435,8 +1427,11 @@ static void openrisc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) { DisasContext *dc = container_of(dcbase, DisasContext, base); OpenRISCCPU *cpu = OPENRISC_CPU(cs); + uint32_t insn = cpu_ldl_code(&cpu->env, dc->base.pc_next); - disas_openrisc_insn(dc, cpu); + if (!decode(dc, insn)) { + gen_illegal_exception(dc); + } dc->base.pc_next += 4; /* delay slot */