* scripttempl/mmo.sc: Add .debug_ranges to listed sections.

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

diff --git a/sim/ppc/tree.c b/sim/ppc/tree.c
index 856e90bf9e2dbebb5fd842a547875d9f4d0136fe..c5106f47f3fdf1d932498b879a0efb6ee7d76341 100644 (file)
--- a/sim/ppc/tree.c
+++ b/sim/ppc/tree.c
@@ -1,6 +1,6 @@
 /*  This file is part of the program psim.
 
-    Copyright (C) 1994-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
@@ -463,6 +463,7 @@ parse_address(device *current,
              const char *chp,
              device_unit *address)
 {
+  ASSERT(device_nr_address_cells(bus) > 0);
   if (device_decode_unit(bus, chp, address) < 0)
     device_error(current, "invalid unit address in %s", chp);
   return skip_token(chp);
@@ -485,6 +486,7 @@ parse_size(device *current,
   /* parse the numeric list */
   size->nr_cells = device_nr_size_cells(bus);
   nr = 0;
+  ASSERT(size->nr_cells > 0);
   while (1) {
     char *next;
     size->cells[nr] = strtoul(curr, &next, 0);
@@ -521,9 +523,11 @@ parse_reg_property(device *current,
   int reg_nr;
   reg_property_spec *regs;
   const char *chp;
+  device *bus = device_parent(current);
 
   /* determine the number of reg entries by counting tokens */
-  nr_regs = count_entries(current, property_name, property_value, 2);
+  nr_regs = count_entries(current, property_name, property_value,
+                         1 + (device_nr_size_cells(bus) > 0));
 
   /* create working space */
   regs = zalloc(nr_regs * sizeof(*regs));
@@ -531,10 +535,11 @@ parse_reg_property(device *current,
   /* fill it in */
   chp = property_value;
   for (reg_nr = 0; reg_nr < nr_regs; reg_nr++) {
-    chp = parse_address(current, device_parent(current),
-                       chp, &regs[reg_nr].address);
-    chp = parse_size(current, device_parent(current),
-                    chp, &regs[reg_nr].size);
+    chp = parse_address(current, bus, chp, &regs[reg_nr].address);
+    if (device_nr_size_cells(bus) > 0)
+      chp = parse_size(current, bus, chp, &regs[reg_nr].size);
+    else
+      memset(&regs[reg_nr].size, sizeof (&regs[reg_nr].size), 0);
   }
 
   /* create it */
@@ -735,26 +740,11 @@ parse_ihandle_property(device *current,
                       const char *value)
 {
   ihandle_runtime_property_spec ihandle;
-  const char *chp;
-  name_specifier ihandle_spec;
 
-  /* copy over the full path */
+  /* pass the full path */
   ihandle.full_path = value;
 
-  /* copy over the args (if present) */
-  chp = strchr(value, '\0');
-  while (chp > value && *chp != '/' && *chp != ':')
-    chp--;
-  if (*chp == ':') {
-    chp += 1;
-    ihandle.args = chp;
-  }
-  else {
-    ihandle.args = NULL;
-  }
-  
   /* save this ready for the ihandle create */
-  ihandle.phandle = split_fill_path(current, ihandle.full_path, &ihandle_spec);
   device_add_ihandle_runtime_property(current, property,
                                      &ihandle);
 }
@@ -1052,8 +1042,6 @@ print_properties(device *me)
            ihandle_runtime_property_spec spec;
            device_find_ihandle_runtime_property(me, property->name, &spec);
            printf_filtered(" *%s", spec.full_path);
-           if (spec.args != NULL)
-             printf_filtered(":%s", spec.args);
          }
        }
        break;