diff options
Diffstat (limited to 'base')
62 files changed, 149 insertions, 87 deletions
diff --git a/base/circlebuf.cc b/base/circlebuf.cc index 7bd488ef8..2d77c9482 100644 --- a/base/circlebuf.cc +++ b/base/circlebuf.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/circlebuf.hh b/base/circlebuf.hh index 168158bb7..7549672ab 100644 --- a/base/circlebuf.hh +++ b/base/circlebuf.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/compression/lzss_compression.cc b/base/compression/lzss_compression.cc index 2f6c5d338..46f1b0266 100644 --- a/base/compression/lzss_compression.cc +++ b/base/compression/lzss_compression.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/compression/lzss_compression.hh b/base/compression/lzss_compression.hh index 9707a8aca..e5e8c8da4 100644 --- a/base/compression/lzss_compression.hh +++ b/base/compression/lzss_compression.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/compression/null_compression.hh b/base/compression/null_compression.hh index 6a630b113..195498f1b 100644 --- a/base/compression/null_compression.hh +++ b/base/compression/null_compression.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/cprintf.cc b/base/cprintf.cc index 5cbf0c057..2c8402c9b 100644 --- a/base/cprintf.cc +++ b/base/cprintf.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/cprintf.hh b/base/cprintf.hh index ca5c08b16..a3a621785 100644 --- a/base/cprintf.hh +++ b/base/cprintf.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/cprintf_formats.hh b/base/cprintf_formats.hh index d8a8a552b..b9131310a 100644 --- a/base/cprintf_formats.hh +++ b/base/cprintf_formats.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -279,8 +279,6 @@ template <typename T> inline void format_integer(std::ostream &out, const T &data, Format &fmt) { _format_integer(out, data, fmt); } - -#if 0 inline void format_integer(std::ostream &out, char data, Format &fmt) { _format_integer(out, data, fmt); } @@ -290,6 +288,7 @@ format_integer(std::ostream &out, unsigned char data, Format &fmt) inline void format_integer(std::ostream &out, signed char data, Format &fmt) { _format_integer(out, data, fmt); } +#if 0 inline void format_integer(std::ostream &out, short data, Format &fmt) { _format_integer(out, data, fmt); } diff --git a/base/dbl_list.hh b/base/dbl_list.hh index 4f6d61a45..1b0478d55 100644 --- a/base/dbl_list.hh +++ b/base/dbl_list.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2000-2001, 2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/fast_alloc.cc b/base/fast_alloc.cc index abb50aa0c..d1e6cfdf1 100644 --- a/base/fast_alloc.cc +++ b/base/fast_alloc.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2000-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/fast_alloc.hh b/base/fast_alloc.hh index 81f2f1359..4536284df 100644 --- a/base/fast_alloc.hh +++ b/base/fast_alloc.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2000-2001, 2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/fifo_buffer.cc b/base/fifo_buffer.cc index d103d2e60..0fb8458d7 100644 --- a/base/fifo_buffer.cc +++ b/base/fifo_buffer.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/fifo_buffer.hh b/base/fifo_buffer.hh index 767db03a4..c51b0394e 100644 --- a/base/fifo_buffer.hh +++ b/base/fifo_buffer.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/hashmap.hh b/base/hashmap.hh index 59c1fe3aa..4584813dd 100644 --- a/base/hashmap.hh +++ b/base/hashmap.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/hybrid_pred.cc b/base/hybrid_pred.cc index 41cf88675..d20bf6e51 100644 --- a/base/hybrid_pred.cc +++ b/base/hybrid_pred.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/hybrid_pred.hh b/base/hybrid_pred.hh index a76977ae2..f81faf865 100644 --- a/base/hybrid_pred.hh +++ b/base/hybrid_pred.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/inet.cc b/base/inet.cc index 46aa027fc..e2bdd19ff 100644 --- a/base/inet.cc +++ b/base/inet.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/inet.hh b/base/inet.hh index 1ae2e8542..67ac5a504 100644 --- a/base/inet.hh +++ b/base/inet.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/inifile.cc b/base/inifile.cc index 74d47204e..7f6a42dd6 100644 --- a/base/inifile.cc +++ b/base/inifile.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ #include <sys/types.h> #include <sys/wait.h> -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__APPLE__) #include <libgen.h> #endif #include <stdio.h> @@ -142,11 +142,11 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs) close(STDOUT_FILENO); if (dup2(fd[1], STDOUT_FILENO) == -1) - return 1; + exit(1); execvp("g++", args); - exit(1); + exit(0); } int retval; diff --git a/base/inifile.hh b/base/inifile.hh index f7229f2f2..01e4e6c17 100644 --- a/base/inifile.hh +++ b/base/inifile.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/intmath.cc b/base/intmath.cc index 2e220aa3b..f84e124fb 100644 --- a/base/intmath.cc +++ b/base/intmath.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001, 2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/intmath.hh b/base/intmath.hh index 77f63fe8d..821514668 100644 --- a/base/intmath.hh +++ b/base/intmath.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001, 2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -119,6 +119,22 @@ FloorLog2(int64_t x) return FloorLog2((uint64_t)x); } +#if defined(__APPLE__) +int +FloorLog2(size_t x) +{ + assert(x > 0); + assert(sizeof(size_t) == 4 || sizeof(size_t) == 8); + + // It's my hope that this is optimized away? + if (sizeof(size_t) == 4) + return FloorLog2((uint32_t)x); + else if (sizeof(size_t) == 8) + return FloorLog2((uint64_t)x); + +} +#endif + template <class T> inline int CeilLog2(T n) diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc index b8ffd2b10..6dfbce28c 100644 --- a/base/loader/elf_object.cc +++ b/base/loader/elf_object.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -74,8 +74,10 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) else { if (ehdr.e_ident[EI_CLASS] == ELFCLASS32) panic("32 bit ELF Binary, Not Supported"); - if (ehdr.e_machine != EM_ALPHA) - panic("Non Alpha Binary, Not Supported"); + /* @todo this emachine value isn't offical yet. + * so we probably shouldn't check it. */ +// if (ehdr.e_machine != EM_ALPHA) +// panic("Non Alpha Binary, Not Supported"); elf_end(elf); @@ -191,7 +193,7 @@ bool ElfObject::loadSomeSymbols(SymbolTable *symtab, int binding) { Elf *elf; - int secidx = 1; // there is a 0 but it is nothing, go figure + int sec_idx = 1; // there is a 0 but it is nothing, go figure Elf_Scn *section; GElf_Shdr shdr; Elf_Data *data; @@ -211,7 +213,7 @@ ElfObject::loadSomeSymbols(SymbolTable *symtab, int binding) assert(elf != NULL); // Get the first section - section = elf_getscn(elf, secidx); + section = elf_getscn(elf, sec_idx); // While there are no more sections while (section != NULL) { @@ -226,14 +228,14 @@ ElfObject::loadSomeSymbols(SymbolTable *symtab, int binding) // loop through all the symbols, only loading global ones for (ii = 0; ii < count; ++ii) { gelf_getsym(data, ii, &sym); - if (GELF_ST_BIND(sym.st_info) & binding) { + if (GELF_ST_BIND(sym.st_info) == binding) { symtab->insert(sym.st_value, elf_strptr(elf, shdr.sh_link, sym.st_name)); } } } - ++secidx; - section = elf_getscn(elf, secidx); + ++sec_idx; + section = elf_getscn(elf, sec_idx); } elf_end(elf); diff --git a/base/loader/elf_object.hh b/base/loader/elf_object.hh index 35a6c6d6e..9ae587e9c 100644 --- a/base/loader/elf_object.hh +++ b/base/loader/elf_object.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/loader/object_file.cc b/base/loader/object_file.cc index 25e9b2d19..2eeace36d 100644 --- a/base/loader/object_file.cc +++ b/base/loader/object_file.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/loader/object_file.hh b/base/loader/object_file.hh index a29bdc153..740cd1b40 100644 --- a/base/loader/object_file.hh +++ b/base/loader/object_file.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/loader/symtab.cc b/base/loader/symtab.cc index 075c197a6..f6abf7e3d 100644 --- a/base/loader/symtab.cc +++ b/base/loader/symtab.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -95,6 +95,31 @@ SymbolTable::load(const string &filename) } bool +SymbolTable::findNearestSymbol(Addr address, string &symbol) const +{ + ATable::const_iterator i = addrTable.lower_bound(address); + + // check for PALCode + if (address & 0x1) + return false; + + // first check for the end + if (i == addrTable.end()) + i--; + else if (i == addrTable.begin() && (*i).first != address) + return false; + else if ((*i).first != address) + i--; + + symbol = (*i).second; + + if (address != (*i).first) + symbol += csprintf("+%d", address - (*i).first); + + return true; +} + +bool SymbolTable::findSymbol(Addr address, string &symbol) const { ATable::const_iterator i = addrTable.find(address); diff --git a/base/loader/symtab.hh b/base/loader/symtab.hh index 49a811018..48230c7a2 100644 --- a/base/loader/symtab.hh +++ b/base/loader/symtab.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,14 +29,14 @@ #ifndef __SYMTAB_HH__ #define __SYMTAB_HH__ -#include "base/hashmap.hh" +#include <map> #include "targetarch/isa_traits.hh" // for Addr class SymbolTable { private: - typedef m5::hash_map<Addr, std::string> ATable; - typedef m5::hash_map<std::string, Addr> STable; + typedef std::map<Addr, std::string> ATable; + typedef std::map<std::string, Addr> STable; ATable addrTable; STable symbolTable; @@ -49,6 +49,7 @@ class SymbolTable bool insert(Addr address, std::string symbol); bool load(const std::string &file); + bool findNearestSymbol(Addr address, std::string &symbol) const; bool findSymbol(Addr address, std::string &symbol) const; bool findAddress(const std::string &symbol, Addr &address) const; diff --git a/base/misc.cc b/base/misc.cc index 1304fb128..0c459352f 100644 --- a/base/misc.cc +++ b/base/misc.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/misc.hh b/base/misc.hh index 45e6db35c..a4f9a99c5 100644 --- a/base/misc.hh +++ b/base/misc.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/mod_num.hh b/base/mod_num.hh index 3b4ef9bb8..831be6b03 100644 --- a/base/mod_num.hh +++ b/base/mod_num.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/pollevent.cc b/base/pollevent.cc index 60a20bd2e..127bf57f5 100644 --- a/base/pollevent.cc +++ b/base/pollevent.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/pollevent.hh b/base/pollevent.hh index 7ea5b83f4..3c9404c08 100644 --- a/base/pollevent.hh +++ b/base/pollevent.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/predictor.hh b/base/predictor.hh index 3b7bd686e..7492273ca 100644 --- a/base/predictor.hh +++ b/base/predictor.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/range.cc b/base/range.cc index 0a4876e89..4453ecc9f 100644 --- a/base/range.cc +++ b/base/range.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/range.hh b/base/range.hh index d72aa9755..2197e2f86 100644 --- a/base/range.hh +++ b/base/range.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -225,7 +225,7 @@ inline bool operator==(const T &pos, const Range<U> &range) { assert(range.valid()); - return pos >= range.start && pos < range.end; + return pos >= range.start && pos <= range.end; } /** diff --git a/base/refcnt.hh b/base/refcnt.hh index f3e0e4114..d308dd0cf 100644 --- a/base/refcnt.hh +++ b/base/refcnt.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc index e20800d12..41f11005d 100644 --- a/base/remote_gdb.cc +++ b/base/remote_gdb.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -332,23 +332,28 @@ RemoteGDB::acc(Addr va, size_t len) last_va = alpha_round_page(va + len); do { - if (va < ALPHA_K0SEG_BASE) { - DPRINTF(GDBAcc, "acc: Mapping is invalid %#x < K0SEG\n", va); - return false; - } - - if (va < ALPHA_K1SEG_BASE) { + if (va >= ALPHA_K0SEG_BASE && va < ALPHA_K1SEG_BASE) { if (va < (ALPHA_K0SEG_BASE + pmem->size())) { DPRINTF(GDBAcc, "acc: Mapping is valid K0SEG <= " "%#x < K0SEG + size\n", va); return true; } else { - DPRINTF(GDBAcc, "acc: Mapping is invalid %#x < K0SEG\n", + DPRINTF(GDBAcc, "acc: Mapping invalid %#x > K0SEG + size\n", va); return false; } } + /** + * This code says that all accesses to palcode (instruction and data) + * are valid since there isn't a va->pa mapping because palcode is + * accessed physically. At some point this should probably be cleaned up + * but there is no easy way to do it. + */ + + if (PC_PAL(va) || va < 0x10000) + return true; + Addr ptbr = context->regs.ipr[AlphaISA::IPR_PALtemp20]; pte = kernel_pte_lookup(pmem, ptbr, va); if (!pte || !entry_valid(pmem->phys_read_qword(pte))) { diff --git a/base/remote_gdb.hh b/base/remote_gdb.hh index fcc1ee2a9..2ed368719 100644 --- a/base/remote_gdb.hh +++ b/base/remote_gdb.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/res_list.hh b/base/res_list.hh index 04c3b7cfa..7080a3ba7 100644 --- a/base/res_list.hh +++ b/base/res_list.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/sat_counter.cc b/base/sat_counter.cc index 09c8881a5..32b5a9f3e 100644 --- a/base/sat_counter.cc +++ b/base/sat_counter.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/sat_counter.hh b/base/sat_counter.hh index 68addbb33..b5054bed7 100644 --- a/base/sat_counter.hh +++ b/base/sat_counter.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/sched_list.hh b/base/sched_list.hh index 0f922d63c..86e342ae1 100644 --- a/base/sched_list.hh +++ b/base/sched_list.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/socket.cc b/base/socket.cc index 63b693d94..aa6a183a9 100644 --- a/base/socket.cc +++ b/base/socket.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/socket.hh b/base/socket.hh index 39bacba94..361658720 100644 --- a/base/socket.hh +++ b/base/socket.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2002-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/mysql.cc b/base/stats/mysql.cc index 77366beb0..42f68811b 100644 --- a/base/stats/mysql.cc +++ b/base/stats/mysql.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/mysql.hh b/base/stats/mysql.hh index 4671b89dd..5780009d7 100644 --- a/base/stats/mysql.hh +++ b/base/stats/mysql.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,6 +34,7 @@ #include "base/stats/output.hh" +namespace MySQL { class Connection; } namespace Stats { class DistDataData; diff --git a/base/stats/output.hh b/base/stats/output.hh index 186d7bab1..a575fdf2e 100644 --- a/base/stats/output.hh +++ b/base/stats/output.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/statdb.cc b/base/stats/statdb.cc index cd5a095c0..eed3d6296 100644 --- a/base/stats/statdb.cc +++ b/base/stats/statdb.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/statdb.hh b/base/stats/statdb.hh index 6935a9aa0..bd7fabf32 100644 --- a/base/stats/statdb.hh +++ b/base/stats/statdb.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/text.cc b/base/stats/text.cc index 511dbe638..f7e82a30f 100644 --- a/base/stats/text.cc +++ b/base/stats/text.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,6 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if defined(__APPLE__) +#define _GLIBCPP_USE_C99 1 +#endif + #include <iostream> #include <fstream> #include <string> diff --git a/base/stats/text.hh b/base/stats/text.hh index 88e32ff0a..9dd036f86 100644 --- a/base/stats/text.hh +++ b/base/stats/text.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/types.hh b/base/stats/types.hh index dcfbd5fa9..fbabfb118 100644 --- a/base/stats/types.hh +++ b/base/stats/types.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/visit.cc b/base/stats/visit.cc index 88cd466b4..a270d94f4 100644 --- a/base/stats/visit.cc +++ b/base/stats/visit.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/stats/visit.hh b/base/stats/visit.hh index 3a46bb9ef..0b6cc5f22 100644 --- a/base/stats/visit.hh +++ b/base/stats/visit.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 The Regents of The University of Michigan + * Copyright (c) 2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/str.cc b/base/str.cc index 5ba23b55f..dd8d80043 100644 --- a/base/str.cc +++ b/base/str.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2003 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/str.hh b/base/str.hh index 8fee21a10..812f4d41a 100644 --- a/base/str.hh +++ b/base/str.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/time.cc b/base/time.cc index 9a484a883..e33aac406 100644 --- a/base/time.cc +++ b/base/time.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/time.hh b/base/time.hh index 1f8c7e747..bee8781a9 100644 --- a/base/time.hh +++ b/base/time.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2003-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/trace.cc b/base/trace.cc index e56bdb11b..aa82ee403 100644 --- a/base/trace.cc +++ b/base/trace.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/trace.hh b/base/trace.hh index 948bff548..60ea015ea 100644 --- a/base/trace.hh +++ b/base/trace.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 The Regents of The University of Michigan + * Copyright (c) 2001-2004 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/base/traceflags.py b/base/traceflags.py index a01eae3eb..363d44ffb 100644 --- a/base/traceflags.py +++ b/base/traceflags.py @@ -57,12 +57,12 @@ baseFlags = [ 'Mbox', 'PCIA', 'PCIDEV', + 'PciConfigAll', 'ISP', 'BADADDR', 'Console', 'ConsolePoll', 'ConsoleVerbose', - 'TlaserUart', 'AlphaConsole', 'Flow', 'Interrupt', @@ -74,6 +74,10 @@ baseFlags = [ 'EthernetPIO', 'EthernetDMA', 'EthernetData', + 'EthernetDesc', + 'EthernetIntr', + 'EthernetSM', + 'EthernetCksum', 'GDBMisc', 'GDBAcc', 'GDBRead', @@ -105,7 +109,11 @@ baseFlags = [ 'Context', 'Config', 'Sampler', - 'WriteBarrier' + 'WriteBarrier', + 'IdeCtrl', + 'IdeDisk', + 'Tsunami', + 'Uart' ] # @@ -120,7 +128,8 @@ compoundFlagMap = { 'GDBAll' : [ 'GDBMisc', 'GDBAcc', 'GDBRead', 'GDBWrite', 'GDBSend', 'GDBRecv', 'GDBExtra' ], 'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ], 'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ], - 'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' ] + 'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ], + 'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ] } ############################################################# |