fixed output

[libfirm] / ir / ir / irprog.c

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 7c588b5..821551e 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -26,7 +26,11 @@
 #include "typegmod.h"
 #include "irop_t.h"
 
+/** The name of the Global Type. */
 #define GLOBAL_TYPE_NAME "GlobalType"
+/** The name of the Thread Local STorage Type. */
+#define TLS_TYPE_NAME "TLS"
+/** The initial name of the irp program. */
 #define INITAL_PROG_NAME "no_name_set"
 
 /* A variable from where everything in the ir can be accessed. */
@@ -39,7 +43,7 @@ ir_prog *get_irp(void) { return irp; }
 static ir_prog *new_incomplete_ir_prog (void) {
   ir_prog *res;
 
-  res = xmalloc (sizeof(*res));
+  res = xmalloc(sizeof(*res));
   memset(res, 0, sizeof(*res));
   irp = res;
 
@@ -59,13 +63,23 @@ static ir_prog *new_incomplete_ir_prog (void) {
 
 /** Completes an incomplete irprog. */
 static ir_prog *complete_ir_prog(ir_prog *irp) {
+#define X(s) s, sizeof(s)-1
+  irp->name      = new_id_from_chars(X(INITAL_PROG_NAME));
 
-  irp->name      = new_id_from_str(INITAL_PROG_NAME);
-
-  irp->glob_type = new_type_class(new_id_from_str (GLOBAL_TYPE_NAME));
-  /* Remove type from type list.  Must be treated differently than
+  irp->glob_type = new_type_class(new_id_from_chars(X(GLOBAL_TYPE_NAME)));
+  irp->tls_type  = new_type_struct(new_id_from_chars(X(TLS_TYPE_NAME)));
+  /* Remove these types from type list.  Must be treated differently than
      other types. */
   remove_irp_type(irp->glob_type);
+  remove_irp_type(irp->tls_type);
+
+  /* Set these flags for debugging. */
+  irp->glob_type->flags |= tf_global_type;
+  irp->tls_type->flags  |= tf_tls_type;
+
+  /* The global type is a class, but we cannot derive from it, so set
+     the final property to assist optimizations that checks for it. */
+  set_class_final(irp->glob_type, 1);
 
   irp->const_code_irg   = new_const_code_irg();
 
@@ -96,9 +110,11 @@ ir_prog *new_ir_prog (void) {
 
 /* frees all memory used by irp.  Types in type list, irgs in irg
     list and entities in global type must be freed by hand before. */
-void     free_ir_prog(void) {
+void free_ir_prog(void) {
   if (irp->glob_type)
     free_type(irp->glob_type);
+  if (irp->tls_type)
+    free_type(irp->tls_type);
 
   /* @@@ * free_ir_graph(irp->const_code_irg); * ?? End has no in?? */
   DEL_ARR_F(irp->graphs);
@@ -117,7 +133,7 @@ void     free_ir_prog(void) {
 
 /* Access the main routine of the compiled program. */
 ir_graph *get_irp_main_irg(void) {
-  assert (irp);
+  assert(irp);
   return irp->main_irg;
 }
 
@@ -130,6 +146,10 @@ ir_type *(get_glob_type)(void) {
   return _get_glob_type();
 }
 
+ir_type *(get_tls_type)(void) {
+  return _get_tls_type();
+}
+
 /* Adds irg to the list of ir graphs in irp. */
 void add_irp_irg(ir_graph *irg) {
   assert (irg != NULL);
@@ -180,13 +200,13 @@ ir_graph *(get_irp_irg)(int pos){
 }
 
 void set_irp_irg(int pos, ir_graph *irg) {
-  assert (irp && irg);
-  assert (pos < (ARR_LEN(irp->graphs)));
+  assert(irp && irg);
+  assert(pos < (ARR_LEN(irp->graphs)));
   irp->graphs[pos] = irg;
 }
 
 /* Gets the number of graphs _and_ pseudo graphs. */
-int       get_irp_n_allirgs(void) {
+int get_irp_n_allirgs(void) {
   /* We can not call get_irp_n_irgs, as we end up in a recursion ... */
   return ARR_LEN(irp->graphs) + get_irp_n_pseudo_irgs();
 }
@@ -205,7 +225,7 @@ ir_graph *get_irp_allirg(int pos) {
 
 /* Adds type to the list of types in irp. */
 void add_irp_type(ir_type *typ) {
-  assert (typ != NULL);
+  assert(typ != NULL);
   assert(irp);
   ARR_APP1 (ir_type *, irp->types, typ);
 }
@@ -235,8 +255,8 @@ ir_type *(get_irp_type) (int pos) {
 }
 
 void set_irp_type(int pos, ir_type *typ) {
-  assert (irp && typ);
-  assert (pos < (ARR_LEN((irp)->types)));
+  assert(irp && typ);
+  assert(pos < (ARR_LEN((irp)->types)));
   irp->types[pos] = typ;
 }
 
@@ -267,11 +287,11 @@ void add_irp_opcode(ir_op *opcode) {
 /* Removes opcode from the list of opcodes and shrinks the list by one. */
 void remove_irp_opcode(ir_op *opcode) {
   int i;
-  assert(opcode);
 
+  assert(opcode);
   for (i = ARR_LEN(irp->opcodes) -1; i >= 0; i--) {
     if (irp->opcodes[i] == opcode) {
-      for(; i < (ARR_LEN(irp->opcodes)) - 1; i++) {
+      for (; i < (ARR_LEN(irp->opcodes)) - 1; i++) {
         irp->opcodes[i] = irp->opcodes[i+1];
       }
       ARR_SETLEN(ir_op *, irp->opcodes, (ARR_LEN(irp->opcodes)) - 1);
@@ -322,7 +342,7 @@ ir_graph *(get_const_code_irg)(void) {
 irg_phase_state get_irp_phase_state(void) {
   return irp->phase_state;
 }
-void           set_irp_phase_state(irg_phase_state s) {
+void set_irp_phase_state(irg_phase_state s) {
   irp->phase_state = s;
 }
 
@@ -334,13 +354,11 @@ void set_irp_ip_outs_inconsistent(void) {
   irp->outs_state = outs_inconsistent;
 }
 
-void      set_irp_ip_outedges(ir_node ** ip_outedges)
-{
+void set_irp_ip_outedges(ir_node ** ip_outedges) {
   irp->ip_outedges = ip_outedges;
 }
 
-ir_node** get_irp_ip_outedges(void)
-{
+ir_node** get_irp_ip_outedges(void) {
   return irp->ip_outedges;
 }