Commit de912050 authored by vegorov@chromium.org's avatar vegorov@chromium.org

Add Zhongping Wang <kewpie.w.zp@gmail.com> to AUTHORS

Fix compilation failure on Win x64 builder introduced by r11084

R=jkummerow@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9748004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11090 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 5d6763aa
......@@ -51,3 +51,4 @@ Tobias Burnus <burnus@net-b.de>
Vlad Burlik <vladbph@gmail.com>
Yuqiang Xian <yuqiang.xian@intel.com>
Zaheer Ahmad <zahmad@codeaurora.org>
Zhongping Wang <kewpie.w.zp@gmail.com>
......@@ -2593,11 +2593,12 @@ MaybeObject* LargeObjectSpace::AllocateRaw(int object_size,
// Register all MemoryChunk::kAlignment-aligned chunks covered by
// this large page in the chunk map.
uintptr_t base = reinterpret_cast<uintptr_t>(page)/MemoryChunk::kAlignment;
uintptr_t limit = base + (page->size()-1)/MemoryChunk::kAlignment;
uintptr_t base = reinterpret_cast<uintptr_t>(page) / MemoryChunk::kAlignment;
uintptr_t limit = base + (page->size() - 1) / MemoryChunk::kAlignment;
for (uintptr_t key = base; key <= limit; key++) {
HashMap::Entry* entry = chunk_map_.Lookup(reinterpret_cast<void*>(key),
key, true);
static_cast<uint32_t>(key),
true);
ASSERT(entry != NULL);
entry->value = page;
}
......@@ -2629,7 +2630,8 @@ MaybeObject* LargeObjectSpace::FindObject(Address a) {
LargePage* LargeObjectSpace::FindPage(Address a) {
uintptr_t key = reinterpret_cast<uintptr_t>(a) / MemoryChunk::kAlignment;
HashMap::Entry* e = chunk_map_.Lookup(reinterpret_cast<void*>(key),
key, false);
static_cast<uint32_t>(key),
false);
if (e != NULL) {
ASSERT(e->value != NULL);
LargePage* page = reinterpret_cast<LargePage*>(e->value);
......@@ -2680,7 +2682,8 @@ void LargeObjectSpace::FreeUnmarkedObjects() {
uintptr_t base = reinterpret_cast<uintptr_t>(page)/alignment;
uintptr_t limit = base + (page->size()-1)/alignment;
for (uintptr_t key = base; key <= limit; key++) {
chunk_map_.Remove(reinterpret_cast<void*>(key), key);
chunk_map_.Remove(reinterpret_cast<void*>(key),
static_cast<uint32_t>(key));
}
if (is_pointer_object) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment