From patchwork Sat Aug 10 04:12:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Bobek X-Patchwork-Id: 11088213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D2D71399 for ; Sat, 10 Aug 2019 04:22:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76B912228E for ; Sat, 10 Aug 2019 04:22:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6803622B1F; Sat, 10 Aug 2019 04:22:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0A5132228E for ; Sat, 10 Aug 2019 04:22:36 +0000 (UTC) Received: from localhost ([::1]:34926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwItn-0003Y3-Dj for patchwork-qemu-devel@patchwork.kernel.org; Sat, 10 Aug 2019 00:22:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34825) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwIky-0005vn-FN for qemu-devel@nongnu.org; Sat, 10 Aug 2019 00:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwIkx-0004Nf-Cf for qemu-devel@nongnu.org; Sat, 10 Aug 2019 00:13:28 -0400 Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]:42325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hwIkx-0004NU-7v for qemu-devel@nongnu.org; Sat, 10 Aug 2019 00:13:27 -0400 Received: by mail-ot1-x343.google.com with SMTP id l15so140514689otn.9 for ; Fri, 09 Aug 2019 21:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uta9ArntGI4TyKGIhn9+xSKs0zFnFU+lVjX12nvNzmE=; b=MtvzrO5m//97TpKLwJ8WbiaNGE2Gvl99knQ59BLDZ4TsvRkCOjbxXhq8CsAIfgfjCa y82rxFSKpKOdyNSQob5mH0e0gV+0tTC32iuIqDSFTYAb6VLBP3A2L2lpp29XaBnYydAh AXUB175pCcEUkAUTvo5l53cg3H3nBo2oC+4WYm7i8i2JjKcUHTkL9uK3lzxeqXqe9r6E vANn8q1bInaQ+hPpos0gOwQHYHPpODC57ae0H0E7QhT8BflYYFWFJo0ENLQ+w39Ora/T q9jKRACRyGw3O/9adR3G87m2+RBSrGI40un7WoGejxLqSk7+HLOmaaxJSrbyY4roi7VA mpvg== 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=Uta9ArntGI4TyKGIhn9+xSKs0zFnFU+lVjX12nvNzmE=; b=LqXfgcRpG7pkl0ulnsQBuJuEpePoGWXoIAbOa22W71hQJtYvbsslBLIrK/JCzWfw4a oxTj5PMdBuTiriHGzYaXlyzpjXTBkNYYbUDE6RoNtAO0pw1d5eCWRhgZMMhUYLE0j5Zw e2i7Ea3POgfu8L+drn8cN331AvmVgzAc4sjGp9Hez0wW5XRXiWPb9l8tkMyquZhA3j1W GlGxUxpEupYspNowUi2eYeUc6EjZDJmR0qacvW0oZ5YuKTUUZOnxgPJixRWPl5Bo4f7n czoO6J8XIe1np85DajY3EJUAHuVb4E/I8VFQkzjs4AG4dMfpnfKfhDrhEKyeH8Mto/zi u3VQ== X-Gm-Message-State: APjAAAUIeYM9xyGE1BOl6sr0QXE12dpIV1d7JA8VJdKpzCzZpoDjRcfs In4Js39hERhlwiZ4vujXFJFchL7V X-Google-Smtp-Source: APXvYqyUdkZSbEp1tbpwmXREPxct8h0ydApSHG4PjJI2SECNU5Z5Bz49MEu9KmK9zgIqsvEtiIzm1g== X-Received: by 2002:a05:6830:11d7:: with SMTP id v23mr10443218otq.58.1565410406542; Fri, 09 Aug 2019 21:13:26 -0700 (PDT) Received: from dionysus.attlocal.net (69-222-133-165.lightspeed.tukrga.sbcglobal.net. [69.222.133.165]) by smtp.gmail.com with ESMTPSA id f84sm33383540oig.43.2019.08.09.21.13.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 21:13:26 -0700 (PDT) From: Jan Bobek To: qemu-devel@nongnu.org Date: Sat, 10 Aug 2019 00:12:36 -0400 Message-Id: <20190810041255.6820-21-jan.bobek@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190810041255.6820-1-jan.bobek@gmail.com> References: <20190810041255.6820-1-jan.bobek@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::343 Subject: [Qemu-devel] [RFC PATCH v2 20/39] target/i386: introduce generic load-store operand 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: Jan Bobek , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This operand attempts to capture the "indirect" or "memory" operand in a generic way. It significatly reduces the amount code that needs to be written in order to read operands from memory to temporary storage and write them back. Signed-off-by: Jan Bobek --- target/i386/translate.c | 78 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/target/i386/translate.c b/target/i386/translate.c index cd2467e6a5..ebb68fef0b 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -4619,6 +4619,84 @@ static int ck_cpuid(CPUX86State *env, DisasContext *s, int ck_cpuid_feat) insnop_prepare(opT2)(env, s, modrm, op), \ insnop_finalize(opT2)(env, s, modrm, op)) +/* + * "Load-store" operand helper + */ +#define INSNOP_LDST(opT, opTr, opTm, scratch_op, ld_stmt, st_stmt) \ + INSNOP( \ + opT, \ + struct { \ + bool is_mem; \ + insnop_t(opTr) op_reg; \ + }, \ + do { \ + insnop_t(opTr) reg; \ + insnop_t(opTm) ptr; \ + if (!insnop_init(opTr)(env, s, modrm, ®)) { \ + op->is_mem = 0; \ + op->op_reg = reg; \ + INSNOP_INIT_OK(*op); \ + } else if (!insnop_init(opTm)(env, s, modrm, &ptr)) { \ + op->is_mem = 1; \ + op->op_reg = (scratch_op); \ + INSNOP_INIT_OK(*op); \ + } \ + INSNOP_INIT_FAIL; \ + } while (0), \ + do { \ + insnop_t(opTr) reg = op->op_reg; \ + if (op->is_mem) { \ + insnop_t(opTm) ptr; \ + const int ret = insnop_init(opTm)(env, s, modrm, &ptr); \ + assert(!ret); \ + \ + insnop_prepare(opTm)(env, s, modrm, &ptr); \ + ld_stmt; \ + } else { \ + insnop_prepare(opTr)(env, s, modrm, ®); \ + } \ + } while (0), \ + do { \ + insnop_t(opTr) reg = op->op_reg; \ + if (op->is_mem) { \ + insnop_t(opTm) ptr; \ + const int ret = insnop_init(opTm)(env, s, modrm, &ptr); \ + assert(!ret); \ + \ + insnop_prepare(opTm)(env, s, modrm, &ptr); \ + st_stmt; \ + } else { \ + insnop_finalize(opTr)(env, s, modrm, ®); \ + } \ + } while (0)) + +#define INSNOP_LDST_UNIFY(opT, opTr, opTrm) \ + INSNOP( \ + opT, insnop_t(opTr), \ + do { \ + insnop_t(opTrm) rm; \ + if (!insnop_init(opTrm)(env, s, modrm, &rm)) { \ + INSNOP_INIT_OK(rm.op_reg); \ + } \ + INSNOP_INIT_FAIL; \ + } while (0), \ + do { \ + insnop_t(opTrm) rm; \ + const int ret = insnop_init(opTrm)(env, s, modrm, &rm); \ + assert(!ret); \ + \ + rm.op_reg = *op; \ + insnop_prepare(opTrm)(env, s, modrm, &rm); \ + } while (0), \ + do { \ + insnop_t(opTrm) rm; \ + const int ret = insnop_init(opTrm)(env, s, modrm, &rm); \ + assert(!ret); \ + \ + rm.op_reg = *op; \ + insnop_finalize(opTrm)(env, s, modrm, &rm); \ + } while (0)) + static void gen_sse_ng(CPUX86State *env, DisasContext *s, int b) { enum {