libk  Diff

Differences From Artifact [a9978dfd3a]:

To Artifact [def2d33e25]:


     3      3   --- this file gathers information on the environment it's
     4      4   --- being compiled in, defining types that our code
     5      5   --- needs. it will be emitted as <k/type.h>.
     6      6   --- vim: ft=c
     7      7   #ifndef KItype
     8      8   #define KItype
     9      9   
    10         -typedef unsigned char      kc_uint_min;
    11         -typedef   signed char      kc_sint_min;
    12         -typedef unsigned long long kc_uint_max;
    13         -typedef   signed long long kc_sint_max;
    14         -
    15         -[ifdef type_bit8]
    16         -	typedef unsigned [type_bit8] u8;
    17         -	typedef   signed [type_bit8] s8;
    18         -[else]
    19         -	typedef kc_uint_min u8;
    20         -	typedef	kc_sint_min s8;
    21         -[endif]
    22         -
    23         -[ifdef type_bit16]
    24         -	typedef unsigned [type_bit16] u16;
    25         -	typedef   signed [type_bit16] s16;
    26         -[else]
    27         -	typedef kc_uint_max u16;
    28         -	typedef	kc_sint_max s16;
    29         -[endif]
    30         -
    31         -[ifdef type_bit32]
    32         -	typedef unsigned [type_bit32] u32;
    33         -	typedef   signed [type_bit32] s32;
    34         -[else]
    35         -	typedef kc_uint_max u32;
    36         -	typedef	kc_sint_max s32;
    37         -[endif]
           10  +/* we define 64-bit types first due to an oddity in how
           11  + * 128-bit types are handled: we want kc_?big to reference
           12  + * the absolute largest type available to the compiler,
           13  + * but in some cases, 128-bits may not be among the
           14  + * standard C types despite being supported by the
           15  + * compiler. to work around this, we first check whether
           16  + * 64-bit types are available (__int128_t only works on
           17  + * 64-bit systems) and then whether the compiler is one
           18  + * that supports the 128-bit extension - but only if a
           19  + * native 128-bit type is not available.
           20  + * 
           21  + * once this is done, we can be certain that u128 will
           22  + * reference the largest available integer type and can
           23  + * safely define kc_?big by reference to it. */
    38     24   
    39     25   [ifdef type_bit64]
    40     26   	typedef unsigned [type_bit64] u64;
    41     27   	typedef   signed [type_bit64] s64;
    42     28   	[ifndef type_bit128]
           29  +	/* even if no native type is 128 bits long, clang and
           30  +	 * gcc have extensions to support 128 bit arithmetic
           31  +	 * on 64-bit hardware */
    43     32   #		if defined(__GNUC__) || defined(__clang__)
    44     33   			typedef unsigned __int128_t u128;
    45     34   			typedef   signed __int128_t s128;
    46     35   #		else
    47         -			typedef kc_uint_max u128;
    48         -			typedef kc_sint_max s128;
           36  +			/* if we don't have access to that extension
           37  +			 * or native 128-bit types, then we just use
           38  +			 * the largest native type specified in the
           39  +			 * C standard */
           40  +			typedef unsigned long long u128;
           41  +			typedef   signed long long s128;
    49     42   #		endif
    50     43   	[endif]
    51     44   [else]
    52         -	typedef kc_uint_max u64;
    53         -	typedef	kc_sint_max s64;
           45  +	typedef unsigned long long u64;
           46  +	typedef   signed long long s64;
    54     47   
    55         -	typedef kc_uint_max u128;
    56         -	typedef	kc_sint_max s128;
           48  +	typedef u64 u128;
           49  +	typedef	s64 s128;
    57     50   [endif]
    58     51   
    59     52   [ifdef type_bit128]
    60     53   	typedef unsigned [type_bit128] u128;
    61     54   	typedef   signed [type_bit128] s128;
    62     55   [endif]
           56  +
           57  +typedef unsigned char ubyte;
           58  +typedef   signed char sbyte;
           59  +typedef          u128 ubig;
           60  +typedef          s128 sbig;
           61  +
           62  +[ifdef type_bit8]
           63  +	typedef unsigned [type_bit8] u8;
           64  +	typedef   signed [type_bit8] s8;
           65  +[else]
           66  +	typedef ubyte u8;
           67  +	typedef	sbyte s8;
           68  +[endif]
           69  +
           70  +[ifdef type_bit16]
           71  +	typedef unsigned [type_bit16] u16;
           72  +	typedef   signed [type_bit16] s16;
           73  +[else]
           74  +	typedef ubig u16;
           75  +	typedef	sbig s16;
           76  +[endif]
           77  +
           78  +[ifdef type_bit32]
           79  +	typedef unsigned [type_bit32] u32;
           80  +	typedef   signed [type_bit32] s32;
           81  +[else]
           82  +	typedef ubig u32;
           83  +	typedef	sbig s32;
           84  +[endif]
    63     85   
    64     86   enum /* max-min values of each type */ {
    65         -	/* assuming two's complement. TODO: check math */
    66         -	/* TODO: figure out how to calc min */
    67         -	kc_byte_bits = [byte_bits],
           87  +	byte_bits = [byte_bits],
           88  +
    68     89   	  u8_min = 0,   u8_max = ((u8)-1),
    69     90   	 u16_min = 0,  u16_max = ((u16)-1),
    70     91   	 u32_min = 0,  u32_max = ((u32)-1),
    71     92   	 u64_min = 0,  u32_max = ((u64)-1),
    72     93   	u128_min = 0, u128_max = ((u128)-1),
    73     94   
           95  +	/* assuming two's complement. TODO: check math */
    74     96   	[define merge: $1$2]
    75     97   	[define [sspec type]:
    76     98   		[merge [type],_min] = 0 - ((1 << sizeof([type]) * kc_byte_bits) / 2),
    77     99   		[merge [type],_max] =      (1 << sizeof([type]) * kc_byte_bits) / 2 - 1]
    78    100   
    79    101   	[sspec s8], [sspec s16], [sspec s32],
    80    102   	[sspec s64], [sspec s128],
    81    103   
    82         -	kc_min_uchar  = 0, kc_max_uchar  = [type_max_u_char],
    83         -	kc_min_ushort = 0, kc_max_ushort = [type_max_u_short],
    84         -	kc_min_uint   = 0, kc_max_uint   = [type_max_u_int],
    85         -	kc_min_ulong  = 0, kc_max_ulong  = [type_max_u_long],
    86         -	kc_min_ullong = 0, kc_max_ullong = [type_max_u_llong],
          104  +	kc_uchar_min  = 0, kc_uchar_max  = [type_max_u_char],
          105  +	kc_ushort_min = 0, kc_ushort_max = [type_max_u_short],
          106  +	kc_uint_min   = 0, kc_uint_max   = [type_max_u_int],
          107  +	kc_ulong_min  = 0, kc_ulong_max  = [type_max_u_long],
          108  +	kc_ullong_min = 0, kc_ullong_max = [type_max_u_llong],
          109  +
          110  +	kc_schar_min  = [type_min_s_char],  kc_schar_max  = [type_max_s_char],
          111  +	kc_sshort_min = [type_min_s_short], kc_sshort_max = [type_max_s_short],
          112  +	kc_sint_min   = [type_min_s_int],   kc_sint_max   = [type_max_s_int],
          113  +	kc_slong_min  = [type_min_s_long],  kc_slong_max  = [type_max_s_long],
          114  +	kc_sllong_min = [type_min_s_llong], kc_sllong_max = [type_max_s_llong],
          115  +
          116  +	ubig_min = u128_min, ubig_max = u128_max,
          117  +	sbig_min = s128_min, sbig_max = s128_max,
    87    118   
    88         -	kc_min_schar  = [type_min_s_char],  kc_max_schar  = [type_max_s_char],
    89         -	kc_min_sshort = [type_min_s_short], kc_max_sshort = [type_max_s_short],
    90         -	kc_min_sint   = [type_min_s_int],   kc_max_sint   = [type_max_s_int],
    91         -	kc_min_slong  = [type_min_s_long],  kc_max_slong  = [type_max_s_long],
    92         -	kc_min_sllong = [type_min_s_llong], kc_max_sllong = [type_max_s_llong],
          119  +	ubyte_min = kc_uchar_min, ubyte_max = kc_uchar_max,
          120  +	sbyte_min = kc_schar_min, sbyte_max = kc_schar_max,
    93    121   };
    94    122   
    95    123   [ifdef type_sz]
    96    124   	typedef [type_sz] sz;
    97    125   [else]
    98    126   #	ifdef __cplusplus
    99    127    	   /* C++ gives us a clean, standardized way to do this */
