Changeset 50 for trunk/hal

Timestamp:

Jun 26, 2017, 3:15:11 PM (7 years ago)

Author:

alain

Message:

bloup

Location:

trunk/hal

Files:

• generic/hal_ppm.h (added)
• i386/__boot.S (deleted)
• i386/__cpu_context.S (deleted)
• i386/__do_exception.c (deleted)
• i386/__do_interrupt.c (deleted)
• i386/__kentry.S (deleted)
• i386/boot.c (deleted)
• i386/cpu-asm.h (deleted)
• i386/cpu-config.h (deleted)
• i386/cpu-internal.h (deleted)
• i386/cpu-io.c (deleted)
• i386/cpu-io.h (deleted)
• i386/cpu_context.c (deleted)
• i386/cpu_internal.c (deleted)
• i386/printk.c (deleted)
• i386/remote.c (deleted)
• i386/screen.c (deleted)
• i386/screen.h (deleted)
• tsar_mips32/hal_do_exceptions.c (modified) (1 diff)
• tsar_mips32/hal_gpt.c (modified) (1 diff)
• tsar_mips32/hal_ppm.c (added)
• tsar_mips32/hal_types.h (modified) (1 diff)

trunk/hal/tsar_mips32/hal_do_exceptions.c

@@ -95 +95 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 
-remote_spinlock_t  exception_lock;
-
+__attribute__((section(".kdata")))
+remote_spinlock_t  exception_lock              CONFIG_CACHE_LINE_ALIGNED;
 
 /////////////////////////////////////////////////////////////////////////////////////////

trunk/hal/tsar_mips32/hal_gpt.c

@@ -101 +101 @@
 
     // check page size
-    if( CONFIG_PPM_PAGE_SIZE != 4096 );
+    if( CONFIG_PPM_PAGE_SIZE != 4096 )
     {
         printk("\n[PANIC] in %s : For TSAR, the page must be 4 Kbytes\n", __FUNCTION__ );

trunk/hal/tsar_mips32/hal_types.h

@@ -180 +180 @@
 typedef uint32_t               vpn_t;         // Virtual Page number
 
+
 #define XPTR_NULL              0
 
 #define PTR_MASK               0x00000000FFFFFFFFULL
 
-#define GET_CXY(xp)            ((cxy_t)((xp) >> 32))
+#define PTR_SHIFT              32
+
+#define GET_CXY(xp)            ((cxy_t)((xp) >> PTR_SHIFT))
 
 #define GET_PTR(xp)            ((void*)(uint32_t)((xp) & PTR_MASK))
 
-#define XPTR(cxy,ptr)          (((uint64_t)(cxy) << 32) | (((uint32_t)(ptr)) & PTR_MASK))
+#define XPTR(cxy,ptr)          (((uint64_t)(cxy) << PTR_SHIFT) | (((uint32_t)(ptr)) & PTR_MASK))
+
 
 #define LPA_MASK               0x00000000FFFFFFFFULL
 
-#define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> 32)) 
+#define LPA_SHIFT              32
+
+#define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> LPA_SHIFT)) 
 
 #define LPA_FROM_PADDR(paddr)  (lpa_t)((paddr & LPA_MASK)
 
-#define PADDR(cxy,lpa)         (((uint64_t)(cxy) << 32) | (((uint64_t)(lpa)) & LPA_MASK))
+#define PADDR(cxy,lpa)         (((uint64_t)(cxy) << LPA_SHIFT) | (((uint64_t)(lpa)) & LPA_MASK))