Commit d4e65539 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20190316' into staging 



Fix lost interrupts.
Update seabios-hppa.

# gpg: Signature made Sat 16 Mar 2019 16:13:42 GMT
# gpg:                using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-hppa-20190316:
  Update seabios-hppa to latest upstream
  target/hppa: Avoid squishing DISAS_IAQ_N_STALE_EXIT

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c4b21ed1 2b42f31e

hw/hppa/hppa_hardware.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define LASI_PS2KBD_HPA 0xffd08000

#define LASI_PS2MOU_HPA 0xffd08100

#define LASI_GFX_HPA    0xf8000000

#define CPU_HPA         0xfff10000

#define CPU_HPA         0xfffb0000

#define MEMORY_HPA      0xfffbf000



#define PCI_HPA         DINO_HPA        /* PCI bus */
@@ -36,5 +36,5 @@ 
#define PORT_SERIAL1    (DINO_UART_HPA + 0x800)

#define PORT_SERIAL2    (LASI_UART_HPA + 0x800)



#define HPPA_MAX_CPUS   32      /* max. number of SMP CPUs */

#define HPPA_MAX_CPUS   8       /* max. number of SMP CPUs */

#define CPU_CLOCK_MHZ   250     /* emulate a 250 MHz CPU */

pc-bios/hppa-firmware.img

+23.1 KiB (765 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

seabios-hppa @ 0f4fe846

Compare 1ef99a01 to 0f4fe846
Original line number Diff line number Diff line 
Subproject commit 1ef99a01572c2581c30e16e6fe69e9ea2ef92ce0
 
Subproject commit 0f4fe84658165e96ce35870fd19fc634e182e77b

target/hppa/translate.c

+28 −14
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ static int expand_shl11(int val) 
/* Similarly, but we want to return to the main loop immediately

   to recognize unmasked interrupts.  */

#define DISAS_IAQ_N_STALE_EXIT      DISAS_TARGET_2

#define DISAS_EXIT                  DISAS_TARGET_3



/* global register indexes */

static TCGv_reg cpu_gr[32];
@@ -4218,9 +4219,14 @@ static void hppa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) 
    ctx->iaoq_b = ctx->iaoq_n;

    ctx->base.pc_next += 4;



    if (ret == DISAS_NORETURN || ret == DISAS_IAQ_N_UPDATED) {

        return;

    }

    switch (ret) {

    case DISAS_NORETURN:

    case DISAS_IAQ_N_UPDATED:

        break;



    case DISAS_NEXT:

    case DISAS_IAQ_N_STALE:

    case DISAS_IAQ_N_STALE_EXIT:

        if (ctx->iaoq_f == -1) {

            tcg_gen_mov_reg(cpu_iaoq_f, cpu_iaoq_b);

            copy_iaoq_entry(cpu_iaoq_b, ctx->iaoq_n, ctx->iaoq_n_var);
@@ -4228,10 +4234,17 @@ static void hppa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) 
            tcg_gen_mov_i64(cpu_iasq_f, cpu_iasq_b);

#endif

            nullify_save(ctx);

        ctx->base.is_jmp = DISAS_IAQ_N_UPDATED;

            ctx->base.is_jmp = (ret == DISAS_IAQ_N_STALE_EXIT

                                ? DISAS_EXIT

                                : DISAS_IAQ_N_UPDATED);

        } else if (ctx->iaoq_b == -1) {

            tcg_gen_mov_reg(cpu_iaoq_b, ctx->iaoq_n_var);

        }

        break;



    default:

        g_assert_not_reached();

    }

}



static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
@@ -4252,11 +4265,12 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) 
    case DISAS_IAQ_N_UPDATED:

        if (ctx->base.singlestep_enabled) {

            gen_excp_1(EXCP_DEBUG);

        } else if (is_jmp == DISAS_IAQ_N_STALE_EXIT) {

            tcg_gen_exit_tb(NULL, 0);

        } else {

        } else if (is_jmp != DISAS_IAQ_N_STALE_EXIT) {

            tcg_gen_lookup_and_goto_ptr();

        }

        /* FALLTHRU */

    case DISAS_EXIT:

        tcg_gen_exit_tb(NULL, 0);

        break;

    default:

        g_assert_not_reached();