On 22 Jan 2016, at 16:46, suraev(a)alumni.ntnu.no
wrote:
+ * (C) 2015 by Sysmocom s.f.m.c. GmbH, Author: Max
<msuraev(a)sysmocom.de>
not too fair for the previous contributor? So Authors if we want to have it?
I let Harald comment on the right way to list authors in case they want to be
mentioned.
+/*! \brief get multiple bits (num_bits) from beginning of vector (MSB side) */
+int16_t bitvec_get_int16_msb(const struct bitvec *bv, unsigned int num_bits)
+{
+ if (num_bits > 15 || bv->cur_bit < num_bits) return -EINVAL;
coding style. Add newline here as well for the return
+
+ if (num_bits < 9) {
+ return bv->data[0] >> (8 - num_bits);
+ }
no braces,
+
+ uint8_t tmp[2];
variable definitions not on first use but at the beginning of the scope. :}
+
/*! \brief get multiple bits (based on numeric value) from current pos */
int bitvec_get_uint(struct bitvec *bv, unsigned int num_bits)
{
@@ -243,17 +260,26 @@ int bitvec_get_uint(struct bitvec *bv, unsigned int num_bits)
return ui;
}
-/*! \brief pad all remaining bits up to num_bits */
-int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit)
+/*! \brief fill num_bits with \fill starting from the current position
+ * returns 0 on success, negative otherwise (out of vector boundary)
+ */
+int bitvec_fill(struct bitvec *bv, unsigned int num_bits, enum bit_value fill)
{
- unsigned int i;
-
- for (i = bv->cur_bit; i <= up_to_bit; i++)
- bitvec_set_bit(bv, L);
+ unsigned i, stop = bv->cur_bit + num_bits;
+ for (i = bv->cur_bit; i < stop; i++)
+ if (bitvec_set_bit(bv, fill) < 0) return -EINVAL;
coding style, add newline and indent for the return statement.
return 0;
}
+/*! \brief pad all remaining bits up to num_bits */
+int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit)
+{
+ int n = up_to_bit - bv->cur_bit + 1;
+ if (n < 1) return 0;
coding style.
+ return bitvec_fill(bv, n, L);
+}
+
/*! \brief find first bit set in bit vector */
int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n,
enum bit_value val)
@@ -428,4 +454,94 @@ int bitvec_write_field(struct bitvec *bv, unsigned int write_index,
uint64_t val
return 0;
}
+/*! \brief convert enum to corresponding character */
+char bit_value_to_char(enum bit_value v)
+{
+ switch (v) {
+ case ZERO: return '0';
+ case ONE: return '1';
+ case L: return 'L';
+ case H: return 'H';
newline for the return?
+ }
+ return 'X'; // make compiler happy
is it complaining? use default: and __builtin_not_reached or such?
+}
+
+/*! \brief prints bit vector to provided string
+ * It's caller's responcibility to ensure that we won't shoot him in the
foot.
+ */
+void bitvec_to_string_r(const struct bitvec *bv, char *str)
+{
+ unsigned i, pos = 0;
+ char *cur = str;
+ for (i = 0; i < bv->cur_bit; i++) {
+ if (0 == i % 8) *cur++ = ' ';
coding style and add line wrapping
+ *cur++ = bit_value_to_char(bitvec_get_bit_pos(bv,
i));
+ pos++;
+ }
+ *cur = 0;
+}
+
+/* we assume that x have at least 1 non-b bit */
+static inline unsigned _leading_bits(uint8_t x, bool b)
+{
+ if (b) {
+ if (x < 0x80) return 0;
+ if (x < 0xC0) return 1;
+ if (x < 0xE0) return 2;
+ if (x < 0xF0) return 3;
+ if (x < 0xF8) return 4;
+ if (x < 0xFC) return 5;
+ if (x < 0xFE) return 6;
+ } else {
+ if (x > 0x7F) return 0;
+ if (x > 0x3F) return 1;
+ if (x > 0x1F) return 2;
+ if (x > 0xF) return 3;
+ if (x > 7) return 4;
+ if (x > 3) return 5;
+ if (x > 1) return 6;
+ }
same coding style thing
+ return 7;
+}
+/*! \brief force bit vector to all 0 and current bit to the beginnig of the vector */
+void bitvec_zero(struct bitvec *bv)
+{
+ bv->cur_bit = 0;
+ memset(bv->data, 0, bv->data_len);
+}
+
+/*! \brief Return number (bits) of uninterrupted run of \b in \bv starting from the MSB
*/
+unsigned bitvec_rl(const struct bitvec *bv, bool b)
+{
+ unsigned i;
+ for (i = 0; i < (bv->cur_bit % 8 ? bv->cur_bit / 8 + 1 : bv->cur_bit / 8);
i++) {
+ if ( (b ? 0xFF : 0) != bv->data[i]) return i * 8 + _leading_bits(bv->data[i],
b);
coding style add new line
+ }
+
+ return bv->cur_bit;
+}
+
+/*! \brief Shifts bitvec to the left, n MSB bits lost */
+void bitvec_shiftl(struct bitvec *bv, unsigned n)
+{
+ if (0 == n) return;
coding style
> + if (n >= bv->cur_bit) {
> + bitvec_zero(bv);
> + return;
> + }
> +
> + memmove(bv->data, bv->data + n / 8, bv->data_len - n / 8);
+
+ uint8_t tmp[2];
> + unsigned i;
> + for (i = 0; i < bv->data_len - 2; i++) {
> + uint16_t t = osmo_load16be(bv->data + i);
> + osmo_store16be(t << (n % 8), &tmp);
> + bv->data[i] = tmp[0];
> + }
> +
> + bv->data[bv->data_len - 1] <<= (n % 8);
> + bv->cur_bit -= n;
otherwise it does look fine.
holger