sparc: fix problem with compound return

[libfirm] / ir / be / beemitter.c

diff --git a/ir/be/beemitter.c b/ir/be/beemitter.c
index c0822dc..f4f0449 100644 (file)
--- a/ir/be/beemitter.c
+++ b/ir/be/beemitter.c
@@ -22,11 +22,11 @@
  * @brief       Interface for assembler output.
  * @author      Matthias Braun
  * @date        12.03.2007
- * @version     $Id$
  */
 #include "config.h"
 
 #include "beemitter.h"
+#include "irnode_t.h"
 #include "irprintf.h"
 #include "ident.h"
 #include "tv.h"
@@ -64,10 +64,7 @@ void be_emit_tarval(ir_tarval *tv)
 
 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, ...)
@@ -82,7 +79,7 @@ void be_emit_irprintf(const char *fmt, ...)
 void be_emit_write_line(void)
 {
        size_t  len  = obstack_object_size(&emit_obst);
-       char   *line = obstack_finish(&emit_obst);
+       char   *line = (char*)obstack_finish(&emit_obst);
 
        fwrite(line, 1, len, emit_file);
        obstack_free(&emit_obst, line);
@@ -100,8 +97,7 @@ void be_emit_pad_comment(void)
 void be_emit_finish_line_gas(const ir_node *node)
 {
        dbg_info   *dbg;
-       const char *sourcefile;
-       unsigned    lineno;
+       src_loc_t   loc;
 
        if (node == NULL) {
                be_emit_char('\n');
@@ -113,11 +109,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 = ir_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();