From 96decefa64cbbf62aa79d3c6553fbe3229add5c3 Mon Sep 17 00:00:00 2001
From: Sweet Bread <glebzaharov1@gmail.com>
Date: Sat, 12 Nov 2022 19:14:56 +0300
Subject: [PATCH] string.parse_int added, fixed print.int

---
 README.md             |  42 ++----------------------------------------
 dnstoys.o             | Bin 1264 -> 1264 bytes
 examples/HWA/main     | Bin 8828 -> 8996 bytes
 examples/HWA/main.asm |  31 ++++++++++++++++++++++++++++++-
 examples/HWA/main.o   | Bin 652 -> 940 bytes
 examples/HWA/makefile |   7 +++++--
 examples/file/main    | Bin 9296 -> 9280 bytes
 examples/file/main.o  | Bin 928 -> 912 bytes
 examples/network/main | Bin 10456 -> 10472 bytes
 src/dnstoys.asm       |   2 +-
 src/std.asm           |   1 +
 src/string.asm        |  42 ++++++++++++++++++++++++++++++++++++++++--
 std.o                 | Bin 920 -> 924 bytes
 string.o              | Bin 416 -> 528 bytes
 14 files changed, 79 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 1af7a28..a503098 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,6 @@
 This project for me just for fun to not spending time for routine operations
 
