Changeset 9559674 in rtems

Timestamp:

Dec 9, 2009, 10:37:12 PM (10 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, master

Children:

b9636c24

Parents:

7b21633

Message:

2009-12-09 Joel Sherrill <joel.sherrill@…>

• startup/bspgetworkarea.c: Add debug printk's.
• startup/linkcmds: Using "-Wl,--defsym -Wl,RamSize?=0x1000000" results in _RamSize being defined. Handle this properly.

Location:

c/src/lib/libbsp/i386/pc386

Files:

• ChangeLog (modified) (1 diff)
• startup/bspgetworkarea.c (modified) (5 diffs)
• startup/linkcmds (modified) (1 diff)

c/src/lib/libbsp/i386/pc386/ChangeLog

@@ +1 @@
+2009-12-09      Joel Sherrill <joel.sherrill@oarcorp.com>
+
+        * startup/bspgetworkarea.c: Add debug printk's.
+        * startup/linkcmds: Using "-Wl,--defsym -Wl,RamSize=0x1000000"
+        results in _RamSize being defined.  Handle this properly.
+
+
+
 2009-12-08      Joel Sherrill <joel.sherrill@oarcorp.com>
 

c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c

@@ -14 +14 @@
  */
 
+/* #define BSP_GET_WORK_AREA_DEBUG */
 #include <bsp.h>
 #include <bsp/bootcard.h>
+
+#ifdef BSP_GET_WORK_AREA_DEBUG
+  #include <rtems/bspIo.h>
+#endif
 
 /*
@@ -75 +80 @@
        _boot_multiboot_info.mem_upper ) {
     bsp_mem_size = _boot_multiboot_info.mem_upper * 1024;
+    #ifdef BSP_GET_WORK_AREA_DEBUG
+      printk( "Multiboot info says we have 0x%08x\n", bsp_mem_size );
+    #endif
   }
 
@@ -90 +98 @@
     for(i=lowest; i<=2048; i++) {
       topAddr = i*1024*1024 - 4;
-      val =  *(uint32_t*)topAddr;
+      val =  *(volatile uint32_t*)topAddr;
       if (val != topAddr) {
         break;
@@ -97 +105 @@
 
     topAddr = (i-1)*1024*1024 - 4;
+    #ifdef BSP_GET_WORK_AREA_DEBUG
+      printk( "Dynamically sized to 0x%08x\n", topAddr );
+    #endif
   } else {
-    printk( "hardcoded\n" );
     topAddr = (uintptr_t) RamSize;
+    #ifdef BSP_GET_WORK_AREA_DEBUG
+      printk( "hardcoded to 0x%08x\n", topAddr );
+    #endif
   }
 
@@ -121 +134 @@
   *heap_size       = (uintptr_t) HeapSize;
 
-  #if 0
+  #ifdef BSP_GET_WORK_AREA_DEBUG
+    printk( "bsp_mem_size = 0x%08x\n", bsp_mem_size );
+    printk( "rtemsFreeMemStart = 0x%08x\n", rtemsFreeMemStart );
     printk( "WorkArea Base = %p\n", *work_area_start );
     printk( "WorkArea Size = 0x%08x\n", *work_area_size );
     printk( "C Program Heap Base = %p\n", *heap_start );
     printk( "C Program Heap Size = 0x%08x\n", *heap_size );
+    printk( "End of WorkArea = %p\n", *work_area_start +  *work_area_size );
   #endif
 }

c/src/lib/libbsp/i386/pc386/startup/linkcmds

@@ -18 +18 @@
 ENTRY(_start)
 */
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
-RamSize = DEFINED(RamSize) ? RamSize    : 0xFFFFFFFF;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 
+          DEFINED(_HeapSize) ? _HeapSize : 0x0;
+RamSize = DEFINED(RamSize) ? RamSize    : 
+          DEFINED(_RamSize) ? _RamSize : 0xFFFFFFFF;
 
 SECTIONS