sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge

Browse source 
--HG--
extra : convert_revision : 9d499125f4e8c8659f214c3290cb51679ad0ade2
This commit is contained in:
Steve Reinhardt 2004-11-18 10:59:30 -05:00
commit 45198407d1
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
base/loader/ecoff_object.cc
View file

@ -108,14 +108,14 @@ EcoffObject::loadGlobalSymbols(SymbolTable *symtab)
return false; return false;
if (fileHdr->f_magic != ECOFF_MAGIC_ALPHA) { if (fileHdr->f_magic != ECOFF_MAGIC_ALPHA) {
cprintf("wrong magic\n"); warn("loadGlobalSymbols: wrong magic on %s\n", filename);
return false; return false;
} }
ecoff_symhdr *syms = (ecoff_symhdr *)(fileData + fileHdr->f_symptr); ecoff_symhdr *syms = (ecoff_symhdr *)(fileData + fileHdr->f_symptr);
if (syms->magic != magicSym2) { if (syms->magic != magicSym2) {
cprintf("bad symbol header magic\n"); warn("loadGlobalSymbols: bad symbol header magic on %s\n", filename);
exit(1); return false;
} }
ecoff_extsym *ext_syms = (ecoff_extsym *)(fileData + syms->cbExtOffset); ecoff_extsym *ext_syms = (ecoff_extsym *)(fileData + syms->cbExtOffset);
@ -137,14 +137,14 @@ EcoffObject::loadLocalSymbols(SymbolTable *symtab)
return false; return false;
if (fileHdr->f_magic != ECOFF_MAGIC_ALPHA) { if (fileHdr->f_magic != ECOFF_MAGIC_ALPHA) {
cprintf("wrong magic\n"); warn("loadGlobalSymbols: wrong magic on %s\n", filename);
return false; return false;
} }
ecoff_symhdr *syms = (ecoff_symhdr *)(fileData + fileHdr->f_symptr); ecoff_symhdr *syms = (ecoff_symhdr *)(fileData + fileHdr->f_symptr);
if (syms->magic != magicSym2) { if (syms->magic != magicSym2) {
cprintf("bad symbol header magic\n"); warn("loadGlobalSymbols: bad symbol header magic on %s\n", filename);
exit(1); return false;
} }
ecoff_sym *local_syms = (ecoff_sym *)(fileData + syms->cbSymOffset); ecoff_sym *local_syms = (ecoff_sym *)(fileData + syms->cbSymOffset);

6
sim/debug.cc
View file

@ -40,13 +40,15 @@
using namespace std; using namespace std;
#ifdef DEBUG
void void
debug_break() debug_break()
{ {
#ifndef NDEBUG
kill(getpid(), SIGTRAP); kill(getpid(), SIGTRAP);
} #else
cprintf("debug_break suppressed, compiled with NDEBUG\n");
#endif #endif
}
// //
// Debug event: place a breakpoint on the process function and // Debug event: place a breakpoint on the process function and

4
sim/debug.hh
View file

@ -29,10 +29,6 @@
#ifndef __DEBUG_HH__ #ifndef __DEBUG_HH__
#define __DEBUG_HH__ #define __DEBUG_HH__
#ifdef DEBUG
void debug_break(); void debug_break();
#else
inline void debug_break() { }
#endif
#endif // __DEBUG_HH__ #endif // __DEBUG_HH__