fix warnings

[r14548]

include/libfirm/adt/bitset.h

@@ -272,7 +272,7 @@ static INLINE bitset_pos_t _bitset_next(const bitset_t *bs,
 		/* If there is a bit set in the current unit, exit. */
 		if (next_in_this_unit < BS_UNIT_SIZE_BITS) {
 			res = next_in_this_unit + unit_number * BS_UNIT_SIZE_BITS;
-			return res < bs->size ? res : -1;
+			return res < bs->size ? res : (bitset_pos_t) -1;
 		}
 
 		/* Else search for set bits in the next units. */
@@ -285,7 +285,7 @@ static INLINE bitset_pos_t _bitset_next(const bitset_t *bs,
 
 				if (first_set < BS_UNIT_SIZE_BITS) {
 					res = first_set + i * BS_UNIT_SIZE_BITS;
-					return res < bs->size ? res : -1;
+					return res < bs->size ? res : (bitset_pos_t) -1;
 				}
 			}
 		}
@@ -518,7 +518,7 @@ static INLINE bitset_t *bitset_ ## op(bitset_t *tgt, const bitset_t *src) \
 #define _bitset_clear_rest(data,n) _bitset_inside_clear_units(data, n)
 BINARY_OP(and)
 #undef _bitset_clear_rest
-#define _bitset_clear_rest(data,n)
+#define _bitset_clear_rest(data,n) do { } while(0)
 
 BINARY_OP(andnot)
 BINARY_OP(or)

include/libfirm/irnode.h

@@ -185,7 +185,7 @@ ir_op *get_irn_op(const ir_node *node);
 /** Sets the opcode struct of the node. */
 void set_irn_op(ir_node *node, ir_op *op);
 /** Gets the opcode-enum of the node. */
-ir_opcode get_irn_opcode(const ir_node *node);
+unsigned get_irn_opcode(const ir_node *node);
 /** Get the string representation of the opcode. */
 const char *get_irn_opname(const ir_node *node);
 /** Get the ident for a string representation of the opcode. */

include/libfirm/irop.h

@@ -175,7 +175,7 @@ ident *get_op_ident(const ir_op *op);
 const char *get_op_name(const ir_op *op);
 
 /** Returns the enum for the opcode */
-ir_opcode get_op_code(const ir_op *op);
+unsigned get_op_code(const ir_op *op);
 
 /** op_pin_state_pinned states */
 typedef enum {
@@ -361,7 +361,7 @@ typedef struct {
  * This function can create all standard Firm opcode as well as new ones.
  * The behavior of new opcode depends on the operations \c ops and the \c flags.
  */
-ir_op *new_ir_op(ir_opcode code, const char *name, op_pin_state p,
+ir_op *new_ir_op(unsigned code, const char *name, op_pin_state p,
        unsigned flags, op_arity opar, int op_index, size_t attr_size,
        const ir_op_ops *ops);
 

ir/ir/irnode.c

@@ -430,7 +430,7 @@ void
 	_set_irn_op(node, op);
 }
 
-ir_opcode
+unsigned
 (get_irn_opcode)(const ir_node *node) {
 	return _get_irn_opcode(node);
 }

ir/ir/irnode_t.h

@@ -404,7 +404,7 @@ copy_node_attr(const ir_node *old_node, ir_node *new_node) {
  * Gets the opcode of a node.
  * Intern version for libFirm.
  */
-static INLINE ir_opcode
+static INLINE unsigned
 _get_irn_opcode(const ir_node *node) {
 	assert(k_ir_node == get_kind(node));
 	assert(node->op);

ir/ir/irop.c

@@ -200,17 +200,23 @@ ASM_copy_attr(const ir_node *old_node, ir_node *new_node) {
  *    The operations.
  */
 static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) {
-	if (code == iro_Call)
+	switch(code) {
+	case iro_Call:
 		ops->copy_attr = call_copy_attr;
-	else if (code == iro_Block)
+		break;
+	case iro_Block:
 		ops->copy_attr = block_copy_attr;
-	else if (code == iro_Phi)
+		break;
+	case iro_Phi:
 		ops->copy_attr = phi_copy_attr;
-	else if (code == iro_Filter)
+		break;
+	case iro_Filter:
 		ops->copy_attr = filter_copy_attr;
-	else if (code == iro_ASM)
+		break;
+	case iro_ASM:
 		ops->copy_attr = ASM_copy_attr;
-	else {
+		break;
+	default:
 		/* not allowed to be NULL */
 		if (! ops->copy_attr)
 			ops->copy_attr = default_copy_attr;
@@ -220,7 +226,7 @@ static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) {
 
 /* Creates a new ir operation. */
 ir_op *
-new_ir_op(ir_opcode code, const char *name, op_pin_state p,
+new_ir_op(unsigned code, const char *name, op_pin_state p,
           unsigned flags, op_arity opar, int op_index, size_t attr_size,
           const ir_op_ops *ops)
 {
@@ -438,7 +444,7 @@ const char *get_op_name (const ir_op *op) {
 	return get_id_str(op->name);
 }  /* get_op_name */
 
-ir_opcode (get_op_code)(const ir_op *op){
+unsigned (get_op_code)(const ir_op *op){
   return _get_op_code(op);
 }  /* get_op_code */
 

ir/ir/irop_t.h

@@ -34,7 +34,7 @@
 
 /** The type of an ir_op. */
 struct ir_op {
-  ir_opcode code;         /**< The unique opcode of the op. */
+  unsigned code;          /**< The unique opcode of the op. */
   ident *name;            /**< The name of the op. */
   size_t attr_size;       /**< Space needed in memory for private attributes. */
   op_pin_state op_pin_state_pinned; /**< How to deal with the node in CSE, PRE. */
@@ -145,7 +145,7 @@ static INLINE int is_op_machine_user(const ir_op *op, unsigned n) {
   return op->flags & (irop_flag_user << n);
 }
 
-static INLINE ir_opcode _get_op_code(const ir_op *op) {
+static INLINE unsigned _get_op_code(const ir_op *op) {
   return op->code;
 }