diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/caretaker.py | 12 | ||||
| -rw-r--r-- | components/microprogram.py | 13 |
2 files changed, 16 insertions, 9 deletions
diff --git a/components/caretaker.py b/components/caretaker.py index 7f8cc33..4237702 100644 --- a/components/caretaker.py +++ b/components/caretaker.py @@ -11,12 +11,12 @@ class Caretaker: def __getitem__(self,key): if key=="MBRU": # If we ask for unsigned - return(self.objects["MBR"] & 0x000000FF) - elif key=="MBR": # If we ask for signed - if self.objects["MBR"]>=0: - return(self["MBRU"]) - else: # Send 2 complement if it's lower than 0 - return(self.objects["MBR"] & 0xFFFFFFFF) + return(abs(self.objects["MBR"])) + elif key== "MBR": + if (self.objects[key]>>7)==1: # If it a negative number (2 complement) + return(-((self.objects[key]-1)^0xFF)) # transforme bin negative number to python negative number + else: + return(self.objects[key]) return(self.objects[key]) def __setitem__(self,key,value):# TODO: Do special treatment for MBR (allow only 2^8 value) diff --git a/components/microprogram.py b/components/microprogram.py index fb0e589..4543de1 100644 --- a/components/microprogram.py +++ b/components/microprogram.py @@ -45,7 +45,7 @@ class Microprogram: """ Execute next opcode """ - opcode=self.c["MBR"] # Get loaded OpCode + opcode=self.c["MBRU"] # Get loaded OpCode (/!\ We used MBRU not MBR because MBR is signed) if opcode==ijvm["NOP"]: # NOP pass elif opcode==ijvm["BIPUSH"]: # BIPUSH @@ -135,16 +135,23 @@ class Microprogram: self.c["H"]=self.c["MDR"] self.c["MDR"]=self.c["MBR"]+self.c["H"] self.wr() + elif opcode==ijvm["GOTO"]: + self.fetch();self.c["PC"]+=1 # Fetch first byte + self.c["OPC"]=self.c["PC"]-1 + self.c["H"]=self.c["MBR"]<<8 + self.fetch();self.c["PC"]+=1 # Fetch second byte + self.c["H"]=self.c["MBRU"]|self.c["H"] + self.c["PC"]=self.c["OPC"]+self.c["H"] elif opcode==ijvm["OUT"]: self.fetch();self.c["PC"]+=1 # Fetch byte to push in MBR - print(str(chr(self.c["MBR"])),end="") + print(str(chr(self.c["MBRU"])),end="") # MBRU because no char which are negative elif opcode==ijvm["HALT"]: return(1) else: if opcode in ijvm: print("Instruction {} not yet implemented.".format(ijvm[opcode])) else: - raise RuntimeError("Instruction {} not found".format(opcode)) + raise RuntimeError("Instruction {} not found on address {}".format(opcode,self.c["PC"]-1)) return(0) def dump(self): |