2000-12-03 Ben Elliston <bje@redhat.com>

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

diff --git a/sim/ppc/ld-cache.c b/sim/ppc/ld-cache.c
index 134339a083d1c2397e89ca5f9fd6f1b5effbd1b8..135013e5f237c5c648ca505547d185f4f1c26afe 100644 (file)
--- a/sim/ppc/ld-cache.c
+++ b/sim/ppc/ld-cache.c
@@ -1,6 +1,6 @@
 /*  This file is part of the program psim.
 
-    Copyright (C) 1994,1995,1996, Andrew Cagney <cagney@highland.com.au>
+    Copyright (C) 1994-1997, Andrew Cagney <cagney@highland.com.au>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 
 enum {
   ca_type,
-  ca_old_name,
-  ca_new_name,
+  ca_field_name,
+  ca_derived_name,
   ca_type_def,
   ca_expression,
   nr_cache_rule_fields,
@@ -41,6 +41,7 @@ enum {
 static const name_map cache_type_map[] = {
   { "cache", cache_value },
   { "compute", compute_value },
+  { "scratch", scratch_value },
   { NULL, 0 },
 };
 
@@ -56,8 +57,8 @@ load_cache_table(char *file_name,
   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->old_name = entry->fields[ca_old_name];
-    new_rule->new_name = entry->fields[ca_new_name];
+    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);
@@ -81,8 +82,8 @@ dump_cache_rule(cache_table* rule,
 {
   dumpf(indent, "((cache_table*)0x%x\n", rule);
   dumpf(indent, " (type %s)\n", i2name(rule->type, cache_type_map));
-  dumpf(indent, " (old_name \"%s\")\n", rule->old_name);
-  dumpf(indent, " (new_name \"%s\")\n", rule->new_name);
+  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);