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

Unified Diff: runtime/vm/stub_code_arm.cc

Issue 636983003: Atomic update of header word on ARM. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/pages.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_arm.cc
===================================================================
--- runtime/vm/stub_code_arm.cc (revision 41358)
+++ runtime/vm/stub_code_arm.cc (working copy)
@@ -1045,8 +1045,25 @@
__ Ret();
__ Bind(&add_to_buffer);
- __ orr(R2, R2, Operand(1 << RawObject::kRememberedBit));
- __ str(R2, FieldAddress(R0, Object::tags_offset()));
+ // R2: Header word.
+ if (TargetCPUFeatures::arm_version() == ARMv5TE) {
+ // TODO(21263): Implement 'swp' and use it below.
+ ASSERT(OS::NumberOfAvailableProcessors() <= 1);
+ __ orr(R2, R2, Operand(1 << RawObject::kRememberedBit));
+ __ str(R2, FieldAddress(R0, Object::tags_offset()));
+ } else {
+ // Atomically set the remembered bit of the object header.
+ ASSERT(Object::tags_offset() == 0);
+ __ sub(R3, R0, Operand(kHeapObjectTag));
+ // R3: Untagged address of header word (ldrex/strex do not support offsets).
+ Label retry;
+ __ Bind(&retry);
+ __ ldrex(R2, R3);
+ __ orr(R2, R2, Operand(1 << RawObject::kRememberedBit));
+ __ strex(R1, R2, R3);
+ __ cmp(R1, Operand(1));
+ __ b(&retry, EQ);
+ }
// Load the isolate.
// Spilled: R1, R2, R3.
« no previous file with comments | « runtime/vm/pages.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698