X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=types.c;h=812dc68c860bc210d15f59bfd790e313eda2b0c6;hb=f109471af0f1a95e840a66c9e136409d0973021c;hp=6ac6f59ea2a8e36600cd264663c8a62d6ab1d282;hpb=20bf09ee9b984f3d029e5c45aa7d271ea6520dc0;p=cparser

diff --git a/types.c b/types.c
index 6ac6f59..812dc68 100644
--- a/types.c
+++ b/types.c
@@ -19,11 +19,15 @@
  */
 #include "type_t.h"
 #include "types.h"
+#include "lang_features.h"
+#include "entity_t.h"
 
 /** The error type. */
 type_t *type_error_type;
 
+type_t *type_bool;
 type_t *type_char;
+type_t *type_const_char;
 type_t *type_double;
 type_t *type_float;
 type_t *type_int;
@@ -31,16 +35,20 @@ type_t *type_long_double;
 type_t *type_long_long;
 type_t *type_long;
 type_t *type_short;
+type_t *type_unsigned_short;
 type_t *type_signed_char;
+type_t *type_unsigned_char;
 type_t *type_unsigned_int;
 type_t *type_unsigned_long_long;
 type_t *type_unsigned_long;
 type_t *type_void;
 
 type_t *type_char_ptr;
+type_t *type_const_char_ptr;
 type_t *type_int_ptr;
 type_t *type_long_long_ptr;
 type_t *type_long_ptr;
+type_t *type_unsigned_long_ptr;
 type_t *type_short_ptr;
 type_t *type_signed_char_ptr;
 type_t *type_void_ptr;
@@ -54,14 +62,27 @@ type_t *type_ssize_t;
 type_t *type_uintmax_t;
 type_t *type_uptrdiff_t;
 type_t *type_wchar_t;
+type_t *type_const_wchar_t;
 type_t *type_wint_t;
 
 type_t *type_intmax_t_ptr;
 type_t *type_ptrdiff_t_ptr;
 type_t *type_ssize_t_ptr;
 type_t *type_wchar_t_ptr;
+type_t *type_const_wchar_t_ptr;
 
 /* microsoft types */
+atomic_type_kind_t int8_type_kind            = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t int16_type_kind           = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t int32_type_kind           = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t int64_type_kind           = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t int128_type_kind          = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t unsigned_int8_type_kind   = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t unsigned_int16_type_kind  = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t unsigned_int32_type_kind  = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t unsigned_int64_type_kind  = ATOMIC_TYPE_INVALID;
+atomic_type_kind_t unsigned_int128_type_kind = ATOMIC_TYPE_INVALID;
+
 type_t *type_int8;
 type_t *type_int16;
 type_t *type_int32;
@@ -70,15 +91,20 @@ type_t *type_unsigned_int8;
 type_t *type_unsigned_int16;
 type_t *type_unsigned_int32;
 type_t *type_unsigned_int64;
