From 7bac427874d2999073074354d0b2cc6fc95487e9 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Thu, 18 Nov 2004 10:52:56 -0500 Subject: Minor fixes. base/loader/ecoff_object.cc: Only warn (not die) if we can't load symbols from an ecoff object. sim/debug.cc: Compile in functioning debug_break unless NDEBUG, not only if DEBUG. Print warning if we hit breakpoint when compiled with NDEBUG. sim/debug.hh: Compile in functioning debug_break unless NDEBUG, not only if DEBUG. --HG-- extra : convert_revision : baef2caac4a9c88e1389660823eaa7c42b1d19c8 --- base/loader/ecoff_object.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'base') diff --git a/base/loader/ecoff_object.cc b/base/loader/ecoff_object.cc index bab75944d..714f1d7b8 100644 --- a/base/loader/ecoff_object.cc +++ b/base/loader/ecoff_object.cc @@ -108,14 +108,14 @@ EcoffObject::loadGlobalSymbols(SymbolTable *symtab) return false; if (fileHdr->f_magic != ECOFF_MAGIC_ALPHA) { - cprintf("wrong magic\n"); + warn("loadGlobalSymbols: wrong magic on %s\n", filename); return false; } ecoff_symhdr *syms = (ecoff_symhdr *)(fileData + fileHdr->f_symptr); if (syms->magic != magicSym2) { - cprintf("bad symbol header magic\n"); - exit(1); + warn("loadGlobalSymbols: bad symbol header magic on %s\n", filename); + return false; } ecoff_extsym *ext_syms = (ecoff_extsym *)(fileData + syms->cbExtOffset); @@ -137,14 +137,14 @@ EcoffObject::loadLocalSymbols(SymbolTable *symtab) return false; if (fileHdr->f_magic != ECOFF_MAGIC_ALPHA) { - cprintf("wrong magic\n"); + warn("loadGlobalSymbols: wrong magic on %s\n", filename); return false; } ecoff_symhdr *syms = (ecoff_symhdr *)(fileData + fileHdr->f_symptr); if (syms->magic != magicSym2) { - cprintf("bad symbol header magic\n"); - exit(1); + warn("loadGlobalSymbols: bad symbol header magic on %s\n", filename); + return false; } ecoff_sym *local_syms = (ecoff_sym *)(fileData + syms->cbSymOffset); -- cgit v1.2.3