From 1511370d09a2dc93a9f7f6154440d28ed6309b49 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 29 Oct 2003 00:41:24 -0800 Subject: More progress on checkpointing... we can now write out a checkpoint and read it back in, though most objects don't actually serialize any data. arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: arch/alpha/isa_traits.hh: cpu/exec_context.cc: cpu/exec_context.hh: cpu/simple_cpu/simple_cpu.hh: dev/alpha_access.h: dev/alpha_console.cc: dev/alpha_console.hh: dev/console.cc: dev/console.hh: Change unserialize param from IniFile& to const IniFile*. cpu/simple_cpu/simple_cpu.cc: Change unserialize param from IniFile& to const IniFile*. Make unserialize call ExecContext::unserialize. sim/eventq.cc: Rename MainEventQueue (no spaces) for easier parsing in checkpoints. Disable event serialization for now, so we can focus on the easy stuff. sim/serialize.cc: Change paramIn and arrayParamIn param from IniFile& to const IniFile*. sim/serialize.hh: Change unserialize, paramIn, and arrayParamIn params from IniFile& to const IniFile*. --HG-- extra : convert_revision : 6e8853ed375eddec0e140c95a01dd51bd225f7b9 --- sim/eventq.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sim/eventq.cc') diff --git a/sim/eventq.cc b/sim/eventq.cc index da9e85eeb..7285f63e8 100644 --- a/sim/eventq.cc +++ b/sim/eventq.cc @@ -50,7 +50,7 @@ const string Event::defaultName("event"); // Events on this queue are processed at the *beginning* of each // cycle, before the pipeline simulation is performed. // -EventQueue mainEventQueue("Main Event Queue"); +EventQueue mainEventQueue("MainEventQueue"); void EventQueue::insert(Event *event) @@ -121,6 +121,7 @@ EventQueue::serviceOne() void EventQueue::nameChildren() { +#if 0 int j = 0; Event *event = head; @@ -131,11 +132,13 @@ EventQueue::nameChildren() event = event->next; } +#endif } void EventQueue::serialize(ostream &os) { +#if 0 string objects = ""; Event *event = head; @@ -148,6 +151,7 @@ EventQueue::serialize(ostream &os) } nameOut(os, "Serialized"); SERIALIZE_MEMBER(objects); +#endif } void -- cgit v1.2.3