Fix data region mappin

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2871 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 72 insertions, 51 deletions

diff --git a/nuttx/arch/arm/src/arm/pg_macros.h b/nuttx/arch/arm/src/arm/pg_macros.h
index c85b7a5cd..9384e378e 100644
--- a/nuttx/arch/arm/src/arm/pg_macros.h
+++ b/nuttx/arch/arm/src/arm/pg_macros.h
@@ -84,6 +84,10 @@
 #  endif
 
 #define PT_SIZE (PTE_NPAGES * 4)
+
+/* We position the data section PTE's just after the text section PTE's */
+
+#define PG_L2_DATA_PADDR       (PG_L2_BASE_PADDR + 4*PG_TEXT_NPAGES)
 #endif /* CONFIG_PAGING */
 
 /****************************************************************************
@@ -100,20 +104,22 @@
  *   written. This macro is used when CONFIG_PAGING is enable.  This case,
  *   it is used asfollows:
  *
- *	ldr	r0, =PG_LOCKED_PBASE
- *	ldr	r1, =CONFIG_PAGING_NLOCKED
- *      ldr	r2, =MMUFLAGS
+ *	ldr	r0, =PG_L2_BASE_PADDR
+ *	ldr	r1, =PG_LOCKED_PBASE
+ *	ldr	r2, =CONFIG_PAGING_NLOCKED
+ *      ldr	r3, =MMUFLAGS
  *	pg_map r0, r1, r2, r3, r4
  *
  * Inputs:
+ *   l2 - Physical start address in the L2 page table (modified)
  *   paddr - The physical address of the start of the region to span. Must
  *            be aligned to 1Mb section boundaries (modified)
  *   npages - Number of pages to write in the section (modified)
  *   mmuflags - L2 MMU FLAGS
  *
- * Scratch registers (modified): tmp1, tmp2
- *   tmp1 - Physical address in the L2 page table.
- *   tmp2 - scratch
+ * Scratch registers (modified): tmp
+ *   l2  - Physical address in the L2 page table.
+ *   tmp - scratch
  *
  * Assumptions:
  * - The MMU is not yet enabled
@@ -123,31 +129,25 @@
  ****************************************************************************/
 
 #ifdef CONFIG_PAGING
-	.macro	pg_map, paddr, npages, mmuflags, tmp1, tmp2
-
-	/* tmp1 = Physical address of the start of the L2 page table
-	 * tmp2 = MMU flags
-	 */
-
-	ldr	\tmp1, =PG_L2_BASE_PADDR
+	.macro	pg_map, paddr, npages, mmuflags, l2, tmp
 	b	2f
 1:
-	/* Write the one L2 entries.  First,  get tmp2 = (paddr | mmuflags),
+	/* Write the one L2 entries.  First,  get tmp = (paddr | mmuflags),
 	 * the value to write into the L2 PTE
 	 */
 
-	orr	\tmp2, \paddr, \mmuflags
+	orr	\tmp, \paddr, \mmuflags
 
 	/* Write value into table at the current table address */
 
-	str	\tmp2, [\tmp1], #4
+	str	\tmp, [\l2], #4
 
 	/* Update the physical addresses that will correspond to the next
 	 * table entry.
 	 */
 
 	add	\paddr, \paddr, #CONFIG_PAGING_PAGESIZE
-	add	\tmp1, \tmp1, #4
+	add	\l2, \l2, #4
 
 	/* Decrement the number of pages written */
 
@@ -169,23 +169,25 @@
  *   macro is used when CONFIG_PAGING is enable.  This case, it is used as
  *   follows:
  *
- *	ldr	r0, =PG_LOCKED_PBASE
- *	ldr	r1, =(CONFIG_PAGING_NLOCKED+CONFIG_PAGING_NPAGES)
- *      ldr	r2, =MMU_FLAGS
+ *	ldr	r0, =PG_L2_BASE_PADDR
+ *	ldr	r1, =PG_LOCKED_PBASE
+ *	ldr	r2, =(CONFIG_PAGING_NLOCKED+CONFIG_PAGING_NPAGES)
+ *      ldr	r3, =MMU_FLAGS
  *	pg_span r0, r1, r2, r3, r4
  *
  * Inputs (unmodified unless noted):
