Adapt for fixed specs

1 files changed, 3 insertions, 7 deletions

diff --git a/fifo.py b/fifo.py
index 7fa55a0..61e70f5 100644
--- a/fifo.py
+++ b/fifo.py
@@ -10,7 +10,6 @@ class FifoPaginator:
   def __init__(self, mem):
     self.mem = mem
     self._main_cursor = 0
-    self._virt_cursor = 0
 
   def _put_main(self, page):
     overwritten = self.mem.main[self._main_cursor]
@@ -18,13 +17,10 @@ class FifoPaginator:
     self._main_cursor = (self._main_cursor + 1) % len(self.mem.main)
     return overwritten
 
-  def _put_virt(self, page):
-    self.mem.virt[self._virt_cursor] = page
-    self._virt_cursor += 1
-
   def load(self, page):
-    if not self.mem.has_page(page): raise IndexError
+    if not self.mem.page_in_range(page): raise IndexError
     if page in self.mem.main: return
+    if page in self.mem.virt: self.mem.remove_virt(page)
     overwritten = self._put_main(page)
-    if overwritten not in self.mem.virt: self._put_virt(overwritten)
+    if overwritten is not None: self.mem.put_virt(overwritten)