Skip to content

GitLab

Commit 1dae71d8 authored by Christian Würdig's avatar Christian Würdig
Browse files

added comments 

extended dumper
adapted to bearch interface changes
parent 83712136
Hide whitespace changes
Inline Side-by-side
ir/be/ia32/bearch_ia32.c
View file @ 1dae71d8
/**
* This is the main ia32 firm backend driver.
*
* $Id$
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
......@@ -259,11 +265,13 @@ ia32_irn_ops_t ia32_irn_ops = {
*/
static void ia32_prepare_graph(void *self) {
ia32_code_gen_t *cg = self;
firm_dbg_module_t *old_mod = cg->mod;
irg_walk_blkwise_graph(cg->irg, ia32_place_consts, ia32_transform_node, cg);
cg->mod = firm_dbg_register("firm.be.ia32.transform");
irg_walk_blkwise_graph(cg->irg, ia32_place_consts_set_modes, ia32_transform_node, cg);
dump_ir_block_graph_sched(cg->irg, "-transformed");
edges_deactivate(cg->irg);
edges_activate(cg->irg);
cg->mod = old_mod;
if (cg->opt.doam) {
irg_walk_blkwise_graph(cg->irg, NULL, ia32_optimize_am, cg);
......@@ -505,6 +513,7 @@ static void *ia32_cg_init(FILE *F, const be_irg_t *birg);
static const arch_code_generator_if_t ia32_code_gen_if = {
ia32_cg_init,
NULL, /* before abi introduce hook */
ia32_prepare_graph,
ia32_before_sched, /* before scheduling hook */
ia32_before_ra, /* before register allocation hook */
......@@ -562,11 +571,12 @@ static void *ia32_cg_init(FILE *F, const be_irg_t *birg) {
*****************************************************************/
static ia32_isa_t ia32_isa_template = {
&ia32_isa_if,
&ia32_gp_regs[REG_ESP],
&ia32_gp_regs[REG_EBP],
-1,
0
&ia32_isa_if, /* isa interface implementation */
&ia32_gp_regs[REG_ESP], /* stack pointer register */
&ia32_gp_regs[REG_EBP], /* base pointer register */
-1, /* stack direction */
0, /* number of code generator objects so far */
NULL /* name obstack */
};
/**
......@@ -585,6 +595,11 @@ static void *ia32_init(void) {
ia32_register_init(isa);
ia32_create_opcodes();
#ifndef NDEBUG
isa->name_obst = xcalloc(1, sizeof(*(isa->name_obst)));
obstack_init(isa->name_obst);
#endif /* NDEBUG */
inited = 1;
return isa;
......@@ -596,6 +611,12 @@ static void *ia32_init(void) {
* Closes the output file and frees the ISA structure.
*/
static void ia32_done(void *self) {
ia32_isa_t *isa = self;
#ifndef NDEBUG
obstack_free(isa->name_obst, NULL);
#endif /* NDEBUG */
free(self);
}
......
ir/be/ia32/bearch_ia32_t.h
View file @ 1dae71d8
#ifndef _BEARCH_IA32_T_H_
#define _BEARCH_IA32_T_H_
#include "firm_config.h"
#include "debug.h"
#include "bearch_ia32.h"
#include "ia32_nodes_attr.h"
......@@ -35,6 +37,9 @@ typedef struct _ia32_isa_t {
const arch_register_t *bp; /** The base pointer register. */
const int stack_dir; /** -1 for decreasing, 1 for increasing. */
int num_codegens;
#ifndef NDEBUG
struct obstack *name_obst; /**< holds the original node names (for debugging) */
#endif /* NDEBUG */
} ia32_isa_t;
typedef struct _ia32_irn_ops_t {
......
ir/be/ia32/ia32_new_nodes.c
View file @ 1dae71d8
......@@ -351,6 +351,18 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) {
}
fprintf(F, "\n");
#ifndef NDEBUG
/* dump original ir node name */
fprintf(F, "orig node = ");
if (get_ia32_orig_node(n)) {
fprintf(F, "%s", get_ia32_orig_node(n));
}
else {
fprintf(F, "n/a");
}
fprintf(F, "\n");
#endif /* NDEBUG */
fprintf(F, "=== IA32 attr end ===\n");
/* end of: case dump_node_info_txt */
break;
......@@ -795,6 +807,25 @@ void set_ia32_pncode(ir_node *node, long code) {
attr->pn_code = code;
}
#ifndef NDEBUG
/**
* Returns the name of the original ir node.
*/
const char *get_ia32_orig_node(const ir_node *node) {
ia32_attr_t *attr = get_ia32_attr(node);
return attr->orig_node;
}
/**
* Sets the name of the original ir node.
*/
void set_ia32_orig_node(ir_node *node, const char *name) {
ia32_attr_t *attr = get_ia32_attr(node);
attr->orig_node = name;
}
#endif /* NDEBUG */
/******************************************************************************************************
* _ _ _ _ __ _ _
......
ir/be/ia32/ia32_new_nodes.h
View file @ 1dae71d8
......@@ -7,6 +7,8 @@
* $Id$
*/
#include "firm_config.h"
#include "ia32_nodes_attr.h"
/**
......@@ -262,6 +264,19 @@ long get_ia32_pncode(const ir_node *node);
*/
void set_ia32_pncode(ir_node *node, long code);
#ifndef NDEBUG
/**
* Returns the name of the original ir node.
*/
const char *get_ia32_orig_node(const ir_node *node);
/**
* Sets the name of the original ir node.
*/
void set_ia32_orig_node(ir_node *node, const char *name);
#endif /* NDEBUG */
/******************************************************************************************************
* _ _ _ _ __ _ _
......
ir/be/ia32/ia32_nodes_attr.h
View file @ 1dae71d8
#ifndef _IA32_NODES_ATTR_H_
#define _IA32_NODES_ATTR_H_
#include "firm_config.h"
#include <obstack.h>
#include "firm_types.h"
......@@ -80,12 +82,16 @@ typedef struct _ia32_attr_t {
entity *frame_ent; /**< the frame entity attached to this node */
long pn_code; /**< projnum "types" (e.g. indicate compare operators and argument numbers) */
long pn_code; /**< projnum "types" (e.g. indicate compare operators and argument numbers) */
#ifndef NDEBUG
const char *orig_node; /**< holds the name of the original ir node for debugging purposes */
#endif /* NDEBUG */
const ia32_register_req_t **in_req; /**< register requirements for arguments */
const ia32_register_req_t **out_req; /**< register requirements for results */
const arch_register_t **slots; /**< register slots for assigned registers */
const arch_register_t **slots; /**< register slots for assigned registers */
} ia32_attr_t;
#endif /* _IA32_NODES_ATTR_H_ */
ir/be/ia32/ia32_optimize.c
View file @ 1dae71d8
......@@ -158,9 +158,10 @@ static ir_node *gen_Const(ia32_transform_env_t *env) {
/**
* Transforms (all) Const's into ia32_Const and places them in the
* block where they are used (or in the cfg-pred Block in case of Phi's)
* block where they are used (or in the cfg-pred Block in case of Phi's).
* Additionally all mode_P nodes are changed into mode_Is nodes.
*/
void ia32_place_consts(ir_node *irn, void *env) {
void ia32_place_consts_set_modes(ir_node *irn, void *env) {
ia32_code_gen_t *cg = env;
ia32_transform_env_t tenv;
ir_mode *mode;
......@@ -173,6 +174,12 @@ void ia32_place_consts(ir_node *irn, void *env) {
mode = get_irn_mode(irn);
/* transform all mode_P nodes into mode_Is nodes */
if (mode == mode_P) {
set_irn_mode(irn, mode_Is);
mode = mode_Is;
}
tenv.block = get_nodes_block(irn);
tenv.cg = cg;
tenv.irg = cg->irg;
......
ir/be/ia32/ia32_optimize.h
View file @ 1dae71d8
......@@ -4,9 +4,10 @@
/**
* Transforms a Firm Const into an ia32 Const and places it
* in the Block where it's used.
* Additionally all mode_P nodes are changed into mode_Is nodes.
* This function is called by a walker.
*/
void ia32_place_consts(ir_node *irn, void *env);
void ia32_place_consts_set_modes(ir_node *irn, void *env);
/**
* Checks for address mode patterns and performs the
......
ir/be/ia32/ia32_transform.c
View file @ 1dae71d8
/**
* This file implements the IR transformation from firm into
* ia32-Firm.
*
* $Id$
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "irargs_t.h"
#include "irnode_t.h"
#include "irgraph_t.h"
#include "irmode_t.h"
......@@ -146,7 +154,18 @@ static char *gen_fp_known_const(ir_mode *mode, ia32_known_const_t kct) {
return ent_name;
}
#ifndef NDEBUG
/**
* Prints the old node name on cg obst and returns a pointer to it.
*/
const char *get_old_node_name(ia32_transform_env_t *env) {
ia32_isa_t *isa = (ia32_isa_t *)env->cg->arch_env->isa;
lc_eoprintf(firm_get_arg_env(), isa->name_obst, "%+F", env->irn);
obstack_1grow(isa->name_obst, 0);
return obstack_finish(isa->name_obst);
}
#endif /* NDEBUG */
/* determine if one operator is an Imm */
static ir_node *get_immediate_op(ir_node *op1, ir_node *op2) {
......@@ -239,6 +258,10 @@ static ir_node *gen_binop(ia32_transform_env_t *env, ir_node *op1, ir_node *op2,
}
}
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
if (is_op_commutative(get_irn_op(env->irn))) {
set_ia32_commutative(new_op);
}
......@@ -312,6 +335,10 @@ static ir_node *gen_shift_binop(ia32_transform_env_t *env, ir_node *op1, ir_node
/* set AM support */
set_ia32_am_support(new_op, ia32_am_Dest);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_rd_Proj(dbg, irg, block, new_op, mode, 0);
}
......@@ -346,6 +373,10 @@ static ir_node *gen_unop(ia32_transform_env_t *env, ir_node *op, construct_unop_
set_ia32_am_support(new_op, ia32_am_Dest);
}
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_rd_Proj(dbg, irg, block, new_op, mode, 0);
}
......@@ -462,6 +493,10 @@ static ir_node *gen_Add(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) {
}
}
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_rd_Proj(dbg, irg, block, new_op, mode, 0);
}
......@@ -631,6 +666,9 @@ static ir_node *gen_Min(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) {
else {
new_op = new_rd_ia32_Min(env->dbg, env->irg, env->block, op1, op2, env->mode);
set_ia32_am_support(new_op, ia32_am_None);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
}
return new_op;
......@@ -747,6 +785,10 @@ static ir_node *gen_Sub(ia32_transform_env_t *env, ir_node *op1, ir_node *op2) {
}
}
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_rd_Proj(dbg, irg, block, new_op, mode, 0);
}
......@@ -821,6 +863,10 @@ static ir_node *generate_DivMod(ia32_transform_env_t *env, ir_node *dividend, ir
be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in_keep);
}
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
return res;
}
......@@ -868,6 +914,10 @@ static ir_node *gen_Quot(ia32_transform_env_t *env, ir_node *op1, ir_node *op2)
new_op = new_rd_ia32_fDiv(env->dbg, env->irg, env->block, noreg, noreg, op1, op2, nomem, env->mode);
set_ia32_am_support(new_op, ia32_am_Source);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_op;
}
......@@ -1015,6 +1065,10 @@ static ir_node *gen_Minus(ia32_transform_env_t *env, ir_node *op) {
set_ia32_sc(new_op, name);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
new_op = new_rd_Proj(env->dbg, env->irg, env->block, new_op, env->mode, 0);
}
else {
......@@ -1075,15 +1129,33 @@ static ir_node *gen_Abs(ia32_transform_env_t *env, ir_node *op) {
set_ia32_sc(res, name);
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
res = new_rd_Proj(dbg, irg, block, res, mode, 0);
}
else {
res = new_rd_ia32_Cdq(dbg, irg, block, op, mode_T);
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
p_eax = new_rd_Proj(dbg, irg, block, res, mode, pn_EAX);
p_edx = new_rd_Proj(dbg, irg, block, res, mode, pn_EDX);
res = new_rd_ia32_Eor(dbg, irg, block, noreg_gp, noreg_gp, p_eax, p_edx, nomem, mode_T);
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
res = new_rd_Proj(dbg, irg, block, res, mode, 0);
res = new_rd_ia32_Sub(dbg, irg, block, noreg_gp, noreg_gp, res, p_edx, nomem, mode_T);
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
res = new_rd_Proj(dbg, irg, block, res, mode, 0);
}
......@@ -1118,6 +1190,10 @@ static ir_node *gen_Load(ia32_transform_env_t *env) {
set_ia32_am_flavour(new_op, ia32_B);
set_ia32_ls_mode(new_op, get_Load_mode(node));
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_op;
}
......@@ -1162,6 +1238,11 @@ static ir_node *gen_Store(ia32_transform_env_t *env) {
set_ia32_op_type(new_op, ia32_AddrModeD);
set_ia32_am_flavour(new_op, ia32_B);
set_ia32_ls_mode(new_op, get_irn_mode(val));
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_op;
}
......@@ -1213,6 +1294,10 @@ static ir_node *gen_Cond(ia32_transform_env_t *env) {
set_ia32_pncode(res, get_Cond_defaultProj(node));
}
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
return res;
}
......@@ -1255,6 +1340,10 @@ static ir_node *gen_CopyB(ia32_transform_env_t *env) {
set_ia32_Immop_tarval(res, new_tarval_from_long(size, mode_Is));
}
#ifndef NDEBUG
set_ia32_orig_node(res, get_old_node_name(env));
#endif /* NDEBUG */
return res;
}
......@@ -1267,13 +1356,48 @@ static ir_node *gen_CopyB(ia32_transform_env_t *env) {
* @return The transformed node.
*/
static ir_node *gen_Mux(ia32_transform_env_t *env) {
ir_node *node = env->irn;
return new_rd_ia32_CMov(env->dbg, env->irg, env->block,
ir_node *node = env->irn;
ir_node *new_op = new_rd_ia32_CMov(env->dbg, env->irg, env->block, \
get_Mux_sel(node), get_Mux_false(node), get_Mux_true(node), env->mode);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_op;
}
/**
* Checks of we can omit the Int -> Int Conv
*/
static int ignore_int_conv(ir_mode *src_mode, ir_mode *tgt_mode) {
int ignore = 0;
int src_sign = mode_is_signed(src_mode);
int tgt_sign = mode_is_signed(tgt_mode);
int src_bits = get_mode_size_bits(src_mode);
int tgt_bits = get_mode_size_bits(tgt_mode);
/* mode_P is already converted in mode_Is */
#if 0
/* ignore mode_P -> mode_Is Convs */
ignore = ((src_mode == mode_P) && (tgt_mode == mode_Is)) ? 1 : 0;
/* ignore mode_Is -> mode_P Convs */
ignore = ((src_mode == mode_Is) && (tgt_mode == mode_P)) ? 1 : 0;
#endif
/* ignore Convs small -> big if same signedness */
ignore = (src_sign == tgt_sign) && (src_bits < tgt_bits) ? 1 : ignore;
/* ignore Bool -> Int Conv */
ignore = (src_mode == mode_b) ? 1 : ignore;
/* ignore Int -> Int Convs if same bitsize */
ignore = (src_bits == tgt_bits) ? 1 : ignore;
return ignore;
}
/**
* Transforms a Conv node.
......@@ -1303,12 +1427,12 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *op) {
if (mode_is_float(tgt_mode)) {
/* ... to float */
DB((mod, LEVEL_1, "create Conv(float, float) ..."));
new_op = new_rd_ia32_Conv_FP2FP(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode);
new_op = new_rd_ia32_Conv_FP2FP(dbg, irg, block, noreg, noreg, op, nomem, mode_T);
}
else {
/* ... to int */
DB((mod, LEVEL_1, "create Conv(float, int) ..."));
new_op = new_rd_ia32_Conv_FP2I(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode);
new_op = new_rd_ia32_Conv_FP2I(dbg, irg, block, noreg, noreg, op, nomem, mode_T);
}
}
else {
......@@ -1316,25 +1440,31 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *op) {
if (mode_is_float(tgt_mode)) {
/* ... to float */
DB((mod, LEVEL_1, "create Conv(int, float) ..."));
new_op = new_rd_ia32_Conv_I2FP(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode);
new_op = new_rd_ia32_Conv_I2FP(dbg, irg, block, noreg, noreg, op, nomem, mode_T);
}
else {
/* ... to int */
DB((mod, LEVEL_1, "create Conv(int, int) ..."));
/* kill mode_P -> mode_Is resp. mode_Is -> mode_P Convs */
if (((src_mode == mode_P) && (tgt_mode == mode_Is)) ||
((src_mode == mode_Is) && (tgt_mode == mode_P)))
{
DB((mod, LEVEL_1, "killed Conv(Is, P)/(P, Is) ..."));
/* check if we can omit the Conv */
if (ignore_int_conv(src_mode, tgt_mode)) {
DB((mod, LEVEL_1, "omitted Conv ..."));
edges_reroute(env->irn, op, irg);
}
else {
new_op = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, op, nomem, tgt_mode);
new_op = new_rd_ia32_Conv_I2I(dbg, irg, block, noreg, noreg, op, nomem, mode_T);
}
}
}
if (new_op) {
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
new_op = new_rd_Proj(dbg, irg, block, new_op, tgt_mode, 0);
}
return new_op;
}
......@@ -1350,6 +1480,9 @@ static ir_node *gen_Conv(ia32_transform_env_t *env, ir_node *op) {
*
********************************************/
/**
* Transforms a FrameAddr into an ia32 Add.
*/
static ir_node *gen_FrameAddr(ia32_transform_env_t *env) {
ir_node *new_op = NULL;
ir_node *node = env->irn;
......@@ -1362,9 +1495,16 @@ static ir_node *gen_FrameAddr(ia32_transform_env_t *env) {
set_ia32_am_support(new_op, ia32_am_Full);
set_ia32_use_frame(new_op);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_rd_Proj(env->dbg, env->irg, env->block, new_op, env->mode, 0);
}
/**
* Transforms a FrameLoad into an ia32 Load.
*/
static ir_node *gen_FrameLoad(ia32_transform_env_t *env) {
ir_node *new_op = NULL;
ir_node *node = env->irn;
......@@ -1388,9 +1528,17 @@ static ir_node *gen_FrameLoad(ia32_transform_env_t *env) {
set_ia32_am_flavour(new_op, ia32_B);
set_ia32_ls_mode(new_op, mode);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_op;
}
/**
* Transforms a FrameStore into an ia32 Store.
*/
static ir_node *gen_FrameStore(ia32_transform_env_t *env) {
ir_node *new_op = NULL;
ir_node *node = env->irn;
......@@ -1414,6 +1562,10 @@ static ir_node *gen_FrameStore(ia32_transform_env_t *env) {
set_ia32_am_flavour(new_op, ia32_B);
set_ia32_ls_mode(new_op, mode);
#ifndef NDEBUG
set_ia32_orig_node(new_op, get_old_node_name(env));
#endif /* NDEBUG */
return new_op;
}
......
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