diff options
-rw-r--r-- | firmware/test/memory/config.h | 1 | ||||
-rw-r--r-- | firmware/test/memory/defines.h | 1 | ||||
-rw-r--r-- | firmware/test/memory/test.y | 16 |
3 files changed, 7 insertions, 11 deletions
diff --git a/firmware/test/memory/config.h b/firmware/test/memory/config.h index aba52b5599..9775fd4893 100644 --- a/firmware/test/memory/config.h +++ b/firmware/test/memory/config.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | ||
10 | * Copyright (C) 2002 by Alan Korr | 9 | * Copyright (C) 2002 by Alan Korr |
11 | * | 10 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 11 | * All files in this archive are subject to the GNU General Public License. |
diff --git a/firmware/test/memory/defines.h b/firmware/test/memory/defines.h index 804731cea3..4e01515831 100644 --- a/firmware/test/memory/defines.h +++ b/firmware/test/memory/defines.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | ||
10 | * Copyright (C) 2002 by Alan Korr | 9 | * Copyright (C) 2002 by Alan Korr |
11 | * | 10 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 11 | * All files in this archive are subject to the GNU General Public License. |
diff --git a/firmware/test/memory/test.y b/firmware/test/memory/test.y index 481339b31b..b3b39acc26 100644 --- a/firmware/test/memory/test.y +++ b/firmware/test/memory/test.y | |||
@@ -1,5 +1,6 @@ | |||
1 | %{ | 1 | %{ |
2 | #include "memory.h" | 2 | #include "memory.h" |
3 | #include "memory-page.h" | ||
3 | #include <stdlib.h> | 4 | #include <stdlib.h> |
4 | #include <stdio.h> | 5 | #include <stdio.h> |
5 | #include <string.h> | 6 | #include <string.h> |
@@ -63,7 +64,7 @@ spy | |||
63 | 64 | ||
64 | check | 65 | check |
65 | : CHECK expression | 66 | : CHECK expression |
66 | { memory_check (yylval); } | 67 | { __memory_check (yylval); } |
67 | ; | 68 | ; |
68 | 69 | ||
69 | expression | 70 | expression |
@@ -112,21 +113,19 @@ void prompt (void) | |||
112 | 113 | ||
113 | void allocate (int order) | 114 | void allocate (int order) |
114 | { | 115 | { |
115 | extern char free_page[0]; | ||
116 | void *address; | 116 | void *address; |
117 | printf("\nallocating a page of %d bytes...",512<<order); | 117 | printf("\nallocating a page of %d bytes...",512<<order); |
118 | if ((unsigned)order > 21) | 118 | if ((unsigned)order > 21) |
119 | printf (" bad order !"); | 119 | printf (" bad order !"); |
120 | else if ((address = memory_allocate_page (order))) | 120 | else if ((address = memory_allocate_page (order))) |
121 | printf (" page #%d allocated !",((char *)address - free_page) >> 9); | 121 | printf (" page #%d allocated !",((char *)address - (char *)__memory_free_page) >> 9); |
122 | else | 122 | else |
123 | printf (" cannot allocate a page !"); | 123 | printf (" cannot allocate a page !"); |
124 | } | 124 | } |
125 | 125 | ||
126 | void release (int page) | 126 | void release (int page) |
127 | { | 127 | { |
128 | extern char free_page[0]; | 128 | void *address = (void *)((char *)__memory_free_page + (page << 9)); |
129 | void *address = (void *)(free_page + (page << 9)); | ||
130 | printf("\nreleasing page #%d...",page); | 129 | printf("\nreleasing page #%d...",page); |
131 | if ((unsigned)page >= (2*1024*1024/512)) | 130 | if ((unsigned)page >= (2*1024*1024/512)) |
132 | printf (" bad page number !"); | 131 | printf (" bad page number !"); |
@@ -138,13 +137,12 @@ void release (int page) | |||
138 | 137 | ||
139 | void spy (int page) | 138 | void spy (int page) |
140 | { | 139 | { |
141 | extern char free_page[0]; | 140 | void *address = (void *)((char *)__memory_free_page + (page << 9)); |
142 | void *address = (void *)(free_page + (page << 9)); | ||
143 | printf("\nspying page #%d...",page); | 141 | printf("\nspying page #%d...",page); |
144 | if ((unsigned)page >= (2*1024*1024/512)) | 142 | if ((unsigned)page >= (2*1024*1024/512)) |
145 | printf (" bad page number !"); | 143 | printf (" bad page number !"); |
146 | else | 144 | else |
147 | memory_spy_page (address); | 145 | __memory_spy_page (address); |
148 | } | 146 | } |
149 | 147 | ||
150 | void dump (void) | 148 | void dump (void) |
@@ -152,7 +150,7 @@ void dump (void) | |||
152 | int order; | 150 | int order; |
153 | printf("\ndumping free pages list..."); | 151 | printf("\ndumping free pages list..."); |
154 | for (order = 0; order < 13; ++order) | 152 | for (order = 0; order < 13; ++order) |
155 | memory_dump (order); | 153 | __memory_dump (order); |
156 | } | 154 | } |
157 | 155 | ||
158 | int main () | 156 | int main () |