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

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

Issue 430503007: Rename ASSERT* to DCHECK*. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: REBASE and fixes Created 6 years, 4 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/regexp-macro-assembler.cc ('k') | src/regexp-macro-assembler-irregexp-inl.h » ('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 2008-2009 the V8 project authors. All rights reserved. 1 // Copyright 2008-2009 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #include "src/ast.h" 7 #include "src/ast.h"
8 #include "src/bytecodes-irregexp.h" 8 #include "src/bytecodes-irregexp.h"
9 #include "src/regexp-macro-assembler.h" 9 #include "src/regexp-macro-assembler.h"
10 #include "src/regexp-macro-assembler-irregexp.h" 10 #include "src/regexp-macro-assembler-irregexp.h"
(...skipping 22 matching lines...) Expand all
33 33
34 34
35 RegExpMacroAssemblerIrregexp::IrregexpImplementation 35 RegExpMacroAssemblerIrregexp::IrregexpImplementation
36 RegExpMacroAssemblerIrregexp::Implementation() { 36 RegExpMacroAssemblerIrregexp::Implementation() {
37 return kBytecodeImplementation; 37 return kBytecodeImplementation;
38 } 38 }
39 39
40 40
41 void RegExpMacroAssemblerIrregexp::Bind(Label* l) { 41 void RegExpMacroAssemblerIrregexp::Bind(Label* l) {
42 advance_current_end_ = kInvalidPC; 42 advance_current_end_ = kInvalidPC;
43 ASSERT(!l->is_bound()); 43 DCHECK(!l->is_bound());
44 if (l->is_linked()) { 44 if (l->is_linked()) {
45 int pos = l->pos(); 45 int pos = l->pos();
46 while (pos != 0) { 46 while (pos != 0) {
47 int fixup = pos; 47 int fixup = pos;
48 pos = *reinterpret_cast<int32_t*>(buffer_.start() + fixup); 48 pos = *reinterpret_cast<int32_t*>(buffer_.start() + fixup);
49 *reinterpret_cast<uint32_t*>(buffer_.start() + fixup) = pc_; 49 *reinterpret_cast<uint32_t*>(buffer_.start() + fixup) = pc_;
50 } 50 }
51 } 51 }
52 l->bind_to(pc_); 52 l->bind_to(pc_);
53 } 53 }
54 54
55 55
56 void RegExpMacroAssemblerIrregexp::EmitOrLink(Label* l) { 56 void RegExpMacroAssemblerIrregexp::EmitOrLink(Label* l) {
57 if (l == NULL) l = &backtrack_; 57 if (l == NULL) l = &backtrack_;
58 if (l->is_bound()) { 58 if (l->is_bound()) {
59 Emit32(l->pos()); 59 Emit32(l->pos());
60 } else { 60 } else {
61 int pos = 0; 61 int pos = 0;
62 if (l->is_linked()) { 62 if (l->is_linked()) {
63 pos = l->pos(); 63 pos = l->pos();
64 } 64 }
65 l->link_to(pc_); 65 l->link_to(pc_);
66 Emit32(pos); 66 Emit32(pos);
67 } 67 }
68 } 68 }
69 69
70 70
71 void RegExpMacroAssemblerIrregexp::PopRegister(int register_index) { 71 void RegExpMacroAssemblerIrregexp::PopRegister(int register_index) {
72 ASSERT(register_index >= 0); 72 DCHECK(register_index >= 0);
73 ASSERT(register_index <= kMaxRegister); 73 DCHECK(register_index <= kMaxRegister);
74 Emit(BC_POP_REGISTER, register_index); 74 Emit(BC_POP_REGISTER, register_index);
75 } 75 }
76 76
77 77
78 void RegExpMacroAssemblerIrregexp::PushRegister( 78 void RegExpMacroAssemblerIrregexp::PushRegister(
79 int register_index, 79 int register_index,
80 StackCheckFlag check_stack_limit) { 80 StackCheckFlag check_stack_limit) {
81 ASSERT(register_index >= 0); 81 DCHECK(register_index >= 0);
82 ASSERT(register_index <= kMaxRegister); 82 DCHECK(register_index <= kMaxRegister);
83 Emit(BC_PUSH_REGISTER, register_index); 83 Emit(BC_PUSH_REGISTER, register_index);
84 } 84 }
85 85
86 86
87 void RegExpMacroAssemblerIrregexp::WriteCurrentPositionToRegister( 87 void RegExpMacroAssemblerIrregexp::WriteCurrentPositionToRegister(
88 int register_index, int cp_offset) { 88 int register_index, int cp_offset) {
89 ASSERT(register_index >= 0); 89 DCHECK(register_index >= 0);
90 ASSERT(register_index <= kMaxRegister); 90 DCHECK(register_index <= kMaxRegister);
91 Emit(BC_SET_REGISTER_TO_CP, register_index); 91 Emit(BC_SET_REGISTER_TO_CP, register_index);
92 Emit32(cp_offset); // Current position offset. 92 Emit32(cp_offset); // Current position offset.
93 } 93 }
94 94
95 95
96 void RegExpMacroAssemblerIrregexp::ClearRegisters(int reg_from, int reg_to) { 96 void RegExpMacroAssemblerIrregexp::ClearRegisters(int reg_from, int reg_to) {
97 ASSERT(reg_from <= reg_to); 97 DCHECK(reg_from <= reg_to);
98 for (int reg = reg_from; reg <= reg_to; reg++) { 98 for (int reg = reg_from; reg <= reg_to; reg++) {
99 SetRegister(reg, -1); 99 SetRegister(reg, -1);
100 } 100 }
101 } 101 }
102 102
103 103
104 void RegExpMacroAssemblerIrregexp::ReadCurrentPositionFromRegister( 104 void RegExpMacroAssemblerIrregexp::ReadCurrentPositionFromRegister(
105 int register_index) { 105 int register_index) {
106 ASSERT(register_index >= 0); 106 DCHECK(register_index >= 0);
107 ASSERT(register_index <= kMaxRegister); 107 DCHECK(register_index <= kMaxRegister);
108 Emit(BC_SET_CP_TO_REGISTER, register_index); 108 Emit(BC_SET_CP_TO_REGISTER, register_index);
109 } 109 }
110 110
111 111
112 void RegExpMacroAssemblerIrregexp::WriteStackPointerToRegister( 112 void RegExpMacroAssemblerIrregexp::WriteStackPointerToRegister(
113 int register_index) { 113 int register_index) {
114 ASSERT(register_index >= 0); 114 DCHECK(register_index >= 0);
115 ASSERT(register_index <= kMaxRegister); 115 DCHECK(register_index <= kMaxRegister);
116 Emit(BC_SET_REGISTER_TO_SP, register_index); 116 Emit(BC_SET_REGISTER_TO_SP, register_index);
117 } 117 }
118 118
119 119
120 void RegExpMacroAssemblerIrregexp::ReadStackPointerFromRegister( 120 void RegExpMacroAssemblerIrregexp::ReadStackPointerFromRegister(
121 int register_index) { 121 int register_index) {
122 ASSERT(register_index >= 0); 122 DCHECK(register_index >= 0);
123 ASSERT(register_index <= kMaxRegister); 123 DCHECK(register_index <= kMaxRegister);
124 Emit(BC_SET_SP_TO_REGISTER, register_index); 124 Emit(BC_SET_SP_TO_REGISTER, register_index);
125 } 125 }
126 126
127 127
128 void RegExpMacroAssemblerIrregexp::SetCurrentPositionFromEnd(int by) { 128 void RegExpMacroAssemblerIrregexp::SetCurrentPositionFromEnd(int by) {
129 ASSERT(is_uint24(by)); 129 DCHECK(is_uint24(by));
130 Emit(BC_SET_CURRENT_POSITION_FROM_END, by); 130 Emit(BC_SET_CURRENT_POSITION_FROM_END, by);
131 } 131 }
132 132
133 133
134 void RegExpMacroAssemblerIrregexp::SetRegister(int register_index, int to) { 134 void RegExpMacroAssemblerIrregexp::SetRegister(int register_index, int to) {
135 ASSERT(register_index >= 0); 135 DCHECK(register_index >= 0);
136 ASSERT(register_index <= kMaxRegister); 136 DCHECK(register_index <= kMaxRegister);
137 Emit(BC_SET_REGISTER, register_index); 137 Emit(BC_SET_REGISTER, register_index);
138 Emit32(to); 138 Emit32(to);
139 } 139 }
140 140
141 141
142 void RegExpMacroAssemblerIrregexp::AdvanceRegister(int register_index, int by) { 142 void RegExpMacroAssemblerIrregexp::AdvanceRegister(int register_index, int by) {
143 ASSERT(register_index >= 0); 143 DCHECK(register_index >= 0);
144 ASSERT(register_index <= kMaxRegister); 144 DCHECK(register_index <= kMaxRegister);
145 Emit(BC_ADVANCE_REGISTER, register_index); 145 Emit(BC_ADVANCE_REGISTER, register_index);
146 Emit32(by); 146 Emit32(by);
147 } 147 }
148 148
149 149
150 void RegExpMacroAssemblerIrregexp::PopCurrentPosition() { 150 void RegExpMacroAssemblerIrregexp::PopCurrentPosition() {
151 Emit(BC_POP_CP, 0); 151 Emit(BC_POP_CP, 0);
152 } 152 }
153 153
154 154
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 return false; // Restart matching for global regexp not supported. 188 return false; // Restart matching for global regexp not supported.
189 } 189 }
190 190
191 191
192 void RegExpMacroAssemblerIrregexp::Fail() { 192 void RegExpMacroAssemblerIrregexp::Fail() {
193 Emit(BC_FAIL, 0); 193 Emit(BC_FAIL, 0);
194 } 194 }
195 195
196 196
197 void RegExpMacroAssemblerIrregexp::AdvanceCurrentPosition(int by) { 197 void RegExpMacroAssemblerIrregexp::AdvanceCurrentPosition(int by) {
198 ASSERT(by >= kMinCPOffset); 198 DCHECK(by >= kMinCPOffset);
199 ASSERT(by <= kMaxCPOffset); 199 DCHECK(by <= kMaxCPOffset);
200 advance_current_start_ = pc_; 200 advance_current_start_ = pc_;
201 advance_current_offset_ = by; 201 advance_current_offset_ = by;
202 Emit(BC_ADVANCE_CP, by); 202 Emit(BC_ADVANCE_CP, by);
203 advance_current_end_ = pc_; 203 advance_current_end_ = pc_;
204 } 204 }
205 205
206 206
207 void RegExpMacroAssemblerIrregexp::CheckGreedyLoop( 207 void RegExpMacroAssemblerIrregexp::CheckGreedyLoop(
208 Label* on_tos_equals_current_position) { 208 Label* on_tos_equals_current_position) {
209 Emit(BC_CHECK_GREEDY, 0); 209 Emit(BC_CHECK_GREEDY, 0);
210 EmitOrLink(on_tos_equals_current_position); 210 EmitOrLink(on_tos_equals_current_position);
211 } 211 }
212 212
213 213
214 void RegExpMacroAssemblerIrregexp::LoadCurrentCharacter(int cp_offset, 214 void RegExpMacroAssemblerIrregexp::LoadCurrentCharacter(int cp_offset,
215 Label* on_failure, 215 Label* on_failure,
216 bool check_bounds, 216 bool check_bounds,
217 int characters) { 217 int characters) {
218 ASSERT(cp_offset >= kMinCPOffset); 218 DCHECK(cp_offset >= kMinCPOffset);
219 ASSERT(cp_offset <= kMaxCPOffset); 219 DCHECK(cp_offset <= kMaxCPOffset);
220 int bytecode; 220 int bytecode;
221 if (check_bounds) { 221 if (check_bounds) {
222 if (characters == 4) { 222 if (characters == 4) {
223 bytecode = BC_LOAD_4_CURRENT_CHARS; 223 bytecode = BC_LOAD_4_CURRENT_CHARS;
224 } else if (characters == 2) { 224 } else if (characters == 2) {
225 bytecode = BC_LOAD_2_CURRENT_CHARS; 225 bytecode = BC_LOAD_2_CURRENT_CHARS;
226 } else { 226 } else {
227 ASSERT(characters == 1); 227 DCHECK(characters == 1);
228 bytecode = BC_LOAD_CURRENT_CHAR; 228 bytecode = BC_LOAD_CURRENT_CHAR;
229 } 229 }
230 } else { 230 } else {
231 if (characters == 4) { 231 if (characters == 4) {
232 bytecode = BC_LOAD_4_CURRENT_CHARS_UNCHECKED; 232 bytecode = BC_LOAD_4_CURRENT_CHARS_UNCHECKED;
233 } else if (characters == 2) { 233 } else if (characters == 2) {
234 bytecode = BC_LOAD_2_CURRENT_CHARS_UNCHECKED; 234 bytecode = BC_LOAD_2_CURRENT_CHARS_UNCHECKED;
235 } else { 235 } else {
236 ASSERT(characters == 1); 236 DCHECK(characters == 1);
237 bytecode = BC_LOAD_CURRENT_CHAR_UNCHECKED; 237 bytecode = BC_LOAD_CURRENT_CHAR_UNCHECKED;
238 } 238 }
239 } 239 }
240 Emit(bytecode, cp_offset); 240 Emit(bytecode, cp_offset);
241 if (check_bounds) EmitOrLink(on_failure); 241 if (check_bounds) EmitOrLink(on_failure);
242 } 242 }
243 243
244 244
245 void RegExpMacroAssemblerIrregexp::CheckCharacterLT(uc16 limit, 245 void RegExpMacroAssemblerIrregexp::CheckCharacterLT(uc16 limit,
246 Label* on_less) { 246 Label* on_less) {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 for (int j = 0; j < kBitsPerByte; j++) { 364 for (int j = 0; j < kBitsPerByte; j++) {
365 if (table->get(i + j) != 0) byte |= 1 << j; 365 if (table->get(i + j) != 0) byte |= 1 << j;
366 } 366 }
367 Emit8(byte); 367 Emit8(byte);
368 } 368 }
369 } 369 }
370 370
371 371
372 void RegExpMacroAssemblerIrregexp::CheckNotBackReference(int start_reg, 372 void RegExpMacroAssemblerIrregexp::CheckNotBackReference(int start_reg,
373 Label* on_not_equal) { 373 Label* on_not_equal) {
374 ASSERT(start_reg >= 0); 374 DCHECK(start_reg >= 0);
375 ASSERT(start_reg <= kMaxRegister); 375 DCHECK(start_reg <= kMaxRegister);
376 Emit(BC_CHECK_NOT_BACK_REF, start_reg); 376 Emit(BC_CHECK_NOT_BACK_REF, start_reg);
377 EmitOrLink(on_not_equal); 377 EmitOrLink(on_not_equal);
378 } 378 }
379 379
380 380
381 void RegExpMacroAssemblerIrregexp::CheckNotBackReferenceIgnoreCase( 381 void RegExpMacroAssemblerIrregexp::CheckNotBackReferenceIgnoreCase(
382 int start_reg, 382 int start_reg,
383 Label* on_not_equal) { 383 Label* on_not_equal) {
384 ASSERT(start_reg >= 0); 384 DCHECK(start_reg >= 0);
385 ASSERT(start_reg <= kMaxRegister); 385 DCHECK(start_reg <= kMaxRegister);
386 Emit(BC_CHECK_NOT_BACK_REF_NO_CASE, start_reg); 386 Emit(BC_CHECK_NOT_BACK_REF_NO_CASE, start_reg);
387 EmitOrLink(on_not_equal); 387 EmitOrLink(on_not_equal);
388 } 388 }
389 389
390 390
391 void RegExpMacroAssemblerIrregexp::IfRegisterLT(int register_index, 391 void RegExpMacroAssemblerIrregexp::IfRegisterLT(int register_index,
392 int comparand, 392 int comparand,
393 Label* on_less_than) { 393 Label* on_less_than) {
394 ASSERT(register_index >= 0); 394 DCHECK(register_index >= 0);
395 ASSERT(register_index <= kMaxRegister); 395 DCHECK(register_index <= kMaxRegister);
396 Emit(BC_CHECK_REGISTER_LT, register_index); 396 Emit(BC_CHECK_REGISTER_LT, register_index);
397 Emit32(comparand); 397 Emit32(comparand);
398 EmitOrLink(on_less_than); 398 EmitOrLink(on_less_than);
399 } 399 }
400 400
401 401
402 void RegExpMacroAssemblerIrregexp::IfRegisterGE(int register_index, 402 void RegExpMacroAssemblerIrregexp::IfRegisterGE(int register_index,
403 int comparand, 403 int comparand,
404 Label* on_greater_or_equal) { 404 Label* on_greater_or_equal) {
405 ASSERT(register_index >= 0); 405 DCHECK(register_index >= 0);
406 ASSERT(register_index <= kMaxRegister); 406 DCHECK(register_index <= kMaxRegister);
407 Emit(BC_CHECK_REGISTER_GE, register_index); 407 Emit(BC_CHECK_REGISTER_GE, register_index);
408 Emit32(comparand); 408 Emit32(comparand);
409 EmitOrLink(on_greater_or_equal); 409 EmitOrLink(on_greater_or_equal);
410 } 410 }
411 411
412 412
413 void RegExpMacroAssemblerIrregexp::IfRegisterEqPos(int register_index, 413 void RegExpMacroAssemblerIrregexp::IfRegisterEqPos(int register_index,
414 Label* on_eq) { 414 Label* on_eq) {
415 ASSERT(register_index >= 0); 415 DCHECK(register_index >= 0);
416 ASSERT(register_index <= kMaxRegister); 416 DCHECK(register_index <= kMaxRegister);
417 Emit(BC_CHECK_REGISTER_EQ_POS, register_index); 417 Emit(BC_CHECK_REGISTER_EQ_POS, register_index);
418 EmitOrLink(on_eq); 418 EmitOrLink(on_eq);
419 } 419 }
420 420
421 421
422 Handle<HeapObject> RegExpMacroAssemblerIrregexp::GetCode( 422 Handle<HeapObject> RegExpMacroAssemblerIrregexp::GetCode(
423 Handle<String> source) { 423 Handle<String> source) {
424 Bind(&backtrack_); 424 Bind(&backtrack_);
425 Emit(BC_POP_BT, 0); 425 Emit(BC_POP_BT, 0);
426 Handle<ByteArray> array = isolate_->factory()->NewByteArray(length()); 426 Handle<ByteArray> array = isolate_->factory()->NewByteArray(length());
(...skipping 19 matching lines...) Expand all
446 own_buffer_ = true; 446 own_buffer_ = true;
447 MemCopy(buffer_.start(), old_buffer.start(), old_buffer.length()); 447 MemCopy(buffer_.start(), old_buffer.start(), old_buffer.length());
448 if (old_buffer_was_our_own) { 448 if (old_buffer_was_our_own) {
449 old_buffer.Dispose(); 449 old_buffer.Dispose();
450 } 450 }
451 } 451 }
452 452
453 #endif // V8_INTERPRETED_REGEXP 453 #endif // V8_INTERPRETED_REGEXP
454 454
455 } } // namespace v8::internal 455 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/regexp-macro-assembler.cc ('k') | src/regexp-macro-assembler-irregexp-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698