{"id":810659,"url":"http://patchwork.ozlabs.org/api/patches/810659/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906144940.30880-11-richard.henderson@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906144940.30880-11-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-06T14:49:36","name":"[PULL,10/14] tcg/s390: Merge add2i facilities check to tcg_target_op_def","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"66acade7b19089312f6220f6b26a275aaac8aebe","submitter":{"id":72104,"url":"http://patchwork.ozlabs.org/api/people/72104/?format=json","name":"Richard Henderson","email":"richard.henderson@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906144940.30880-11-richard.henderson@linaro.org/mbox/","series":[{"id":1829,"url":"http://patchwork.ozlabs.org/api/series/1829/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1829","date":"2017-09-06T14:49:28","name":"[PULL,01/14] tcg: Remove support for ia64 as host","version":1,"mbox":"http://patchwork.ozlabs.org/series/1829/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810659/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810659/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"Sr5t0cU9\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnRZG5K7Vz9t50\n\tfor ;\n\tThu, 7 Sep 2017 00:59:34 +1000 (AEST)","from localhost ([::1]:36561 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpbng-0004vT-ON\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 10:59:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40052)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpbeT-0005Za-W2\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:50:08 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpbeP-0000N1-85\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:50:02 -0400","from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]:38097)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dpbeP-0000Mk-2i\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:49:57 -0400","by mail-pg0-x22d.google.com with SMTP id v66so15523204pgb.5\n\tfor ; Wed, 06 Sep 2017 07:49:56 -0700 (PDT)","from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net.\n\t[97.126.108.236]) by smtp.gmail.com with ESMTPSA id\n\th1sm3467646pfg.153.2017.09.06.07.49.54\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 06 Sep 2017 07:49:54 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=sDRqOgTcMnZU2Boh5HLQatvifS7VMtYpiEtzWIfOUGU=;\n\tb=Sr5t0cU9lBwD7y9IAzWjr4iGQSfq5gkXhelmUSPiY9rtSjKFTOFoQDvK92yyeLa8gY\n\t37G3WMyCVI7qZEhCTZIwgtNCfu1RdEbYk3ccR4x1bkyQV1gcp+7wY50UjetY8i7FHVsp\n\tTulT6GgPbd8vqvsSR3xYhKPTLs0qd0KqxppXg=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=sDRqOgTcMnZU2Boh5HLQatvifS7VMtYpiEtzWIfOUGU=;\n\tb=WE1LTYwrazH20eGqYHzkyNPau4CFTw9I4nYw4WEo9Gc0U8SY6h+5TS58NPVmML24Qv\n\t6rPnL8G0C+qL3Rv7lDr3m0N27K87qLhV7AcpyiUe+a1Aitpva3XSgSNLXXgrJUQWSbLk\n\tiHcjrKtUvxkCVpT0nWlRuo1/Z0XTrABjbjDZ6oHqT8uEHOS7q80CwCDcuQVdlSNvZ4i8\n\ttA1kALqC9tyoR3C3+3bx5ysS5hNMhTItJhOLvklzYe0PFHHEh8gR6YlgdudSABqdqrjU\n\tmNXb00wFtt4bTU5uZgb+ZeSqOnOXuqtH6CjjYwZ7TgZ3DCyshY9wVl4fmdw9aFv+XZuh\n\tSPlg==","X-Gm-Message-State":"AHPjjUhyBJWSWmJThnKvLRDuIj4bMh9NpGRyKUOQwhcjVYwjUUNxmrVn\n\tBB3grNISOvlYEG7OErEhWg==","X-Google-Smtp-Source":"ADKCNb7UdkWLIAQGhklYkrWUoB2kYo9ZwB7HVngNp7Gbd6z7OJVjsgtXLpLsyo+gpubOX6h5tF7GkQ==","X-Received":"by 10.98.137.203 with SMTP id n72mr7674931pfk.4.1504709395737;\n\tWed, 06 Sep 2017 07:49:55 -0700 (PDT)","From":"Richard Henderson ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 07:49:36 -0700","Message-Id":"<20170906144940.30880-11-richard.henderson@linaro.org>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170906144940.30880-1-richard.henderson@linaro.org>","References":"<20170906144940.30880-1-richard.henderson@linaro.org>","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400e:c05::22d","Subject":"[Qemu-devel] [PULL 10/14] tcg/s390: Merge add2i facilities check to\n\ttcg_target_op_def","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"peter.maydell@linaro.org, Richard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Richard Henderson \n\nAcked-by: Cornelia Huck \nSigned-off-by: Richard Henderson \n---\n tcg/s390/tcg-target.inc.c | 38 ++++++++++++++------------------------\n 1 file changed, 14 insertions(+), 24 deletions(-)","diff":"diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c\nindex ff3f644f8e..6b08ccea6d 100644\n--- a/tcg/s390/tcg-target.inc.c\n+++ b/tcg/s390/tcg-target.inc.c\n@@ -43,7 +43,7 @@\n #define TCG_CT_CONST_ORI 0x400\n #define TCG_CT_CONST_XORI 0x800\n #define TCG_CT_CONST_U31 0x1000\n-#define TCG_CT_CONST_ADLI 0x2000\n+#define TCG_CT_CONST_S33 0x2000\n #define TCG_CT_CONST_ZERO 0x4000\n \n /* Several places within the instruction set 0 means \"no register\"\n@@ -387,7 +387,7 @@ static const char *target_parse_constraint(TCGArgConstraint *ct,\n tcg_regset_set_reg(ct->u.regs, TCG_REG_R3);\n break;\n case 'A':\n- ct->ct |= TCG_CT_CONST_ADLI;\n+ ct->ct |= TCG_CT_CONST_S33;\n break;\n case 'I':\n ct->ct |= TCG_CT_CONST_S16;\n@@ -478,20 +478,6 @@ static int tcg_match_xori(TCGType type, tcg_target_long val)\n return 1;\n }\n \n-/* Immediates to be used with add2/sub2. */\n-\n-static int tcg_match_add2i(TCGType type, tcg_target_long val)\n-{\n- if (s390_facilities & FACILITY_EXT_IMM) {\n- if (type == TCG_TYPE_I32) {\n- return 1;\n- } else if (val >= -0xffffffffll && val <= 0xffffffffll) {\n- return 1;\n- }\n- }\n- return 0;\n-}\n-\n /* Test if a constant matches the constraint. */\n static int tcg_target_const_match(tcg_target_long val, TCGType type,\n const TCGArgConstraint *arg_ct)\n@@ -511,8 +497,8 @@ static int tcg_target_const_match(tcg_target_long val, TCGType type,\n return val == (int16_t)val;\n } else if (ct & TCG_CT_CONST_S32) {\n return val == (int32_t)val;\n- } else if (ct & TCG_CT_CONST_ADLI) {\n- return tcg_match_add2i(type, val);\n+ } else if (ct & TCG_CT_CONST_S33) {\n+ return val >= -0xffffffffll && val <= 0xffffffffll;\n } else if (ct & TCG_CT_CONST_ORI) {\n return tcg_match_ori(type, val);\n } else if (ct & TCG_CT_CONST_XORI) {\n@@ -2241,6 +2227,12 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op)\n static const TCGTargetOpDef r_0_rJ = { .args_ct_str = { \"r\", \"0\", \"rJ\" } };\n static const TCGTargetOpDef r_0_rO = { .args_ct_str = { \"r\", \"0\", \"rO\" } };\n static const TCGTargetOpDef r_0_rX = { .args_ct_str = { \"r\", \"0\", \"rX\" } };\n+ static const TCGTargetOpDef a2_r\n+ = { .args_ct_str = { \"r\", \"r\", \"0\", \"1\", \"r\", \"r\" } };\n+ static const TCGTargetOpDef a2_ri\n+ = { .args_ct_str = { \"r\", \"r\", \"0\", \"1\", \"ri\", \"r\" } };\n+ static const TCGTargetOpDef a2_rA\n+ = { .args_ct_str = { \"r\", \"r\", \"0\", \"1\", \"rA\", \"r\" } };\n \n switch (op) {\n case INDEX_op_goto_ptr:\n@@ -2389,15 +2381,13 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op)\n = { .args_ct_str = { \"b\", \"a\", \"0\", \"r\" } };\n return &mul2;\n }\n+\n case INDEX_op_add2_i32:\n- case INDEX_op_add2_i64:\n case INDEX_op_sub2_i32:\n+ return (s390_facilities & FACILITY_EXT_IMM ? &a2_ri : &a2_r);\n+ case INDEX_op_add2_i64:\n case INDEX_op_sub2_i64:\n- {\n- static const TCGTargetOpDef arith2\n- = { .args_ct_str = { \"r\", \"r\", \"0\", \"1\", \"rA\", \"r\" } };\n- return &arith2;\n- }\n+ return (s390_facilities & FACILITY_EXT_IMM ? &a2_rA : &a2_r);\n \n default:\n break;\n","prefixes":["PULL","10/14"]}