aboutsummaryrefslogtreecommitdiff
path: root/MicSim/components/caretaker.py
diff options
context:
space:
mode:
authorLoic GUEGAN <loic.guegan@yahoo.fr>2018-09-03 07:08:31 +0200
committerLoic GUEGAN <loic.guegan@yahoo.fr>2018-09-03 07:08:31 +0200
commit041e5ba04dda5c6e1d52acae81bcef2eaa3b711c (patch)
treeb4cd02998b5726e67419d3b69cd50bd3a23eac8f /MicSim/components/caretaker.py
parent878c2b84a97411fad9179b1dfcc8ded75bc9ebe8 (diff)
Debug caretaker
Diffstat (limited to 'MicSim/components/caretaker.py')
-rw-r--r--MicSim/components/caretaker.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/MicSim/components/caretaker.py b/MicSim/components/caretaker.py
index cb92cbb..b43b3e3 100644
--- a/MicSim/components/caretaker.py
+++ b/MicSim/components/caretaker.py
@@ -18,14 +18,16 @@ class Caretaker:
if self.objects[key] < 0:
return(self.objects[key])
elif self.objects[key]>>7==1: # If it a negative number (2 complement)
- return(-(self.objects[key]&0x7F))
+ #return(-(self.objects[key]&0x7F))
+ return(-((self.objects[key]-1)^0xFF)) # Reverse 2 complements to get an unsign nummber (for python is better)
+
else:
return(self.objects[key])
return(self.objects[key])
def __setitem__(self,key,value):
if key!="RAM":
- if (-(2**7-1))>value and (key=="MBR" or key=="MBRU"):
+ if ((-(2**7-1))>value or value>(2**8)-1) and (key=="MBR" or key=="MBRU"):
raise RuntimeError("Value {} cannot fit in MBR register (-2^7 minimum value)".format(value))
elif value>(2**32-1) and (key!="MBR" and key!="MBRU"):
raise RuntimeError("Value {} cannot fit in MBR register (2^32 minimum value)".format(value))