Revision: 4589
Author: whe...@chromium.org
Date: Wed May 5 01:56:16 2010
Log: Make sure that type info of results is correctly recorded when results
are moved to registers by generated code.
Review URL: http://codereview.chromium.org/1905002
http://code.google.com/p/v8/source/detail?r=4589
Modified:
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/x64/codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Tue May 4 23:57:41
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Wed May 5 01:56:16
2010
@@ -1426,6 +1426,9 @@
Result* left,
Result* right,
OverwriteMode
overwrite_mode) {
+ // Copy the type info because left and right may be overwritten.
+ TypeInfo left_type_info = left->type_info();
+ TypeInfo right_type_info = right->type_info();
Token::Value op = expr->op();
Result answer;
// Special handling of div and mod because they use fixed registers.
@@ -1501,8 +1504,8 @@
(op == Token::DIV) ? eax : edx,
left->reg(),
right->reg(),
- left->type_info(),
- right->type_info(),
+ left_type_info,
+ right_type_info,
overwrite_mode);
if (left->reg().is(right->reg())) {
__ test(left->reg(), Immediate(kSmiTagMask));
@@ -1605,18 +1608,18 @@
answer.reg(),
left->reg(),
ecx,
- left->type_info(),
- right->type_info(),
+ left_type_info,
+ right_type_info,
overwrite_mode);
Label do_op, left_nonsmi;
// If right is a smi we make a fast case if left is either a smi
// or a heapnumber.
- if (CpuFeatures::IsSupported(SSE2) && right->type_info().IsSmi()) {
+ if (CpuFeatures::IsSupported(SSE2) && right_type_info.IsSmi()) {
CpuFeatures::Scope use_sse2(SSE2);
__ mov(answer.reg(), left->reg());
// Fast case - both are actually smis.
- if (!left->type_info().IsSmi()) {
+ if (!left_type_info.IsSmi()) {
__ test(answer.reg(), Immediate(kSmiTagMask));
__ j(not_zero, &left_nonsmi);
} else {
@@ -1640,7 +1643,7 @@
deferred->Branch(negative);
} else {
CheckTwoForSminess(masm_, left->reg(), right->reg(), answer.reg(),
- left->type_info(), right->type_info(), deferred);
+ left_type_info, right_type_info, deferred);
// Untag both operands.
__ mov(answer.reg(), left->reg());
@@ -1713,11 +1716,11 @@
answer.reg(),
left->reg(),
right->reg(),
- left->type_info(),
- right->type_info(),
+ left_type_info,
+ right_type_info,
overwrite_mode);
CheckTwoForSminess(masm_, left->reg(), right->reg(), answer.reg(),
- left->type_info(), right->type_info(), deferred);
+ left_type_info, right_type_info, deferred);
__ mov(answer.reg(), left->reg());
switch (op) {
@@ -1988,18 +1991,13 @@
}
-Result CodeGenerator::ConstantSmiBinaryOperation(
- BinaryOperation* expr,
- Result* operand,
- Handle<Object> value,
- bool reversed,
- OverwriteMode overwrite_mode) {
- // NOTE: This is an attempt to inline (a bit) more of the code for
- // some possible smi operations (like + and -) when (at least) one
- // of the operands is a constant smi.
- // Consumes the argument "operand".
- // TODO(199): Optimize some special cases of operations involving a
- // smi literal (multiply by 2, shift by 0, etc.).
+Result CodeGenerator::ConstantSmiBinaryOperation(BinaryOperation* expr,
+ Result* operand,
+ Handle<Object> value,
+ bool reversed,
+ OverwriteMode
overwrite_mode) {
+ // Generate inline code for a binary operation when one of the
+ // operands is a constant smi. Consumes the argument "operand".
if (IsUnsafeSmi(value)) {
Result unsafe_operand(value);
if (reversed) {
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Tue May 4 07:49:50 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Wed May 5 01:56:16 2010
@@ -6404,10 +6404,8 @@
Handle<Object> value,
bool reversed,
OverwriteMode
overwrite_mode) {
- // NOTE: This is an attempt to inline (a bit) more of the code for
- // some possible smi operations (like + and -) when (at least) one
- // of the operands is a constant smi.
- // Consumes the argument "operand".
+ // Generate inline code for a binary operation when one of the
+ // operands is a constant smi. Consumes the argument "operand".
if (IsUnsafeSmi(value)) {
Result unsafe_operand(value);
if (reversed) {
@@ -6685,10 +6683,19 @@
return answer;
}
+
+// Implements a binary operation using a deferred code object and some
+// inline code to operate on smis quickly.
Result CodeGenerator::LikelySmiBinaryOperation(BinaryOperation* expr,
Result* left,
Result* right,
OverwriteMode
overwrite_mode) {
+ // Copy the type info because left and right may be overwritten.
+ TypeInfo left_type_info = left->type_info();
+ TypeInfo right_type_info = right->type_info();
+ USE(left_type_info);
+ USE(right_type_info);
+ // TODO(X64): Use type information in calculations.
Token::Value op = expr->op();
Result answer;
// Special handling of div and mod because they use fixed registers.
@@ -6813,9 +6820,7 @@
left->reg(),
rcx,
overwrite_mode);
- __ movq(answer.reg(), left->reg());
- __ or_(answer.reg(), rcx);
- __ JumpIfNotSmi(answer.reg(), deferred->entry_label());
+ __ JumpIfNotBothSmi(left->reg(), rcx, deferred->entry_label());
// Perform the operation.
switch (op) {
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
