aboutsummaryrefslogtreecommitdiff
path: root/myMemory.py
diff options
context:
space:
mode:
Diffstat (limited to 'myMemory.py')
-rwxr-xr-xmyMemory.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/myMemory.py b/myMemory.py
index 2439aae..6e1014a 100755
--- a/myMemory.py
+++ b/myMemory.py
@@ -4,10 +4,14 @@
4# Pacien TRAN-GIRARD et Adam NAILI 4# Pacien TRAN-GIRARD et Adam NAILI
5 5
6from mem import Memory 6from mem import Memory
7from pageexception import *
7from fifo import FifoPaginator 8from fifo import FifoPaginator
8 9from lru import LruPaginator
10from secondchance import SecondChancePaginator
9paginators = { 11paginators = {
10 'fifo': FifoPaginator 12 'fifo': FifoPaginator,
13 'lru': LruPaginator,
14 'secondchance': SecondChancePaginator
11} 15}
12 16
13 17
@@ -25,7 +29,7 @@ def main(main_size, virt_size, paginator):
25 try: 29 try:
26 pag.load(int(cmd)) 30 pag.load(int(cmd))
27 output(cmd, mem.dump_main()) 31 output(cmd, mem.dump_main())
28 except IndexError: 32 except PageException:
29 output(cmd, "Error: invalid page.") 33 output(cmd, "Error: invalid page.")
30 elif cmd == 'p': 34 elif cmd == 'p':
31 output(cmd, mem.dump_main() + '\t' + mem.dump_virt()) 35 output(cmd, mem.dump_main() + '\t' + mem.dump_virt())