X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=type.c;h=7a406bdcfee3315c986e37e448e602c94281d6bf;hb=6a9cb81d6a96969b8608d395820f20d5b0d5baaa;hp=8749b21b2295994119ac5af8fa28c5536bcc280f;hpb=e849b35ca637658d5fc0b4c9fee6651f340421c8;p=cparser

diff --git a/type.c b/type.c
index 8749b21..7a406bd 100644
--- a/type.c
+++ b/type.c
@@ -204,7 +204,8 @@ void init_types(void)
 	}
 
 	unsigned int_size   = machine_size < 32 ? 2 : 4;
-	unsigned long_size  = machine_size < 64 ? 4 : 8;
+	/* long is always 32bit on windows */
+	unsigned long_size  = c_mode & _MS ? 4 : (machine_size < 64 ? 4 : 8);
 	unsigned llong_size = machine_size < 32 ? 4 : 8;
 
 	props[ATOMIC_TYPE_INT].size            = int_size;
@@ -222,11 +223,19 @@ void init_types(void)
 
 	/* TODO: backend specific, need a way to query the backend for this.
 	 * The following are good settings for x86 */
-	props[ATOMIC_TYPE_FLOAT].alignment       = 4;
-	props[ATOMIC_TYPE_DOUBLE].alignment      = 4;
-	props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4;
-	props[ATOMIC_TYPE_LONGLONG].alignment    = 4;
-	props[ATOMIC_TYPE_ULONGLONG].alignment   = 4;
+	if (machine_size <= 32) {
+		props[ATOMIC_TYPE_FLOAT].alignment       = 4;
+		props[ATOMIC_TYPE_DOUBLE].alignment      = 4;
+		props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4;
+		props[ATOMIC_TYPE_LONGLONG].alignment    = 4;
+		props[ATOMIC_TYPE_ULONGLONG].alignment   = 4;
+	} else {
+		props[ATOMIC_TYPE_FLOAT].alignment       = 4;
+		props[ATOMIC_TYPE_DOUBLE].alignment      = 8;
+		props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 8;
+		props[ATOMIC_TYPE_LONGLONG].alignment    = 8;
+		props[ATOMIC_TYPE_ULONGLONG].alignment   = 8;
+	}
 	if (force_long_double_size > 0) {
 		props[ATOMIC_TYPE_LONG_DOUBLE].size      = force_long_double_size;
 		props[ATOMIC_TYPE_LONG_DOUBLE].alignment = force_long_double_size;
@@ -773,11 +782,6 @@ void print_type(const type_t *const type)
 void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const scope_t *parameters)
 {
-	if (type == NULL) {
-		print_string("nil type");
-		return;
-	}
-
 	intern_print_type_pre(type);
 	if (symbol != NULL) {
 		print_string(" ");
@@ -1682,57 +1686,6 @@ type_t *make_array_type(type_t *element_type, size_t size,
 	return identify_new_type(type);
 }
 
-static entity_t *pack_bitfield_members_big_endian(il_size_t *struct_offset,
-		il_alignment_t *struct_alignment, bool packed, entity_t *first)
-{
-	type_t        *current_base_type = NULL;
-	il_size_t      offset            = *struct_offset;
-	il_alignment_t alignment         = *struct_alignment;
-	size_t         bit_offset        = 0;
-
-	if (packed)
-		panic("packed bitfields on big-endian arch not supported yet");
-
-	entity_t *member;
-	for (member = first; member != NULL; member = member->base.next) {
-		if (member->kind != ENTITY_COMPOUND_MEMBER)
-			continue;
-
-		type_t *type = member->declaration.type;
-		if (type->kind != TYPE_BITFIELD)
-			break;
-
-		size_t  bit_size  = type->bitfield.bit_size;
-		type_t *base_type = skip_typeref(type->bitfield.base_type);
-
-		/* see if we need to start a new "bucket" */
-		if (base_type != current_base_type || bit_size > bit_offset) {
-			if (current_base_type != NULL)
-				offset += get_type_size(current_base_type);
-
-			current_base_type = base_type;
-			il_alignment_t base_alignment = get_type_alignment(base_type);
-			il_alignment_t alignment_mask = base_alignment-1;
-			if (base_alignment > alignment)
-				alignment = base_alignment;
-			offset     = (offset + base_alignment-1) & ~alignment_mask;
-			bit_offset = get_type_size(base_type) * BITS_PER_BYTE;
-			assert(bit_offset >= bit_size);
-		}
-
-		bit_offset -= bit_size;
-		member->compound_member.offset     = offset;
-		member->compound_member.bit_offset = bit_offset;
-	}
-
-	if (current_base_type != NULL)
-		offset += get_type_size(current_base_type);
-
-	*struct_offset    = offset;
-	*struct_alignment = alignment;
-	return member;
-}
-
 static entity_t *pack_bitfield_members(il_size_t *struct_offset,
                                        il_alignment_t *struct_alignment,
 									   bool packed, entity_t *first)
@@ -1769,8 +1722,14 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset,
 			}
 		}
 
-		member->compound_member.offset     = offset;
-		member->compound_member.bit_offset = bit_offset;
+		if (byte_order_big_endian) {
+			size_t base_size = get_type_size(base_type) * BITS_PER_BYTE;
+			member->compound_member.offset     = offset & ~alignment_mask;
+			member->compound_member.bit_offset = base_size - bit_offset - bit_size;
+		} else {
+			member->compound_member.offset     = offset;
+			member->compound_member.bit_offset = bit_offset;
+		}
 
 		bit_offset += bit_size;
 		offset     += bit_offset / BITS_PER_BYTE;
@@ -1814,14 +1773,8 @@ void layout_struct_type(compound_type_t *type)
 		}
 
 		if (skipped->kind == TYPE_BITFIELD) {
-			if (byte_order_big_endian) {
-				entry = pack_bitfield_members_big_endian(&offset, &alignment,
-				                                         compound->packed,
-				                                         entry);
-			} else {
-				entry = pack_bitfield_members(&offset, &alignment,
-				                              compound->packed, entry);
-			}
+			entry = pack_bitfield_members(&offset, &alignment,
+			                              compound->packed, entry);
 			continue;
 		}