X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=types.c;h=24d38d363a6ed4fb4952059986ee30a0064b19a1;hb=10842603c042d3c62f128519d6356b3817b6a0db;hp=8473799f4452b183862c79bc8105c7923c402ed6;hpb=2ef7b77e92bd93fa2e3d487b91a24f55d299cdd7;p=cparser

diff --git a/types.c b/types.c
index 8473799..24d38d3 100644
--- a/types.c
+++ b/types.c
@@ -54,6 +54,7 @@ type_t *type_unsigned_long_ptr;
 type_t *type_short_ptr;
 type_t *type_signed_char_ptr;
 type_t *type_void_ptr;
+type_t *type_const_void;
 type_t *type_const_void_ptr;
 type_t *type_void_ptr_restrict;
 type_t *type_const_void_ptr_restrict;
@@ -69,6 +70,8 @@ type_t *type_uptrdiff_t;
 type_t *type_wchar_t;
 type_t *type_const_wchar_t;
 type_t *type_wint_t;
+type_t *type_int32_t;
+type_t *type_int64_t;
 
 type_t *type_intmax_t_ptr;
 type_t *type_ptrdiff_t_ptr;
@@ -79,16 +82,16 @@ type_t *type_const_wchar_t_ptr;
 type_t *type_valist;
 
 /* 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;
+atomic_type_kind_t int8_type_kind;
+atomic_type_kind_t int16_type_kind;
+atomic_type_kind_t int32_type_kind;
+atomic_type_kind_t int64_type_kind;
+atomic_type_kind_t int128_type_kind;
+atomic_type_kind_t unsigned_int8_type_kind;
+atomic_type_kind_t unsigned_int16_type_kind;
+atomic_type_kind_t unsigned_int32_type_kind;
+atomic_type_kind_t unsigned_int64_type_kind;
+atomic_type_kind_t unsigned_int128_type_kind;
 
 type_t *type_int8;
 type_t *type_int16;
@@ -122,16 +125,21 @@ void init_basic_types(void)
 	type_float              = make_atomic_type(ATOMIC_TYPE_FLOAT,       TYPE_QUALIFIER_NONE);
 	type_char               = make_atomic_type(ATOMIC_TYPE_CHAR,        TYPE_QUALIFIER_NONE);
 	type_void               = make_atomic_type(ATOMIC_TYPE_VOID,        TYPE_QUALIFIER_NONE);
+	type_const_void         = make_atomic_type(ATOMIC_TYPE_VOID,        TYPE_QUALIFIER_CONST);
+
+	int8_type_kind  = find_signed_int_atomic_type_kind_for_size(1);
+	int16_type_kind = find_signed_int_atomic_type_kind_for_size(2);
+	int32_type_kind = find_signed_int_atomic_type_kind_for_size(4);
+	int64_type_kind = find_signed_int_atomic_type_kind_for_size(8);
+
+	type_int32_t = make_atomic_type(int32_type_kind, TYPE_QUALIFIER_NONE);
+	type_int64_t = make_atomic_type(int64_type_kind, TYPE_QUALIFIER_NONE);
 
 	/* microsoft types */
 	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);
@@ -148,10 +156,10 @@ void init_basic_types(void)
 
 	/* pointer types */
 	type_void_ptr           = make_pointer_type(type_void,              TYPE_QUALIFIER_NONE);
-	type_const_void_ptr     = make_pointer_type(type_void,              TYPE_QUALIFIER_CONST);
+	type_const_void_ptr     = make_pointer_type(type_const_void,        TYPE_QUALIFIER_NONE);
 	type_void_ptr_restrict  = make_pointer_type(type_void,              TYPE_QUALIFIER_RESTRICT);
 	type_const_void_ptr_restrict
-	                        = make_pointer_type(type_void,              TYPE_QUALIFIER_CONST | TYPE_QUALIFIER_RESTRICT);
+	                        = make_pointer_type(type_const_void,        TYPE_QUALIFIER_RESTRICT);
 	type_char_ptr           = make_pointer_type(type_char,              TYPE_QUALIFIER_NONE);
 	type_char_ptr_restrict  = make_pointer_type(type_char,              TYPE_QUALIFIER_RESTRICT);
 	type_signed_char_ptr    = make_pointer_type(type_signed_char,       TYPE_QUALIFIER_NONE);
@@ -176,15 +184,18 @@ void init_basic_types(void)
 	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);
+}
+
+void init_wchar_types(atomic_type_kind_t akind)
+{
+	type_wchar_t       = make_atomic_type(akind, TYPE_QUALIFIER_NONE);
+	type_const_wchar_t = make_atomic_type(akind, TYPE_QUALIFIER_CONST);
+	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);
 }