Merge pull request #2 from celebi-pkg/dev

Fixing README, updating reference to repo, package changelog, etc

Author: kcelebi

setup.cfg

@@ -5,10 +5,10 @@ author_email = kayacelebi17@gmail.com
 description = RISC-V Assembly code assembler package for Python.
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://github.com/kcelebi/riscv-assembler
+url = https://github.com/celebi-pkg/riscv-assembler
 project_urls =
-    Bug Tracker = https://github.com/kcelebi/riscv-assembler/issues
-    Changelog = https://github.com/kcelebi/riscv-assembler/releases
+    Bug Tracker = https://github.com/celebi-pkg/riscv-assembler/issues
+    Changelog = https://github.com/celebi-pkg/riscv-assembler/releases
 classifiers =
     Programming Language :: Python :: 3
     License :: OSI Approved :: MIT License

src/riscv_assembler/instr_arr.py

@@ -184,8 +184,8 @@ def JUMP(tk : str, line_num : int, code: list) -> int:
 		try:
 			index, skip_labels = code.index(tk + ":"), 0
 		except:
-			raise Exception('''Address not found! Provided assembly code could
-				 be faulty, branch is expressed but not found in code.''')
+			raise Exception('''Address not found for {}! Provided assembly code could 
+				be faulty, branch is expressed but not found in code.'''.format(tk))
 
 		pos = 1
 		if index > line_num: # forward search:
@@ -298,6 +298,7 @@ def __str__(self):
 	def organize(self, tokens):
 		# better way to organize, express, abstract pseudo?
 		instr = tokens[0]
+		line_num, code = tokens[-2], tokens[-1]
 		if instr == 'nop':
 			rs1, imm, rd = reg_map["x0"], 0, reg_map["x0"]
 			return I("addi", rs1, imm, rd)
@@ -310,8 +311,14 @@ def organize(self, tokens):
 		elif instr == "neg":
 			rs1, rs2, rd = reg_map["x0"], reg_map[tokens[2]], reg_map[tokens[1]]
 			return R("sub", rs1, rs2, rd)
-
-		raise Exception("Bad Instruction provided, this does not exist or has not been implemented here yet.")
+		elif instr == "j":
+			return UJ("jal", super().JUMP(tokens[1], line_num, code), "x0")
+		elif instr == "li":
+			# This is missing addi rd rd -273
+			return U("lui", tokens[2], reg_map[tokens[1]])
+			# I("addi", reg_map[tokens[1]], reg_map[tokens[1]], tokens[2])
+
+		raise Exception("Bad Instruction provided, {} does not exist or has not been implemented here yet.".format(instr))
 
 
 def register_map():

tests/assembly/test8.s

@@ -0,0 +1,62 @@
+dot:
+    addi sp, sp, -24
+    sw s0, 0(sp)        #sum
+    sw s1, 4(sp)        #loaded val v0
+    sw s2, 8(sp)        #loaded val v1
+    sw s3, 12(sp)       #product
+    sw s4, 16(sp)       #stride v0
+    sw s5, 20(sp)       #stride v1
+
+    addi t5, x0, 1      #exit value
+    blt a2, t5, exit5
+    blt a3, t5, exit6
+    blt a4, t5, exit6
+    j loop_start
+
+exit5:
+    li a1, 5
+    j exit6
+
+exit6:
+    li a1, 6
+    j exit5
+
+loop_start:
+    addi s0, x0, 0      #set sum to 0
+    addi t0, x0, 0      #i=0, to keep track of not going over vectorsize
+    addi t1, x0, 0      #v0 iter = 0
+    addi t2, x0, 0      #v1 iter = 0
+    addi t3, x0, 4
+    mul s4, a3, t3      #v0 stride
+    mul s5, a4, t3       #v1 stride
+
+    j loop_continue
+
+loop_continue:
+    beq t0, a2, loop_end  #loop statement
+
+    lw s1, 0(a0)        #load v0
+    lw s2, 0(a1)        #load v1
+
+    add a0, a0, s4      #getting v0[i], increment by stride
+    add a1, a1, s5      #getting v1[i], increment by stride
+    
+    mul s3, s1, s2      #get product
+
+    add s0, s0, s3      #add to sum
+
+    addi t0, t0, 1      #increment
+    j loop_continue
+
+loop_end:
+    # Epilogue
+    mv a0, s0           #give a0 return value
+
+    lw s0, 0(sp)        #restore and end
+    lw s1, 4(sp)
+    lw s2, 8(sp)
+    lw s3, 12(sp)
+    lw s4, 16(sp)
+    lw s5, 20(sp)
+    addi, sp, sp, 24
+    #ret

