From patchwork Fri May 4 05:40:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 134929 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp423259lji; Thu, 3 May 2018 22:43:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrscPw04yFsa4GEKdOhehvUmOA3mObKAw/gfdRasIpOqDWu2WMst9sAiW+jnLKzKvYSnIK6 X-Received: by 10.55.200.20 with SMTP id c20mr21487830qkj.382.1525412585377; Thu, 03 May 2018 22:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525412585; cv=none; d=google.com; s=arc-20160816; b=XcU+YcYrVRMRTkqi8n9XR8iFKi9soTGr4oIH9ASNC2QG4pbRYau9xjPTibj902QDCr F9GsMm+aPBnu7+MWu6dXNAvKqHaiEFPYDpTstSvn4MXA3UrFaw13V3tAuwTVVaaUpzA4 a09KTlOtPbsqIO82x2Z8A7RlAPMA8C5hOGRl0rvuch7JDMdrTGNjkUg73BltSfnJVXod NJwmFHEMDCB76TKA5pDrCvvthhBNOh16UPy8TysrzbNtmEQRz2Wayq8+KTOZLbgT3LMM /S4B/LbL657J3VApYGjMECHg1rJ0fZH8badwiWRz8+frwk9ctAs3yK5B103WrgBlp08h 4KRA== 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=bxZz1Ldu+26EKuM1hl7gl38q87A5EvMynlzZeCFjos0=; b=y796KuqIoZyOGaUiDApbtpwynIhnUz1dNiNiKtKeB4doxiHPGnbGNlaxCeHermJpEQ MM4ne3A4yNmsIB6f1BCxEIdHYkm6C2p7fuAhbbv+8sdaTciXrnD3ZWqL2z6a8CL7nE2k hNYS/h73TOTOodLV5qgkQSOV5KsUYUnJeIbYxB10V/4P1U5sCMe5hu5A+9LXeVxYR3pX rcLdb+DnPuf5CeofeuSwzZ10/kMln2cdxMPKyprU1vOcmT4WqCbqhDS0w4Sxyw1AxvNH 2K6nKwU0fm+tO99cdGFPY1tUEQhlIbYG1cNh2Fikfa8DunDtrETCkJuOKResceiKy58i 0S5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EbHvoPmq; 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 a9-v6si189919qtk.205.2018.05.03.22.43.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 May 2018 22:43:05 -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=EbHvoPmq; 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]:60551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fETUm-0001bF-Qa for patch@linaro.org; Fri, 04 May 2018 01:43:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fETSQ-0008Ov-Gs for qemu-devel@nongnu.org; Fri, 04 May 2018 01:40:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fETSP-0004fP-87 for qemu-devel@nongnu.org; Fri, 04 May 2018 01:40:38 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:39800) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fETSO-0004dj-Vq for qemu-devel@nongnu.org; Fri, 04 May 2018 01:40:37 -0400 Received: by mail-pf0-x242.google.com with SMTP id a22so2474940pfn.6 for ; Thu, 03 May 2018 22:40: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=bxZz1Ldu+26EKuM1hl7gl38q87A5EvMynlzZeCFjos0=; b=EbHvoPmq8hynenfG7EDpvzL1L2ICdcvpUJqn/FYtq/QOMRY0HdEjVM+IbeJof1BzVZ /iQGy0H5vhywzezoG/edFEndhPiA2EwNLdfWieueH4sNd1KkvRmnad209LHlgu/fV82Y PXxW/Xou6sbO7VmtpMP9Cv76pqz4FqFMIO4DU= 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=bxZz1Ldu+26EKuM1hl7gl38q87A5EvMynlzZeCFjos0=; b=rzPqjSkW5dfvIG+7LrB2b1EC+pE7hbgdf9MgeKjkZUN5OgrXn9zqkfKkWk/wgsjfBS nIqjKp15/brU2kIvv57QkTZT2sLyA272jKRpp6DED3tJSktc190lqox1/WcougazSlGb 82m8v5HH04rpR/yZm6/n+pUXluRAnu0j/KqeXAuZV+U6fkAC7tVIyDCKJllPrO7+r1kB VCiBDKC2w+EryNjdzHFZhyhrvHnziedoILlLFNtf+48zmcbnMVApJkKEB8Hdm0acVQgQ ShxtpTL2Shh4epVnFVcj1D9Xcsf3fyczjey3/OvNzBJDZfkv8RXhf14x31F/tH1pgB30 m8Ew== X-Gm-Message-State: ALQs6tA4kP/jFQQOuxbVN3byf0Ry1BMnUAU12xurQk8B+0jEzeXzxvzV cINwwYNiQ2v2CiBXxXpezitOlVKmimg= X-Received: by 2002:a17:902:5409:: with SMTP id d9-v6mr170346pli.1.1525412435381; Thu, 03 May 2018 22:40: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 t23-v6sm26550809pgu.41.2018.05.03.22.40.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 22:40:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 22:40:19 -0700 Message-Id: <20180504054030.24527-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180504054030.24527-1-richard.henderson@linaro.org> References: <20180504054030.24527-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::242 Subject: [Qemu-devel] [PATCH 02/13] target/openrisc: Start conversion to decodetree.py 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: Stafford Horne Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Begin with the 0x08 major opcode, the system instructions. Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 79 +++++++++++++++++++++---------------------- target/openrisc/Makefile.objs | 9 +++++ target/openrisc/insns.decode | 28 +++++++++++++++ 3 files changed, 76 insertions(+), 40 deletions(-) create mode 100644 target/openrisc/insns.decode -- 2.14.3 Acked-by: Stafford Horne diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 6876317971..40b21a5db1 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -31,6 +31,7 @@ #include "exec/helper-proto.h" #include "exec/helper-gen.h" +#include "exec/gen-icount.h" #include "trace-tcg.h" #include "exec/log.h" @@ -53,6 +54,9 @@ typedef struct DisasContext { bool singlestep_enabled; } DisasContext; +/* Include the auto-generated decoder. */ +#include "decode.inc.c" + static TCGv cpu_sr; static TCGv cpu_R[32]; static TCGv cpu_R0; @@ -67,7 +71,6 @@ static TCGv cpu_lock_value; static TCGv_i32 fpcsr; static TCGv_i64 cpu_mac; /* MACHI:MACLO */ static TCGv_i32 cpu_dflag; -#include "exec/gen-icount.h" void openrisc_translate_init(void) { @@ -1243,45 +1246,40 @@ static void dec_compi(DisasContext *dc, uint32_t insn) } } -static void dec_sys(DisasContext *dc, uint32_t insn) +static bool trans_l_sys(DisasContext *dc, arg_l_sys *a, uint32_t insn) { - uint32_t op0; - uint32_t K16; + LOG_DIS("l.sys %d\n", a->k); + tcg_gen_movi_tl(cpu_pc, dc->pc); + gen_exception(dc, EXCP_SYSCALL); + dc->is_jmp = DISAS_UPDATE; + return true; +} - op0 = extract32(insn, 16, 10); - K16 = extract32(insn, 0, 16); +static bool trans_l_trap(DisasContext *dc, arg_l_trap *a, uint32_t insn) +{ + LOG_DIS("l.trap %d\n", a->k); + tcg_gen_movi_tl(cpu_pc, dc->pc); + gen_exception(dc, EXCP_TRAP); + return true; +} - switch (op0) { - case 0x000: /* l.sys */ - LOG_DIS("l.sys %d\n", K16); - tcg_gen_movi_tl(cpu_pc, dc->pc); - gen_exception(dc, EXCP_SYSCALL); - dc->is_jmp = DISAS_UPDATE; - break; +static bool trans_l_msync(DisasContext *dc, arg_l_msync *a, uint32_t insn) +{ + LOG_DIS("l.msync\n"); + tcg_gen_mb(TCG_MO_ALL); + return true; +} - case 0x100: /* l.trap */ - LOG_DIS("l.trap %d\n", K16); - tcg_gen_movi_tl(cpu_pc, dc->pc); - gen_exception(dc, EXCP_TRAP); - break; +static bool trans_l_psync(DisasContext *dc, arg_l_psync *a, uint32_t insn) +{ + LOG_DIS("l.psync\n"); + return true; +} - case 0x300: /* l.csync */ - LOG_DIS("l.csync\n"); - break; - - case 0x200: /* l.msync */ - LOG_DIS("l.msync\n"); - tcg_gen_mb(TCG_MO_ALL); - break; - - case 0x270: /* l.psync */ - LOG_DIS("l.psync\n"); - break; - - default: - gen_illegal_exception(dc); - break; - } +static bool trans_l_csync(DisasContext *dc, arg_l_csync *a, uint32_t insn) +{ + LOG_DIS("l.csync\n"); + return true; } static void dec_float(DisasContext *dc, uint32_t insn) @@ -1509,17 +1507,18 @@ static void disas_openrisc_insn(DisasContext *dc, OpenRISCCPU *cpu) uint32_t op0; uint32_t insn; insn = cpu_ldl_code(&cpu->env, dc->pc); - op0 = extract32(insn, 26, 6); + /* Transition to the auto-generated decoder. */ + if (decode(dc, insn)) { + return; + } + + op0 = extract32(insn, 26, 6); switch (op0) { case 0x06: dec_M(dc, insn); break; - case 0x08: - dec_sys(dc, insn); - break; - case 0x2e: dec_logic(dc, insn); break; diff --git a/target/openrisc/Makefile.objs b/target/openrisc/Makefile.objs index 918b1c6e9c..1b98a911ea 100644 --- a/target/openrisc/Makefile.objs +++ b/target/openrisc/Makefile.objs @@ -3,3 +3,12 @@ obj-y += cpu.o exception.o interrupt.o mmu.o translate.o obj-y += exception_helper.o fpu_helper.o \ interrupt_helper.o mmu_helper.o sys_helper.o obj-y += gdbstub.o + +DECODETREE = $(SRC_PATH)/scripts/decodetree.py + +target/openrisc/decode.inc.c: \ + $(SRC_PATH)/target/openrisc/insns.decode $(DECODETREE) + $(call quiet-command,\ + $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@) + +target/openrisc/translate.o: target/openrisc/decode.inc.c diff --git a/target/openrisc/insns.decode b/target/openrisc/insns.decode new file mode 100644 index 0000000000..47d31afc5b --- /dev/null +++ b/target/openrisc/insns.decode @@ -0,0 +1,28 @@ +# +# OpenRISC instruction decode definitions. +# +# Copyright (c) 2018 Richard Henderson +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, see . +# + +#### +# System Instructions +#### + +l_sys 001000 0000000000 k:16 +l_trap 001000 0100000000 k:16 +l_msync 001000 1000000000 00000000 00000000 +l_psync 001000 1010000000 00000000 00000000 +l_csync 001000 1100000000 00000000 00000000