From patchwork Tue Dec 25 20:55:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154480 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5212499ljp; Tue, 25 Dec 2018 13:03:13 -0800 (PST) X-Google-Smtp-Source: ALg8bN4d3FiNLXkIz5PRQwrFj/SblQKelykjNwL1lhpFQrmV+P+wAwq9/BRU3AShfQepKMheDGHs X-Received: by 2002:a37:dd84:: with SMTP id u4mr16478354qku.56.1545771793376; Tue, 25 Dec 2018 13:03:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545771793; cv=none; d=google.com; s=arc-20160816; b=mNBwAzLjv0/dgsWMLafDRHCSSd7in7LiEniMM9c+BEjnZQnhG9aU/Vj/QqWZ/isybQ 8ImX+APdhPUoxjFSlvihBvUcCRg0ijVUr3Uqn7M4pCnCaQrAMpnNKqpPEMdSjxPSiogD 6tmKjcFMvjgr+UNUl3YZlAu5uRET+7MahueUINlnswETlwdg0TAm9nM8VSbdh7qSdOcY zoPIhBjCvuDnOjQi1gfWS3LkycnO6lKfmI1BAhzHMVxYY80NdoycqdgQX/hb3lnsC1Yc Emg4ywDGz+u+fbjHoH/xBpp8uultitGMaK0vrpq7BQLKSG7qdgW3Ea4dmHbm+Cql7krV lh1A== 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=CA8Yy8kQm8FvWeCQYdlXRjZqDQYPeW0QvjBq7JtZ3JM=; b=S77c/Z0Yv1ZVbfdcDjU9OZlKy7DqwI/0LWKQU2x3b0xef6CuA4x1vqtzHju7yxJVHX qrSzz8X3wrRoNgLvc4cDqXm5YeEv2F0EC4+IwwXs4p7NHME0JP6YSfMRHYlGW7v80IPj SUG12xEkrLO2w5vX1E2hyfBJ9hfGlLPYlXTA2v3KItHCpkDSxzt3Xz5Pj64MhaeSnkwg /24YrQSPmAWsl7i27+ps5n8YaP3v3StSJrjn8dVCiZhGniu8OD1oidlpRKbU+xHyuEAz CFA0SWKYeAjUDuNLezQicpP/mrNxhEJ7Ek+Ku0/DcjTG0o3y+ouIMA/HyLUqEn1AXAf/ GM8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gGQCcrTQ; 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 c47si66943qvh.87.2018.12.25.13.03.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:03:13 -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=gGQCcrTQ; 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]:43070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtr6-0003Hm-Rm for patch@linaro.org; Tue, 25 Dec 2018 16:03:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtlX-0005GJ-G0 for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtlR-0007rF-Jb for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:27 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:34338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtlQ-0007pJ-P3 for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:21 -0500 Received: by mail-pf1-x42b.google.com with SMTP id h3so7091001pfg.1 for ; Tue, 25 Dec 2018 12:57:20 -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=CA8Yy8kQm8FvWeCQYdlXRjZqDQYPeW0QvjBq7JtZ3JM=; b=gGQCcrTQj4tHog63gWMgFCxmA1kB7QUMPD2Jm3eRVFGHOLcl9u5gTaiwdCF2F+7Spm zLoIuuvLAkUz4jrbBjjmWQ+b2nC4wGDhQLiHSBiu3lw35rKIsg0CJTVXpAOw64xsizQb DRu1cqcwIq5ZDMtz3lKVnhZUtRBxUfKeu9Bxk= 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=CA8Yy8kQm8FvWeCQYdlXRjZqDQYPeW0QvjBq7JtZ3JM=; b=d2cFDM0CK2YE0n/TqypZcTWdd0EZrcSkb/2Vx9uQDXFE0bvHbBAvAk1FDpJ6LyuDCX ObQtS3pFKcCJ7wCtS2M8qzirpmw39TBVznm9eewsphAYhW6D8ucziGK2/bA3SaJVfrDD EuKw1HWhVbRWuy1UZR1bB6WvrmeHigNHoyVp1LDiSa4sq2RoiK9IkfeQoxGQuvgelu55 dKAPLRoqEN+4cn/s0mUEPY+Qhf+t88fsbRFNtS3wCKSQS6huLvqKgVIFzWp9nY3eeM+Y 626D4h5HHzdtAo36WlLmkxXC2IIZ4r6jjDGSmuAtRheqIaGd9yPqGKHT4qu6k3cIOm43 tSxw== X-Gm-Message-State: AJcUukdqoQQ5Z/pWSgxs+Vyu11Ed+GJlVYKA8Jpdu1MTO1VwH4wPKVpK b++ScMJaZucrw3gdbkaa/pmMY5XnIQw= X-Received: by 2002:a63:2263:: with SMTP id t35mr16622367pgm.69.1545771438882; Tue, 25 Dec 2018 12:57:18 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:57:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:55:00 +1100 Message-Id: <20181225205529.10874-14-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::42b Subject: [Qemu-devel] [PULL 13/42] tcg/riscv: Add the out 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: Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.inc.c | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) -- 2.17.2 diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c index 48399480b2..65718df7ad 100644 --- a/tcg/riscv/tcg-target.inc.c +++ b/tcg/riscv/tcg-target.inc.c @@ -630,3 +630,68 @@ static void tcg_out_ext32s(TCGContext *s, TCGReg ret, TCGReg arg) { tcg_out_opc_imm(s, OPC_ADDIW, ret, arg, 0); } + +static void tcg_out_ldst(TCGContext *s, RISCVInsn opc, TCGReg data, + TCGReg addr, intptr_t offset) +{ + intptr_t imm12 = sextreg(offset, 0, 12); + + if (offset != imm12) { + intptr_t diff = offset - (uintptr_t)s->code_ptr; + + if (addr == TCG_REG_ZERO && diff == (int32_t)diff) { + imm12 = sextreg(diff, 0, 12); + tcg_out_opc_upper(s, OPC_AUIPC, TCG_REG_TMP2, diff - imm12); + } else { + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP2, offset - imm12); + if (addr != TCG_REG_ZERO) { + tcg_out_opc_reg(s, OPC_ADD, TCG_REG_TMP2, TCG_REG_TMP2, addr); + } + } + addr = TCG_REG_TMP2; + } + + switch (opc) { + case OPC_SB: + case OPC_SH: + case OPC_SW: + case OPC_SD: + tcg_out_opc_store(s, opc, addr, data, imm12); + break; + case OPC_LB: + case OPC_LBU: + case OPC_LH: + case OPC_LHU: + case OPC_LW: + case OPC_LWU: + case OPC_LD: + tcg_out_opc_imm(s, opc, data, addr, imm12); + break; + default: + g_assert_not_reached(); + } +} + +static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg, + TCGReg arg1, intptr_t arg2) +{ + bool is32bit = (TCG_TARGET_REG_BITS == 32 || type == TCG_TYPE_I32); + tcg_out_ldst(s, is32bit ? OPC_LW : OPC_LD, arg, arg1, arg2); +} + +static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, + TCGReg arg1, intptr_t arg2) +{ + bool is32bit = (TCG_TARGET_REG_BITS == 32 || type == TCG_TYPE_I32); + tcg_out_ldst(s, is32bit ? OPC_SW : OPC_SD, arg, arg1, arg2); +} + +static bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val, + TCGReg base, intptr_t ofs) +{ + if (val == 0) { + tcg_out_st(s, type, TCG_REG_ZERO, base, ofs); + return true; + } + return false; +}