Slight changes/bug fixes
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2525 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -30,8 +30,8 @@ unsigned long areaManager::getNextAddress(int pages, unsigned long start) {
|
|||||||
// error ("Looking for %x, %d pages; current = %x\n",start,pages,myArea->getEndAddress());
|
// error ("Looking for %x, %d pages; current = %x\n",start,pages,myArea->getEndAddress());
|
||||||
if (!myArea->couldAdd(start,end))
|
if (!myArea->couldAdd(start,end))
|
||||||
{ // if we don't work, there must be an overlap, so go to the end of this area.
|
{ // if we don't work, there must be an overlap, so go to the end of this area.
|
||||||
start=myArea->getEndAddress();
|
start=myArea->getEndAddress()+1; // Since the end address == last byte in the area...
|
||||||
end=start+(pages*PAGE_SIZE)-1;
|
end=start+(pages*PAGE_SIZE)-1; // See above...
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ char vpage::getByte(unsigned long address,areaManager *manager) {
|
|||||||
if (!physPage)
|
if (!physPage)
|
||||||
if (!manager->fault((void *)(address),false))
|
if (!manager->fault((void *)(address),false))
|
||||||
throw ("vpage::getByte");
|
throw ("vpage::getByte");
|
||||||
error ("vpage::getByte: About to return %c from %x\n", *((char *)(address-start_address+physPage->getAddress())),(address-start_address+physPage->getAddress()));
|
// error ("vpage::getByte: About to return %c from %x\n", *((char *)(address-start_address+physPage->getAddress())),(address-start_address+physPage->getAddress()));
|
||||||
return *((char *)(address-start_address+physPage->getAddress()));
|
return *((char *)(address-start_address+physPage->getAddress()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user