bearch: Dump the output requirement and the assigned register in the same line for...

[libfirm] / ir / be / beemitter.c

diff --git a/ir/be/beemitter.c b/ir/be/beemitter.c
index 3de970a..a08461d 100644 (file)
--- a/ir/be/beemitter.c
+++ b/ir/be/beemitter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,25 +22,23 @@
  * @brief       Interface for assembler output.
  * @author      Matthias Braun
  * @date        12.03.2007
- * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "beemitter.h"
+#include "be_t.h"
+#include "irnode_t.h"
 #include "irprintf.h"
 #include "ident.h"
 #include "tv.h"
+#include "dbginfo.h"
 
 FILE           *emit_file;
 struct obstack  emit_obst;
-int             emit_linelength;
 
 void be_emit_init(FILE *file)
 {
        emit_file       = file;
-       emit_linelength = 0;
        obstack_init(&emit_obst);
 }
 
@@ -49,28 +47,9 @@ void be_emit_exit(void)
        obstack_free(&emit_obst, NULL);
 }
 
-void be_emit_ident(ident *id)
-{
-       size_t      len = get_id_strlen(id);
-       const char *str = get_id_str(id);
-
-       be_emit_string_len(str, len);
-}
-
-void be_emit_tarval(tarval *tv)
-{
-       char buf[64];
-
-       tarval_snprintf(buf, sizeof(buf), tv);
-       be_emit_string(buf);
-}
-
 void be_emit_irvprintf(const char *fmt, va_list args)
 {
-       char buf[256];
-
-       ir_vsnprintf(buf, sizeof(buf), fmt, args);
-       be_emit_string(buf);
+       ir_obst_vprintf(&emit_obst, fmt, args);
 }
 
 void be_emit_irprintf(const char *fmt, ...)
@@ -84,28 +63,28 @@ void be_emit_irprintf(const char *fmt, ...)
 
 void be_emit_write_line(void)
 {
-       char *finished_line = obstack_finish(&emit_obst);
+       size_t  len  = obstack_object_size(&emit_obst);
+       char   *line = (char*)obstack_finish(&emit_obst);
 
-       fwrite(finished_line, emit_linelength, 1, emit_file);
-       emit_linelength = 0;
-       obstack_free(&emit_obst, finished_line);
+       fwrite(line, 1, len, emit_file);
+       obstack_free(&emit_obst, line);
 }
 
 void be_emit_pad_comment(void)
 {
-       while(emit_linelength <= 30) {
-               be_emit_char(' ');
-       }
-       be_emit_cstring("    ");
+       size_t len = obstack_object_size(&emit_obst);
+       if (len > 30)
+               len = 30;
+       /* 34 spaces */
+       be_emit_string_len("                                  ", 34 - len);
 }
 
 void be_emit_finish_line_gas(const ir_node *node)
 {
-       dbg_info   *dbg;
-       const char *sourcefile;
-       unsigned    lineno;
+       dbg_info  *dbg;
+       src_loc_t  loc;
 
-       if(node == NULL) {
+       if (node == NULL || !be_options.verbose_asm) {
                be_emit_char('\n');
                be_emit_write_line();
                return;
@@ -115,11 +94,16 @@ void be_emit_finish_line_gas(const ir_node *node)
        be_emit_cstring("/* ");
        be_emit_irprintf("%+F ", node);
 
-       dbg        = get_irn_dbg_info(node);
-       sourcefile = be_retrieve_dbg_info(dbg, &lineno);
-       if(sourcefile != NULL) {
-               be_emit_string(sourcefile);
-               be_emit_irprintf(":%u", lineno);
+       dbg = get_irn_dbg_info(node);
+       loc = ir_retrieve_dbg_info(dbg);
+       if (loc.file) {
+               be_emit_string(loc.file);
+               if (loc.line != 0) {
+                       be_emit_irprintf(":%u", loc.line);
+                       if (loc.column != 0) {
+                               be_emit_irprintf(":%u", loc.column);
+                       }
+               }
        }
        be_emit_cstring(" */\n");
        be_emit_write_line();