Changeset 162 for soft/giet_vm/boot

Timestamp:

Jun 20, 2012, 5:11:11 PM (12 years ago)

Author:

karaoui

Message:

Cleaning unused files
Simplifying Makefile
adding missing include

Location:

soft/giet_vm/boot

Files:

• boot_handler.c (modified) (6 diffs)
• hwr_mapping.h (deleted)
• reset.S (modified) (2 diffs)

soft/giet_vm/boot/boot_handler.c

@@ -52 +52 @@
 #include <boot_handler.h>
 #include <mapping_info.h>
-#include <hwr_mapping.h>
 #include <mwmr.h>
 
@@ -80 +79 @@
                          { [0 ... GIET_NB_VSPACE_MAX-1] = 0 };
 
-// Page table pointer 
+// Page table pointers
 page_table_t* _ptabs[GIET_NB_VSPACE_MAX];
 
@@ -149 +148 @@
     }
     boot_tty_puts(buf);
-}
-
-unsigned int _tty_puts(const char *buffer, unsigned int length) 
-{
-    unsigned int* tty_address = (unsigned int*)&seg_tty_base;
-    unsigned int n;
-
-    for ( n=0; n<length; n++)
-    {
-        if (buffer[n] == 0) break;
-        tty_address[0] = (unsigned int)buffer[n];
-    }
-    
-    return n;
-} 
-
-////////////////////////////////////////////////////////////////////////////////////
-// tty_printf()
-// This function is a simplified version of the mutek_printf() function.
-// The terminal index must be defined in the calling task context.
-// It doesn't use the IRQ_PUT interrupt, and the associated kernel buffer.
-// Only a limited number of formats are supported:
-//   - %d : signed decimal
-//   - %u : unsigned decimal
-//   - %x : hexadecimal
-//   - %c : char
-//   - %s : string
-// - Returns 0 if success, > 0 if error.
-////////////////////////////////////////////////////////////////////////////////////
-unsigned int _tty_printf(char *format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    unsigned int ret;
-
-printf_text:
-
-    while (*format) {
-        unsigned int i;
-        for (i = 0; format[i] && format[i] != '%'; i++)
-            ;
-        if (i) {
-            ret = _tty_puts(format,i);
-            if (ret != i)
-                return 1; /* return error */
-            format += i;
-        }
-        if (*format == '%') {
-            format++;
-            goto printf_arguments;
-        }
-    }
-
-    va_end(ap);
-    return 0;
-
-printf_arguments:
-
-    {
-        int         val = va_arg(ap, long);
-        char            buf[20];
-        char*           pbuf;
-        unsigned int        len = 0;
-        static const char   HexaTab[] = "0123456789ABCDEF";
-        unsigned int        i;
-
-        switch (*format++) {
-            case ('c'):             /* char conversion */
-                len = 1;
-                buf[0] = val;
-                pbuf = buf;
-                break;
-            case ('d'):             /* decimal signed integer */
-                if (val < 0) {
-                    val = -val;
-                    ret = _tty_puts("-",1);
-                    if (ret != 1)
-                        return 1; /* return error */
-                }
-            case ('u'):             /* decimal unsigned integer */
-                for( i=0 ; i<10 ; i++) {
-                    buf[9-i] = HexaTab[val % 10];
-                    if (!(val /= 10)) break;
-                }
-                len =  i+1;
-                pbuf = &buf[9-i];
-                break;
-            case ('x'):             /* hexadecimal integer */
-                ret = _tty_puts("0x",2);
-                if (ret != 2)
-                    return 1; /* return error */
-                for( i=0 ; i<8 ; i++) {
-                    buf[7-i] = HexaTab[val % 16U];
-                    if (!(val /= 16U)) break;
-                }
-                len =  i+1;
-                pbuf = &buf[7-i];
-                break;
-            case ('s'):             /* string */
-                {
-                    char *str = (char*)val;
-                    while ( str[len] ) len++;
-                    pbuf = (char*)val;
-                }
-                break;
-            default:
-                goto printf_text;
-        }
-
-        ret = _tty_puts(pbuf, len);
-        if (ret != len)
-            return 1;
-        goto printf_text;
-    }
 }
 
@@ -718 +603 @@
 ///////////////////////////////////////////////////////////////////////////
 // Initialise vobjs
+// For now only one type is initialised the: PTAB
+//
 // param:
-// vobj: the vobj to initialise
-// region_id: the vspace in wich the vobj is located or the global space(-1).
+//  vobj: the vobj to initialise
+//  region_id: the vspace in wich the vobj is located or the global space(-1).
 ///////////////////////////////////////////////////////////////////////////
-void initialise_ptabs(mapping_vobj_t* vobj, unsigned int region_id)
+void initailise_vobj(mapping_vobj_t* vobj, unsigned int region_id)
 {
     if(vobj->type == PTAB)
@@ -804 +691 @@
     // + to computes the length of the current vseg
     // + Align vobjs
-    // + Initialise the ptabs if the vobj correspond
+    // + Initialise the vobj
     cur_vaddr = vseg->vbase;
     cur_paddr = vseg->pbase;
@@ -821 +708 @@
         cur_vaddr += vobj[vobj_id].length;
         cur_paddr += vobj[vobj_id].length; 
-        initialise_ptabs(&vobj[vobj_id], region_id);
+        initailise_vobj(&vobj[vobj_id], region_id);
     } 
     

soft/giet_vm/boot/reset.S

@@ -119 +119 @@
         jal     boot_init
     nop
-    j app_start
+    j to_kinit
     nop
 
@@ -130 +130 @@
     nop
         
-app_start:
+to_kinit:
     /* All processors initialize PTPR / MODE */
     /* and jump to kernel_init code.                                     */