From patchwork Sat Jun 26 05:02:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 467420 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2136911jao; Fri, 25 Jun 2021 22:05:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8SXYQf25O12qzjj4RE6yUubIroHet3fp2UvLW5LGrXy1AxzuVY1j4EgWp75doK5EUQpJq X-Received: by 2002:a05:622a:84:: with SMTP id o4mr12650068qtw.360.1624683953598; Fri, 25 Jun 2021 22:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624683953; cv=none; d=google.com; s=arc-20160816; b=jV+XOrXLDS6nM7Wt8Djg+jSMNZgSgEc+d2sJsCSJdn2RqOde/UCeiz1RIwTX/dWXkj RzxihLx0OUM6Jjl6koP1Xk+sJ0vlE+s3uOOSTVwonoBeAeLusPcC4rcBbDkKzTB584Mf xa6t2K33M6zggxGiQx6jdaGXmJG3ldBwEeYPT8a6PCj7TajAZvCRQkLASVaRMKhT7h9h W5zjSMssYUSClqOoBTHWce6TdZyMwqxrB7yOgHhz6JvNAAs8Ven6f9H6fam2NtS5p+H7 GKkMMTAVIxShd3Grqx313AnXslUsu0Q9A1M0UpQQJP2uMl7rvUopUea9IkbCoqa7bFN4 F83w== 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=QOIjP++pUZAecpRcUAi86x58Btt1FbABLnvHLDjfasY=; b=Ph0HMBdmpMT+Hdza6iNv2zBNh8y+dTL5eewhIbCmJ0Zx2mm2i2kSjXiaje+t6G2cqz tLgfU+yAIywVMAFW9m4Hff0o/ITNNukiJvrjWfK3RO894iPQwIuJUrouYra1egTabPVD EPuBZ/rZjsireyFFepEA/uF8M2t1LQCt6B+9fuQ6KsZsqtWoSlA047jMNH19eJ1F1QSv /foewkeTSveTkIMO1JHjg6AjxySHTu0PCVrZ0362xf8wTvXU/JGiN9hSkOAhsYCSvj2j x7XWgPG74dX7LVIEqROAgx0c0MXgDps//jMvybVOZFzvExzL/EkT0izkuvOQQ6J3Jg+p laKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jp0vbH6t; 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 22si2138779qtp.131.2021.06.25.22.05.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jun 2021 22:05:53 -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=jp0vbH6t; 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]:44462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lx0Vt-0003rz-2K for patch@linaro.org; Sat, 26 Jun 2021 01:05:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lx0TJ-0006lE-59 for qemu-devel@nongnu.org; Sat, 26 Jun 2021 01:03:13 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:34425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lx0TH-0008Ci-8W for qemu-devel@nongnu.org; Sat, 26 Jun 2021 01:03:12 -0400 Received: by mail-pf1-x432.google.com with SMTP id i6so9151856pfq.1 for ; Fri, 25 Jun 2021 22:03:10 -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=QOIjP++pUZAecpRcUAi86x58Btt1FbABLnvHLDjfasY=; b=jp0vbH6tPVp3cRq2mC41TTHIRI0lHDH0Rrp2S8dkDO16hhTZxZbR1OUAiobH0ukofC PZ7Jcuw/t8WelgXZIvzQcc0dutO9Jhmq2ZTt5LCLtWBCe90Or2RXsHj+BoCHFKPqAoYy V2vaCevlK1fOjtbJQQPNrHPIONBqegLFdWiKTLc0r2ujhFJf+wrg5MsqPJGE808eEBeh 9f1+2LKcJZmGBeJEPHCotIY9y4a1vEPUy0s3JXxywPAT+WPxKJDR92NzRUFvGLN0chlS suyjHHqGYJMc0bfBJnkF8JFjBIskVRTvBnULyTs7boiizjebD3bazL7kPm1vvMdHGAST s/IA== 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=QOIjP++pUZAecpRcUAi86x58Btt1FbABLnvHLDjfasY=; b=BxXxsOOET9iWSslGN+tWISdGj5Gdiy9ejjlHhdyq8y7nfwqcI0iTroBWzFEGkXuQje TfwUyk5iM89AO5j0KzK1q/w6MHTQS3urSbV5nfV1Obkq31czzx0SnNpecwRW5gEJGN3p LanCYwDo16oBxYzRkslMHsFEfN/WWvtSlQfM7RKi7PsTO6yw8RGv/ELNLfbHG+flp5lU 7KgD5JNfoo2jdxXLVVbnGkJHk3vycSsNQpSeIhaLv3Xy4f0+xV79aJ8xFhd7d1Ix3lVW y++7KArAjza6cXXZH2i7KuYL67kCeVUD8YBtkkRGHvcvcd+Fzhs1ZAntTPV5cYfc87OF Mc7g== X-Gm-Message-State: AOAM531i9DmYuy0L1q19bzX8qzaOWQaB+K23BWzltO/fB6ixx8IAFhii hoa3Bb+m+nK8u7Npz1C01VLG7wY1qxuXvw== X-Received: by 2002:aa7:8509:0:b029:2e5:8cfe:bc17 with SMTP id v9-20020aa785090000b02902e58cfebc17mr13914652pfn.2.1624683789926; Fri, 25 Jun 2021 22:03:09 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id c62sm7389768pfa.12.2021.06.25.22.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 22:03:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 03/16] tcg/s390x: Merge TCG_AREG0 and TCG_REG_CALL_STACK into TCGReg Date: Fri, 25 Jun 2021 22:02:54 -0700 Message-Id: <20210626050307.2408505-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210626050307.2408505-1-richard.henderson@linaro.org> References: <20210626050307.2408505-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" They are rightly values in the same enumeration. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- tcg/s390x/tcg-target.h | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) -- 2.25.1 diff --git a/tcg/s390x/tcg-target.h b/tcg/s390x/tcg-target.h index e1209cfef3..eb17657994 100644 --- a/tcg/s390x/tcg-target.h +++ b/tcg/s390x/tcg-target.h @@ -32,22 +32,13 @@ #define MAX_CODE_GEN_BUFFER_SIZE (3 * GiB) typedef enum TCGReg { - TCG_REG_R0 = 0, - TCG_REG_R1, - TCG_REG_R2, - TCG_REG_R3, - TCG_REG_R4, - TCG_REG_R5, - TCG_REG_R6, - TCG_REG_R7, - TCG_REG_R8, - TCG_REG_R9, - TCG_REG_R10, - TCG_REG_R11, - TCG_REG_R12, - TCG_REG_R13, - TCG_REG_R14, - TCG_REG_R15 + TCG_REG_R0, TCG_REG_R1, TCG_REG_R2, TCG_REG_R3, + TCG_REG_R4, TCG_REG_R5, TCG_REG_R6, TCG_REG_R7, + TCG_REG_R8, TCG_REG_R9, TCG_REG_R10, TCG_REG_R11, + TCG_REG_R12, TCG_REG_R13, TCG_REG_R14, TCG_REG_R15, + + TCG_AREG0 = TCG_REG_R10, + TCG_REG_CALL_STACK = TCG_REG_R15 } TCGReg; #define TCG_TARGET_NB_REGS 16 @@ -139,7 +130,6 @@ extern uint64_t s390_facilities[1]; #define TCG_TARGET_HAS_mulsh_i64 0 /* used for function call generation */ -#define TCG_REG_CALL_STACK TCG_REG_R15 #define TCG_TARGET_STACK_ALIGN 8 #define TCG_TARGET_CALL_STACK_OFFSET 160 @@ -148,10 +138,6 @@ extern uint64_t s390_facilities[1]; #define TCG_TARGET_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) -enum { - TCG_AREG0 = TCG_REG_R10, -}; - static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, uintptr_t jmp_rw, uintptr_t addr) {