From patchwork Mon May 14 22:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135782 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp201471lji; Mon, 14 May 2018 15:32:24 -0700 (PDT) X-Google-Smtp-Source: AB8JxZopm1PD9sGm3B+GprhZGyD29GSyNSajlUepaH4dQXuT4VDk01hV6Ldh0vEKA2FwxVeMRr6A X-Received: by 2002:ac8:2e8d:: with SMTP id h13-v6mr10926637qta.39.1526337144293; Mon, 14 May 2018 15:32:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526337144; cv=none; d=google.com; s=arc-20160816; b=XVPwoR5spnMyAhCn/Qg8We9GA04N8bcnWt6MnRTnxEiLPH/IkUCR1rakJWp505bWFP 1vX+4cQrJRL+zK9FZYkFXfFZWmmEyYlJkvtDe6f5CdTYmqY6LxeO6E1xvYIfU/IZcn9P VrjL1bPpgN8Q4jCG+BDyilTY1kh0FRtcsrZqdAaWlHJ5BGi5vEp1gmrhGpSwxfzF4/nO rnB35z3QHk4qyFXwX6UH+luYsZXvbV3rMViwcM/vW1TYl6T/s7Q622L+VXkYiem0xMvS /UdG17/oWR1s6KmN+Q9Mw6gqf5Wy9fQo4ySFlQ89K69MIlTENK4EjwRPGo+lC3EnDq5q 7WlA== 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=wov3UDEUIab80KZLsx5qFyv4cBmccw1Qn22N0bcTDV0=; b=rMaa3E5K0HsF7f1Md2tbDYqd6VFAxpThPGPOjdVw6ahExkxn8IDURoWaGcKY4zpvpl pgj1fnVqta0V+TeIk1pyFUadxFwhOdnv/W4wrcPltOE3JbzuMGO/l5yRUVahnopEu1Y9 35OqLK8Jo09rfYO6cIIO3/zNVjfFmycO0AT4reJsDZe+u4KxUlZx/2rofKFpo5+O8z1H pmY+UqNkSo11kM0wZUtrdEDErt0ZdqmVejZZjd5RWAESMSgO717Ofz69au9cVk7HkBor jn413h5JQQDeW9lpB+a6Sb3EA5x2eEYhU0coVGe4Bk0hOW62CGysqjY/gX0EdOGDSZnV EWQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=McjJdr10; 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 q54-v6si10373297qtj.120.2018.05.14.15.32.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 May 2018 15:32:24 -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=McjJdr10; 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]:50253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIM11-0008CM-Nx for patch@linaro.org; Mon, 14 May 2018 18:32:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fILwJ-0004DU-VP for qemu-devel@nongnu.org; Mon, 14 May 2018 18:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fILwJ-0008TF-4G for qemu-devel@nongnu.org; Mon, 14 May 2018 18:27:31 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:43870) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fILwI-0008SU-VM for qemu-devel@nongnu.org; Mon, 14 May 2018 18:27:31 -0400 Received: by mail-pf0-x243.google.com with SMTP id j20-v6so6673433pff.10 for ; Mon, 14 May 2018 15:27:30 -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=wov3UDEUIab80KZLsx5qFyv4cBmccw1Qn22N0bcTDV0=; b=McjJdr106vBpy2bi+W3/c+7FuRnl/398Cqjht0NlRazG7t6O3KUwAUZAaQr/8QOvG0 CcWvHO6aBsYRQ3eB5cItQhV26U6dtTmwonyR9WakJESswpwLuneay/18JbsMuAbIiu8d a1PiycBRQEhz+95JSopWbvzsxeK7VDKzqQnxo= 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=wov3UDEUIab80KZLsx5qFyv4cBmccw1Qn22N0bcTDV0=; b=bJffDDGnHq39IQ1lvcTo2SOSveZ88QYc/WX3R2AvWIuthHkhtGINkYHd69QPAAow3F eQDwRq2wAwJNaXEVXuqW2f8mmuU5MSj5pwqfhsHL+Ew6RSff7L5T33xGQu/uCTu9nR+h pM88uvyuoiB49JvS1o8AwIoeB9/R0pt8B+SeuyXZgjNhude5U6FuPBAeSivOOBOG8ugh 8B6ySf6wXwFuDZaBGiTBIhfIxlTp0AIrVYl1781PjlqL1PRVlzJrfyC5xrQYvmvzIWmV gWS8AF2rn5yBFWhZC2ibdWLjXDJ5Zz7jHmVKLmJy5U1ma9KwmbCS6yEP16jgIa/2AfIQ 4TFg== X-Gm-Message-State: ALKqPweB5FsB+9qeRaO0n72dmaoOCLSuBTumIB7c0vKOv11qRjkdPyDs NhL5wpTSJZ4G1xwH6PtfrmPSu1vwG6A= X-Received: by 2002:a63:7a44:: with SMTP id j4-v6mr9902036pgn.172.1526336849728; Mon, 14 May 2018 15:27:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 15:27:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 15:27:10 -0700 Message-Id: <20180514222714.7982-10-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:c00::243 Subject: [Qemu-devel] [PULL 09/13] target/openrisc: Convert dec_M 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 | 41 ++++++++++++------------------------ target/openrisc/insns.decode | 3 +++ 2 files changed, 16 insertions(+), 28 deletions(-) -- 2.17.0 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index b5ff7577bd..bdd4626c02 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1030,32 +1030,21 @@ static bool trans_l_rori(DisasContext *dc, arg_dal *a, uint32_t insn) return true; } -static void dec_M(DisasContext *dc, uint32_t insn) +static bool trans_l_movhi(DisasContext *dc, arg_l_movhi *a, uint32_t insn) { - uint32_t op0; - uint32_t rd; - uint32_t K16; - op0 = extract32(insn, 16, 1); - rd = extract32(insn, 21, 5); - K16 = extract32(insn, 0, 16); + LOG_DIS("l.movhi r%d, %d\n", a->d, a->k); + check_r0_write(a->d); + tcg_gen_movi_tl(cpu_R[a->d], a->k << 16); + return true; +} - check_r0_write(rd); - switch (op0) { - case 0x0: /* l.movhi */ - LOG_DIS("l.movhi r%d, %d\n", rd, K16); - tcg_gen_movi_tl(cpu_R[rd], (K16 << 16)); - break; - - case 0x1: /* l.macrc */ - LOG_DIS("l.macrc r%d\n", rd); - tcg_gen_trunc_i64_tl(cpu_R[rd], cpu_mac); - tcg_gen_movi_i64(cpu_mac, 0); - break; - - default: - gen_illegal_exception(dc); - break; - } +static bool trans_l_macrc(DisasContext *dc, arg_l_macrc *a, uint32_t insn) +{ + LOG_DIS("l.macrc r%d\n", a->d); + check_r0_write(a->d); + tcg_gen_trunc_i64_tl(cpu_R[a->d], cpu_mac); + tcg_gen_movi_i64(cpu_mac, 0); + return true; } static void dec_comp(DisasContext *dc, uint32_t insn) @@ -1480,10 +1469,6 @@ static void disas_openrisc_insn(DisasContext *dc, OpenRISCCPU *cpu) op0 = extract32(insn, 26, 6); switch (op0) { - case 0x06: - dec_M(dc, insn); - break; - case 0x2f: dec_compi(dc, insn); break; diff --git a/target/openrisc/insns.decode b/target/openrisc/insns.decode index fb8ba5812a..84f71c13b3 100644 --- a/target/openrisc/insns.decode +++ b/target/openrisc/insns.decode @@ -95,6 +95,9 @@ l_mtspr 110000 ..... a:5 b:5 ........... k=%mtspr_k l_maci 010011 ----- a:5 i:s16 +l_movhi 000110 d:5 ----0 k:16 +l_macrc 000110 d:5 ----1 00000000 00000000 + #### # Arithmetic Instructions ####