aboutsummaryrefslogtreecommitdiff
path: root/target-sparc
diff options
context:
space:
mode:
Diffstat (limited to 'target-sparc')
-rw-r--r--target-sparc/helper.c3
-rw-r--r--target-sparc/machine.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index ab96428388..12070b9246 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -658,13 +658,12 @@ void cpu_reset(CPUSPARCState *env)
#ifdef TARGET_SPARC64
env->pstate = PS_PRIV;
env->hpstate = HS_PRIV;
- env->pc = 0x1fff0000020ULL; // XXX should be different for system_reset
env->tsptr = &env->ts[env->tl & MAXTL_MASK];
#else
- env->pc = 0;
env->mmuregs[0] &= ~(MMU_E | MMU_NF);
env->mmuregs[0] |= env->def->mmu_bm;
#endif
+ env->pc = 0;
env->npc = env->pc + 4;
#endif
}
diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 626a088c21..417523f883 100644
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -9,6 +9,7 @@ void register_machines(void)
#ifdef TARGET_SPARC64
qemu_register_machine(&sun4u_machine);
qemu_register_machine(&sun4v_machine);
+ qemu_register_machine(&niagara_machine);
#else
qemu_register_machine(&ss5_machine);
qemu_register_machine(&ss10_machine);