Commit ffbc2525 authored by Matthias Braun's avatar Matthias Braun
Browse files

Cleanup: remove firm_common_t.h (and the PRECISE_EXC_CONTEXT define)

[r26222]
parent e3717f71
......@@ -324,7 +324,6 @@ EXTRA_DIST = \
common/error.h \
common/irtools.h \
common/firmwalk.h \
common/firm_common_t.h \
common/debug.h \
debug/dbginfo_t.h \
debug/debugger.h \
......
......@@ -33,7 +33,6 @@
#include "gaussseidel.h"
#include "firm_common_t.h"
#include "set.h"
#include "hashptr.h"
#include "debug.h"
......
......@@ -28,7 +28,6 @@
#include "execution_frequency.h"
#include "firm_common_t.h"
#include "set.h"
#include "pdeq.h"
#include "hashptr.h"
......
......@@ -29,7 +29,6 @@
#include "debug.h"
#include "interval_analysis.h"
#include "execution_frequency.h"
#include "firm_common_t.h"
#include "set.h"
#include "array.h"
......
......@@ -35,7 +35,6 @@
#include "ircons_t.h"
#include "iropt_t.h"
#include "irop.h"
#include "firm_common_t.h"
#include "irvrfy_t.h"
#include "irprintf.h"
#include "xmalloc.h"
......
......@@ -36,7 +36,6 @@
#include "ircons_t.h"
#include "iropt_t.h"
#include "irop.h"
#include "firm_common_t.h"
#include "irvrfy_t.h"
#include "irprintf.h"
#include "xmalloc.h"
......
......@@ -38,7 +38,6 @@
#include "ircons_t.h"
#include "iropt_t.h"
#include "irop.h"
#include "firm_common_t.h"
#include "irvrfy_t.h"
#include "irprintf.h"
#include "iredges.h"
......
......@@ -36,7 +36,6 @@
#include "ircons_t.h"
#include "iropt_t.h"
#include "irop.h"
#include "firm_common_t.h"
#include "irvrfy_t.h"
#include "irprintf.h"
#include "xmalloc.h"
......
......@@ -36,7 +36,6 @@
#include "ircons_t.h"
#include "iropt_t.h"
#include "irop.h"
#include "firm_common_t.h"
#include "irvrfy_t.h"
#include "irprintf.h"
#include "xmalloc.h"
......
......@@ -24,7 +24,6 @@
*/
#include "config.h"
#include "firm_common_t.h"
#include "irgraph.h"
#include "irloop.h"
#include "tv.h"
......
/*
* 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.
*/
/**
* @file
* @brief Internal preprocessor directives.
* @author Goetz Lindenmaier
* @version $Id$
*/
#ifndef FIRM_COMMON_COMMON_T_H
#define FIRM_COMMON_COMMON_T_H
#include "firm_common.h"
/* --- Global flags. --- */
/** When set Phi node construction uses the values valid when the fragile
* operation is executed. Else it uses the values valid at the end of the
* block with the fragile operation. */
#define PRECISE_EXC_CONTEXT 1
/** If this and DEBUG_libfirm are defined irdump uses the nodeid numbers as
* labels for the vcg nodes. This makes the vcg graph better readable.
* Sometimes it's useful to see the pointer values, though. */
#define NODEID_AS_LABEL 1
#endif
......@@ -32,7 +32,6 @@
#include "irnode_t.h"
#include "irmode_t.h"
#include "ircons_t.h"
#include "firm_common_t.h"
#include "irvrfy.h"
#include "irop_t.h"
#include "iropt_t.h"
......@@ -766,7 +765,6 @@ new_rd_Phi_in(ir_graph *irg, ir_node *block, ir_mode *mode,
static ir_node *
get_r_value_internal(ir_node *block, int pos, ir_mode *mode);
#if PRECISE_EXC_CONTEXT
static ir_node *
phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins);
......@@ -884,7 +882,6 @@ get_r_frag_value_internal(ir_node *block, ir_node *cfOp, int pos, ir_mode *mode)
}
return res;
} /* get_r_frag_value_internal */
#endif /* PRECISE_EXC_CONTEXT */
/**
* Check whether a control flownode cf_pred represents an exception flow.
......@@ -960,14 +957,12 @@ phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins) {
} else {
phi0 = new_rd_Phi0(irg, block, mode);
block->attr.block.graph_arr[pos] = phi0;
#if PRECISE_EXC_CONTEXT
if (get_opt_precise_exc_context()) {
/* Set graph_arr for fragile ops. Also here we should break recursion.
We could choose a cyclic path through an cfop. But the recursion would
break at some point. */
set_frag_value(block->attr.block.graph_arr, pos, phi0);
}
#endif
}
}
......@@ -987,12 +982,10 @@ phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins) {
prevBlock = prevCfOp->in[0]; /* go past control flow op to prev block */
assert(prevBlock);
if (!is_Bad(prevBlock)) {
#if PRECISE_EXC_CONTEXT
if (get_opt_precise_exc_context() && is_exception_flow(cf_pred, prevCfOp)) {
assert(get_r_frag_value_internal(prevBlock, prevCfOp, pos, mode));
nin[i-1] = get_r_frag_value_internal(prevBlock, prevCfOp, pos, mode);
} else
#endif
nin[i-1] = get_r_value_internal(prevBlock, pos, mode);
} else {
nin[i-1] = new_Bad();
......
......@@ -29,8 +29,6 @@
#include <stdlib.h>
#include <stdarg.h>
#include "firm_common_t.h"
#include "list.h"
#include "irnode_t.h"
......
......@@ -32,8 +32,6 @@
#include "irdump_t.h"
#include "irgraph_t.h"
#include "firm_common_t.h"
#include "irprog_t.h"
#include "entity_t.h"
#include "trouts.h"
......
......@@ -29,7 +29,6 @@
#include "firm_types.h"
#include "irgraph.h"
#include "firm_common_t.h"
#include "irtypes.h"
#include "irprog.h"
#include "pseudo_irg.h"
......
......@@ -31,7 +31,6 @@
#include "irop_t.h"
#include "irgraph_t.h"
#include "irflag_t.h"
#include "firm_common_t.h"
#include "array.h"
/**
......
......@@ -31,7 +31,6 @@
#include "irtypes.h"
#include "pseudo_irg.h"
#include "ircgcons.h"
#include "firm_common_t.h"
#include "irtypeinfo.h"
#include "irmemory.h"
......
......@@ -46,7 +46,6 @@ static void prepare_nodes(ir_node *irn, void *env) {
memset(irn->attr.block.graph_arr, 0, sizeof(ir_node *) * current_ir_graph->n_loc);
irn->attr.block.phis = NULL;
break;
#if PRECISE_EXC_CONTEXT
/* note that the frag array must be cleared first, else firm_alloc_frag_arr()
will not allocate new memory. */
case iro_Quot:
......@@ -89,7 +88,6 @@ static void prepare_nodes(ir_node *irn, void *env) {
irn->attr.bound.exc.frag_arr = NULL;
firm_alloc_frag_arr(irn, op_Bound, &irn->attr.bound.exc.frag_arr);
break;
#endif
default:
;
}
......
......@@ -27,7 +27,6 @@
#define FIRM_IR_IRDEFS_H
#include "firm_types.h"
#include "firm_common_t.h"
#include "irdom_t.h"
#include "irmode.h"
#include "irnode.h"
......@@ -184,9 +183,7 @@ typedef struct {
op_pin_state pin_state; /**< the pin state for operations that might generate a exception:
If it's know that no exception will be generated, could be set to
op_pin_state_floats. */
#if PRECISE_EXC_CONTEXT
struct ir_node **frag_arr; /**< For Phi node construction in case of exception */
#endif
} except_attr;
/** Call attributes. */
......
......@@ -29,8 +29,6 @@
#include <stdlib.h>
#include <stddef.h>
#include "firm_common_t.h"
#include "xmalloc.h"
#include "entity_t.h"
#include "array.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment