| OLD | NEW |
| 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 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1900 // in initial map. | 1900 // in initial map. |
| 1901 bind(&non_instance); | 1901 bind(&non_instance); |
| 1902 ldr(result, FieldMemOperand(result, Map::kConstructorOffset)); | 1902 ldr(result, FieldMemOperand(result, Map::kConstructorOffset)); |
| 1903 | 1903 |
| 1904 // All done. | 1904 // All done. |
| 1905 bind(&done); | 1905 bind(&done); |
| 1906 } | 1906 } |
| 1907 | 1907 |
| 1908 | 1908 |
| 1909 void MacroAssembler::CallStub(CodeStub* stub, Condition cond) { | 1909 void MacroAssembler::CallStub(CodeStub* stub, Condition cond) { |
| 1910 // TODO(gc): Fix this! | 1910 // TODO(1599): Do not call stubs from stubs that do not allow stub calls. |
| 1911 // ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. | 1911 // ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. |
| 1912 Call(stub->GetCode(), RelocInfo::CODE_TARGET, kNoASTId, cond); | 1912 Call(stub->GetCode(), RelocInfo::CODE_TARGET, kNoASTId, cond); |
| 1913 } | 1913 } |
| 1914 | 1914 |
| 1915 | 1915 |
| 1916 MaybeObject* MacroAssembler::TryCallStub(CodeStub* stub, Condition cond) { | 1916 MaybeObject* MacroAssembler::TryCallStub(CodeStub* stub, Condition cond) { |
| 1917 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. | 1917 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. |
| 1918 Object* result; | 1918 Object* result; |
| 1919 { MaybeObject* maybe_result = stub->TryGetCode(); | 1919 { MaybeObject* maybe_result = stub->TryGetCode(); |
| 1920 if (!maybe_result->ToObject(&result)) return maybe_result; | 1920 if (!maybe_result->ToObject(&result)) return maybe_result; |
| (...skipping 1457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3378 void CodePatcher::EmitCondition(Condition cond) { | 3378 void CodePatcher::EmitCondition(Condition cond) { |
| 3379 Instr instr = Assembler::instr_at(masm_.pc_); | 3379 Instr instr = Assembler::instr_at(masm_.pc_); |
| 3380 instr = (instr & ~kCondMask) | cond; | 3380 instr = (instr & ~kCondMask) | cond; |
| 3381 masm_.emit(instr); | 3381 masm_.emit(instr); |
| 3382 } | 3382 } |
| 3383 | 3383 |
| 3384 | 3384 |
| 3385 } } // namespace v8::internal | 3385 } } // namespace v8::internal |
| 3386 | 3386 |
| 3387 #endif // V8_TARGET_ARCH_ARM | 3387 #endif // V8_TARGET_ARCH_ARM |
| OLD | NEW |