-1. std
-   - print
-     - str
-     - int
-     - ~~float~~
-     - ~~hex~~
-     - char
-     - bin
-     - nl
-   - exit
-2. file
-   - open
-   - close
-   - content
-   - ~~size~~
-   - ~~next_line~~
-3. path
-   - filename
-   - ~~join~~
-   - ~~is_dir~~
-   - ~~is_file~~
-4. string
-   - copy
-   - len
-   - ~~split~~
-   - ~~replace~~
-   - ~~find~~
-   - ~~parse_int~~
-   - ~~parse_float~~
-5. network
-   - get_ip
-   - IP_to_str
-6. dns
-   - send
-   - get_field
-7. [dnstoys](https://www.dns.toys/)
-   - myip
-   - ~~weather and other~~
-8. ~~http~~
-9. ~~json~~
+[Wiki](https://github.com/VerySweetBread/asm_libs/wiki)
+[Examples](https://github.com/VerySweetBread/asm_libs/tree/main/examples)
 
 <sup>A lot of shit code included</sup>
diff --git a/dnstoys.o b/dnstoys.o
index f1b559d286930ac5adfdff9693b9b67cc87301fc..8af284ae14fa6077f594a64c428f165c51ffcd61 100644
GIT binary patch
delta 13
Ucmeys`GIpo1PdeE<Vcq303>+?jQ{`u

delta 13
Ucmeys`GIpo1Pde6<Vcq303>Aui2wiq

diff --git a/examples/HWA/main b/examples/HWA/main
index 0bb9c714495cde572f2d05f92a2ee5516a92f8f1..fad9ef8962f16c1e61c0040066313926209fb3e9 100644
GIT binary patch
literal 8996
zcmeHN&r4KM6h6+3`FvSg7z8eQE`m@IC!{PUNM$4_!Ia7}9Y%dN);P+{jg*95jDbHk
z<+?@m2ULp|>J$iy*usq~%S{_;;zbY{8ZGQQ@6DTeWs6$1xd-mM=R5cOxbxlBy>spb
zFEr)l<&h&E@{)xf`jlE2UzOV{wWN`cj!_{g_BxvlpTgrMR31LIm5{xTnUI6WO%D-|
zeD}Hr@C54^6;OG&<EwzHUicIqP>Jy#RyeN|$$(@)G9Vd{3`hnf1CjyBfMh^2AQ_Mh
zNCy6ifyiCBr(1F5Pk)4F!w+nG$B?h*>Bp??XKfnVj2E922F>#2d~Pqa6=TV$<ePeg
zP3c=OManrK%$j9;h7#?`d9@|I0b6>MKLOYvmnJq^+Ag+UzB1XYjPI*Mh8cbeNb%|{
z!#UPaBcB0H1$`4iCDe88YDar#a?!Vtjh|{({HsRb010n{xs^+@V(f~!siq(7?CiK=
zgLtP%;gy1t+n&*at*@>ARdcf?#U<MV9#P<{8TU4tn-MmoClEWs+Nm{Bu++Fi=gn`s
zYUK8X+-gciZvSd>Tiumi&1PTnl3n1~-xQc(Ui|AThKs|gV9`{k;(ucV6cUA#rOJ5e
z-g@(kwYj1!Y057@+`n!F4uiBtb8Dj0VfHtVS+3O=QOT&Q87(&IPTf%_4;yApU)x#p
zlYib`?&wSYP=#9j{OzqbYTlapId@PC2$v!mkPJu$Bm<HG$$(@)G9Vd{3`hnf1OJVI
zb9yv7sNETiM|;av3dV#U*F;3uVz&pn_4sLxv`Woiqn*+IutUBPUVmi&KYx%s#4iEl
z!iNCAXR((w;AI!)|MV9h=HgEPkGXIYu+>9==^(la>M>W~&duf$bQ3gVE}M4Zz0?J~
z?TWtv?DmfVx4YsKz^}9W!PS2#-X9ay7#Xd*KSl`w<BjU5o>hAWhek3ESj=cWk#L+s
zq3%Q?ln~*#aN>r-@q`}ArHn->r1yqJ7*nj5^x=L%RGk<Z5aDjjB5u!-tR{M^g+45-
zHQtB~PzRg;OF05RJ}aw#g84xY#eG+-)pr40=JMln7=vE}2WG_aI|}UN<MUiTK=jmc
z!tD4JLg&XKepIn~Jv6(|gCUFKcN{t&D*N(VQI%%*djMME_;F1uSH{kM@1Yl9@EZGZ
idx%pPswG9`M8gii%)TtxwpG&t_>95tqysQJem?=U%21U6

delta 545
zcmY+B&r1S96vyA{`m?ph)D982vk`<KX-O0a35Aym%;*=`UF=kND=6rqp0qhcm*~);
zAV^PHUW&+Dm;Qwa7Ca`@L9q8+G8=fa`}uzNJF_$IGTvG!s-7r^&WL~tGK_;AY^ABN
zH7fyRrBY^i%!M|UOrJ3TH0S}WEZeC_Rx8)r16wAv^fSctK2G{6O$9=@knQ>sVaJ%I
zC15T8kyu?xu5T2U?Ku~%RHZFyWZn}#(A(=#-NM8z+Z!QiGiu7(<WSB$-)N>u(DUtf
zyUN75+b>dXPw@ELd0_kcOorbY%|y+JIJ=R$8H`lmHx;Nn7y3_BrS#-Ir0tZFaiBpk
zK_7Ct_{TovY!Ca9BRxEU3|*EWfaoe4d4|_FjeOPhO)&T0AA&dvp`O4Z@{W+WDrPtr
z86FdNJSg6|Pns0Fnnx&_;-DXhU^`-hqmt6Rl8Zdw7-p$8W-Ph}rec>msT++sh|1_#
X#f#>*JR&88d(<OZ8nZAC5Fq*i?1^rx

diff --git a/examples/HWA/main.asm b/examples/HWA/main.asm
index 56e42b7..561a0db 100644
--- a/examples/HWA/main.asm
+++ b/examples/HWA/main.asm
@@ -5,6 +5,7 @@ extrn print.int
 extrn print.bin
 extrn print.str
 extrn print.nl
+extrn string.parse_int
 extrn exit
 
 macro nl {
@@ -13,7 +14,13 @@ macro nl {
 
 
 section '.strtab'
-str1 db "Hello world!", 0
+str1 db "Hello world!", 10, 0
+str2 db "Enter the number: ", 0
+str3 db " + 10 = ", 0
+
+
+section '.bss' writeable
+buffer rb 11
 
 
 section '.text' executable
@@ -28,6 +35,28 @@ _start:
 
 	push str1
 	call print.str
+
+	push str2
+	call print.str
+	mov eax, 3
+	mov ebx, 0
+	mov ecx, buffer
+	mov edx, 11
+	int 80h
+
+	mov [buffer+eax-1], 0 
+
+	push buffer
+	call print.str
+	push str3
+	call print.str
+
+	push buffer
+	call string.parse_int
+	pop eax
+	add eax, 10
+	push eax
+	call print.int
 	nl
 
 	call exit
diff --git a/examples/HWA/main.o b/examples/HWA/main.o
index a224c4793cf6580aa17d49ca65c342688077b7d0..3f8681f615a171dd864ad3fbcce9b96168525212 100644
GIT binary patch
literal 940
zcmaKq&q~8U5XL8|TCE@|c+i8U;-M-;1uqIcNkv4V7ezc+8oIQBG%d-B5fLlCf(IYN
zqkk@*y!j3ueF!1Wmu%WJ2M2cN`|ZxoB(r;0Ioj7WjS|x+M*|{y)Z?A)$dxEhV{{-K
zr(;}oJf~4CP{ozPGh|B`?q%B&-mXE$y0NuslnrX#@UfrYFbtz9i^v&oOeN|i$Lbv$
zubAE@dHU*o_BcgIEiA<cihb2zJA3#jR0qW(#a~OLj}jq|K29_T&x;F+m)PU?SHO9q
zRmG;_GMIaCsC-rV6SaR1=JPeh4YhBBCy0D_t{=d2{ag3~PZ^s@F>YXfh;>>X;vAJy
zJj-{sk>Y9AI~m@~@NtGuGu+HDnf`TK)-CqZ8}gR#lj#Y^lp>H+^JU$W)b(svnmm-U
zY*#5hu9WK#gY7oWZr$@m4bdX7WvcT35<SCPRZo=gM%PkDMwCV`x%J$o*e=-NJtUUI
zp~uLFHv>c5eWc<kiCbjktL@u2t0x|O%~1`+p<epi7%AX|XZFaC7!2GMawXr!l1ltT
K4umq~f&Br^MT|}W

literal 652
zcmaiyy-EZz6ot=>u0M#Nf`x*pXrUHUh_xuFY+++#E4w)0K%A9qz!eK$!3Xd$d?+76
z7|+RM*lZdv+?@O6-u&m|`t~NvGIW+<4pRcY0-X7RBP^hYere2T?{#F&<366=nfdu`
zn#MONYS=XEBhCTj^T3L95!jUWfbGD$RBh={%;MwFUr3kOB(@&0cE2;jISwM;K#r4$
z*BG~FYdgi~Nxq-(UBW2FZ_jQpq&hpJwlsw+Ck_u|H?R&bwyIr057DryL&T9Gstw9X
z<)StI3w3@yQyvO+p4AXbc-7u?FRIi1%P#4sK5Cn;Zi~1a^=mH|bmg^%RL>BvNyIn(
Zlg_8)FKX*_pPEbD*%b%gcR<xVvOjBsPz?Y8

diff --git a/examples/HWA/makefile b/examples/HWA/makefile
index e469b7f..0adebfc 100644
--- a/examples/HWA/makefile
+++ b/examples/HWA/makefile
@@ -1,7 +1,7 @@
 all: main
 
-main: ../../std.o main.o
-	ld -m elf_i386 main.o ../../std.o --output main
+main: ../../std.o ../../string.o main.o
+	ld -m elf_i386 main.o ../../std.o ../../string.o --output main
 
 main.o:
 	fasm main.asm
@@ -9,5 +9,8 @@ main.o:
 ../../std.o:
 	make -C ../../ std.o
 
+../../string.o:
+	make -C ../../ string.o
+
 clear:
 	rm main.o main
diff --git a/examples/file/main b/examples/file/main
index 3c10d90a01dce976ce543f111aa3ec45f403197f..30355a7e92ccf3555a699577fb1f0b4a574a12c9 100644
GIT binary patch
delta 567
zcmX|8JxIeq6uwIvjH1~1M+QS%BPcFbsf#!?wn7Jm3{_j4R4R%s7O}V#thm&6P&pU1
zptY-m(k0bJ7q^O|AP8;|2M68bdr9=*eV6y$m+!rI_Z+>C9{OnE$iFPBgb)lj1o03;
zVT<@6uH8c9rjlt7G+(#{qsS3r)DgB_gjDg=978lRNS-5{0szTWPZy1_IZtM18U%U@
z97{5O))N4Y{Av&#zd#+oi~(b21>@by=A3NFG)?0PsD*+&3tS})!0{;NcocCw(i}f;
zVH~ik0ciR?6dQR>+~OE}Y)b6uiUMy{)QoX(9C<CuF}5K}^XNcdLQq{Z+ME;g2F`AG
zUqUgKpf4pE{cQ%zfk@NgCY;F<rEYAok*`GAn|LheAkpzk@34_NrdCUh{3D-Z2OXQe
zNW~|(ttNM%;0k~KtRi9T!{B<3$(<puEok`{Ji3Uj8T!+BYiFIwRw2E(o?KZ=C2Nvz
zkW!VY{$WuCGbjuX+C;LjmutKJZ%RkmjN;|-`h)C5QF!Z-*@H4b%j^U2ii!OLQn-(h
LN&MScI0CL;2xF#T

delta 583
zcmX|8JxIeq6uwIn45HXrl?aBmR#05p4lbggwL-@fi&k{-r_l(CwXHab1sD4RD(4_N
zXmxc^x}@sh<W_N11i>xf;GlbaFRdQD@AAI;^1b)&9wN_?0}nku^e!q<LI?&AL7aq8
z*kT@tYhH}ql#(rh&U0Qg^Bf^&1!2oU$R(ay1Bhl4$uoo#03g|@vyH~sq%*lQ3j$*m
z919A5R#pJ2Sv`!7U!aa(B!ICtMf1bXmg?DpWm)DEP&0dq23%<yfD=&62`J(Oq&Z>P
zMjh~S4nQ>?pjhy2`WDC7W#dvuTO4@1qG}F;WAH7nB-pwnPoV>S8G-7m*<3$CZ{TX}
z=42FO3Hnk{(7(oDIS{D^+(dn{=|VfUSk0E=>|HuiijWw1rFYm!1yj4FYW7hmvi;Un
z7gF&dF4MpV_8eoMKROa-4hA=hOmU64Yl6mq!J~uJH2r@Xclp$%HOYQ`eNFSHw=^xY
zkkaN8ejPwdrOTqHkJ2a$di_!q%%Kr@;0Ce@`&D_v`%P(x4g1^zK1Z14d_KW`bavzG
YrC00~@Sf40UU{OMkP!Y|UpNx3U**8BdH?_b

diff --git a/examples/file/main.o b/examples/file/main.o
index 339c0e40d75da6acb7f1f3cf9b6bdc2cad21791d..b5708107259478024dea1db98d40b9423cc7e406 100644
GIT binary patch
delta 84
zcmZ3$K7oCL0%OHQMPZKI#O&0x%$(GTKGuw!8#`>67>y<$Wm0BLoBWbV9Y_i?t23UN
YYzZV|CMPnhOYkr;Fk~_y03(zM0N0Zd%K!iX

delta 100
zcmbQhzJPs#0%ONSMPUj3jQreG{o?Y})RLs4)Wj713?PwOR6Nnfno)9Ng$)y<)8ws8
m%8X@`Z!)O^Nk(RM#ygWWfn?6)KxTCb872mXOa=sCgfap3Ll@-$

diff --git a/examples/network/main b/examples/network/main
index 029ebba069fe2487f38407d6864355f0cb5cfaad..ae1ef0f8b6f16ed2fec29e93734ed00cc0485439 100644
GIT binary patch
delta 608
zcmcZ+_#$wE0^^Q}ip{Klm>C%UY+TvE&uBGSOJJrV`}fa5hL>J{3D`Yh0}Drl4O0m_
zi$Mpo^Xo4eAb}U1lN|+BCKm{BO%@O|VAKNgbSD=GCJUbiN@g4e68}p%UUV=pFl3yb
z{7le_al>RqAzL6BFJvk)Ya<KCE+(Md*@hi#Kq~rdL$@o(&SjI=2-$LgB-1*1XH5Pm
zB;`2;$k|cI$iUDo3u5jBNg7^C>lU2>Wb6ZKW$3Qu3Ee9IHY;`q&<{|R-M#|dp(0T8
zftojm2*2c!uh|TA+zFtfj18NBtO^iUaRJabLZANs&)6_IMj?FS1%b)alrBxYz`nUh
zQG~gkV<HO&Py>Sy0~3QRkX|zZ!B+?J7sBP48H|AZtjREWRt5(kzW_<z2gpAH=d&<G
zgXEFSO9k?CCL#3aF)-9K7$7OA11eyE^BEZ`f!y8=5DfwhTnw#1{t~!66GI=G{8S*n
zXA468EFfP6=zkyu^dKk0av+@!cOWo^@+QwymF6rc%FHX#OUlffyhF8ZvZq@6<nwB_
nj1HT5)$JJ>|4jDPP-g6zT&SVWx<(ZkK$GVJ`4N*3YKQ{>kM@<A

delta 608
zcmaD6cq4Fv0^^E_ip{KVm>C$}Y+TvE&uB4OOJJrv>-Wz=ufGNCp0I(1Bf^HMgq_8p
zgW37@mkf}=i|)x!1mYNVfTRld4n_tB2E*HD8yFZS7YHT`?*=N!*bF58mvX%50Lo?T
zp8QPEigCeYMIl=t882ii(Y29<V;2)p?rg&jHXs#!wxQdVW9PKVYlLh$K$2;lyd9H2
z3Q2jk069AffmU?Of|xr&l7^Skx<xyHjD0|@4BfRnp?d|uX2tFR`U0x5+gG4FR0L{1
zQ1j*x;g>w}Ih%owI{{Rbv0xLBl>y=^E&%#S=+poI84D)ID1=X5rgUlI1@_Hz6h)Zp
z*(S1Z097*xF)%U60_lZtJ~M*`ke@XfCeO-X2ILnY$vXl0N8o%GhCq<~1ekgzhG-x^
zXA+Fh%8&x&8z9M-Ffi0JFu(;E8S;S&dVv88q!<JkxEQK|^b)u{6GID{d^eC^vjw4k
z0+6o)^em79dWe%@E|5-zJCKQC5s<$I$vlR<$?H_5Ctp@=<tix3%q!7L%FIid9In<e
r`GJ}Zqupj%b$dp}H<M#Elo@L#H)^P}&QWDxSUY(wkncJ9qJ}sCFyoaN

diff --git a/src/dnstoys.asm b/src/dnstoys.asm
index 84c9786..e12e77d 100644
--- a/src/dnstoys.asm
+++ b/src/dnstoys.asm
@@ -19,7 +19,7 @@ response rb 200
 DNS_server sockaddr 00,53, ?,?,?,?
 DNS_request dnsreq
 
-section '.dnstoys.text'
+section '.dnstoys.text' executable
 myip:
 	push 0
 	prelude
diff --git a/src/std.asm b/src/std.asm
index 77a256c..4ed241c 100644
--- a/src/std.asm
+++ b/src/std.asm
@@ -121,6 +121,7 @@ _int:
 
 	push 10
 	mov ebx, 10
+	xor edx, edx
 
 	@@:
 		cmp eax, 10
diff --git a/src/string.asm b/src/string.asm
index 4d8488c..604e95b 100644
--- a/src/string.asm
+++ b/src/string.asm
@@ -1,6 +1,7 @@
 format ELF
-public copy as 'string.copy'
-public len  as 'string.len'
+public copy 		as 'string.copy'
+public len  		as 'string.len'
+public parse_int	as 'string.parse_int'
 
 include "../include/_macros.inc"
 
@@ -44,3 +45,40 @@ len:
 		mov [ebp+2*4], ebx
 		postlude
 		ret
+
+parse_int:
+	prelude
+
+	mov eax, [ebp+4*2]
+	xor ebx, ebx
+	mov ecx, 1
+	push word 10
+
+	@@:
+		cmp [eax], byte '0'
+		jl @f
+		cmp [eax], byte '9'
+		ja @f
+
+		mov bl, [eax]
+		sub bl, '0'
+		push bx
+		inc eax
+		jmp @b
+	@@:
+		xor eax, eax
+		mov ecx, 1
+	@@:
+		pop bx
+
+		cmp bx, 10
+		je @f
+
+		imul ebx, ecx
+		imul ecx, 10
+		add eax, ebx
+		jmp @b
+	@@:
+		mov [ebp+4*2], eax
+		postlude
+		ret
diff --git a/std.o b/std.o
index 957a16c2477d90b4031aedbe7246a30f9074bf3e..82b562a6edb0d71c9023f148885942ed0ac0ce3d 100644
GIT binary patch
delta 95
zcmbQiK8JmR0^^#AivO4lFHM$bRA<zf_(ElJHX|n!1H<GJMgy_m3=9m6j0_C?Kn$WK
s!Sv*POk$HSFcvUcPIhEE&FD0lmsy#yVzME#I^%)Kkw7wFawD@i0A;EcRsaA1

delta 96
zcmbQkK7)ON0^^E_ivK1nGO9CbP4;Beom|0aAo!Dkfq{{cfq@r@LA3bfos8X#=968S
lPBS`87GzdtESYS|tj@S+axAmDgbxz~Lo`qa3;;EN0RS%X5sUx;

diff --git a/string.o b/string.o
index 8fd560a9486fcd1ba9ddbe0b00e946503cf03bfa..d6117586a1485a17773daf6fdce6cf6b9412c50c 100644
GIT binary patch
delta 167
zcmZ3$Jb`6`0%O5M#Wc6j&Zhyvfk9#6-L4#lw|6o!FfgQLa4|Gk7}W4LSXh>GbxAb5
zHb@J0c>Tuk07N=Et@$@s2^atRo7pG17;n6O*XcU3PHN(GLsnCu?%;`g9R!L?iZb)k
z^$HS;ic{k=^GYT&GOAA&U}TxB!6?GGXtFJ%GV2YX+JMQajLH%kKug_#JQx7E0R#YS
CyD!xM

delta 74
zcmbQhvVeJl0wcpj#k7gn1Sh^Qn5@BQI=P5ZZE^!6>*N`XB8<V4*D@-zb}%q7I846E
Qs4Q^;$T9_D7+{1l01lTAzW@LL