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

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

Issue 11360251: Make kAsciiDataHintTag have correct semantics for all both 1 and 2 byte string types. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 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
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/ia32/code-stubs-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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 3320 matching lines...) Expand 10 before | Expand all | Expand 10 after
3331 } 3331 }
3332 3332
3333 3333
3334 void MacroAssembler::JumpIfBothInstanceTypesAreNotSequentialAscii( 3334 void MacroAssembler::JumpIfBothInstanceTypesAreNotSequentialAscii(
3335 Register first, 3335 Register first,
3336 Register second, 3336 Register second,
3337 Register scratch1, 3337 Register scratch1,
3338 Register scratch2, 3338 Register scratch2,
3339 Label* failure) { 3339 Label* failure) {
3340 int kFlatAsciiStringMask = 3340 int kFlatAsciiStringMask =
3341 kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask; 3341 kIsNotStringMask | kStringEncodingMask | kAsciiDataHintMask |
3342 kStringRepresentationMask;
3342 int kFlatAsciiStringTag = ASCII_STRING_TYPE; 3343 int kFlatAsciiStringTag = ASCII_STRING_TYPE;
3344 ASSERT_EQ(ASCII_STRING_TYPE, ASCII_STRING_TYPE & kFlatAsciiStringMask);
3343 and_(scratch1, first, Operand(kFlatAsciiStringMask)); 3345 and_(scratch1, first, Operand(kFlatAsciiStringMask));
3344 and_(scratch2, second, Operand(kFlatAsciiStringMask)); 3346 and_(scratch2, second, Operand(kFlatAsciiStringMask));
3345 cmp(scratch1, Operand(kFlatAsciiStringTag)); 3347 cmp(scratch1, Operand(kFlatAsciiStringTag));
3346 // Ignore second test if first test failed. 3348 // Ignore second test if first test failed.
3347 cmp(scratch2, Operand(kFlatAsciiStringTag), eq); 3349 cmp(scratch2, Operand(kFlatAsciiStringTag), eq);
3348 b(ne, failure); 3350 b(ne, failure);
3349 } 3351 }
3350 3352
3351 3353
3352 void MacroAssembler::JumpIfInstanceTypeIsNotSequentialAscii(Register type, 3354 void MacroAssembler::JumpIfInstanceTypeIsNotSequentialAscii(Register type,
3353 Register scratch, 3355 Register scratch,
3354 Label* failure) { 3356 Label* failure) {
3355 int kFlatAsciiStringMask = 3357 int kFlatAsciiStringMask =
3356 kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask; 3358 kIsNotStringMask | kStringEncodingMask | kAsciiDataHintMask |
3359 kStringRepresentationMask;
3357 int kFlatAsciiStringTag = ASCII_STRING_TYPE; 3360 int kFlatAsciiStringTag = ASCII_STRING_TYPE;
3361 ASSERT_EQ(ASCII_STRING_TYPE, ASCII_STRING_TYPE & kFlatAsciiStringMask);
3358 and_(scratch, type, Operand(kFlatAsciiStringMask)); 3362 and_(scratch, type, Operand(kFlatAsciiStringMask));
3359 cmp(scratch, Operand(kFlatAsciiStringTag)); 3363 cmp(scratch, Operand(kFlatAsciiStringTag));
3360 b(ne, failure); 3364 b(ne, failure);
3361 } 3365 }
3362 3366
3363 static const int kRegisterPassedArguments = 4; 3367 static const int kRegisterPassedArguments = 4;
3364 3368
3365 3369
3366 int MacroAssembler::CalculateStackPassedWords(int num_reg_arguments, 3370 int MacroAssembler::CalculateStackPassedWords(int num_reg_arguments,
3367 int num_double_arguments) { 3371 int num_double_arguments) {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
3877 void CodePatcher::EmitCondition(Condition cond) { 3881 void CodePatcher::EmitCondition(Condition cond) {
3878 Instr instr = Assembler::instr_at(masm_.pc_); 3882 Instr instr = Assembler::instr_at(masm_.pc_);
3879 instr = (instr & ~kCondMask) | cond; 3883 instr = (instr & ~kCondMask) | cond;
3880 masm_.emit(instr); 3884 masm_.emit(instr);
3881 } 3885 }
3882 3886
3883 3887
3884 } } // namespace v8::internal 3888 } } // namespace v8::internal
3885 3889
3886 #endif // V8_TARGET_ARCH_ARM 3890 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/ia32/code-stubs-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698