i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The heap size is now part of the stage2_args.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4962 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-10-07 22:41:44 +00:00
parent 662cc71f2c
commit bc09bddb53
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/platform/openfirmware/heap.cpp
+7 -16
View File
@@ -18,15 +18,6 @@
#endif #endif
#define HEAP_SIZE 32768
struct of_address {
void *base;
int size;
};
status_t status_t
platform_init_heap(stage2_args *args, void **_base, void **_top) platform_init_heap(stage2_args *args, void **_base, void **_top)
{ {
@@ -37,15 +28,15 @@ platform_init_heap(stage2_args *args, void **_base, void **_top)
return B_ERROR; return B_ERROR;
printf("memory = %d\n", memory); printf("memory = %d\n", memory);
struct of_address available; struct of_region available;
int memPackage = of_instance_to_package(memory); int memPackage = of_instance_to_package(memory);
printf("memPackage = %d\n", memPackage); printf("memPackage = %d\n", memPackage);
of_getprop(memPackage, "available", &available, sizeof(struct of_address)); of_getprop(memPackage, "available", &available, sizeof(struct of_region));
printf("available: base = %p, size = %d\n", available.base, available.size); printf("available: base = %p, size = %ld\n", available.base, available.size);
*_base = of_claim(available.base, HEAP_SIZE); *_base = of_claim(available.base, args->heap_size, 64);
printf("heap base = %p\n", *_base); printf("heap base = %p\n", *_base);
*_top = (void *)((int8 *)*_base + HEAP_SIZE); *_top = (void *)((int8 *)*_base + args->heap_size);
printf("heap top = %p\n", *_top); printf("heap top = %p\n", *_top);
return B_OK; return B_OK;
@@ -53,9 +44,9 @@ platform_init_heap(stage2_args *args, void **_base, void **_top)
void void
platform_release_heap(void *base) platform_release_heap(stage2_args *args, void *base)
{ {
if (base != NULL) if (base != NULL)
of_release(base, HEAP_SIZE); of_release(base, args->heap_size);
} }