Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: src/arm/macro-assembler-arm.cc

Issue 10991045: Fix ARM bug introduced in r12604 that caused crashes on ARM (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/arm/stub-cache-arm.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 1970 matching lines...) Expand 10 before | Expand all | Expand 10 after
1981 Operand(key_reg, LSL, kDoubleSizeLog2 - kSmiTagSize)); 1981 Operand(key_reg, LSL, kDoubleSizeLog2 - kSmiTagSize));
1982 // scratch1 is now effective address of the double element 1982 // scratch1 is now effective address of the double element
1983 1983
1984 FloatingPointHelper::Destination destination; 1984 FloatingPointHelper::Destination destination;
1985 if (CpuFeatures::IsSupported(VFP2)) { 1985 if (CpuFeatures::IsSupported(VFP2)) {
1986 destination = FloatingPointHelper::kVFPRegisters; 1986 destination = FloatingPointHelper::kVFPRegisters;
1987 } else { 1987 } else {
1988 destination = FloatingPointHelper::kCoreRegisters; 1988 destination = FloatingPointHelper::kCoreRegisters;
1989 } 1989 }
1990 1990
1991 Register untagged_value = receiver_reg; 1991 Register untagged_value = elements_reg;
1992 SmiUntag(untagged_value, value_reg); 1992 SmiUntag(untagged_value, value_reg);
1993 FloatingPointHelper::ConvertIntToDouble(this, 1993 FloatingPointHelper::ConvertIntToDouble(this,
1994 untagged_value, 1994 untagged_value,
1995 destination, 1995 destination,
1996 d0, 1996 d0,
1997 mantissa_reg, 1997 mantissa_reg,
1998 exponent_reg, 1998 exponent_reg,
1999 scratch4, 1999 scratch4,
2000 s2); 2000 s2);
2001 if (destination == FloatingPointHelper::kVFPRegisters) { 2001 if (destination == FloatingPointHelper::kVFPRegisters) {
(...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after
3839 void CodePatcher::EmitCondition(Condition cond) { 3839 void CodePatcher::EmitCondition(Condition cond) {
3840 Instr instr = Assembler::instr_at(masm_.pc_); 3840 Instr instr = Assembler::instr_at(masm_.pc_);
3841 instr = (instr & ~kCondMask) | cond; 3841 instr = (instr & ~kCondMask) | cond;
3842 masm_.emit(instr); 3842 masm_.emit(instr);
3843 } 3843 }
3844 3844
3845 3845
3846 } } // namespace v8::internal 3846 } } // namespace v8::internal
3847 3847
3848 #endif // V8_TARGET_ARCH_ARM 3848 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/arm/stub-cache-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698