From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462490; cv=none; d=zohomail.com; s=zohoarc; b=D0k0wfpk+1HsHtFrgCJVkr8lfnTx3iEYw0mGnoQbI+RRCMaYkVatrSOcqTLG35smNbeJ/ZU2RGG/SvlFfKomiJBbngt5SvnwZxJYcrovjfqqanpqfCOBJ99fMyIWzVgK9NxkLSfQo1hyBRTCsnmkyKCb1vZPPXvjx/IDdeunuzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462490; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2/aRV94oyF6HEuHjJmnfTp1vElXNF/Wl/VWcdqDW0pY=; b=iNpfmCVSx0Q5ObxaG8NK8WqQsaSO4KzX0CUsGuZw5JCD6RvnprMFJAVKr/KZzPJXVwtG4MU8E8lbv7iCeNZ804Xy34afwfcHBP0gMXpT3zbbTYsXhu/sTC35r5aHmrFPyVnln7EFVyP6DNcXg9Mupi+GNGzHngs5o1s5qFbdrrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462490552225.13195466879415; Sun, 12 Sep 2021 09:01:30 -0700 (PDT) Received: from localhost ([::1]:43274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRv7-0005Bg-8F for importer@patchew.org; Sun, 12 Sep 2021 12:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs3-0002OT-I6 for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:19 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:44740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRrx-0003to-Np for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:18 -0400 Received: by mail-pf1-x430.google.com with SMTP id v123so6542791pfb.11 for ; Sun, 12 Sep 2021 08:58:12 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2/aRV94oyF6HEuHjJmnfTp1vElXNF/Wl/VWcdqDW0pY=; b=w0vmoY8NePJQBOh02ZLuliHQnADpk6ZimJvYFOhtmAWRPSOL2jy2IbQxsaLIstUq0u wRsoJVx3HuF+C3XVa3cES5xmkaIEUBDeLcBybh73ZdGApyhblHCxjpl2c22rx5m/GcO7 IEMylrPenvt5hIncwWi+mve2dY9M3m7Azj8o4JpqVjY0Keh36AjLEAK17wOrgPrbt4tl yghA1jEw6DKMrEQPZnZjVuqsMukQW4DNPS7y1oLIC9K9CGdQhIEZve/XyXY7uH5LQ80C kZsoJuk1f2NNP/zKK4UUEZtIMIANnpsc15XaVS+zaI9nR/3sowcvbLxdUIyg8hDBYnRc zb6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2/aRV94oyF6HEuHjJmnfTp1vElXNF/Wl/VWcdqDW0pY=; b=mkTqjIDhYzqodIwYKpqbUPVTJxdJxONrDSK0RTEnfeCTOdZHKuAMzraG2y+sBeTdqJ EAEN9roItgkjc9srTEhKDUQrcAgvlY7xy/YFTDwJhiQlHgncJoNOIUcXl6QfF/D7mPhm jfIpz1/jBSn9OEs1IA7N3f0ibZK6PnXg/6mSIcJiv69AWNqZNEKeSz1bKMSyvTzKYeeT CHntkMQFJgbd2+bDgUZpYG1LtYrlejkTf8fvbgpDESCIS+nwJK3UKPNaa7hsTFY22LKI Etu6UuFFG/DWQCQL6RyD/VTZWIsVAXXq4eyzKcrDoGpLpHf011fpdV7A0TQhlnK2yUaa OGDg== X-Gm-Message-State: AOAM5303ClNJ63KQbBpQ+OqRRD6QAjhMkZSvXec8EWYjwf2JyqU2NpYB Khwzf7st/T7M7EtlkhbnEQvIs/H0nzEEWw== X-Google-Smtp-Source: ABdhPJxCYwCWNCGcVG8C6oKdzGGBWXJeS82tQg19CTA6qUWGUSX+u/G5grfVIoWhbxB9NcUoK1jMgA== X-Received: by 2002:a63:9d44:: with SMTP id i65mr7176366pgd.69.1631462291407; Sun, 12 Sep 2021 08:58:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/9] accel/tcg: Add DisasContextBase argument to translator_ld* Date: Sun, 12 Sep 2021 08:58:01 -0700 Message-Id: <20210912155809.196236-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Ilya Leoshkevich Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462492140100001 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Signed-off-by: Ilya Leoshkevich [rth: Split out of a larger patch.] Signed-off-by: Richard Henderson --- include/exec/translator.h | 9 +++++---- target/arm/arm_ldst.h | 12 ++++++------ target/alpha/translate.c | 2 +- target/arm/translate-a64.c | 2 +- target/arm/translate.c | 9 +++++---- target/hexagon/translate.c | 3 ++- target/hppa/translate.c | 2 +- target/i386/tcg/translate.c | 10 +++++----- target/m68k/translate.c | 2 +- target/mips/tcg/translate.c | 8 ++++---- target/openrisc/translate.c | 2 +- target/ppc/translate.c | 5 +++-- target/riscv/translate.c | 5 +++-- target/s390x/tcg/translate.c | 16 +++++++++------- target/sh4/translate.c | 4 ++-- target/sparc/translate.c | 2 +- target/xtensa/translate.c | 5 +++-- target/mips/tcg/micromips_translate.c.inc | 2 +- target/mips/tcg/mips16e_translate.c.inc | 4 ++-- target/mips/tcg/nanomips_translate.c.inc | 4 ++-- 20 files changed, 58 insertions(+), 50 deletions(-) diff --git a/include/exec/translator.h b/include/exec/translator.h index d318803267..6c054e8d05 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -157,7 +157,8 @@ bool translator_use_goto_tb(DisasContextBase *db, targe= t_ulong dest); =20 #define GEN_TRANSLATOR_LD(fullname, type, load_fn, swap_fn) \ static inline type \ - fullname ## _swap(CPUArchState *env, abi_ptr pc, bool do_swap) \ + fullname ## _swap(CPUArchState *env, DisasContextBase *dcbase, \ + abi_ptr pc, bool do_swap) \ { \ type ret =3D load_fn(env, pc); \ if (do_swap) { \ @@ -166,10 +167,10 @@ bool translator_use_goto_tb(DisasContextBase *db, tar= get_ulong dest); plugin_insn_append(&ret, sizeof(ret)); \ return ret; \ } \ - \ - static inline type fullname(CPUArchState *env, abi_ptr pc) \ + static inline type fullname(CPUArchState *env, \ + DisasContextBase *dcbase, abi_ptr pc) \ { \ - return fullname ## _swap(env, pc, false); \ + return fullname ## _swap(env, dcbase, pc, false); \ } =20 GEN_TRANSLATOR_LD(translator_ldub, uint8_t, cpu_ldub_code, /* no swap */) diff --git a/target/arm/arm_ldst.h b/target/arm/arm_ldst.h index 057160e8da..cee0548a1c 100644 --- a/target/arm/arm_ldst.h +++ b/target/arm/arm_ldst.h @@ -24,15 +24,15 @@ #include "qemu/bswap.h" =20 /* Load an instruction and return it in the standard little-endian order */ -static inline uint32_t arm_ldl_code(CPUARMState *env, target_ulong addr, - bool sctlr_b) +static inline uint32_t arm_ldl_code(CPUARMState *env, DisasContextBase *s, + target_ulong addr, bool sctlr_b) { - return translator_ldl_swap(env, addr, bswap_code(sctlr_b)); + return translator_ldl_swap(env, s, addr, bswap_code(sctlr_b)); } =20 /* Ditto, for a halfword (Thumb) instruction */ -static inline uint16_t arm_lduw_code(CPUARMState *env, target_ulong addr, - bool sctlr_b) +static inline uint16_t arm_lduw_code(CPUARMState *env, DisasContextBase* s, + target_ulong addr, bool sctlr_b) { #ifndef CONFIG_USER_ONLY /* In big-endian (BE32) mode, adjacent Thumb instructions have been sw= apped @@ -41,7 +41,7 @@ static inline uint16_t arm_lduw_code(CPUARMState *env, ta= rget_ulong addr, addr ^=3D 2; } #endif - return translator_lduw_swap(env, addr, bswap_code(sctlr_b)); + return translator_lduw_swap(env, s, addr, bswap_code(sctlr_b)); } =20 #endif diff --git a/target/alpha/translate.c b/target/alpha/translate.c index de6c0a8439..b034206688 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -2971,7 +2971,7 @@ static void alpha_tr_translate_insn(DisasContextBase = *dcbase, CPUState *cpu) { DisasContext *ctx =3D container_of(dcbase, DisasContext, base); CPUAlphaState *env =3D cpu->env_ptr; - uint32_t insn =3D translator_ldl(env, ctx->base.pc_next); + uint32_t insn =3D translator_ldl(env, &ctx->base, ctx->base.pc_next); =20 ctx->base.pc_next +=3D 4; ctx->base.is_jmp =3D translate_one(ctx, insn); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 422e2ac0c9..a52949b1f3 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14655,7 +14655,7 @@ static void disas_a64_insn(CPUARMState *env, DisasC= ontext *s) uint32_t insn; =20 s->pc_curr =3D s->base.pc_next; - insn =3D arm_ldl_code(env, s->base.pc_next, s->sctlr_b); + insn =3D arm_ldl_code(env, &s->base, s->base.pc_next, s->sctlr_b); s->insn =3D insn; s->base.pc_next +=3D 4; =20 diff --git a/target/arm/translate.c b/target/arm/translate.c index 24b7f49d76..422fca353d 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9302,7 +9302,7 @@ static bool insn_crosses_page(CPUARMState *env, Disas= Context *s) * boundary, so we cross the page if the first 16 bits indicate * that this is a 32 bit insn. */ - uint16_t insn =3D arm_lduw_code(env, s->base.pc_next, s->sctlr_b); + uint16_t insn =3D arm_lduw_code(env, &s->base, s->base.pc_next, s->sct= lr_b); =20 return !thumb_insn_is_16bit(s, s->base.pc_next, insn); } @@ -9540,7 +9540,7 @@ static void arm_tr_translate_insn(DisasContextBase *d= cbase, CPUState *cpu) } =20 dc->pc_curr =3D dc->base.pc_next; - insn =3D arm_ldl_code(env, dc->base.pc_next, dc->sctlr_b); + insn =3D arm_ldl_code(env, &dc->base, dc->base.pc_next, dc->sctlr_b); dc->insn =3D insn; dc->base.pc_next +=3D 4; disas_arm_insn(dc, insn); @@ -9610,11 +9610,12 @@ static void thumb_tr_translate_insn(DisasContextBas= e *dcbase, CPUState *cpu) } =20 dc->pc_curr =3D dc->base.pc_next; - insn =3D arm_lduw_code(env, dc->base.pc_next, dc->sctlr_b); + insn =3D arm_lduw_code(env, &dc->base, dc->base.pc_next, dc->sctlr_b); is_16bit =3D thumb_insn_is_16bit(dc, dc->base.pc_next, insn); dc->base.pc_next +=3D 2; if (!is_16bit) { - uint32_t insn2 =3D arm_lduw_code(env, dc->base.pc_next, dc->sctlr_= b); + uint32_t insn2 =3D arm_lduw_code(env, &dc->base, dc->base.pc_next, + dc->sctlr_b); =20 insn =3D insn << 16 | insn2; dc->base.pc_next +=3D 2; diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 54fdcaa5e8..6fb4e6853c 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -112,7 +112,8 @@ static int read_packet_words(CPUHexagonState *env, Disa= sContext *ctx, memset(words, 0, PACKET_WORDS_MAX * sizeof(uint32_t)); for (nwords =3D 0; !found_end && nwords < PACKET_WORDS_MAX; nwords++) { words[nwords] =3D - translator_ldl(env, ctx->base.pc_next + nwords * sizeof(uint32= _t)); + translator_ldl(env, &ctx->base, + ctx->base.pc_next + nwords * sizeof(uint32_t)); found_end =3D is_packet_end(words[nwords]); } if (!found_end) { diff --git a/target/hppa/translate.c b/target/hppa/translate.c index b18150ef8d..3ce22cdd09 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4177,7 +4177,7 @@ static void hppa_tr_translate_insn(DisasContextBase *= dcbase, CPUState *cs) { /* Always fetch the insn, even if nullified, so that we check the page permissions for execute. */ - uint32_t insn =3D translator_ldl(env, ctx->base.pc_next); + uint32_t insn =3D translator_ldl(env, &ctx->base, ctx->base.pc_nex= t); =20 /* Set up the IA queue for the next insn. This will be overwritten by a branch. */ diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index aacb605eee..a46be75b00 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2028,28 +2028,28 @@ static uint64_t advance_pc(CPUX86State *env, DisasC= ontext *s, int num_bytes) =20 static inline uint8_t x86_ldub_code(CPUX86State *env, DisasContext *s) { - return translator_ldub(env, advance_pc(env, s, 1)); + return translator_ldub(env, &s->base, advance_pc(env, s, 1)); } =20 static inline int16_t x86_ldsw_code(CPUX86State *env, DisasContext *s) { - return translator_ldsw(env, advance_pc(env, s, 2)); + return translator_ldsw(env, &s->base, advance_pc(env, s, 2)); } =20 static inline uint16_t x86_lduw_code(CPUX86State *env, DisasContext *s) { - return translator_lduw(env, advance_pc(env, s, 2)); + return translator_lduw(env, &s->base, advance_pc(env, s, 2)); } =20 static inline uint32_t x86_ldl_code(CPUX86State *env, DisasContext *s) { - return translator_ldl(env, advance_pc(env, s, 4)); + return translator_ldl(env, &s->base, advance_pc(env, s, 4)); } =20 #ifdef TARGET_X86_64 static inline uint64_t x86_ldq_code(CPUX86State *env, DisasContext *s) { - return translator_ldq(env, advance_pc(env, s, 8)); + return translator_ldq(env, &s->base, advance_pc(env, s, 8)); } #endif =20 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index c34d9aed61..50a55f949c 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -415,7 +415,7 @@ static TCGv gen_ldst(DisasContext *s, int opsize, TCGv = addr, TCGv val, static inline uint16_t read_im16(CPUM68KState *env, DisasContext *s) { uint16_t im; - im =3D translator_lduw(env, s->pc); + im =3D translator_lduw(env, &s->base, s->pc); s->pc +=3D 2; return im; } diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 6f4a9a839c..148afec9dc 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -16041,17 +16041,17 @@ static void mips_tr_translate_insn(DisasContextBa= se *dcbase, CPUState *cs) =20 is_slot =3D ctx->hflags & MIPS_HFLAG_BMASK; if (ctx->insn_flags & ISA_NANOMIPS32) { - ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next= ); insn_bytes =3D decode_isa_nanomips(env, ctx); } else if (!(ctx->hflags & MIPS_HFLAG_M16)) { - ctx->opcode =3D translator_ldl(env, ctx->base.pc_next); + ctx->opcode =3D translator_ldl(env, &ctx->base, ctx->base.pc_next); insn_bytes =3D 4; decode_opc(env, ctx); } else if (ctx->insn_flags & ASE_MICROMIPS) { - ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next= ); insn_bytes =3D decode_isa_micromips(env, ctx); } else if (ctx->insn_flags & ASE_MIPS16) { - ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next= ); insn_bytes =3D decode_ase_mips16e(env, ctx); } else { gen_reserved_instruction(ctx); diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index d6ea536744..5f3d430245 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1613,7 +1613,7 @@ static void openrisc_tr_translate_insn(DisasContextBa= se *dcbase, CPUState *cs) { DisasContext *dc =3D container_of(dcbase, DisasContext, base); OpenRISCCPU *cpu =3D OPENRISC_CPU(cs); - uint32_t insn =3D translator_ldl(&cpu->env, dc->base.pc_next); + uint32_t insn =3D translator_ldl(&cpu->env, &dc->base, dc->base.pc_nex= t); =20 if (!decode(dc, insn)) { gen_illegal_exception(dc); diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 171b216e17..5d8b06bd80 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -8585,7 +8585,7 @@ static void ppc_tr_translate_insn(DisasContextBase *d= cbase, CPUState *cs) ctx->base.pc_next, ctx->mem_idx, (int)msr_ir); =20 ctx->cia =3D pc =3D ctx->base.pc_next; - insn =3D translator_ldl_swap(env, pc, need_byteswap(ctx)); + insn =3D translator_ldl_swap(env, dcbase, pc, need_byteswap(ctx)); ctx->base.pc_next =3D pc +=3D 4; =20 if (!is_prefix_insn(ctx, insn)) { @@ -8600,7 +8600,8 @@ static void ppc_tr_translate_insn(DisasContextBase *d= cbase, CPUState *cs) gen_exception_err(ctx, POWERPC_EXCP_ALIGN, POWERPC_EXCP_ALIGN_INSN= ); ok =3D true; } else { - uint32_t insn2 =3D translator_ldl_swap(env, pc, need_byteswap(ctx)= ); + uint32_t insn2 =3D translator_ldl_swap(env, dcbase, pc, + need_byteswap(ctx)); ctx->base.pc_next =3D pc +=3D 4; ok =3D decode_insn64(ctx, deposit64(insn2, 32, 32, insn)); } diff --git a/target/riscv/translate.c b/target/riscv/translate.c index e356fc6c46..74b33fa3c9 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -500,7 +500,8 @@ static void decode_opc(CPURISCVState *env, DisasContext= *ctx, uint16_t opcode) } else { uint32_t opcode32 =3D opcode; opcode32 =3D deposit32(opcode32, 16, 16, - translator_lduw(env, ctx->base.pc_next + 2)); + translator_lduw(env, &ctx->base, + ctx->base.pc_next + 2)); ctx->pc_succ_insn =3D ctx->base.pc_next + 4; if (!decode_insn32(ctx, opcode32)) { gen_exception_illegal(ctx); @@ -561,7 +562,7 @@ static void riscv_tr_translate_insn(DisasContextBase *d= cbase, CPUState *cpu) { DisasContext *ctx =3D container_of(dcbase, DisasContext, base); CPURISCVState *env =3D cpu->env_ptr; - uint16_t opcode16 =3D translator_lduw(env, ctx->base.pc_next); + uint16_t opcode16 =3D translator_lduw(env, &ctx->base, ctx->base.pc_ne= xt); =20 decode_opc(env, ctx, opcode16); ctx->base.pc_next =3D ctx->pc_succ_insn; diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 0632b0374b..f284870cd2 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -388,14 +388,16 @@ static void update_cc_op(DisasContext *s) } } =20 -static inline uint64_t ld_code2(CPUS390XState *env, uint64_t pc) +static inline uint64_t ld_code2(CPUS390XState *env, DisasContext *s, + uint64_t pc) { - return (uint64_t)cpu_lduw_code(env, pc); + return (uint64_t)translator_lduw(env, &s->base, pc); } =20 -static inline uint64_t ld_code4(CPUS390XState *env, uint64_t pc) +static inline uint64_t ld_code4(CPUS390XState *env, DisasContext *s, + uint64_t pc) { - return (uint64_t)(uint32_t)cpu_ldl_code(env, pc); + return (uint64_t)(uint32_t)translator_ldl(env, &s->base, pc); } =20 static int get_mem_index(DisasContext *s) @@ -6273,7 +6275,7 @@ static const DisasInsn *extract_insn(CPUS390XState *e= nv, DisasContext *s) ilen =3D s->ex_value & 0xf; op =3D insn >> 56; } else { - insn =3D ld_code2(env, pc); + insn =3D ld_code2(env, s, pc); op =3D (insn >> 8) & 0xff; ilen =3D get_ilen(op); switch (ilen) { @@ -6281,10 +6283,10 @@ static const DisasInsn *extract_insn(CPUS390XState = *env, DisasContext *s) insn =3D insn << 48; break; case 4: - insn =3D ld_code4(env, pc) << 32; + insn =3D ld_code4(env, s, pc) << 32; break; case 6: - insn =3D (insn << 48) | (ld_code4(env, pc + 2) << 16); + insn =3D (insn << 48) | (ld_code4(env, s, pc + 2) << 16); break; default: g_assert_not_reached(); diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 8704fea1ca..cf5fe9243d 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -1907,7 +1907,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4Stat= e *env) =20 /* Read all of the insns for the region. */ for (i =3D 0; i < max_insns; ++i) { - insns[i] =3D translator_lduw(env, pc + i * 2); + insns[i] =3D translator_lduw(env, &ctx->base, pc + i * 2); } =20 ld_adr =3D ld_dst =3D ld_mop =3D -1; @@ -2307,7 +2307,7 @@ static void sh4_tr_translate_insn(DisasContextBase *d= cbase, CPUState *cs) } #endif =20 - ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next); decode_opc(ctx); ctx->base.pc_next +=3D 2; } diff --git a/target/sparc/translate.c b/target/sparc/translate.c index bb70ba17de..fdb8bbe5dc 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -5855,7 +5855,7 @@ static void sparc_tr_translate_insn(DisasContextBase = *dcbase, CPUState *cs) CPUSPARCState *env =3D cs->env_ptr; unsigned int insn; =20 - insn =3D translator_ldl(env, dc->pc); + insn =3D translator_ldl(env, &dc->base, dc->pc); dc->base.pc_next +=3D 4; disas_sparc_insn(dc, insn); =20 diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 20399d6a04..dcf6b500ef 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -882,7 +882,8 @@ static int arg_copy_compare(const void *a, const void *= b) static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc) { xtensa_isa isa =3D dc->config->isa; - unsigned char b[MAX_INSN_LENGTH] =3D {translator_ldub(env, dc->pc)}; + unsigned char b[MAX_INSN_LENGTH] =3D {translator_ldub(env, &dc->base, + dc->pc)}; unsigned len =3D xtensa_op0_insn_len(dc, b[0]); xtensa_format fmt; int slot, slots; @@ -907,7 +908,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, Disa= sContext *dc) =20 dc->base.pc_next =3D dc->pc + len; for (i =3D 1; i < len; ++i) { - b[i] =3D translator_ldub(env, dc->pc + i); + b[i] =3D translator_ldub(env, &dc->base, dc->pc + i); } xtensa_insnbuf_from_chars(isa, dc->insnbuf, b, len); fmt =3D xtensa_format_decode(isa, dc->insnbuf); diff --git a/target/mips/tcg/micromips_translate.c.inc b/target/mips/tcg/mi= cromips_translate.c.inc index 5e95f47854..0da4c802a3 100644 --- a/target/mips/tcg/micromips_translate.c.inc +++ b/target/mips/tcg/micromips_translate.c.inc @@ -1627,7 +1627,7 @@ static void decode_micromips32_opc(CPUMIPSState *env,= DisasContext *ctx) uint32_t op, minor, minor2, mips32_op; uint32_t cond, fmt, cc; =20 - insn =3D translator_lduw(env, ctx->base.pc_next + 2); + insn =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D (ctx->opcode >> 21) & 0x1f; diff --git a/target/mips/tcg/mips16e_translate.c.inc b/target/mips/tcg/mips= 16e_translate.c.inc index 54071813f1..84d816603a 100644 --- a/target/mips/tcg/mips16e_translate.c.inc +++ b/target/mips/tcg/mips16e_translate.c.inc @@ -455,7 +455,7 @@ static void decode_i64_mips16(DisasContext *ctx, =20 static int decode_extended_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { - int extend =3D translator_lduw(env, ctx->base.pc_next + 2); + int extend =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); int op, rx, ry, funct, sa; int16_t imm, offset; =20 @@ -688,7 +688,7 @@ static int decode_ase_mips16e(CPUMIPSState *env, DisasC= ontext *ctx) /* No delay slot, so just process as a normal instruction */ break; case M16_OPC_JAL: - offset =3D translator_lduw(env, ctx->base.pc_next + 2); + offset =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); offset =3D (((ctx->opcode & 0x1f) << 21) | ((ctx->opcode >> 5) & 0x1f) << 16 | offset) << 2; diff --git a/target/mips/tcg/nanomips_translate.c.inc b/target/mips/tcg/nan= omips_translate.c.inc index a66ae26796..ccbcecad09 100644 --- a/target/mips/tcg/nanomips_translate.c.inc +++ b/target/mips/tcg/nanomips_translate.c.inc @@ -3656,7 +3656,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *en= v, DisasContext *ctx) int offset; int imm; =20 - insn =3D translator_lduw(env, ctx->base.pc_next + 2); + insn =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D extract32(ctx->opcode, 21, 5); @@ -3775,7 +3775,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *en= v, DisasContext *ctx) break; case NM_P48I: { - insn =3D translator_lduw(env, ctx->base.pc_next + 4); + insn =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + = 4); target_long addr_off =3D extract32(ctx->opcode, 0, 16) | insn = << 16; switch (extract32(ctx->opcode, 16, 5)) { case NM_LI48: --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462641; cv=none; d=zohomail.com; s=zohoarc; b=XQDkwZFFhxIMf/qIw+d553j55Joze1bClypf005K8CKws60RPCZBJ0sRrzaVHqP5XbgYqzcCKGtpO0sm76SBSywLkPl5ZPJDk98N/awORs74mfCatNc8/TaQEWYCvnmSb/d234D1PSe6VtKghAJSj5cUxXpjt/bZyqbvKCGEaSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462641; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eLHG44jCWPrfG7hZcGkKiwrmgjxf0GnrOvDF2kTb5Z0=; b=KhPtQgtuYSri/AY4hqT+07qs5SgWQLeSBVsK1EO30V8+Qg+g2oc6WQGWTJ1m7jD8TwtWV/1Urx2ATmalULBJdgctMvMG9QcW7HGcFuqbZC3RJeeRqJ3TJ49Bui+nAq0UwWs0uibiprUv1GV1pg+TTrRywPRnteiBIrutjwEZulU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16314626414227.608627276441439; Sun, 12 Sep 2021 09:04:01 -0700 (PDT) Received: from localhost ([::1]:51918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRxY-0002Xv-9G for importer@patchew.org; Sun, 12 Sep 2021 12:04:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs1-0002MQ-JW for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:17 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:40809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRrx-0003uh-J4 for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:15 -0400 Received: by mail-pl1-x629.google.com with SMTP id n18so4256513plp.7 for ; Sun, 12 Sep 2021 08:58:13 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eLHG44jCWPrfG7hZcGkKiwrmgjxf0GnrOvDF2kTb5Z0=; b=vsT/ctD0xCdETlcGMvZbdQZ/CPHhfv78Zi01bjvsE8BKT3GE6oeYmXBcZNdSLYmUkO Nng1Qa3k3fP5TA9XZqAxbVvfsBN6sZH0XUT/QSbKOHLsC3vHhX8xjvznyx6ZvNhJSFm2 Vkf7GS+SphUkdVnhS3IcOmBXzSqIg17BkbuUZcRVHuRWGDfqjhQoYn+pVOYRCxchyKjj f0hwmLE/ico8/jZLHTJTdG1HrB9WX1E+6sgazTbdkJuIDOKuQjd7k6yP2dI5271r+ZqJ zWl3ocQ6ONCvanQWiuxSsoDA8jAIPNnpDjks21a8amcx8lw7FqGy8xy/I0BrscOy+3QO IDmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eLHG44jCWPrfG7hZcGkKiwrmgjxf0GnrOvDF2kTb5Z0=; b=5ixwIY/ZCkLmL8lcwPFcuXIKepAECOAfMY3a1niND7hujHB1XiIYHuPMPys/ZfrJ1r l9D09cgjG/WAYr5PZ0SwhecpclquIv9CkTxV680dovIVG0KkI6Prn4PtXCQc+vF4Eg93 SvCeLHJ/xqqZXfBDaLbMTmesbGnlWO5m2LnE2zopzYPXbewpiWGS29ljLNlwXy413Xke cMx4ctnarXQ2Zc5NBoNvKguT2Tz+okfG8un/T2/ZZAk0EvMiVQA0oLpu5iFh4qsGeRLn kIGDJEOVxaqZcOzsMUd6dPYhFsO3Uhn0bU+DrslAGAYDifYRj4VFP+7lxMuUpKkle7Jl xWxw== X-Gm-Message-State: AOAM532g4IUKwSTAQqZBxLiQPLQtw+itTA850yr9tvGy6he/fNkafwTp SoWBnFOZGMes+I4nMt/xXulMTZU11bQ2Jw== X-Google-Smtp-Source: ABdhPJxxh8Vm9CEkOnuz/Ony3c9kILbPeRylWDBUwt1knpITTdKolyM9IWi+egRJhNw2z7D7sQjHUA== X-Received: by 2002:a17:90a:bc8d:: with SMTP id x13mr8059546pjr.9.1631462292179; Sun, 12 Sep 2021 08:58:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/9] accel/tcg: Clear PAGE_WRITE before translation Date: Sun, 12 Sep 2021 08:58:02 -0700 Message-Id: <20210912155809.196236-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Ilya Leoshkevich Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462641816100002 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich translate_insn() implementations fetch instruction bytes piecemeal, which can cause qemu-user to generate inconsistent translations if another thread modifies them concurrently [1]. Fix by making pages containing translated instruction non-writable right before loading instruction bytes from them. [1] https://lists.nongnu.org/archive/html/qemu-devel/2021-08/msg00644.html Signed-off-by: Ilya Leoshkevich Message-Id: <20210805204835.158918-1-iii@linux.ibm.com> Signed-off-by: Richard Henderson --- include/exec/translate-all.h | 1 + include/exec/translator.h | 39 ++++++++++++++---------- accel/tcg/translate-all.c | 59 +++++++++++++++++++++--------------- accel/tcg/translator.c | 39 ++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 41 deletions(-) diff --git a/include/exec/translate-all.h b/include/exec/translate-all.h index a557b4e2bb..9f646389af 100644 --- a/include/exec/translate-all.h +++ b/include/exec/translate-all.h @@ -33,6 +33,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, = tb_page_addr_t end); void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr); =20 #ifdef CONFIG_USER_ONLY +void page_protect(tb_page_addr_t page_addr); int page_unprotect(target_ulong address, uintptr_t pc); #endif =20 diff --git a/include/exec/translator.h b/include/exec/translator.h index 6c054e8d05..9bc46eda59 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/plugin-gen.h" +#include "exec/translate-all.h" #include "tcg/tcg.h" =20 =20 @@ -74,6 +75,17 @@ typedef struct DisasContextBase { int num_insns; int max_insns; bool singlestep_enabled; +#ifdef CONFIG_USER_ONLY + /* + * Guest address of the last byte of the last protected page. + * + * Pages containing the translated instructions are made non-writable = in + * order to achieve consistency in case another thread is modifying the + * code while translate_insn() fetches the instruction bytes piecemeal. + * Such writer threads are blocked on mmap_lock() in page_unprotect(). + */ + target_ulong page_protect_end; +#endif } DisasContextBase; =20 /** @@ -156,28 +168,23 @@ bool translator_use_goto_tb(DisasContextBase *db, tar= get_ulong dest); */ =20 #define GEN_TRANSLATOR_LD(fullname, type, load_fn, swap_fn) \ - static inline type \ - fullname ## _swap(CPUArchState *env, DisasContextBase *dcbase, \ - abi_ptr pc, bool do_swap) \ - { \ - type ret =3D load_fn(env, pc); \ - if (do_swap) { \ - ret =3D swap_fn(ret); \ - } \ - plugin_insn_append(&ret, sizeof(ret)); \ - return ret; \ - } \ + type fullname ## _swap(CPUArchState *env, DisasContextBase *dcbase, \ + abi_ptr pc, bool do_swap); \ static inline type fullname(CPUArchState *env, \ DisasContextBase *dcbase, abi_ptr pc) \ { \ return fullname ## _swap(env, dcbase, pc, false); \ } =20 -GEN_TRANSLATOR_LD(translator_ldub, uint8_t, cpu_ldub_code, /* no swap */) -GEN_TRANSLATOR_LD(translator_ldsw, int16_t, cpu_ldsw_code, bswap16) -GEN_TRANSLATOR_LD(translator_lduw, uint16_t, cpu_lduw_code, bswap16) -GEN_TRANSLATOR_LD(translator_ldl, uint32_t, cpu_ldl_code, bswap32) -GEN_TRANSLATOR_LD(translator_ldq, uint64_t, cpu_ldq_code, bswap64) +#define FOR_EACH_TRANSLATOR_LD(F) \ + F(translator_ldub, uint8_t, cpu_ldub_code, /* no swap */) \ + F(translator_ldsw, int16_t, cpu_ldsw_code, bswap16) \ + F(translator_lduw, uint16_t, cpu_lduw_code, bswap16) \ + F(translator_ldl, uint32_t, cpu_ldl_code, bswap32) \ + F(translator_ldq, uint64_t, cpu_ldq_code, bswap64) + +FOR_EACH_TRANSLATOR_LD(GEN_TRANSLATOR_LD) + #undef GEN_TRANSLATOR_LD =20 #endif /* EXEC__TRANSLATOR_H */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index bbfcfb698c..fb9ebfad9e 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1297,31 +1297,8 @@ static inline void tb_page_add(PageDesc *p, Translat= ionBlock *tb, invalidate_page_bitmap(p); =20 #if defined(CONFIG_USER_ONLY) - if (p->flags & PAGE_WRITE) { - target_ulong addr; - PageDesc *p2; - int prot; - - /* force the host page as non writable (writes will have a - page fault + mprotect overhead) */ - page_addr &=3D qemu_host_page_mask; - prot =3D 0; - for (addr =3D page_addr; addr < page_addr + qemu_host_page_size; - addr +=3D TARGET_PAGE_SIZE) { - - p2 =3D page_find(addr >> TARGET_PAGE_BITS); - if (!p2) { - continue; - } - prot |=3D p2->flags; - p2->flags &=3D ~PAGE_WRITE; - } - mprotect(g2h_untagged(page_addr), qemu_host_page_size, - (prot & PAGE_BITS) & ~PAGE_WRITE); - if (DEBUG_TB_INVALIDATE_GATE) { - printf("protecting code page: 0x" TB_PAGE_ADDR_FMT "\n", page_= addr); - } - } + /* translator_loop() must have made all TB pages non-writable */ + assert(!(p->flags & PAGE_WRITE)); #else /* if some code is already present, then the pages are already protected. So we handle the case where only the first TB is @@ -2394,6 +2371,38 @@ int page_check_range(target_ulong start, target_ulon= g len, int flags) return 0; } =20 +void page_protect(tb_page_addr_t page_addr) +{ + target_ulong addr; + PageDesc *p; + int prot; + + p =3D page_find(page_addr >> TARGET_PAGE_BITS); + if (p && (p->flags & PAGE_WRITE)) { + /* + * Force the host page as non writable (writes will have a page fa= ult + + * mprotect overhead). + */ + page_addr &=3D qemu_host_page_mask; + prot =3D 0; + for (addr =3D page_addr; addr < page_addr + qemu_host_page_size; + addr +=3D TARGET_PAGE_SIZE) { + + p =3D page_find(addr >> TARGET_PAGE_BITS); + if (!p) { + continue; + } + prot |=3D p->flags; + p->flags &=3D ~PAGE_WRITE; + } + mprotect(g2h_untagged(page_addr), qemu_host_page_size, + (prot & PAGE_BITS) & ~PAGE_WRITE); + if (DEBUG_TB_INVALIDATE_GATE) { + printf("protecting code page: 0x" TB_PAGE_ADDR_FMT "\n", page_= addr); + } + } +} + /* called from signal handler: invalidate the code and unprotect the * page. Return 0 if the fault was not handled, 1 if it was handled, * and 2 if it was handled but the caller must cause the TB to be diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index c53a7f8e44..390bd9db0a 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -42,6 +42,15 @@ bool translator_use_goto_tb(DisasContextBase *db, target= _ulong dest) return ((db->pc_first ^ dest) & TARGET_PAGE_MASK) =3D=3D 0; } =20 +static inline void translator_page_protect(DisasContextBase *dcbase, + target_ulong pc) +{ +#ifdef CONFIG_USER_ONLY + dcbase->page_protect_end =3D pc | ~TARGET_PAGE_MASK; + page_protect(pc); +#endif +} + void translator_loop(const TranslatorOps *ops, DisasContextBase *db, CPUState *cpu, TranslationBlock *tb, int max_insns) { @@ -56,6 +65,7 @@ void translator_loop(const TranslatorOps *ops, DisasConte= xtBase *db, db->num_insns =3D 0; db->max_insns =3D max_insns; db->singlestep_enabled =3D cflags & CF_SINGLE_STEP; + translator_page_protect(db, db->pc_next); =20 ops->init_disas_context(db, cpu); tcg_debug_assert(db->is_jmp =3D=3D DISAS_NEXT); /* no early exit */ @@ -137,3 +147,32 @@ void translator_loop(const TranslatorOps *ops, DisasCo= ntextBase *db, } #endif } + +static inline void translator_maybe_page_protect(DisasContextBase *dcbase, + target_ulong pc, size_t l= en) +{ +#ifdef CONFIG_USER_ONLY + target_ulong end =3D pc + len - 1; + + if (end > dcbase->page_protect_end) { + translator_page_protect(dcbase, end); + } +#endif +} + +#define GEN_TRANSLATOR_LD(fullname, type, load_fn, swap_fn) \ + type fullname ## _swap(CPUArchState *env, DisasContextBase *dcbase, \ + abi_ptr pc, bool do_swap) \ + { \ + translator_maybe_page_protect(dcbase, pc, sizeof(type)); \ + type ret =3D load_fn(env, pc); \ + if (do_swap) { \ + ret =3D swap_fn(ret); \ + } \ + plugin_insn_append(&ret, sizeof(ret)); \ + return ret; \ + } + +FOR_EACH_TRANSLATOR_LD(GEN_TRANSLATOR_LD) + +#undef GEN_TRANSLATOR_LD --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462490; cv=none; d=zohomail.com; s=zohoarc; b=O7km4P1+7Li/dX1WVdkzj3DV7u0OmYcUz+Fyh/jrzrizKGWWcApTf8ZAWA14f51pZUyXW6WdGqsV6vydAxkZfWNkb1bgmwjJeEEOExpa5ogFzJLfXTqtQDXBREO3xcyL+SgsmQDbQ9JAlbIuwH+XiutJZ/vy8vmqst2SzlB5+bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462490; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xTIxcHhgBqxY5Qqs3Qm50I0S2odWSXBe4kNBC/XEBq0=; b=MbUKt61WoRsg73pmg5T1Wp1U6FBVRYEXJWNM3vV+h1cjXpNMFGPVDOADO8Fzdm444rOxQPe5+ZVj3sLsyOJ5xYddcBvSeWx3/V5d4I5BfUADGlARcS/eWfsE7hD8EvBR2qbiAjK+h3HxXnMpOPfgIF43LeUTtbktDUPS4762ZjA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462490954989.9985415498209; Sun, 12 Sep 2021 09:01:30 -0700 (PDT) Received: from localhost ([::1]:43314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRv7-0005Cn-RM for importer@patchew.org; Sun, 12 Sep 2021 12:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs2-0002NE-4J for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:18 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:39804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRry-0003uo-8P for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:17 -0400 Received: by mail-pl1-x62b.google.com with SMTP id c4so2713629pls.6 for ; Sun, 12 Sep 2021 08:58:13 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xTIxcHhgBqxY5Qqs3Qm50I0S2odWSXBe4kNBC/XEBq0=; b=EQowP4aujitLFXTmAcp/FAajb9HJX5SmJnDuCUdnBmM3X7cjDInr2VGP7BNfOffbMI /K1QrbpbZtPJ9E+97eBIelpSibmgiyyr3nF4+mXILfS0k0WZRQSD3If4Alb8ZTJIxfJD 5oCWK7eAjrjxz195oOcZ3TNfk93OZRIVAd2MxPwBn93+4NGF+YEr6vZwJqyopVO0+jBV PPqySojcklmP/nI4SE/JQRd25LeEHHrqUKhlXBWiJnJNLEkmFeK1L1JMCWeG2161xSsX JLB4csmHtsTK5roOTillanCOrHRzjFl+ruyj3q8T8eUDSNi07MG0Dq/aRDA+a1zOtuJX evRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xTIxcHhgBqxY5Qqs3Qm50I0S2odWSXBe4kNBC/XEBq0=; b=eVGunGAPzMAG9hV9sVUNJgGxUsVE1wNxxhFVVmRVo+1wNupVhQeMRaZ3OYwfR9x5nS ezH5l0F/kXD4Moz5cNyC+R2D4Upv4COvQXrt5XHrokb0+QtMQh0NmutuWSzsKL1GI7UA uOrl7zEuqp7cOBlcPPWVOj0LbVndJ8xNcFDUPzNlE1bue48k46/2j7toc4cHQJyvqRCo FQZMwmM4ZOpMGoRTV434X34HWkluQyr0klLpMHB7zdpjue8j3t+H2zUHV/OoBXcv35Ab wEWLeNGUftCRFIawNRmkWLAER2PnGoBUVaeldl2I2UiBP83ThqLDJ4ltzgRLoaovnr5T av9Q== X-Gm-Message-State: AOAM533KlXsMlObOqQ74rw2N4YrO4YiupcmJopnLcJSuWiy2DEZFKWkM UB6c2PhNF79k16qucVIggL7KVDV7hUY5BA== X-Google-Smtp-Source: ABdhPJzhupnRZYocOKN78KCXTc55J3sec7ZdEqucOPxTdYVp0PoiPeg8k2ntiCwNUFjzC3K+zpx+tw== X-Received: by 2002:a17:90a:a23:: with SMTP id o32mr264815pjo.172.1631462292987; Sun, 12 Sep 2021 08:58:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 3/9] tcg/i386: Split P_VEXW from P_REXW Date: Sun, 12 Sep 2021 08:58:03 -0700 Message-Id: <20210912155809.196236-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631463394016100001 Content-Type: text/plain; charset="utf-8" We need to be able to represent VEX.W on a 32-bit host, where REX.W will always be zero. Fixes the encoding for VPSLLVQ and VPSRLVQ. Fixes: a2ce146a068 ("tcg/i386: Support vector variable shift opcodes") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/385 Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 98d924b91a..997510109d 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -241,8 +241,9 @@ static bool tcg_target_const_match(int64_t val, TCGType= type, int ct) #define P_EXT 0x100 /* 0x0f opcode prefix */ #define P_EXT38 0x200 /* 0x0f 0x38 opcode prefix */ #define P_DATA16 0x400 /* 0x66 opcode prefix */ +#define P_VEXW 0x1000 /* Set VEX.W =3D 1 */ #if TCG_TARGET_REG_BITS =3D=3D 64 -# define P_REXW 0x1000 /* Set REX.W =3D 1 */ +# define P_REXW P_VEXW /* Set REX.W =3D 1; match VEXW */ # define P_REXB_R 0x2000 /* REG field as byte register */ # define P_REXB_RM 0x4000 /* R/M field as byte register */ # define P_GS 0x8000 /* gs segment override */ @@ -410,13 +411,13 @@ static bool tcg_target_const_match(int64_t val, TCGTy= pe type, int ct) #define OPC_VPBROADCASTW (0x79 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTD (0x58 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTQ (0x59 | P_EXT38 | P_DATA16) -#define OPC_VPERMQ (0x00 | P_EXT3A | P_DATA16 | P_REXW) +#define OPC_VPERMQ (0x00 | P_EXT3A | P_DATA16 | P_VEXW) #define OPC_VPERM2I128 (0x46 | P_EXT3A | P_DATA16 | P_VEXL) #define OPC_VPSLLVD (0x47 | P_EXT38 | P_DATA16) -#define OPC_VPSLLVQ (0x47 | P_EXT38 | P_DATA16 | P_REXW) +#define OPC_VPSLLVQ (0x47 | P_EXT38 | P_DATA16 | P_VEXW) #define OPC_VPSRAVD (0x46 | P_EXT38 | P_DATA16) #define OPC_VPSRLVD (0x45 | P_EXT38 | P_DATA16) -#define OPC_VPSRLVQ (0x45 | P_EXT38 | P_DATA16 | P_REXW) +#define OPC_VPSRLVQ (0x45 | P_EXT38 | P_DATA16 | P_VEXW) #define OPC_VZEROUPPER (0x77 | P_EXT) #define OPC_XCHG_ax_r32 (0x90) =20 @@ -576,7 +577,7 @@ static void tcg_out_vex_opc(TCGContext *s, int opc, int= r, int v, =20 /* Use the two byte form if possible, which cannot encode VEX.W, VEX.B, VEX.X, or an m-mmmm field other than P_EXT. */ - if ((opc & (P_EXT | P_EXT38 | P_EXT3A | P_REXW)) =3D=3D P_EXT + if ((opc & (P_EXT | P_EXT38 | P_EXT3A | P_VEXW)) =3D=3D P_EXT && ((rm | index) & 8) =3D=3D 0) { /* Two byte VEX prefix. */ tcg_out8(s, 0xc5); @@ -601,7 +602,7 @@ static void tcg_out_vex_opc(TCGContext *s, int opc, int= r, int v, tmp |=3D (rm & 8 ? 0 : 0x20); /* VEX.B */ tcg_out8(s, tmp); =20 - tmp =3D (opc & P_REXW ? 0x80 : 0); /* VEX.W */ + tmp =3D (opc & P_VEXW ? 0x80 : 0); /* VEX.W */ } =20 tmp |=3D (opc & P_VEXL ? 0x04 : 0); /* VEX.L */ --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462636; cv=none; d=zohomail.com; s=zohoarc; b=brymHSw7BxagmWwA7qtj/Ud/ORrjtFkQ04NTN3MX4ubARrYwNfJ9/8QLGTIeEsxoSI4gRPb7jQKlpIoGsn1e/5vdnzx+oh9E+r5tOGaMU6AU0skQqbqsDwKtYLxpkLqzWS0clIUVBfTkPA1kysv6K8mkxQpqu6FUVrKP0g8KBPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462636; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4qLOJ7aAC4BizQd/i02xX0hEQglVCR9hQiC8rfWR7Us=; b=Q1OXFDulk/I2ACBW+a5GE6M7Sx/7ynfNeqLlMx0RK7qQzxAGd3/ZGRrvKbetnRtK05ZIhZI4yInV+hJ2iM5CPeYPqfOl78FiPuDGmoNN8QpS+e4+DWJtKn1lKiA8WH4IGl2owWuifstHXCiv/TbAQAtNSFbRqDkbcKE2NDX98cY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462636505468.6150552169215; Sun, 12 Sep 2021 09:03:56 -0700 (PDT) Received: from localhost ([::1]:51544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRxT-0002J3-G0 for importer@patchew.org; Sun, 12 Sep 2021 12:03:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs1-0002MR-Kx for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:17 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:42931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRrz-0003vQ-4q for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:17 -0400 Received: by mail-pl1-x635.google.com with SMTP id n4so4249549plh.9 for ; Sun, 12 Sep 2021 08:58:14 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4qLOJ7aAC4BizQd/i02xX0hEQglVCR9hQiC8rfWR7Us=; b=J7B4eDwfWuTdlCqBUcS077j1KftDXaNKG2WBXRsA6Sgc/ikWItxTG5F00+4lOjYM48 q0DU1ytuRlWDrnryc25ccjcJzVoSAbozidI5MZj981xAdbAfIkgPClF7WQvEQCo3BJs/ bje0Wdu512RVsx6j33IMsK0VH1VzVaPZ5sBQnC5IJ98QiRimcCUqs/tCxZEceMlLdXM4 lg0GoIB4aB7UbPgqwtbJCMrUNH+Nn6FIygpIxOcS5sUfOW0Uk5pP4jXU1xMQFpESgpXL HWIQMjySe0npcVgDWn3aIvhDmiCdujqFoHMPqcKvQIFKXCLLwlkca/xrgbGjYAlgxEPZ G+FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4qLOJ7aAC4BizQd/i02xX0hEQglVCR9hQiC8rfWR7Us=; b=012UX7vGYWYuwUTQbPmUPyERSfCa4r/yFINXC0hnT98IJAWU2AAAnOx7cBN7bkGMZW jKUNJ7N3lbAPoenz7YWJzjan1sNYvegtNaNpufANGlPJM4vu+uK++3s9bstv4Kh/BeW+ AASXs4g0tMaAWArx7S6EOsLSwpbs4OLkZNNX3sCOC6dgnh1CCmp4oaj5V7UPBN6Axreg kC2qFU3nyZB3NWocDquSUFH0uMFy2jQH+3l2avZxoFPvpae+EwK6Okq4li2yGoMHpW/5 U/2NdjS3oTJJmUsFG6C8Zrlx3+2OUviGYMMuoSnviPCvMgNs96sPnA07Ndf30mYJOp3i Mp1g== X-Gm-Message-State: AOAM5326DID52jG1Z/3zKks94NzFMFpuzBbcqrBqAVWTlbXxMJTq8Dme mkj71pvdo5ZP85kiZuEU0KSMX4ObrIH2Lg== X-Google-Smtp-Source: ABdhPJxDm8ZprADwzxgUDE3nzSFbd+QaL5Tow1fYNdjcJsvKby1rXzj0+zYX1PhevF97qZLQAPdqpw== X-Received: by 2002:a17:90b:4904:: with SMTP id kr4mr8417715pjb.50.1631462293808; Sun, 12 Sep 2021 08:58:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 4/9] accel/tcg: remove redundant TCG_KICK_PERIOD define Date: Sun, 12 Sep 2021 08:58:04 -0700 Message-Id: <20210912155809.196236-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Luc Michel , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462637465100001 From: Luc Michel The TCG_KICK_PERIOD macro is already defined in tcg-accel-ops-rr.h. Remove it from tcg-accel-ops-rr.c. Signed-off-by: Luc Michel Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210811141229.12470-1-lmichel@kalray.eu> Signed-off-by: Richard Henderson --- accel/tcg/tcg-accel-ops-rr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index c02c061ecb..a5fd26190e 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -60,8 +60,6 @@ void rr_kick_vcpu_thread(CPUState *unused) static QEMUTimer *rr_kick_vcpu_timer; static CPUState *rr_current_cpu; =20 -#define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10) - static inline int64_t rr_next_kick_time(void) { return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + TCG_KICK_PERIOD; --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462830; cv=none; d=zohomail.com; s=zohoarc; b=UJ2aHidyKJs0CzAQb1P4kEFiWr86xS6ukCu4eqmasBFslgPEw8T+SP98F1WLz2NDcXFjLWO/KU+1Z/yivD6qXhLCehubsmQ7F1G5kBSj9PMXm9GOqDpxiojamt/2Ln6D1PSF0a913AEkagPEY+A8XzN9O7SD+YXDtdLUfdK8fP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mo8bAa/Ep14lrVyCCKLWc2/qVNIgW8fWICNcTlyJnEo=; b=D0MMPnSwqyn5Dk7qVPKWiP2nUxxGM5q6UlWBqE4vDl0xx1MZG7KGIOhBoF3s1Uc8YMiFYax+w5foamRKNCFRfCLsKpcpiILp71xmpP2yOuhLVxDlgtypD3A9OPycMqnEvxEtTtN7nJsjzi01i5WSk53GpWxPtR6rZc0nG5qkxlU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462830066126.86482886431202; Sun, 12 Sep 2021 09:07:10 -0700 (PDT) Received: from localhost ([::1]:60288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPS0b-0008AM-3P for importer@patchew.org; Sun, 12 Sep 2021 12:07:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs4-0002QE-Gm for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:21 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:36831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRrz-0003wJ-T8 for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:20 -0400 Received: by mail-pg1-x52d.google.com with SMTP id t1so7037044pgv.3 for ; Sun, 12 Sep 2021 08:58:15 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mo8bAa/Ep14lrVyCCKLWc2/qVNIgW8fWICNcTlyJnEo=; b=yHyodcA8fcQjjJC1ke3hNEXdLnjKF7cvxhUXPAnlushiIKz2AKMdOluu4G6gRRae3P +aFTYaaK/MM9emNCy5ronvq/43H8RI5NEeMW6sM+gdtijCVXhXrdknFI1H6m1jokh4Yh 7/nbReNmXqLwfIl4VI2rIHDcX0KoLSe4scVeHPdg3L5Q7zBbCczHFC2jjsk5RTIJCJVK Ffp4aGrhGhyZ5hoxl5SqNwG0v+EESNa5l0q+QxAan3TayEWp1W92+ACOXKCvJVqmLIkl 0cKnreb3UcUuyxVth65jrK31/7/cn85vlWdrSyUwUb8aM6v2v4mM3pNVBv8aUL/KvdEC owAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mo8bAa/Ep14lrVyCCKLWc2/qVNIgW8fWICNcTlyJnEo=; b=16NoIC0OtTTW+sSbtDlaI4hKnuycjkhzPOHg9gl/+IYLo5yNcLXzMwrBKvDwNKtcyI wOlOqhloh3AMyqrwMh2ODGtmJZsgWff/B2voNGZ5ik9wu4/BxB9II6wSW7IrnKBnFa35 PewGQeuESbEVdTz3ZzICds5sJMjUZzUEXdjBpvYGbfl9eZyfbMvpK4kjNLUiPb6PpkLD wKcohqpE43DksrIITvyW00QAQ/y3qG0F9aIKFb+KhZ/p4BdhxiY/NcU1lD5VBJeG+Ag0 BDFf45wC/VDWQoV99+oI2+EgCCFladpFpXKAZ+ngmCh11WteP4/3MRvQIphLrBcisQ5d oIdA== X-Gm-Message-State: AOAM5330YYUwi8ZO56/Dj6NBdE2wHAjKelvvUVYFAqMjEmE1jGvAt8zs yhE+uuwfbMyOpo3Etegw8dKFK/AYUIR+4g== X-Google-Smtp-Source: ABdhPJyYzAbGWC+1XCInNDL4tbEBkLFEK0/lqBxH5QZaO2GYUOIbCL4Ya05HHkHa0QEiXYMVF7l1kg== X-Received: by 2002:a63:e510:: with SMTP id r16mr7232349pgh.34.1631462294650; Sun, 12 Sep 2021 08:58:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 5/9] tcg: Remove tcg_global_reg_new defines Date: Sun, 12 Sep 2021 08:58:05 -0700 Message-Id: <20210912155809.196236-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52d.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462832240100001 From: Bin Meng Since commit 1c2adb958fc0 ("tcg: Initialize cpu_env generically"), these tcg_global_reg_new_ macros are not used anywhere. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210816143507.11200-1-bmeng.cn@gmail.com> Signed-off-by: Richard Henderson --- include/tcg/tcg-op.h | 2 -- target/hppa/translate.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 2a654f350c..0545a6224c 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -843,7 +843,6 @@ static inline void tcg_gen_plugin_cb_end(void) =20 #if TARGET_LONG_BITS =3D=3D 32 #define tcg_temp_new() tcg_temp_new_i32() -#define tcg_global_reg_new tcg_global_reg_new_i32 #define tcg_global_mem_new tcg_global_mem_new_i32 #define tcg_temp_local_new() tcg_temp_local_new_i32() #define tcg_temp_free tcg_temp_free_i32 @@ -851,7 +850,6 @@ static inline void tcg_gen_plugin_cb_end(void) #define tcg_gen_qemu_st_tl tcg_gen_qemu_st_i32 #else #define tcg_temp_new() tcg_temp_new_i64() -#define tcg_global_reg_new tcg_global_reg_new_i64 #define tcg_global_mem_new tcg_global_mem_new_i64 #define tcg_temp_local_new() tcg_temp_local_new_i64() #define tcg_temp_free tcg_temp_free_i64 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 3ce22cdd09..c3698cf067 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -34,7 +34,6 @@ =20 #undef TCGv #undef tcg_temp_new -#undef tcg_global_reg_new #undef tcg_global_mem_new #undef tcg_temp_local_new #undef tcg_temp_free @@ -59,7 +58,6 @@ #define TCGv_reg TCGv_i64 =20 #define tcg_temp_new tcg_temp_new_i64 -#define tcg_global_reg_new tcg_global_reg_new_i64 #define tcg_global_mem_new tcg_global_mem_new_i64 #define tcg_temp_local_new tcg_temp_local_new_i64 #define tcg_temp_free tcg_temp_free_i64 @@ -155,7 +153,6 @@ #else #define TCGv_reg TCGv_i32 #define tcg_temp_new tcg_temp_new_i32 -#define tcg_global_reg_new tcg_global_reg_new_i32 #define tcg_global_mem_new tcg_global_mem_new_i32 #define tcg_temp_local_new tcg_temp_local_new_i32 #define tcg_temp_free tcg_temp_free_i32 --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462491; cv=none; d=zohomail.com; s=zohoarc; b=cWnMCfHCBkTW1iJXbTPFiG543QPjb5uIzUw5165JlzGu8zvXh8ySuk9V8BzRASSFr1craEIS91x0YfH5Qe1MMVVFG83NKn7PY0P/pdiUGEn86/EzUgMQLi82/Ed9UVTbG8FwyTRvVhJGfsVkOe4jST0zYtKHodPXEtwWI5cpLo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462491; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WQDuqbSrDr+qw7KrlgTnp7QFi56WX9RoG9PJ3coNJeg=; b=Yu8ffMbWNlkQCL6pwV8Z0rhJoU4oJTPRDLEHPqH3W3+4IG5YYlRKu6AQQTNkwDhgQ8V1FGkpA0Lqj9tnPU0DAZYqfShq0DTmr/FvbsR7Ii7Lo803OcM3QaoDm55qLWj6gBmjp5rXGW74vXVaQDUuePlWi1lkp47D87VOkXF2BpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462490956386.3027055800327; Sun, 12 Sep 2021 09:01:30 -0700 (PDT) Received: from localhost ([::1]:43290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRv7-0005CA-NH for importer@patchew.org; Sun, 12 Sep 2021 12:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs4-0002Pn-9o for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:20 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:44544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRs1-0003wo-C1 for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:20 -0400 Received: by mail-pj1-x1029.google.com with SMTP id gp20-20020a17090adf1400b00196b761920aso4760145pjb.3 for ; Sun, 12 Sep 2021 08:58:16 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WQDuqbSrDr+qw7KrlgTnp7QFi56WX9RoG9PJ3coNJeg=; b=GlXybQsWe+pPyo3VjOdYKrJ932JM7RquMO0mH4xIUVMqZMdN04C8Dhzv8t/pn6PYMB VrIfBPdpcNLdLtgcyOPtgYZ/XRbURu2xBhlrX6aEwZeiNKRil4omWQyQ4uMjT+wFObx3 fd2C3P/ZYKT4o+KNqL1SOnQyJC1WOkTvK1lkMeaWMriw3+8Vn2HfnpXYWPwIYUhjts7u JtI9NFiSeQjej/C7bTl1rIywVue8pHGxEogO7/1wc2vZOJjygOQnmp91Iol+sRgPF7qr teQBVozIi4GB3weGBOmSzBJWmjXeMb6ctHAUmPvcEWNrJTvrfsnARqaw43VOvKhmF2z9 lNUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WQDuqbSrDr+qw7KrlgTnp7QFi56WX9RoG9PJ3coNJeg=; b=hBlx18+Z87oviCWyEwjKzONjr8nXnAiv0LcRYtEUDvwMs1OSIbB6Sc3o8eh2LHnG+J mpCF087bil6jexRprfqTyxJALGngqwTAbuEVTXTgu1Ntpk8IYGXf3pJi6T08Qjj0ZAsy IP0JrtiCgdy8CzoiJvHHgPyHt7BKC64fXTJBZUV5sRqsHmkcdm6NPT//FFt7e1l+EoQI Kg0WbYK1r6ngiHlv8neazr+oSWvKe5PBjpYflraWI6hKnqr+T5HFRAN2QqFrYbnCrlrf tHxm4tZdJNCFYkdpk/ae+XAa8ZP6s0PnXmEMgdPxLj51X9czWjQp54mj84zd3FIJqiU0 oPJg== X-Gm-Message-State: AOAM532qObi9BODcEFBDrTVyIk+tpJ/4TsCjNVD6+XiP7bd/RShKOaUK cI1OzZ0wR73zdOxsgi8jY6wCQI2TDH3pow== X-Google-Smtp-Source: ABdhPJyo/33YDup46veK6AL8CVDKj+QNgntfzDK9kzJuR9WBkXhO5jXa2RctH1eMgGcuVjKjkw0/ZQ== X-Received: by 2002:a17:902:7d8f:b0:13a:79e7:5bf0 with SMTP id a15-20020a1709027d8f00b0013a79e75bf0mr6666987plm.27.1631462295407; Sun, 12 Sep 2021 08:58:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 6/9] include/qemu: Use builtins for bswap Date: Sun, 12 Sep 2021 08:58:06 -0700 Message-Id: <20210912155809.196236-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462492372100003 All supported compilers have builtins for this. Drop all of the complicated system detection stuff. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210708181743.750220-1-richard.henderson@linaro.org> Signed-off-by: Richard Henderson --- meson.build | 6 ----- include/qemu/bswap.h | 53 +++----------------------------------------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/meson.build b/meson.build index 9a64d16943..306797c604 100644 --- a/meson.build +++ b/meson.build @@ -1332,8 +1332,6 @@ config_host_data.set('HAVE_STRCHRNUL', cc.has_functio= n('strchrnul')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', pre= fix: '#include ')) =20 # has_header_symbol -config_host_data.set('CONFIG_BYTESWAP_H', - cc.has_header_symbol('byteswap.h', 'bswap_32')) config_host_data.set('CONFIG_EPOLL_CREATE1', cc.has_header_symbol('sys/epoll.h', 'epoll_create1')) config_host_data.set('CONFIG_HAS_ENVIRON', @@ -1353,10 +1351,6 @@ config_host_data.set('CONFIG_INOTIFY', cc.has_header_symbol('sys/inotify.h', 'inotify_init')) config_host_data.set('CONFIG_INOTIFY1', cc.has_header_symbol('sys/inotify.h', 'inotify_init1'= )) -config_host_data.set('CONFIG_MACHINE_BSWAP_H', - cc.has_header_symbol('machine/bswap.h', 'bswap32', - prefix: '''#include - #include ''')) config_host_data.set('CONFIG_PRCTL_PR_SET_TIMERSLACK', cc.has_header_symbol('sys/prctl.h', 'PR_SET_TIMERSLAC= K')) config_host_data.set('CONFIG_RTNETLINK', diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 2d3bb8bbed..9e12bd8073 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -1,73 +1,26 @@ #ifndef BSWAP_H #define BSWAP_H =20 -#ifdef CONFIG_MACHINE_BSWAP_H -# include -# include -#elif defined(__FreeBSD__) -# include -#elif defined(__HAIKU__) -# include -#elif defined(CONFIG_BYTESWAP_H) -# include -#define BSWAP_FROM_BYTESWAP -# else -#define BSWAP_FROM_FALLBACKS -#endif /* ! CONFIG_MACHINE_BSWAP_H */ - #ifdef __cplusplus extern "C" { #endif =20 #include "fpu/softfloat-types.h" =20 -#ifdef BSWAP_FROM_BYTESWAP static inline uint16_t bswap16(uint16_t x) { - return bswap_16(x); + return __builtin_bswap16(x); } =20 static inline uint32_t bswap32(uint32_t x) { - return bswap_32(x); + return __builtin_bswap32(x); } =20 static inline uint64_t bswap64(uint64_t x) { - return bswap_64(x); + return __builtin_bswap64(x); } -#endif - -#ifdef BSWAP_FROM_FALLBACKS -static inline uint16_t bswap16(uint16_t x) -{ - return (((x & 0x00ff) << 8) | - ((x & 0xff00) >> 8)); -} - -static inline uint32_t bswap32(uint32_t x) -{ - return (((x & 0x000000ffU) << 24) | - ((x & 0x0000ff00U) << 8) | - ((x & 0x00ff0000U) >> 8) | - ((x & 0xff000000U) >> 24)); -} - -static inline uint64_t bswap64(uint64_t x) -{ - return (((x & 0x00000000000000ffULL) << 56) | - ((x & 0x000000000000ff00ULL) << 40) | - ((x & 0x0000000000ff0000ULL) << 24) | - ((x & 0x00000000ff000000ULL) << 8) | - ((x & 0x000000ff00000000ULL) >> 8) | - ((x & 0x0000ff0000000000ULL) >> 24) | - ((x & 0x00ff000000000000ULL) >> 40) | - ((x & 0xff00000000000000ULL) >> 56)); -} -#endif - -#undef BSWAP_FROM_BYTESWAP -#undef BSWAP_FROM_FALLBACKS =20 static inline void bswap16s(uint16_t *s) { --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462798; cv=none; d=zohomail.com; s=zohoarc; b=T7z5eCfDQFw+cdoZWYxn8SnDavffwDjXDHTL+nfYdEDjlwSMFX+SCjGKllwhOXKm5v2ZHpK+LSGp6OYCxBaiL9zNB4Rq37Jh39IQcVaHN7q7hqF0mAYWWsIChB0HRTuuc5ny3WmsoROItT8P8NTnqPyI6WL4im50HGJHO3z4rw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462798; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=W+tlMR9kLwNev57AGri8czjj5jmY2x4F8vStFej9vQqA6NC3psXx3ydWuniny4IKACjhPTDGrtddMlbMbW8Zb+Tx4aJFDLnrpSt6XhyTBkIJvMCWPjg4sIuYGVaRJEUFmB6M7DeqPOMF2QFQEX86vSMqxVzmUHmrN6exnPGzk/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462798185807.7629982709138; Sun, 12 Sep 2021 09:06:38 -0700 (PDT) Received: from localhost ([::1]:58506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPS04-0006zp-P9 for importer@patchew.org; Sun, 12 Sep 2021 12:06:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs4-0002QN-OU for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:21 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:37719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRs1-0003xF-CI for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:19 -0400 Received: by mail-pl1-x630.google.com with SMTP id f21so2021864plb.4 for ; Sun, 12 Sep 2021 08:58:16 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=X1HK1FUm3HBpdWLlIShTQXfxDBn3QbTNqlzrS2uIb2MVZ+Vq/9RTQYFdj9FZQNuW1H PfenExM/qaeu4FWMFX2+c2yfYBeH3t1Vp+zCXFJA5DY/ZicbtpVS//vvUPDuV3c+fxLS 7KQg+W+JAV5oTG4qoGrIhP/R05GTJ84iPRtBnyHtXht/rbP241blCqTjdOpjjDfTiVRK K0tL3rchaTRfAVkPeq6xAces2OKPG55W09SXvoMbMOBDcp17VeE7x97gpmGv+T48Hf0x /GSKLz2J+mBWMoWveB24N85WYIz1bzznN9rpQOfsDtsmt5kbJKvmoQLLffjqtpt5GMhT r36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m7emFn9ZXxGGMcBZFosB1EnmF9R96t2zGLMZbzq44mc=; b=YlN+9i2cuYuguezfVc9ZM4cTX/aqVAi+fMMybfEtC48HLvtNXQRxsWFKtLePW8FSlF JbVaUtWa0jveMrDsEnY+1eGw/T1DCPX+1vp3GtcBwqbMSBn2fAbQFrPMSvpn9X1aAvVr 1LKLi9R/FEygkpzPo9RXgloBd6Jn1zsEbd9Evtt1EdiXb9lM/xO0esI1BGZxg5NueO3J XRTLTZnEwKzN7REBQAgrxOWMDjW4lWl52CC1FGyoTHwDnodYo/SmTc/gaCjBK3sTevs8 oKBtrYwPOB1wH2BhQE3JFbh+0ZDVCIPDeks4p4riRofuxLaqBv8uyF0d1BsO7nnOAOe7 o7hA== X-Gm-Message-State: AOAM530RWN7SuOqJQzqSKOn7kzS/Pm9Db596HlB99PrEyPG9i4ezTzjm /6EgkQRn78lxyGGyyZSNjvBL6EPw7HCVAw== X-Google-Smtp-Source: ABdhPJw2/GR3tElLTTiOSDuEsKeOAYl9oRnGNBrht8YiYJnuXzW4iFmWieqWG94lxpf9oZMbzZXYfQ== X-Received: by 2002:a17:90b:814:: with SMTP id bk20mr8255580pjb.108.1631462295989; Sun, 12 Sep 2021 08:58:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 7/9] tcg/ppc: Replace TCG_TARGET_CALL_DARWIN with _CALL_DARWIN Date: Sun, 12 Sep 2021 08:58:07 -0700 Message-Id: <20210912155809.196236-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462800063100001 Content-Type: text/plain; charset="utf-8" If __APPLE__, ensure that _CALL_DARWIN is set, then remove our local TCG_TARGET_CALL_DARWIN. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index e0f4665213..2202ce017e 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -25,8 +25,8 @@ #include "elf.h" #include "../tcg-pool.c.inc" =20 -#if defined _CALL_DARWIN || defined __APPLE__ -#define TCG_TARGET_CALL_DARWIN +#if !defined _CALL_DARWIN && defined __APPLE__ +#define _CALL_DARWIN 1 #endif #ifdef _CALL_SYSV # define TCG_TARGET_CALL_ALIGN_ARGS 1 @@ -169,7 +169,7 @@ static const int tcg_target_call_oarg_regs[] =3D { }; =20 static const int tcg_target_callee_save_regs[] =3D { -#ifdef TCG_TARGET_CALL_DARWIN +#ifdef _CALL_DARWIN TCG_REG_R11, #endif TCG_REG_R14, @@ -2372,7 +2372,7 @@ static void tcg_out_nop_fill(tcg_insn_unit *p, int co= unt) # define LINK_AREA_SIZE (6 * SZR) # define LR_OFFSET (1 * SZR) # define TCG_TARGET_CALL_STACK_OFFSET (LINK_AREA_SIZE + 8 * SZR) -#elif defined(TCG_TARGET_CALL_DARWIN) +#elif defined(_CALL_DARWIN) # define LINK_AREA_SIZE (6 * SZR) # define LR_OFFSET (2 * SZR) #elif TCG_TARGET_REG_BITS =3D=3D 64 --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631462996; cv=none; d=zohomail.com; s=zohoarc; b=YGyWbHaMH/6OoRFzmb48CRCfERkH+nyhnYaMMQcvsF6jNnj7wXmhtW600h+Au/va5kuE+qmvndpvMuq/VLatuvn/AJRbl3dab4Xbf22RNUYt7EEkq6f6z3mhfu5QvNEIGTrKP+ai46Gq1dvTICSxLCzXLcEVkOE3Dh1vrk3vq+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631462996; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0lgwAN4JLa+eJyUWPeSpGCyCJ0/V+S2YWU/Kqpi1gBQ=; b=ei67M80c3w1DM1BFf7rnKYpjsSgEIpDVxTAlmBm2A/VDs9RwRCPJ+uYt0Yk4eLR6mtkQwjFnOaveH2ZThxrHBuXzzR45begSCybKI9PckDlT1fy8mdLyJ+w27/CQvc7EG58mZxMNCIb97miq3GOO4KdUqTWiYGaBKfrisVat+2M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631462996346935.859543411882; Sun, 12 Sep 2021 09:09:56 -0700 (PDT) Received: from localhost ([::1]:38750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPS3H-0004Av-BO for importer@patchew.org; Sun, 12 Sep 2021 12:09:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs8-0002ST-2r for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:25 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:33286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRs1-0003xc-TD for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:23 -0400 Received: by mail-pj1-x1029.google.com with SMTP id mi6-20020a17090b4b4600b00199280a31cbso3735332pjb.0 for ; Sun, 12 Sep 2021 08:58:17 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0lgwAN4JLa+eJyUWPeSpGCyCJ0/V+S2YWU/Kqpi1gBQ=; b=yP51pHcwrmx2oxBxaPl9XGJ8pj+i76hA6At+8sZWguIVn2hF/x9/PWxkAh6URyuZCt fb9Q9Wh1FNC58ihi8vnShAPgORQQz6uCbelqTLte4IasOFpI9fi8d5V33ieVUOQCkXdP 1iSIXq8t3f3augEBnz9q1YAavXG/jzn1Cb2bZKgZu1qPEWEJYLUAOOM10KC8Ht0YiERB 84QmhCA89vOLUVZvE6arskHQjhH9E7nxr90a6ijDYer6vackcZw60k8j7OmHn9LBxSwu 18hFt9+yqUKB2PI1JeBsG8BoWsOu84eDifX0gXHnXxIhn6GZYpv8XFGzff5HTrpTDeE+ 7elg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0lgwAN4JLa+eJyUWPeSpGCyCJ0/V+S2YWU/Kqpi1gBQ=; b=JeU+DNz+MK+Lqf7WYW9HDzD3uoN0Hh/iPTWB+M73I1FldY9rK/lO0zYsf/vKYu2MHg 3ww4aYFt7wd7GxWLMD+JHNI0A37tVpe5/Ft7fGgacr5c9vjTQ2SHZlMNZ+pz2ltjpm9J SHi/AU1YA4tumjwQwlerFSToaHaSh75m6HoEpELzohITwIRL3D1lK/BrZyyGKkZMzGZh o7mOFAC3b6MOnmaOaI6aEVxq1iyTqsGMmZZOXSRSxl3ilPm9wBBPR3Otg32QavKHu/rW /tO55nmOd2oB3Z8t/QhTWltteqUngbPkniZDOd1OX2TD2ltyJgzzvB9kOpKWNt6KuVsP 4+Gw== X-Gm-Message-State: AOAM533K6DWSBASvXoXPNreTIbgrXlrMW7OIPeZw8W3eHPq+lha1g2Fk J1Fr4UMip1GMmqlC5KIirI7UpqIrW9xw1w== X-Google-Smtp-Source: ABdhPJyrfxdOvHjt6OuXbdgl0Yrm0CGbf7+2WYBuCWZ4nN6jep3OKP8JFOOc4lMGIFR3s/w6xni5Eg== X-Received: by 2002:a17:90b:1102:: with SMTP id gi2mr8195486pjb.43.1631462296624; Sun, 12 Sep 2021 08:58:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 8/9] tcg/ppc: Ensure _CALL_SYSV is set for 32-bit ELF Date: Sun, 12 Sep 2021 08:58:08 -0700 Message-Id: <20210912155809.196236-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631462998282100001 Content-Type: text/plain; charset="utf-8" Clang only sets _CALL_ELF for ppc64, and nothing at all to specify the ABI for ppc32. Make a good guess based on other symbols. Reported-by: Brad Smith Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 2202ce017e..5e1fac914a 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -25,9 +25,24 @@ #include "elf.h" #include "../tcg-pool.c.inc" =20 -#if !defined _CALL_DARWIN && defined __APPLE__ -#define _CALL_DARWIN 1 -#endif +/* + * Standardize on the _CALL_FOO symbols used by GCC: + * Apple XCode does not define _CALL_DARWIN. + * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV (32-bit). + */ +#if !defined(_CALL_SYSV) && \ + !defined(_CALL_DARWIN) && \ + !defined(_CALL_AIX) && \ + !defined(_CALL_ELF) +# if defined(__APPLE__) +# define _CALL_DARWIN +# elif defined(__ELF__) && TCG_TARGET_REG_BITS =3D=3D 32 +# define _CALL_SYSV +# else +# error "Unknown ABI" +# endif +#endif=20 + #ifdef _CALL_SYSV # define TCG_TARGET_CALL_ALIGN_ARGS 1 #endif --=20 2.25.1 From nobody Thu May 9 00:41:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16314626413611017.8221213247834; Sun, 12 Sep 2021 09:04:01 -0700 (PDT) Received: from localhost ([::1]:51916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPRxY-0002Xq-Bt for importer@patchew.org; Sun, 12 Sep 2021 12:04:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPRs5-0002QO-0Y for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:21 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:37720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPRs2-0003xu-KW for qemu-devel@nongnu.org; Sun, 12 Sep 2021 11:58:20 -0400 Received: by mail-pl1-x631.google.com with SMTP id f21so2021880plb.4 for ; Sun, 12 Sep 2021 08:58:18 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id v13sm4439415pfm.16.2021.09.12.08.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 08:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zk1Xc7v798/v3MVPLkwWlC7sy9W9XT/J+dwHkhEwhvw=; b=nKS8ugSATycLyeQxIyMfhf4kc+XW54il7LyNeNU4jzkDnC6Bl1XlH/nJif/Q6caolD PXj82aFQ1eCUYvk+5m22OkOnF6M0U6bCW+HPuBkO4psXUu8/MQyX22r/RNmBCryGWibY av3D6bV195o0JajS42wppNn28z9uQpXA/l8o50w8tVZtYKlJhZFsflmYq5BD4bj2tv5/ D5UVuNs0eogkB5sotsh4m/dfjM0WZjqjKk4+G0FExCFcKfdmGi5n+YYglFMdcINkkSWf /k49+C60IcuKBKpqecpLefyRnmrnbut8sLW+aUKxp8DYlFhWA3htdEt5AUClTpIX1Xdh S89w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zk1Xc7v798/v3MVPLkwWlC7sy9W9XT/J+dwHkhEwhvw=; b=YQZu7Wo7o64E1jRzzh9vBlfec2ynFl9OsZ86/G22ycogbO+p/RRQ4lz7wcFKraqGz2 lMTpEgu6r0ZJvhKRImFTZrs+ZGuf67YITJBrGrYIZlr1LWBVtNIGitlLtXUUIlZvOPNJ NfnhsuafoqJ/UV5qxyHU/Axb4dN3ZSj+tdfgR5RLQUn2wchyzjzQi7HygyjVCdmasSh+ L5T6u4FMNDsLdzLq7cnPHg+sRGe6aY7TFnkV32dFBYc81ED83fQbTKzkkoOrcUcvxqik l+Y1yIZyiKEpq2Ysrb+42VSexSlJiZsDgGNgQw1NQzdB/Dp+EIQx1p//CZdHTciU+Coa /YYA== X-Gm-Message-State: AOAM5307U4Crlf0fHfQvggl2sGh1TTFf3X8E5SY1zGUolMnsuXoEwP4v Hs1VpRWBVaeG3ZF+E1b73NkRTnHlERmv9g== X-Google-Smtp-Source: ABdhPJzvNWjuvi32Lhiv6FgSWHKvDooBAScvi5lCBsiwx7EpR9s7oRnDw09CkWS1c4k7zKN5qxXiXQ== X-Received: by 2002:a17:902:7e89:b0:13a:6adf:176 with SMTP id z9-20020a1709027e8900b0013a6adf0176mr6644218pla.48.1631462297275; Sun, 12 Sep 2021 08:58:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 9/9] tcg/arm: Fix tcg_out_vec_op function signature Date: Sun, 12 Sep 2021 08:58:09 -0700 Message-Id: <20210912155809.196236-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210912155809.196236-1-richard.henderson@linaro.org> References: <20210912155809.196236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Jose R. Ziviani" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631462641814100001 From: "Jose R. Ziviani" Commit 5e8892db93 fixed several function signatures but tcg_out_vec_op for arm is missing. It causes a build error on armv6 and armv7: tcg-target.c.inc:2718:42: error: argument 5 of type 'const TCGArg *' {aka 'const unsigned int *'} declared as a pointer [-Werror=3Darray-paramet= er=3D] const TCGArg *args, const int *const_args) ~~~~~~~~~~~~~~^~~~ ../tcg/tcg.c:120:41: note: previously declared as an array 'const TCGArg[16= ]' {aka 'const unsigned int[16]'} const TCGArg args[TCG_MAX_OP_ARGS], ~~~~~~~~~~~~~~^~~~ Signed-off-by: Jose R. Ziviani Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210908185338.7927-1-jziviani@suse.de> Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 007ceee68e..e5b4f86841 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -2715,7 +2715,8 @@ static const ARMInsn vec_cmp0_insn[16] =3D { =20 static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, unsigned vecl, unsigned vece, - const TCGArg *args, const int *const_args) + const TCGArg args[TCG_MAX_OP_ARGS], + const int const_args[TCG_MAX_OP_ARGS]) { TCGType type =3D vecl + TCG_TYPE_V64; unsigned q =3D vecl; --=20 2.25.1