From e0633e6450666ed9bcf1c2ac0008b9b2d8303f40 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Fri, 31 Oct 2014 17:44:37 +0000 Subject: [PATCH] cleanup --- hardware.cpp | 14 ++++---------- memory.cpp | 1 + 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hardware.cpp b/hardware.cpp index 10c35b3..117bfd3 100644 --- a/hardware.cpp +++ b/hardware.cpp @@ -44,11 +44,8 @@ void hardware_checkpoint(Stream &s) { unsigned ds = 0; for (unsigned i = 0; i < 0x10000; i += ds) { Memory::Device *dev = memory.get(i); - if (dev) { - dev->checkpoint(s); - ds = dev->pages() * Memory::page_size; - } else - ds = Memory::page_size; + dev->checkpoint(s); + ds = dev->pages() * Memory::page_size; } _cpu->checkpoint(s); } @@ -57,11 +54,8 @@ void hardware_restore(Stream &s) { unsigned ds = 0; for (unsigned i = 0; i < 0x10000; i += ds) { Memory::Device *dev = memory.get(i); - if (dev) { - dev->restore(s); - ds = dev->pages() * Memory::page_size; - } else - ds = Memory::page_size; + dev->restore(s); + ds = dev->pages() * Memory::page_size; } _cpu->restore(s); } diff --git a/memory.cpp b/memory.cpp index 1de55d7..57f24ed 100644 --- a/memory.cpp +++ b/memory.cpp @@ -19,4 +19,5 @@ public: void Memory::begin() { put(nd, 0); + nd._pages = 1; // hack for checkpointing }