mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better SuperSPARC emulation (Robert Reif)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6123 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-12-23 15:06:35 +00:00
parent 8fa211e881
commit 963262debc
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target-sparc/cpu.h
View File

@ -210,6 +210,7 @@ typedef struct sparc_def_t {
uint32_t mmu_cxr_mask; uint32_t mmu_cxr_mask;
uint32_t mmu_sfsr_mask; uint32_t mmu_sfsr_mask;
uint32_t mmu_trcr_mask; uint32_t mmu_trcr_mask;
uint32_t mxcc_version;
uint32_t features; uint32_t features;
uint32_t nwindows; uint32_t nwindows;
uint32_t maxtl; uint32_t maxtl;

50
target-sparc/helper.c
View File

@ -688,6 +688,7 @@ static int cpu_sparc_register(CPUSPARCState *env, const char *cpu_model)
#if !defined(TARGET_SPARC64) #if !defined(TARGET_SPARC64)
env->mmuregs[0] |= def->mmu_version; env->mmuregs[0] |= def->mmu_version;
cpu_sparc_set_id(env, 0); cpu_sparc_set_id(env, 0);
env->mxccregs[7] |= def->mxcc_version;
#else #else
env->mmu_version = def->mmu_version; env->mmu_version = def->mmu_version;
env->maxtl = def->maxtl; env->maxtl = def->maxtl;
@ -971,19 +972,6 @@ static const sparc_def_t sparc_defs[] = {
.features = CPU_FEATURE_FLOAT | CPU_FEATURE_SWAP | CPU_FEATURE_FSQRT | .features = CPU_FEATURE_FLOAT | CPU_FEATURE_SWAP | CPU_FEATURE_FSQRT |
CPU_FEATURE_FSMULD, CPU_FEATURE_FSMULD,
}, },
{
.name = "TI SuperSparc II",
.iu_version = 0x40000000,
.fpu_version = 0 << 17,
.mmu_version = 0x04000000,
.mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff,
.mmu_sfsr_mask = 0xffffffff,
.mmu_trcr_mask = 0xffffffff,
.nwindows = 8,
.features = CPU_DEFAULT_FEATURES,
},
{ {
.name = "TI MicroSparc I", .name = "TI MicroSparc I",
.iu_version = 0x41000000, .iu_version = 0x41000000,
@ -1027,9 +1015,9 @@ static const sparc_def_t sparc_defs[] = {
}, },
{ {
.name = "TI SuperSparc 40", // STP1020NPGA .name = "TI SuperSparc 40", // STP1020NPGA
.iu_version = 0x41000000, .iu_version = 0x41000000, // SuperSPARC 2.x
.fpu_version = 0 << 17, .fpu_version = 0 << 17,
.mmu_version = 0x00000000, .mmu_version = 0x00000800, // SuperSPARC 2.x, no MXCC
.mmu_bm = 0x00002000, .mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0, .mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff, .mmu_cxr_mask = 0x0000ffff,
@ -1040,9 +1028,9 @@ static const sparc_def_t sparc_defs[] = {
}, },
{ {
.name = "TI SuperSparc 50", // STP1020PGA .name = "TI SuperSparc 50", // STP1020PGA
.iu_version = 0x40000000, .iu_version = 0x40000000, // SuperSPARC 3.x
.fpu_version = 0 << 17, .fpu_version = 0 << 17,
.mmu_version = 0x04000000, .mmu_version = 0x01000800, // SuperSPARC 3.x, no MXCC
.mmu_bm = 0x00002000, .mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0, .mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff, .mmu_cxr_mask = 0x0000ffff,
@ -1053,22 +1041,23 @@ static const sparc_def_t sparc_defs[] = {
}, },
{ {
.name = "TI SuperSparc 51", .name = "TI SuperSparc 51",
.iu_version = 0x43000000, .iu_version = 0x40000000, // SuperSPARC 3.x
.fpu_version = 0 << 17, .fpu_version = 0 << 17,
.mmu_version = 0x04000000, .mmu_version = 0x01000000, // SuperSPARC 3.x, MXCC
.mmu_bm = 0x00002000, .mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0, .mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff, .mmu_cxr_mask = 0x0000ffff,
.mmu_sfsr_mask = 0xffffffff, .mmu_sfsr_mask = 0xffffffff,
.mmu_trcr_mask = 0xffffffff, .mmu_trcr_mask = 0xffffffff,
.mxcc_version = 0x00000104,
.nwindows = 8, .nwindows = 8,
.features = CPU_DEFAULT_FEATURES, .features = CPU_DEFAULT_FEATURES,
}, },
{ {
.name = "TI SuperSparc 60", // STP1020APGA .name = "TI SuperSparc 60", // STP1020APGA
.iu_version = 0x40000000, .iu_version = 0x40000000, // SuperSPARC 3.x
.fpu_version = 0 << 17, .fpu_version = 0 << 17,
.mmu_version = 0x03000000, .mmu_version = 0x01000800, // SuperSPARC 3.x, no MXCC
.mmu_bm = 0x00002000, .mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0, .mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff, .mmu_cxr_mask = 0x0000ffff,
@ -1079,14 +1068,29 @@ static const sparc_def_t sparc_defs[] = {
}, },
{ {
.name = "TI SuperSparc 61", .name = "TI SuperSparc 61",
.iu_version = 0x44000000, .iu_version = 0x44000000, // SuperSPARC 3.x
.fpu_version = 0 << 17, .fpu_version = 0 << 17,
.mmu_version = 0x04000000, .mmu_version = 0x01000000, // SuperSPARC 3.x, MXCC
.mmu_bm = 0x00002000, .mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0, .mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff, .mmu_cxr_mask = 0x0000ffff,
.mmu_sfsr_mask = 0xffffffff, .mmu_sfsr_mask = 0xffffffff,
.mmu_trcr_mask = 0xffffffff, .mmu_trcr_mask = 0xffffffff,
.mxcc_version = 0x00000104,
.nwindows = 8,
.features = CPU_DEFAULT_FEATURES,
},
{
.name = "TI SuperSparc II",
.iu_version = 0x40000000, // SuperSPARC II 1.x
.fpu_version = 0 << 17,
.mmu_version = 0x08000000, // SuperSPARC II 1.x, MXCC
.mmu_bm = 0x00002000,
.mmu_ctpr_mask = 0xffffffc0,
.mmu_cxr_mask = 0x0000ffff,
.mmu_sfsr_mask = 0xffffffff,
.mmu_trcr_mask = 0xffffffff,
.mxcc_version = 0x00000104,
.nwindows = 8, .nwindows = 8,
.features = CPU_DEFAULT_FEATURES, .features = CPU_DEFAULT_FEATURES,
}, },