ia32: cleanup handling of 8/16bit operations

[libfirm] / ir / be / belive_t.h

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index c55ffa2..a8d939d 100644 (file)
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -22,16 +22,16 @@
  * @brief       Internal headers for liveness analysis.
  * @author      Sebastian Hack
  * @date        06.12.2004
- * @version     $Id$
  */
 #ifndef FIRM_BE_BELIVE_T_H
 #define FIRM_BE_BELIVE_T_H
 
+#include <stdbool.h>
 #include "be_types.h"
 #include "irgraph_t.h"
-#include "irphase_t.h"
+#include "irnodehashmap.h"
 #include "irhooks.h"
-#include "dfs.h"
+#include "irlivechk.h"
 #include "statev.h"
 
 #include "pset.h"
@@ -39,21 +39,13 @@
 
 #include "belive.h"
 
-#define USE_LIVE_CHK
-
-#ifdef USE_LIVE_CHK
-#include "irlivechk.h"
-#endif
-
 struct be_lv_t {
-       ir_phase ph;
-       ir_graph *irg;
-       dfs_t *dfs;
-       bitset_t *nodes;
-       hook_entry_t hook_info;
-#ifdef USE_LIVE_CHK
-       lv_chk_t *lvc;
-#endif
+       ir_nodehashmap_t map;
+       struct obstack   obst;
+       bool             sets_valid;
+       ir_graph        *irg;
+       hook_entry_t     hook_info;
+       lv_chk_t        *lvc;
 };
 
 typedef struct be_lv_info_node_t be_lv_info_node_t;
@@ -67,66 +59,68 @@ struct be_lv_info_head_t {
        unsigned n_size;
 };
 
-struct be_lv_info_t {
-       union {
-               struct be_lv_info_head_t head;
-               struct be_lv_info_node_t node;
-       } u;
+union be_lv_info_t {
+       struct be_lv_info_head_t head;
+       struct be_lv_info_node_t node;
 };
 
-static inline int _be_lv_next_irn(const be_lv_t *lv, const ir_node *bl,
-                                  unsigned flags, int i)
-{
-       be_lv_info_t *arr = phase_get_irn_data(&lv->ph, bl);
+be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *block,
+                             const ir_node *irn);
 
-       if (arr) {
-               int n_members = (int) arr[0].u.head.n_members;
+static inline unsigned _be_is_live_xxx(const be_lv_t *li, const ir_node *block,
+                                       const ir_node *irn, unsigned flags)
+{
+       unsigned res;
 
-               while(i < n_members) {
-                       if(arr[i + 1].u.node.flags & flags) {
-                               return i;
-                       }
-                       ++i;
-               }
+       if (li->sets_valid) {
+               be_lv_info_node_t *info = be_lv_get(li, block, irn);
+               res = info != NULL ? (info->flags & flags) != 0 : 0;
+       } else {
+               res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
        }
 
-       return -1;
+       return res;
 }
 
-static inline ir_node *_be_lv_get_irn(const be_lv_t *lv, const ir_node *bl, int i)
+typedef struct lv_iterator_t
 {
-       be_lv_info_t *arr = phase_get_irn_data(&lv->ph, bl);
-       return get_idx_irn(lv->irg, arr[i + 1].u.node.idx);
+       be_lv_info_t *info;
+       ir_graph     *irg;
+       be_lv_state_t flags;
+       size_t        i;
+} lv_iterator_t;
+
+static inline lv_iterator_t be_lv_iteration_begin(const be_lv_t *lv,
+       const ir_node *block, be_lv_state_t flags)
+{
+       lv_iterator_t res;
+       res.info  = ir_nodehashmap_get(be_lv_info_t, &lv->map, block);
+       res.irg   = get_Block_irg(block);
+       res.flags = flags;
+       res.i     = res.info != NULL ? res.info[0].head.n_members : 0;
+       return res;
 }
 
-be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, const ir_node *irn);
-
-static inline int _be_is_live_xxx(const be_lv_t *li, const ir_node *block, const ir_node *irn, unsigned flags)
+static inline ir_node *be_lv_iteration_next(lv_iterator_t *iterator)
 {
-       int res;
-
-       if (li->nodes) {
-               be_lv_info_node_t *info = be_lv_get(li, block, irn);
-               res = info ? (info->flags & flags) != 0 : 0;
+       while (iterator->i != 0) {
+               const be_lv_info_t *info = iterator->info + iterator->i--;
+               if (info->node.flags & iterator->flags)
+                       return get_idx_irn(iterator->irg, info->node.idx);
        }
-
-#ifdef USE_LIVE_CHK
-       else
-               res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
-#endif /* USE_LIVE_CHK */
-
-       return res;
+       return NULL;
 }
 
-#define be_lv_foreach(lv, bl, flags, i) \
-       for (i = _be_lv_next_irn(lv, bl, flags, 0); i >= 0; i = _be_lv_next_irn(lv, bl, flags, i + 1))
-
+#define be_lv_foreach(lv, block, flags, node) \
+       for (bool once = true; once;) \
+               for (lv_iterator_t iter = be_lv_iteration_begin((lv), (block), (flags)); once; once = false) \
+                       for (ir_node *node; (node = be_lv_iteration_next(&iter)) != NULL;)
 
-static inline pset *_be_lv_pset_put(const be_lv_t *lv, const ir_node *block, int state, pset *s)
+static inline pset *_be_lv_pset_put(const be_lv_t *lv, const ir_node *block,
+                                    int state, pset *s)
 {
-       int i;
-       be_lv_foreach(lv, block, state, i)
-               pset_insert_ptr(s, _be_lv_get_irn(lv, block, i));
+       be_lv_foreach(lv, block, state, node)
+               pset_insert_ptr(s, node);
        return s;
 }