git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/libposix - Basic stat() emulation
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
include
/
tpl_mm_phys_bitmap.h
diff --git
a/KernelLand/Kernel/include/tpl_mm_phys_bitmap.h
b/KernelLand/Kernel/include/tpl_mm_phys_bitmap.h
index
005a2f8
..
424a3ea
100644
(file)
--- a/
KernelLand/Kernel/include/tpl_mm_phys_bitmap.h
+++ b/
KernelLand/Kernel/include/tpl_mm_phys_bitmap.h
@@
-9,6
+9,7
@@
*
* Uses 4.125+PtrSize bytes per page
*/
*
* Uses 4.125+PtrSize bytes per page
*/
+#include <debug_hooks.h>
#define MM_PAGE_REFCOUNTS MM_PMM_BASE
#define MM_PAGE_NODES (MM_PMM_BASE+(MM_MAXPHYSPAGE*sizeof(Uint32)))
#define MM_PAGE_REFCOUNTS MM_PMM_BASE
#define MM_PAGE_NODES (MM_PMM_BASE+(MM_MAXPHYSPAGE*sizeof(Uint32)))
@@
-27,7
+28,6
@@
int MM_int_GetRangeID( tPAddr Addr );
int MM_int_GetMapEntry( void *Data, int Index, tPAddr *Start, tPAddr *Length );
void MM_Tpl_InitPhys(int MaxRAMPage, void *MemoryMap);
int MM_int_GetRangeID( tPAddr Addr );
int MM_int_GetMapEntry( void *Data, int Index, tPAddr *Start, tPAddr *Length );
void MM_Tpl_InitPhys(int MaxRAMPage, void *MemoryMap);
-void MM_DumpStatistics(void);
// === GLOBALS ===
tMutex glPhysicalPages;
// === GLOBALS ===
tMutex glPhysicalPages;
@@
-84,7
+84,7
@@
void MM_Tpl_InitPhys(int MaxRAMPage, void *MemoryMap)
// Only need to allocate bitmaps
if( !MM_GetPhysAddr( (void*)bitmap_page ) ) {
// Only need to allocate bitmaps
if( !MM_GetPhysAddr( (void*)bitmap_page ) ) {
- if( !MM_Allocate( bitmap_page ) ) {
+ if( !MM_Allocate(
(void*)
bitmap_page ) ) {
Log_KernelPanic("PMM", "Out of memory during init, this is bad");
return ;
}
Log_KernelPanic("PMM", "Out of memory during init, this is bad");
return ;
}
@@
-326,7
+326,7
@@
void MM_RefPhys(tPAddr PAddr)
if( !MM_GetPhysAddr( (void*)refpage ) )
{
int pages_per_page, basepage, i;
if( !MM_GetPhysAddr( (void*)refpage ) )
{
int pages_per_page, basepage, i;
- if( MM_Allocate(refpage) == 0 ) {
+ if( MM_Allocate(
(void*)
refpage) == 0 ) {
// Out of memory, can this be resolved?
// TODO: Reclaim memory
Log_Error("PMM", "Out of memory (MM_RefPhys)");
// Out of memory, can this be resolved?
// TODO: Reclaim memory
Log_Error("PMM", "Out of memory (MM_RefPhys)");
@@
-354,7
+354,13
@@
int MM_GetRefCount(tPAddr PAddr)
return gaiPageReferences[PAddr];
}
return gaiPageReferences[PAddr];
}
- if( gaPageBitmaps[ PAddr / 32 ] & (1LL << (PAddr&31)) ) {
+ Uint32 *bm = &gaPageBitmaps[ PAddr / 32 ];
+ if( !MM_GetPhysAddr(bm) ) {
+ Log_Error("MMPhys", "MM_GetRefCount: bitmap for ppage 0x%x not mapped %p",
+ PAddr, bm);
+ return 0;
+ }
+ if( (*bm) & (1LL << (PAddr&31)) ) {
return 1;
}
return 1;
}
@@
-416,7
+422,7
@@
int MM_SetPageNode(tPAddr PAddr, void *Node)
if( !MM_GetRefCount(PAddr) ) return 1;
if( !MM_GetPhysAddr( (void*)node_page ) ) {
if( !MM_GetRefCount(PAddr) ) return 1;
if( !MM_GetPhysAddr( (void*)node_page ) ) {
- if( !MM_Allocate(node_page) )
+ if( !MM_Allocate(
(void*)
node_page) )
return -1;
memset( (void*)node_page, 0, PAGE_SIZE );
}
return -1;
memset( (void*)node_page, 0, PAGE_SIZE );
}
UCC
git Repository :: git.ucc.asn.au