From patchwork Tue Dec 25 20:55:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154481 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5213596ljp; Tue, 25 Dec 2018 13:04:39 -0800 (PST) X-Google-Smtp-Source: ALg8bN4Hdfcs86N9OKj5P5bxAXp/LXUn6I2phuI/mMPIu6n7M0hahWtg9o5rVTk7ZnKVEI+aoX8f X-Received: by 2002:a37:de09:: with SMTP id h9mr16283925qkj.113.1545771879535; Tue, 25 Dec 2018 13:04:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545771879; cv=none; d=google.com; s=arc-20160816; b=ENo+71sHnyS9uyWMaqQNhlOj5Y7b+PaqwLUhr+r2C+t8czBW3Eqri23ntx5m6xD/1C E72Wp0QpHFsiQEvb+vJvQsgTsgezSem46zdv+vEVTPWN54kFxvvPv/KuFIYOsiXq++ha q40LUm9R2ZssDqckQ7pMoz8dJ2Bxu/m95bvKhiDqK2Jwmt7YPSYNM4edKfrdfKf+cLge eol+7Fo5Ku8/4cf7p+RwLO57Zlqv3iCeCFS5UYpn8s/nCq4IVq3CiLMoWQBQ17BuTrW9 cCuxVy6LVhYcENe7qiojjhMc0ooZAuNgKi6l1FmC8/cAQ0Oz1V6da5iSlpHmk5vn4p3E 1WAQ== 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; bh=xNOg+VDeowXy43vU0v167Pr+GVH+V6aOuRdahcOpNVQ=; b=UNeEZY0WK9gIClloXjyt+ibhZI8/Daqiaf+THXzkzxAt5HNJj6DJnqsTxnpBRRbRj3 Ira4t7MewCFGWfPOBkcOK+RPmGOJPoE/sYx9oMWGvXo0Q63/aHx+Fw+ycozVtB5FGofr m0Thmf1gIKMp0XBH0LJseT2dvFGWONdZLjTuWWnIgRlKI51yNVAvYOnshGGQbgoJqPrd MM1zIEJd+0QNz6fEyJQszH+pxLD9Nw87oJQ22ThMnhRyHfKVGEyr+QlQY27UJBg8PSxb qB03+k8Mfg9icPTJ9fY4CQ3FNAPmy8GU4oMnrkPjRft2pzQgHyWXIIXlt8nMDbWFvgrS CSJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VltL1In1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 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. [208.118.235.17]) by mx.google.com with ESMTPS id x189si1550683qke.171.2018.12.25.13.04.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:04:39 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VltL1In1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 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 ([127.0.0.1]:43081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtsU-0004t9-Vb for patch@linaro.org; Tue, 25 Dec 2018 16:04:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtm0-0005nq-Ox for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtlx-0008K4-5u for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:55 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:46323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtlv-0008Hr-CA for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:52 -0500 Received: by mail-pl1-x633.google.com with SMTP id t13so6794296ply.13 for ; Tue, 25 Dec 2018 12:57:51 -0800 (PST) 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=xNOg+VDeowXy43vU0v167Pr+GVH+V6aOuRdahcOpNVQ=; b=VltL1In11ORz3+PBeqsPk7MStDuOOzZ8WwOw4PPE+gL5zwiI7rD0C+/lipw8oiTcC5 s0dURI1bnFyQ6tTQLn6ptk2dMu1zVw4FlZfoiOezh4SoEC8H1EUuKa5CuXZuSwVAe4PD 5zW+kRotkEMfjBj4cMHM76Z8MuYzZwqeE+Hds= 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=xNOg+VDeowXy43vU0v167Pr+GVH+V6aOuRdahcOpNVQ=; b=WHqVYKEWGHo0oVJosHIQCwQB3dSoXf/Zu0N/XpiCb9if/VPm35EpJO/WPyz4/n8+HB YSn8f7CtvBPJ+LBpw/huOulNQ/g46U7bop+BiWVuGe5KKlDfD6sA6w3UQMZe4hDPBWAi QP8OqI6QGpFYVRh5M0oUQsGAvER4vKFrImlisMMhQa17EiTanrffwOfb7QqMpgnss3C6 Rk9XXSc67joT7JMAe08afUIx+CvENDLQ+Tt/4A/+xCj5KxztyG/stTh2hx+4OGU6oR+2 OOBgzgK8UbvWqcoc/cK3tGouu7gw3oFPGdX4I4mquPSJwA7QhoX4y6dwjApXUHhcJbR0 RBpg== X-Gm-Message-State: AJcUukcLIVh3M6erNS/fCGBzjlQLO7MRjMregmwTKE+tvmQ5KN2runNc mrUTL6zm2zEkE3bnT8P9vpY0JuQ3HM4= X-Received: by 2002:a17:902:47aa:: with SMTP id r39mr17248013pld.219.1545771469990; Tue, 25 Dec 2018 12:57:49 -0800 (PST) Received: from cloudburst.home (c211-28-135-144.sunsh3.vic.optusnet.com.au. [211.28.135.144]) by smtp.gmail.com with ESMTPSA id t21sm48501628pgg.24.2018.12.25.12.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:57:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:55:04 +1100 Message-Id: <20181225205529.10874-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181225205529.10874-1-richard.henderson@linaro.org> References: <20181225205529.10874-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::633 Subject: [Qemu-devel] [PULL 17/42] tcg/riscv: Add direct load and store instructions 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, Michael Clark , Alistair Francis Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis Signed-off-by: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Richard Henderson Message-Id: <2e047a95c39c007c66cda024c095e29b0ac4c43e.1545246859.git.alistair.francis@wdc.com> Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.inc.c | 158 +++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) -- 2.17.2 diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c index 7216bad086..154315787c 100644 --- a/tcg/riscv/tcg-target.inc.c +++ b/tcg/riscv/tcg-target.inc.c @@ -1151,3 +1151,161 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) tcg_out_goto(s, l->raddr); } #endif /* CONFIG_SOFTMMU */ + +static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg lo, TCGReg hi, + TCGReg base, TCGMemOp opc, bool is_64) +{ + const TCGMemOp bswap = opc & MO_BSWAP; + + /* We don't yet handle byteswapping, assert */ + g_assert(!bswap); + + switch (opc & (MO_SSIZE)) { + case MO_UB: + tcg_out_opc_imm(s, OPC_LBU, lo, base, 0); + break; + case MO_SB: + tcg_out_opc_imm(s, OPC_LB, lo, base, 0); + break; + case MO_UW: + tcg_out_opc_imm(s, OPC_LHU, lo, base, 0); + break; + case MO_SW: + tcg_out_opc_imm(s, OPC_LH, lo, base, 0); + break; + case MO_UL: + if (TCG_TARGET_REG_BITS == 64 && is_64) { + tcg_out_opc_imm(s, OPC_LWU, lo, base, 0); + break; + } + /* FALLTHRU */ + case MO_SL: + tcg_out_opc_imm(s, OPC_LW, lo, base, 0); + break; + case MO_Q: + /* Prefer to load from offset 0 first, but allow for overlap. */ + if (TCG_TARGET_REG_BITS == 64) { + tcg_out_opc_imm(s, OPC_LD, lo, base, 0); + } else if (lo != base) { + tcg_out_opc_imm(s, OPC_LW, lo, base, 0); + tcg_out_opc_imm(s, OPC_LW, hi, base, 4); + } else { + tcg_out_opc_imm(s, OPC_LW, hi, base, 4); + tcg_out_opc_imm(s, OPC_LW, lo, base, 0); + } + break; + default: + g_assert_not_reached(); + } +} + +static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) +{ + TCGReg addr_regl, addr_regh __attribute__((unused)); + TCGReg data_regl, data_regh; + TCGMemOpIdx oi; + TCGMemOp opc; +#if defined(CONFIG_SOFTMMU) + tcg_insn_unit *label_ptr[1]; +#endif + TCGReg base = TCG_REG_TMP0; + + data_regl = *args++; + data_regh = (TCG_TARGET_REG_BITS == 32 && is_64 ? *args++ : 0); + addr_regl = *args++; + addr_regh = (TCG_TARGET_REG_BITS < TARGET_LONG_BITS ? *args++ : 0); + oi = *args++; + opc = get_memop(oi); + +#if defined(CONFIG_SOFTMMU) + tcg_out_tlb_load(s, addr_regl, addr_regh, oi, label_ptr, 1); + tcg_out_qemu_ld_direct(s, data_regl, data_regh, base, opc, is_64); + add_qemu_ldst_label(s, 1, oi, + (is_64 ? TCG_TYPE_I64 : TCG_TYPE_I32), + data_regl, data_regh, addr_regl, addr_regh, + s->code_ptr, label_ptr); +#else + if (TCG_TARGET_REG_BITS > TARGET_LONG_BITS) { + tcg_out_ext32u(s, base, addr_regl); + addr_regl = base; + } + + if (guest_base == 0) { + tcg_out_opc_reg(s, OPC_ADD, base, addr_regl, TCG_REG_ZERO); + } else { + tcg_out_opc_reg(s, OPC_ADD, base, TCG_GUEST_BASE_REG, addr_regl); + } + tcg_out_qemu_ld_direct(s, data_regl, data_regh, base, opc, is_64); +#endif +} + +static void tcg_out_qemu_st_direct(TCGContext *s, TCGReg lo, TCGReg hi, + TCGReg base, TCGMemOp opc) +{ + const TCGMemOp bswap = opc & MO_BSWAP; + + /* We don't yet handle byteswapping, assert */ + g_assert(!bswap); + + switch (opc & (MO_SSIZE)) { + case MO_8: + tcg_out_opc_store(s, OPC_SB, base, lo, 0); + break; + case MO_16: + tcg_out_opc_store(s, OPC_SH, base, lo, 0); + break; + case MO_32: + tcg_out_opc_store(s, OPC_SW, base, lo, 0); + break; + case MO_64: + if (TCG_TARGET_REG_BITS == 64) { + tcg_out_opc_store(s, OPC_SD, base, lo, 0); + } else { + tcg_out_opc_store(s, OPC_SW, base, lo, 0); + tcg_out_opc_store(s, OPC_SW, base, hi, 4); + } + break; + default: + g_assert_not_reached(); + } +} + +static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) +{ + TCGReg addr_regl, addr_regh __attribute__((unused)); + TCGReg data_regl, data_regh; + TCGMemOpIdx oi; + TCGMemOp opc; +#if defined(CONFIG_SOFTMMU) + tcg_insn_unit *label_ptr[1]; +#endif + TCGReg base = TCG_REG_TMP0; + + data_regl = *args++; + data_regh = (TCG_TARGET_REG_BITS == 32 && is_64 ? *args++ : 0); + addr_regl = *args++; + addr_regh = (TCG_TARGET_REG_BITS < TARGET_LONG_BITS ? *args++ : 0); + oi = *args++; + opc = get_memop(oi); + +#if defined(CONFIG_SOFTMMU) + tcg_out_tlb_load(s, addr_regl, addr_regh, oi, label_ptr, 0); + tcg_out_qemu_st_direct(s, data_regl, data_regh, base, opc); + add_qemu_ldst_label(s, 0, oi, + (is_64 ? TCG_TYPE_I64 : TCG_TYPE_I32), + data_regl, data_regh, addr_regl, addr_regh, + s->code_ptr, label_ptr); +#else + if (TCG_TARGET_REG_BITS > TARGET_LONG_BITS) { + tcg_out_ext32u(s, base, addr_regl); + addr_regl = base; + } + + if (guest_base == 0) { + tcg_out_opc_reg(s, OPC_ADD, base, addr_regl, TCG_REG_ZERO); + } else { + tcg_out_opc_reg(s, OPC_ADD, base, TCG_GUEST_BASE_REG, addr_regl); + } + tcg_out_qemu_st_direct(s, data_regl, data_regh, base, opc); +#endif +}