This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / sim / igen / ld-cache.c

diff --git a/sim/igen/ld-cache.c b/sim/igen/ld-cache.c
index e7f119e057200da4160d0175c5c1372cc32e6a86..63bd111ac2e25376b7261b5610c236d17b72e787 100644 (file)
--- a/sim/igen/ld-cache.c
+++ b/sim/igen/ld-cache.c
@@ -22,6 +22,10 @@
 #include "misc.h"
 #include "lf.h"
 #include "table.h"
+#include "filter.h"
+#include "igen.h"
+
+#include "ld-insn.h"
 #include "ld-cache.h"
 
 #ifndef NULL
@@ -46,70 +50,65 @@ static const name_map cache_type_map[] = {
 };
 
 
-cache_table *
-load_cache_table(char *file_name,
-                int hi_bit_nr)
+cache_entry *
+load_cache_table (char *file_name)
 {
-  table *file = table_open(file_name, nr_cache_rule_fields, 0);
+  cache_entry *cache = NULL;
+  cache_entry **last = &cache;
+  table *file = table_open (file_name);
   table_entry *entry;
-  cache_table *table = NULL;
-  cache_table **curr_rule = &table;
-  while ((entry = table_entry_read(file)) != NULL) {
-    cache_table *new_rule = ZALLOC(cache_table);
-    new_rule->type = name2i(entry->fields[ca_type], cache_type_map);
-    new_rule->field_name = entry->fields[ca_field_name];
-    new_rule->derived_name = entry->fields[ca_derived_name];
-    new_rule->type_def = (strlen(entry->fields[ca_type_def])
-                         ? entry->fields[ca_type_def]
-                         : NULL);
-    new_rule->expression = (strlen(entry->fields[ca_expression]) > 0
-                           ? entry->fields[ca_expression]
-                           : NULL);
-    new_rule->file_entry = entry;
-    *curr_rule = new_rule;
-    curr_rule = &new_rule->next;
-  }
-  return table;
+  while ((entry = table_read (file)) != NULL)
+    {
+      cache_entry *new_rule = ZALLOC (cache_entry);
+      new_rule->line = entry->line;
+      new_rule->entry_type = name2i (entry->field[ca_type], cache_type_map);
+      new_rule->name = entry->field[ca_derived_name];
+      filter_parse (&new_rule->original_fields,
+                   entry->field[ca_field_name]);
+      new_rule->type = entry->field[ca_type_def];
+      /* expression is the concatenation of the remaining fields */
+      if (entry->nr_fields > ca_expression)
+       {
+         int len = 0;
+         int chi;
+         for (chi = ca_expression; chi < entry->nr_fields; chi++)
+           {
+             len += strlen (" : ") + strlen (entry->field[chi]);
+           }
+         new_rule->expression = NZALLOC (char, len);
+         strcpy (new_rule->expression, entry->field[ca_expression]);
+         for (chi = ca_expression + 1; chi < entry->nr_fields; chi++)
+           {
+             strcat (new_rule->expression, " : ");
+             strcat (new_rule->expression, entry->field[chi]);
+           }
+       }
+      /* insert it */
+      *last = new_rule;
+      last = &new_rule->next;
+    }
+  return cache;
 }
 
 
 
 #ifdef MAIN
 
-static void
-dump_cache_rule(cache_table* rule,
-               int indent)
-{
-  dumpf(indent, "((cache_table*)0x%x\n", rule);
-  dumpf(indent, " (type %s)\n", i2name(rule->type, cache_type_map));
-  dumpf(indent, " (field_name \"%s\")\n", rule->field_name);
-  dumpf(indent, " (derived_name \"%s\")\n", rule->derived_name);
-  dumpf(indent, " (type-def \"%s\")\n", rule->type_def);
-  dumpf(indent, " (expression \"%s\")\n", rule->expression);
-  dumpf(indent, " (next 0x%x)\n", rule->next);
-  dumpf(indent, " )\n");
-}
-
-
-static void
-dump_cache_rules(cache_table* rule,
-                int indent)
-{
-  while (rule) {
-    dump_cache_rule(rule, indent);
-    rule = rule->next;
-  }
-}
-
+igen_options options;
 
 int
 main(int argc, char **argv)
 {
-  cache_table *rules;
-  if (argc != 3)
-    error("Usage: cache <cache-file> <hi-bit-nr>\n");
-  rules = load_cache_table(argv[1], a2i(argv[2]));
-  dump_cache_rules(rules, 0);
+  cache_entry *rules = NULL;
+  lf *l;
+
+  if (argc != 2)
+    error (NULL, "Usage: cache <cache-file>\n");
+
+  rules = load_cache_table (argv[1]);
+  l = lf_open ("-", "stdout", lf_omit_references, lf_is_text, "tmp-ld-insn");
+  dump_cache_entries (l, "(", rules, ")\n");
+
   return 0;
 }
 #endif