diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-09-06 00:18:15 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-09-06 00:18:15 +0000 |
| commit | ead9360e2fbcaae10a8ca3d8bfed885422205dca (patch) | |
| tree | bbec65c2f895319d4192f9662919f74f51556f9a /hw | |
| parent | 606b41e7020db7634fe90d069d2c019770c74b45 (diff) | |
| download | qemu-ead9360e2fbcaae10a8ca3d8bfed885422205dca.zip | |
Partial support for 34K multithreading, not functional yet.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3156 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mips_r4k.c | 2 | ||||
| -rw-r--r-- | hw/mips_timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 2208922a75..82782273b5 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -77,7 +77,7 @@ void load_kernel (CPUState *env, int ram_size, const char *kernel_filename, if (kernel_size >= 0) { if ((entry & ~0x7fffffffULL) == 0x80000000) entry = (int32_t)entry; - env->PC = entry; + env->PC[env->current_tc] = entry; } else { fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); diff --git a/hw/mips_timer.c b/hw/mips_timer.c index 6a517e1841..2fe5e29c58 100644 --- a/hw/mips_timer.c +++ b/hw/mips_timer.c @@ -10,7 +10,7 @@ uint32_t cpu_mips_get_random (CPUState *env) static uint32_t seed = 0; uint32_t idx; seed = seed * 314159 + 1; - idx = (seed >> 16) % (env->nb_tlb - env->CP0_Wired) + env->CP0_Wired; + idx = (seed >> 16) % (env->tlb->nb_tlb - env->CP0_Wired) + env->CP0_Wired; return idx; } |