cons flags: fix wrong alignment on 64-bit platforms

Sigrid Solveig Haflínudóttir committed 3 months ago

Commit fb512ba1 parent 13e6bd84 files · +14 −11Browse files

Unified · Split

4 files

boot/sl.boot +7 −7
src/print.c +2 −2
src/sl.c +2 −2
src/slpriv.h +3 −0

@@ -706,8 +706,8 @@ caaaar #fn("A180<<<<:" 5) caaadr · 705 unmodified lines
706	706	#fn("A180T<:" 5) caar #fn("A180<<:" 5) cadaar
707	707	#fn("A180<<T:" 5) cadadr #fn("A180TT:" 5) cadar
708	708	#fn("A180<T:" 5) caddar #fn("A180<=T:" 5) cadddr
709		−#fn("A180==T:" 5) caddr #7=#fn("A180=T:" 5) call-with-values
710		−#fn("A2805086B3B09086<C:08186=z2:818661:" #4=#() #(#6=(values)) 7) capture-var! #fn("A2DIb6862086>1_480F3G86<8187E5388;JI0421875180F3228781e152p4:" #(#fn("A381J50D9:8081<C5082:90<8081=82KM63:" index-of 9)
	709	+#fn("A180==T:" 5) caddr #6=#fn("A180=T:" 5) call-with-values
	710	+#fn("A2805086B3B09086<C:08186=z2:818661:" #() #(#5=(values)) 7) capture-var! #fn("A2DIb6862086>1_480F3G86<8187E5388;JI0421875180F3228781e152p4:" #(#fn("A381J50D9:8081<C5082:90<8081=82KM63:" index-of 9)
711	711	#fn(length) #fn(nconc)) 13)
712	712	cdaaar #fn("A180<<<=:" 5) cdaadr
713	713	#fn("A180T<=:" 5) cdaar #fn("A180<<=:" 5) cdadar
@@ -732,7 +732,7 @@ compile-begin #fn("A483H3?070808182DI64:83=H3@07080818283<64:708081D983<54471802 · 18 unmodified lines
732	732	emit pop compile-begin) 9)
733	733	compile-builtin-call #fn("A7DI20868580>3?;4217285D9538<3I07383=8<52J=074858<52@40D94858=25CP086El23=0768027F963:7680858663:8=28C708;60:8=29C708;60:8=2:C`086El23;076802;62:86F2l23;076802<62:7680858663:8=2=Cp086El23:07485K62:86Kl23;076802>62:86F2l23;076802?62:7680858663:8=2@CN086El23;076802A62:7680858663:8=2BCM086El23:07485K62:7680858663:8=2CCP086El23=076802D2E63:7680858663:8=2FCY086F2L23;07485F262:7680823702G@402F8663:8=2HCd086F2l23;076802I62:F286L23@076808586F3n63:7485F262:76808562:" #(#fn("A090El23:07091K62:7192919063:" #(argc-error
734	734	emit) num-compare 8) #fn(get) arg-counts length= argc-error list emit loade8 < = + load0 add2 -
735		−neg sub2 * load1 / vec loadv #4# apply tapply aref aref2) 12)
	735	+neg sub2 * load1 / vec loadv #() apply tapply aref aref2) 12)
736	736	compile-error #fn("r0702180Pz2:" #(error "compile: ") 7) compile-f
737	737	#fn("A270218081>22262:" #(call-with-values #fn("A070909162:" #(compile-f-) 7)
738	738	#fn("A280:" 4)) 7)
@@ -938,7 +938,7 @@ top-level-value print-pretty print-readably print-circle that #fn("A090I04 · 199 unmodified lines
938	938	print-readably print-circle that) 4) #fn("A0209091524219161:" #(#fn(write)
939	939	#fn(io-close)) 7)
940	940	#fn("A190504208061:" #(#fn(raise)) 6)) 15)
941		−map-int #fn("A2E81L2;3u0480E51D9P8620K81DI898:L23S048987808;51D9PN487=?7^1489KM?9@\b/^251486:" #(#5=#fn("r0DI:" void 4)) 13)
	941	+map-int #fn("A2E81L2;3u0480E51D9P8620K81DI898:L23S048987808;51D9PN487=?7^1489KM?9@\b/^251486:" #(#4=#fn("r0DI:" void 4)) 13)
942	942	max #fn("r1813=07021808163:80:" #(foldl #fn("A28081L235081:80:" 6)) 8) member
943	943	#fn("A281<80d35081:813<0708081=62:D9:" #(member) 7) memv #fn("A281<80c35081:813<0708081=62:D9:" #(memv) 7)
944	944	min #fn("r1813=07021808163:80:" #(foldl #fn("A28081L235080:81:" 6)) 8) mod
@@ -1078,7 +1078,7 @@ str-trim #fn("w10003000W1000J7070?14W2000J7081?24DIDIb7b88721818087>3_4882282808 · 133 unmodified lines
1078	1078	subseq #fn("w20003000W2000J70D9?24DIDIb770818252370D9@>071228123825448724828187>3_425808281>3?8480B3<087<808162:80]390887661:2780513=02880818263:7980513D02:8051T882;89>161:D9:" #(<=
1079	1079	arg-error "start <= end: " " <= " #fn("A281El23g090;38049091n7080865287863H0718786523=072809052@40D94:80B3A092<80=73815162:72809162:" #(copy-list
1080	1080	length< bounds-error 1-) subseq-l 10) #fn("A120905191;J504858586L23=071908652@;0808692n51229286DI898:L23N0489878;92n908;Gp^1489KM?9@\r/^251487:" #(#fn(length)
1081		−bounds-error #5#) subseq-av 15) vec-alloc #fn(str?)
	1081	+bounds-error #4#) subseq-av 15) vec-alloc #fn(str?)
