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

Side by Side Diff: src/assembler.cc

Issue 6580028: Fix wrong assertion in assembler causing the shell to crash with --code-comme... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 10 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
OLDNEW
1 // Copyright (c) 1994-2006 Sun Microsystems Inc. 1 // Copyright (c) 1994-2006 Sun Microsystems Inc.
2 // All Rights Reserved. 2 // All Rights Reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // - Redistributions of source code must retain the above copyright notice, 8 // - Redistributions of source code must retain the above copyright notice,
9 // this list of conditions and the following disclaimer. 9 // this list of conditions and the following disclaimer.
10 // 10 //
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // Otherwise, use costly encoding. 245 // Otherwise, use costly encoding.
246 WriteExtraTaggedPC(pc_delta, kPCJumpTag); 246 WriteExtraTaggedPC(pc_delta, kPCJumpTag);
247 WriteExtraTaggedData(data_delta, pos_type_tag); 247 WriteExtraTaggedData(data_delta, pos_type_tag);
248 last_data_ = rinfo->data(); 248 last_data_ = rinfo->data();
249 } 249 }
250 } else if (RelocInfo::IsComment(rmode)) { 250 } else if (RelocInfo::IsComment(rmode)) {
251 // Comments are normally not generated, so we use the costly encoding. 251 // Comments are normally not generated, so we use the costly encoding.
252 WriteExtraTaggedPC(pc_delta, kPCJumpTag); 252 WriteExtraTaggedPC(pc_delta, kPCJumpTag);
253 WriteExtraTaggedData(rinfo->data() - last_data_, kCommentTag); 253 WriteExtraTaggedData(rinfo->data() - last_data_, kCommentTag);
254 last_data_ = rinfo->data(); 254 last_data_ = rinfo->data();
255 ASSERT(begin_pos - pos_ == RelocInfo::kRelocCommentSize); 255 ASSERT(begin_pos - pos_ >= RelocInfo::kMinRelocCommentSize);
256 } else { 256 } else {
257 // For all other modes we simply use the mode as the extra tag. 257 // For all other modes we simply use the mode as the extra tag.
258 // None of these modes need a data component. 258 // None of these modes need a data component.
259 ASSERT(rmode < kPCJumpTag && rmode < kDataJumpTag); 259 ASSERT(rmode < kPCJumpTag && rmode < kDataJumpTag);
260 WriteExtraTaggedPC(pc_delta, rmode); 260 WriteExtraTaggedPC(pc_delta, rmode);
261 } 261 }
262 last_pc_ = rinfo->pc(); 262 last_pc_ = rinfo->pc();
263 #ifdef DEBUG 263 #ifdef DEBUG
264 ASSERT(begin_pos - pos_ <= kMaxSize); 264 ASSERT(begin_pos - pos_ <= kMaxSize);
265 #endif 265 #endif
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
964 assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position); 964 assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position);
965 state_.written_position = state_.current_position; 965 state_.written_position = state_.current_position;
966 written = true; 966 written = true;
967 } 967 }
968 968
969 // Return whether something was written. 969 // Return whether something was written.
970 return written; 970 return written;
971 } 971 }
972 972
973 } } // namespace v8::internal 973 } } // namespace v8::internal
OLDNEW
« src/assembler.h ('K') | « src/assembler.h ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698