mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-03-11 07:20:29 -07:00
Code Issues Projects Releases Packages Wiki Activity

cmp: define constant VM before it is first used in a produced header

Browse source 
When we've built ECL without dynamic VV, the preprocessor define VM was
referenced in the produced header before it was defined. That lead to an error.
This commit is contained in:
Daniel Kochmański 2026-02-27 11:18:59 +01:00
parent 86e2f245f6
commit ede2f0aaa1
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cmp/cmpbackend-cxx/cmppass2-top.lsp
View file

@ -111,14 +111,6 @@
(defun ctop-write (init-name h-pathname data-pathname &aux top-output-string)
(wt-nl "#include \"" (brief-namestring h-pathname) "\"")
;; VV might be needed by functions in CLINES.
(wt-nl-h "#ifdef ECL_DYNAMIC_VV")
(wt-nl-h "static cl_object *VV;")
(wt-nl-h "#else")
(wt-nl-h "static cl_object VV[VM];")
(wt-nl-h "#endif")
(output-clines *compiler-output2*)
(wt-nl-h "#ifdef __cplusplus")
(wt-nl-h "extern \"C\" {")
(wt-nl-h "#endif")
@ -141,7 +133,13 @@
(progn
(wt-nl-h "#define VM " (data-permanent-storage-size))
(wt-nl-h "#define VMtemp " (data-temporary-storage-size)))))
;; VV might be needed by functions in CLINES.
(wt-nl-h "# ifdef ECL_DYNAMIC_VV")
(wt-nl-h "static cl_object *VV;")
(wt-nl-h "# else")
(wt-nl-h "static cl_object VV[VM];")
(wt-nl-h "# endif")
;;
(wt-nl-h "#define ECL_DEFINE_SETF_FUNCTIONS ")
(loop for (name setf-vv name-vv) in *setf-definitions*
do (wt-h #\\ #\Newline setf-vv "=ecl_setf_definition(" name-vv ",ECL_T);"))
@ -159,6 +157,7 @@
do (funcall builder (vv-location vv) value *compiler-output2*)))
(output-cfuns *compiler-output2*)
(output-clines *compiler-output2*)
(setq *compiler-phase* 't3)