Unify markbits for old and new spaces.

src/ia32/macro-assembler-ia32.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 87 matching lines @@
   // Check if an object has a given incremental marking colour.  Also uses ecx!
   // The colour bits are found by splitting the address at the bit offset
   // indicated by the mask: bits that are zero in the mask are used for the
   // address of the bitmap, and bits that are one in the mask are used for the
   // index of the bit.
   template <typename LabelType>
   void HasColour(Register object,
                  Register scratch0,
                  Register scratch1,
                  LabelType* has_colour,
-                 uint32_t mask,
-                 int header_size,
                  int first_bit,
-                 int second_bit,
-                 bool in_new_space);
+                 int second_bit);
 
   template <typename LabelType>
   void InOldSpaceIsBlack(Register object,
                          Register scratch0,
                          Register scratch1,
                          LabelType* is_black);
 
   template <typename LabelType>
   void InNewSpaceIsBlack(Register object,
                          Register scratch0,
@@ skipping 658 matching lines @@
   MUST_USE_RESULT MaybeObject* PopHandleScopeHelper(Register saved,
                                                     Register scratch,
                                                     bool gc_allowed);
 
   // Helper for finding the mark bits for an address.  Afterwards, the
   // bitmap register points at the word with the mark bits and the mask
   // the position of the first bit.  Uses ecx as scratch and leaves addr_reg
   // unchanged.
   inline void MarkBits(Register addr_reg,
                        Register bitmap_reg,
-                       Register mask_reg,
-                       int32_t high_mask,
-                       bool in_new_space);
+                       Register mask_reg);
 
   // Compute memory operands for safepoint stack slots.
   Operand SafepointRegisterSlot(Register reg);
   static int SafepointRegisterStackIndex(int reg_code);
 
   // Needs access to SafepointRegisterStackIndex for optimized frame
   // traversal.
   friend class OptimizedFrame;
 };
 
@@ skipping 99 matching lines @@
   }                                                                       \
   masm->
 #else
 #define ACCESS_MASM(masm) masm->
 #endif
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_IA32_MACRO_ASSEMBLER_IA32_H_