Changeset 603 for trunk/kernel/libk/xlist.h

Timestamp:

Dec 3, 2018, 12:17:35 PM (5 years ago)

Author:

alain

Message:

Improve the FAT32 file system to support cat, rm, cp commands.

File:

• trunk/kernel/libk/xlist.h (modified) (13 diffs)

trunk/kernel/libk/xlist.h

@@ -25 +25 @@
  */
 
-#ifndef _ALMOS_XLIST_H_
-#define _ALMOS_XLIST_H_
+#ifndef _XLIST_H_
+#define _XLIST_H_
 
 #include <kernel_config.h>
@@ -81 +81 @@
  **************************************************************************/
 
-#define XLIST_FIRST( root_xp , type , member ) \
-    ({ xptr_t __first = hal_remote_l64( root_xp );     \
+#define XLIST_FIRST( root_xp , type , member )       \
+    ({ xptr_t __first = hal_remote_l64( root_xp );   \
            XLIST_ELEMENT( __first , type , member ); })
 
@@ -95 +95 @@
  **************************************************************************/
 
-#define XLIST_LAST( root_xp , type , member )  \
-    ({ xptr_t __last = hal_remote_l64( root_xp + 8 );  \
+#define XLIST_LAST( root_xp , type , member )                       \
+    ({ xptr_t __last = hal_remote_l64( root_xp + sizeof(xptr_t) );  \
            XLIST_ELEMENT( __last , type , member ); })
 
@@ -118 +118 @@
  **************************************************************************/
 
-#define XLIST_FOREACH_BACKWARD( root_xp , iter_xp )  \
-for( (iter_xp) = hal_remote_l64( (root_xp) + 8 ) ;   \
-     (iter_xp) != (root_xp) ;                        \
-     (iter_xp) = hal_remote_l64( (iter_xp) + 8 ) )
+#define XLIST_FOREACH_BACKWARD( root_xp , iter_xp )              \
+for( (iter_xp) = hal_remote_l64( (root_xp) + sizeof(xptr_t) ) ;  \
+     (iter_xp) != (root_xp) ;                                    \
+     (iter_xp) = hal_remote_l64( (iter_xp) + sizeof(xptr_t) ) )
 
 /***************************************************************************
@@ -156 +156 @@
 
     // get ref->pred
-    xptr_t ref_pred  = (xptr_t)hal_remote_l64( ref + 8 );
+    xptr_t ref_pred  = (xptr_t)hal_remote_l64( ref + sizeof(xptr_t) );
 
     // test if list is empty or ref is the first element  
@@ -171 +171 @@
 static inline void xlist_root_init( xptr_t root_xp )
 {
-    hal_remote_s64(  root_xp   , root_xp );
-    hal_remote_s64(  root_xp+8 , root_xp );
+    hal_remote_s64( root_xp                  , root_xp );
+    hal_remote_s64( root_xp + sizeof(xptr_t) , root_xp );
 }
 
@@ -182 +182 @@
 static inline void xlist_entry_init( xptr_t entry_xp )
 {
-    hal_remote_s64(  entry_xp   , 0 );
-    hal_remote_s64(  entry_xp+8 , 0 );
+    hal_remote_s64( entry_xp                  , 0 );
+    hal_remote_s64( entry_xp + sizeof(xptr_t) , 0 );
 }
 
@@ -206 +206 @@
 
     // entry.pred <= root 
-    hal_remote_s64( entry + 8 , (uint64_t)root );
+    hal_remote_s64( entry + sizeof(xptr_t) , (uint64_t)root );
     
     // first.pred <= new
-    hal_remote_s64( first + 8 , (uint64_t)entry );
+    hal_remote_s64( first + sizeof(xptr_t) , (uint64_t)entry );
 }
 
@@ -223 +223 @@
 {
     // get the extended pointer on the last element in list
-    xptr_t last = (xptr_t)hal_remote_l64( root + 8 );
+    xptr_t last = (xptr_t)hal_remote_l64( root + sizeof(xptr_t) );
 
     // update root.pred <= entry
-    hal_remote_s64( root + 8 , (uint64_t)entry );
+    hal_remote_s64( root + sizeof(xptr_t) , (uint64_t)entry );
 
     // update entry.pred <= last
-    hal_remote_s64( entry + 8 , (uint64_t)last );
+    hal_remote_s64( entry + sizeof(xptr_t) , (uint64_t)last );
 
     // entry.next <= root 
@@ -262 +262 @@
     xlist_entry_t entry;
     hal_remote_memcpy( XPTR( local_cxy , &entry ) ,
-                                  xp , 
-                                  sizeof(xlist_entry_t) );
+                       xp , 
+                       sizeof(xlist_entry_t) );
 
     xptr_t next = entry.next;
@@ -272 +272 @@
 
     // update next.pred <= pred
-    hal_remote_s64( next + 8 , (uint64_t)pred );
+    hal_remote_s64( next + sizeof(xptr_t) , (uint64_t)pred );
 }
 
@@ -298 +298 @@
 
     // update new.pred <= pred
-    hal_remote_s64( new + 8 , (uint64_t)pred );
+    hal_remote_s64( new + sizeof(xptr_t) , (uint64_t)pred );
 
         // update pred.next <= new
@@ -304 +304 @@
 
     // update next.pred <= new
-    hal_remote_s64( next + 8 , (uint64_t)new );
-}
-
-#endif  /* _ALMOS_LIST_H_ */
+    hal_remote_s64( next + sizeof(xptr_t) , (uint64_t)new );
+}
+
+#endif  /* _XLIST_H_ */