OLD | NEW |
1 // Copyright 2010 the V8 project authors. All rights reserved. | 1 // Copyright 2010 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 case Token::BIT_AND: | 862 case Token::BIT_AND: |
863 case Token::BIT_XOR: | 863 case Token::BIT_XOR: |
864 if (inline_smi) { | 864 if (inline_smi) { |
865 bool rhs_is_smi = frame_->KnownSmiAt(0); | 865 bool rhs_is_smi = frame_->KnownSmiAt(0); |
866 bool lhs_is_smi = frame_->KnownSmiAt(1); | 866 bool lhs_is_smi = frame_->KnownSmiAt(1); |
867 Register rhs = frame_->PopToRegister(); | 867 Register rhs = frame_->PopToRegister(); |
868 Register lhs = frame_->PopToRegister(rhs); | 868 Register lhs = frame_->PopToRegister(rhs); |
869 Register smi_test_reg; | 869 Register smi_test_reg; |
870 Condition cond; | 870 Condition cond; |
871 if (!rhs_is_smi || !lhs_is_smi) { | 871 if (!rhs_is_smi || !lhs_is_smi) { |
872 if (!rhs_is_smi) { | 872 if (rhs_is_smi) { |
| 873 smi_test_reg = lhs; |
| 874 } else if (lhs_is_smi) { |
873 smi_test_reg = rhs; | 875 smi_test_reg = rhs; |
874 } else if (!lhs_is_smi) { | |
875 smi_test_reg = lhs; | |
876 } else { | 876 } else { |
877 smi_test_reg = VirtualFrame::scratch0(); | 877 smi_test_reg = VirtualFrame::scratch0(); |
878 __ orr(smi_test_reg, rhs, Operand(lhs)); | 878 __ orr(smi_test_reg, rhs, Operand(lhs)); |
879 } | 879 } |
880 // Check they are both Smis. | 880 // Check they are both Smis. |
881 __ tst(smi_test_reg, Operand(kSmiTagMask)); | 881 __ tst(smi_test_reg, Operand(kSmiTagMask)); |
882 cond = eq; | 882 cond = eq; |
883 } else { | 883 } else { |
884 cond = al; | 884 cond = al; |
885 } | 885 } |
(...skipping 9610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
10496 __ bind(&string_add_runtime); | 10496 __ bind(&string_add_runtime); |
10497 __ TailCallRuntime(Runtime::kStringAdd, 2, 1); | 10497 __ TailCallRuntime(Runtime::kStringAdd, 2, 1); |
10498 } | 10498 } |
10499 | 10499 |
10500 | 10500 |
10501 #undef __ | 10501 #undef __ |
10502 | 10502 |
10503 } } // namespace v8::internal | 10503 } } // namespace v8::internal |
10504 | 10504 |
10505 #endif // V8_TARGET_ARCH_ARM | 10505 #endif // V8_TARGET_ARCH_ARM |
OLD | NEW |