Changeset 101 for trunk/Softwares/Common

Timestamp:

Jan 15, 2009, 6:19:08 PM (16 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

Location:

trunk/Softwares/Common

Files:

• include/find_one.h (modified) (1 diff)
• include/func_io.h (modified) (1 diff)
• include/service_clock.h (modified) (1 diff)
• include/uncached_mask.h (deleted)
• ldscript/or32.ld (modified) (3 diffs)
• src/asm/cpu_info.s (modified) (1 diff)
• src/asm/find_one.s (modified) (1 diff)
• src/asm/thread_info.s (modified) (1 diff)
• src/asm/uncached_mask.s (deleted)
• src/c/func_io.c (modified) (1 diff)
• src/c/service_clock.c (modified) (1 diff)
• src/sys/crt0.s (deleted)

trunk/Softwares/Common/include/find_one.h

@@ -1 +1 @@
 unsigned int  find_first_one (unsigned int val);
+// unsigned int  find_last_one  (unsigned int val);

trunk/Softwares/Common/include/func_io.h

@@ -1 +1 @@
 #include "mapping_memory.h"
 
-void print(int data);
-void quit (int data);
+void tty  (unsigned char data);
+void print(char * data);
+void quit (unsigned int data);
+void show (unsigned int data);

trunk/Softwares/Common/include/service_clock.h

@@ -1 @@
-unsigned int service_clock ();
+// unsigned int service_clock ();

trunk/Softwares/Common/ldscript/or32.ld

@@ -6 +6 @@
 
 /*
- * Memory Mapping
+ * Memory Mapping : cf ${MORPHEO_TOPLEVEL}/IPs/systemC/shared/mapping_memory.h
  */
 
@@ -13 +13 @@
         iram     : ORIGIN = 0x00000000, LENGTH = 0x01000000
         dram     : ORIGIN = 0x10000000, LENGTH = 0x10000000
-        dram_unc : ORIGIN = 0x40000000, LENGTH = 0x01000000
+        dram_unc : ORIGIN = 0x80000000, LENGTH = 0x01000000
 }
 
@@ -20 +20 @@
  * grows down.
  */
-PROVIDE (_stack       = 0x52000000 - 4);
-PROVIDE (__stack      = 0x52000000 - 4);
+PROVIDE (_stack       = 0x42000000 - 4);
 PROVIDE (_stack_alloc = 0x00500000    );
 PROVIDE (_tty         = 0xa0000000    );
+PROVIDE (_ramlock     = 0xb0000000    );
+PROVIDE (_sim2os      = 0xc0000000    );
 
 SECTIONS

trunk/Softwares/Common/src/asm/cpu_info.s

@@ -10 +10 @@
 _get_cpu_id :
         l.jr    r9
-        l.mfspr r11,r0,0xF800  /* R11 <- SPR[31][0] */
-
+        l.mfspr r11,r0,21      /* R11 <- SPR[0][21] */
+        
         .global _set_cpu_id
 _set_cpu_id :
         l.jr    r9
-        l.mtspr r0 ,r3,0xF800  /* SPR[31][0] <- r3  */
+        l.mtspr r0 ,r3,21  /* SPR[0][21] <- r3  */
 

trunk/Softwares/Common/src/asm/find_one.s

@@ -12 +12 @@
         l.ff1   r11,r3
 
-/*
+/*        
         .global _find_last_one
 _find_last_one :

trunk/Softwares/Common/src/asm/thread_info.s

@@ -10 +10 @@
 _get_thread_id :
         l.jr    r9                              
-        l.mfspr r11,r0,0xF801                   /* R11 <- SPR[31][1] */
-        
+        l.mfspr r11,r0,22                       /* R11 <- SPR[0][22] */
+        
         .global _set_thread_id
 _set_thread_id :
         l.jr    r9
-        l.mtspr r0 ,r3,0xF801                   /* SPR[31][1] <- r3  */
+        l.mtspr r0 ,r3,22                       /* SPR[0][22] <- r3  */
 
         .global _get_thread_priority
 _get_thread_priority :
         l.jr    r9
-        l.mfspr r11,r0,0xF802                   /* R11 <- SPR[31][2] */
+        l.mfspr r11,r0,23                       /* R11 <- SPR[0][23] */
 
         .global _set_thread_priority
 _set_thread_priority :
         l.jr    r9
-        l.mtspr r0 ,r3,0xF802                   /* SPR[31][2] <- r3  */
+        l.mtspr r0 ,r3,23                       /* SPR[0][23] <- r3  */
         

trunk/Softwares/Common/src/c/func_io.c

@@ -2 +2 @@
 #include "thread_info.h"
 
-void print(int data)
+void tty (unsigned char data)
 {
-  int *show   =(int*)(TTY_BASE + (get_thread_id() << 4) + 8);
+  unsigned int * addr =(unsigned int*)(TTY_BASE + (get_thread_id() << 4) + 0);
 
-  *(show) = data;
+  *(addr) = data;
 }
 
-void quit (int data)
+void print (char * data)
 {
-  int *stop   =(int*)(TTY_BASE + (get_thread_id() << 4) + 4);
+  unsigned int * addr =(unsigned int*)(TTY_BASE + (get_thread_id() << 4) + 0);
 
-  *(stop) = data;
+  while ((*data) != '\0')
+    {
+      *(addr) = (*data);
+      data++;
+    }
 }
+
+void show (unsigned int data)
+{
+  unsigned int * addr =(unsigned int*)(TTY_BASE + (get_thread_id() << 4) + 8);
+
+  *(addr) = data;
+}
+
+void quit (unsigned int data)
+{
+  unsigned int * addr = (unsigned int*)(TTY_BASE + (get_thread_id() << 4) + 4);
+
+  *(addr) = data;
+}

trunk/Softwares/Common/src/c/service_clock.c

@@ -1 @@
-#include <time.h>
-#include <errno.h>
-#include <sys/lock.h>
-#include "mapping_memory.h"
-#include "sim2os.h"
-#include "service_clock.h"
+/* #include <time.h> */
+/* #include <errno.h> */
+/* #include <sys/lock.h> */
+/* #include "mapping_memory.h" */
+/* #include "sim2os.h" */
+/* #include "service_clock.h" */
 
-unsigned int service_clock ()
-{
-  unsigned int * addr   = (unsigned int *)(SIM2OS_BASE);
-  unsigned int   result = -1;
+/* unsigned int service_clock () */
+/* { */
+/*   unsigned int * addr   = (unsigned int *)(SIM2OS_BASE); */
+/*   unsigned int   result = -1; */
 
-  __lock_init    (service_lock);
+/*   __lock_init    (service_lock); */
   
-  __lock_acquire (service_lock);
+/*   __lock_acquire (service_lock); */
 
-  *(addr+0) = (unsigned int)SERVICE_CLOCK;
+/*   *(addr+0) = (unsigned int)SERVICE_CLOCK; */
  
-  // memory synchronisation
-  // (else read (with an address that depend not of store address) can be lunch before a store)
-  asm("l.msync;");
+/*   // memory synchronisation */
+/*   // (else read (with an address that depend not of store address) can be lunch before a store) */
+/*   asm("l.msync;"); */
 
-  result    = (clock_t) *(addr+1);
+/*   result    = (clock_t) *(addr+1); */
  
-  if (result == (clock_t)-1)
-    errno = (int) *(addr+2);
+/*   if (result == (clock_t)-1) */
+/*     errno = (int) *(addr+2); */
 
-  __lock_release (service_lock);
+/*   __lock_release (service_lock); */
 
-  return result;
-}
+/*   return result; */
+/* } */