文字列用メモリプール追加。
branches/try-vfunc/unittest/LibcImpl.h (diff)
branches/try-vfunc/unittest/LibcImpl.c (diff)| @@ -41,11 +41,17 @@ | ||
| 41 | 41 | # include <stdlib.h> |
| 42 | 42 | # define MALLOC malloc |
| 43 | 43 | # define FREE free |
| 44 | +# define STR_MALLOC malloc | |
| 45 | +# define STR_FREE free | |
| 44 | 46 | #else |
| 45 | 47 | # define MALLOC LibcImpl_malloc |
| 46 | 48 | # define FREE LibcImpl_free |
| 49 | +# define STR_MALLOC LibcImpl_str_malloc | |
| 50 | +# define STR_FREE LibcImpl_str_free | |
| 47 | 51 | void *LibcImpl_malloc(size_t size); |
| 48 | 52 | void LibcImpl_free(void *ptr); |
| 53 | +char *LibcImpl_str_malloc(size_t size); | |
| 54 | +void LibcImpl_str_free(char *ptr); | |
| 49 | 55 | #endif |
| 50 | 56 | |
| 51 | 57 |
| @@ -251,6 +251,28 @@ | ||
| 251 | 251 | if (!ptr) return; |
| 252 | 252 | ((TestAssertionBlock *) ptr)->used_flag = 0; |
| 253 | 253 | } |
| 254 | + | |
| 255 | +#define STR_POOL_SIZE 4096 | |
| 256 | +static char str_pool[STR_POOL_SIZE]; | |
| 257 | +static const char *str_pool_end_ptr = &str_pool[STR_POOL_SIZE]; | |
| 258 | +static char *str_pool_next_ptr = str_pool; | |
| 259 | + | |
| 260 | +char *LibcImpl_str_malloc(size_t size) | |
| 261 | +{ | |
| 262 | + char *p = str_pool_next_ptr; | |
| 263 | + if (str_pool_next_ptr + size > str_pool_end_ptr) { | |
| 264 | + return 0; | |
| 265 | + } | |
| 266 | + str_pool_next_ptr += size; | |
| 267 | + return p; | |
| 268 | +} | |
| 269 | + | |
| 270 | +void LibcImpl_str_free(char *ptr) | |
| 271 | +{ | |
| 272 | + (void) ptr; | |
| 273 | + str_pool_next_ptr = str_pool; | |
| 274 | +} | |
| 275 | + | |
| 254 | 276 | #endif |
| 255 | 277 | |
| 256 | 278 |
