From patchwork Fri May 8 18:25:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 186419 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp226244ill; Fri, 8 May 2020 11:27:11 -0700 (PDT) X-Google-Smtp-Source: APiQypII0RnM41bqFIi+Gz7WnHl21/semATYImfZKTLo9ddV01ulEA3mtkieGSd+Euy6V42qaag6 X-Received: by 2002:a37:7b83:: with SMTP id w125mr3935845qkc.420.1588962431484; Fri, 08 May 2020 11:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588962431; cv=none; d=google.com; s=arc-20160816; b=P6SzaBAXT0CJY7yW7a2nXNVgSE3SZ07lw+/NgAH/UTnXnXgdxTEDZsyBwZEWpsEb0F ojOQy7qL1UfE3c47dw09DFsfJW2Fky3gkYcut3NGQSSSe9d9zlJZ484Ns2RjL/T9eiyp L0uEG3ibdaRRaGyij5r7RZFrmGLvlcJIcesirVvV6nsP3FhI+Ijnz2k39FclV4pzx8uS A740kV+Fnv+3EjylM+jYwde+dMaGaiRAH0eLmhCB4ihzRkVa4AH9XK9S29FgwttFjWhn 70JcrJvggkNr2/k/rWMGfZHZ0RLRjv1j9K+8CUmlv+H2slGRxYEc/GEUmjH7JFgqkwLL XR+A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=lWkulx8CoF0cSLWK7D7tlMYLSyKx6Hnk2sQWr9PjIsk=; b=muRlKqDeOigk0Oy2KpG4fTIA2YjBxaB6S9KutVq+0rrIrv7tNmk1KVZ6yhWZa/GthY j2SGjqM3+LtYvsEhgzRhrXRKRDt6oJsX8rVsRUc6mrDULafnECXmd/f2h9+xOpBGaxkq jpHxY9RYf4peSTreGjUlMWxUwt0I60vfZ5fww8fIlutfoQXA4kAamOBcGBMSChck9xw4 Wsm4ZyP9NujwKROZHDtJ538TCMBETUMje/6im/NkK5L864InFbj9Nz8cv496V5owD3pI goYdg+4PiD4t1NcL1FJXHDrxAa3J1PqMHhfd1pbRvrVryZbzwjsYwHw91KvBfv+ynTHr 0L1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gMH6bPWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o24si1460169qtj.337.2020.05.08.11.27.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 May 2020 11:27:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gMH6bPWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jX7iI-0006f6-V3 for patch@linaro.org; Fri, 08 May 2020 14:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jX7hY-0006co-Ec for qemu-devel@nongnu.org; Fri, 08 May 2020 14:26:24 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:37278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jX7hW-0005GD-Pj for qemu-devel@nongnu.org; Fri, 08 May 2020 14:26:24 -0400 Received: by mail-pj1-x1043.google.com with SMTP id a7so4658725pju.2 for ; Fri, 08 May 2020 11:26:22 -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 :mime-version:content-transfer-encoding; bh=lWkulx8CoF0cSLWK7D7tlMYLSyKx6Hnk2sQWr9PjIsk=; b=gMH6bPWcNjNkkIuild7UgMkMf1MBex+9M9HzjZAFCHrWL2r4gQqTqWfEVHLhJ61Xvz +Oj6ZQxxFby/njrxGlv5/4YcJY/SVBF/fQzTm/sXEFKfmkc8p29eFZ/ILuPZivvbhoe8 aNdx5uuSs6rBSETb3oAraMueCyZRKtx2+mzsuj2NBYCaUs9xaYYEgeMLoBLG8ncHS4c2 sFIRrVlfnYPHIG+w5QNA9jl81IUJPHmgPO3GYEsrqB9+WJS0POfbV8SlpM92YUUzfAnC T/Yi1V7nIuBSvuE+rtGemERpGe0ZwXakbAo0thAZmKDx2OfFagmXq8HCbIusw0qxU56g drkA== 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:mime-version:content-transfer-encoding; bh=lWkulx8CoF0cSLWK7D7tlMYLSyKx6Hnk2sQWr9PjIsk=; b=izrb8EhaRdd2HN0RsztF1juhDhs2rWu+/kGurNQ1FfHkLwJMtQ4PwMeFH6VYi3j56B l3TOqKtZIAYsFAMbqOeVmHd2YG9UqdsQKgJkXNIwmtgCFzSSbyixyGwltfLaFNm6xvEI q+kFh+5E1OZlXUFlH8yhjh4qzJcnQQTaZ9f9a+kK4tzoCcpxunH9qy30in8hooax6Zrc ItHDPEG6gzWdvSiZxtsLPuXvPHXgz5wV+SqiDcFb6opV/oQwiJQNBYRt0uquaOm3QA0N qHqiwH3XFaexdhs2RWIU77ibchPKvZHb6l3ItEksx3d8Lciv4C/GCvtwv+hY8HrfvgcI 4Y7g== X-Gm-Message-State: AGi0PubjUeZWP0eNgAIauNen7syDQI/Qctu8LZ4IIWzh+vLMPPBUNLE7 3BFW9+eZrDGhGTchiVp6kaOynpVB48o= X-Received: by 2002:a17:902:b417:: with SMTP id x23mr3462293plr.51.1588962380810; Fri, 08 May 2020 11:26:20 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id u9sm2421775pfn.197.2020.05.08.11.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 11:26:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 02/19] tcg: Add temp_readonly Date: Fri, 8 May 2020 11:25:59 -0700 Message-Id: <20200508182616.18318-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200508182616.18318-1-richard.henderson@linaro.org> References: <20200508182616.18318-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1043; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In most, but not all, places that we check for TEMP_FIXED, we are really testing that we do not modify the temporary. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 5 +++++ tcg/tcg.c | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 06486635e6..0d09ea7822 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -681,6 +681,11 @@ struct TCGContext { target_ulong gen_insn_data[TCG_MAX_INSNS][TARGET_INSN_START_WORDS]; }; +static inline bool temp_readonly(TCGTemp *ts) +{ + return ts->kind == TEMP_FIXED; +} + extern TCGContext tcg_init_ctx; extern __thread TCGContext *tcg_ctx; extern TCGv_env cpu_env; diff --git a/tcg/tcg.c b/tcg/tcg.c index 2c022c9621..a529166026 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3173,7 +3173,7 @@ static void temp_load(TCGContext *, TCGTemp *, TCGRegSet, TCGRegSet, TCGRegSet); mark it free; otherwise mark it dead. */ static void temp_free_or_dead(TCGContext *s, TCGTemp *ts, int free_or_dead) { - if (ts->kind == TEMP_FIXED) { + if (temp_readonly(ts)) { return; } if (ts->val_type == TEMP_VAL_REG) { @@ -3197,7 +3197,7 @@ static inline void temp_dead(TCGContext *s, TCGTemp *ts) static void temp_sync(TCGContext *s, TCGTemp *ts, TCGRegSet allocated_regs, TCGRegSet preferred_regs, int free_or_dead) { - if (ts->kind == TEMP_FIXED) { + if (temp_readonly(ts)) { return; } if (!ts->mem_coherent) { @@ -3355,8 +3355,7 @@ static void temp_save(TCGContext *s, TCGTemp *ts, TCGRegSet allocated_regs) { /* The liveness analysis already ensures that globals are back in memory. Keep an tcg_debug_assert for safety. */ - tcg_debug_assert(ts->val_type == TEMP_VAL_MEM - || ts->kind == TEMP_FIXED); + tcg_debug_assert(ts->val_type == TEMP_VAL_MEM || temp_readonly(ts)); } /* save globals to their canonical location and assume they can be @@ -3414,7 +3413,7 @@ static void tcg_reg_alloc_do_movi(TCGContext *s, TCGTemp *ots, TCGRegSet preferred_regs) { /* ENV should not be modified. */ - tcg_debug_assert(ots->kind != TEMP_FIXED); + tcg_debug_assert(!temp_readonly(ots)); /* The movi is not explicitly generated here. */ if (ots->val_type == TEMP_VAL_REG) { @@ -3454,7 +3453,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) ts = arg_temp(op->args[1]); /* ENV should not be modified. */ - tcg_debug_assert(ots->kind != TEMP_FIXED); + tcg_debug_assert(!temp_readonly(ots)); /* Note that otype != itype for no-op truncation. */ otype = ots->type; @@ -3515,7 +3514,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) * Store the source register into the destination slot * and leave the destination temp as TEMP_VAL_MEM. */ - assert(ots->kind != TEMP_FIXED); + assert(!temp_readonly(ots)); if (!ts->mem_allocated) { temp_allocate_frame(s, ots); } @@ -3552,7 +3551,7 @@ static void tcg_reg_alloc_dup(TCGContext *s, const TCGOp *op) its = arg_temp(op->args[1]); /* ENV should not be modified. */ - tcg_debug_assert(ots->kind != TEMP_FIXED); + tcg_debug_assert(!temp_readonly(ots)); itype = its->type; vece = TCGOP_VECE(op); @@ -3783,7 +3782,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) ts = arg_temp(arg); /* ENV should not be modified. */ - tcg_debug_assert(ts->kind != TEMP_FIXED); + tcg_debug_assert(!temp_readonly(ts)); if ((arg_ct->ct & TCG_CT_ALIAS) && !const_args[arg_ct->alias_index]) { @@ -3825,7 +3824,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) ts = arg_temp(op->args[i]); /* ENV should not be modified. */ - tcg_debug_assert(ts->kind != TEMP_FIXED); + tcg_debug_assert(!temp_readonly(ts)); if (NEED_SYNC_ARG(i)) { temp_sync(s, ts, o_allocated_regs, 0, IS_DEAD_ARG(i)); @@ -3957,7 +3956,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op) ts = arg_temp(arg); /* ENV should not be modified. */ - tcg_debug_assert(ts->kind != TEMP_FIXED); + tcg_debug_assert(!temp_readonly(ts)); reg = tcg_target_call_oarg_regs[i]; tcg_debug_assert(s->reg_to_temp[reg] == NULL);