- /* normalize offset */
- vals += offset_bits >> 3;
- offset_bits &= 7;
- value_len = get_mode_size_bits(mode);
-
- /* combine bits with existing bits */
- for (j = 0; value_len + (int) offset_bits > 0; ++j) {
- assert((size_t) (vals - glob_vals) + j < max_vals);
- assert(vals[j].kind == BITFIELD ||
- (vals[j].kind == NORMAL && vals[j].v.value == NULL));
- vals[j].kind = BITFIELD;
- curr_bits = get_tarval_sub_bits(tv, j);
- vals[j].v.bf_val
- |= (last_bits >> (8 - offset_bits)) | (curr_bits << offset_bits);
- value_len -= 8;
- last_bits = curr_bits;
+ value_len = get_type_size_bytes(get_primitive_base_type(type));
+ bit_offset = 0;
+ end = get_mode_size_bits(mode);
+ while (bit_offset < end) {
+ size_t src_offset = bit_offset / BITS_PER_BYTE;
+ size_t src_offset_bits = bit_offset % BITS_PER_BYTE;
+ size_t dst_offset = (bit_offset+offset_bits) / BITS_PER_BYTE;
+ size_t dst_offset_bits = (bit_offset+offset_bits) % BITS_PER_BYTE;
+ size_t src_bits_len = end-bit_offset;
+ size_t dst_bits_len = BITS_PER_BYTE-dst_offset_bits;
+ unsigned char curr_bits;
+ normal_or_bitfield *val;
+ if (src_bits_len > dst_bits_len)
+ src_bits_len = dst_bits_len;
+
+ if (big_endian) {
+ val = &vals[value_len - dst_offset - 1];
+ } else {
+ val = &vals[dst_offset];
+ }
+
+ assert((val-glob_vals) < (ptrdiff_t) max_vals);
+ assert(val->kind == BITFIELD ||
+ (val->kind == NORMAL && val->v.value == NULL));
+ val->kind = BITFIELD;
+ curr_bits = get_tarval_sub_bits(tv, src_offset);
+ curr_bits = curr_bits >> src_offset_bits;
+ if (src_offset_bits + src_bits_len > 8) {
+ unsigned next_bits = get_tarval_sub_bits(tv, src_offset+1);
+ curr_bits |= next_bits << (8 - src_offset_bits);
+ }
+ curr_bits &= (1 << src_bits_len) - 1;
+ val->v.bf_val |= curr_bits << dst_offset_bits;
+
+ bit_offset += dst_bits_len;