* infrun.c (IN_SOLIB_TRAMPOLINE): Correct comment, trampolines

[binutils.git] / gdb / nindy-tdep.c

diff --git a/gdb/nindy-tdep.c b/gdb/nindy-tdep.c
index b609fd7971bf83d2db5d57e930b1918fe4466662..b296e069119f5f81d86942413e01d7f0f8267a68 100644 (file)
--- a/gdb/nindy-tdep.c
+++ b/gdb/nindy-tdep.c
@@ -6,8 +6,8 @@ This file is part of GDB.
 
 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
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,15 +15,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Miscellaneous NINDY-dependent routines.
    Some replace macros normally defined in "tm.h".  */
 
-#include <stdio.h>
 #include "defs.h"
-#include "param.h"
 #include "symtab.h"
 #include "frame.h"
 
@@ -39,7 +37,7 @@ nindy_frame_chain_valid (chain, curframe)
     FRAME curframe;
 {
        struct symbol *sym;
-       int i;
+       struct minimal_symbol *msymbol;
 
        /* crtnindy.o is an assembler module that is assumed to be linked
         * first in an i80960 executable.  It contains the true entry point;
@@ -63,14 +61,12 @@ nindy_frame_chain_valid (chain, curframe)
        sym = lookup_symbol(sf, 0, VAR_NAMESPACE, (int *)NULL, 
                                  (struct symtab **)NULL);
        if ( sym != 0 ){
-               a = sym->value.value;
+               a = SYMBOL_VALUE (sym);
        } else {
-               for ( i = 0; strcmp(misc_function_vector[i].name,sf); i++ ){
-                       if ( i >= misc_function_count ){
-                               return 0;
-                       }
-               }
-               a = misc_function_vector[i].address;
+               msymbol = lookup_minimal_symbol (sf, (struct objfile *) NULL);
+               if (msymbol == NULL)
+                       return 0;
+               a = SYMBOL_VALUE_ADDRESS (msymbol);
        }
 
        return ( chain != read_memory_integer(a,4) );