Index: src/ia32/macro-assembler-ia32.h |
diff --git a/src/ia32/macro-assembler-ia32.h b/src/ia32/macro-assembler-ia32.h |
index 05ad82d45bb4480cb0e724d01b41b7369400418c..f003948a6e494442599c3f8db9a5ae7bbe6e5903 100644 |
--- a/src/ia32/macro-assembler-ia32.h |
+++ b/src/ia32/macro-assembler-ia32.h |
@@ -564,22 +564,22 @@ class MacroAssembler: public Assembler { |
// --------------------------------------------------------------------------- |
// Allocation support |
- // Allocate an object in new space. If the new space is exhausted control |
- // continues at the gc_required label. The allocated object is returned in |
- // result and end of the new object is returned in result_end. The register |
- // scratch can be passed as no_reg in which case an additional object |
- // reference will be added to the reloc info. The returned pointers in result |
- // and result_end have not yet been tagged as heap objects. If |
- // result_contains_top_on_entry is true the content of result is known to be |
- // the allocation top on entry (could be result_end from a previous call to |
- // AllocateInNewSpace). If result_contains_top_on_entry is true scratch |
+ // Allocate an object in new space or old pointer space. If the given space |
+ // is exhausted control continues at the gc_required label. The allocated |
+ // object is returned in result and end of the new object is returned in |
+ // result_end. The register scratch can be passed as no_reg in which case |
+ // an additional object reference will be added to the reloc info. The |
+ // returned pointers in result and result_end have not yet been tagged as |
+ // heap objects. If result_contains_top_on_entry is true the content of |
+ // result is known to be the allocation top on entry (could be result_end |
+ // from a previous call). If result_contains_top_on_entry is true scratch |
// should be no_reg as it is never used. |
- void AllocateInNewSpace(int object_size, |
- Register result, |
- Register result_end, |
- Register scratch, |
- Label* gc_required, |
- AllocationFlags flags); |
+ void Allocate(int object_size, |
+ Register result, |
+ Register result_end, |
+ Register scratch, |
+ Label* gc_required, |
+ AllocationFlags flags); |
void AllocateInNewSpace(int header_size, |
ScaleFactor element_size, |
@@ -910,7 +910,10 @@ class MacroAssembler: public Assembler { |
void LoadAllocationTopHelper(Register result, |
Register scratch, |
AllocationFlags flags); |
- void UpdateAllocationTopHelper(Register result_end, Register scratch); |
+ |
+ void UpdateAllocationTopHelper(Register result_end, |
+ Register scratch, |
+ AllocationFlags flags); |
// Helper for PopHandleScope. Allowed to perform a GC and returns |
// NULL if gc_allowed. Does not perform a GC if !gc_allowed, and |