+type_t *type_int64_ptr;
 
 
 void init_basic_types(void)
 {
-	static const type_base_t error = { TYPE_ERROR, TYPE_QUALIFIER_NONE, 0, { NULL, 0 }, NULL };
+	static const type_base_t error = { TYPE_ERROR, 0, TYPE_QUALIFIER_NONE,
+	                                   TYPE_MODIFIER_NONE, 0, NULL };
 
 	type_error_type         = (type_t*)&error;
+	type_bool               = make_atomic_type(ATOMIC_TYPE_BOOL,        TYPE_QUALIFIER_NONE);
 	type_signed_char        = make_atomic_type(ATOMIC_TYPE_SCHAR,       TYPE_QUALIFIER_NONE);
+	type_unsigned_char      = make_atomic_type(ATOMIC_TYPE_UCHAR,       TYPE_QUALIFIER_NONE);
 	type_short              = make_atomic_type(ATOMIC_TYPE_SHORT,       TYPE_QUALIFIER_NONE);
+	type_unsigned_short     = make_atomic_type(ATOMIC_TYPE_USHORT,      TYPE_QUALIFIER_NONE);
 	type_int                = make_atomic_type(ATOMIC_TYPE_INT,         TYPE_QUALIFIER_NONE);
 	type_unsigned_int       = make_atomic_type(ATOMIC_TYPE_UINT,        TYPE_QUALIFIER_NONE);
 	type_long               = make_atomic_type(ATOMIC_TYPE_LONG,        TYPE_QUALIFIER_NONE);
@@ -92,14 +118,27 @@ void init_basic_types(void)
 	type_void               = make_atomic_type(ATOMIC_TYPE_VOID,        TYPE_QUALIFIER_NONE);
 
 	/* microsoft types */
-	type_int8               = make_atomic_type(ATOMIC_TYPE_CHAR,        TYPE_QUALIFIER_NONE);
-	type_int16              = make_atomic_type(ATOMIC_TYPE_SHORT,       TYPE_QUALIFIER_NONE);
-	type_int32              = make_atomic_type(ATOMIC_TYPE_INT,         TYPE_QUALIFIER_NONE);
-	type_int64              = make_atomic_type(ATOMIC_TYPE_LONGLONG,    TYPE_QUALIFIER_NONE);
-	type_unsigned_int8      = make_atomic_type(ATOMIC_TYPE_UCHAR,       TYPE_QUALIFIER_NONE);
-	type_unsigned_int16     = make_atomic_type(ATOMIC_TYPE_USHORT,      TYPE_QUALIFIER_NONE);
-	type_unsigned_int32     = make_atomic_type(ATOMIC_TYPE_UINT,        TYPE_QUALIFIER_NONE);
-	type_unsigned_int64     = make_atomic_type(ATOMIC_TYPE_ULONGLONG,   TYPE_QUALIFIER_NONE);
+	if (c_mode & _MS) {
+		int8_type_kind           = find_signed_int_atomic_type_kind_for_size(1);
+		type_int8                = make_atomic_type(int8_type_kind, TYPE_QUALIFIER_NONE);
+		int16_type_kind          = find_signed_int_atomic_type_kind_for_size(2);
+		type_int16               = make_atomic_type(int16_type_kind, TYPE_QUALIFIER_NONE);
+		int32_type_kind          = find_signed_int_atomic_type_kind_for_size(4);
+		type_int32               = make_atomic_type(int32_type_kind, TYPE_QUALIFIER_NONE);
+		int64_type_kind          = find_signed_int_atomic_type_kind_for_size(8);
+		type_int64               = make_atomic_type(int64_type_kind, TYPE_QUALIFIER_NONE);
+		unsigned_int8_type_kind  = find_unsigned_int_atomic_type_kind_for_size(1);
+		type_unsigned_int8       = make_atomic_type(unsigned_int8_type_kind, TYPE_QUALIFIER_NONE);
+		unsigned_int16_type_kind = find_unsigned_int_atomic_type_kind_for_size(2);
+		type_unsigned_int16      = make_atomic_type(unsigned_int16_type_kind, TYPE_QUALIFIER_NONE);
+		unsigned_int32_type_kind = find_unsigned_int_atomic_type_kind_for_size(4);
+		type_unsigned_int32      = make_atomic_type(unsigned_int32_type_kind, TYPE_QUALIFIER_NONE);
+		unsigned_int64_type_kind = find_unsigned_int_atomic_type_kind_for_size(8);
+		type_unsigned_int64      = make_atomic_type(unsigned_int64_type_kind, TYPE_QUALIFIER_NONE);
+
+		/* pointer types */
+		type_int64_ptr           = make_pointer_type(type_int64,              TYPE_QUALIFIER_NONE);
+	}
 
 	/* pointer types */
 	type_void_ptr           = make_pointer_type(type_void,              TYPE_QUALIFIER_NONE);
@@ -108,7 +147,31 @@ void init_basic_types(void)
 	type_short_ptr          = make_pointer_type(type_short,             TYPE_QUALIFIER_NONE);
 	type_int_ptr            = make_pointer_type(type_int,               TYPE_QUALIFIER_NONE);
 	type_long_ptr           = make_pointer_type(type_long,              TYPE_QUALIFIER_NONE);
+	type_unsigned_long_ptr  = make_pointer_type(type_unsigned_long,     TYPE_QUALIFIER_NONE);
 	type_long_long_ptr      = make_pointer_type(type_long_long,         TYPE_QUALIFIER_NONE);
 
 	type_char_ptr_ptr       = make_pointer_type(type_char_ptr,          TYPE_QUALIFIER_NONE);
+
+	/* const character types */
+	type_const_char         = make_atomic_type(ATOMIC_TYPE_CHAR,        TYPE_QUALIFIER_CONST);
+	type_const_char_ptr     = make_pointer_type(type_const_char,        TYPE_QUALIFIER_NONE);
+
+	/* other types */
+	type_intmax_t    = type_long_long;
+	type_size_t      = type_unsigned_long;
+	type_ssize_t     = type_long;
+	type_ptrdiff_t   = type_long;
+	type_uintmax_t   = type_unsigned_long_long;
+	type_uptrdiff_t  = type_unsigned_long;
+	type_wchar_t     = make_atomic_type(wchar_atomic_kind, TYPE_QUALIFIER_NONE);
+	type_wint_t      = type_int;
+	type_const_wchar_t
+		= make_atomic_type(wchar_atomic_kind, TYPE_QUALIFIER_CONST);
+
+	type_intmax_t_ptr  = make_pointer_type(type_intmax_t,  TYPE_QUALIFIER_NONE);
+	type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE);
+	type_ssize_t_ptr   = make_pointer_type(type_ssize_t,   TYPE_QUALIFIER_NONE);
+	type_wchar_t_ptr   = make_pointer_type(type_wchar_t,   TYPE_QUALIFIER_NONE);
+	type_const_wchar_t_ptr
+		= make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE);
 }