From d9bebd9b1ff12c5ecc9151337de9fefa0cf0cfff Mon Sep 17 00:00:00 2001
From: Kaya Celebi <kayacelebi17@gmail.com>
Date: Mon, 10 Apr 2023 06:37:40 -0400
Subject: [PATCH 1/2] .gitignore update

---
 .gitignore                                    |   3 ++-
 .../__pycache__/convert.cpython-38.pyc        | Bin 5954 -> 5986 bytes
 .../__pycache__/parse.cpython-38.pyc          | Bin 4133 -> 4133 bytes
 .../test_class.cpython-38-pytest-7.2.2.pyc    | Bin 7584 -> 7576 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index cf3feec..1a32213 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ dist
 riscv_assembler.egg-info
 build
 .pytest_cache/
-deprc_setup.py
\ No newline at end of file
+deprc_setup.py
+__pycache__/
\ No newline at end of file
diff --git a/src/riscv_assembler/__pycache__/convert.cpython-38.pyc b/src/riscv_assembler/__pycache__/convert.cpython-38.pyc
index 456c6d296760d72967e3d9e088b6223ca3f16cb9..1668e2e3aca3f48ef69063a88137a556618b02a8 100644
GIT binary patch
delta 70
zcmX@4_ehU7l$V!_0SH{58mBzj$opJON3tlhIJqo7vA8%jHz_BzNG~(5xTGjPv8d>l
KD7w@naVG#^ycxa#

delta 39
tcmaE)cSw&nl$V!_0SN9tF-|$Mk@vY64`*gxaY<2pVo}j8*2xOuP5}QA4Kx4%

diff --git a/src/riscv_assembler/__pycache__/parse.cpython-38.pyc b/src/riscv_assembler/__pycache__/parse.cpython-38.pyc
index cf5d2584b5c4092ffabec818651ab10c0b4d83c8..932fcfeef792ed0b1b30e8aef8fd5a7eff195bc3 100644
GIT binary patch
delta 25
fcmZ3guvCF7l$V!_0SG*wZsc0a&v<L{4*pyKQfUWO

delta 25
fcmZ3guvCF7l$V!_0SJ~o+{m?-pD}9k4*pyKR2c^@

diff --git a/tests/__pycache__/test_class.cpython-38-pytest-7.2.2.pyc b/tests/__pycache__/test_class.cpython-38-pytest-7.2.2.pyc
index c76ee7587bd2a88735c85a20a653d620406a2587..9d89ef7fe25c2972246ec4ee6a9eeba43dc88f66 100644
GIT binary patch
delta 36
qcmZ2rJ;RzWl$V!_0SL688K?Z_-N=_J!zezvLPm*Ebn|=}Mn(Xt<_Qe|

delta 44
wcmbPXy}+6;l$V!_0SJ;G8>cYyZRAUpVU;c}O4gfPBBR7A31V%YF2l$O0Q9B{I{*Lx


From ff759d3c713e423134c98f190638f50fccddaf83 Mon Sep 17 00:00:00 2001
From: Kaya Celebi <kayacelebi17@gmail.com>
Date: Mon, 10 Apr 2023 07:50:40 -0400
Subject: [PATCH 2/2] SB and JUMP working

---
 .../__pycache__/convert.cpython-38.pyc        | Bin 5986 -> 5986 bytes
 .../__pycache__/instr_arr.cpython-38.pyc      | Bin 13312 -> 13490 bytes
 .../__pycache__/parse.cpython-38.pyc          | Bin 4133 -> 4110 bytes
 src/riscv_assembler/instr_arr.py              |  36 +++++++++---------
 src/riscv_assembler/parse.py                  |  30 +++++++--------
 .../test_class.cpython-38-pytest-7.2.2.pyc    | Bin 7576 -> 7958 bytes
 tests/test_class.py                           |   4 +-
 7 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/riscv_assembler/__pycache__/convert.cpython-38.pyc b/src/riscv_assembler/__pycache__/convert.cpython-38.pyc
index 1668e2e3aca3f48ef69063a88137a556618b02a8..8ab836d006916f3e9eecb163a8f7a643e8238a30 100644
GIT binary patch
delta 19
ZcmaE)_ehT`l$V!_0SNv-+sG9m4gfm`1+xGE

delta 19
ZcmaE)_ehT`l$V!_0SH{5Zsdv(2LLvv1o!{|

diff --git a/src/riscv_assembler/__pycache__/instr_arr.cpython-38.pyc b/src/riscv_assembler/__pycache__/instr_arr.cpython-38.pyc
index 18b4a221b2c6c4654f8165af41191c12886d7db7..ba150fa5dbfb586661dd5ad861e26017d07f8d8c 100644
GIT binary patch
literal 13490
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

literal 13312
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

diff --git a/src/riscv_assembler/__pycache__/parse.cpython-38.pyc b/src/riscv_assembler/__pycache__/parse.cpython-38.pyc
index 932fcfeef792ed0b1b30e8aef8fd5a7eff195bc3..dbb86b1664c465a3863f180c7b178d7f021eb3d4 100644
GIT binary patch
delta 2103
zcmZuyO>7fK6rMM`-d#Jk<Afw65Fq_$`Ek=m{5C|W(4bZ#ErbSSK^NCEF(&IDW;ZRk
zwtPsWsu!wgIi_l&s;ZF6q2kbMkG=P{y>R7F_0FN~d*c`abgg~!=K0N=H{bi-?2i+7
zC$gVrGAV{n{MVHDIkT1>zcGU|!36m15{=x4DlZs7y5XDEL?MB?S%!jjj){b@R++F?
zc)^zT3M)9mo@cJ}m_oV`!vPfO+2vX(tki3l?ldIMEqS{Vguz;CEM=qHX?%m<*S_D^
z5qqUA9q9;b-4M2LRud~wNJ<N>wn(mXkrI8YCfZVHGo`6*X_3*kKJ90UEc*3}oVKO6
z{07iAD0XODMp|MYM$GC6!|SFP5j*uxZ})3=Ta2RnnAoM=b2{vR*p0Svu}9km#Sk8H
z;$ai6LnndhpQ9tpq6k?F?lLtR!UhlFra`k!m}jBc0s&)e1;WG<SJU)=*Ro*=z6sg~
zZldij!_dZ@0*n?z%C(h=nzCq`snkNL8cK#<QK>koWKp=@V#SxS86vi^5risE1P#9u
zx;!=m=`Y4+QI&)HOy#2QjPqw4&np#u-}8nsV4y1x4&-<ahM<}AJ}Ig|s(jCB)-__d
z9rxji`j=j*?$>L|j?O3cz}09e@zI4VEhg+SCLBD|6=BUYk;Lp%-Rz&hYs#Ut@f`Wt
z$N%E<1WsO3IkdT4?Z80|ksw1?3`8kw?<+Ylp*h&g<%^<U5uRVE$=)J6`YpXDDp(g`
zIC@}>zZo08ti`sH4Zm3GdBsMf9y}NNZ|l*(C~oxx_N(1`bk#`o$li5yAI@TX-mBCI
zKl{V3qB4}%1d6SVW4QBNz)9yaP%cB!x|2NqE;?fQvBcj_w6WNNuOb;XV3VCi+hxYt
z5q5!HWItemX}p5%gkYHu|8NdMblMv3%wvRL97P$!TpMZwGK4J|3c0hvHrX1#W#R(R
zpkf;(Fxg52>&)|$T{O1=iBaOzw2ysOs#hB`A5&=JkcD|TtocR{U80a?P<}dE=o^gw
zN$wmyNQ+@{`&rSVQqkemq3hJKB_e0<A$n3|1K;3%6lK<iE)ZwgwaKfz&D)0NyV2q;
zwrPBWuzbxHyAU~{A&eCuh>qd9Tj}UQ>Rbm8Nn5yvqSAE9pL|MwEXQFq$Kc(^%OtEX
z$=X(>2go~*VgcW$=S{Pw+dJ>mAk;zmX}^x$5X_*`LyD-;!Lr0jSzE43Rm6_d&FAQi
zDoq(DRIyf;uBoWx1qVZ7YX})TL{bk|#U^Q8{EkpcI<F*Z7bq{?b=-s;WMP~)hhNIA
zL&?qI2Jg}0lO$*>rLiZRdk<kx^E3Dc1r#ktOlh+ah=>A~Otld54Fhopt(l~4B+$n|
zyVWu_p^dkc=Gny-?~a`onp(WfcOq9?$kH;7_j$Li@kTm?J3Xt6+C|e>N$8F_fZEHs
zAEp1FC#X7(wrltXX%vh*FoKArU}AjRRn$Wri>^aZ!yP-Jrf~t9bY-$aVv(u@KHY*n
z&v($}#T}=jsmuXv+Rrk-So`V!x1!<f+~^5X^(~P6;C4wi=wpRPn2Em1j^|!T`c(8&
zcG7lX*5z|^(Vy9)ok3h3r-QH<R!UVF-lz*j2a3(l>vew{Is}ZO;wz#;Y#?zo1Zs+=
z&f?ZrQk^1~XS-@mGpO6Zh}Y}r;czpPO>-ED?)C4;jrMUEbU0{4=G<iTYybX*%M{nH
s2l+-ZyrI7%vF&;K`qzGnzFq&fQ|wGv>tflLGt`Efunwg0XYuUve*j$CF8}}l

literal 4133
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

diff --git a/src/riscv_assembler/instr_arr.py b/src/riscv_assembler/instr_arr.py
index 91f4aa2..27f1bd8 100644
--- a/src/riscv_assembler/instr_arr.py
+++ b/src/riscv_assembler/instr_arr.py
@@ -4,7 +4,7 @@
 
 __all__ = [
 	'R_instr', 'I_instr', 'S_instr',
-	'SB_instr', 'U_instr', 'UJ_instr','pseudo_instr',
+	'SB_instr', 'U_instr', 'UJ_instr','pseudo_instr', 'JUMP',
 	 'R', 'I', 'S', 'SB', 'U', 'UJ',
 	 'Rp', 'Ip', 'Sp', 'SBp', 'Up', 'UJp', 'Psp']
 
@@ -69,7 +69,8 @@ def compute_instr(self, instr, rs1, imm, rd):
 	@staticmethod
 	def immediate(imm):
 		#return int(imm) - ((int(imm)>>12)<<12) # imm[11:0]
-		return format(int(imm), '012b')
+		return format(((1 << 12) - 1) & int(imm), '012b')
+		#return format(int(imm), '012b')
 
 class _S(Instruction):
 	def __repr__(self):
@@ -97,7 +98,7 @@ def immediate(imm, n):
 								mod_imm_2 = int(imm) - ((int(imm) >> 5) << 5) # imm[4:0]
 						
 								return mod_imm, mod_imm_2'''
-		mod_imm = format(((1 << 13) - 1) & int(imm), '013b')
+		mod_imm = format(((1 << 12) - 1) & int(imm), '012b')
 		if n == 1:
 			return mod_imm[0] + mod_imm[12-10 : 12-4]
 		return mod_imm[12-4 : 12 - 0] + mod_imm[1]
@@ -127,8 +128,8 @@ def compute_instr(self, instr, rs1, rs2, imm):
 	def immediate(imm, n):
 		mod_imm = format(((1 << 13) - 1) & int(imm), '013b')
 		if n == 1:
-			return mod_imm[12-12] + mod_imm[12-10:12-5]
-		return mod_imm[12-4:12-1] + mod_imm[12-11]
+			return mod_imm[12-12] + mod_imm[12-11:12-5]
+		return mod_imm[12-4:12-0] + mod_imm[12-11]
 
 class _U(Instruction):
 	def __repr__(self):
@@ -201,10 +202,11 @@ def __str__(self):
 		return "I Parser"
 
 	def organize(self, tokens):
+		line_num, code = tokens[-2], tokens[-1]
 		instr, rs1, imm, rd = tokens[0], None, None, None
 		if instr == "jalr":
 			if len(tokens) == 4:
-				rs1, imm, rd = reg_map[tokens[2]], JUMP(tokens[3]), reg_map[tokens[1]]
+				rs1, imm, rd = reg_map[tokens[2]], JUMP(tokens[3], line_num, code), reg_map[tokens[1]]
 			else:
 				rs1, imm, rd = reg_map[tokens[1]], 0, reg_map["x1"]
 		elif instr == "lw":
@@ -235,7 +237,8 @@ def __str__(self):
 		return "SB Parser"
 
 	def organize(self, tokens):
-		instr, rs1, rs2, imm = tokens[0], reg_map[tokens[1]], reg_map[tokens[2]], JUMP(tokens[3])
+		line_num, code = tokens[-2], tokens[-1]
+		instr, rs1, rs2, imm = tokens[0], reg_map[tokens[1]], reg_map[tokens[2]], JUMP(tokens[3], line_num, code)
 		return SB(instr, rs1, rs2, imm)
 
 class _U_parse(InstructionParser):
@@ -259,11 +262,12 @@ def __str__(self):
 		return "UJ Parser"
 
 	def organize(self, tokens):
+		line_num, code = tokens[-2], tokens[-1]
 		instr, imm, rd = tokens[0], None, None
 		if len(tokens) == 3:
-			imm, rd = JUMP(tokens[2]), reg_map[tokens[1]]
+			imm, rd = JUMP(tokens[2], line_num, code), reg_map[tokens[1]]
 		else:
-			imm, rd = JUMP(tokens[1]), reg_map["x1"]
+			imm, rd = JUMP(tokens[1], line_num, code), reg_map["x1"]
 
 		return UJ(instr, imm, rd)
 
@@ -292,27 +296,25 @@ def organize(self, tokens):
 
 		return BadInstructionError()
 
-def JUMP(x : str, line_num : int) -> int:
-	raise NotImplementedError()
-
+def JUMP(x : str, line_num : int, code: list) -> int:
 	# search forward
 	skip_labels = 0
-	for i in range(line_num, len(self.code)):
-		if x+":" == self.code[i]:
+	for i in range(line_num, len(code)):
+		if x+":" == code[i]:
 			jump_size = (i - line_num - skip_labels) * 4 # how many instructions to jump ahead
 			return jump_size
 
-		if self.code[i][-1] == ':':
+		if code[i][-1] == ':':
 			skip_labels += 1
 
 	# search backward
 	skip_labels = 0
 	for i in range(line_num, -1, -1):
 		# substruct correct label itself
-		if self.code[i][-1] == ':':
+		if code[i][-1] == ':':
 			skip_labels += 1
 
-		if x+":" == self.code[i]:
+		if x+":" == code[i]:
 			jump_size = (i - line_num + skip_labels) * 4 # how many instructions to jump behind
 			return jump_size
 
diff --git a/src/riscv_assembler/parse.py b/src/riscv_assembler/parse.py
index 13dd736..643bc53 100644
--- a/src/riscv_assembler/parse.py
+++ b/src/riscv_assembler/parse.py
@@ -1,5 +1,6 @@
 from riscv_assembler.instr_arr import *
 from types import FunctionType as function
+from os.path import exists
 __all__ = ['Parser']
 
 class _Parser:
@@ -18,13 +19,12 @@ class _Parser:
 	'''
 
 	def __call__(self, *args) -> list:
-		if _Parser.is_file(*args):
-			return _Parser.interpret_file(_Parser.read_file(*args))
-		return [_Parser.interpret(_Parser.tokenize(x)) for x in args[0].split("\n") if len(_Parser.tokenize(x)) > 0]
-
-	@staticmethod
-	def is_file(x : str) -> bool:
-		return True if '.s' in x or '/' in x else False
+		if exists(*args):
+			return _Parser.interpret_arr(_Parser.read_file(*args))
+		#return [_Parser.interpret(_Parser.tokenize(x)) for x in args[0].split("\n") if len(_Parser.tokenize(x)) > 0]
+		elif type(args[0]) == str:
+			return _Parser.interpret_arr(args[0].split('\n'))
+		return _Parser.interpret_arr(*args)
 
 	'''
 		In read_file(), Check if the inputted line is appropriate before
@@ -35,7 +35,7 @@ def valid_line(x : str, allow_colon : bool = False) -> bool:
 		if x[0][0] == "#" or x[0][0] == "\n" or x[0][0] == "" or x[0][0] == ".":
 			return False
 
-		if not allow_colon and x[0][-1] == ":" :
+		if not allow_colon and x[-1] == ":" :
 			return False
 		return True
 
@@ -76,13 +76,13 @@ def read_file(file : str) -> list:
 								file.close()
 								return code'''
 		with open(file) as f:
-			return f.readlines()
+			return [x.strip() for x in f.readlines() if x != '\n']
 
 	@staticmethod
-	def interpret_file(code : list) -> list:
+	def interpret_arr(code : list) -> list:
 		int_code = []
-		for line in code:
-			tokens = _Parser.tokenize(line)
+		for line_num, line in enumerate(code):
+			tokens = _Parser.tokenize(line, line_num, code)
 			int_code += [_Parser.interpret(tokens) for _ in range(1) if len(tokens) != 0]
 
 		return int_code
@@ -91,12 +91,12 @@ def interpret_file(code : list) -> list:
 		Tokenize a given line
 	'''
 	@staticmethod
-	def tokenize(line : str) -> list:
+	def tokenize(line : str, line_num: int = None, code : list = None) -> list:
 		line = line.strip()
-		if len(line) > 0 and _Parser.valid_line(line, True):
+		if len(line) > 0 and _Parser.valid_line(line):
 			tokens = _Parser.handle_inline_comments(line).split()
 			tokens = _Parser.handle_specific_instr(tokens)
-			return tokens
+			return tokens + [line_num, code] if line_num != None and code != None else tokens
 		return []
 
 	'''
diff --git a/tests/__pycache__/test_class.cpython-38-pytest-7.2.2.pyc b/tests/__pycache__/test_class.cpython-38-pytest-7.2.2.pyc
index 9d89ef7fe25c2972246ec4ee6a9eeba43dc88f66..fdf57f5f60ee03ed6ba6c8430be90073ab62a367 100644
GIT binary patch
delta 320
zcmbPXJ<X0cl$V!_0SH#VG*0<Bkyn;cX`{9jBd=wORSQFuMhasvgQoRnFUAlFi)lbr
zB@E3BwG1hYDNHHMDJ<zMwTv|kHH_IzwM;ck#cd^w3z$+^Ynaj)Q`kV_X-o@QQrIV-
z7L}J}2g(7(7BYfq#)XV29CMh(7;2eQI8(SL^GK<OaQj7Z8B`b;BpMi)7#btkmQc2Z
ziG`6Fn4OktU}9imX<TFqbWxExh%f{Z79b)DMA!leP0k|2$s48JWsK$ldBp-if`O5Z
zfro*EfrY^jNb@li#cXbrbYWzSn_S2xJNdEH3dY#UJ<{!L@gVJ*n<Zrg8M$MC?4mdj
W5kJ{LR*lhNa=5G=D+>oR2QvVNdPSfB

delta 92
zcmbPcH^Z7Yl$V!_0SL688K?Z7$ScbzwNYD&k(Du+LDO<`5MzkMW>IN%M#k958~9}>
tN6D;UjG4?V+s+mT)S{`ed4jAUBU>zxT@*KYjhq^z-Q>%1cFgP?%m4{%72W^<

diff --git a/tests/test_class.py b/tests/test_class.py
index 8829373..792d623 100644
--- a/tests/test_class.py
+++ b/tests/test_class.py
@@ -155,8 +155,8 @@ def test_11():
 	assert func11() == []
 
 # Test file test2.s, need to implement JUMP
-#def test_12():
-#	assert func12() == ['0x00a00413', '0x00a00493', '0x00848263', '0xfe040493']
+def test_12():
+	assert func12() == ['0x00a00413', '0x00a00493', '0x00848263', '0xfe040493']
 
 def test_13():
 	assert func13() == ['0x00812023']