+ *   l2 - Physical start address in the L2 page table (modified)
  *   addr - The virtual address of the start of the region to span. Must
  *     be aligned to 1Mb section boundaries (modified)
  *   npages - Number of pages to required to span that memory region (modified)
  *   mmuflags - L1 MMU flags to use
  *
  * Scratch registers (modified):
- *   addr, npages, tmp1, tmp2
- *   addr   - Physical address in the L1 page table.
+ *   addr, npages, tmp
+ *   l2  - L2 page table physical address
+ *   addr - Physical address in the L1 page table.
  *   npages - The number of pages remaining to be accounted for
- *   tmp1   - L2 page table physical address
- *   tmp2   - scratch
+ *   tmp - scratch
  *
  * Return:
  *   Nothing of interest.
@@ -197,36 +199,32 @@
  ****************************************************************************/
 
 #ifdef CONFIG_PAGING
-	.macro	pg_span, addr, npages, mmuflags, tmp1, tmp2
-
-	/* tmp1 = Physical address of the start of the L2 page table */
-
-	ldr	\tmp1, =PG_L2_BASE_PADDR
+	.macro	pg_span, l2, addr, npages, mmuflags, tmp
 
 	/* Get addr = the L1 page table address coresponding to the virtual
 	 * address of the start of memory region to be mapped.
 	 */
 
-   	ldr	\tmp2, =PGTABLE_BASE_PADDR
+   	ldr	\tmp, =PGTABLE_BASE_PADDR
 	lsr	\addr, \addr, #20
-	add	\addr, \tmp2, \addr, lsl #2
+	add	\addr, \tmp, \addr, lsl #2
 	b	2f
 1:
 	/* Write the L1 table entry that refers to this (unmapped) coarse page
 	 * table.
 	 *
-	 * tmp2 = (paddr | mmuflags), the value to write into the page table
+	 * tmp = (paddr | mmuflags), the value to write into the page table
 	 */
 
-	orr	\tmp2, \tmp1, \mmuflags
+	orr	\tmp, \l2, \mmuflags
 
 	/* Write the value into the L1 table at the correct offset. */
 	
-	str	\tmp2, [\addr], #4
+	str	\tmp, [\addr], #4
 
 	/* Update the L2 page table address for the next L1 table entry. */
 
-	add	\tmp1, \tmp1, #PT_SIZE  /* Next L2 page table start paddr */
+	add	\l2, \l2, #PT_SIZE  /* Next L2 page table start paddr */
 
 	/* Update the number of pages that we have account for (with
 	 * non-mappings
diff --git a/nuttx/arch/arm/src/arm/up_head.S b/nuttx/arch/arm/src/arm/up_head.S
index d5a44f5bf..9f7c47d22 100644
--- a/nuttx/arch/arm/src/arm/up_head.S
+++ b/nuttx/arch/arm/src/arm/up_head.S
@@ -182,16 +182,14 @@ __start:
 #ifdef CONFIG_PAGING
 	/* Populate the L1 table for the locked and paged text regions */
 
- 	ldr	r0, =PG_LOCKED_PBASE
- 	ldr	r1, =PG_TEXT_NPAGES
-	ldr	r2, =MMU_L1_TEXTFLAGS
+	adr	r0, .Ltxtspan
+	ldmia	r0, {r0, r1, r2, r3}
  	pg_span r0, r1, r2, r3, r4
 
 	/* Populate the L2 table for the locked text region only */
 
- 	ldr	r0, =PG_LOCKED_PBASE
- 	ldr	r1, =CONFIG_PAGING_NLOCKED
-	ldr	r2, =MMU_L2_TEXTFLAGS
+	adr	r0, .Ltxtmap
+	ldmia	r0, {r0, r1, r2, r3}
  	pg_map r0, r1, r2, r3, r4
  #else
 	/* Create a virtual single section mapping for the first MB of the .text
@@ -355,20 +353,18 @@ __start:
 #if defined(CONFIG_PAGING)
 	/* Populate the L1 table for the data regions */
 
