Changeset 38de8a5 in mainline for arch/mips/src/cpu/cpu.c

Timestamp:

2005-09-09T13:50:54Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b02e5d1

Parents:

b0edf3b2

Message:

MIPS architecture now works without any problems in

• msim: compile as OUTPUT_FORMAT(binary)
• gxemul: compile as OUTPUT_FORMAT(ecoff-littlemips), or create

configuration file for binary format (will be done later)

• simics: compile as OUTPUT_FORMAT(elf32-little), might work with binary

format, didn't try yet.

File:

• arch/mips/src/cpu/cpu.c (modified) (3 diffs)

arch/mips/src/cpu/cpu.c

@@ -35 +35 @@
 
 #include <typedefs.h>
-#include <print.h>
+#include <print.h>      
 
-struct {
+struct data_t {
         char *vendor;
         char *model;
-} imp_data[] = {
+};
+
+static struct data_t imp_data[] = {
         { "Invalid", "Invalid" },       /* 0x00 */
         { "MIPS", "R2000" },            /* 0x01 */
@@ -79 +81 @@
 };
 
+static struct data_t imp_data80[] = {
+        { "MIPS", "4Kc" },  /* 0x80 */
+        {"Invalid","Invalid"}, /* 0x81 */
+        {"Invalid","Invalid"}, /* 0x82 */
+        {"MIPS","4Km & 4Kp"} /* 0x83 */
+};
+
 void cpu_arch_init(void)
 {
@@ -91 +100 @@
 void cpu_print_report(cpu_t *m)
 {
+        struct data_t *data;
+
+        if (m->arch.imp_num & 0x80) {
+                data = &imp_data80[m->arch.imp_num & 0x7f];
+        } else
+                data = &imp_data[m->arch.imp_num];
+
         printf("cpu%d: %s %s (rev=%d.%d, imp=%d)\n",
-                m->id, imp_data[m->arch.imp_num].vendor, imp_data[m->arch.imp_num].model, m->arch.rev_num >> 4, m->arch.rev_num & 0xf, m->arch.imp_num);
+                m->id, data->vendor, data->model, m->arch.rev_num >> 4, 
+               m->arch.rev_num & 0xf, m->arch.imp_num);
 }