X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firmode_t.h;h=334d12c8a0355542f73cf3933621fdb72300cd8b;hb=5c1ded548038459acf350812d820d8bbd7901ab0;hp=48b8647a07b06fe34b81b7858511f3ad6751c314;hpb=9baf0cd6e299828073f897e4bd0a284379ad9cdb;p=libfirm

diff --git a/ir/ir/irmode_t.h b/ir/ir/irmode_t.h
index 48b8647a0..334d12c8a 100644
--- 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.
  *
@@ -36,50 +36,47 @@
  * ------------------------------- */
 extern ir_mode *mode_P_code, *mode_P_data;
 
-static INLINE ir_mode *
+static inline ir_mode *
 _get_modeP_code(void) { return mode_P_code; }
 
-static INLINE ir_mode *
+static inline ir_mode *
 _get_modeP_data(void) { return mode_P_data; }
 
-static INLINE modecode
-_get_mode_modecode(const ir_mode *mode) { return mode->code; }
-
-static INLINE ident *
+static inline ident *
 _get_mode_ident(const ir_mode *mode) { return mode->name; }
 
-static INLINE mode_sort
-_get_mode_sort(const ir_mode* mode) { return mode->sort; }
+static inline ir_mode_sort
+_get_mode_sort(const ir_mode *mode) { return mode->sort; }
 
-static INLINE int
+static inline unsigned
 _get_mode_size_bits(const ir_mode *mode) { return mode->size; }
 
-static INLINE int
+static inline unsigned
 _get_mode_size_bytes(const ir_mode *mode) {
-	int size = _get_mode_size_bits(mode);
-	if ((size & 7) != 0) return -1;
+	unsigned size = _get_mode_size_bits(mode);
+	if ((size & 7) != 0) return (unsigned) -1;
 	return size >> 3;
 }
 
-static INLINE int
+static inline int
 _get_mode_sign(const ir_mode *mode) { return mode->sign; }
 
-static INLINE int
+static inline ir_mode_arithmetic
 _get_mode_arithmetic(const ir_mode *mode) { return mode->arithmetic; }
 
-static INLINE unsigned int
+static inline unsigned int
 _get_mode_modulo_shift(const ir_mode *mode) { return mode->modulo_shift; }
 
-static INLINE unsigned int
+static inline unsigned int
 _get_mode_vector_elems(const ir_mode *mode) { return mode->vector_elem; }
 
-static INLINE void *
+static inline void *
 _get_mode_link(const ir_mode *mode) { return mode->link; }
 
-static INLINE void
+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
 
@@ -116,62 +113,53 @@ _set_mode_link(ir_mode *mode, void *l) { mode->link = l; }
             = {data || irm_M}
 */
 
-static INLINE int
+static inline int
 _mode_is_signed(const ir_mode *mode) {
-	assert(mode);
 	return mode->sign;
 }
 
-static INLINE int
+static inline int
 _mode_is_float(const ir_mode *mode) {
-	assert(mode);
 	return (_get_mode_sort(mode) == irms_float_number);
 }
 
-static INLINE int
+static inline int
 _mode_is_int(const ir_mode *mode) {
-	assert(mode);
 	return (_get_mode_sort(mode) == irms_int_number);
 }
 
-static INLINE int
+static inline int
 _mode_is_reference(const ir_mode *mode) {
-	assert(mode);
 	return (_get_mode_sort(mode) == irms_reference);
 }
 
-static INLINE int
+static inline int
 _mode_is_num(const ir_mode *mode) {
-	assert(mode);
-	return (_mode_is_int(mode) || _mode_is_float(mode));
+	return (_get_mode_sort(mode) & irmsh_is_num);
 }
 
-static INLINE int
+static inline int
 _mode_is_data(const ir_mode *mode) {
-	return (_mode_is_int(mode) || _mode_is_float(mode) || _mode_is_reference(mode));
+	return (_get_mode_sort(mode) & irmsh_is_data);
 }
 
-static INLINE int
+static inline int
 _mode_is_datab(const ir_mode *mode) {
-	assert(mode);
-	return (_mode_is_data(mode) || _get_mode_sort(mode) == irms_internal_boolean);
+	return (_get_mode_sort(mode) & irmsh_is_datab);
 }
 
-static INLINE int
+static inline int
 _mode_is_dataM(const ir_mode *mode) {
-	assert(mode);
-	return (_mode_is_data(mode) || _get_mode_modecode(mode) == irm_M);
+	return (_get_mode_sort(mode) & irmsh_is_dataM);
 }
 
-static INLINE int
+static inline int
 _mode_is_float_vector(const ir_mode *mode) {
-	assert(mode);
 	return (_get_mode_sort(mode) == irms_float_number) && (_get_mode_vector_elems(mode) > 1);
 }
 
-static INLINE int
+static inline int
 _mode_is_int_vector(const ir_mode *mode) {
-	assert(mode);
 	return (_get_mode_sort(mode) == irms_int_number) && (_get_mode_vector_elems(mode) > 1);
 }
 
@@ -183,7 +171,6 @@ void finish_mode(void);
 
 #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)