Changeset 409 for trunk/hal

Timestamp:

Dec 20, 2017, 4:51:09 PM (7 years ago)

Author:

alain

Message:

Fix bugs in exec

Location:

trunk/hal

Files:

• generic/hal_ppm.h (modified) (1 diff)
• tsar_mips32/core/hal_exception.c (modified) (4 diffs)
• tsar_mips32/core/hal_gpt.c (modified) (3 diffs)
• tsar_mips32/core/hal_ppm.c (modified) (1 diff)

trunk/hal/generic/hal_ppm.h

@@ -30 +30 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
-//           Generic Physical Page Table API (implementation in hal_ppm.c)
+//           Generic Physical Page Manager API (implementation in hal_ppm.c)
 //
 // Any arch-specific implementation must implement this API.

trunk/hal/tsar_mips32/core/hal_exception.c

@@ -99 +99 @@
 xcode_values_t;
 
-////////////////////////////////////////////////////
-static char * hal_mmu_exception_str( uint32_t code )
+/////////////////////////////////////////////
+char * hal_mmu_exception_str( uint32_t code )
 {
     if     ( code == MMU_WRITE_PT1_UNMAPPED        ) return "WRITE_PT1_UNMAPPED";
@@ -201 +201 @@
     }
 
-// @@@
-thread_t * parent = (thread_t *)0xa4000;
-uint32_t cond = (this == 0xe0000) && (hal_time_stamp() > 5380000);
-
-if( cond ) hal_gpt_display( this->process );
-if( cond ) hal_gpt_display( parent->process );
-if( cond ) printk("\n[DBG] %s : core[%x,%d] / is_ins %d / %s / vaddr %x\n",
+excp_dmsg("\n[DBG] %s : core[%x,%d] / is_ins %d / %s / vaddr %x\n",
 __FUNCTION__ , local_cxy , this->core->lid , is_ins,
 hal_mmu_exception_str(excp_code) , bad_vaddr );
@@ -267 +261 @@
                 {
 
-if( cond ) printk("\n[DBG] %s : core[%x,%d] / copy-on-write handled for vaddr = %x\n",
+excp_dmsg("\n[DBG] %s : core[%x,%d] / copy-on-write handled for vaddr = %x\n",
 __FUNCTION__ , local_cxy , this->core->lid , bad_vaddr );
 
@@ -275 +269 @@
             else                             // non writable user error
             {
-                printk("\n[ERROR] in %s for thread %x : write to non-writable vaddr = %x\n",
+                printk("\n[ERROR] in %s for thread %x : non-writable vaddr = %x\n",
                 __FUNCTION__ , this->trdid , bad_vaddr );
 

trunk/hal/tsar_mips32/core/hal_gpt.c

@@ -131 +131 @@
         page_t   * page;
     xptr_t     page_xp;
-    vpn_t      vpn;
-    error_t    error;
-    uint32_t   attr;
 
 gpt_dmsg("\n[DBG] %s : core[%x,%d] enter\n", 
@@ -159 +156 @@
         gpt->ptr  = GET_PTR( ppm_page2base( page_xp ) );
         gpt->ppn  = ppm_page2ppn( page_xp );
-
-    // identity map the kentry_vseg (must exist for all processes)
-    attr = GPT_MAPPED | GPT_SMALL | GPT_EXECUTABLE | GPT_CACHABLE | GPT_GLOBAL;
-    for( vpn = CONFIG_VMM_KENTRY_BASE;
-         vpn < (CONFIG_VMM_KENTRY_BASE + CONFIG_VMM_KENTRY_SIZE); vpn++ )
-    {
-
-gpt_dmsg("\n[DBG] %s : identity map vpn %d\n", __FUNCTION__ , vpn );
-
-        error = hal_gpt_set_pte( gpt,
-                                 vpn,
-                                 attr,
-                                 (local_cxy<<20) | (vpn & 0xFFFFF) );
-
-        if( error )
-        {
-            printk("\n[ERROR] in %s : cannot identity map kentry vseg\n", __FUNCTION__ );
-            return ENOMEM;
-        }
-    }
 
 gpt_dmsg("\n[DBG] %s : core[%x,%d] exit\n",
@@ -933 +910 @@
     pte2_attr = pt2[2*ix2];
 
-if( (CURRENT_THREAD == 0xe0000) && (hal_time_stamp() > 5380000) )
-printk("\n@@@ %s : vpn = %X / attr = %X\n", __FUNCTION__ , vpn , tsar2gpt( pte2_attr ) );
-
     if( (pte2_attr & TSAR_MMU_MAPPED) == 0 ) return false;
 

trunk/hal/tsar_mips32/core/hal_ppm.c

@@ -35 +35 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// This file contains the TSAR specific code for :
-// - cores registers initialisation,
-// - memory allocators initialisation.
+// This file contains the TSAR specific code for the physical memory
+// allocators initialisation.
 //
 // For The TSAR architecture, the kernel pointers are identity mapped: