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

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

Issue 8343001: RegExpMacroAssembler::CheckStackGuardState should update input string pointer (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/ia32/regexp-macro-assembler-ia32.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 start_index + slice_offset); 1104 start_index + slice_offset);
1105 1105
1106 if (start_address != new_address) { 1106 if (start_address != new_address) {
1107 // If there is a difference, update the object pointer and start and end 1107 // If there is a difference, update the object pointer and start and end
1108 // addresses in the RegExp stack frame to match the new value. 1108 // addresses in the RegExp stack frame to match the new value.
1109 const byte* end_address = frame_entry<const byte* >(re_frame, kInputEnd); 1109 const byte* end_address = frame_entry<const byte* >(re_frame, kInputEnd);
1110 int byte_length = static_cast<int>(end_address - start_address); 1110 int byte_length = static_cast<int>(end_address - start_address);
1111 frame_entry<const String*>(re_frame, kInputString) = *subject; 1111 frame_entry<const String*>(re_frame, kInputString) = *subject;
1112 frame_entry<const byte*>(re_frame, kInputStart) = new_address; 1112 frame_entry<const byte*>(re_frame, kInputStart) = new_address;
1113 frame_entry<const byte*>(re_frame, kInputEnd) = new_address + byte_length; 1113 frame_entry<const byte*>(re_frame, kInputEnd) = new_address + byte_length;
1114 } else if (frame_entry<const String*>(re_frame, kInputString) != *subject) {
1115 // Subject string might have been a ConsString that underwent
1116 // short-circuiting during GC. That will not change start_address but
1117 // will change pointer inside the subject handle.
1118 frame_entry<const String*>(re_frame, kInputString) = *subject;
1114 } 1119 }
1115 1120
1116 return 0; 1121 return 0;
1117 } 1122 }
1118 1123
1119 1124
1120 MemOperand RegExpMacroAssemblerARM::register_location(int register_index) { 1125 MemOperand RegExpMacroAssemblerARM::register_location(int register_index) {
1121 ASSERT(register_index < (1<<30)); 1126 ASSERT(register_index < (1<<30));
1122 if (num_registers_ <= register_index) { 1127 if (num_registers_ <= register_index) {
1123 num_registers_ = register_index + 1; 1128 num_registers_ = register_index + 1;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 __ ldr(pc, MemOperand(sp, stack_alignment, PostIndex)); 1304 __ ldr(pc, MemOperand(sp, stack_alignment, PostIndex));
1300 } 1305 }
1301 1306
1302 #undef __ 1307 #undef __
1303 1308
1304 #endif // V8_INTERPRETED_REGEXP 1309 #endif // V8_INTERPRETED_REGEXP
1305 1310
1306 }} // namespace v8::internal 1311 }} // namespace v8::internal
1307 1312
1308 #endif // V8_TARGET_ARCH_ARM 1313 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/regexp-macro-assembler-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698