Switch default CPU to 24Kf for now, as the Linux FPU emulation in

the current qemu mips emulation fails in some cases. (The Linux
FPU emulation works on real FPU-less hardware.)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2738 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 3a11503..42627e8 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -721,7 +721,7 @@ void mips_malta_init (int ram_size, int vga_ram_size, int boot_device,
 #ifdef TARGET_MIPS64
         cpu_model = "R4000";
 #else
-        cpu_model = "4KEc";
+        cpu_model = "24Kf";
 #endif
     }
     if (mips_find_by_name(cpu_model, &def) != 0)

diff --git a/hw/mips_pica61.c b/hw/mips_pica61.c
index 8e1058a..3f2a937 100644 (file)
--- a/hw/mips_pica61.c
+++ b/hw/mips_pica61.c
@@ -73,7 +73,8 @@ void mips_pica61_init (int ram_size, int vga_ram_size, int boot_device,
 #ifdef TARGET_MIPS64
         cpu_model = "R4000";
 #else
-        cpu_model = "4KEc";
+        /* FIXME: All wrong, this maybe should be R3000 for the older PICAs. */
+        cpu_model = "24Kf";
 #endif
     }
     if (mips_find_by_name(cpu_model, &def) != 0)

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index f6af322..72e9ac8 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -154,7 +154,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
 #ifdef TARGET_MIPS64
         cpu_model = "R4000";
 #else
-        cpu_model = "4KEc";
+        cpu_model = "24Kf";
 #endif
     }
     if (mips_find_by_name(cpu_model, &def) != 0)