Revision: 5939
Author: [email protected]
Date: Tue Dec 7 07:51:33 2010
Log: Merge r5931 and r5938 to trunk to fix compilation/linking
issues on ARM.
Review URL: http://codereview.chromium.org/5563010
http://code.google.com/p/v8/source/detail?r=5939
Modified:
/trunk/src/arm/deoptimizer-arm.cc
/trunk/src/version.cc
/trunk/tools/gyp/v8.gyp
=======================================
--- /trunk/src/arm/deoptimizer-arm.cc Tue Dec 7 04:49:48 2010
+++ /trunk/src/arm/deoptimizer-arm.cc Tue Dec 7 07:51:33 2010
@@ -196,7 +196,7 @@
// function code and AST id of the bailout.
output_offset -= kPointerSize;
input_offset -= kPointerSize;
- uint32_t value;
+ intptr_t value;
if (is_bottommost) {
value = input_->GetFrameSlot(input_offset);
} else {
@@ -220,7 +220,7 @@
value = output_[frame_index - 1]->GetFp();
}
output_frame->SetFrameSlot(output_offset, value);
- unsigned fp_value = top_address + output_offset;
+ intptr_t fp_value = top_address + output_offset;
ASSERT(!is_bottommost || input_->GetRegister(fp.code()) == fp_value);
output_frame->SetFp(fp_value);
if (is_topmost) {
@@ -235,7 +235,7 @@
// optimize functions that need local contexts.
output_offset -= kPointerSize;
input_offset -= kPointerSize;
- value = reinterpret_cast<uint32_t>(function->context());
+ value = reinterpret_cast<intptr_t>(function->context());
// The context for the bottommost output frame should also agree with the
// input frame.
ASSERT(!is_bottommost || input_->GetFrameSlot(input_offset) == value);
=======================================
--- /trunk/src/version.cc Tue Dec 7 04:49:48 2010
+++ /trunk/src/version.cc Tue Dec 7 07:51:33 2010
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 0
#define BUILD_NUMBER 0
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
=======================================
--- /trunk/tools/gyp/v8.gyp Tue Dec 7 04:49:48 2010
+++ /trunk/tools/gyp/v8.gyp Tue Dec 7 07:51:33 2010
@@ -388,7 +388,7 @@
'../../src/jsregexp.h',
'../../src/list-inl.h',
'../../src/list.h',
- '../../src/lithium-allocator.cc',
+ '../../src/lithium-allocator.cc',
'../../src/lithium-allocator.h',
'../../src/liveedit.cc',
'../../src/liveedit.h',
@@ -540,6 +540,10 @@
'../../src/arm/full-codegen-arm.cc',
'../../src/arm/ic-arm.cc',
'../../src/arm/jump-target-arm.cc',
+ '../../src/arm/lithium-codegen-arm.cc',
+ '../../src/arm/lithium-codegen-arm.h',
+ '../../src/arm/lithium-arm.cc',
+ '../../src/arm/lithium-arm.h',
'../../src/arm/macro-assembler-arm.cc',
'../../src/arm/macro-assembler-arm.h',
'../../src/arm/regexp-macro-assembler-arm.cc',
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
