projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct three bugs in bemit_incsp(): Offset 0 must emit no code, get_signed_imm_size...
[libfirm]
/
ir
/
be
/
beinsn.c
diff --git
a/ir/be/beinsn.c
b/ir/be/beinsn.c
index
ac534b9
..
ebe4f4a
100644
(file)
--- a/
ir/be/beinsn.c
+++ b/
ir/be/beinsn.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-23,18
+23,16
@@
* @author Sebastian Hack
* @version $Id$
*/
* @author Sebastian Hack
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include "irgraph_t.h"
#include "irmode_t.h"
#include "irnode_t.h"
#include "iredges.h"
#include "irgraph_t.h"
#include "irmode_t.h"
#include "irnode_t.h"
#include "iredges.h"
-#include "besched
_t
.h"
+#include "besched.h"
#include "beinsn_t.h"
#include "beinsn_t.h"
-#include "beirg
_t
.h"
+#include "beirg.h"
#include "beabi.h"
#include "raw_bitset.h"
#include "beabi.h"
#include "raw_bitset.h"
@@
-46,8
+44,7
@@
* @param mach_op the machine operand for which uses are added
*/
static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_node *mach_op) {
* @param mach_op the machine operand for which uses are added
*/
static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_node *mach_op) {
- const arch_env_t *arch_env = env->aenv;
- struct obstack *obst = env->obst;
+ struct obstack *obst = env->obst;
int i, n;
for (i = 0, n = get_irn_arity(mach_op); i < n; ++i) {
int i, n;
for (i = 0, n = get_irn_arity(mach_op); i < n; ++i) {
@@
-55,11
+52,11
@@
static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_n
if (is_irn_machine_operand(op)) {
add_machine_operands(env, insn, op);
if (is_irn_machine_operand(op)) {
add_machine_operands(env, insn, op);
- } else if (arch_irn_consider_in_reg_alloc(
arch_env,
env->cls, op)) {
+ } else if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
be_operand_t o;
/* found a register use, create an operand */
be_operand_t o;
/* found a register use, create an operand */
- o.req = arch_get_register_req(
arch_env,
mach_op, i);
+ o.req = arch_get_register_req(mach_op, i);
o.carrier = op;
o.irn = insn->irn;
o.pos = i;
o.carrier = op;
o.irn = insn->irn;
o.pos = i;
@@
-82,15
+79,13
@@
static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_n
*/
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
{
*/
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
{
- const arch_env_t *arch_env = env->aenv;
- struct obstack *obst = env->obst;
+ struct obstack *obst = env->obst;
be_operand_t o;
be_insn_t *insn;
int i, n;
int pre_colored = 0;
be_operand_t o;
be_insn_t *insn;
int i, n;
int pre_colored = 0;
- insn = obstack_alloc(obst, sizeof(insn[0]));
- memset(insn, 0, sizeof(insn[0]));
+ insn = OALLOCZ(obst, be_insn_t);
insn->irn = irn;
insn->next_insn = sched_next(irn);
insn->irn = irn;
insn->next_insn = sched_next(irn);
@@
-107,9
+102,9
@@
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
in the backend, but check it for now. */
assert(get_irn_mode(p) != mode_T);
in the backend, but check it for now. */
assert(get_irn_mode(p) != mode_T);
- if (arch_irn_consider_in_reg_alloc(
arch_env,
env->cls, p)) {
+ if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
/* found a def: create a new operand */
/* found a def: create a new operand */
- o.req = arch_get_register_req
(arch_env, p, -1
);
+ o.req = arch_get_register_req
_out(p
);
o.carrier = p;
o.irn = irn;
o.pos = -(get_Proj_proj(p) + 1);
o.carrier = p;
o.irn = irn;
o.pos = -(get_Proj_proj(p) + 1);
@@
-118,12
+113,12
@@
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
obstack_grow(obst, &o, sizeof(o));
insn->n_ops++;
insn->out_constraints |= o.has_constraints;
obstack_grow(obst, &o, sizeof(o));
insn->n_ops++;
insn->out_constraints |= o.has_constraints;
- pre_colored += arch_get_irn_register(
arch_env,
p) != NULL;
+ pre_colored += arch_get_irn_register(p) != NULL;
}
}
}
}
- } else if (arch_irn_consider_in_reg_alloc(
arch_env,
env->cls, irn)) {
+ } else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
/* only one def, create one operand */
/* only one def, create one operand */
- o.req = arch_get_register_req
(arch_env, irn, -1
);
+ o.req = arch_get_register_req
_out(irn
);
o.carrier = irn;
o.irn = irn;
o.pos = -1;
o.carrier = irn;
o.irn = irn;
o.pos = -1;
@@
-132,7
+127,7
@@
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
obstack_grow(obst, &o, sizeof(o));
insn->n_ops++;
insn->out_constraints |= o.has_constraints;
obstack_grow(obst, &o, sizeof(o));
insn->n_ops++;
insn->out_constraints |= o.has_constraints;
- pre_colored += arch_get_irn_register(
arch_env,
irn) != NULL;
+ pre_colored += arch_get_irn_register(irn) != NULL;
}
if (pre_colored > 0) {
}
if (pre_colored > 0) {
@@
-147,9
+142,9
@@
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
if (is_irn_machine_operand(op)) {
add_machine_operands(env, insn, op);
if (is_irn_machine_operand(op)) {
add_machine_operands(env, insn, op);
- } else if (arch_irn_consider_in_reg_alloc(
arch_env,
env->cls, op)) {
+ } else if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
/* found a register use, create an operand */
/* found a register use, create an operand */
- o.req = arch_get_register_req(
arch_env,
irn, i);
+ o.req = arch_get_register_req(irn, i);
o.carrier = op;
o.irn = irn;
o.pos = i;
o.carrier = op;
o.irn = irn;
o.pos = i;
@@
-184,7
+179,7
@@
be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
if (type & arch_register_req_type_limited) {
rbitset_copy_to_bitset(req->limited, op->regs);
} else {
if (type & arch_register_req_type_limited) {
rbitset_copy_to_bitset(req->limited, op->regs);
} else {
- arch_put_non_ignore_regs(
arch_env,
env->cls, op->regs);
+ arch_put_non_ignore_regs(env->cls, op->regs);
if (env->ignore_colors)
bitset_andnot(op->regs, env->ignore_colors);
}
if (env->ignore_colors)
bitset_andnot(op->regs, env->ignore_colors);
}
@@
-197,7
+192,6
@@
be_insn_env_t *be_insn_env_init(be_insn_env_t *ie, const be_irg_t *birg,
const arch_register_class_t *cls,
struct obstack *obst)
{
const arch_register_class_t *cls,
struct obstack *obst)
{
- ie->aenv = be_get_birg_arch_env(birg);
ie->cls = cls;
ie->obst = obst;
ie->ignore_colors = bitset_obstack_alloc(obst, cls->n_regs);
ie->cls = cls;
ie->obst = obst;
ie->ignore_colors = bitset_obstack_alloc(obst, cls->n_regs);