From patchwork Thu May 11 08:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 680869 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp3267561wrs; Thu, 11 May 2023 01:12:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4baAVQsN5fGdMOkihowpR7LtDo+SyvXOlawaptF8/xRjP3Urdf4uj0rd7493qpsasjM+KG X-Received: by 2002:a05:6214:2484:b0:605:648b:2adc with SMTP id gi4-20020a056214248400b00605648b2adcmr35657126qvb.19.1683792740939; Thu, 11 May 2023 01:12:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683792740; cv=none; d=google.com; s=arc-20160816; b=XnZi3PVOzRPkaF2Z6HvLwnErmg8XkcmD+VIzhzbKspHQdQ8Tx3RoCbYanCVc6678Jv sz9v09AOw5MbRHOd4mglGEcMAWHDovGR1Edaj9oj6VpFV3Za2l9xnCfV+VKzWS9h/wwQ G9XTyvn9MBml0GEiRxyCqI9Wq4iPyWKNxwNImV+86DndAdiKD+wnV/c0n4s+O+FZ7IB+ tQhJEk0/RuHrND0Y4s6JauWYoczRpVp4cb9jWm2lU18+XmEDOxs5C+MqMEAdzXoHE8Mc MkCZmH4v/Or75QxNkbBanbWxgwfHEkYvb908rVVECeo6rnu7hx1aGsksTkXnW38caA0V Jpkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=S8RtnewBREelRk2wvCU4YAc0w9WRx08DJdvjsASE20Q=; b=Q1Sptrzjcsj60omFLDM98hrw2Xzkfyr2Z2mrSt6wbApFH5SZ0LcmAVfma8bJMF5bNS njfQkzas3emZSMshWvhXY3KXO5YVzITUlo4RxsYHpLidZhsZo4EPm8pAZtBvCUw48oCc brCf823aeW68KPOXXAmnjInqMj8CWAoN1UEGpwQzMLuYNGa183hkToBC75uiKeF5rBmG 8kubscaWX8zEjiq3oNtBfZZjk/36eQqYsGmirsp1IkWB13I/3cJ3PF+9Y4DUGayXe7Wo 9Pe9NXAcnF1YbSoflNg3nnMeLFH/7yHU59+m9RzzrbuyJ7pGQ3BacNJyVo06qSckpL5a c0yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tpygpO37; 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 kk7-20020a056214508700b005ef79fa9aa7si1612312qvb.216.2023.05.11.01.12.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 May 2023 01:12:20 -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=tpygpO37; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px1Ie-0006Qg-2l; Thu, 11 May 2023 04:05:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1px1IY-0006NJ-EG for qemu-devel@nongnu.org; Thu, 11 May 2023 04:05:14 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1px1IS-0000zg-DD for qemu-devel@nongnu.org; Thu, 11 May 2023 04:05:14 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-50bd2d7ba74so76559232a12.1 for ; Thu, 11 May 2023 01:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683792306; x=1686384306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S8RtnewBREelRk2wvCU4YAc0w9WRx08DJdvjsASE20Q=; b=tpygpO37QElwBX5gE0YQ4dJsGUEFXic8/ywVaCVjCeIxhz3yso5Zva+gOx/+xYZZG7 Ld877EN1hqA+lW4XsazmgZhqnLJWeeBmFZpQr9E/nESMNXZaGNbINbcX/Ywv4SBZjIqE n02v+cgnEvHwWPkH566/+Nz84QIfyxqgL2Rmovk4KrI5EB43G9bG3/xQ5E6Lv1vMsJpd j16WkaKfZgRVFgJIYQhw16+B2hyxgq/fHravnG4r/ANqhb7SlS2XGHm5VRdTRIbkhWSY jGY2c0Ul+IotM4vIqS7btJRNA7V3+1iagRv2UwQycJMNJmVINjyx821JrHFjtJwjmie4 GoxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683792306; x=1686384306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S8RtnewBREelRk2wvCU4YAc0w9WRx08DJdvjsASE20Q=; b=J02aHkmTv/vVJV71CeTyhUQOjNqrMegcKGmGbSdFL0S9Q8qc2gwbPKF/1nZnYDXQxK 4TTsIR+eR0XLByHIaph3f+hEfPpjlaDsTk3ssm/uu4FydwbmDrV6TN3/2+yyp0wxOddt LXr/G79OA46KmPnoXvrS46jkJZXcwZhNyTNmKomNVd7t7vpbcuA+NZADfGqyuE+Zrjvc F4vNrdNjHW8vijG17P98GRpePH8QUaF7X191cPDZmwpLiPTJ8X4ikc5UZM8tl8t6Hsa5 sN3am3p8/7KEj39bZUUc1sG7wP3Ct6tBXjQ+L8IB4UWbjQ0XTT1ynN68tzejeTZ44g26 grUw== X-Gm-Message-State: AC+VfDx/bdqDdHWv1WQoZQoDBvExil8bk2xAe1cit6fQybBlnlmGDE7b 2pz+UJPSOgkKwHWFWnfcsfhH/V+9Qg23h43rnjOm+g== X-Received: by 2002:a05:6402:510d:b0:506:94db:f4fb with SMTP id m13-20020a056402510d00b0050694dbf4fbmr15228541edd.20.1683792305975; Thu, 11 May 2023 01:05:05 -0700 (PDT) Received: from stoup.. ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i12-20020aa7c70c000000b0050bd7267a5csm2662095edq.58.2023.05.11.01.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 01:05:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 21/53] tcg/i386: Convert tcg_out_qemu_ld_slow_path Date: Thu, 11 May 2023 09:04:18 +0100 Message-Id: <20230511080450.860923-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511080450.860923-1-richard.henderson@linaro.org> References: <20230511080450.860923-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-ed1-x52a.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Use tcg_out_ld_helper_args and tcg_out_ld_helper_ret. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c.inc | 71 +++++++++++++++------------------------ 1 file changed, 28 insertions(+), 43 deletions(-) diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 18b0e7997d..3508b9cc6c 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -1802,13 +1802,37 @@ static void * const qemu_st_helpers[(MO_SIZE | MO_BSWAP) + 1] = { [MO_BEUQ] = helper_be_stq_mmu, }; +/* + * Because i686 has no register parameters and because x86_64 has xchg + * to handle addr/data register overlap, we have placed all input arguments + * before we need might need a scratch reg. + * + * Even then, a scratch is only needed for l->raddr. Rather than expose + * a general-purpose scratch when we don't actually know it's available, + * use the ra_gen hook to load into RAX if needed. + */ +#if TCG_TARGET_REG_BITS == 64 +static TCGReg ldst_ra_gen(TCGContext *s, const TCGLabelQemuLdst *l, int arg) +{ + if (arg < 0) { + arg = TCG_REG_RAX; + } + tcg_out_movi(s, TCG_TYPE_PTR, arg, (uintptr_t)l->raddr); + return arg; +} +static const TCGLdstHelperParam ldst_helper_param = { + .ra_gen = ldst_ra_gen +}; +#else +static const TCGLdstHelperParam ldst_helper_param = { }; +#endif + /* * Generate code for the slow path for a load at the end of block */ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) { - MemOpIdx oi = l->oi; - MemOp opc = get_memop(oi); + MemOp opc = get_memop(l->oi); tcg_insn_unit **label_ptr = &l->label_ptr[0]; /* resolve label address */ @@ -1817,49 +1841,10 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) tcg_patch32(label_ptr[1], s->code_ptr - label_ptr[1] - 4); } - if (TCG_TARGET_REG_BITS == 32) { - int ofs = 0; - - tcg_out_st(s, TCG_TYPE_PTR, TCG_AREG0, TCG_REG_ESP, ofs); - ofs += 4; - - tcg_out_st(s, TCG_TYPE_I32, l->addrlo_reg, TCG_REG_ESP, ofs); - ofs += 4; - - if (TARGET_LONG_BITS == 64) { - tcg_out_st(s, TCG_TYPE_I32, l->addrhi_reg, TCG_REG_ESP, ofs); - ofs += 4; - } - - tcg_out_sti(s, TCG_TYPE_I32, oi, TCG_REG_ESP, ofs); - ofs += 4; - - tcg_out_sti(s, TCG_TYPE_PTR, (uintptr_t)l->raddr, TCG_REG_ESP, ofs); - } else { - tcg_out_mov(s, TCG_TYPE_PTR, tcg_target_call_iarg_regs[0], TCG_AREG0); - tcg_out_mov(s, TCG_TYPE_TL, tcg_target_call_iarg_regs[1], - l->addrlo_reg); - tcg_out_movi(s, TCG_TYPE_I32, tcg_target_call_iarg_regs[2], oi); - tcg_out_movi(s, TCG_TYPE_PTR, tcg_target_call_iarg_regs[3], - (uintptr_t)l->raddr); - } - + tcg_out_ld_helper_args(s, l, &ldst_helper_param); tcg_out_branch(s, 1, qemu_ld_helpers[opc & (MO_BSWAP | MO_SIZE)]); + tcg_out_ld_helper_ret(s, l, false, &ldst_helper_param); - if (TCG_TARGET_REG_BITS == 32 && (opc & MO_SIZE) == MO_64) { - TCGMovExtend ext[2] = { - { .dst = l->datalo_reg, .dst_type = TCG_TYPE_I32, - .src = TCG_REG_EAX, .src_type = TCG_TYPE_I32, .src_ext = MO_UL }, - { .dst = l->datahi_reg, .dst_type = TCG_TYPE_I32, - .src = TCG_REG_EDX, .src_type = TCG_TYPE_I32, .src_ext = MO_UL }, - }; - tcg_out_movext2(s, &ext[0], &ext[1], -1); - } else { - tcg_out_movext(s, l->type, l->datalo_reg, - TCG_TYPE_REG, opc & MO_SSIZE, TCG_REG_EAX); - } - - /* Jump to the code corresponding to next IR of qemu_st */ tcg_out_jmp(s, l->raddr); return true; }