tests/test_class.py

@@ -5,7 +5,7 @@
 from riscv_assembler.instr_arr import *
 from riscv_assembler.parse import Parser
 
-num_test_files = 8
+num_test_files = 9
 num_questions = 15
 
 def SUITE():
@@ -85,6 +85,7 @@ def SUITE():
 
 	return results
 
+ans = ['0xfe810113','0x00812023','0x00912223','0x01212423','0x01312623','0x01412823','0x01512a23','0x00100f13','0x01e64863','0x01e6ca63','0x01e74863','0x0140006f','0x00500593','0xfcdff06f','0x00600593','0xfc5ff06f','0x00000413','0x00000293','0x00000313','0x00000393','0x00400e13','0x03c68a33','0x03c70ab3','0x0040006f','0x02c28263','0x00052483','0x0005a903','0x01450533','0x015585b3','0x032489b3','0x01340433','0x00128293','0xfe1ff06f','0x00040513','0x00012403','0x00412483','0x00812903','0x00c12983','0x01012a03','0x01412a83','0x01810113']
 ANSWERS = {
 	0: [['0x000000b3'], None, 'file0.txt', 'file0.bin', ['0x000000b3'], None, 'str0.txt', 'str0.bin', ['0x000000b3'], 'a', None, 'p', 'arr0.txt', 'arr0.bin', 'f'],
 	1: [['0x02040293'], None, 'file1.txt', 'file1.bin',['0x02040293'], None, 'str1.txt', 'str1.bin',['0x02040293'], 'a', None, 'p', 'arr1.txt', 'arr1.bin', 'f'],
@@ -93,7 +94,9 @@ def SUITE():
 	4: [['0x000000b3', '0x02040293', '0x02040293','0x00812023'], None, 'file4.txt', 'file4.bin',['0x000000b3', '0x02040293', '0x02040293','0x00812023'], None, 'str4.txt', 'str4.bin',['0x000000b3', '0x02040293', '0x02040293','0x00812023'], 'a', None, 'p', 'arr4.txt', 'arr4.bin', 'f'],
 	5: [['0x00a00413','0x00a00493','0xfff00493','0x00048463','0xfe000ce3','0xfe040493'], None, 'file5.txt', 'file5.bin', ['0x00a00413','0x00a00493','0xfff00493','0x00048463','0xfe000ce3','0xfe040493'], None, 'str5.txt', 'str5.bin', ['0x00a00413','0x00a00493','0xfff00493','0x00048463','0xfe000ce3','0xfe040493'], 'a', None, 'p', 'arr5.txt', 'arr5.bin', 'f'],
 	6: [['0x00a00093','0xfec00113','0x00000663','0x00123023','0x00023083','0xfff00093','0x00123023','0x00023083','0xfe02c6e3'], None, 'file6.txt', 'file6.bin', ['0x00a00093','0xfec00113','0x00000663','0x00123023','0x00023083','0xfff00093','0x00123023','0x00023083','0xfe02c6e3'], None, 'str6.txt', 'str6.bin', ['0x00a00093','0xfec00113','0x00000663','0x00123023','0x00023083','0xfff00093','0x00123023','0x00023083','0xfe02c6e3'], 'a', None, 'p', 'arr6.txt', 'arr6.bin', 'f'],
-	7: [['0x00318233','0x002080b3','0x00708093','0x00123023','0x00023083'], None, 'file7.txt', 'file7.bin', ['0x00318233','0x002080b3','0x00708093','0x00123023','0x00023083'], None, 'str7.txt', 'str7.bin', ['0x00318233','0x002080b3','0x00708093','0x00123023','0x00023083'], 'a', None, 'p', 'arr7.txt', 'arr7.bin', 'f']}
+	7: [['0x00318233','0x002080b3','0x00708093','0x00123023','0x00023083'], None, 'file7.txt', 'file7.bin', ['0x00318233','0x002080b3','0x00708093','0x00123023','0x00023083'], None, 'str7.txt', 'str7.bin', ['0x00318233','0x002080b3','0x00708093','0x00123023','0x00023083'], 'a', None, 'p', 'arr7.txt', 'arr7.bin', 'f'],
+	8: [ans, None, 'file8.txt', 'file8.bin', ans, None, 'str8.txt', 'str8.bin', ans, 'a', None, 'p', 'arr8.txt', 'arr8.bin', 'f']}
+
 RESULTS = SUITE()
 
 def error_label(q, test):