X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=821551ebfb6aef2bf093b6a405af37274d5c589f;hb=11c9ade1e7e5edf7e1f4f502a2feb19b9daf4581;hp=f29c5278ad5a6868776f3ac9c262a9e37d7b5272;hpb=d382d46d40faa79f071cf3eebd74fc47ad22b196;p=libfirm

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index f29c5278a..821551ebf 100644
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -18,14 +18,19 @@
 # include <string.h>
 #endif
 
-# include "irprog_t.h"
-# include "irgraph_t.h"
-# include "pseudo_irg.h"
-# include "array.h"
-# include "obst.h"
-# include "typegmod.h"
-
+#include "irprog_t.h"
+#include "irgraph_t.h"
+#include "pseudo_irg.h"
+#include "array.h"
+#include "obst.h"
+#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. */
@@ -38,15 +43,16 @@ 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;
 
   res->kind          = k_ir_prog;
   res->graphs        = NEW_ARR_F(ir_graph *, 0);
   res->pseudo_graphs = NEW_ARR_F(ir_graph *, 0);
-  res->types         = NEW_ARR_F(type *, 0);
+  res->types         = NEW_ARR_F(ir_type *, 0);
   res->modes         = NEW_ARR_F(ir_mode *, 0);
+  res->opcodes       = NEW_ARR_F(ir_op *, 0);
 
 #ifdef DEBUG_libfirm
   res->max_node_nr = 0;
@@ -57,16 +63,27 @@ 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();
 
+  irp->phase_state      = phase_building;
   irp->outs_state       = outs_none;
   irp->ip_outedges      = NULL;
   irp->trouts_state     = outs_none;
@@ -93,15 +110,18 @@ 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);
   DEL_ARR_F(irp->pseudo_graphs);
   DEL_ARR_F(irp->types);
   DEL_ARR_F(irp->modes);
+  DEL_ARR_F(irp->opcodes);
 
   irp->name           = NULL;
   irp->const_code_irg = NULL;
@@ -113,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;
 }
 
@@ -122,10 +142,14 @@ void set_irp_main_irg(ir_graph *main_irg) {
   irp->main_irg = main_irg;
 }
 
-type *(get_glob_type)(void) {
+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);
@@ -176,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();
 }
@@ -200,14 +224,14 @@ ir_graph *get_irp_allirg(int pos) {
 }
 
 /* Adds type to the list of types in irp. */
-void add_irp_type(type *typ) {
-  assert (typ != NULL);
+void add_irp_type(ir_type *typ) {
+  assert(typ != NULL);
   assert(irp);
-  ARR_APP1 (type *, irp->types, typ);
+  ARR_APP1 (ir_type *, irp->types, typ);
 }
 
 /* Remove type form the list of types in irp. */
-void remove_irp_type(type *typ) {
+void remove_irp_type(ir_type *typ) {
   int i;
   assert(typ);
 
@@ -216,7 +240,7 @@ void remove_irp_type(type *typ) {
       for(; i < (ARR_LEN(irp->types)) - 1; i++) {
         irp->types[i] = irp->types[i+1];
       }
-      ARR_SETLEN(type *, irp->types, (ARR_LEN(irp->types)) - 1);
+      ARR_SETLEN(ir_type *, irp->types, (ARR_LEN(irp->types)) - 1);
       break;
     }
   }
@@ -226,13 +250,13 @@ int (get_irp_n_types) (void) {
   return _get_irp_n_types();
 }
 
-type *(get_irp_type) (int pos) {
+ir_type *(get_irp_type) (int pos) {
   return _get_irp_type(pos);
 }
 
-void  set_irp_type(int pos, type *typ) {
-  assert (irp && typ);
-  assert (pos < (ARR_LEN((irp)->types)));
+void set_irp_type(int pos, ir_type *typ) {
+  assert(irp && typ);
+  assert(pos < (ARR_LEN((irp)->types)));
   irp->types[pos] = typ;
 }
 
@@ -253,13 +277,48 @@ void add_irp_mode(ir_mode *mode) {
   ARR_APP1(ir_mode *, irp->modes, mode);
 }
 
-#ifdef DEBUG_libfirm
-int get_irp_new_node_nr() {
+/* Adds opcode to the list of opcodes in irp. */
+void add_irp_opcode(ir_op *opcode) {
+  assert(opcode != NULL);
   assert(irp);
-  irp->max_node_nr = irp->max_node_nr + 1;
-  return irp->max_node_nr - 1;
+  ARR_APP1(ir_op *, irp->opcodes, 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);
+  for (i = ARR_LEN(irp->opcodes) -1; i >= 0; i--) {
+    if (irp->opcodes[i] == opcode) {
+      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);
+      break;
+    }
+  }
+}
+
+/* Returns the number of all opcodes in the irp. */
+int (get_irp_n_opcodes)(void) {
+  return _get_irp_n_opcodes();
+}
+
+/* Returns the opcode at position pos in the irp. */
+ir_op *(get_irp_opcode)(int pos) {
+  return _get_irp_opcode(pos);
+}
+
+/* Sets the generic function pointer of all opcodes to NULL */
+void  clear_irp_opcodes_generic_func(void) {
+  int i;
+
+  for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
+    ir_op *op = get_irp_opcode(i);
+    op->ops.generic = (op_func)NULL;
+  }
 }
-#endif
 
 /*- File name / executable name or the like -*/
 void   set_irp_prog_name(ident *name) {
@@ -283,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;
 }
 
@@ -295,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;
 }