Move bitmap manipulation functions in bitmap.h

src/trusted/validator_ragel/unreviewed/validator_internal.h

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * This file contains common parts of x86-32 and x86-64 internals (inline
  * functions and defines).
  */
@@ skipping 230 matching lines @@
 #define SET_IMM_TYPE_IMM8 (instruction_info_collected += IMMEDIATE_8BIT)
 #define SET_IMM_TYPE_IMM16 (instruction_info_collected += IMMEDIATE_16BIT)
 #define SET_IMM_TYPE_IMM32 (instruction_info_collected += IMMEDIATE_32BIT)
 #define SET_IMM_TYPE_IMM64 (instruction_info_collected += IMMEDIATE_64BIT)
 #define SET_IMM2_TYPE(T) SET_IMM2_TYPE_##T
 #define SET_IMM2_TYPE_IMM8 \
     (instruction_info_collected += SECOND_IMMEDIATE_8BIT)
 #define SET_IMM2_TYPE_IMM16 \
     (instruction_info_collected += SECOND_IMMEDIATE_16BIT)
 
-#define BITMAP_WORD_NAME BITMAP_WORD_NAME1(NACL_HOST_WORDSIZE)
-#define BITMAP_WORD_NAME1(size) BITMAP_WORD_NAME2(size)
-#define BITMAP_WORD_NAME2(size) uint##size##_t
-
-typedef BITMAP_WORD_NAME bitmap_word;
-
-static INLINE bitmap_word *BitmapAllocate(size_t indexes) {
-  bitmap_word *bitmap;
-  size_t byte_count = ((indexes + NACL_HOST_WORDSIZE - 1) / NACL_HOST_WORDSIZE)*
-                      sizeof *bitmap;
-  bitmap = malloc(byte_count);
-  if (bitmap != NULL) {
-    memset(bitmap, 0, byte_count);
-  }
-  return bitmap;
-}
-
-static FORCEINLINE int BitmapIsBitSet(bitmap_word *bitmap, size_t index) {
-  return (bitmap[index / NACL_HOST_WORDSIZE] &
-                       (((bitmap_word)1) << (index % NACL_HOST_WORDSIZE))) != 0;
-}
-
-static FORCEINLINE void BitmapSetBit(bitmap_word *bitmap, size_t index) {
-  bitmap[index / NACL_HOST_WORDSIZE] |=
-                               ((bitmap_word)1) << (index % NACL_HOST_WORDSIZE);
-}
-
-static FORCEINLINE void BitmapClearBit(bitmap_word *bitmap, size_t index) {
-  bitmap[index / NACL_HOST_WORDSIZE] &=
-                            ~(((bitmap_word)1) << (index % NACL_HOST_WORDSIZE));
-}
-
-/* All the bits must be in a single 32-bit bundle.  */
-static FORCEINLINE int BitmapIsAnyBitSet(bitmap_word *bitmap,
-                                         size_t index, size_t bits) {
-  return (bitmap[index / NACL_HOST_WORDSIZE] &
-       (((((bitmap_word)1) << bits) - 1) << (index % NACL_HOST_WORDSIZE))) != 0;
-}
-
-/* All the bits must be in a single 32-bit bundle. */
-static FORCEINLINE void BitmapSetBits(bitmap_word *bitmap,
-                                      size_t index,
-                                      size_t bits) {
-  bitmap[index / NACL_HOST_WORDSIZE] |=
-               ((((bitmap_word)1) << bits) - 1) << (index % NACL_HOST_WORDSIZE);
-}
-
-/* All the bits must be in a single 32-bit bundle. */
-static FORCEINLINE void BitmapClearBits(bitmap_word *bitmap,
-                                        size_t index, size_t bits) {
-  bitmap[index / NACL_HOST_WORDSIZE] &=
-            ~(((((bitmap_word)1) << bits) - 1) << (index % NACL_HOST_WORDSIZE));
-}
-
 /* Mark the destination of a jump instruction and make an early validity check:
  * to jump outside given code region, the target address must be aligned.
  *
  * Returns TRUE iff the jump passes the early validity check.
  */
 static FORCEINLINE int MarkJumpTarget(size_t jump_dest,
                                       bitmap_word *jump_dests,
                                       size_t size) {
   if ((jump_dest & kBundleMask) == 0) {
     return TRUE;
@@ skipping 543 matching lines @@
     const uint8_t *data,
     bitmap_word *valid_targets) {
   if (VerifyNaclCallOrJmpAddToReg(*instruction_start, current_position))
     ExpandSuperinstructionBySandboxingBytes(
       4 /* and */ + 3 /* add */, instruction_start, data, valid_targets);
   else
     *instruction_info_collected |= UNRECOGNIZED_INSTRUCTION;
 }
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_VALIDATOR_RAGEL_VALIDATOR_INTERNAL_H_ */