diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-26 19:48:58 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-26 19:48:58 +0000 |
| commit | e87231d4262e472628e866394f85320829fe4fc5 (patch) | |
| tree | 011ec34f351ae4ee72f8130163f2868550759004 /target-sparc | |
| parent | c99657d30329b5c296a5f998f1a05d1d10aa8e31 (diff) | |
| download | qemu-e87231d4262e472628e866394f85320829fe4fc5.zip | |
Add a generic Niagara machine
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5329 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-sparc')
| -rw-r--r-- | target-sparc/helper.c | 3 | ||||
| -rw-r--r-- | target-sparc/machine.c | 1 |
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); |