X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=a68d301ba8f01d2d5faacd7666338770b160d035;hb=36fc5bb2784078aa07e1fa643a5acba7025fe98f;hp=c54767565dcc1aef6d73915c4f92475e17433eec;hpb=cdcd17c48e951c6e0201c58b94aaf52a8769703c;p=libfirm diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h index c54767565..a68d301ba 100644 --- a/ir/be/bechordal_t.h +++ b/ir/be/bechordal_t.h @@ -1,20 +1,6 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. - * * This file is part of libFirm. - * - * This file may be distributed and/or modified under the terms of the - * GNU General Public License version 2 as published by the Free Software - * Foundation and appearing in the file LICENSE.GPL included in the - * packaging of this file. - * - * Licensees holding valid libFirm Professional Edition licenses may use - * this file in accordance with the libFirm Commercial License. - * Agreement provided with the Software. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. + * Copyright (C) 2012 University of Karlsruhe. */ /** @@ -34,19 +20,15 @@ #include "debug.h" #include "bechordal.h" -#include "beirg.h" #include "beifg.h" /** * A liveness interval border. */ struct border_t { - DEBUG_ONLY(unsigned magic;) /**< A magic number for checking. */ struct list_head list; /**< list head for queuing. */ - border_t *other_end; /**< The other end of the border. */ ir_node *irn; /**< The node. */ unsigned step; /**< The number equal to the interval border. */ - unsigned pressure; /**< The pressure at this interval border. (The border itself is counting). */ unsigned is_def : 1; /**< Does this border denote a use or a def. */ unsigned is_real : 1; /**< Is the def/use real? Or is it just inserted at block beginnings or ends @@ -58,7 +40,7 @@ struct border_t { * Environment for each of the chordal register allocator phases */ struct be_chordal_env_t { - struct obstack *obst; /**< An obstack for temporary storage. */ + struct obstack obst; /**< An obstack for temporary storage. */ be_ra_chordal_opts_t *opts; /**< A pointer to the chordal ra options. */ ir_graph *irg; /**< The graph under examination. */ const arch_register_class_t *cls; /**< The current register class. */ @@ -67,20 +49,12 @@ struct be_chordal_env_t { bitset_t *allocatable_regs; /**< set of allocatable registers */ }; -static inline struct list_head *_get_block_border_head(const be_chordal_env_t *inf, ir_node *bl) { +static inline struct list_head *get_block_border_head(be_chordal_env_t const *const inf, ir_node *const bl) +{ return pmap_get(list_head, inf->border_heads, bl); } -#define get_block_border_head(info, bl) _get_block_border_head(info, bl) - #define foreach_border_head(head, pos) list_for_each_entry_reverse(border_t, pos, head, list) -#define border_next(b) (list_entry((b)->list.next, border_t, list)) -#define border_prev(b) (list_entry((b)->list.prev, border_t, list)) - -#define chordal_has_class(chordal_env, irn) \ - arch_irn_consider_in_reg_alloc(chordal_env->cls, irn) - -void be_ra_chordal_color(be_chordal_env_t *chordal_env); enum { /* Dump flags */ @@ -112,9 +86,6 @@ struct be_ra_chordal_opts_t { unsigned dump_flags; int lower_perm_opt; int vrfy_option; - - char ilp_server[128]; - char ilp_solver[128]; }; void check_for_memory_operands(ir_graph *irg);