More small optimizations

Author: vinistock

st.c

@@ -939,29 +939,24 @@ find_table_entry_ind(st_table *tab, st_hash_t hash_value, st_data_t key)
 static st_index_t
 find_table_bin_ind(st_table *tab, st_hash_t hash_value, st_data_t key)
 {
-    int eq_p, rebuilt_p;
-    st_index_t ind;
-#ifdef QUADRATIC_PROBE
-    st_index_t d;
-#else
-    st_index_t peterb;
-#endif
-    st_index_t bin;
-    st_table_entry *entries = tab->entries;
-
     st_assert(tab != NULL);
     st_assert(tab->bins != NULL);
-    ind = hash_bin(hash_value, tab);
+
+    unsigned short int eq_p, rebuilt_p;
+    st_index_t ind = hash_bin(hash_value, tab);
+    st_index_t bin;
 #ifdef QUADRATIC_PROBE
-    d = 1;
+    st_index_t d = 1;
 #else
-    peterb = hash_value;
+    st_index_t peterb = hash_value;
 #endif
+
     FOUND_BIN;
+
     for (;;) {
         bin = get_bin(tab->bins, get_size_ind(tab), ind);
         if (! EMPTY_OR_DELETED_BIN_P(bin)) {
-	    DO_PTR_EQUAL_CHECK(tab, &entries[bin - ENTRY_BASE], hash_value, key, eq_p, rebuilt_p);
+	    DO_PTR_EQUAL_CHECK(tab, &tab->entries[bin - ENTRY_BASE], hash_value, key, eq_p, rebuilt_p);
 	    if (EXPECT(rebuilt_p, 0))
 		return REBUILT_TABLE_BIN_IND;
 	    if (eq_p)
@@ -985,29 +980,23 @@ find_table_bin_ind(st_table *tab, st_hash_t hash_value, st_data_t key)
 static st_index_t
 find_table_bin_ind_direct(st_table *tab, st_hash_t hash_value, st_data_t key)
 {
-    st_index_t ind;
-#ifdef QUADRATIC_PROBE
-    st_index_t d;
-#else
-    st_index_t peterb;
-#endif
-    st_index_t bin;
-    st_table_entry *entries = tab->entries;
-
     st_assert(tab != NULL);
     st_assert(tab->bins != NULL);
-    ind = hash_bin(hash_value, tab);
+
+    st_index_t ind = hash_bin(hash_value, tab);;
+    st_index_t bin;
 #ifdef QUADRATIC_PROBE
-    d = 1;
+    st_index_t d = 1;
 #else
-    peterb = hash_value;
+    st_index_t peterb = hash_value;
 #endif
+
     FOUND_BIN;
     for (;;) {
         bin = get_bin(tab->bins, get_size_ind(tab), ind);
         if (EMPTY_OR_DELETED_BIN_P(bin))
 	    return ind;
-	st_assert (entries[bin - ENTRY_BASE].hash != hash_value);
+	st_assert (tab->entries[bin - ENTRY_BASE].hash != hash_value);
 #ifdef QUADRATIC_PROBE
 	ind = hash_bin(ind + d, tab);
 	d++;
@@ -1031,7 +1020,7 @@ static st_index_t
 find_table_bin_ptr_and_reserve(st_table *tab, st_hash_t *hash_value,
 			       st_data_t key, st_index_t *bin_ind)
 {
-    int eq_p, rebuilt_p;
+    unsigned short int eq_p, rebuilt_p;
     st_index_t ind;
     st_hash_t curr_hash_value = *hash_value;
 #ifdef QUADRATIC_PROBE