Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator_arm/address_set.cc

Index: src/trusted/validator_arm/address_set.cc
diff --git a/src/trusted/validator_arm/address_set.cc b/src/trusted/validator_arm/address_set.cc
index 3c9b8bc20404d8d6557aa032964ab12048fe9a9d..9653060cf7c50becc2e409e553f9986660471f60 100644
--- a/src/trusted/validator_arm/address_set.cc
+++ b/src/trusted/validator_arm/address_set.cc
@@ -9,11 +9,16 @@
 #include <stdio.h>
 #include <string.h>
 
+#define ADDRFACTOR sizeof(uint16_t)
+#define BITSINADDRF (ADDRFACTOR * 8)
+#define RUPADDR    (ADDRFACTOR - 1)
+
 namespace nacl_arm_val {
 
 AddressSet::AddressSet(uint32_t base, uint32_t size)
-    : base_(base), size_(size), bits_(new uint32_t[(size + 3) / 4]) {
-  memset(bits_, 0, sizeof(uint32_t) * ((size + 3) / 4));
+    : base_(base), size_(size),
+      bits_(new uint32_t[(size + RUPADDR) / ADDRFACTOR]) {
+  memset(bits_, 0, sizeof(uint32_t) * ((size + RUPADDR) / ADDRFACTOR));
 }
 
 AddressSet::~AddressSet() {
@@ -22,7 +27,7 @@ AddressSet::~AddressSet() {
 
 void AddressSet::add(uint32_t address) {
   if ((address - base_) < size_) {
-    uint32_t word_address = (address - base_) / sizeof(uint32_t);
+    uint32_t word_address = (address - base_) / ADDRFACTOR;
 
     bits_[word_address / 32] |= 1 << (word_address % 32);
   }
@@ -30,7 +35,7 @@ void AddressSet::add(uint32_t address) {
 
 bool AddressSet::contains(uint32_t address) const {
   if ((address - base_) < size_) {
-    uint32_t word_address = (address - base_) / sizeof(uint32_t);
+    uint32_t word_address = (address - base_) / ADDRFACTOR;
 
     return bits_[word_address / 32] & (1 << (word_address % 32));
   } else {
@@ -43,7 +48,7 @@ AddressSet::Iterator AddressSet::begin() const {
 }
 
 AddressSet::Iterator AddressSet::end() const {
-  return Iterator(*this, (size_ + 3) / 4, 0);
+  return Iterator(*this, (size_ + RUPADDR) / ADDRFACTOR, 0);
 }
 
 AddressSet::Iterator::Iterator(const AddressSet &parent,
@@ -64,11 +69,11 @@ bool AddressSet::Iterator::operator!=(const AddressSet::Iterator &other) const {
 }
 
 uint32_t AddressSet::Iterator::operator*() const {
-  return parent_.base_ + 4 * ((index_ * 32) + shift_);
+  return parent_.base_ + ADDRFACTOR * ((index_ * 32) + shift_);
 }
 
 void AddressSet::Iterator::advance() {
-  uint32_t max_index = (parent_.size_ + 3) / 4;
+  uint32_t max_index = (parent_.size_ + RUPADDR) / ADDRFACTOR;
 
   for (; index_ < max_index; index_++) {
     uint32_t word = (shift_ > 31)? 0 : parent_.bits_[index_] >> shift_;