Changeset 207 for soft/giet_vm/boot

Timestamp:

Aug 16, 2012, 6:36:16 PM (12 years ago)

Author:

alain

Message:

Several bugs have been fixed to support TSAR multi-cluster architecture
such as the "tsarv4-generic_mmu" platform.

Location:

soft/giet_vm/boot

Files:

• boot_init.c (modified) (2 diffs)
• reset.S (modified) (2 diffs)

soft/giet_vm/boot/boot_init.c

@@ -286 +286 @@
 void boot_puts(const char *buffer) 
 {
-    unsigned int* tty_address = (unsigned int*)( (unsigned)&seg_tty_base +
-                                     (CLUSTER_IO_ID * (unsigned)CLUSTER_SIZE) );
+    unsigned int* tty_address = (unsigned int*)( (char*)&seg_tty_base +
+                                (CLUSTER_IO_ID * (unsigned)CLUSTER_SIZE) );
     unsigned int n;
 
@@ -293 +293 @@
     {
         if (buffer[n] == 0) break;
-        tty_address[0] = (unsigned int)buffer[n];
+        tty_address[TTY_WRITE] = (unsigned int)buffer[n];
     }
-    
 } 
 ////////////////////////////////////////////////////////////////////////////

soft/giet_vm/boot/reset.S

@@ -65 +65 @@
     nop
     mfc0        a0,     CP0_TIME
-        jal             boot_putx
+        jal             boot_putd
         nop
     la          a0,     boot_lf_string
@@ -76 +76 @@
     mfc0        k0,     CP0_PROCID
     andi        a0,     k0,     0xFFF
-        jal             boot_putx
+        jal             boot_putd
     nop
     la          a0,     boot_lf_string