- 	ldr	r0, =PG_PAGED_PBASE
- 	ldr	r1, =PG_DATA_NPAGED
-	ldr	r2, =MMU_L1_DATAFLAGS
+	adr	r0, .Ldatamap
+	ldmia	r0, {r0, r1, r2, r3}
  	pg_span r0, r1, r2, r3, r4
 
 	/* Populate the L2 table for the data region */
 
- 	ldr	r0, =PG_PAGED_PBASE
- 	ldr	r1, =PG_DATA_NPAGED
-	ldr	r2, =MMU_L2_DATAFLAGS
- 	pg_map r0, r1, r2, r3, r4
+	adr	r0, .Ldatamap
+	ldmia	r0, {r0, r1, r2, r3, r4}
+ 	pg_map r0, r1, r2, r4, r3
 
 #elif defined(CONFIG_BOOT_RUNFROMFLASH)
-# error "Logic not implemented"
+#  error "Logic not implemented"
 #else
 	/* Now setup the pagetables for our normal SDRAM mappings mapped region.
 	 * We round NUTTX_START_VADDR down to the nearest megabyte boundary.
@@ -440,7 +436,7 @@ __start:
 	mov	lr, #0
 	b	os_start
 
-	/* Variables:
+	/* Text-section constants:
 	 *
 	 *   _sbss is the start of the BSS region (see ld.script)
 	 *   _ebss is the end of the BSS regsion (see ld.script)
@@ -454,8 +450,31 @@ __start:
 	.long	_sbss
 	.long	_ebss
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
+
+#ifdef CONFIG_PAGING
+.Ltxtspan:
+	.long	PG_L2_BASE_PADDR
+	.long	PG_LOCKED_PBASE
+	.long	PG_TEXT_NPAGES
+	.long	MMU_L1_TEXTFLAGS
+
+.Ltxtmap:
+	.long	PG_L2_BASE_PADDR
+	.long	PG_LOCKED_PBASE
+	.long	CONFIG_PAGING_NLOCKED
+	.long	MMU_L2_TEXTFLAGS
+
+.Ldatamap:
+	.long	PG_L2_DATA_PADDR
+	.long	PG_DATA_PBASE
+	.long	PG_DATA_NPAGED
+	.long	MMU_L1_DATAFLAGS
+	.long	MMU_L2_DATAFLAGS
+ #endif
 	.size	.Lvstart, .-.Lvstart
 
+	 /* Data section variables */
+
 	/* This global variable is unsigned long g_heapbase and is
 	 * exported from here only because of its coupling to .Linitparms
 	 * above.
diff --git a/nuttx/include/nuttx/page.h b/nuttx/include/nuttx/page.h
index 3da4b6fb5..9ae2dd5a0 100755
--- a/nuttx/include/nuttx/page.h
+++ b/nuttx/include/nuttx/page.h
@@ -117,11 +117,15 @@
 #define PG_PAGED_PEND              (PG_PAGED_PBASE + PG_PAGED_SIZE)
 #define PG_PAGED_VEND              (PG_PAGED_VBASE + PG_PAGED_SIZE)
 
+/* Size of the overall text section */
+
+#define PG_TEXT_NPAGES             (CONFIG_PAGING_NLOCKED + CONFIG_PAGING_NPAGED)
+#define PG_TEXT_SIZE               (PG_TEXT_NPAGES << PAGESHIFT)
+
 /* CONFIG_PAGING_NDATA - This is the number of data pages in the memory
  * map.  The size of data address region will then be:
  */
 
-#define PG_TEXT_NPAGES             (CONFIG_PAGING_NLOCKED + CONFIG_PAGING_NPAGED)
 #define PG_RAM_PAGES               (CONFIG_DRAM_SIZE >> PAGESHIFT)
 #if PG_RAM_PAGES <= PG_TEXT_NPAGES
 #  error "Not enough memory for this page layout"