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

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

Issue 6460038: Version 3.1.3.... (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
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
« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/builtins.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 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 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 ldr(ip, MemOperand(topaddr)); 1143 ldr(ip, MemOperand(topaddr));
1144 cmp(result, ip); 1144 cmp(result, ip);
1145 Check(eq, "Unexpected allocation top"); 1145 Check(eq, "Unexpected allocation top");
1146 } 1146 }
1147 // Load allocation limit into ip. Result already contains allocation top. 1147 // Load allocation limit into ip. Result already contains allocation top.
1148 ldr(ip, MemOperand(topaddr, limit - top)); 1148 ldr(ip, MemOperand(topaddr, limit - top));
1149 } 1149 }
1150 1150
1151 // Calculate new top and bail out if new space is exhausted. Use result 1151 // Calculate new top and bail out if new space is exhausted. Use result
1152 // to calculate the new top. 1152 // to calculate the new top.
1153 add(scratch2, result, Operand(obj_size_reg)); 1153 add(scratch2, result, Operand(obj_size_reg), SetCC);
1154 b(cs, gc_required);
1154 cmp(scratch2, Operand(ip)); 1155 cmp(scratch2, Operand(ip));
1155 b(hi, gc_required); 1156 b(hi, gc_required);
1156 str(scratch2, MemOperand(topaddr)); 1157 str(scratch2, MemOperand(topaddr));
1157 1158
1158 // Tag object if requested. 1159 // Tag object if requested.
1159 if ((flags & TAG_OBJECT) != 0) { 1160 if ((flags & TAG_OBJECT) != 0) {
1160 add(result, result, Operand(kHeapObjectTag)); 1161 add(result, result, Operand(kHeapObjectTag));
1161 } 1162 }
1162 } 1163 }
1163 1164
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 Check(eq, "Unexpected allocation top"); 1223 Check(eq, "Unexpected allocation top");
1223 } 1224 }
1224 // Load allocation limit into ip. Result already contains allocation top. 1225 // Load allocation limit into ip. Result already contains allocation top.
1225 ldr(ip, MemOperand(topaddr, limit - top)); 1226 ldr(ip, MemOperand(topaddr, limit - top));
1226 } 1227 }
1227 1228
1228 // Calculate new top and bail out if new space is exhausted. Use result 1229 // Calculate new top and bail out if new space is exhausted. Use result
1229 // to calculate the new top. Object size may be in words so a shift is 1230 // to calculate the new top. Object size may be in words so a shift is
1230 // required to get the number of bytes. 1231 // required to get the number of bytes.
1231 if ((flags & SIZE_IN_WORDS) != 0) { 1232 if ((flags & SIZE_IN_WORDS) != 0) {
1232 add(scratch2, result, Operand(object_size, LSL, kPointerSizeLog2)); 1233 add(scratch2, result, Operand(object_size, LSL, kPointerSizeLog2), SetCC);
1233 } else { 1234 } else {
1234 add(scratch2, result, Operand(object_size)); 1235 add(scratch2, result, Operand(object_size), SetCC);
1235 } 1236 }
1237 b(cs, gc_required);
1236 cmp(scratch2, Operand(ip)); 1238 cmp(scratch2, Operand(ip));
1237 b(hi, gc_required); 1239 b(hi, gc_required);
1238 1240
1239 // Update allocation top. result temporarily holds the new top. 1241 // Update allocation top. result temporarily holds the new top.
1240 if (FLAG_debug_code) { 1242 if (FLAG_debug_code) {
1241 tst(scratch2, Operand(kObjectAlignmentMask)); 1243 tst(scratch2, Operand(kObjectAlignmentMask));
1242 Check(eq, "Unaligned allocation in new space"); 1244 Check(eq, "Unaligned allocation in new space");
1243 } 1245 }
1244 str(scratch2, MemOperand(topaddr)); 1246 str(scratch2, MemOperand(topaddr));
1245 1247
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2409 2411
2410 void CodePatcher::Emit(Address addr) { 2412 void CodePatcher::Emit(Address addr) {
2411 masm()->emit(reinterpret_cast<Instr>(addr)); 2413 masm()->emit(reinterpret_cast<Instr>(addr));
2412 } 2414 }
2413 #endif // ENABLE_DEBUGGER_SUPPORT 2415 #endif // ENABLE_DEBUGGER_SUPPORT
2414 2416
2415 2417
2416 } } // namespace v8::internal 2418 } } // namespace v8::internal
2417 2419
2418 #endif // V8_TARGET_ARCH_ARM 2420 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/lithium-codegen-arm.cc ('k') | src/builtins.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698