Changeset 930 for trunk/softs

Timestamp:

Jan 27, 2015, 5:20:19 PM (10 years ago)

Author:

cfuguet

Message:

tsar_boot: using global variable for the block device block cache

• Some GCC versions have a problem to align as indicated with the attribute(aligned()) macro the functions' local variables. Therefore, using a global variable instead of a static local variable for the block cache because this last must be aligned to a cache line.

Location:

trunk/softs/tsar_boot

Files:

• preloader.ld.in (modified) (1 diff)
• src/reset_elf_loader.c (modified) (2 diffs)
• src/reset_utils.c (modified) (2 diffs)

trunk/softs/tsar_boot/preloader.ld.in

@@ -39 +39 @@
         *(.data)
         *(.bss)
+        *(COMMON)
     }
 }

trunk/softs/tsar_boot/src/reset_elf_loader.c

@@ -16 +16 @@
 #include <defs.h>
 
+extern int blk_buf_idx;
+
 ///////////////////////////////////////////////////////////////////////////////
 void * reset_elf_loader(size_t lba)
@@ -25 +27 @@
     reset_putd( proctime() );
     reset_puts("\n");
+
+    /*
+     * Init the cache block index
+     */
+    blk_buf_idx = -1;
 
     /*

trunk/softs/tsar_boot/src/reset_utils.c

@@ -12 +12 @@
 #include <io.h>
 
+/*
+ * Cache block data buffer and cached block index
+ */
+struct aligned_blk blk_buf;
+int blk_buf_idx;
+
 /**
  * \param file_offset: Disk relative offset of file
@@ -24 +30 @@
 int pread(size_t file_offset, void *buf, size_t nbyte, size_t offset) {
     if (nbyte == 0) return 0;
-
-    /*
-     * Cache block data buffer and cached block index
-     */
-    static struct aligned_blk blk_buf;
-    static int blk_buf_idx = -1;
 
     char *dst;