Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libmedia: use size_t consistently in rtm_pool.

Browse Source 
* fixed a bad address error on x86_64.
This commit is contained in:
Jerome Duval 2013-12-04 18:38:13 +01:00
parent ab3fd9c828
commit 1fe06744d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kits/media/RealtimeAlloc.cpp
View File

@ -49,10 +49,10 @@ public:
void* AllocatedAddress() const; void* AllocatedAddress() const;
static FreeChunk* SetToAllocated(void* allocated); static FreeChunk* SetToAllocated(void* allocated);
static addr_t NextOffset() { return sizeof(uint32); } static addr_t NextOffset() { return sizeof(size_t); }
private: private:
uint32 fSize; size_t fSize;
FreeChunk* fNext; FreeChunk* fNext;
}; };
@ -198,7 +198,7 @@ FreeChunk::AllocatedAddress() const
FreeChunk* FreeChunk*
FreeChunk::SetToAllocated(void* allocated) FreeChunk::SetToAllocated(void* allocated)
{ {
return (FreeChunk*)((uint8*)allocated - FreeChunk::NextOffset()); return (FreeChunk*)((addr_t)allocated - FreeChunk::NextOffset());
} }
@ -386,7 +386,7 @@ rtm_alloc(rtm_pool* pool, size_t size)
last->SetNext(chunk->Next()); last->SetNext(chunk->Next());
} }
pool->available -= size + sizeof(uint32); pool->available -= size + sizeof(size_t);
TRACE("malloc(%lu) -> %p\n", size, chunk->AllocatedAddress()); TRACE("malloc(%lu) -> %p\n", size, chunk->AllocatedAddress());
return chunk->AllocatedAddress(); return chunk->AllocatedAddress();