Commit 6e2de16a authored by Jean-Claude Beaudoin's avatar Jean-Claude Beaudoin
Browse files

Utility dpp is from now on in pre-retirement with very limited duties, restricted to .dh files.

parent 6193e618
...@@ -305,13 +305,13 @@ mkcl_min$(EXE): $(LIBRARIES) mkclmin.@LIBEXT@ c/cinit.o c/all_symbols.o .gdbinit ...@@ -305,13 +305,13 @@ mkcl_min$(EXE): $(LIBRARIES) mkclmin.@LIBEXT@ c/cinit.o c/all_symbols.o .gdbinit
.gdbinit: util/gdbinit .gdbinit: util/gdbinit
cp util/gdbinit $@ cp util/gdbinit $@
c/cinit.o: c/GNUmakefile c/cinit.d c/mkcl/mkcl.h c/cinit.o: c/GNUmakefile c/cinit.c c/mkcl/mkcl.h
cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile cinit.o cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile cinit.o
c/all_symbols.o: c/GNUmakefile c/all_symbols.d c/symbols_list.h c/symbols_list2.h c/mkcl/mkcl.h c/all_symbols.o: c/GNUmakefile c/all_symbols.c c/symbols_list.h c/symbols_list2.h c/mkcl/mkcl.h
cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile all_symbols.o cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile all_symbols.o
c/all_symbols2.o: c/GNUmakefile c/all_symbols.d c/symbols_list.h c/symbols_list2.h c/mkcl/mkcl.h c/all_symbols2.o: c/GNUmakefile c/all_symbols.c c/symbols_list.h c/symbols_list2.h c/mkcl/mkcl.h
cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile all_symbols2.o cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile all_symbols2.o
lsp/config.lsp: lsp/config.pre lsp/config.lsp: lsp/config.pre
...@@ -382,7 +382,7 @@ libmkcc1.a: ../contrib/tinycc/libmkcc1.a ...@@ -382,7 +382,7 @@ libmkcc1.a: ../contrib/tinycc/libmkcc1.a
../contrib/tinycc/libmkcc1.a: ../contrib/tinycc/mkcc$(EXE) ../contrib/tinycc/lib/*.[cS] ../contrib/tinycc/lib/Makefile ../contrib/tinycc/libmkcc1.a: ../contrib/tinycc/mkcc$(EXE) ../contrib/tinycc/lib/*.[cS] ../contrib/tinycc/lib/Makefile
cd ../contrib/tinycc; $(MAKE) libmkcc1.a cd ../contrib/tinycc; $(MAKE) libmkcc1.a
mkclmin.@LIBEXT@: c/GNUmakefile c/mkcl/mkcl.h $(MKCL_HFILES) c/*.d c/arch/*.d c/*.h mkclmin.@LIBEXT@: c/GNUmakefile c/mkcl/mkcl.h $(MKCL_HFILES) c/*.c c/arch/*.c c/*.h
cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile ../mkclmin.@LIBEXT@ cd c; $(MAKE) GNUmakefile; $(MAKE) -f GNUmakefile ../mkclmin.@LIBEXT@
mkcltop.@LIBEXT@: c/GNUmakefile c/all_symbols2.o mkcltop.@LIBEXT@: c/GNUmakefile c/all_symbols2.o
...@@ -585,18 +585,18 @@ realclean: distclean ...@@ -585,18 +585,18 @@ realclean: distclean
$(RM) *~ c/*~ c/arch/*~ $(RM) *~ c/*~ c/arch/*~
$(RM) lsp/*~ clos/*~ cmp/*~ $(RM) lsp/*~ clos/*~ cmp/*~
TAGS: lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre c/*.d c/*.h c/arch/*.d c/mkcl/*.dh c/mkcl/*.h TAGS: lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre c/*.c c/*.h c/arch/*.c c/mkcl/*.dh c/mkcl/*.h
if type etags >/dev/null 2>&1; then \ if type etags >/dev/null 2>&1; then \
if etags --help | grep -q -e "--language-force"; then \ if etags --help | grep -q -e "--language-force"; then \
etags -R lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre --language-force=c c/*.d c/*.h c/arch/*.d c/mkcl/*.dh c/mkcl/*.h; \ etags -R lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre --language-force=c c/*.c c/*.h c/arch/*.c c/mkcl/*.dh c/mkcl/*.h; \
else \ else \
etags -R lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre --language=c c/*.d c/*.h c/arch/*.d c/mkcl/*.dh c/mkcl/*.h; \ etags -R lsp/*.lsp lsp/config.pre clos/*.lsp cmp/*.lsp cmp/cmpdefs.pre --language=c c/*.c c/*.h c/arch/*.c c/mkcl/*.dh c/mkcl/*.h; \
fi \ fi \
else touch TAGS; fi else touch TAGS; fi
c/makefile.depend: c/*.d c/*.h c/arch/*.d c/mkcl/mkcl.h $(MKCL_HFILES) c/makefile.depend: c/*.c c/*.h c/arch/*.c c/mkcl/mkcl.h $(MKCL_HFILES)
cd c; $(MAKE) makefile.depend cd c; $(MAKE) makefile.depend
c/GNUmakefile: c/Makefile.in c/makefile.depend c/GNUmakefile: c/Makefile.in c/makefile.depend
......
...@@ -828,7 +828,7 @@ AC_DEFUN([MKCL_FFI],[ ...@@ -828,7 +828,7 @@ AC_DEFUN([MKCL_FFI],[
AC_MSG_CHECKING([whether we can dynamically build calls to C functions]) AC_MSG_CHECKING([whether we can dynamically build calls to C functions])
case "${host_cpu}" in case "${host_cpu}" in
i686 | i586 | pentium* | athlon* ) i686 | i586 | pentium* | athlon* )
EXTRA_OBJS="${EXTRA_OBJS} ffi_x86.o" EXTRA_OBJS="${EXTRA_OBJS} arch/ffi_x86.o"
if test "${enable_asmapply}" = "yes" ; then if test "${enable_asmapply}" = "yes" ; then
EXTRA_OBJS="${EXTRA_OBJS} apply_x86.o" EXTRA_OBJS="${EXTRA_OBJS} apply_x86.o"
AC_DEFINE(MKCL_ASM_APPLY) AC_DEFINE(MKCL_ASM_APPLY)
...@@ -838,25 +838,25 @@ case "${host_cpu}" in ...@@ -838,25 +838,25 @@ case "${host_cpu}" in
;; ;;
x86_64 ) x86_64 )
if test "${CL_FIXNUM_BITS}" = 32 ; then if test "${CL_FIXNUM_BITS}" = 32 ; then
EXTRA_OBJS="${EXTRA_OBJS} ffi_x86.o" EXTRA_OBJS="${EXTRA_OBJS} arch/ffi_x86.o"
else else
case "${host_os}" in case "${host_os}" in
mingw*) mingw*)
EXTRA_OBJS="${EXTRA_OBJS} ffi_x86_64_w64.o" EXTRA_OBJS="${EXTRA_OBJS} arch/ffi_x86_64_w64.o"
;; ;;
*) *)
EXTRA_OBJS="${EXTRA_OBJS} ffi_x86_64.o" EXTRA_OBJS="${EXTRA_OBJS} arch/ffi_x86_64.o"
;; ;;
esac esac
fi fi
dynamic_ffi=yes dynamic_ffi=yes
;; ;;
aarch64 ) aarch64 )
EXTRA_OBJS="${EXTRA_OBJS} ffi_aarch64.o" EXTRA_OBJS="${EXTRA_OBJS} arch/ffi_aarch64.o"
dynamic_ffi=yes dynamic_ffi=yes
;; ;;
arm* ) arm* )
EXTRA_OBJS="${EXTRA_OBJS} ffi_arm.o" EXTRA_OBJS="${EXTRA_OBJS} arch/ffi_arm.o"
dynamic_ffi=yes dynamic_ffi=yes
;; ;;
*) *)
......
...@@ -2,8 +2,6 @@ GNUmakefile ...@@ -2,8 +2,6 @@ GNUmakefile
makefile.depend makefile.depend
dpp dpp
dpp.exe dpp.exe
[a-ce-z][a-z]*.c
disassembler.c
Makefile Makefile
symbols_list2.h symbols_list2.h
/*.s /*.s
...@@ -85,7 +85,7 @@ OBJS = main.o symbol.o package.o list.o \ ...@@ -85,7 +85,7 @@ OBJS = main.o symbol.o package.o list.o \
DCFILES = $(OBJS:%.o=%.c) DCFILES = $(OBJS:%.o=%.c)
.SUFFIXES: .c .o .d .dh .SUFFIXES: .c .o .dh
.PHONY: all all2 .PHONY: all all2
all: all:
...@@ -99,9 +99,6 @@ all2: ../mkclmin.a ../mkcltop.a all_symbols.o all_symbols2.o cinit.o ...@@ -99,9 +99,6 @@ all2: ../mkclmin.a ../mkcltop.a all_symbols.o all_symbols2.o cinit.o
.c.o: .c.o:
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -o $@ -c $<
.d.c:
$(DPP) $< $@
.dh.h: .dh.h:
$(DPP) $< $@ $(DPP) $< $@
...@@ -121,21 +118,6 @@ mkcl/internal.h: $(C_EXPORTED_SYMBOLS_H_IN_MKCL) ...@@ -121,21 +118,6 @@ mkcl/internal.h: $(C_EXPORTED_SYMBOLS_H_IN_MKCL)
#apply_x86.c: arch/apply_x86.d $(DPP) #apply_x86.c: arch/apply_x86.d $(DPP)
# $(DPP) $< $@ # $(DPP) $< $@
ffi_x86.c: arch/ffi_x86.d $(DPP)
$(DPP) $< $@
ffi_x86_64.c: arch/ffi_x86_64.d $(DPP)
$(DPP) $< $@
ffi_x86_64_w64.c: arch/ffi_x86_64_w64.d $(DPP)
$(DPP) $< $@
ffi_arm.c: arch/ffi_arm.d $(DPP)
$(DPP) $< $@
ffi_aarch64.c: arch/ffi_aarch64.d $(DPP)
$(DPP) $< $@
../mkclmin.a: GNUmakefile $(OBJS) ../mkclmin.a: GNUmakefile $(OBJS)
$(RM) $@ $(RM) $@
...@@ -152,7 +134,8 @@ clean: ...@@ -152,7 +134,8 @@ clean:
$(RM) mkcl/gc/*.h $(C_EXPORTED_SYMBOLS_H_IN_MKCL) $(RM) mkcl/gc/*.h $(C_EXPORTED_SYMBOLS_H_IN_MKCL)
distclean: clean distclean: clean
$(RM) $(DPP) $(DCFILES) symbols_list2.h all_symbols.c cinit.c $(RM) $(DPP) # $(DCFILES)
$(RM) symbols_list2.h # all_symbols.c cinit.c
$(RM) GNUmakefile makefile.depend $(RM) GNUmakefile makefile.depend
$(RM) Makefile $(RM) Makefile
...@@ -182,8 +165,8 @@ unixfsys.o: unixfsys.c ...@@ -182,8 +165,8 @@ unixfsys.o: unixfsys.c
# GCC might break this code # GCC might break this code
# #
ffi_x86.o: ffi_x86.c arch/ffi_x86.o: arch/ffi_x86.c
$(CC) $(CFLAGS) -O0 -c ffi_x86.c -o $@ $(CC) $(CFLAGS) -O0 -c arch/ffi_x86.c -o $@
# #
...@@ -205,7 +188,7 @@ Makefile: Makefile.in ../config.status ...@@ -205,7 +188,7 @@ Makefile: Makefile.in ../config.status
# #
# #
makefile.depend: $(DCFILES) *.h arch/*.d cinit.c all_symbols.c mkcl/mkcl.h $(MKCL_HFILES) makefile.depend: $(DCFILES) *.h arch/*.c cinit.c all_symbols.c mkcl/mkcl.h $(MKCL_HFILES)
$(RM) makefile.depend $(RM) makefile.depend
for i in $^; do \ for i in $^; do \
case $$i in \ case $$i in \
......
...@@ -63,7 +63,7 @@ _mkcl_backq_cdr(MKCL, mkcl_object *px) ...@@ -63,7 +63,7 @@ _mkcl_backq_cdr(MKCL, mkcl_object *px)
return(EVAL); return(EVAL);
} }
if (MKCL_CAR(x) == MK_SI_unquote_splice || MKCL_CAR(x) == MK_SI_unquote_nsplice) if (MKCL_CAR(x) == MK_SI_unquote_splice || MKCL_CAR(x) == MK_SI_unquote_nsplice)
mkcl_FEerror(env, ",@@ or ,. has appeared in an illegal position.", 0); mkcl_FEerror(env, ",@ or ,. has appeared in an illegal position.", 0);
ax = MKCL_CAR(x); dx = MKCL_CDR(x); ax = MKCL_CAR(x); dx = MKCL_CDR(x);
a = _mkcl_backq_car(env, &ax); a = _mkcl_backq_car(env, &ax);
...@@ -244,7 +244,7 @@ backq(MKCL, mkcl_object x) ...@@ -244,7 +244,7 @@ backq(MKCL, mkcl_object x)
a = _mkcl_backq_car(env, &x); a = _mkcl_backq_car(env, &x);
if (a == APPEND || a == NCONC) if (a == APPEND || a == NCONC)
mkcl_FEerror(env, ",@@ or ,. has appeared in an illegal position.", 0); mkcl_FEerror(env, ",@ or ,. has appeared in an illegal position.", 0);
if (a == QUOTE) if (a == QUOTE)
return(kwote(env, x)); return(kwote(env, x));
return(x); return(x);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# include <stdio.h> # include <stdio.h>
#endif #endif
#include "cfun_dispatch.d" #include "cfun_dispatch.c"
static mkcl_object wrong_num_args_cfun_0(MKCL) static mkcl_object wrong_num_args_cfun_0(MKCL)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment