X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firmode.c;h=2240d141a07e2e6177393dbe057b11dcb37ff007;hb=c3c48d7bd83f042cc2951754377de928d66fe51e;hp=d926e90c4c035af4b33cc253f7fdae8efbe2087b;hpb=8dc4091a707bf66377da637d17cb20080847bf1c;p=libfirm

diff --git a/ir/ir/irmode.c b/ir/ir/irmode.c
index d926e90c4..2240d141a 100644
--- a/ir/ir/irmode.c
+++ b/ir/ir/irmode.c
@@ -224,16 +224,20 @@ INLINE ir_mode *get_modeANY(void) { ANNOUNCE(); return mode_ANY; }
 INLINE ir_mode *get_modeBAD(void) { ANNOUNCE(); return mode_BAD; }
 
 
-ir_mode *get_modeP_mach(void)  { ANNOUNCE(); return mode_P_mach; }
-void     set_modeP_mach(ir_mode *p) {
+ir_mode *(get_modeP_mach)(void) {
   ANNOUNCE();
-  assert(mode_is_reference(p));
-  mode_P_mach = p;
- }
+  return __get_modeP_mach();
+}
+
+void (set_modeP_mach)(ir_mode *p) {
+  ANNOUNCE();
+  __set_modeP_mach(p);
+}
 
 /**
- * Registers a new mode if not defined yet, else returns
- * the "equivalent" one.
+ * Registers a new mode.
+ *
+ * @param new_mode  The new mode template.
  */
 static ir_mode *register_mode(const ir_mode* new_mode)
 {
@@ -246,7 +250,7 @@ static ir_mode *register_mode(const ir_mode* new_mode)
   mode = (ir_mode*)obstack_copy(&modes, new_mode, sizeof(ir_mode));
 
   mode->kind = k_ir_mode;
-  if(num_modes>=irm_max) mode->code = num_modes;
+  if (num_modes >= irm_max) mode->code = num_modes;
   num_modes++;
 
   set_mode_values(mode);
@@ -257,7 +261,7 @@ static ir_mode *register_mode(const ir_mode* new_mode)
 /*
  * Creates a new mode.
  */
-ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int align, int sign,
+ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int bit_align, int sign,
 		     mode_arithmetic arithmetic, unsigned int modulo_shift )
 {
   ir_mode mode_tmpl;
@@ -266,7 +270,7 @@ ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int align,
   mode_tmpl.name         = new_id_from_str(name);
   mode_tmpl.sort         = sort;
   mode_tmpl.size         = bit_size;
-  mode_tmpl.align        = align;
+  mode_tmpl.align        = bit_align;
   mode_tmpl.sign         = sign ? 1 : 0;
   mode_tmpl.modulo_shift = (mode_tmpl.sort == irms_int_number) ? modulo_shift : 0;
   mode_tmpl.vector_elem  = 1;
@@ -291,9 +295,6 @@ ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int align,
       return NULL;
 
     case irms_float_number:
-      assert(0 && "not yet implemented");
-      return NULL;
-
     case irms_int_number:
     case irms_reference:
     case irms_character:
@@ -305,7 +306,7 @@ ir_mode *new_ir_mode(const char *name, mode_sort sort, int bit_size, int align,
 /*
  * Creates a new vector mode.
  */
-ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsigned num_of_elem, int align, int sign,
+ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsigned num_of_elem, int bit_align, int sign,
 		     mode_arithmetic arithmetic, unsigned int modulo_shift )
 {
   ir_mode mode_tmpl;
@@ -314,7 +315,7 @@ ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsi
   mode_tmpl.name         = new_id_from_str(name);
   mode_tmpl.sort         = sort;
   mode_tmpl.size         = bit_size * num_of_elem;
-  mode_tmpl.align        = align;
+  mode_tmpl.align        = bit_align;
   mode_tmpl.sign         = sign ? 1 : 0;
   mode_tmpl.modulo_shift = (mode_tmpl.sort == irms_int_number) ? modulo_shift : 0;
   mode_tmpl.vector_elem  = num_of_elem;
@@ -358,17 +359,17 @@ ir_mode *new_ir_vector_mode(const char *name, mode_sort sort, int bit_size, unsi
 
 /* Functions for the direct access to all attributes od a ir_mode */
 modecode
-get_mode_modecode(const ir_mode *mode)
+(get_mode_modecode)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->code;
+  return __get_mode_modecode(mode);
 }
 
 ident *
-get_mode_ident(const ir_mode *mode)
+(get_mode_ident)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->name;
+  return __get_mode_ident(mode);
 }
 
 const char *
@@ -379,44 +380,51 @@ get_mode_name(const ir_mode *mode)
 }
 
 mode_sort
