Changeset 38de8a5 in mainline

Timestamp:

2005-09-09T13:50:54Z (19 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.

Files:

• arch/mips/Makefile.inc (modified) (1 diff)
• arch/mips/_link.ld (modified) (3 diffs)
• arch/mips/src/console.c (moved) (moved from arch/mips/src/putchar.c ) (2 diffs)
• arch/mips/src/cpu/cpu.c (modified) (3 diffs)
• arch/mips/src/interrupt.c (modified) (2 diffs)
• arch/mips/src/mips.c (modified) (2 diffs)
• arch/mips/src/mm/tlb.c (modified) (1 diff)
• contrib/conf/SPMIPS.simics (added)
• contrib/conf/spmips.conf (added)

arch/mips/Makefile.inc

@@ -25 +25 @@
         arch/mips.c \
         arch/dummy.S \
-        arch/putchar.c \
+        arch/console.c \
         arch/asm.S \
         arch/exception.c \

arch/mips/_link.ld

@@ -7 +7 @@
  */
 
+/* OUTPUT_FORMAT(ecoff-littlemips) */
 OUTPUT_FORMAT(binary)
+/* OUTPUT_FORMAT(elf32-little) */
+
 ENTRY(kernel_image_start) 
 
 SECTIONS {
-        .image 0x80000000: AT (0x80000000) {
+        .image 0x80000000: AT (0) {
                 _gp = 0x00000000;
                 
@@ -28 +31 @@
                 *(.sdata);
                 *(.sbss);
+                *(.comment); 
+                *(.pdr); 
+
                 hardcoded_ktext_size = .;
                 LONG(ktext_end - ktext_start);  
@@ -43 +49 @@
                 kdata_end = .;
 
-        } = 0x00000000
+        } 
 }

arch/mips/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2003-2004 Jakub Jermar
+ * Copyright (C) 2005 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -30 +30 @@
 #include <arch/types.h>
 #include <arch/cp0.h>
+#include <arch/console.h>
 
-#define VIDEORAM        0xB0000000
+static void (*putchar_func)(const char ch) = NULL;
+
+static void cons_putchar(const char ch)
+{
+        *((char *) VIDEORAM) = ch;
+}
+
+
+static void serial_putchar(const char ch)
+{
+        int i;
+
+        if (ch=='\n')
+                putchar('\r');
+
+        /* Wait until transmit buffer empty */
+        while (! ((*SERIAL_LSR) & (1<<TRANSMIT_EMPTY_BIT)))
+                ;
+        *(SERIAL_PORT_BASE) = ch;
+}
+
+void console_init(void)
+{
+        /* The LSR on the start usually contains this value */
+        if (*SERIAL_LSR == 0x60)
+                putchar_func = serial_putchar;
+        else
+                putchar_func = cons_putchar;
+}
 
 void putchar(const char ch)
 {
-//      __u32 status = cp0_status_read();
-        
-//      cp0_status_write(cp0_status_read() | cp0_status_erl_error_bit);
-        *((char *) VIDEORAM) = ch;
-//      cp0_status_write(status);
+        putchar_func(ch);
 }

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);
 }

arch/mips/src/interrupt.c

@@ -58 +58 @@
 }
 
-
 void interrupt(void)
 {
@@ -84 +83 @@
                                         break;
                                 case 7: /* Timer Interrupt */
-                                        cp0_compare_write(cp0_compare_value); /* clear timer interrupt */
+                                        cp0_compare_write(cp0_count_read() + cp0_compare_value); /* clear timer interrupt */
                                         /* start counting over again */
-                                        cp0_count_write(0);
                                         clock();
                                         break;

arch/mips/src/mips.c

@@ -34 +34 @@
 #include <mm/vm.h>
 #include <userspace.h>
+#include <arch/console.h>
 
 void arch_pre_mm_init(void)
@@ -51 +52 @@
          * Start hardware clock.
          */
-        cp0_compare_write(cp0_compare_value);
-        cp0_count_write(0);
+        cp0_compare_write(cp0_compare_value + cp0_count_read());
+
+        console_init();
 }
 

arch/mips/src/mm/tlb.c

@@ -38 +38 @@
 void tlb_refill(struct exception_regdump *pstate)
 {
-        panic("tlb_refill exception\n");
+        char *symbol = "";
+        char *sym2 = "";
+
+        if (THREAD) {
+                char *s = get_symtab_entry(pstate->epc);
+                if (s)
+                        symbol = s;
+                s = get_symtab_entry(pstate->ra);
+                if (s)
+                        sym2 = s;
+        }
+        panic("%X: tlb_refill exception at %X(%s<-%s)\n", cp0_badvaddr_read(),
+              pstate->epc, symbol,sym2);
 }