diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-31 02:21:12 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-31 02:21:12 +0000 |
commit | a66cf9d6e86bc95a25e21e746000e602e6f1ecbc (patch) | |
tree | 21c35973ac5cd59ec676a68423140c3a42ce4231 /nuttx/configs/ea3131 | |
parent | e3dbd274922d727842086ad42df644308dfc668d (diff) | |
download | px4-nuttx-a66cf9d6e86bc95a25e21e746000e602e6f1ecbc.tar.gz px4-nuttx-a66cf9d6e86bc95a25e21e746000e602e6f1ecbc.tar.bz2 px4-nuttx-a66cf9d6e86bc95a25e21e746000e602e6f1ecbc.zip |
Add paging debug instrumentation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2899 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/ea3131')
-rwxr-xr-x | nuttx/configs/ea3131/pgnsh/defconfig | 5 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/pgnsh/ld.script | 50 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/src/up_fillpage.c | 2 |
3 files changed, 37 insertions, 20 deletions
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index 58480f875..8f5082eea 100755 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -301,6 +301,7 @@ CONFIG_APP_DIR=examples/nsh CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n +CONFIG_DEBUG_PAGING=n CONFIG_MM_REGIONS=1 CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=200 @@ -407,12 +408,12 @@ CONFIG_SIG_SIGWORK=4 # CONFIG_PAGING=y CONFIG_PAGING_PAGESIZE=1024 -CONFIG_PAGING_NLOCKED=36 +CONFIG_PAGING_NLOCKED=48 #CONFIG_PAGING_LOCKED_PBASE #CONFIG_PAGING_LOCKED_VBASE CONFIG_PAGING_NPPAGED=96 CONFIG_PAGING_NVPAGED=384 -CONFIG_PAGING_NDATA=44 +CONFIG_PAGING_NDATA=32 #CONFIG_PAGING_DEFPRIO CONFIG_PAGING_STACKSIZE=2048 CONFIG_PAGING_BLOCKINGFILL=y diff --git a/nuttx/configs/ea3131/pgnsh/ld.script b/nuttx/configs/ea3131/pgnsh/ld.script index ba5030bdd..eb77ecaff 100755 --- a/nuttx/configs/ea3131/pgnsh/ld.script +++ b/nuttx/configs/ea3131/pgnsh/ld.script @@ -42,20 +42,35 @@ * address space: 0x1102 8000. The virtual space is broken up into three * regions: * - * locked - Pages locked in memory. Start: 0x1102 8000 Size: 36Kb - * paged - Pages in nonvolatile store. Start: 0x1103 1000 Size: 384Kb - * data - .data/.bss/heap. Start: 0x1109 1000 Size: 44Kb + * PHYSICAL VIRTUAL + * NAME DESCRIPTION SIZE START SIZE START + * -------- -------------------------- ----- ----------- ------- ----------- + * locked Pages locked in memory. 48Kb 0x1102 8000 48Kb 0x1102 8000 + * paged Pages in nonvolatile store. 96Kb 0x1103 4000 384Kb 0x1103 4000 + * data .data/.bss/heap. 32Kb 0x1104 c000 32Kb 0x1109 4000 + * Reserved for page table 16Kb 0x1105 4000 16Kb 0x1109 c000 + * -------- -------------------------- ----- ----------- ------- ----------- + * 192Kb 0x1105 8000 480Kb 0x110a 0000 * * These region sizes must match the size in pages specified for each region * in the NuttX configuration file: CONFIG_PAGING_NLOCKED, CONFIG_PAGING_NVPAGED, * and CONFIG_PAGING_NDATA. + * + * NOTE 1: The locked region is really big here so that you can enable lots of + * debug output without overflowing the locked region. 32Kb would probably be + * plenty if this were a real, optimized application. + * + * NOTE 2: Different compilers will compile the code to different sizes. If you + * get a link time error saying that the locked region is full, you may have to + * re-organize this memory layout (here and in defconfig) to make the locked + * region even bigger. */ MEMORY { - locked (rx) : ORIGIN = 0x11029080, LENGTH = 36K - 4224 - paged (rx) : ORIGIN = 0x11031000, LENGTH = 384K - data (rw) : ORIGIN = 0x11091000, LENGTH = 44K + locked (rx) : ORIGIN = 0x11029080, LENGTH = 48K - 4224 + paged (rx) : ORIGIN = 0x11034000, LENGTH = 384K + data (rw) : ORIGIN = 0x11094000, LENGTH = 44K } OUTPUT_ARCH(arm) @@ -65,18 +80,19 @@ SECTIONS .locked : { _slocked = ABSOLUTE(.); *(.vectors) - locked.r (.text .text.*) - locked.r (.fixup) - locked.r (.gnu.warning) - locked.r (.rodata .rodata.*) - locked.r (.gnu.linkonce.t.*) - locked.r (.glue_7) - locked.r (.glue_7t) - locked.r (.got) - locked.r (.gcc_except_table) - locked.r (.gnu.linkonce.r.*) + up_head.o locked.r (.text .text.*) + up_head.o locked.r (.fixup) + up_head.o locked.r (.gnu.warning) + up_head.o locked.r (.rodata .rodata.*) + up_head.o locked.r (.gnu.linkonce.t.*) + up_head.o locked.r (.glue_7) + up_head.o locked.r (.glue_7t) + up_head.o locked.r (.got) + up_head.o locked.r (.gcc_except_table) + up_head.o locked.r (.gnu.linkonce.r.*) _elocked = ABSOLUTE(.); } >locked + _eronly = ABSOLUTE(.); .paged : { @@ -94,8 +110,6 @@ SECTIONS _epaged = ABSOLUTE(.); } > paged - _eronly = ABSOLUTE(.); - .data : { _sdata = ABSOLUTE(.); *(.data .data.*) diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c index be355fffe..b9a97f684 100755 --- a/nuttx/configs/ea3131/src/up_fillpage.c +++ b/nuttx/configs/ea3131/src/up_fillpage.c @@ -112,12 +112,14 @@ #ifdef CONFIG_PAGING_BLOCKINGFILL int up_fillpage(FAR _TCB *tcb, FAR void *vpage) { + pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); # warning "Not implemented" return -ENOSYS; } #else int up_fillpage(FAR _TCB *tcb, FAR void *vpage, up_pgcallback_t pg_callback) { + pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); # warning "Not implemented" return -ENOSYS; } |