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

Side by Side Diff: src/ia32/codegen-ia32.cc

Issue 8569008: Port r10023 to x64 (Add pointer cache field to external string). (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: . Created 9 years, 1 month 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 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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 // Handle external strings. 556 // Handle external strings.
557 Label external_string, ascii_external, done; 557 Label external_string, ascii_external, done;
558 __ bind(&external_string); 558 __ bind(&external_string);
559 if (FLAG_debug_code) { 559 if (FLAG_debug_code) {
560 // Assert that we do not have a cons or slice (indirect strings) here. 560 // Assert that we do not have a cons or slice (indirect strings) here.
561 // Sequential strings have already been ruled out. 561 // Sequential strings have already been ruled out.
562 __ test(result, Immediate(kIsIndirectStringMask)); 562 __ test(result, Immediate(kIsIndirectStringMask));
563 __ Assert(zero, "external string expected, but not found"); 563 __ Assert(zero, "external string expected, but not found");
564 } 564 }
565 __ mov(result, FieldOperand(string, ExternalString::kResourceDataOffset)); 565 __ mov(result, FieldOperand(string, ExternalString::kResourceDataOffset));
566 // Assert that the external string has not been finalized yet. 566 // Assert that the data pointer cache is valid.
Lasse Reichstein 2011/11/24 09:21:42 This shouldn't be necessary any more, right? The c
567 __ test(result, result); 567 __ test(result, result);
568 __ j(zero, call_runtime); 568 __ j(zero, call_runtime);
569 Register scratch = string; 569 Register scratch = string;
570 __ mov(scratch, FieldOperand(string, HeapObject::kMapOffset)); 570 __ mov(scratch, FieldOperand(string, HeapObject::kMapOffset));
571 __ cmp(scratch, Immediate(factory->external_ascii_string_map())); 571 __ cmp(scratch, Immediate(factory->external_ascii_string_map()));
572 __ j(equal, &ascii_external, Label::kNear); 572 __ j(equal, &ascii_external, Label::kNear);
573 __ cmp(scratch, Immediate(factory->external_ascii_symbol_map())); 573 __ cmp(scratch, Immediate(factory->external_ascii_symbol_map()));
574 __ j(equal, &ascii_external, Label::kNear); 574 __ j(equal, &ascii_external, Label::kNear);
575 // Two-byte string. 575 // Two-byte string.
576 __ movzx_w(result, Operand(result, index, times_2, 0)); 576 __ movzx_w(result, Operand(result, index, times_2, 0));
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 times_1, 629 times_1,
630 SeqAsciiString::kHeaderSize)); 630 SeqAsciiString::kHeaderSize));
631 __ bind(&done); 631 __ bind(&done);
632 } 632 }
633 633
634 #undef __ 634 #undef __
635 635
636 } } // namespace v8::internal 636 } } // namespace v8::internal
637 637
638 #endif // V8_TARGET_ARCH_IA32 638 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/ia32/codegen-ia32.h ('k') | src/x64/code-stubs-x64.cc » ('j') | src/x64/codegen-x64.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698