mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 20:51:52 +01:00
Fix a conversion warning in the mingw32 build
gcc diagnoses this: warning: converting to non-pointer type 'unsigned int' from NULL Also remove an empty statement. No change in functionality. llvm-svn: 192955
This commit is contained in:
parent
4e8af73f01
commit
5f858a6e6b
@ -82,7 +82,7 @@ MemoryBlock Memory::allocateMappedMemory(size_t NumBytes,
|
|||||||
|
|
||||||
uintptr_t Start = NearBlock ? reinterpret_cast<uintptr_t>(NearBlock->base()) +
|
uintptr_t Start = NearBlock ? reinterpret_cast<uintptr_t>(NearBlock->base()) +
|
||||||
NearBlock->size()
|
NearBlock->size()
|
||||||
: NULL;
|
: 0;
|
||||||
|
|
||||||
// If the requested address is not aligned to the allocation granularity,
|
// If the requested address is not aligned to the allocation granularity,
|
||||||
// round up to get beyond NearBlock. VirtualAlloc would have rounded down.
|
// round up to get beyond NearBlock. VirtualAlloc would have rounded down.
|
||||||
@ -106,7 +106,7 @@ MemoryBlock Memory::allocateMappedMemory(size_t NumBytes,
|
|||||||
MemoryBlock Result;
|
MemoryBlock Result;
|
||||||
Result.Address = PA;
|
Result.Address = PA;
|
||||||
Result.Size = NumBlocks*Granularity;
|
Result.Size = NumBlocks*Granularity;
|
||||||
;
|
|
||||||
if (Flags & MF_EXEC)
|
if (Flags & MF_EXEC)
|
||||||
Memory::InvalidateInstructionCache(Result.Address, Result.Size);
|
Memory::InvalidateInstructionCache(Result.Address, Result.Size);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user