X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeemitter.c;h=a08461d1528b9d65d8a2cf2312eca7404e196160;hb=199ea1a4479a4d8dcbebfde81820286935e64b0c;hp=dbdcb80d327c3c293a0889570184a79e9122473d;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/beemitter.c b/ir/be/beemitter.c
index dbdcb80d3..a08461d15 100644
--- 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,93 +22,89 @@
  * @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"
 
-void be_emit_init_env(be_emit_env_t *env, FILE *F)
-{
-	memset(env, 0, sizeof(env[0]));
-
-	env->F = F;
-	obstack_init(&env->obst);
-	env->linelength = 0;
-}
+FILE           *emit_file;
+struct obstack  emit_obst;
 
-void be_emit_destroy_env(be_emit_env_t *env)
+void be_emit_init(FILE *file)
 {
-	obstack_free(&env->obst, NULL);
+	emit_file       = file;
+	obstack_init(&emit_obst);
 }
 
-void be_emit_ident(be_emit_env_t *env, ident *id)
+void be_emit_exit(void)
 {
-	size_t len = get_id_strlen(id);
-	const char *str = get_id_str(id);
-
-	be_emit_string_len(env, str, len);
+	obstack_free(&emit_obst, NULL);
 }
 
-void be_emit_irvprintf(be_emit_env_t *env, const char *fmt, va_list args)
+void be_emit_irvprintf(const char *fmt, va_list args)
 {
-	char buf[256];
-
-	ir_vsnprintf(buf, sizeof(buf), fmt, args);
-	be_emit_string(env, buf);
+	ir_obst_vprintf(&emit_obst, fmt, args);
 }
 
-void be_emit_irprintf(be_emit_env_t *env, const char *fmt, ...)
+void be_emit_irprintf(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	be_emit_irvprintf(env, fmt, ap);
+	be_emit_irvprintf(fmt, ap);
 	va_end(ap);
 }
 
-void be_emit_write_line(be_emit_env_t *env)
+void be_emit_write_line(void)
 {
-	char *finished_line = obstack_finish(&env->obst);
+	size_t  len  = obstack_object_size(&emit_obst);
+	char   *line = (char*)obstack_finish(&emit_obst);
 
-	fwrite(finished_line, env->linelength, 1, env->F);
-	env->linelength = 0;
-	obstack_free(&env->obst, finished_line);
+	fwrite(line, 1, len, emit_file);
+	obstack_free(&emit_obst, line);
 }
 
-void be_emit_pad_comment(be_emit_env_t *env)
+void be_emit_pad_comment(void)
 {
-	while(env->linelength <= 30) {
-		be_emit_char(env, ' ');
-	}
-	be_emit_cstring(env, "    ");
+	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(be_emit_env_t *env, const ir_node *node)
+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) {
-		be_emit_char(env, '\n');
-		be_emit_write_line(env);
+	if (node == NULL || !be_options.verbose_asm) {
+		be_emit_char('\n');
+		be_emit_write_line();
 		return;
 	}
 
-	be_emit_pad_comment(env);
-	be_emit_cstring(env, "/* ");
-	be_emit_irprintf(env, "%+F ", node);
+	be_emit_pad_comment();
+	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(env, sourcefile);
-		be_emit_irprintf(env, ":%u", lineno);
+	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(env, " */\n");
-	be_emit_write_line(env);
+	be_emit_cstring(" */\n");
+	be_emit_write_line();
 }