3325
|
1 |
--- webkit-1.2.7/JavaScriptCore/interpreter/RegisterFile.cpp Fri Sep 10 15:20:23 2010
|
|
2 |
+++ webkit-1.2.7-patch/JavaScriptCore/interpreter/RegisterFile.cpp Sat Mar 19 22:58:16 2011
|
|
3 |
@@ -36,7 +36,7 @@
|
2315
|
4 |
RegisterFile::~RegisterFile()
|
|
5 |
{
|
|
6 |
#if HAVE(MMAP)
|
|
7 |
- munmap(m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
|
|
8 |
+ munmap((caddr_t)m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
|
|
9 |
#elif HAVE(VIRTUALALLOC)
|
|
10 |
#if OS(WINCE)
|
|
11 |
VirtualFree(m_buffer, DWORD(m_commitEnd) - DWORD(m_buffer), MEM_DECOMMIT);
|
3325
|
12 |
--- webkit-1.2.7/JavaScriptCore/interpreter/RegisterFile.h Fri Sep 10 15:20:23 2010
|
|
13 |
+++ webkit-1.2.7-patch/JavaScriptCore/interpreter/RegisterFile.h Sat Mar 19 22:58:16 2011
|
|
14 |
@@ -175,7 +175,7 @@
|
2315
|
15 |
|
|
16 |
size_t bufferLength = (capacity + maxGlobals) * sizeof(Register);
|
|
17 |
#if HAVE(MMAP)
|
|
18 |
- m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, VM_TAG_FOR_REGISTERFILE_MEMORY, 0));
|
|
19 |
+ m_buffer = reinterpret_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, VM_TAG_FOR_REGISTERFILE_MEMORY, 0));
|
|
20 |
if (m_buffer == MAP_FAILED) {
|
|
21 |
#if OS(WINCE)
|
|
22 |
fprintf(stderr, "Could not allocate register file: %d\n", GetLastError());
|
3325
|
23 |
--- webkit-1.2.7/JavaScriptCore/runtime/MarkStackPosix.cpp Fri Mar 19 16:20:53 2010
|
|
24 |
+++ webkit-1.2.7-patch/JavaScriptCore/runtime/MarkStackPosix.cpp Sat Mar 19 22:58:16 2011
|
2663
|
25 |
@@ -44,7 +44,7 @@
|
2315
|
26 |
}
|
|
27 |
void MarkStack::releaseStack(void* addr, size_t size)
|
|
28 |
{
|
|
29 |
- munmap(addr, size);
|
|
30 |
+ munmap((caddr_t)addr, size);
|
|
31 |
}
|
|
32 |
|
|
33 |
}
|
3325
|
34 |
--- webkit-1.2.7/JavaScriptCore/wtf/TCSystemAlloc.cpp Fri Sep 10 15:20:23 2010
|
|
35 |
+++ webkit-1.2.7-patch/JavaScriptCore/wtf/TCSystemAlloc.cpp Sat Mar 19 22:58:16 2011
|
2663
|
36 |
@@ -194,10 +194,10 @@
|
2315
|
37 |
|
|
38 |
// Return the unused memory to the system
|
|
39 |
if (adjust > 0) {
|
|
40 |
- munmap(reinterpret_cast<void*>(ptr), adjust);
|
|
41 |
+ munmap(reinterpret_cast<caddr_t>(ptr), adjust);
|
|
42 |
}
|
|
43 |
if (adjust < extra) {
|
|
44 |
- munmap(reinterpret_cast<void*>(ptr + adjust + size), extra - adjust);
|
|
45 |
+ munmap(reinterpret_cast<caddr_t>(ptr + adjust + size), extra - adjust);
|
|
46 |
}
|
|
47 |
|
|
48 |
ptr += adjust;
|
2663
|
49 |
@@ -443,7 +443,7 @@
|
2315
|
50 |
|
|
51 |
void TCMalloc_SystemRelease(void* start, size_t length)
|
|
52 |
{
|
|
53 |
- void* newAddress = mmap(start, length, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
|
|
54 |
+ void* newAddress = mmap((caddr_t)start, length, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
|
|
55 |
// If the mmap failed then that's ok, we just won't return the memory to the system.
|
|
56 |
ASSERT_UNUSED(newAddress, newAddress == start || newAddress == reinterpret_cast<void*>(MAP_FAILED));
|
|
57 |
}
|