................................................................................
   102    130   #		if defined(__GNUC__) || defined(__clang__)
   103    131   			typedef __typeof__ (sizeof(char)) sz;
   104    132   #		else
   105    133   			/* we're stumped - set sz to the safest possible value under
   106    134   			 * the circumstances, and warn the user. */
   107    135   #			warning no authoritative sz (size_t) type definition \
   108    136   			        available; defaulting to largest unsigned integer type
   109         -			typedef kc_uint_max sz;
          137  +			typedef ubig sz;
   110    138   #		endif
   111    139   #	endif
   112    140   [endif]
   113    141   
   114    142   [ifdef type_offset]
   115    143   	typedef [type_offset] offset;
   116    144   [else]
................................................................................
   121    149   #		if defined(__GNUC__) || defined(__clang__)
   122    150   			typedef __typeof__ (((void*)10) - ((void*)5)) offset;
   123    151   #		else
   124    152   			/* no dice - set offset to the safest possible value under
   125    153   			 * the circumstances, and warn the user. */
   126    154   #			warning no authoritative offset (ptrdiff_t) type definition \
   127    155   			        available; defaulting to largest unsigned integer type
   128         -			typedef kc_sint_max offset;
          156  +			typedef sbig offset;
   129    157   #		endif
   130    158   #	endif
   131    159   [endif]
   132    160   
   133    161   // exit status integer types - pls use kbad in <k/magic.h> instead
   134    162   [if [target_posix] == yes]
   135    163   	/* by convention, posix return values are 8-bit,