1082	1082	#fn(str-sub) arr? #fn(type-of) #fn("A1209080E63:" #(#fn(arr-alloc)) 8)) 11)
1083	1083	t0_auto42# #:t0_auto42# t0_auto54# #:t0_auto54# table->assoc-list
1084	1084	#fn("A12021D98063:" #(#fn(table-fold) #fn("A38081P82P:" 6)) 8) table-invert #fn("A12050212285>1D98053485:" #(#fn(table)
@@ -1102,13 +1102,13 @@ type-error #fn("r22021228081825461:" #(#fn(raise) · 17 unmodified lines
1102	1102	untrace #fn("A12080517172513D02380247251F3G52@40D9^14DI:" #(#fn(top-level-value)
1103	1103	traced? fn #fn(set-top-level-value!)
1104	1104	#fn(fn-vals)) 9)
1105		−values #fn("r080B3<080=J6080<:9080P:" #4# #(#6#) 6) vars-to-env
	1105	+values #fn("r080B3<080=J6080<:9080P:" #() #(#5#) 6) vars-to-env
1106	1106	#fn("A320218182>280722380515163:" #(#fn(map)
1107	1107	#fn("A2708021809052SS8191M63:" #(vinfo #fn(memq)) 9)
1108	1108	iota #fn(length)) 10)
1109	1109	vec->list #fn("A17080z2:" #(list) 6) vinfo
1110	1110	#fn("A3808182e3:" 7) vinfo:heap? #.cadr vinfo:index
1111		−#7# vinfo:sym #.car void
	1111	+#6# vinfo:sym #.car void
1112	1112	#3# void? #fn("A180DIQ:" 6) zero?
1113	1113	#fn("A180El2:" 6) zip #fn("r0707180z3:" #(map list) 7) zip-with
1114	1114	#fn("r1708081z3:" #(map) 7))

src/print.c+2−2

@@ -13,7 +13,7 @@ enum { · 12 unmodified lines
13	13
14	14	#define LOG2_10 3.321928094887362347870319429489
15	15
16		−#define cons_index(c) (ptr(sl_cons, c)-(sl_cons*)slvm.fromspace)
	16	+#define cons_index(c) (ptr(sl_aligned, c)-(sl_aligned*)slvm.fromspace)
17	17	#define ismarked(c) bitvector_get(sl.consflags, cons_index(c))
18	18	#define mark_cons(c) bitvector_set(sl.consflags, cons_index(c))
19	19	#define unmark_cons(c) bitvector_reset(sl.consflags, cons_index(c))
@@ -1094,7 +1094,7 @@ sl_print(sl_v v) · 1074 unmodified lines
1094	1094	if(iscons(v) \|\| isvec(v) \|\| isfn(v) \|\| (iscvalue(v) && !isstr(v))){
1095	1095	htable_reset(&sl.pr.conses, HT_N_INLINE);
1096	1096	if(sl.pr.circle)
1097		− memset(sl.consflags, 0, sizeof(u32int)*bitvector_nwords(slvm.heapsize/sizeof(sl_cons)));
	1097	+ memset(sl.consflags, 0, sizeof(u32int)*bitvector_nwords(slvm.heapsize/sizeof(sl_aligned)));
1098	1098	}
1099	1099	}
1100	1100

src/sl.c+2−2

@@ -614,7 +614,7 @@ sl_gc(bool mustgrow) · 613 unmodified lines
614	614	cthrow(raise(sl_erroom), mustgrow);
615	615	}
616	616	if(slvm.grew){
617		− u64int sz = slvm.heapsize/sizeof(sl_cons);
	617	+ u64int sz = slvm.heapsize/sizeof(sl_aligned);
618	618	if(sl_unlikely(sz < 1))
619	619	sz = 1;
620	620	temp = bitvector_resize(sl.consflags, sz, sz*2);
@@ -1401,7 +1401,7 @@ failed: · 780 unmodified lines
1401	1401	if((slvm.gchandles = MEM_ALLOC(slvm.maxgchandles * sizeof(sl_v*))) == nil)
1402	1402	goto failed;
1403	1403
1404		− if((sl.consflags = bitvector_new(slvm.heapsize/sizeof(sl_cons))) == nil)
	1404	+ if((sl.consflags = bitvector_new(slvm.heapsize/sizeof(sl_aligned))) == nil)
1405	1405	goto failed;
1406	1406	if((htable_new(&sl.pr.conses, HT_N_INLINE)) == nil)
1407	1407	goto failed;

src/slpriv.h+3−0

@@ -5,6 +5,9 @@ · 4 unmodified lines
5	5	#include "htable_h.h"
6	6	HTPROT(ptrhash)
7	7
	8	+// all allocations on the heap are 8-byte aligned
	9	+typedef u64int sl_aligned;
	10	+
8	11	#if defined(BITS64)
9	12	#define FIXNUM_BITS (64-TAG_BITS)
10	13	#define UNBOXED_BITS (64-TAG_EXT_BITS)

cons flags: fix wrong alignment on 64-bit platforms

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code