Revision: 5085
Author: [email protected]
Date: Fri Jul 16 01:56:05 2010
Log: [isolates] Merge 5083:5084 into isolates branch. Fix compiler errors
on x64.
Review URL: http://codereview.chromium.org/2878034
http://code.google.com/p/v8/source/detail?r=5085
Modified:
/branches/experimental/isolates/src/profile-generator.cc
/branches/experimental/isolates/src/x64/codegen-x64.cc
=======================================
--- /branches/experimental/isolates/src/profile-generator.cc Thu Jul 15
20:09:25 2010
+++ /branches/experimental/isolates/src/profile-generator.cc Fri Jul 16
01:56:05 2010
@@ -1559,7 +1559,8 @@
uint64_t HeapObjectsMap::FindEntry(Address addr) {
HashMap::Entry* entry = entries_map_.Lookup(addr, AddressHash(addr),
false);
if (entry != NULL) {
- int entry_index = reinterpret_cast<intptr_t>(entry->value);
+ int entry_index =
+ static_cast<int>(reinterpret_cast<intptr_t>(entry->value));
EntryInfo& entry_info = entries_->at(entry_index);
entry_info.accessed = true;
return entry_info.id;
@@ -1574,7 +1575,8 @@
for (HashMap::Entry* entry = entries_map_.Start();
entry != NULL;
entry = entries_map_.Next(entry)) {
- int entry_index = reinterpret_cast<intptr_t>(entry->value);
+ int entry_index =
+ static_cast<int>(reinterpret_cast<intptr_t>(entry->value));
EntryInfo& entry_info = entries_->at(entry_index);
if (entry_info.accessed) {
entry->value = reinterpret_cast<void*>(new_entries->length());
=======================================
--- /branches/experimental/isolates/src/x64/codegen-x64.cc Thu Jul 15
20:09:25 2010
+++ /branches/experimental/isolates/src/x64/codegen-x64.cc Fri Jul 16
01:56:05 2010
@@ -438,7 +438,7 @@
default:
UNREACHABLE();
- return Operand(rax, 0);
+ return Operand(rsp, 0);
}
}
@@ -11537,7 +11537,7 @@
// Make count the number of bytes to copy.
if (!ascii) {
- ASSERT_EQ(2, sizeof(uc16)); // NOLINT
+ ASSERT_EQ(2, static_cast<int>(sizeof(uc16))); // NOLINT
__ addl(count, count);
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
