- remove block parameter from new_r_Proj and new_rd_Proj

[libfirm] / ir / ir / irmode_t.h

diff --git a/ir/ir/irmode_t.h b/ir/ir/irmode_t.h
index 24fd293..e0712cc 100644 (file)
--- a/ir/ir/irmode_t.h
+++ b/ir/ir/irmode_t.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.

  *
  * This file is part of libFirm.
  *
  *
  * This file is part of libFirm.
  *


@@ -34,52 +34,36 @@
 /* ------------------------------- *
  * inline functions                *
  * ------------------------------- */
 /* ------------------------------- *
  * inline functions                *
  * ------------------------------- */

-extern ir_mode *mode_P_code, *mode_P_data;
+static inline ir_mode *_get_modeP_code(void) { return mode_P_code; }

 
 

-static INLINE ir_mode *
-_get_modeP_code(void) { return mode_P_code; }
+static inline ir_mode *_get_modeP_data(void) { return mode_P_data; }

 
 

-static INLINE ir_mode *
-_get_modeP_data(void) { return mode_P_data; }
+static inline ident *_get_mode_ident(const ir_mode *mode) { return mode->name; }

 
 

-static INLINE modecode
-_get_mode_modecode(const ir_mode *mode) { return mode->code; }
+static inline ir_mode_sort _get_mode_sort(const ir_mode *mode) { return mode->sort; }

 
 

-static INLINE ident *
-_get_mode_ident(const ir_mode *mode) { return mode->name; }
+static inline unsigned _get_mode_size_bits(const ir_mode *mode) { return mode->size; }

 
 

-static INLINE mode_sort
-_get_mode_sort(const ir_mode* mode) { return mode->sort; }
-
-static INLINE int
-_get_mode_size_bits(const ir_mode *mode) { return mode->size; }
-
-static INLINE int
-_get_mode_size_bytes(const ir_mode *mode) {
-       int size = _get_mode_size_bits(mode);
-       if ((size & 7) != 0) return -1;
+static inline unsigned _get_mode_size_bytes(const ir_mode *mode)
+{
+       unsigned size = _get_mode_size_bits(mode);
+       if ((size & 7) != 0) return (unsigned) -1;

        return size >> 3;
 }
 
        return size >> 3;
 }
 

-static INLINE int
-_get_mode_sign(const ir_mode *mode) { return mode->sign; }
+static inline int _get_mode_sign(const ir_mode *mode) { return mode->sign; }

 
 

-static INLINE mode_arithmetic
-_get_mode_arithmetic(const ir_mode *mode) { return mode->arithmetic; }
+static inline ir_mode_arithmetic _get_mode_arithmetic(const ir_mode *mode) { return mode->arithmetic; }

 
 

-static INLINE unsigned int
-_get_mode_modulo_shift(const ir_mode *mode) { return mode->modulo_shift; }
+static inline unsigned int _get_mode_modulo_shift(const ir_mode *mode) { return mode->modulo_shift; }

 
 

-static INLINE unsigned int
-_get_mode_vector_elems(const ir_mode *mode) { return mode->vector_elem; }
+static inline unsigned int _get_mode_vector_elems(const ir_mode *mode) { return mode->vector_elem; }

 
 

-static INLINE void *
-_get_mode_link(const ir_mode *mode) { return mode->link; }
+static inline void * _get_mode_link(const ir_mode *mode) { return mode->link; }

 
 

-static INLINE void
-_set_mode_link(ir_mode *mode, void *l) { mode->link = l; }
+static inline void _set_mode_link(ir_mode *mode, void *l) { mode->link = l; }

 
 

-/* Functions to check, whether a modecode is signed, float, int, num, data,
+/* Functions to check, whether a mode is signed, float, int, num, data,

    datab or dataM. For more exact definitions read the corresponding pages
    in the firm documentation or the following enumeration
 
    datab or dataM. For more exact definitions read the corresponding pages
    in the firm documentation or the following enumeration
 


@@ -116,62 +100,53 @@ _set_mode_link(ir_mode *mode, void *l) { mode->link = l; }
             = {data || irm_M}
 */
 
             = {data || irm_M}
 */
 

