From patchwork Tue Dec 25 20:54:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154490 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5217968ljp; Tue, 25 Dec 2018 13:11:21 -0800 (PST) X-Google-Smtp-Source: ALg8bN4/KrbdKGkwVHy0T0xA0kWR6uumfPUaIo+scV9nxkutlSUsQZxrfLGRdXntcVMBwMFBQuBe X-Received: by 2002:a37:9a52:: with SMTP id c79mr15327075qke.172.1545772280963; Tue, 25 Dec 2018 13:11:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545772280; cv=none; d=google.com; s=arc-20160816; b=q6B9FZdBvN+raJFUT5iNzvh7BOP77vfIJqgUZrY+z0MtK9NGnOBEqTkO7k9GbVPZvl ZRB0tJ2c6RqygcuTOdzVSu+Ofun3xe50AroBa3Xagorev56yPqm9CTO65J6lujHp7hY6 jY/UnHxQu1P0TtGuvJjpVvnkxbV1vs8Gloqd3lk38Vwia2PUKfOwtVC7J1Lm7QZlsJR6 x4mkomd65beayIM+Ngo45PIpWIsjLYtWj3KYrmxMpgkkPSBTb4JFtDjXL9VdxZIbRshX ZnsMONpMDEa8M96QjUc1QOg91V+6SG6FV8GQsAmcos7VTfVqCpxqIjJ9EAByVrUzDZpA EKIg== 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=roey7MaKzLOK1mtW7WNnSxDIzzsjTgofsH4zmety2y4=; b=ww2+dtBwMvW8mZIW2K92l8KbAi0n7zBSY9GcrAzkX2TN/gFThR5rfwq8oslH8Uq8be 16t0rzDYu/i3nPDB9Z/UaBVeGl4GjBJhhUvA4hZNYDkdT1T3PvU6kvZtGBayebmHC01o DJ/OplChbahxvsN8OoqyOBIxgdfCk8okBs8Bv4jFBMmS6VhFpRonOD2FVd2Q0vGM8wdl DUjP2vq09yryeTkmxobP6ghwuPSa+U6xFhY3I9QhXK5SgTkbmhaB1b0jgJy1iWb4sMAU urHTvIJS/QticTiGNOqrXHD9vxQ7odwUIZ0S48m5wx6oni//uQe5Vwa+9BJ0GGf+ynfD Qqqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UPwTmkhl; 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 q45si1662500qte.344.2018.12.25.13.11.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:11:20 -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=UPwTmkhl; 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]:43146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtyy-0005yO-CO for patch@linaro.org; Tue, 25 Dec 2018 16:11:20 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtl4-0004gA-Kv for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:57:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtl3-0007SK-Q1 for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:56:58 -0500 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:45256) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtl3-0007R1-KE for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:56:57 -0500 Received: by mail-pg1-x532.google.com with SMTP id y4so6808093pgc.12 for ; Tue, 25 Dec 2018 12:56:57 -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=roey7MaKzLOK1mtW7WNnSxDIzzsjTgofsH4zmety2y4=; b=UPwTmkhlcAdYiMUXssZXA/IBShZfL2E7dQxBT/Hu7d5JbqegRUXDjLNqpZLYVjuXvt 7oxB/gYG2IIJIMfElDR3sdwWvD7xJxw+ugOxD2fr9S4qapHNhHfvWT/u5VTkRMXzdtnx n7XCtJQBvo3MkdwUTCcyYwS8KET0OPDHkbJT4= 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=roey7MaKzLOK1mtW7WNnSxDIzzsjTgofsH4zmety2y4=; b=HeuafavZK5HQG8SGPxdxWQ559w42CnZGm+FhBTnApFeKA/wlm/zPnreBA+NYC4R4Zv lsclmG0s3bNwAbueiKIoGGdudoqD5a5ReNf4Ksgc4SL6d4/LJvZb6GSNr+KpHR57YuiM DVXCHxWAOFUOc/L6Wh9rnkzdxIRW2cJFhZXOqffZeErAmcF/wc94E0o4fEqtP96PCKeV iyuP+QducMrqb8m54VbqEBoPXFYjKlUJ4V1U9ZU2lfUqUkgv+MdmcdlnMqSXfqGpJA3g mo/Kb5xOGmspEsCRFGRjbF5d6qkWfrkO+CYes6i7S4sjNYNttu2tyYd8Qal4snWeVqVM AoNQ== X-Gm-Message-State: AJcUukfe56hy7WsCnxxg/iqn8VXMtT2xG0AXhW/8u6ZlEXP0z+ao8QeD y9dc0x5KrpJaeHW1ekppcoZwYyroqtg= X-Received: by 2002:a62:c185:: with SMTP id i127mr5311171pfg.43.1545771415954; Tue, 25 Dec 2018 12:56:55 -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.56.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:56:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:54:57 +1100 Message-Id: <20181225205529.10874-11-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::532 Subject: [Qemu-devel] [PULL 10/42] tcg/riscv: Add the relocation functions 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: <6ac4f4b0d5ea93cb0ee9a3b8b47ee9f7b3711494.1545246859.git.alistair.francis@wdc.com> Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.inc.c | 88 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) -- 2.17.2 diff --git a/tcg/riscv/tcg-target.inc.c b/tcg/riscv/tcg-target.inc.c index d198cfd5f7..a26744052f 100644 --- a/tcg/riscv/tcg-target.inc.c +++ b/tcg/riscv/tcg-target.inc.c @@ -422,3 +422,91 @@ static void tcg_out_nop_fill(tcg_insn_unit *p, int count) p[i] = encode_i(OPC_ADDI, TCG_REG_ZERO, TCG_REG_ZERO, 0); } } + +/* + * Relocations + */ + +static bool reloc_sbimm12(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +{ + intptr_t offset = (intptr_t)target - (intptr_t)code_ptr; + + if (offset == sextreg(offset, 1, 12) << 1) { + code_ptr[0] |= encode_sbimm12(offset); + return true; + } + + return false; +} + +static bool reloc_jimm20(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +{ + intptr_t offset = (intptr_t)target - (intptr_t)code_ptr; + + if (offset == sextreg(offset, 1, 20) << 1) { + code_ptr[0] |= encode_ujimm20(offset); + return true; + } + + return false; +} + +static bool reloc_call(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +{ + intptr_t offset = (intptr_t)target - (intptr_t)code_ptr; + int32_t lo = sextreg(offset, 0, 12); + int32_t hi = offset - lo; + + if (offset == hi + lo) { + code_ptr[0] |= encode_uimm20(hi); + code_ptr[1] |= encode_imm12(lo); + return true; + } + + return false; +} + +static bool patch_reloc(tcg_insn_unit *code_ptr, int type, + intptr_t value, intptr_t addend) +{ + uint32_t insn = *code_ptr; + intptr_t diff; + bool short_jmp; + + tcg_debug_assert(addend == 0); + + switch (type) { + case R_RISCV_BRANCH: + diff = value - (uintptr_t)code_ptr; + short_jmp = diff == sextreg(diff, 0, 12); + if (short_jmp) { + return reloc_sbimm12(code_ptr, (tcg_insn_unit *)value); + } else { + /* Invert the condition */ + insn = insn ^ (1 << 12); + /* Clear the offset */ + insn &= 0x01fff07f; + /* Set the offset to the PC + 8 */ + insn |= encode_sbimm12(8); + + /* Move forward */ + code_ptr[0] = insn; + + /* Overwrite the NOP with jal x0,value */ + diff = value - (uintptr_t)(code_ptr + 1); + insn = encode_uj(OPC_JAL, TCG_REG_ZERO, diff); + code_ptr[1] = insn; + + return true; + } + break; + case R_RISCV_JAL: + return reloc_jimm20(code_ptr, (tcg_insn_unit *)value); + break; + case R_RISCV_CALL: + return reloc_call(code_ptr, (tcg_insn_unit *)value); + break; + default: + tcg_abort(); + } +}