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

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

Issue 11744020: Rename RelocInfo::NONE to RelocInfo::NONE32. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 11 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/assembler-arm.h ('k') | src/arm/assembler-arm-inl.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 (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 5 // modification, are permitted provided that the following conditions
6 // are met: 6 // are 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 rm_ = no_reg; 227 rm_ = no_reg;
228 // Verify all Objects referred by code are NOT in new space. 228 // Verify all Objects referred by code are NOT in new space.
229 Object* obj = *handle; 229 Object* obj = *handle;
230 ASSERT(!HEAP->InNewSpace(obj)); 230 ASSERT(!HEAP->InNewSpace(obj));
231 if (obj->IsHeapObject()) { 231 if (obj->IsHeapObject()) {
232 imm32_ = reinterpret_cast<intptr_t>(handle.location()); 232 imm32_ = reinterpret_cast<intptr_t>(handle.location());
233 rmode_ = RelocInfo::EMBEDDED_OBJECT; 233 rmode_ = RelocInfo::EMBEDDED_OBJECT;
234 } else { 234 } else {
235 // no relocation needed 235 // no relocation needed
236 imm32_ = reinterpret_cast<intptr_t>(obj); 236 imm32_ = reinterpret_cast<intptr_t>(obj);
237 rmode_ = RelocInfo::NONE; 237 rmode_ = RelocInfo::NONE32;
238 } 238 }
239 } 239 }
240 240
241 241
242 Operand::Operand(Register rm, ShiftOp shift_op, int shift_imm) { 242 Operand::Operand(Register rm, ShiftOp shift_op, int shift_imm) {
243 ASSERT(is_uint5(shift_imm)); 243 ASSERT(is_uint5(shift_imm));
244 ASSERT(shift_op != ROR || shift_imm != 0); // use RRX if you mean it 244 ASSERT(shift_op != ROR || shift_imm != 0); // use RRX if you mean it
245 rm_ = rm; 245 rm_ = rm;
246 rs_ = no_reg; 246 rs_ = no_reg;
247 shift_op_ = shift_op; 247 shift_op_ = shift_op;
(...skipping 2671 matching lines...) Expand 10 before | Expand all | Expand 10 after
2919 2919
2920 // Since a constant pool was just emitted, move the check offset forward by 2920 // Since a constant pool was just emitted, move the check offset forward by
2921 // the standard interval. 2921 // the standard interval.
2922 next_buffer_check_ = pc_offset() + kCheckPoolInterval; 2922 next_buffer_check_ = pc_offset() + kCheckPoolInterval;
2923 } 2923 }
2924 2924
2925 2925
2926 } } // namespace v8::internal 2926 } } // namespace v8::internal
2927 2927
2928 #endif // V8_TARGET_ARCH_ARM 2928 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/assembler-arm.h ('k') | src/arm/assembler-arm-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698