ASM fast fertig

asm/asm02.py

@@ -93,27 +93,135 @@ def searchSymbols(asm):
     i = 16
     for line in asm:
         if line.startswith('@'):
-            #ic (i, " ",line[1:])
             if line[1:].isdigit():
                     if line not in symboltable:
                         addtoSymboltable(line, int(line[1:]))
             elif line not in symboltable:
-                #ic("Symbol nicht in Table")
                 addtoSymboltable(line, i)
                 i = i+1
                     
 def ciinstruction(ci):
-    c = "1110000000000000"
-    
+    c = "111"
     if ci.__contains__('='):
         c2 = ci.split('=')
+        comp = c2[1]
+        dest = c2[0]
+        c = c + c_comp(comp) + c_dest(dest) +"000"
+    elif ci.__contains__(";"):
+        jmp = ci.split(';')
+        comp = jmp[0]
+        jmpinst = jmp[1]
+        c = c + c_comp(comp) + "000" + c_jump(jmpinst)
         
-        ic(c2)
         
-        #ic("Dest = ", ci[0], "  Comp = ", ci[2])
+    return c +"\n"
+        
+def c_jump(jmp):
+    match jmp:
+        case "JGT":
+            return "001"
+        case "JEQ":
+            return "010"
+        case "JGE":
+            return "011"
+        case "JLT":
+            return "100"
+        case "JNE":
+            return "101"
+        case "JLE":
+            return "110"
+        case "JMP":
+            return "111"
+        case _:
+            return "000"
         
     
-    return c +"\n"
+
+    
+def c_comp(comp):
+    match comp: 
+        # A = 0 
+        case "D":
+            return "0001100"
+        case "0":
+            return "0001100"
+        case "1":
+            return "0111111"
+        case "-1":
+            return "0111010"
+        case "A":
+            return "0110000"
+        case "!D":
+            return "0001101"
+        case "!A":
+            return "0110001"
+        case "-D":
+            return "0001111"
+        case "-A":
+            return "0110011"
+        case "D+1":
+            return "0011111"
+        case "A+1":
+            return "0110111"
+        case "D-1":
+            return "0001110"
+        case "A-1":
+            return "0110010"
+        case "D+A":
+            return "0000010"
+        case "D-A":
+            return "0010011"
+        case "A-D":
+            return "0000111"
+        case "D&A":
+            return "0000000"
+        case "D|A":
+            return "0010101"
+        # a = 1
+        case "M":
+            return "1110000"
+        case "!M":
+            return "1110001"
+        case "-M":
+            return "1110011"
+        case "M+1":
+            return "1110111"
+        case "M-1":
+            return "1110010"
+        case "D+M":
+            return "1000010"
+        case "D-M":
+            return "1010011"
+        case "M-D":
+            return "1000111"
+        case "D&M":
+            return "1000000"
+        case "D|M":
+            return "1010101"
+        case _:
+            return ""
+
+def c_dest(dest):
+    match dest:
+        case "M":
+            return "001"
+        case "D":
+            return "010"
+        case "MD":
+            return "011"
+        case "A":
+            return "100"
+        case "AM":
+            return "101"
+        case "AD":
+            return "110"
+        case "AMD":
+            return "111"
+        case _:
+            return "000"
+    
+  
+        
     #return '{0:016b}'.format(c)+"\n"
     #return  bin(c)[2:]+"\n" # 111 in binär --> falscher Weg
     # dest = comp; jump
@@ -121,19 +229,16 @@ def ciinstruction(ci):
                     
             
 def addtoSymboltable(key,value):
-    ic(key, value)
     symboltable[key]=value
         
 
 def createAsmFile():
     datename = os.path.splitext(os.path.basename(filename))[0]+".hack"
-    ic(datename)
     f = open(datename,"w")
     for line in asm:
         if line in symboltable:
             f.write('{0:016b}'.format(symboltable[line]) + "\n")
         else:
-            #M=D
             f.write(ciinstruction(line))
     f.close()
 
@@ -147,7 +252,6 @@ if __name__ == "__main__":
     searchSymbols(asm)
     createAsmFile()
     
-    #print("Symtable = ",symboltable)