{"id":807756,"url":"http://patchwork.ozlabs.org/api/patches/807756/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-32-cohuck@redhat.com/","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":"<20170830165252.13421-32-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:39","name":"[PULL,31/44] target/s390x: move cc_name() to helper.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bc5c60545ecfc2ff83ecb6fccac6dce00ff564e1","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-32-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807756/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807756/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=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"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 3xjBr30nfCz9s8P\n\tfor ;\n\tThu, 31 Aug 2017 03:11:47 +1000 (AEST)","from localhost ([::1]:51701 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6Wm-0001Mg-OY\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:11:44 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57610)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6H3-0003fy-E8\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6H0-0005pn-3N\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:29 -0400","from mx1.redhat.com ([209.132.183.28]:39452)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Gz-0005pJ-Q9\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:26 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id A5CF05F798;\n\tWed, 30 Aug 2017 16:55:24 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 411AB70917;\n\tWed, 30 Aug 2017 16:55:22 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A5CF05F798","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:39 +0200","Message-Id":"<20170830165252.13421-32-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 30 Aug 2017 16:55:24 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 31/44] target/s390x: move cc_name() to helper.c","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":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: David Hildenbrand \n\nWhile at it, move the translations into the function and properly pass\nenum cc_op as parameter. We can't move it to cc_helper.c as this would\nbreak --disable-tcg.\n\nReviewed-by: Thomas Huth \nReviewed-by: Philippe Mathieu-Daudé \nReviewed-by: Richard Henderson \nSigned-off-by: David Hildenbrand \nMessage-Id: <20170818114353.13455-10-david@redhat.com>\nSigned-off-by: Cornelia Huck \n---\n target/s390x/cpu.h | 48 +-----------------------------------------------\n target/s390x/helper.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 49 insertions(+), 47 deletions(-)","diff":"diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex c40d70dd70..10208ecbbb 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -742,53 +742,7 @@ enum cc_op {\n CC_OP_MAX\n };\n \n-static const char *cc_names[] = {\n- [CC_OP_CONST0] = \"CC_OP_CONST0\",\n- [CC_OP_CONST1] = \"CC_OP_CONST1\",\n- [CC_OP_CONST2] = \"CC_OP_CONST2\",\n- [CC_OP_CONST3] = \"CC_OP_CONST3\",\n- [CC_OP_DYNAMIC] = \"CC_OP_DYNAMIC\",\n- [CC_OP_STATIC] = \"CC_OP_STATIC\",\n- [CC_OP_NZ] = \"CC_OP_NZ\",\n- [CC_OP_LTGT_32] = \"CC_OP_LTGT_32\",\n- [CC_OP_LTGT_64] = \"CC_OP_LTGT_64\",\n- [CC_OP_LTUGTU_32] = \"CC_OP_LTUGTU_32\",\n- [CC_OP_LTUGTU_64] = \"CC_OP_LTUGTU_64\",\n- [CC_OP_LTGT0_32] = \"CC_OP_LTGT0_32\",\n- [CC_OP_LTGT0_64] = \"CC_OP_LTGT0_64\",\n- [CC_OP_ADD_64] = \"CC_OP_ADD_64\",\n- [CC_OP_ADDU_64] = \"CC_OP_ADDU_64\",\n- [CC_OP_ADDC_64] = \"CC_OP_ADDC_64\",\n- [CC_OP_SUB_64] = \"CC_OP_SUB_64\",\n- [CC_OP_SUBU_64] = \"CC_OP_SUBU_64\",\n- [CC_OP_SUBB_64] = \"CC_OP_SUBB_64\",\n- [CC_OP_ABS_64] = \"CC_OP_ABS_64\",\n- [CC_OP_NABS_64] = \"CC_OP_NABS_64\",\n- [CC_OP_ADD_32] = \"CC_OP_ADD_32\",\n- [CC_OP_ADDU_32] = \"CC_OP_ADDU_32\",\n- [CC_OP_ADDC_32] = \"CC_OP_ADDC_32\",\n- [CC_OP_SUB_32] = \"CC_OP_SUB_32\",\n- [CC_OP_SUBU_32] = \"CC_OP_SUBU_32\",\n- [CC_OP_SUBB_32] = \"CC_OP_SUBB_32\",\n- [CC_OP_ABS_32] = \"CC_OP_ABS_32\",\n- [CC_OP_NABS_32] = \"CC_OP_NABS_32\",\n- [CC_OP_COMP_32] = \"CC_OP_COMP_32\",\n- [CC_OP_COMP_64] = \"CC_OP_COMP_64\",\n- [CC_OP_TM_32] = \"CC_OP_TM_32\",\n- [CC_OP_TM_64] = \"CC_OP_TM_64\",\n- [CC_OP_NZ_F32] = \"CC_OP_NZ_F32\",\n- [CC_OP_NZ_F64] = \"CC_OP_NZ_F64\",\n- [CC_OP_NZ_F128] = \"CC_OP_NZ_F128\",\n- [CC_OP_ICM] = \"CC_OP_ICM\",\n- [CC_OP_SLA_32] = \"CC_OP_SLA_32\",\n- [CC_OP_SLA_64] = \"CC_OP_SLA_64\",\n- [CC_OP_FLOGR] = \"CC_OP_FLOGR\",\n-};\n-\n-static inline const char *cc_name(int cc_op)\n-{\n- return cc_names[cc_op];\n-}\n+const char *cc_name(enum cc_op cc_op);\n \n static inline void setcc(S390CPU *cpu, uint64_t cc)\n {\ndiff --git a/target/s390x/helper.c b/target/s390x/helper.c\nindex 0c989b1610..e31d3e51df 100644\n--- a/target/s390x/helper.c\n+++ b/target/s390x/helper.c\n@@ -352,3 +352,51 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,\n \n cpu_fprintf(f, \"\\n\");\n }\n+\n+const char *cc_name(enum cc_op cc_op)\n+{\n+ static const char * const cc_names[] = {\n+ [CC_OP_CONST0] = \"CC_OP_CONST0\",\n+ [CC_OP_CONST1] = \"CC_OP_CONST1\",\n+ [CC_OP_CONST2] = \"CC_OP_CONST2\",\n+ [CC_OP_CONST3] = \"CC_OP_CONST3\",\n+ [CC_OP_DYNAMIC] = \"CC_OP_DYNAMIC\",\n+ [CC_OP_STATIC] = \"CC_OP_STATIC\",\n+ [CC_OP_NZ] = \"CC_OP_NZ\",\n+ [CC_OP_LTGT_32] = \"CC_OP_LTGT_32\",\n+ [CC_OP_LTGT_64] = \"CC_OP_LTGT_64\",\n+ [CC_OP_LTUGTU_32] = \"CC_OP_LTUGTU_32\",\n+ [CC_OP_LTUGTU_64] = \"CC_OP_LTUGTU_64\",\n+ [CC_OP_LTGT0_32] = \"CC_OP_LTGT0_32\",\n+ [CC_OP_LTGT0_64] = \"CC_OP_LTGT0_64\",\n+ [CC_OP_ADD_64] = \"CC_OP_ADD_64\",\n+ [CC_OP_ADDU_64] = \"CC_OP_ADDU_64\",\n+ [CC_OP_ADDC_64] = \"CC_OP_ADDC_64\",\n+ [CC_OP_SUB_64] = \"CC_OP_SUB_64\",\n+ [CC_OP_SUBU_64] = \"CC_OP_SUBU_64\",\n+ [CC_OP_SUBB_64] = \"CC_OP_SUBB_64\",\n+ [CC_OP_ABS_64] = \"CC_OP_ABS_64\",\n+ [CC_OP_NABS_64] = \"CC_OP_NABS_64\",\n+ [CC_OP_ADD_32] = \"CC_OP_ADD_32\",\n+ [CC_OP_ADDU_32] = \"CC_OP_ADDU_32\",\n+ [CC_OP_ADDC_32] = \"CC_OP_ADDC_32\",\n+ [CC_OP_SUB_32] = \"CC_OP_SUB_32\",\n+ [CC_OP_SUBU_32] = \"CC_OP_SUBU_32\",\n+ [CC_OP_SUBB_32] = \"CC_OP_SUBB_32\",\n+ [CC_OP_ABS_32] = \"CC_OP_ABS_32\",\n+ [CC_OP_NABS_32] = \"CC_OP_NABS_32\",\n+ [CC_OP_COMP_32] = \"CC_OP_COMP_32\",\n+ [CC_OP_COMP_64] = \"CC_OP_COMP_64\",\n+ [CC_OP_TM_32] = \"CC_OP_TM_32\",\n+ [CC_OP_TM_64] = \"CC_OP_TM_64\",\n+ [CC_OP_NZ_F32] = \"CC_OP_NZ_F32\",\n+ [CC_OP_NZ_F64] = \"CC_OP_NZ_F64\",\n+ [CC_OP_NZ_F128] = \"CC_OP_NZ_F128\",\n+ [CC_OP_ICM] = \"CC_OP_ICM\",\n+ [CC_OP_SLA_32] = \"CC_OP_SLA_32\",\n+ [CC_OP_SLA_64] = \"CC_OP_SLA_64\",\n+ [CC_OP_FLOGR] = \"CC_OP_FLOGR\",\n+ };\n+\n+ return cc_names[cc_op];\n+}\n","prefixes":["PULL","31/44"]}