Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator_arm/address_set.h

Index: src/trusted/validator_arm/address_set.h
diff --git a/src/trusted/validator_arm/address_set.h b/src/trusted/validator_arm/address_set.h
index 7f4436d7d17de7bb7564c86e5c611905b5ddd26d..1b68d08ebe400dcea38bbdab67a616e58c9cbfb8 100644
--- a/src/trusted/validator_arm/address_set.h
+++ b/src/trusted/validator_arm/address_set.h
@@ -16,10 +16,10 @@ namespace nacl_arm_val {
  * A set of word addresses, implemented as a dense bitset.
  *
  * An AddressSet has a base address and a size, in bytes, of the space to
- * describe.  Describing N bytes costs N/32 bytes here, since we only record
- * word addresses (4-byte alignment) and pack 8 per byte.
+ * describe.  Describing N bytes costs N/16 bytes here, since we only record
+ * half-word addresses (2-byte alignment) and pack 8 per byte.
  *
- * Thus, an AddressSet covering the entire 256MB code region costs 8MB, plus
+ * Thus, an AddressSet covering the entire 256MB code region costs 16MB, plus
  * a small constant overhead (~16 bytes).
  */
 class AddressSet {
@@ -35,14 +35,14 @@ class AddressSet {
    * - If the address is already in the set, nothing changes.
    * - If the address is outside of this set's range (delimited by base and size
    *   provided at construction), nothing changes.
-   * - If the address is not 4-byte aligned, the address of the 4-byte word
+   * - If the address is not 2-byte aligned, the address of the 2-byte word
    *   containing the address is added instead.
    */
   void add(uint32_t address);
 
   /*
    * Checks whether the AddressSet contains an address.  If the address is not
-   * 4-byte aligned, the address of the 4-byte word containing the address is
+   * 2-byte aligned, the address of the 2-byte word containing the address is
    * checked instead.
    */
   bool contains(uint32_t address) const;