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

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

Issue 9110029: Fix test-hashing after recent changes to string hashing. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 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
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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 bind(&done); 389 bind(&done);
390 } else { 390 } else {
391 usat(dst, satpos, src, cond); 391 usat(dst, satpos, src, cond);
392 } 392 }
393 } 393 }
394 394
395 395
396 void MacroAssembler::LoadRoot(Register destination, 396 void MacroAssembler::LoadRoot(Register destination,
397 Heap::RootListIndex index, 397 Heap::RootListIndex index,
398 Condition cond) { 398 Condition cond) {
399 ldr(destination, MemOperand(roots, index << kPointerSizeLog2), cond); 399 ldr(destination, MemOperand(kRootRegister, index << kPointerSizeLog2), cond);
400 } 400 }
401 401
402 402
403 void MacroAssembler::StoreRoot(Register source, 403 void MacroAssembler::StoreRoot(Register source,
404 Heap::RootListIndex index, 404 Heap::RootListIndex index,
405 Condition cond) { 405 Condition cond) {
406 str(source, MemOperand(roots, index << kPointerSizeLog2), cond); 406 str(source, MemOperand(kRootRegister, index << kPointerSizeLog2), cond);
407 } 407 }
408 408
409 409
410 void MacroAssembler::LoadHeapObject(Register result, 410 void MacroAssembler::LoadHeapObject(Register result,
411 Handle<HeapObject> object) { 411 Handle<HeapObject> object) {
412 if (isolate()->heap()->InNewSpace(*object)) { 412 if (isolate()->heap()->InNewSpace(*object)) {
413 Handle<JSGlobalPropertyCell> cell = 413 Handle<JSGlobalPropertyCell> cell =
414 isolate()->factory()->NewJSGlobalPropertyCell(object); 414 isolate()->factory()->NewJSGlobalPropertyCell(object);
415 mov(result, Operand(cell)); 415 mov(result, Operand(cell));
416 ldr(result, FieldMemOperand(result, JSGlobalPropertyCell::kValueOffset)); 416 ldr(result, FieldMemOperand(result, JSGlobalPropertyCell::kValueOffset));
(...skipping 3208 matching lines...) Expand 10 before | Expand all | Expand 10 after
3625 void CodePatcher::EmitCondition(Condition cond) { 3625 void CodePatcher::EmitCondition(Condition cond) {
3626 Instr instr = Assembler::instr_at(masm_.pc_); 3626 Instr instr = Assembler::instr_at(masm_.pc_);
3627 instr = (instr & ~kCondMask) | cond; 3627 instr = (instr & ~kCondMask) | cond;
3628 masm_.emit(instr); 3628 masm_.emit(instr);
3629 } 3629 }
3630 3630
3631 3631
3632 } } // namespace v8::internal 3632 } } // namespace v8::internal
3633 3633
3634 #endif // V8_TARGET_ARCH_ARM 3634 #endif // V8_TARGET_ARCH_ARM
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698