From patchwork Fri Nov 30 21:52:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 152596 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4169258ljp; Fri, 30 Nov 2018 13:56:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/VsrZfQVse5LCwRR7OUxv22IokSkQlalKEpHoPRMJyFTHiCNDtLI2nJkV3KKRqnOAB6yefU X-Received: by 2002:a81:b3c3:: with SMTP id r186mr7675872ywh.66.1543614965718; Fri, 30 Nov 2018 13:56:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543614965; cv=none; d=google.com; s=arc-20160816; b=DvkzVz4lnWKdOH0JNPRHYT0GkQoOYq0b42F9rjHiW9OX9pQ8Z+5RKsad6j4s7wiHZs pDKi4GU1QpXtQZFwQitw2aIPPylgqcSY21fWGLw50UzNnz/muVmnJb+JaJC+m25YP1x0 upTHqSdBfWrdCEjPSfwa2NTnzTN+8Cvne27RP6KOvirmP2rLghgB26OxUOGvEte59cSo RHuiAocNs4gV56A3jI72RVxwV4BAMgbJpyrPVcoCwJn27/lbjg0Z8BakAV3njn+RieNV AIvbNRG1Lf2kfnXaK3oRjfYEFdKGkW/d4k66a5ZQPDy7ay7CdeYSkUlhMBEVj1SKHIxB sIYw== 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=8d6/+vDMAvBZgsrjYW7C4rNaADj256qJL0tBGY8IUpM=; b=soM4iToxTH5pJDzC4mx5Yt5d0Xb9o9+e7ZptnctGoALge8uLDPO8b9+PAj5ZqlcShC +sLBP6uJgORrFYHqQ38tBeADBcp2ybz7FjMuFQtlNaCD0zDY+lfHdbCZumIhR6rtWLUv 0OjTH17er+uCmdxOam10Q/c1tIOfrYwfHS7xROI9qWrfoxwaLQsrk1b/5N6fa1SzL+2b PB9ISnomiIoeV9U/0wx9E5HqtTxLmTunD9899HJ7dD4YorW+REfolh+EO9EPrOyOsxm+ DkmSlhgjeXTtIoLx1cJYRj3SwixNKH5gaJXeyoUr7qyMTyXPZ1raWQwlW6Zzcj6UJS4e o6Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EpGO1L28; 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 o186si3959411ywe.9.2018.11.30.13.56.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Nov 2018 13:56:05 -0800 (PST) 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=EpGO1L28; 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]:34751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSqlZ-0003UO-2c for patch@linaro.org; Fri, 30 Nov 2018 16:56:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSqiL-0008BT-Tu for qemu-devel@nongnu.org; Fri, 30 Nov 2018 16:52:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSqiI-0007Uw-Cg for qemu-devel@nongnu.org; Fri, 30 Nov 2018 16:52:45 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:33625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSqiI-0007Rn-7P for qemu-devel@nongnu.org; Fri, 30 Nov 2018 16:52:42 -0500 Received: by mail-pf1-x442.google.com with SMTP id c123so3445805pfb.0 for ; Fri, 30 Nov 2018 13:52:42 -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=8d6/+vDMAvBZgsrjYW7C4rNaADj256qJL0tBGY8IUpM=; b=EpGO1L28KpxiPJuzMayFrp+B5mRHRhs/jMBtgTcNox7cBMT4aQIs4Ua4ZttoVSE2JM h7bkL9MKdznGWwUtcJo5p9T3GB2bXVmFuzFm6ir3I+zNf0amZ4hD/PLmH8u4v00g1Kgw VxLCpi2FtXs0gJD6CtLw55KXYF82oBwAIk8aM= 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=8d6/+vDMAvBZgsrjYW7C4rNaADj256qJL0tBGY8IUpM=; b=axAyY6/m6Rf87Z0gcZqnWNoqVWwKLMVVO2VmRG3UbUTX+hCSsl5KwLNBLe+QF8lKAS BCDVr9S5nye+z0AZAIRmyGhgHRbLQmOJrBKABkabcTFVRSbGcYK+zVyLcx0CTX4C+bT/ 2GRyUNEUNyvl9AaIMg6xqTDvH/fZu7ztJtIP0pHl2NU9vSc8QEDVhHG8NjbkvjpLzIit gDkoD7fujYqkhmEwKVJ5spBtTwNihPtfkOoQA+DijKAkzFwdZaOM03w0yelPeHaUmHCq negvNLv39hthkl2nyhWkxe8COklTBFjUR/tXkafv/DoHv7gwX+5J51fO6osFUjISM/fa 8F8w== X-Gm-Message-State: AA+aEWZBoJ6NOQ68QdYwaJD4flPbn9b92oN+1HfL1mPafSziat0Mjjig /pExzms0ojPUUrGfyqyz4cW14EKMi3I= X-Received: by 2002:a63:2d82:: with SMTP id t124mr6168883pgt.260.1543614760759; Fri, 30 Nov 2018 13:52:40 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-170-180.tukw.qwest.net. [97.113.170.180]) by smtp.gmail.com with ESMTPSA id a18sm6973967pgj.30.2018.11.30.13.52.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 13:52:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2018 13:52:19 -0800 Message-Id: <20181130215221.20554-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181130215221.20554-1-richard.henderson@linaro.org> References: <20181130215221.20554-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::442 Subject: [Qemu-devel] [PATCH v3 14/16] tcg/arm: Return false on failure from patch_reloc 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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This does require an extra two checks within the slow paths to replace the assert that we're moving. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) -- 2.17.2 Reviewed-by: Alex Bennée diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index deefa20fbf..49f57d655e 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -187,10 +187,14 @@ static const uint8_t tcg_cond_to_arm_cond[] = { [TCG_COND_GTU] = COND_HI, }; -static inline void reloc_pc24(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +static inline bool reloc_pc24(tcg_insn_unit *code_ptr, tcg_insn_unit *target) { ptrdiff_t offset = (tcg_ptr_byte_diff(target, code_ptr) - 8) >> 2; - *code_ptr = (*code_ptr & ~0xffffff) | (offset & 0xffffff); + if (offset == sextract32(offset, 0, 24)) { + *code_ptr = (*code_ptr & ~0xffffff) | (offset & 0xffffff); + return true; + } + return false; } static bool patch_reloc(tcg_insn_unit *code_ptr, int type, @@ -199,7 +203,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type, tcg_debug_assert(addend == 0); if (type == R_ARM_PC24) { - reloc_pc24(code_ptr, (tcg_insn_unit *)value); + return reloc_pc24(code_ptr, (tcg_insn_unit *)value); } else if (type == R_ARM_PC13) { intptr_t diff = value - (uintptr_t)(code_ptr + 2); tcg_insn_unit insn = *code_ptr; @@ -213,7 +217,11 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type, } else { int rd = extract32(insn, 12, 4); int rt = rd == TCG_REG_PC ? TCG_REG_TMP : rd; - assert(diff >= 0x1000 && diff < 0x100000); + + if (diff < 0x1000 || diff >= 0x100000) { + return false; + } + /* add rt, pc, #high */ *code_ptr++ = ((insn & 0xf0000000) | (1 << 25) | ARITH_ADD | (TCG_REG_PC << 16) | (rt << 12) @@ -1372,7 +1380,8 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) TCGMemOp opc = get_memop(oi); void *func; - reloc_pc24(lb->label_ptr[0], s->code_ptr); + bool ok = reloc_pc24(lb->label_ptr[0], s->code_ptr); + tcg_debug_assert(ok); argreg = tcg_out_arg_reg32(s, TCG_REG_R0, TCG_AREG0); if (TARGET_LONG_BITS == 64) { @@ -1432,7 +1441,8 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) TCGMemOpIdx oi = lb->oi; TCGMemOp opc = get_memop(oi); - reloc_pc24(lb->label_ptr[0], s->code_ptr); + bool ok = reloc_pc24(lb->label_ptr[0], s->code_ptr); + tcg_debug_assert(ok); argreg = TCG_REG_R0; argreg = tcg_out_arg_reg32(s, argreg, TCG_AREG0);