{"id":811261,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811261/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170907224051.21518-19-richard.henderson@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20170907224051.21518-19-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-07T22:40:46","name":"[PULL,18/23] tcg/arm: Extract INSN_NOP","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e86a10c85598165ae15523ecff7b664317ffc2ad","submitter":{"id":72104,"url":"http://patchwork.ozlabs.org/api/1.2/people/72104/?format=json","name":"Richard Henderson","email":"richard.henderson@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170907224051.21518-19-richard.henderson@linaro.org/mbox/","series":[{"id":2073,"url":"http://patchwork.ozlabs.org/api/1.2/series/2073/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2073","date":"2017-09-07T22:40:28","name":"[PULL,01/23] tcg: Move USE_DIRECT_JUMP discriminator to tcg/cpu/tcg-target.h","version":1,"mbox":"http://patchwork.ozlabs.org/series/2073/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811261/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811261/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","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=\"eVtRLIYz\"; 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 3xpG7313WTz9s81\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri,  8 Sep 2017 08:57:19 +1000 (AEST)","from localhost ([::1]:42580 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dq5jZ-0007sX-7q\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 18:57:17 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52311)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <richard.henderson@linaro.org>) id 1dq5UE-0003F3-4r\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <richard.henderson@linaro.org>) id 1dq5U9-0008ME-Fe\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:26 -0400","from mail-pg0-x22b.google.com ([2607:f8b0:400e:c05::22b]:37081)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <richard.henderson@linaro.org>)\n\tid 1dq5U9-0008LZ-9X\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:21 -0400","by mail-pg0-x22b.google.com with SMTP id d8so1804327pgt.4\n\tfor <qemu-devel@nongnu.org>; Thu, 07 Sep 2017 15:41:21 -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\th19sm770678pfh.142.2017.09.07.15.41.18\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tThu, 07 Sep 2017 15:41:19 -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=H7OIZz6ye65zyAW3I3NdIdDeG7/KcItlzmmSrm81ckA=;\n\tb=eVtRLIYzIkxxe18bIKbzDDOx0WkAT82Pfy8j8FceiJvoQwB2h+RK1tg3M9yzoZkti7\n\tIoPQ8mPmWdX9Tzb/qVEd2xaRn17+oQwiKnMp2foSBgSC22SXOpHR3z+zNUPsaU+u4nMP\n\tY6bXsLWkwzatTHIx/7j4H4EtyP/26yWywWH+Q=","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=H7OIZz6ye65zyAW3I3NdIdDeG7/KcItlzmmSrm81ckA=;\n\tb=i0WYZ3f/TBvaUm56OoakEnqI2wfq2sKifRwkQM+2jVVNQJBEZ2v3qzOP4DM2oAV8EA\n\tqVxj2EUjqS/TX8ABz0FCo1RboPGhpUCR5qjK+OMR2sGvX8ovV/ia1V80oX8LiuybOgiK\n\t7N90f+Lr9KmqrxGSWIz/LGqCoTToemaBSHZsxuH/bOoZQL9/zUrOpNvq5vq4gzNkbIYn\n\tfaMYQMf0xgi7lQdQNO/OmKlTiGbNJw7rG5kfRBd3qyaRcAMfQYIveXibNobnsBwV135b\n\tFUHMTzRj2s1CNn2ddwRg3b7iwL4qT+Rxq+1TJ8NNjx68qfiP/TAXY33kGxETclgaKzyD\n\t08qg==","X-Gm-Message-State":"AHPjjUibjk48dbgJsJV3NeBHyMJfxt57gjYO7QyqwOBOxEek4tRENktw\n\tDF8jS+fylCfBw6HA8+No1w==","X-Google-Smtp-Source":"ADKCNb7JS1VhXKBUsD4kUiWuHlcZTIKb7DTSkuw6p50sT30fHTAkb2yKA6ZlxHuheLYOxwMhmgjxww==","X-Received":"by 10.98.245.207 with SMTP id b76mr915846pfm.223.1504824080066; \n\tThu, 07 Sep 2017 15:41:20 -0700 (PDT)","From":"Richard Henderson <richard.henderson@linaro.org>","To":"qemu-devel@nongnu.org","Date":"Thu,  7 Sep 2017 15:40:46 -0700","Message-Id":"<20170907224051.21518-19-richard.henderson@linaro.org>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170907224051.21518-1-richard.henderson@linaro.org>","References":"<20170907224051.21518-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::22b","Subject":"[Qemu-devel] [PULL 18/23] tcg/arm: Extract INSN_NOP","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"peter.maydell@linaro.org, Richard Henderson <rth@twiddle.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Richard Henderson <rth@twiddle.net>\n\nWe'll want this for tcg_out_nop_fill.\n\nSigned-off-by: Richard Henderson <rth@twiddle.net>\n---\n tcg/arm/tcg-target.inc.c | 21 +++++++++++----------\n 1 file changed, 11 insertions(+), 10 deletions(-)","diff":"diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c\nindex f40e87066f..78603a19db 100644\n--- a/tcg/arm/tcg-target.inc.c\n+++ b/tcg/arm/tcg-target.inc.c\n@@ -160,8 +160,18 @@ typedef enum {\n \n     INSN_DMB_ISH   = 0x5bf07ff5,\n     INSN_DMB_MCR   = 0xba0f07ee,\n+\n+    /* Architected nop introduced in v6k.  */\n+    /* ??? This is an MSR (imm) 0,0,0 insn.  Anyone know if this\n+       also Just So Happened to do nothing on pre-v6k so that we\n+       don't need to conditionalize it?  */\n+    INSN_NOP_v6k   = 0xe320f000,\n+    /* Otherwise the assembler uses mov r0,r0 */\n+    INSN_NOP_v4    = (COND_AL << 28) | ARITH_MOV,\n } ARMInsn;\n \n+#define INSN_NOP   (use_armv7_instructions ? INSN_NOP_v6k : INSN_NOP_v4)\n+\n static const uint8_t tcg_cond_to_arm_cond[] = {\n     [TCG_COND_EQ] = COND_EQ,\n     [TCG_COND_NE] = COND_NE,\n@@ -375,16 +385,7 @@ static inline void tcg_out_dat_reg(TCGContext *s,\n \n static inline void tcg_out_nop(TCGContext *s)\n {\n-    if (use_armv7_instructions) {\n-        /* Architected nop introduced in v6k.  */\n-        /* ??? This is an MSR (imm) 0,0,0 insn.  Anyone know if this\n-           also Just So Happened to do nothing on pre-v6k so that we\n-           don't need to conditionalize it?  */\n-        tcg_out32(s, 0xe320f000);\n-    } else {\n-        /* Prior to that the assembler uses mov r0, r0.  */\n-        tcg_out_dat_reg(s, COND_AL, ARITH_MOV, 0, 0, 0, SHIFT_IMM_LSL(0));\n-    }\n+    tcg_out32(s, INSN_NOP);\n }\n \n static inline void tcg_out_mov_reg(TCGContext *s, int cond, int rd, int rm)\n","prefixes":["PULL","18/23"]}