Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-17 01:37:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #185 - Ensure objects are moved during init

Browse source 
This prevents broken hearts by ensuring objects are in their final locations before assigning pointers to pointers.
This commit is contained in:
Justin Ethier 2017-03-21 19:01:06 -04:00
parent c99e046517
commit 24a2b63b7f
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scheme/cyclone/cgen.sld
View file

@ -1293,7 +1293,7 @@
required-libs) required-libs)
(emit "static void c_entry_pt(data, argc, env,cont) void *data; int argc; closure env,cont; { ")) (emit "static void c_entry_pt(data, argc, env,cont) void *data; int argc; closure env,cont; { "))
(else (else
(emit* "void c_" (lib:name->string lib-name) "_entry_pt(data, argc, cont,value) void *data; int argc; closure cont; object value;{ ") (emit* "void c_" (lib:name->string lib-name) "_entry_pt_first_lambda(data, argc, cont,value) void *data; int argc; closure cont; object value;{ ")
; DEBUG (emit (string-append "printf(\"init " (lib:name->string lib-name) "\\n\");")) ; DEBUG (emit (string-append "printf(\"init " (lib:name->string lib-name) "\\n\");"))
)) ))
@ -1418,16 +1418,17 @@
"(((closure)" "(((closure)"
(cgen:mangle-global (lib:name->symbol lib-name)) (cgen:mangle-global (lib:name->symbol lib-name))
")->fn)(data, 1, cont, cont);") ")->fn)(data, 1, cont, cont);")
;; TODO: can GC to ensure objects are moved when exporting exports.
;; Ideally want to create an inner function and only do this for libraries
;; that we know are exporting exports. Otherwise it just wastes time on
;; startup
;(emit*
; "object buf[1]; buf[0] = cont;"
; "GC(data, "
; (cgen:mangle-global (lib:name->symbol lib-name))
; ", buf, 1);")
(emit* "}")
(emit* "void c_" (lib:name->string lib-name) "_entry_pt(data, argc, cont,value) void *data; int argc; closure cont; object value;{ ")
(if (null? lib-pass-thru-exports)
(emit* " c_" (lib:name->string lib-name) "_entry_pt_first_lambda(data, argc, cont,value);")
; GC to ensure objects are moved when exporting exports.
; Otherwise there will be broken hearts :(
(emit*
" mclosure1(clo, c_" (lib:name->string lib-name) "_entry_pt_first_lambda, ((closure1_type *)cont)->element);\n"
" object buf[1]; buf[0] = cont;\n"
" GC(data, (closure)&clo, buf, 1);\n"))
)) ))
(emit "}") (emit "}")