-get_mode_sort(const ir_mode* mode)
+(get_mode_sort)(const ir_mode* mode)
 {
   ANNOUNCE();
-  return mode->sort;
+  return __get_mode_sort(mode);
 }
 
-INLINE int
-get_mode_size_bits(const ir_mode *mode)
+int
+(get_mode_size_bits)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->size;
+  return __get_mode_size_bits(mode);
 }
 
-int get_mode_size_bytes(const ir_mode *mode) {
-  int size = get_mode_size_bits(mode);
+int
+(get_mode_size_bytes)(const ir_mode *mode) {
+  ANNOUNCE();
+  return __get_mode_size_bytes(mode);
+}
+
+int
+(get_mode_align_bits)(const ir_mode *mode)
+{
   ANNOUNCE();
-  if ((size & 7) != 0) return -1;
-  return size >> 3;
+  return __get_mode_align_bits(mode);
 }
 
 int
-get_mode_align (const ir_mode *mode)
+(get_mode_align_bytes)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->align;
+  return __get_mode_align_bytes(mode);
 }
 
 int
-get_mode_sign (const ir_mode *mode)
+(get_mode_sign)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->sign;
+  return __get_mode_sign(mode);
 }
 
-int get_mode_arithmetic (const ir_mode *mode)
+int
+(get_mode_arithmetic)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->arithmetic;
+  return get_mode_arithmetic(mode);
 }
 
 
@@ -424,24 +432,27 @@ int get_mode_arithmetic (const ir_mode *mode)
  *  whether shift applies modulo to value of bits to shift.  Asserts
  *  if mode is not irms_int_number.
  */
