added call emit

small emitter interface changes

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index c0071c0..7ebfa36 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -532,7 +532,7 @@ static void ia32_codegen(void *self) {
 
        ia32_finish_irg(irg, cg);
        dump_ir_block_graph_sched(irg, "-finished");
-       ia32_gen_routine(out, irg, cg->arch_env);
+       ia32_gen_routine(out, irg, cg);
 
        cur_reg_set = NULL;
 

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 358e1ce..e668f91 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -608,7 +608,7 @@ void emit_Jmp(ir_node *irn, emit_env_t *env) {
 void emit_Proj(ir_node *irn, emit_env_t *env) {
        ir_node *pred = get_Proj_pred(irn);
 
-       if (get_irn_opcode(pred) == iro_Start) {
+       if (get_irn_op(pred) == op_Start) {
                switch(get_Proj_proj(irn)) {
                        case pn_Start_X_initial_exec:
                                emit_Jmp(irn, env);
@@ -619,6 +619,53 @@ void emit_Proj(ir_node *irn, emit_env_t *env) {
        }
 }
 
+/********************
+ *   _____      _ _
+ *  / ____|    | | |
+ * | |     __ _| | |
+ * | |    / _` | | |
+ * | |___| (_| | | |
+ *  \_____\__,_|_|_|
+ *
+ ********************/
+
+void emit_ia32_Call(ir_node *irn, emit_env_t *emit_env) {
+       int                 i, n      = get_irn_arity(irn);
+       int                 args_size = 0;
+       ir_node            *sync      = get_irn_n(irn, n - 1);
+       FILE               *F         = emit_env->out;
+       const lc_arg_env_t *env       = ia32_get_arg_env();
+
+       if (get_irn_op(sync) == op_Sync) {
+               /* We have stack arguments */
+               ir_node **args = get_Sync_preds_arr(sync);
+
+               for (i = 0; i < get_Sync_n_preds(sync); i++) {
+                       lc_efprintf(env, F, "\tpush %1D\t\t\t\t/* push %+F on stack */\n", args[i], args[i]);
+
+                       if (mode_is_int(get_irn_mode(args[i]))) {
+                               args_size += 4;
+                       }
+                       else {
+                               args_size += 16;
+                       }
+               }
+       }
+
+       lc_efprintf(env, F, "\tcall %C\t\t\t/* %+F */\n", irn, irn);
+
+       if (get_irn_op(sync) == op_Sync) {
+               /* We had stack arguments: clear the stack */
+               fprintf(F, "\tadd %d, ", args_size);
+               if (emit_env->cg->has_alloca) {
+                       fprintf(F, "%ebp");
+               }
+               else {
+                       fprintf(F, "%esp");
+               }
+               fprintf(F, "\t\t\t\t/* clear stack after call */\n");
+       }
+}
 
 
 /***********************************************************************************
@@ -711,6 +758,7 @@ void ia32_emit_node(ir_node *irn, void *env) {
        IA32_EMIT(CondJmp);
        IA32_EMIT(CondJmp_i);
        IA32_EMIT(SwitchJmp);
+       IA32_EMIT(Call);
 
        EMIT(Jmp);
        EMIT(Proj);
@@ -774,14 +822,13 @@ void ia32_gen_labels(ir_node *block, void *env) {
 /**
  * Main driver
  */
-void ia32_gen_routine(FILE *F, ir_graph *irg, const arch_env_t *env) {
+void ia32_gen_routine(FILE *F, ir_graph *irg, const ia32_code_gen_t *cg) {
        emit_env_t emit_env;
 
        emit_env.mod      = firm_dbg_register("ir.be.codegen.ia32");
        emit_env.out      = F;
-       emit_env.arch_env = env;
-
-       arch_env = env;
+       emit_env.arch_env = cg->arch_env;
+       emit_env.cg       = cg;
 
        ia32_emit_start(F, irg);
        irg_block_walk_graph(irg, ia32_gen_labels, NULL, &emit_env);

diff --git a/ir/be/ia32/ia32_emitter.h b/ir/be/ia32/ia32_emitter.h
index 0470932..584b864 100644 (file)
--- a/ir/be/ia32/ia32_emitter.h
+++ b/ir/be/ia32/ia32_emitter.h
@@ -7,10 +7,13 @@
 
 #include "../bearch.h"
 
+#include "bearch_ia32_t.h"
+
 typedef struct _emit_env_t {
-       firm_dbg_module_t *mod;
-       FILE              *out;
-       const arch_env_t  *arch_env;
+       firm_dbg_module_t     *mod;
+       FILE                  *out;
+       const arch_env_t      *arch_env;
+       const ia32_code_gen_t *cg;
 } emit_env_t;
 
 const lc_arg_env_t *ia32_get_arg_env(void);
@@ -20,6 +23,6 @@ void equalize_dest_src(FILE *F, ir_node *n);
 int get_ia32_reg_nr(ir_node *irn, int posi, int in_out);
 const char *get_ia32_in_reg_name(ir_node *irn, int pos);
 
-void ia32_gen_routine(FILE *F, ir_graph *irg, const arch_env_t *env);
+void ia32_gen_routine(FILE *F, ir_graph *irg, const ia32_code_gen_t *cg);
 
 #endif /* _IA32_EMITTER_H_ */

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 16f925f..5e0a7ef 100644 (file)
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -722,7 +722,6 @@ $arch = "ia32";
   "state"    => "mem_pinned",
   "arity"    => "variable",
   "comment"  => "construct Call: Call(...)",
-  "emit"     => '. call %C',
   "args"     => [
                   { "type" => "int",        "name" => "n" },
                   { "type" => "ir_node **", "name" => "in" }
@@ -740,7 +739,6 @@ $arch = "ia32";
   "state"    => "pinned",
   "arity"    => "variable",
   "comment"  => "construct Return: Return(...)",
-  "emit"     => '. ret',
   "args"     => [
                   { "type" => "int",        "name" => "n" },
                   { "type" => "ir_node **", "name" => "in" }