| OLD | NEW |
| 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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 865 __ bind(&exit_with_exception); | 865 __ bind(&exit_with_exception); |
| 866 // Exit with Result EXCEPTION(-1) to signal thrown exception. | 866 // Exit with Result EXCEPTION(-1) to signal thrown exception. |
| 867 __ mov(r0, Operand(EXCEPTION)); | 867 __ mov(r0, Operand(EXCEPTION)); |
| 868 __ jmp(&return_r0); | 868 __ jmp(&return_r0); |
| 869 } | 869 } |
| 870 | 870 |
| 871 CodeDesc code_desc; | 871 CodeDesc code_desc; |
| 872 masm_->GetCode(&code_desc); | 872 masm_->GetCode(&code_desc); |
| 873 Handle<Code> code = isolate()->factory()->NewCode( | 873 Handle<Code> code = isolate()->factory()->NewCode( |
| 874 code_desc, Code::ComputeFlags(Code::REGEXP), masm_->CodeObject()); | 874 code_desc, Code::ComputeFlags(Code::REGEXP), masm_->CodeObject()); |
| 875 PROFILE(Isolate::Current(), RegExpCodeCreateEvent(*code, *source)); | 875 PROFILE(masm_->isolate(), RegExpCodeCreateEvent(*code, *source)); |
| 876 return Handle<HeapObject>::cast(code); | 876 return Handle<HeapObject>::cast(code); |
| 877 } | 877 } |
| 878 | 878 |
| 879 | 879 |
| 880 void RegExpMacroAssemblerARM::GoTo(Label* to) { | 880 void RegExpMacroAssemblerARM::GoTo(Label* to) { |
| 881 BranchOrBacktrack(al, to); | 881 BranchOrBacktrack(al, to); |
| 882 } | 882 } |
| 883 | 883 |
| 884 | 884 |
| 885 void RegExpMacroAssemblerARM::IfRegisterGE(int reg, | 885 void RegExpMacroAssemblerARM::IfRegisterGE(int reg, |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1090 template <typename T> | 1090 template <typename T> |
| 1091 static T& frame_entry(Address re_frame, int frame_offset) { | 1091 static T& frame_entry(Address re_frame, int frame_offset) { |
| 1092 return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); | 1092 return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); |
| 1093 } | 1093 } |
| 1094 | 1094 |
| 1095 | 1095 |
| 1096 int RegExpMacroAssemblerARM::CheckStackGuardState(Address* return_address, | 1096 int RegExpMacroAssemblerARM::CheckStackGuardState(Address* return_address, |
| 1097 Code* re_code, | 1097 Code* re_code, |
| 1098 Address re_frame) { | 1098 Address re_frame) { |
| 1099 Isolate* isolate = frame_entry<Isolate*>(re_frame, kIsolate); | 1099 Isolate* isolate = frame_entry<Isolate*>(re_frame, kIsolate); |
| 1100 ASSERT(isolate == Isolate::Current()); | |
| 1101 if (isolate->stack_guard()->IsStackOverflow()) { | 1100 if (isolate->stack_guard()->IsStackOverflow()) { |
| 1102 isolate->StackOverflow(); | 1101 isolate->StackOverflow(); |
| 1103 return EXCEPTION; | 1102 return EXCEPTION; |
| 1104 } | 1103 } |
| 1105 | 1104 |
| 1106 // If not real stack overflow the stack guard was used to interrupt | 1105 // If not real stack overflow the stack guard was used to interrupt |
| 1107 // execution for another purpose. | 1106 // execution for another purpose. |
| 1108 | 1107 |
| 1109 // If this is a direct call from JavaScript retry the RegExp forcing the call | 1108 // If this is a direct call from JavaScript retry the RegExp forcing the call |
| 1110 // through the runtime system. Currently the direct call cannot handle a GC. | 1109 // through the runtime system. Currently the direct call cannot handle a GC. |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 } | 1353 } |
| 1355 | 1354 |
| 1356 | 1355 |
| 1357 #undef __ | 1356 #undef __ |
| 1358 | 1357 |
| 1359 #endif // V8_INTERPRETED_REGEXP | 1358 #endif // V8_INTERPRETED_REGEXP |
| 1360 | 1359 |
| 1361 }} // namespace v8::internal | 1360 }} // namespace v8::internal |
| 1362 | 1361 |
| 1363 #endif // V8_TARGET_ARCH_ARM | 1362 #endif // V8_TARGET_ARCH_ARM |
| OLD | NEW |