-unsigned int get_mode_modulo_shift(const ir_mode *mode) {
-  return mode->modulo_shift;
+unsigned int
+(get_mode_modulo_shift)(const ir_mode *mode) {
+  return __get_mode_modulo_shift(mode);
 }
 
-unsigned int get_mode_vector_elems(const ir_mode *mode) {
-  return mode->vector_elem;
+unsigned int
+(get_mode_vector_elems)(const ir_mode *mode) {
+  return __get_mode_vector_elems(mode);
 }
 
-void *get_mode_link(const ir_mode *mode)
+void *
+(get_mode_link)(const ir_mode *mode)
 {
   ANNOUNCE();
-  return mode->link;
+  return __get_mode_link(mode);
 }
 
-void set_mode_link(ir_mode *mode, void *l)
+void
+(set_mode_link)(ir_mode *mode, void *l)
 {
-  mode->link=l;
-  return;
+  __set_mode_link(mode, l);
 }
 
 tarval *
@@ -512,165 +523,84 @@ get_mode_NAN(ir_mode *mode)
 
 int
 is_mode (void *thing) {
-  assert(thing);
   if (get_kind(thing) == k_ir_mode)
     return 1;
   else
     return 0;
 }
 
-/* Functions to check, whether a modecode is signed, float, int, num, data,
-   datab or dataM. For more exact definitions read the corresponding pages
-   in the firm documentation or the followingenumeration
-
-   The set of "float" is defined as:
-   ---------------------------------
-   float = {irm_F, irm_D, irm_E}
-
-   The set of "int" is defined as:
-   -------------------------------
-   int   = {irm_Bs, irm_Bu, irm_Hs, irm_Hu, irm_Is, irm_Iu, irm_Ls, irm_Lu}
-
-   The set of "num" is defined as:
-   -------------------------------
-   num   = {irm_F, irm_D, irm_E, irm_Bs, irm_Bu, irm_Hs, irm_Hu,
-            irm_Is, irm_Iu, irm_Ls, irm_Lu}
-            = {float || int}
-
-   The set of "data" is defined as:
-   -------------------------------
-   data  = {irm_F, irm_D, irm_E irm_Bs, irm_Bu, irm_Hs, irm_Hu,
-            irm_Is, irm_Iu, irm_Ls, irm_Lu, irm_C, irm_U, irm_P}
-            = {num || irm_C || irm_U || irm_P}
-
-   The set of "datab" is defined as:
-   ---------------------------------
-   datab = {irm_F, irm_D, irm_E, irm_Bs, irm_Bu, irm_Hs, irm_Hu,
-            irm_Is, irm_Iu, irm_Ls, irm_Lu, irm_C, irm_U, irm_P, irm_b}
-            = {data || irm_b }
-
-   The set of "dataM" is defined as:
-   ---------------------------------
-   dataM = {irm_F, irm_D, irm_E, irm_Bs, irm_Bu, irm_Hs, irm_Hu,
-            irm_Is, irm_Iu, irm_Ls, irm_Lu, irm_C, irm_U, irm_P, irm_M}
-            = {data || irm_M}
-*/
-
-#ifdef MODE_ACCESS_DEFINES
-#  undef mode_is_signed
-#  undef mode_is_float
-#  undef mode_is_int
-#  undef mode_is_num
-#  undef mode_is_numP
-#  undef mode_is_data
-#  undef mode_is_datab
-#  undef mode_is_dataM
-#endif
 int
-mode_is_signed (const ir_mode *mode)
-{
+(mode_is_signed)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return mode->sign;
+  return __mode_is_signed(mode);
 }
 
 int
-mode_is_float (const ir_mode *mode)
-{
+(mode_is_float)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (get_mode_sort(mode) == irms_float_number);
+  return __mode_is_float(mode);
 }
 
 int
-mode_is_int (const ir_mode *mode)
-{
+(mode_is_int)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (get_mode_sort(mode) == irms_int_number);
+  return __mode_is_int(mode);
 }
 
-int mode_is_character (const ir_mode *mode)
-{
+int
+(mode_is_character)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (get_mode_sort(mode) == irms_character);
+  return __mode_is_character(mode);
 }
 
-int mode_is_reference (const ir_mode *mode)
-{
+int
+(mode_is_reference)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (get_mode_sort(mode) == irms_reference);
+  return __mode_is_reference(mode);
 }
 
 int
-mode_is_num (const ir_mode *mode)
-{
+(mode_is_num)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (mode_is_int(mode) || mode_is_float(mode));
+  return __mode_is_num(mode);
 }
 
 int
-mode_is_numP (const ir_mode *mode)
-{
+(mode_is_numP)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (mode_is_int(mode) || mode_is_float(mode) || mode_is_reference(mode));
+  return __mode_is_numP(mode);
 }
 
 int
-mode_is_data (const ir_mode *mode)
-{
+(mode_is_data)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (mode_is_num(mode) || get_mode_sort(mode) == irms_character || get_mode_sort(mode) == irms_reference);
+  return __mode_is_data(mode);
 }
 
 int
-mode_is_datab (const ir_mode *mode)
-{
+(mode_is_datab)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (mode_is_data(mode) || get_mode_sort(mode) == irms_internal_boolean);
+  return __mode_is_datab(mode);
 }
 
 int
-mode_is_dataM (const ir_mode *mode)
-{
+(mode_is_dataM)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (mode_is_data(mode) || get_mode_modecode(mode) == irm_M);
+  return __mode_is_dataM(mode);
 }
 
 int
-mode_is_float_vector (const ir_mode *mode)
-{
+(mode_is_float_vector)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (get_mode_sort(mode) == irms_float_number) && (get_mode_vector_elems(mode) > 1);
+  return __mode_is_float_vector(mode);
 }
 
 int
-mode_is_int_vector (const ir_mode *mode)
-{
+(mode_is_int_vector)(const ir_mode *mode) {
   ANNOUNCE();
-  assert(mode);
-  return (get_mode_sort(mode) == irms_int_number) && (get_mode_vector_elems(mode) > 1);
-}
-
-#ifdef MODE_ACCESS_DEFINES
-#  define mode_is_signed(mode) (mode)->sign
-#  define mode_is_float(mode) ((mode)->sort == irms_float_number)
-#  define mode_is_int(mode) ((mode)->sort == irms_int_number)
-#  define mode_is_num(mode) (((mode)->sort == irms_float_number) || ((mode)->sort == irms_int_number))
-#  define mode_is_data(mode) (((mode)->sort == irms_float_number) || ((mode)->sort == irms_int_number) || ((mode)->sort == irms_character) || ((mode)->sort == irms_reference))
-#  define mode_is_datab(mode) (((mode)->sort == irms_float_number) || ((mode)->sort == irms_int_number) || ((mode)->sort == irms_character) || ((mode)->sort == irms_reference) || ((mode)->sort == irms_internal_boolean))
-#  define mode_is_dataM(mode) (((mode)->sort == irms_float_number) || ((mode)->sort == irms_int_number) || ((mode)->sort == irms_character) || ((mode)->sort == irms_reference) || ((mode)->code == irm_M))
-#  define mode_is_float_vector(mode) (((mode)->sort == irms_float_number) && ((mode)->vector_elem > 1))
-#  define mode_is_int_vector(mode) (((mode)->sort == irms_int_number) && ((mode)->vector_elem > 1))
-#endif
+  return __mode_is_int_vector(mode);
+}
+
 /* Returns true if sm can be converted to lm without loss. */
 int
 smaller_mode(const ir_mode *sm, const ir_mode *lm)
@@ -747,7 +677,7 @@ smaller_mode(const ir_mode *sm, const ir_mode *lm)
   return 0;
 }
 
-/* ** initialization ** */
+/* initialization, build the default modes */
 void
 init_mode (void)
 {
@@ -828,14 +758,14 @@ init_mode (void)
   newmode.vector_elem = 1;
 
   /* Float Number Modes */
-  newmode.sort    = irms_float_number;
+  newmode.sort       = irms_float_number;
   newmode.arithmetic = irma_ieee754;
 
   /* float */
   newmode.name    = id_from_str("F", 1);
   newmode.code    = irm_F;
   newmode.sign    = 1;
-  newmode.align   = 4;
+  newmode.align   = 32;
   newmode.size    = 32;
 
   mode_F = register_mode(&newmode);
@@ -844,7 +774,7 @@ init_mode (void)
   newmode.name    = id_from_str("D", 1);
   newmode.code    = irm_D;
   newmode.sign    = 1;
-  newmode.align   = 4;
+  newmode.align   = 64;
   newmode.size    = 64;
 
   mode_D = register_mode(&newmode);
@@ -853,116 +783,116 @@ init_mode (void)
   newmode.name    = id_from_str("E", 1);
   newmode.code    = irm_E;
   newmode.sign    = 1;
-  newmode.align   = 4;
+  newmode.align   = 128;
   newmode.size    = 80;
 
   mode_E = register_mode(&newmode);
 
   /* Integer Number Modes */
-  newmode.sort    = irms_int_number;
-  newmode.arithmetic = irma_twos_complement;
+  newmode.sort         = irms_int_number;
+  newmode.arithmetic   = irma_twos_complement;
 
   /* signed byte */
-  newmode.name    = id_from_str("Bs", 2);
-  newmode.code    = irm_Bs;
-  newmode.sign    = 1;
-  newmode.align   = 1;
-  newmode.size    = 8;
+  newmode.name         = id_from_str("Bs", 2);
+  newmode.code         = irm_Bs;
+  newmode.sign         = 1;
+  newmode.align        = 8;
+  newmode.size         = 8;
   newmode.modulo_shift = 32;
 
   mode_Bs = register_mode(&newmode);
 
   /* unsigned byte */
-  newmode.name    = id_from_str("Bu", 2);
-  newmode.code    = irm_Bu;
-  newmode.arithmetic = irma_twos_complement;
-  newmode.sign    = 0;
-  newmode.align   = 1;
-  newmode.size    = 8;
+  newmode.name         = id_from_str("Bu", 2);
+  newmode.code         = irm_Bu;
+  newmode.arithmetic   = irma_twos_complement;
+  newmode.sign         = 0;
+  newmode.align        = 8;
+  newmode.size         = 8;
   newmode.modulo_shift = 32;
 
   mode_Bu = register_mode(&newmode);
 
   /* signed short integer */
-  newmode.name    = id_from_str("Hs", 2);
-  newmode.code    = irm_Hs;
-  newmode.sign    = 1;
-  newmode.align   = 2;
-  newmode.size    = 16;
+  newmode.name         = id_from_str("Hs", 2);
+  newmode.code         = irm_Hs;
+  newmode.sign         = 1;
+  newmode.align        = 16;
+  newmode.size         = 16;
   newmode.modulo_shift = 32;
 
   mode_Hs = register_mode(&newmode);
 
   /* unsigned short integer */
-  newmode.name    = id_from_str("Hu", 2);
-  newmode.code    = irm_Hu;
-  newmode.sign    = 0;
-  newmode.align   = 2;
-  newmode.size    = 16;
+  newmode.name         = id_from_str("Hu", 2);
+  newmode.code         = irm_Hu;
+  newmode.sign         = 0;
+  newmode.align        = 16;
+  newmode.size         = 16;
   newmode.modulo_shift = 32;
 
   mode_Hu = register_mode(&newmode);
 
   /* signed integer */
-  newmode.name    = id_from_str("Is", 2);
-  newmode.code    = irm_Is;
-  newmode.sign    = 1;
-  newmode.align   = 4;
-  newmode.size    = 32;
+  newmode.name         = id_from_str("Is", 2);
+  newmode.code         = irm_Is;
+  newmode.sign         = 1;
+  newmode.align        = 32;
+  newmode.size         = 32;
   newmode.modulo_shift = 32;
 
   mode_Is = register_mode(&newmode);
 
   /* unsigned integer */
-  newmode.name    = id_from_str("Iu", 2);
-  newmode.code    = irm_Iu;
-  newmode.sign    = 0;
-  newmode.align   = 4;
-  newmode.size    = 32;
+  newmode.name         = id_from_str("Iu", 2);
+  newmode.code         = irm_Iu;
+  newmode.sign         = 0;
+  newmode.align        = 32;
+  newmode.size         = 32;
   newmode.modulo_shift = 32;
 
   mode_Iu = register_mode(&newmode);
 
   /* signed long integer */
-  newmode.name    = id_from_str("Ls", 2);
-  newmode.code    = irm_Ls;
-  newmode.sign    = 1;
-  newmode.align   = 4;
-  newmode.size    = 64;
+  newmode.name         = id_from_str("Ls", 2);
+  newmode.code         = irm_Ls;
+  newmode.sign         = 1;
+  newmode.align        = 32;
+  newmode.size         = 64;
   newmode.modulo_shift = 64;
 
   mode_Ls = register_mode(&newmode);
 
   /* unsigned long integer */
-  newmode.name    = id_from_str("Lu", 2);
-  newmode.code    = irm_Lu;
-  newmode.sign    = 0;
-  newmode.align   = 4;
-  newmode.size    = 64;
+  newmode.name         = id_from_str("Lu", 2);
+  newmode.code         = irm_Lu;
+  newmode.sign         = 0;
+  newmode.align        = 32;
+  newmode.size         = 64;
   newmode.modulo_shift = 64;
 
   mode_Lu = register_mode(&newmode);
 
   /* Character Modes */
-  newmode.sort    = irms_character;
-  newmode.arithmetic = irma_none;
+  newmode.sort         = irms_character;
+  newmode.arithmetic   = irma_none;
 
   /* Character */
-  newmode.name    = id_from_str("C", 1);
-  newmode.code    = irm_C;
-  newmode.sign    = 0;
-  newmode.align   = 1;
-  newmode.size    = 8;
+  newmode.name         = id_from_str("C", 1);
+  newmode.code         = irm_C;
+  newmode.sign         = 0;
+  newmode.align        = 8;
+  newmode.size         = 8;
   newmode.modulo_shift = 32;
 
   mode_C = register_mode(&newmode);
 
   /* Unicode character */
-  newmode.name    = id_from_str("U", 1);
-  newmode.code    = irm_U;
-  newmode.sign    = 0;
-  newmode.align   = 2;
-  newmode.size    = 16;
+  newmode.name         = id_from_str("U", 1);
+  newmode.code         = irm_U;
+  newmode.sign         = 0;
+  newmode.align        = 16;
+  newmode.size         = 16;
   newmode.modulo_shift = 32;
 
   mode_U = register_mode(&newmode);
@@ -972,11 +902,11 @@ init_mode (void)
   newmode.arithmetic = irma_twos_complement;
 
   /* pointer */
-  newmode.name    = id_from_str("P", 1);
-  newmode.code    = irm_P;
-  newmode.sign    = 0;
-  newmode.align   = 4;
-  newmode.size    = 32;
+  newmode.name         = id_from_str("P", 1);
+  newmode.code         = irm_P;
+  newmode.sign         = 0;
+  newmode.align        = 32;
+  newmode.size         = 32;
   newmode.modulo_shift = 0;
 
   mode_P = register_mode(&newmode);