Changeset 171

Timestamp:

Jul 18, 2012, 9:17:22 AM (12 years ago)

Author:

karaoui

Message:

Testing the placement of the kernel segments without the identity mapping.
debugging memo.
debugging the vm_handler to disable the interrupts while passing in physical addressing.

Location:

soft/giet_vm

Files:

• map.xml (modified) (4 diffs)
• memo/src/libelfpp/elfpp_access.cc (modified) (5 diffs)
• sys/vm_handler.c (modified) (1 diff)

soft/giet_vm/map.xml

@@ -89 +89 @@
                         vbase     = "0x80000000" 
                         mode      = "CX__" 
-                        psegname  = "PSEG_RAK"
-                        ident     = "1" >
+                        psegname  = "PSEG_RAU"
+                        ident     = "0" >
                                         <vobj   name    = "seg_kernel_code"
                                                         type    = "ELF"
@@ -101 +101 @@
                         vbase     = "0x80010000" 
                         mode      = "C_W_" 
-                        psegname  = "PSEG_RAK"
-                        ident     = "1" >
+                        psegname  = "PSEG_RAU"
+                        ident     = "O" >
                                         <vobj   name    = "seg_kernel_data"
                                                         type    = "ELF"
@@ -112 +112 @@
                         vbase     = "0x80080000" 
                         mode      = "__W_"
-                        psegname  = "PSEG_RAK"
-                        ident     = "1" >
+                        psegname  = "PSEG_RAU"
+                        ident     = "0" >
                                             <vobj   name        = "seg_kernel_uncdata"
                                                         type    = "ELF"
@@ -123 +123 @@
                         vbase     = "0x80090000" 
                         mode      = "CX__"
-                        psegname  = "PSEG_RAK"
-                        ident     = "1" >
+                        psegname  = "PSEG_RAU"
+                        ident     = "0" >
                                         <vobj   name    = "seg_kernel_init"
                                                         type    = "ELF"

soft/giet_vm/memo/src/libelfpp/elfpp_access.cc

@@ -644 +644 @@
         segment *s = new segment(obj);
 
-        if(!(sec->get_flags() & elfpp::SHF_ALLOC))
-    {
-            s->set_type(PT_NULL);
-        continue;
-    }
-    
-    s->set_type(PT_LOAD);
-        s->set_file_offset(0);//done while writing section in file
-        s->set_vaddr(sec->get_vaddr());
-        s->set_paddr(sec->get_vaddr());
-
-        s->set_mem_size(sec->get_size());
-        s->set_file_size(sec->get_size());
-
-        flag = PF_R ;//ALLOC ==> read ? 
-        flag = flag | (p_flags_e)(sec->get_flags() & SHF_WRITE)? PF_W : PF_R ; 
-        flag = flag | (p_flags_e)(sec->get_flags() & SHF_EXECINSTR)? PF_X : PF_R ; 
-        s->set_flags(flag);
-        s->set_align(0);//FIXME!
-
-        obj.add_segment(*s);
+        if(!(sec->get_flags() & elfpp::SHF_ALLOC))
+        {
+            s->set_type(PT_NULL);
+            continue;
+        }
+        
+        s->set_type(PT_LOAD);
+        s->set_file_offset(0);//done while writing section in file
+#ifdef MEMO_DEBUG
+        std::cout << "seg building (" << std::hex << sec->get_vaddr() << ") for: " << *sec << std::endl;
+#endif
+        s->set_vaddr(sec->get_vaddr());
+        s->set_paddr(sec->get_vaddr());
+
+        s->set_mem_size(sec->get_size());
+        s->set_file_size(sec->get_size());
+
+            flag = PF_R ;//ALLOC ==> read ? 
+            flag = flag | (p_flags_e)(sec->get_flags() & SHF_WRITE)? PF_W : PF_R ; 
+            flag = flag | (p_flags_e)(sec->get_flags() & SHF_EXECINSTR)? PF_X : PF_R ; 
+        s->set_flags(flag);
+        s->set_align(0);//FIXME!
+
+#ifdef MEMO_DEBUG
+        std::cout <<"New segment " << s->get_file_size() << std::endl;
+#endif
+        obj.add_segment(*s);
       }
   }
@@ -675 +681 @@
     if (obj.generate_symtab_)
       save_symtab(obj);
+
+    // create all segments
 
     create_segments(obj);
@@ -797 +805 @@
     std::memset(phdr, 0, sizeof(phdr));
 
-    unsigned int i = 0;
+    unsigned int i = 1;//to keep the same order as sections
     FOREACH(s, obj.get_segment_table())
       {
@@ -812 +820 @@
         
         swap(&phdr[i].p_align, s->get_align());
-        //offset done while writing sections
+        //note: offset done while writing sections
         i++;
       }
@@ -829 +837 @@
     FOREACH(s, obj.get_section_table())
       {
-        if (s->get_type() == SHT_NOBITS)
-          continue;
-
+        if (s->get_type() == SHT_NOBITS)
+          continue;
+
+#ifdef MEMO_DEBUG
+        std::cout << "offset: " << ftell(file) << " for " << *s << std::endl;
+        std::cout << std::hex << "paddr: " << phdr[s->index_].p_paddr << ", sect vaddr: " << s->get_vaddr() << "/" <<shdr[s->index_].sh_addr << std::endl;
+#endif
         swap(&shdr[s->index_].sh_offset, ftell(file));
         swap(&phdr[s->index_].p_offset, ftell(file));

soft/giet_vm/sys/vm_handler.c

@@ -118 +118 @@
 
         // gets ppn_value and flags_value, after temporary DTLB desactivation
-        asm volatile ( "move    $27, %2     \n"     /* $27 <= pte2      */
-                       "li      $26, 0xB    \n"     /* DTLB unactivated */
-                       "mtc2    $26, $1     \n"
-                       "lw      %0,  0($27) \n"     /* read flags       */ 
-                       "lw      %1,  4($27) \n"     /* read ppn         */
-                       "li      $26, 0xF    \n" 
-                       "mtc2    $26, $1     \n"     /* DTLB activated   */
+        asm volatile ( 
+                       "li      $27,    0xFFFFFFFE  \n"     /* Mask for IE bits     */
+                       "mfc0    $8,     $12         \n"     /* $8 <= SR             */ 
+                       "and     $26,    $26,    $27 \n"     /* disable Interrupts   */
+                       "move    $27,    %2          \n"     /* $27 <= pte2          */
+                       "li      $26,    0xB         \n"     /* DTLB unactivated     */
+                       "mtc2    $26,    $1          \n"
+                       "lw      %0,     0($27)      \n"     /* read flags           */ 
+                       "lw      %1,     4($27)      \n"     /* read ppn             */
+                       "li      $26,    0xF         \n" 
+                       "mtc2    $26,    $1          \n"     /* DTLB activated       */
+                       "or     $26,     $8,    $0   \n"     /* SR previous state    */
                         :"=r"(flags_value), "=r"(ppn_value)
                         :"r"(pte2)
-                        :"$26" );
+                        :"$26","$27","$8" );
 
         // check PTE2 mapping