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

Side by Side Diff: src/disassembler.cc

Issue 7945009: Merge experimental/gc branch to the bleeding_edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 3 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/deoptimizer.cc ('k') | src/execution.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 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 // Instruction address and instruction offset. 194 // Instruction address and instruction offset.
195 out.AddFormatted("%p %4d ", prev_pc, prev_pc - begin); 195 out.AddFormatted("%p %4d ", prev_pc, prev_pc - begin);
196 196
197 // Instruction. 197 // Instruction.
198 out.AddFormatted("%s", decode_buffer.start()); 198 out.AddFormatted("%s", decode_buffer.start());
199 199
200 // Print all the reloc info for this instruction which are not comments. 200 // Print all the reloc info for this instruction which are not comments.
201 for (int i = 0; i < pcs.length(); i++) { 201 for (int i = 0; i < pcs.length(); i++) {
202 // Put together the reloc info 202 // Put together the reloc info
203 RelocInfo relocinfo(pcs[i], rmodes[i], datas[i]); 203 RelocInfo relocinfo(pcs[i], rmodes[i], datas[i], NULL);
204 204
205 // Indent the printing of the reloc info. 205 // Indent the printing of the reloc info.
206 if (i == 0) { 206 if (i == 0) {
207 // The first reloc info is printed after the disassembled instruction. 207 // The first reloc info is printed after the disassembled instruction.
208 out.AddPadding(' ', kRelocInfoPosition - out.position()); 208 out.AddPadding(' ', kRelocInfoPosition - out.position());
209 } else { 209 } else {
210 // Additional reloc infos are printed on separate lines. 210 // Additional reloc infos are printed on separate lines.
211 DumpBuffer(f, &out); 211 DumpBuffer(f, &out);
212 out.AddPadding(' ', kRelocInfoPosition); 212 out.AddPadding(' ', kRelocInfoPosition);
213 } 213 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 #else // ENABLE_DISASSEMBLER 340 #else // ENABLE_DISASSEMBLER
341 341
342 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {} 342 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {}
343 int Disassembler::Decode(FILE* f, byte* begin, byte* end) { return 0; } 343 int Disassembler::Decode(FILE* f, byte* begin, byte* end) { return 0; }
344 void Disassembler::Decode(FILE* f, Code* code) {} 344 void Disassembler::Decode(FILE* f, Code* code) {}
345 345
346 #endif // ENABLE_DISASSEMBLER 346 #endif // ENABLE_DISASSEMBLER
347 347
348 } } // namespace v8::internal 348 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/deoptimizer.cc ('k') | src/execution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698