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

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

Issue 8337012: Fix bug in instanceof of bound functions on ARM. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 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 | « no previous file | src/mips/code-stubs-mips.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 2026 matching lines...) Expand 10 before | Expand all | Expand 10 after
2037 2037
2038 // Check that the function really is a function. Load map into result reg. 2038 // Check that the function really is a function. Load map into result reg.
2039 CompareObjectType(function, result, scratch, JS_FUNCTION_TYPE); 2039 CompareObjectType(function, result, scratch, JS_FUNCTION_TYPE);
2040 b(ne, miss); 2040 b(ne, miss);
2041 2041
2042 if (miss_on_bound_function) { 2042 if (miss_on_bound_function) {
2043 ldr(scratch, 2043 ldr(scratch,
2044 FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset)); 2044 FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset));
2045 ldr(scratch, 2045 ldr(scratch,
2046 FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset)); 2046 FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset));
2047 tst(scratch, Operand(1 << SharedFunctionInfo::kBoundFunction)); 2047 tst(scratch,
2048 Operand(Smi::FromInt(1 << SharedFunctionInfo::kBoundFunction)));
2048 b(ne, miss); 2049 b(ne, miss);
2049 } 2050 }
2050 2051
2051 // Make sure that the function has an instance prototype. 2052 // Make sure that the function has an instance prototype.
2052 Label non_instance; 2053 Label non_instance;
2053 ldrb(scratch, FieldMemOperand(result, Map::kBitFieldOffset)); 2054 ldrb(scratch, FieldMemOperand(result, Map::kBitFieldOffset));
2054 tst(scratch, Operand(1 << Map::kHasNonInstancePrototype)); 2055 tst(scratch, Operand(1 << Map::kHasNonInstancePrototype));
2055 b(ne, &non_instance); 2056 b(ne, &non_instance);
2056 2057
2057 // Get the prototype or initial map from the function. 2058 // Get the prototype or initial map from the function.
(...skipping 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after
3661 void CodePatcher::EmitCondition(Condition cond) { 3662 void CodePatcher::EmitCondition(Condition cond) {
3662 Instr instr = Assembler::instr_at(masm_.pc_); 3663 Instr instr = Assembler::instr_at(masm_.pc_);
3663 instr = (instr & ~kCondMask) | cond; 3664 instr = (instr & ~kCondMask) | cond;
3664 masm_.emit(instr); 3665 masm_.emit(instr);
3665 } 3666 }
3666 3667
3667 3668
3668 } } // namespace v8::internal 3669 } } // namespace v8::internal
3669 3670
3670 #endif // V8_TARGET_ARCH_ARM 3671 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/mips/code-stubs-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698