-static INLINE int
-_mode_is_signed(const ir_mode *mode) {
-       assert(mode);
+static inline int _mode_is_signed(const ir_mode *mode)
+{

        return mode->sign;
 }
 
        return mode->sign;
 }
 

-static INLINE int
-_mode_is_float(const ir_mode *mode) {
-       assert(mode);
+static inline int _mode_is_float(const ir_mode *mode)
+{

        return (_get_mode_sort(mode) == irms_float_number);
 }
 
        return (_get_mode_sort(mode) == irms_float_number);
 }
 

-static INLINE int
-_mode_is_int(const ir_mode *mode) {
-       assert(mode);
+static inline int _mode_is_int(const ir_mode *mode)
+{

        return (_get_mode_sort(mode) == irms_int_number);
 }
 
        return (_get_mode_sort(mode) == irms_int_number);
 }
 

-static INLINE int
-_mode_is_reference(const ir_mode *mode) {
-       assert(mode);
+static inline int _mode_is_reference(const ir_mode *mode)
+{

        return (_get_mode_sort(mode) == irms_reference);
 }
 
        return (_get_mode_sort(mode) == irms_reference);
 }
 

-static INLINE int
-_mode_is_num(const ir_mode *mode) {
-       assert(mode);
-       return (_mode_is_int(mode) || _mode_is_float(mode));
+static inline int _mode_is_num(const ir_mode *mode)
+{
+       return (_get_mode_sort(mode) & irmsh_is_num);

 }
 
 }
 

-static INLINE int
-_mode_is_data(const ir_mode *mode) {
-       return (_mode_is_int(mode) || _mode_is_float(mode) || _mode_is_reference(mode));
+static inline int _mode_is_data(const ir_mode *mode)
+{
+       return (_get_mode_sort(mode) & irmsh_is_data);

 }
 
 }
 

-static INLINE int
-_mode_is_datab(const ir_mode *mode) {
-       assert(mode);
-       return (_mode_is_data(mode) || _get_mode_sort(mode) == irms_internal_boolean);
+static inline int _mode_is_datab(const ir_mode *mode)
+{
+       return (_get_mode_sort(mode) & irmsh_is_datab);

 }
 
 }
 

-static INLINE int
-_mode_is_dataM(const ir_mode *mode) {
-       assert(mode);
-       return (_mode_is_data(mode) || _get_mode_modecode(mode) == irm_M);
+static inline int _mode_is_dataM(const ir_mode *mode)
+{
+       return (_get_mode_sort(mode) & irmsh_is_dataM);

 }
 
 }
 

-static INLINE int
-_mode_is_float_vector(const ir_mode *mode) {
-       assert(mode);
+static inline int _mode_is_float_vector(const ir_mode *mode)
+{

        return (_get_mode_sort(mode) == irms_float_number) && (_get_mode_vector_elems(mode) > 1);
 }
 
        return (_get_mode_sort(mode) == irms_float_number) && (_get_mode_vector_elems(mode) > 1);
 }
 

-static INLINE int
-_mode_is_int_vector(const ir_mode *mode) {
-       assert(mode);
+static inline int _mode_is_int_vector(const ir_mode *mode)
+{

        return (_get_mode_sort(mode) == irms_int_number) && (_get_mode_vector_elems(mode) > 1);
 }
 
        return (_get_mode_sort(mode) == irms_int_number) && (_get_mode_vector_elems(mode) > 1);
 }
 


@@ -183,7 +158,6 @@ void finish_mode(void);
 
 #define get_modeP_code()               _get_modeP_code()
 #define get_modeP_data()               _get_modeP_data()
 
 #define get_modeP_code()               _get_modeP_code()
 #define get_modeP_data()               _get_modeP_data()

-#define get_mode_modecode(mode)        _get_mode_modecode(mode)

 #define get_mode_ident(mode)           _get_mode_ident(mode)
 #define get_mode_sort(mode)            _get_mode_sort(mode)
 #define get_mode_size_bits(mode)       _get_mode_size_bits(mode)
 #define get_mode_ident(mode)           _get_mode_ident(mode)
 #define get_mode_sort(mode)            _get_mode_sort(mode)
 #define get_mode_size_bits(mode)       _get_mode_size_bits(mode)