diff options
| -rw-r--r-- | components/caretaker.py | 1 | ||||
| -rw-r--r-- | components/microprogram.py | 5 | ||||
| -rw-r--r-- | components/ram.py | 18 | ||||
| -rw-r--r-- | ram.txt | 10 |
4 files changed, 16 insertions, 18 deletions
diff --git a/components/caretaker.py b/components/caretaker.py index 5707a16..ab20fba 100644 --- a/components/caretaker.py +++ b/components/caretaker.py @@ -27,7 +27,6 @@ class Caretaker: elif value > (2**8) and key=="MBR" and key=="MBRU": # Check value fit in byte print("Warning byte overflow: value {} on register {}".format(value,key)) value=value%256 # Force to fit in byte - self.objects[key]=value def items(self): diff --git a/components/microprogram.py b/components/microprogram.py index 8ae9703..869a2ae 100644 --- a/components/microprogram.py +++ b/components/microprogram.py @@ -1,9 +1,6 @@ from components.ijvm import ijvm -# TODO: Switch MAR as 32bits address (multiply its value by for) -# then same for SP and LV - class Microprogram: def __init__(self,components): @@ -164,7 +161,7 @@ class Microprogram: print("-------------- RAM --------------") self.c["RAM"].dump() print("------------- Stack -------------") - self.c["RAM"].dumpRange(self.c["LV"],self.c["SP"]) + self.c["RAM"].dumpRange(self.c["LV"]*4,self.c["SP"]*4,4) # Convert address to 32bits value print("----------- Registers -----------") for key,value in self.c.items(): if key!="RAM": diff --git a/components/ram.py b/components/ram.py index b6258e3..dd99ada 100644 --- a/components/ram.py +++ b/components/ram.py @@ -34,19 +34,25 @@ class Ram: """ Write data to memory based Mic-1 architecture """ - addr=self.c["MAR"] + addr=self.c["MAR"]*4 # Don't forget MAR address 32bits block of memory if addr>self.lastAddr: raise ValueError("You get out of the ram by trying to set a value at address {}, max address is {}".format(addr,self.lastAddr)) - self.data[addr]=self.c["MDR"] + #### Little endian #### + self.data[addr]=self.c["MDR"] & 0xFF + self.data[addr+1]=self.c["MDR"] & 0xFF00 + self.data[addr+2]=self.c["MDR"] & 0xFF0000 + self.data[addr+3]=self.c["MDR"] & 0xFF000000 + def read(self): """ Read data from memory based Mic-1 architecture """ - addr=self.c["MAR"] + addr=self.c["MAR"]*4 # Don't forget MAR address 32bits block of memory value=None try: - value=self.data[addr] + #### Little endian #### + value=(self.data[addr+3]<<24)|(self.data[addr+2]<<16)|(self.data[addr+1]<<8)|self.data[addr] except: if addr>self.lastAddr: raise ValueError("You get out of the ram by trying to get value at address {}, max address is {}".format(addr,self.lastAddr)) @@ -77,11 +83,11 @@ class Ram: #print("{}:{}".format(key,bin(value)[2:])) print("{}:{}".format(key,value)) - def dumpRange(self,start,end): + def dumpRange(self,start,end,step): """ Another dump helper """ - for i in range(start,end+1): + for i in range(start,end+1,step): try: print("{}:{}".format(i,self.data[i])) except: @@ -1,9 +1,5 @@ BIPUSH -1 +7 BIPUSH -0 -GOTO -0 -0 -BIPUSH -30 +8 +IADD |