qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: matheus.ferst@eldorado.org.br
Cc: richard.henderson@linaro.org, qemu-devel@nongnu.org,
	f4bug@amsat.org, luis.pires@eldorado.org.br, qemu-ppc@nongnu.org,
	lagarcia@br.ibm.com, bruno.larsen@eldorado.org.br
Subject: Re: [PATCH v4 07/31] target/ppc: Introduce DISAS_{EXIT,CHAIN}{,_UPDATE}
Date: Thu, 13 May 2021 14:10:30 +1000	[thread overview]
Message-ID: <YJymtojVE+pnqdT2@yekko> (raw)
In-Reply-To: <20210512185441.3619828-8-matheus.ferst@eldorado.org.br>

[-- Attachment #1: Type: text/plain, Size: 4474 bytes --]

On Wed, May 12, 2021 at 03:54:17PM -0300, matheus.ferst@eldorado.org.br wrote:
> From: Richard Henderson <richard.henderson@linaro.org>
> 
> Rewrite ppc_tr_tb_stop to handle these new codes.
> 
> Convert ctx->exception into these new codes at the end of
> ppc_tr_translate_insn, prior to pushing the change back
> throughout translate.c.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>

Applied to ppc-for-6.1, thanks.

> ---
>  target/ppc/translate.c | 75 ++++++++++++++++++++++++++++++++++++------
>  1 file changed, 65 insertions(+), 10 deletions(-)
> 
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index 7b23f85c11..4bebb00bb2 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -182,6 +182,11 @@ struct DisasContext {
>      uint64_t insns_flags2;
>  };
>  
> +#define DISAS_EXIT         DISAS_TARGET_0  /* exit to main loop, pc updated */
> +#define DISAS_EXIT_UPDATE  DISAS_TARGET_1  /* exit to main loop, pc stale */
> +#define DISAS_CHAIN        DISAS_TARGET_2  /* lookup next tb, pc updated */
> +#define DISAS_CHAIN_UPDATE DISAS_TARGET_3  /* lookup next tb, pc stale */
> +
>  /* Return true iff byteswap is needed in a scalar memop */
>  static inline bool need_byteswap(const DisasContext *ctx)
>  {
> @@ -9417,28 +9422,78 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
>                   opc3(ctx->opcode), opc4(ctx->opcode), ctx->opcode);
>      }
>  
> -    if (ctx->base.is_jmp == DISAS_NEXT
> -        && ctx->exception != POWERPC_EXCP_NONE) {
> -        ctx->base.is_jmp = DISAS_TOO_MANY;
> +    if (ctx->base.is_jmp == DISAS_NEXT) {
> +        switch (ctx->exception) {
> +        case POWERPC_EXCP_NONE:
> +            break;
> +        case POWERPC_EXCP_BRANCH:
> +            ctx->base.is_jmp = DISAS_NORETURN;
> +            break;
> +        case POWERPC_EXCP_SYNC:
> +        case POWERPC_EXCP_STOP:
> +            ctx->base.is_jmp = DISAS_EXIT;
> +            break;
> +        default:
> +            /* Every other ctx->exception should have set NORETURN. */
> +            g_assert_not_reached();
> +        }
>      }
>  }
>  
>  static void ppc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
>  {
>      DisasContext *ctx = container_of(dcbase, DisasContext, base);
> +    DisasJumpType is_jmp = ctx->base.is_jmp;
> +    target_ulong nip = ctx->base.pc_next;
>  
> -    if (ctx->base.is_jmp == DISAS_NORETURN) {
> +    if (is_jmp == DISAS_NORETURN) {
> +        /* We have already exited the TB. */
>          return;
>      }
>  
> -    if (ctx->exception == POWERPC_EXCP_NONE) {
> -        gen_goto_tb(ctx, 0, ctx->base.pc_next);
> -    } else if (ctx->exception != POWERPC_EXCP_BRANCH) {
> -        if (unlikely(ctx->base.singlestep_enabled)) {
> -            gen_debug_exception(ctx);
> +    /* Honor single stepping. */
> +    if (unlikely(ctx->base.singlestep_enabled)) {
> +        switch (is_jmp) {
> +        case DISAS_TOO_MANY:
> +        case DISAS_EXIT_UPDATE:
> +        case DISAS_CHAIN_UPDATE:
> +            gen_update_nip(ctx, nip);
> +            break;
> +        case DISAS_EXIT:
> +        case DISAS_CHAIN:
> +            break;
> +        default:
> +            g_assert_not_reached();
>          }
> -        /* Generate the return instruction */
> +        gen_debug_exception(ctx);
> +        return;
> +    }
> +
> +    switch (is_jmp) {
> +    case DISAS_TOO_MANY:
> +        if (use_goto_tb(ctx, nip)) {
> +            tcg_gen_goto_tb(0);
> +            gen_update_nip(ctx, nip);
> +            tcg_gen_exit_tb(ctx->base.tb, 0);
> +            break;
> +        }
> +        /* fall through */
> +    case DISAS_CHAIN_UPDATE:
> +        gen_update_nip(ctx, nip);
> +        /* fall through */
> +    case DISAS_CHAIN:
> +        tcg_gen_lookup_and_goto_ptr();
> +        break;
> +
> +    case DISAS_EXIT_UPDATE:
> +        gen_update_nip(ctx, nip);
> +        /* fall through */
> +    case DISAS_EXIT:
>          tcg_gen_exit_tb(NULL, 0);
> +        break;
> +
> +    default:
> +        g_assert_not_reached();
>      }
>  }
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2021-05-13  4:33 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-12 18:54 [PATCH v4 00/31] Base for adding PowerPC 64-bit instructions matheus.ferst
2021-05-12 18:54 ` [PATCH v4 01/31] target/ppc: Add cia field to DisasContext matheus.ferst
2021-05-13  4:03   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 02/31] target/ppc: Split out decode_legacy matheus.ferst
2021-05-13  4:03   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 03/31] target/ppc: Move DISAS_NORETURN setting into gen_exception* matheus.ferst
2021-05-13  4:06   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 04/31] target/ppc: Remove special case for POWERPC_SYSCALL matheus.ferst
2021-05-13  4:06   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 05/31] target/ppc: Remove special case for POWERPC_EXCP_TRAP matheus.ferst
2021-05-13  4:07   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 06/31] target/ppc: Simplify gen_debug_exception matheus.ferst
2021-05-13  4:08   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 07/31] target/ppc: Introduce DISAS_{EXIT,CHAIN}{,_UPDATE} matheus.ferst
2021-05-13  4:10   ` David Gibson [this message]
2021-05-12 18:54 ` [PATCH v4 08/31] target/ppc: Replace POWERPC_EXCP_SYNC with DISAS_EXIT matheus.ferst
2021-05-12 19:31   ` Bruno Piazera Larsen
2021-05-13  4:11   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 09/31] target/ppc: Remove unnecessary gen_io_end calls matheus.ferst
2021-05-13  4:12   ` David Gibson
2021-05-12 18:54 ` [PATCH v4 10/31] target/ppc: Introduce gen_icount_io_start matheus.ferst
2021-05-12 19:21   ` Matheus K. Ferst
2021-05-13  4:14     ` David Gibson
2021-05-12 18:54 ` [PATCH v4 11/31] target/ppc: Replace POWERPC_EXCP_STOP with DISAS_EXIT_UPDATE matheus.ferst
2021-05-12 18:54 ` [PATCH v4 12/31] target/ppc: Replace POWERPC_EXCP_BRANCH with DISAS_NORETURN matheus.ferst
2021-05-12 18:54 ` [PATCH v4 13/31] target/ppc: Remove DisasContext.exception matheus.ferst
2021-05-12 18:54 ` [PATCH v4 14/31] target/ppc: Move single-step check to ppc_tr_tb_stop matheus.ferst
2021-05-12 18:54 ` [PATCH v4 15/31] target/ppc: Tidy exception vs exit_tb matheus.ferst
2021-05-12 18:54 ` [PATCH v4 16/31] target/ppc: Mark helper_raise_exception* as noreturn matheus.ferst
2021-05-12 18:54 ` [PATCH v4 17/31] target/ppc: Use translator_loop_temp_check matheus.ferst
2021-05-12 19:45   ` Bruno Piazera Larsen
2021-05-12 18:54 ` [PATCH v4 18/31] target/ppc: Introduce macros to check isa extensions matheus.ferst
2021-05-12 18:54 ` [PATCH v4 19/31] target/ppc: Move page crossing check to ppc_tr_translate_insn matheus.ferst
2021-05-12 18:54 ` [PATCH v4 20/31] target/ppc: Add infrastructure for prefixed insns matheus.ferst
2021-05-12 18:54 ` [PATCH v4 21/31] target/ppc: Move ADDI, ADDIS to decodetree, implement PADDI matheus.ferst
2021-05-12 18:54 ` [PATCH v4 22/31] target/ppc: Implement PNOP matheus.ferst
2021-05-13 10:37   ` Richard Henderson
2021-05-12 18:54 ` [PATCH v4 23/31] TCG: add tcg_constant_tl matheus.ferst
2021-05-13 10:42   ` Richard Henderson
2021-05-12 18:54 ` [PATCH v4 24/31] target/ppc: Move D/DS/X-form integer loads to decodetree matheus.ferst
2021-05-12 18:54 ` [PATCH v4 25/31] target/ppc: Implement prefixed integer load instructions matheus.ferst
2021-05-13 10:50   ` Richard Henderson
2021-05-12 18:54 ` [PATCH v4 26/31] target/ppc: Move D/DS/X-form integer stores to decodetree matheus.ferst
2021-05-12 18:54 ` [PATCH v4 27/31] target/ppc: Implement prefixed integer store instructions matheus.ferst
2021-05-12 18:54 ` [PATCH v4 28/31] target/ppc: Implement setbc/setbcr/stnbc/setnbcr instructions matheus.ferst
2021-05-13 11:01   ` Richard Henderson
2021-05-13 11:43     ` Matheus K. Ferst
2021-05-12 18:54 ` [PATCH v4 29/31] target/ppc: Implement cfuged instruction matheus.ferst
2021-05-13 11:31   ` Richard Henderson
2021-05-13 12:24     ` Matheus K. Ferst
2021-05-14  0:01       ` Richard Henderson
2021-05-12 18:54 ` [PATCH v4 30/31] target/ppc: Implement vcfuged instruction matheus.ferst
2021-05-13 11:36   ` Richard Henderson
2021-05-12 18:54 ` [PATCH v4 31/31] target/ppc: Move addpcis to decodetree matheus.ferst
2021-05-13 11:40   ` Richard Henderson
2021-05-13  4:22 ` [PATCH v4 00/31] Base for adding PowerPC 64-bit instructions David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YJymtojVE+pnqdT2@yekko \
    --to=david@gibson.dropbear.id.au \
    --cc=bruno.larsen@eldorado.org.br \
    --cc=f4bug@amsat.org \
    --cc=lagarcia@br.ibm.com \
    --cc=luis.pires@eldorado.org.br \
    --cc=matheus.ferst@eldorado.org.br \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --subject='Re: [PATCH v4 07/31] target/ppc: Introduce DISAS_{EXIT,CHAIN}{,_UPDATE}' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox