d7ad8dc608
This patch changes how the serialization of the system works. The base class had a non-virtual serialize and unserialize, that was hidden by a function with the same name for a number of subclasses (most likely not intentional as the base class should have been virtual). A few of the derived systems had no specialization at all (e.g. Power and x86 that simply called the System::serialize), but MIPS and Alpha adds additional symbol table entries to the checkpoint. Instead of overriding the virtual function, the additional entries are now printed through a virtual function (un)serializeSymtab. The reason for not calling System::serialize from the two related systems is that a follow up patch will require the system to also serialize the PhysicalMemory, and if this is done in the base class if ends up being between the general parts and the specialized symbol table. With this patch, the checkpoint is not modified, as the order of the segments is unchanged.
103 lines
3.4 KiB
C++
103 lines
3.4 KiB
C++
/*
|
|
* Copyright (c) 2007 The Hewlett-Packard Development Company
|
|
* All rights reserved.
|
|
*
|
|
* The license below extends only to copyright in the software and shall
|
|
* not be construed as granting a license to any other intellectual
|
|
* property including but not limited to intellectual property relating
|
|
* to a hardware implementation of the functionality of the software
|
|
* licensed hereunder. You may use the software subject to the license
|
|
* terms below provided that you ensure that this notice is replicated
|
|
* unmodified and in its entirety in all distributions of the software,
|
|
* modified or unmodified, in source code or in binary form.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Authors: Gabe Black
|
|
*/
|
|
|
|
#ifndef __ARCH_X86_SYSTEM_HH__
|
|
#define __ARCH_X86_SYSTEM_HH__
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/loader/symtab.hh"
|
|
#include "cpu/pc_event.hh"
|
|
#include "kern/system_events.hh"
|
|
#include "params/X86System.hh"
|
|
#include "sim/sim_object.hh"
|
|
#include "sim/system.hh"
|
|
|
|
namespace X86ISA
|
|
{
|
|
namespace SMBios
|
|
{
|
|
class SMBiosTable;
|
|
}
|
|
namespace IntelMP
|
|
{
|
|
class FloatingPointer;
|
|
class ConfigTable;
|
|
}
|
|
}
|
|
|
|
class X86System : public System
|
|
{
|
|
public:
|
|
typedef X86SystemParams Params;
|
|
X86System(Params *p);
|
|
~X86System();
|
|
|
|
/**
|
|
* Serialization stuff
|
|
*/
|
|
public:
|
|
|
|
void initState();
|
|
|
|
protected:
|
|
|
|
X86ISA::SMBios::SMBiosTable * smbiosTable;
|
|
X86ISA::IntelMP::FloatingPointer * mpFloatingPointer;
|
|
X86ISA::IntelMP::ConfigTable * mpConfigTable;
|
|
X86ISA::ACPI::RSDP * rsdp;
|
|
|
|
void writeOutSMBiosTable(Addr header,
|
|
Addr &headerSize, Addr &tableSize, Addr table = 0);
|
|
|
|
void writeOutMPTable(Addr fp,
|
|
Addr &fpSize, Addr &tableSize, Addr table = 0);
|
|
|
|
const Params *params() const { return (const Params *)_params; }
|
|
|
|
virtual Addr fixFuncEventAddr(Addr addr)
|
|
{
|
|
//XXX This may eventually have to do something useful.
|
|
return addr;
|
|
}
|
|
};
|
|
|
|
#endif
|
|
|