From d72a19f8f327c5fb8f8be2cf5b756cff58e1d761 Mon Sep 17 00:00:00 2001
From: miinjung <laura126@ajou.ac.kr>
Date: Fri, 15 Jun 2018 22:24:53 +0900
Subject: [PATCH] real
---
alloc.c | 38 ++++++++++++++------------------------
main | Bin 17824 -> 18024 bytes
2 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/alloc.c b/alloc.c
index 3c60061..e43fde7 100644
--- a/alloc.c
+++ b/alloc.c
@@ -102,46 +102,36 @@ void m_realoc(void* p,uint32_t size){
void m_free(void *ptr){
int index = *(int *)ptr;
int count = 0;
+ meta* tmp_head;
meta* temp = head;
int size = head -> size;
int break_point = 0;
- while(1){
- if(count == index)
- break;
-
- temp = temp -> next_memory;
- if(temp -> free == 0)
- count++;
- }
- while(1){
- if(temp -> next_memory == NULL){
+ if(temp -> next_memory != NULL){
if(temp -> next_memory -> free == 1){
size += temp -> next_memory -> size;
- temp -> next_memory = temp -> next_memory -> next_memory;
+ tmp_head -> next_memory = temp -> next_memory -> next_memory;
+ temp -> next_memory -> next_memory -> prev_memory = tmp_head;
}
- else
- break;
}
else
- break;
- }
- while(1){
- if(temp -> prev_memory == NULL){
+ tmp_head -> next_memory = NULL;
+
+ if(temp -> prev_memory != NULL){
if(temp -> prev_memory -> free == 1){
size += temp -> prev_memory -> size;
- temp -> prev_memory = temp -> prev_memory -> prev_memory;
+ tmp_head -> prev_memory = temp -> prev_memory -> prev_memory;
+ temp -> prev_memory -> prev_memory -> next_memory = tmp_head;
}
- else
- break;
}
else
- break;
- }
- temp -> free = 1;
+ tmp_head -> prev_memory = NULL;
+
+ tmp_head -> free = 1;
+ tmp_head -> size = size;
strcpy(temp -> comment," ");
if( index == 0)
- head == temp -> next_memory;
+ head == tmp_head -> next_memory;
}
diff --git a/main b/main
index 90eb02129370e40d37a4f7e2bd1d6f380ec0e167..b33515706675bf9b67bc29f1370cc11e86e34237 100755
GIT binary patch
delta 1609
zcmZ3`&G@2+ae@Zpi;0@cxmfrZz<`Bs;;nr`96VqS0|$=-n8Cp_c@^U=5hrEuy9K%j
zQ`Cg|n#-PxmAzi_d-moTOaY8c4BVSvF-tPD9pQFh*nfO7C%YBTPG$xM!%Kz-I$!R4
zI@zDyg7M<y4t6b$4crb49>)(lY~IE0z{vND+kt_<rH6rm!K3l#pUE7Y(TqPfr*O(J
z)_ZibGO{T!cytGFc(h(BNocMTU@TGc=oSF+*uXp;k8THvT?z~g3~8MLhxz3jKyLNu
z4&pF8>CqX;;nB(U`g|I{d<#gJ!J}IUq}=1U69<Toqzx*6oJAEZ!@$7sdPbV&gkX<u
z*$J!)3?9wZ91JDO6S}=cx`PD_5BPLDOYHjx@+Tt$1H+5f$v?Q%6!tMGFob&a>VoKC
z&(3e2omYJ{pL#UE;qW;4m-)r|$#&e!G%bGp|G$8Nf#Jum|Nl=gFfh#c{r`Ufi2n2c
z{|^QR29AIK|9dbpFjP$D<#A?Im>kHX&p2UnBab?x#^jYe`iwIs-{kR^-SOxD|4fh<
zpjd=~f#D7V1B1Zd|NrYIyYkMSEWqc$xMg!7-(n`FDNK_uGKy{H5!7R0d^*`$RGaTO
zHzZ1B8ACXkk4!ERHDkQEd9^4nBV)_toni`%Q#RicJH^ZxGkK|0B!3JW0|SHHCQgW!
z?8&^+v+L`i_A<_CVP#-YE+{EtU`*p?WME(n6%}J<U|>wQW?*38VP#-Y(FbueKwJjZ
zcn~`?k%fVQF-Y_$0|NtN7KjtU%D^D14APwqQnwJKtsSH^2gGF%|Ift0u!IX@{{@h)
z`W6W(W(EckHU<U>er5)S5RelY)Xp+7Ffev8Ks{#ycjG6J`C#k1LDqG%F)*kbFf%X+
zKvhb^R8Ev|U}j)g$Hu@Qrwx^>VPjyBXAEUDlm~?sD9RZa7&gz7$zu_b;bve^HDO@p
zv*Nbq_7rB4U|>+2tgk4}t1ioEC@jb*#2&#N$-UV{F@uqD)8@5G6^y206%&~`)0$bB
zm`l@G7&+|cGjm;IVPY<_VPRzE^8&G&SQt5^m_<G*ma{N3M>Vl9GOKO&R9VYm^Z=C7
z7#JA7L1`w2QU*aLh|5)>G)T+?%8p~2oUbEg@Eod~11ikO5CGF<ju1l9bXP~R9;OLl
zSAhsjmkd-F7ek@Q6qW*!DJ)9!VPY_M@G=x|uqnf(5vD_&%fwIsO0W<Plw^S#E5O9S
zpa>FUWB8;5DuL{w67EnMEI#=nqp%!I3(RXw3<VM}wgA)QyE>BG8Bk4=nHVN7(2x)<
zfbu6nX)Xrlf83Mz2}n#1(L1jNGf)C5YYe4f0R?kP0Mq1)yr!F7^g|dKw@lt>Aj&Mj
zaA5LA193)<$qx-gnS~e<Ha|4j&cwvPH+hzE9}@@9WGxdt#toArO_nomnapT<-S7Z3
zd9i@J%D}*2!o<KJ#K6aZo_H;x;trEJ&DJy4ZQg0d&dIoG@<Drj&Mi<QwoLwMZ_Wub
z@W5nC2Xii@GP}ybj57gRgePp?>2REh(PVO?vpJ)~<ekp;oNK{>&A_mCGNX$*W7cF#
z7kf@-4T!65O>T5C=e(;2;R#G;bd{g{z(s<o&U*4M7dyrelPz8CnJO$MSGlSI01Dtp
Awg3PC
delta 1406
zcmaFS!?>WEae@Y;!bHvGTvvD*z~Bn+#9RA>Zg7J+3^%wPz>FK*lUFg`5}9f2(!IuY
zS;apO<<H%|G84|Lzc{#g22%hd(*>^0ub3s7*`{ziFzlZ`nUmd$r<0k1!SIsdfzFrv
zwodkEw_sd2xr1Gcqk-Fj!Q=Qrfz7+v9T@peaXT>ZxAZVDFnBcnJTsYtGn(<l<`hmD
z#`<o4k8algtO^XRCrgA3FHP|1cHn5P5MXS+#9(=`^rJ^}1qVYZXE%$g00RR9KetD-
z1w+Zl;|>ChAhWt1Bz7q<FfgQb3LNH_Zvgor*rQwa0ILFnM{_j?Ly7W)Zf}w9U;)De
zKHbg|`_6%!4bu5y>+k>nK}sg;bIU8dV^UxU_2|_F(ZQab-#k07`e;7&Xnw=taqutm
zi~E!FxR+^W{QCcY0Rsbr#_#|CPcSerocR6!e*uX8^Z)-31_lO;fB*k`FfuT#m~6}A
z%os4akw>5Lz~qfQ>WmSSZ}R9fo|w$Z>o5D_&;S3KAa_Es2m=Gd9R>ylhrj>-drmIp
zojrL2zrkbyJ_p8@&4GN2nV3?TCSPO}+sq@V$HKUEvbCr--*jkX$ufp;GEbRYB5KCC
zaPw+WUPi{6$vedq7*jUi5<A7r7&3XOR3v{08v_G_+$K&){3cK4m7ZPi3ALMXP7Nyq
zgK|Mh5d&iyHzNZBW2lN4GXn!-x-|m>17nb=K8TY6;_$FCFo^yHiDo9UFfcfSxXK_M
zSs>X;Rt5&uc97z15SKyiKNADP9xjNT&;-Z8*e4;y%)qdlwVr`Nf}fdz;V~=79qMP9
z7#J9*T!5-J0f~X^nez%{2iVG~AS<QV7#P$Hm>C!zKvhb^RL+)gU}j*jWn*BF`wf*V
zVPjyBXAEUDlm~?oDAu8hHPSLmHm{ROW3gb8U|>)+VPNL7;<o1Y6qey;U{I4~G!zzO
z6k?Cyj^t)wP}gI$mxRcJ1RW%%J4rGMZ}w5lU}Rjld8<+dql&OWWw}p&5HoK{KQnh4
z3lno<2@4~$8i$QyISVs$Kobiiv%%&hm9-qQk3gx8fq~&YlxAWum=9zBpS)j3O6Db0
zhL;KARz`*ZekfC6a+j`DI7|Ud8xuo;2#oz7s+os@xkDfUYyg`wC~bk6FhT}uo(7a=
zWB4S+Gx;K;uq;eQ0V>19P#^(gYk+L$vVh7YGfhs=loWM<a+9Dm7X$M-?#cTEBqra}
zJ3n~?zv5;dgAhi>mdS~R;*1j}CmM<}3o_gQ(?SdelP4OAZr*3Oh>7U}@8l$tKBgPo
zlRug0F*ZzAG+oZvGWn$Gb;b#k7n+GnqNfW>CI$u}20jLX$rsJmGkR`rG-u~zY?|EZ
zpwHO?%@-|`4?380PJr?zOlEX6=RzvroE*(K4R|1F(_nL><8dZNoyndq=8P7T8(r)<
zmnuR+Yt7`7F6NAZlNnv@IbW$m#4;y)x|(wa>p^%ICL5XvPoCqd!nDn5@*!6{Mvcjg
RZuVRo%puZj%#*!r<p3VgK*Rt5
--
GitLab