From 9841b6e8fff7fa6a2f19df2902b9cd8b96c4a0e3 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Wed, 10 Jun 2020 10:02:22 -0500 Subject: [PATCH] Bug fix I don't know how this ever worked... --- include/bh.h | 8 ++++---- onyx | Bin 103328 -> 103344 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/bh.h b/include/bh.h index 8d3f6a23..92461df0 100644 --- a/include/bh.h +++ b/include/bh.h @@ -375,7 +375,7 @@ isize bh_snprintf_va(char *str, isize n, char const *fmt, va_list va); #ifdef BH_DEBUG void* bh__debug_malloc(size_t size, const char* file, u64 line); -void* bh__debug_aligned_alloc(size_t size, size_t alignment, const char* file, u64 line); +void* bh__debug_aligned_alloc(size_t alignment, size_t size, const char* file, u64 line); void bh__debug_free(void* ptr, const char* file, u64 line); void* bh__debug_realloc(void* ptr, size_t size, const char* file, u64 line); @@ -387,8 +387,8 @@ void* bh__debug_malloc(size_t size, const char* file, u64 line) { return p; } -void* bh__debug_aligned_alloc(size_t size, size_t alignment, const char* file, u64 line) { - void* p = aligned_alloc(size, alignment); +void* bh__debug_aligned_alloc(size_t alignment, size_t size, const char* file, u64 line) { + void* p = aligned_alloc(alignment, size); bh_printf("[DEBUG] %p = aligned_alloc(%d, %d) at %s:%d\n", p, alignment, size, file, line); return p; } @@ -407,7 +407,7 @@ void* bh__debug_realloc(void* ptr, size_t size, const char* file, u64 line) { #endif #define malloc(size) (bh__debug_malloc(size, __FILE__, __LINE__)) -#define aligned_alloc(size, alignment) (bh__debug_aligned_alloc(size, alignment, __FILE__, __LINE__)) +#define aligned_alloc(alignment, size) (bh__debug_aligned_alloc(alignment, size, __FILE__, __LINE__)) #define free(ptr) (bh__debug_free(ptr, __FILE__, __LINE__)) #define realloc(ptr, size) (bh__debug_realloc(ptr, size, __FILE__, __LINE__)) diff --git a/onyx b/onyx index 89915f0778d2b5e529900446753f71b9bda5a197..06d26eb9bcc8f97ada3f63de7a387f4880be23ff 100755 GIT binary patch delta 2462 zcmZWpdr(wW7(d^Iy@EUzmWN2jBk=)<3kidS2y38=qT%48mKkP@h~{Ks<0HJh7Fbq{ z<)rIlRhnS}oiVjl7N7Y9tqlT7pI_KWKSE>8Qe&>7rzTfwK=WIh0 zzpsg}8x4;vk+%kqC`95nqR_5^Q{caOtZ=pftu^?8Icm$2XmX>)5Nz+}mW8NW3J}uQ zdZmgYrPrPxK3fB2_}I8GNWeG8wZLw?F+Kw3;=}R1t~t{X!Z8WK_Ol7S9 zqTPE^s4Mu|$4+kd0zK}_356H-A+xTGjxcAODL(<_UHztvGkSAIyWX7UV>(4ot;ZQX zz3E&x#;(O?*pKUqi(npBt@{{MxM1B@7>iwm7)Zl$LXf99qf>_I#J(j%APO%KmO(!5 z5On`{=Hkeb<*)&7D_KAZ9FQ{)u(Aq)W`)2<*uS)rcD$`L3T(KobZJ=d4noeKHt0=v z^`_#hdeh1dli{K{e=T?)v0)UMV!x} z+l1(Aji{dr+UyQ|vtqbU)NaujOC+NX`x>=ApZ+2mJDibboNbJO_whPoxR1BwLeBUx zc&{;eVc$tH{xhes>@)*2cD)p>X-K|5kWdj9#<}CwOV6Uo) z9!C^C8Ru4o$6`fSGYqq_o%LWw>XtNDb;}7;8^u_m#N6+~O;wZPBNfB;E*70Z*JSLV ziT5KY0y~(InCYto7U4ImQ%C;jC9{bV6Q_66*_2S$huy>rd5Nv5371u8c`Q^yTk*B( zkoVFqvq>1`4NdD5Re38DBvszW_!FX6-ZA-BR2!V*@x4U|UXU7)cy|-KYU)t*SRL}W zZgy5}N^(3xy4+0D&pJb<>8Wm(&h)~duZ6`$R|{OZI9e~$4gj6F9One z`&4r8dhsqRIL|?DXc#p;p}hywYu8E7il4j8+@jx~j`b4tcMtI2QT*}Lzv(I=h3r8n z`1v5?&!YaWYb1nN1^}#A0E%e9OuVZ(6l(E#`rC?onx{aQJ#N=SS1zc={?>P0gSfs} ztm6Xh!7UAm&}To=+o}eGz38PUaET^d);|Sq;0yf;Ft45r=f+jz5hMam%4|3 z1x_Tf9TBO7W{(L76hmT}!dcSBI2hD*UY(psE4o;Y3NftKZyVJR=y{Om`%9z>g&X6* zPdLbju{;+`vmhlNiR{%QmV`Q$}3!^N^$(1s47(5*ZlO_4cEo^~VC5A*y| zQP*oj28;S|Nzc~022lMt&oe|yO?!h;`$5*zW0nf}%MhHD0q1DdVF_EAbGMB=O`dxhQrh<7t#OK8d2TPrTPug3U<#miA;E z$V#9&18Er@ z5prHZJYyT0#jD)Jjb%!M$dyZGM{i~uUBp9su?U8w$$TIKI5#+7<}g)SU?~p)&Y@`a z!4zS!dDGJ2dPPeF46ya7t~^njRJp1&IHK!POBo&ryJ4>v74@7KeO z*UtXdz)VPS#u+kUEj#)hwf>X|$DqnlHx-_QILa483eflLI8_KU25~+$4$bHA7li-! zWk%39ra@k>Zk08%2zIi>3q{Zd?#jz?Z21BNF1*1c%^+VAsGk0Bv3%v7I+9jHD8MS~ z+%+%?4A#;$@X%ek9gfv&;hYApSalmfJ2CPJn4 dP(7qltmjO0Taz%Px^FSjHPLUTwRAm%{tGeM9nb&( delta 2396 zcmZ8hc~BEq7=Pae77!sAkgFC%tqK?uE0&_7M6qrV7^x>S4#kcLRO+Y`wH~+;OkhQ< z;nfC@3Z1c|c50#Q454!9s0Fo-I<)nwtvJd|s8XF4wbttPz1?g)_K&>xUBB=59WRZC z*!n~4uCdVLh`%}LVKI`whsB}}PC{5hQuAqd_3^@QLR*@XdVag=%BZUq-OS1ut-S~# zt~y97AF1Do1#ydXunxCR91d^d-zPT10lYhD6qxX_q<$a69E7lbQndKPr2as#V$qb# z{Fy2S&xrK_Uvd009l@<;SfFa2`L}S`wCVK$6a$TEGdtoKSj|6V_f57KmkK;S79? z_iP&-y2m)7SJ41<9p(>Ojt2Vcg*o$7@ zIk=-DYH)*B9&-!du9y*6;8k41#>$w$EU(;%b1SEh_VdcidnkOCn-p#(B#-&a3v_|b zK*SxDnS5Q4%4^^zEm?M>=I$qQEwx^6}c(ZFGZ>HZ~ohzqK*{nigeNr>;ms$h6QbTsAE* z3lB~6O~QW*xN7|pqMnx-|BNfY=kNYNydb>I;xwJHY1e~*lw)p5I!G3>tWT0olQZuR zNxDPMw!4z#qa$$lBxw{mzv!2wbaD>-B}vQ3xlD}Tdpn3PVF(FRaEP6m8N_M|nZbVk zXc$oqkX{9o9Xvxxs&?iSHOuxe()MOzzwwIwir1b*>}#${QXYLBYP=>FRQ&nG-gr%l zk!-I3SiJxi;xH5+IUEZ)_$>LY#C?ZnL!&t1$bBEiEr=t&?eSw;jo8G5i_y*X$34Vf(o1=CG$5}-+aQXy^Ll@XbELW zKG;8+v?ih0g5U-lPw$MQC^00ASnjg0tX%OzzW%d)5sH5tN%Y;UjtcL3kmPb?BrAy? zH#A&!F;anXq>Xb?sBTs}C7EQ@INEqU&Gpl6ErbtlVA<G~4BU?qa@RlvoD23kuS%ZAF-JNU$-QABZ`g{G|vYh*k~ zJ5tN~(j3ouMJsOzxx)Sjp=w8J*BaDG4r(+}B5Abe+OV|WmI{3<&vl9%1 z+#WEJZTn8>)Ihg0rv{Rlr*oX!YhW6zcb=_*=}_bhz~s25 D2tf(& -- 2.25.1