aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2016-05-25 12:06:29 -0700
committerH. Peter Anvin <hpa@zytor.com>2016-05-25 12:06:29 -0700
commite1f985c167495185c55c46e640f2607604597383 (patch)
tree3ddd11d12e6a3bf6e21c39d1342175d5488d8d39
parent22538e2b6713d6e4e05fb82c6969320a519b4c93 (diff)
downloadnasm-e1f985c167495185c55c46e640f2607604597383.tar.gz
nasm-e1f985c167495185c55c46e640f2607604597383.tar.xz
nasm-e1f985c167495185c55c46e640f2607604597383.zip
Reorganize the source code into subdirectories
Make the source code easier to understand and keep track of by organizing it into subdirectories depending on the function. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--.gitignore52
-rw-r--r--Makefile.in476
-rw-r--r--Mkfiles/msvc.mak315
-rw-r--r--Mkfiles/netware.mak261
-rw-r--r--Mkfiles/openwcom.mak329
-rw-r--r--Mkfiles/owlinux.mak315
-rw-r--r--asm/assemble.c (renamed from assemble.c)2
-rw-r--r--asm/assemble.h (renamed from assemble.h)0
-rw-r--r--asm/directiv.dat (renamed from directiv.dat)0
-rwxr-xr-xasm/directiv.pl (renamed from directiv.pl)0
-rw-r--r--asm/eval.c (renamed from eval.c)0
-rw-r--r--asm/eval.h (renamed from eval.h)0
-rw-r--r--asm/exprlib.c (renamed from exprlib.c)0
-rw-r--r--asm/float.c (renamed from float.c)0
-rw-r--r--asm/float.h (renamed from float.h)0
-rw-r--r--asm/labels.c (renamed from labels.c)0
-rw-r--r--asm/listing.c (renamed from listing.c)0
-rw-r--r--asm/listing.h (renamed from listing.h)0
-rw-r--r--asm/nasm.c (renamed from nasm.c)2
-rw-r--r--asm/parser.c (renamed from parser.c)0
-rw-r--r--asm/parser.h (renamed from parser.h)0
-rwxr-xr-xasm/phash.pl (renamed from phash.pl)0
-rw-r--r--asm/pptok.dat (renamed from pptok.dat)0
-rwxr-xr-xasm/pptok.pl (renamed from pptok.pl)0
-rw-r--r--asm/preproc-nop.c (renamed from preproc-nop.c)0
-rw-r--r--asm/preproc.c (renamed from preproc.c)0
-rw-r--r--asm/preproc.h (renamed from preproc.h)0
-rw-r--r--asm/quote.c (renamed from quote.c)0
-rw-r--r--asm/quote.h (renamed from quote.h)0
-rw-r--r--asm/rdstrnum.c (renamed from rdstrnum.c)0
-rw-r--r--asm/segalloc.c (renamed from segalloc.c)0
-rw-r--r--asm/stdscan.c (renamed from stdscan.c)0
-rw-r--r--asm/stdscan.h (renamed from stdscan.h)0
-rw-r--r--asm/strfunc.c (renamed from strfunc.c)0
-rw-r--r--asm/tokens.dat (renamed from tokens.dat)0
-rwxr-xr-xasm/tokhash.pl (renamed from tokhash.pl)0
-rw-r--r--common/common.c (renamed from common.c)0
-rw-r--r--configure.ac2
-rw-r--r--disasm/disasm.c (renamed from disasm.c)0
-rw-r--r--disasm/disasm.h (renamed from disasm.h)0
-rw-r--r--disasm/ndisasm.c (renamed from ndisasm.c)0
-rw-r--r--disasm/sync.c (renamed from sync.c)0
-rw-r--r--disasm/sync.h (renamed from sync.h)0
-rw-r--r--include/compiler.h (renamed from compiler.h)0
-rw-r--r--include/disp8.h (renamed from disp8.h)0
-rw-r--r--include/hashtbl.h (renamed from hashtbl.h)0
-rw-r--r--include/iflag.h (renamed from iflag.h)0
-rw-r--r--include/insns.h (renamed from insns.h)0
-rw-r--r--include/labels.h (renamed from labels.h)0
-rw-r--r--include/md5.h (renamed from md5.h)0
-rw-r--r--include/nasm.h (renamed from nasm.h)0
-rw-r--r--include/nasmint.h (renamed from nasmint.h)0
-rw-r--r--include/nasmlib.h (renamed from nasmlib.h)0
-rw-r--r--include/opflags.h (renamed from opflags.h)0
-rw-r--r--include/raa.h (renamed from raa.h)0
-rw-r--r--include/rbtree.h (renamed from rbtree.h)0
-rw-r--r--include/rdoff.h (renamed from rdoff/rdoff.h)0
-rw-r--r--include/saa.h (renamed from saa.h)0
-rw-r--r--include/tables.h (renamed from tables.h)0
-rw-r--r--include/ver.h (renamed from ver.h)0
-rwxr-xr-xmacros/macros.pl (renamed from macros.pl)6
-rw-r--r--macros/standard.mac (renamed from standard.mac)0
-rwxr-xr-xmisc/makedist.sh71
-rw-r--r--nasmlib/hashtbl.c (renamed from hashtbl.c)0
-rw-r--r--nasmlib/raa.c (renamed from raa.c)0
-rw-r--r--nasmlib/rbtree.c (renamed from rbtree.c)0
-rw-r--r--nasmlib/saa.c (renamed from saa.c)0
-rw-r--r--output/codeview.c4
-rw-r--r--output/nulldbg.c2
-rw-r--r--output/nullout.c2
-rw-r--r--output/outaout.c4
-rw-r--r--output/outas86.c4
-rw-r--r--output/outbin.c4
-rw-r--r--output/outcoff.c6
-rw-r--r--output/outdbg.c2
-rw-r--r--output/outelf.c12
-rw-r--r--output/outelf.h2
-rw-r--r--output/outform.c2
-rw-r--r--output/outieee.c4
-rw-r--r--output/outlib.c2
-rw-r--r--output/outmacho.c4
-rw-r--r--output/outobj.c4
-rw-r--r--output/outrdf2.c8
-rw-r--r--rdoff/Makefile.in13
-rwxr-xr-xtools/cleanfile (renamed from misc/cleanfile)0
-rwxr-xr-xtools/cleanpatch (renamed from misc/cleanpatch)0
-rwxr-xr-xtools/mkdep.pl (renamed from mkdep.pl)79
-rwxr-xr-xtools/release (renamed from misc/release)0
-rwxr-xr-xtools/syncfiles.pl (renamed from syncfiles.pl)0
-rwxr-xr-xtools/tag-release (renamed from misc/tag-release)0
-rw-r--r--x86/disp8.c (renamed from disp8.c)0
-rw-r--r--x86/insns-iflags.pl (renamed from insns-iflags.pl)10
-rw-r--r--x86/insns.dat (renamed from insns.dat)0
-rwxr-xr-xx86/insns.pl (renamed from insns.pl)40
-rw-r--r--x86/regs.dat (renamed from regs.dat)0
-rwxr-xr-xx86/regs.pl (renamed from regs.pl)0
96 files changed, 949 insertions, 1090 deletions
diff --git a/.gitignore b/.gitignore
index 1bfdb987..d9ac37be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,14 +25,20 @@
cscope*
tags
TAGS
+/*.1
/Makefile
+/asm/directiv.c
+/asm/directiv.h
+/asm/pptok.c
+/asm/pptok.h
+/asm/pptok.ph
+/asm/tokens.h
+/asm/tokhash.c
/config.h
/config.h.in
/config.log
/config.status
/configure
-/directiv.c
-/directiv.h
/doc/*.dip
/doc/*.hpj
/doc/*.pdf
@@ -41,22 +47,15 @@ TAGS
/doc/*.texi
/doc/*.txt
/doc/Makefile
-/doc/inslist.src
-/doc/version.src
/doc/html
/doc/info
-/insnsa.c
-/insnsb.c
-/insnsd.c
-/insnsi.h
-/insnsn.c
-/macros.c
+/doc/inslist.src
+/doc/version.src
+/macros/macros.c
/nasm
/ndisasm
-/*.1
-/pptok.c
-/pptok.h
-/pptok.ph
+/nsis/arch.nsh
+/nsis/version.nsh
/rdoff/Makefile
/rdoff/ldrdf
/rdoff/rdf2bin
@@ -67,22 +66,23 @@ TAGS
/rdoff/rdfdump
/rdoff/rdflib
/rdoff/rdx
-/regdis.c
-/regdis.h
-/regflags.c
-/regs.c
-/regs.h
-/regvals.c
/test/golden
/test/perf/*.asm
/test/testresults
-/tokens.h
-/tokhash.c
/version.h
/version.mac
/version.mak
/version.sed
-/iflag.c
-/iflaggen.h
-/nsis/version.nsh
-/nsis/arch.nsh
+/x86/iflag.c
+/x86/iflaggen.h
+/x86/insnsa.c
+/x86/insnsb.c
+/x86/insnsd.c
+/x86/insnsi.h
+/x86/insnsn.c
+/x86/regdis.c
+/x86/regdis.h
+/x86/regflags.c
+/x86/regs.c
+/x86/regs.h
+/x86/regvals.c
diff --git a/Makefile.in b/Makefile.in
index ac7a553f..ff2db501 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,12 @@ datarootdir = @datarootdir@
CC = @CC@
CFLAGS = @CFLAGS@
BUILD_CFLAGS = $(CFLAGS) @DEFS@
-INTERNAL_CFLAGS = -I$(srcdir) -I.
+INTERNAL_CFLAGS = -I$(srcdir) -I$(objdir) \
+ -I$(srcdir)/include -I$(objdir)/include \
+ -I$(srcdir)/x86 -I$(objdir)/x86 \
+ -I$(srcdir)/asm -I$(objdir)/asm \
+ -I$(srcdir)/disasm -I$(objdir)/disasm \
+ -I$(srcdir)/output -I$(objdir)/output
ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -80,29 +85,29 @@ endif
$(XMLTO) man --skip-validation $< 2>/dev/null
#-- Begin File Lists --#
-NASM = nasm.$(O) \
- raa.$(O) saa.$(O) rbtree.$(O) \
- float.$(O) insnsa.$(O) insnsb.$(O) \
- directiv.$(O) \
- assemble.$(O) labels.$(O) hashtbl.$(O) parser.$(O) \
+NASM = asm/nasm.$(O) \
+ asm/float.$(O) \
+ asm/directiv.$(O) \
+ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
+ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
+ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) \
+ asm/stdscan.$(O) \
+ asm/strfunc.$(O) asm/tokhash.$(O) \
+ asm/segalloc.$(O) \
+ asm/preproc-nop.$(O) \
+ asm/rdstrnum.$(O) \
+ \
+ macros/macros.$(O) \
+ \
output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \
output/nullout.$(O) \
output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \
output/outelf.$(O) \
output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \
output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \
- output/codeview.$(O) \
- preproc.$(O) quote.$(O) pptok.$(O) \
- macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \
- strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) \
- segalloc.$(O) \
- preproc-nop.$(O) \
- disp8.$(O) rdstrnum.$(O) \
- iflag.$(O) common.$(O)
-
-NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) \
- insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) \
- disp8.$(O) iflag.$(O) common.$(O)
+ output/codeview.$(O)
+
+NDISASM = disasm/ndisasm.$(O) disasm/disasm.$(O) disasm/sync.$(O)
LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
stdlib/strnlen.$(O) \
@@ -111,7 +116,13 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
nasmlib/file.$(O) nasmlib/ilog2.$(O) \
nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
- nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O)
+ nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
+ nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
+ nasmlib/raa.$(O) nasmlib/saa.$(O) \
+ common/common.$(O) \
+ x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \
+ x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
+ x86/disp8.$(O) x86/iflag.$(O)
#-- End File Lists --#
all: nasm$(X) ndisasm$(X) rdf
@@ -133,22 +144,29 @@ ndisasm$(X): $(NDISASM) $(NASMLIB)
# instruction-table file by a Perl script. They're distributed,
# though, so it isn't necessary to have Perl just to recompile NASM
# from the distribution.
-INSDEP = insns.dat insns.pl
-
-iflag.c: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -fc $(srcdir)/insns.dat
-iflaggen.h: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -fh $(srcdir)/insns.dat
-insnsb.c: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -b $(srcdir)/insns.dat
-insnsa.c: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -a $(srcdir)/insns.dat
-insnsd.c: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -d $(srcdir)/insns.dat
-insnsi.h: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -i $(srcdir)/insns.dat
-insnsn.c: $(INSDEP)
- $(RUNPERL) $(srcdir)/insns.pl -n $(srcdir)/insns.dat
+INSDEP = x86/insns.dat x86/insns.pl
+
+x86/iflag.c: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -fc \
+ $(srcdir)/x86/insns.dat x86/iflag.c
+x86/iflaggen.h: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -fh \
+ $(srcdir)/x86/insns.dat x86/iflaggen.h
+x86/insnsb.c: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -b \
+ $(srcdir)/x86/insns.dat x86/insnsb.c
+x86/insnsa.c: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -a \
+ $(srcdir)/x86/insns.dat x86/insnsa.c
+x86/insnsd.c: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -d \
+ $(srcdir)/x86/insns.dat x86/insnsd.c
+x86/insnsi.h: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -i \
+ $(srcdir)/x86/insns.dat x86/insnsi.h
+x86/insnsn.c: $(INSDEP)
+ $(RUNPERL) $(srcdir)/x86/insns.pl -n \
+ $(srcdir)/x86/insns.dat x86/insnsn.c
# These files contains all the standard macros that are derived from
# the version number.
@@ -166,57 +184,73 @@ nsis/version.nsh: version version.pl
# This source file is generated from the standard macros file
# `standard.mac' by another Perl script. Again, it's part of the
# standard distribution.
-macros.c: macros.pl pptok.ph standard.mac version.mac \
+macros/macros.c: macros/macros.pl asm/pptok.ph version.mac \
$(srcdir)/macros/*.mac $(srcdir)/output/*.mac
- $(RUNPERL) $(srcdir)/macros.pl $(srcdir)/standard.mac version.mac \
+ $(RUNPERL) $(srcdir)/macros/macros.pl version.mac \
$(srcdir)/macros/*.mac $(srcdir)/output/*.mac
# These source files are generated from regs.dat by yet another
# perl script.
-regs.c: regs.dat regs.pl
- $(RUNPERL) $(srcdir)/regs.pl c $(srcdir)/regs.dat > regs.c
-regflags.c: regs.dat regs.pl
- $(RUNPERL) $(srcdir)/regs.pl fc $(srcdir)/regs.dat > regflags.c
-regdis.c: regs.dat regs.pl
- $(RUNPERL) $(srcdir)/regs.pl dc $(srcdir)/regs.dat > regdis.c
-regdis.h: regs.dat regs.pl
- $(RUNPERL) $(srcdir)/regs.pl dh $(srcdir)/regs.dat > regdis.h
-regvals.c: regs.dat regs.pl
- $(RUNPERL) $(srcdir)/regs.pl vc $(srcdir)/regs.dat > regvals.c
-regs.h: regs.dat regs.pl
- $(RUNPERL) $(srcdir)/regs.pl h $(srcdir)/regs.dat > regs.h
+x86/regs.c: x86/regs.dat x86/regs.pl
+ $(RUNPERL) $(srcdir)/x86/regs.pl c \
+ $(srcdir)/x86/regs.dat > x86/regs.c
+x86/regflags.c: x86/regs.dat x86/regs.pl
+ $(RUNPERL) $(srcdir)/x86/regs.pl fc \
+ $(srcdir)/x86/regs.dat > x86/regflags.c
+x86/regdis.c: x86/regs.dat x86/regs.pl
+ $(RUNPERL) $(srcdir)/x86/regs.pl dc \
+ $(srcdir)/x86/regs.dat > x86/regdis.c
+x86/regdis.h: x86/regs.dat x86/regs.pl
+ $(RUNPERL) $(srcdir)/x86/regs.pl dh \
+ $(srcdir)/x86/regs.dat > x86/regdis.h
+x86/regvals.c: x86/regs.dat x86/regs.pl
+ $(RUNPERL) $(srcdir)/x86/regs.pl vc \
+ $(srcdir)/x86/regs.dat > x86/regvals.c
+x86/regs.h: x86/regs.dat x86/regs.pl
+ $(RUNPERL) $(srcdir)/x86/regs.pl h \
+ $(srcdir)/x86/regs.dat > x86/regs.h
# Assembler token hash
-tokhash.c: insns.dat regs.dat tokens.dat tokhash.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/tokhash.pl c $(srcdir)/insns.dat $(srcdir)/regs.dat \
- $(srcdir)/tokens.dat > tokhash.c
+asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \
+ perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/tokhash.pl c \
+ $(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat \
+ $(srcdir)/asm/tokens.dat > asm/tokhash.c
# Assembler token metadata
-tokens.h: insns.dat regs.dat tokens.dat tokhash.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/tokhash.pl h $(srcdir)/insns.dat $(srcdir)/regs.dat \
- $(srcdir)/tokens.dat > tokens.h
+asm/tokens.h: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \
+ perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/tokhash.pl h \
+ $(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat \
+ $(srcdir)/asm/tokens.dat > asm/tokens.h
# Preprocessor token hash
-pptok.h: pptok.dat pptok.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/pptok.pl h $(srcdir)/pptok.dat pptok.h
-pptok.c: pptok.dat pptok.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/pptok.pl c $(srcdir)/pptok.dat pptok.c
-pptok.ph: pptok.dat pptok.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/pptok.pl ph $(srcdir)/pptok.dat pptok.ph
+asm/pptok.h: asm/pptok.dat asm/pptok.pl perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/pptok.pl h \
+ $(srcdir)/asm/pptok.dat asm/pptok.h
+asm/pptok.c: asm/pptok.dat asm/pptok.pl perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/pptok.pl c \
+ $(srcdir)/asm/pptok.dat asm/pptok.c
+asm/pptok.ph: asm/pptok.dat asm/pptok.pl perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/pptok.pl ph \
+ $(srcdir)/asm/pptok.dat asm/pptok.ph
# Directives hash
-directiv.h: directiv.dat directiv.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/directiv.pl h $(srcdir)/directiv.dat directiv.h
-directiv.c: directiv.dat directiv.pl perllib/phash.ph
- $(RUNPERL) $(srcdir)/directiv.pl c $(srcdir)/directiv.dat directiv.c
+asm/directiv.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/directiv.pl h \
+ $(srcdir)/asm/directiv.dat asm/directiv.h
+asm/directiv.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph
+ $(RUNPERL) $(srcdir)/asm/directiv.pl c \
+ $(srcdir)/asm/directiv.dat asm/directiv.c
# This target generates all files that require perl.
# This allows easier generation of distribution (see dist target).
-PERLREQ = macros.c insnsb.c insnsa.c insnsd.c insnsi.h insnsn.c \
- regs.c regs.h regflags.c regdis.c regdis.h regvals.c \
- tokhash.c tokens.h pptok.h pptok.c pptok.ph \
- directiv.c directiv.h \
- iflag.c iflaggen.h \
+PERLREQ = x86/insnsb.c x86/insnsa.c x86/insnsd.c x86/insnsi.h x86/insnsn.c \
+ x86/regs.c x86/regs.h x86/regflags.c x86/regdis.c x86/regdis.h \
+ x86/regvals.c asm/tokhash.c asm/tokens.h asm/pptok.h asm/pptok.c \
+ x86/iflag.c x86/iflaggen.h \
+ macros/macros.c \
+ asm/pptok.ph asm/directiv.c asm/directiv.h \
version.h version.mac version.mak nsis/version.nsh
perlreq: $(PERLREQ)
@@ -243,10 +277,9 @@ install: nasm$(X) ndisasm$(X)
$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
clean:
- $(RM) -f *.$(O) *.s *.i *.$(A)
- $(RM) -f stdlib/*.$(O) stdlib/*.s stdlib/*.i
- $(RM) -f nasmlib/*.$(O) nasmlib/*.s nasmlib/*.i
- $(RM) -f output/*.$(O) output/*.s output/*.i
+ for d in . stdlib nasmlib output asm dis asm x86; do \
+ $(RM) -f "$$d"/*.$(O) "$$d"/*.s "$$d"/*.i "$$d"/*.$(A) ; \
+ done
$(RM) -f nasm$(X) ndisasm$(X)
$(RM) -f nasm-*-installer-*.exe
$(RM) -f tags TAGS
@@ -328,172 +361,141 @@ golden: nasm$(X)
# This build dependencies in *ALL* makefiles. Partially for that reason,
# it's expected to be invoked manually.
#
-alldeps: perlreq
- $(RUNPERL) syncfiles.pl Makefile.in Mkfiles/*.mak
- $(RUNPERL) mkdep.pl -M Makefile.in Mkfiles/*.mak -- \
- . output stdlib nasmlib
+alldeps: perlreq tools/syncfiles.pl tools/mkdep.pl
+ $(RUNPERL) tools/syncfiles.pl Makefile.in Mkfiles/*.mak
+ $(RUNPERL) tools/mkdep.pl -M Makefile.in Mkfiles/*.mak -- \
+ . include asm common disasm macros nasmlib output stdlib x86
./config.status
#-- Magic hints to mkdep.pl --#
# @object-ending: ".$(O)"
# @path-separator: "/"
#-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(O): assemble.c assemble.h compiler.h config.h directiv.h disp8.h \
- iflag.h iflaggen.h insns.h insnsi.h listing.h nasm.h nasmint.h nasmlib.h \
- opflags.h pptok.h preproc.h regs.h tables.h tokens.h
-common.$(O): common.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h tables.h tokens.h
-directiv.$(O): directiv.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-disasm.$(O): disasm.c compiler.h config.h directiv.h disasm.h disp8.h \
- iflag.h iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h \
- pptok.h preproc.h regdis.h regs.h sync.h tables.h tokens.h
-disp8.$(O): disp8.c compiler.h config.h directiv.h disp8.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-eval.$(O): eval.c compiler.h config.h directiv.h eval.h float.h insnsi.h \
- labels.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-exprlib.$(O): exprlib.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-float.$(O): float.c compiler.h config.h directiv.h float.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-hashtbl.$(O): hashtbl.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-iflag.$(O): iflag.c compiler.h config.h iflag.h iflaggen.h nasmint.h
-insnsa.$(O): insnsa.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h tables.h tokens.h
-insnsb.$(O): insnsb.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h tables.h tokens.h
-insnsd.$(O): insnsd.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h tables.h tokens.h
-insnsn.$(O): insnsn.c compiler.h config.h insnsi.h nasmint.h tables.h
-labels.$(O): labels.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- labels.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-listing.$(O): listing.c compiler.h config.h directiv.h insnsi.h listing.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-macros.$(O): macros.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h \
- regs.h tables.h
-nasm.$(O): nasm.c assemble.h compiler.h config.h directiv.h eval.h float.h \
- iflag.h iflaggen.h insns.h insnsi.h labels.h listing.h nasm.h nasmint.h \
- nasmlib.h opflags.h output/outform.h parser.h pptok.h preproc.h raa.h \
- regs.h saa.h stdscan.h tables.h tokens.h ver.h
-nasmlib/bsi.$(O): nasmlib/bsi.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/crc64.$(O): nasmlib/crc64.c compiler.h config.h hashtbl.h nasmint.h \
- nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/file.$(O): nasmlib/file.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/filename.$(O): nasmlib/filename.c compiler.h config.h nasmint.h \
- nasmlib.h
-nasmlib/ilog2.$(O): nasmlib/ilog2.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/malloc.$(O): nasmlib/malloc.c compiler.h config.h nasmint.h \
- nasmlib.h
-nasmlib/md5c.$(O): nasmlib/md5c.c compiler.h config.h md5.h nasmint.h
-nasmlib/readnum.$(O): nasmlib/readnum.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h config.h nasmint.h \
- nasmlib.h
-nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h config.h hashtbl.h \
- nasmint.h nasmlib.h
-nasmlib/string.$(O): nasmlib/string.c compiler.h config.h nasmint.h \
- nasmlib.h
-nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
-nasmlib/zerobuf.$(O): nasmlib/zerobuf.c compiler.h config.h nasmint.h \
- nasmlib.h
-ndisasm.$(O): ndisasm.c compiler.h config.h directiv.h disasm.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regs.h sync.h tables.h tokens.h ver.h
-output/codeview.$(O): output/codeview.c compiler.h config.h directiv.h \
- hashtbl.h insnsi.h md5.h nasm.h nasmint.h nasmlib.h opflags.h \
- output/outlib.h output/pecoff.h pptok.h preproc.h regs.h saa.h tables.h \
- version.h
-output/nulldbg.$(O): output/nulldbg.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h \
- preproc.h regs.h tables.h
-output/nullout.$(O): output/nullout.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h \
- preproc.h regs.h tables.h
-output/outaout.$(O): output/outaout.c compiler.h config.h directiv.h eval.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h tables.h
-output/outas86.$(O): output/outas86.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h raa.h regs.h saa.h tables.h
-output/outbin.$(O): output/outbin.c compiler.h config.h directiv.h eval.h \
- insnsi.h labels.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h regs.h saa.h stdscan.h tables.h
-output/outcoff.$(O): output/outcoff.c compiler.h config.h directiv.h eval.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h output/pecoff.h pptok.h preproc.h raa.h regs.h saa.h \
- tables.h
-output/outdbg.$(O): output/outdbg.c compiler.h config.h directiv.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h \
- regs.h tables.h
-output/outelf.$(O): output/outelf.c compiler.h config.h directiv.h eval.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
- output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \
- preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
-output/outform.$(O): output/outform.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h \
- preproc.h regs.h tables.h
-output/outieee.$(O): output/outieee.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h regs.h tables.h ver.h
-output/outlib.$(O): output/outlib.c compiler.h config.h directiv.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h \
- regs.h tables.h
-output/outmacho.$(O): output/outmacho.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h tables.h
-output/outobj.$(O): output/outobj.c compiler.h config.h directiv.h eval.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h regs.h stdscan.h tables.h ver.h
-output/outrdf2.$(O): output/outrdf2.c compiler.h config.h directiv.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h tables.h
-parser.$(O): parser.c compiler.h config.h directiv.h eval.h float.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h parser.h \
- pptok.h preproc.h regs.h stdscan.h tables.h tokens.h
-pptok.$(O): pptok.c compiler.h config.h hashtbl.h nasmint.h nasmlib.h \
- pptok.h preproc.h
-preproc-nop.$(O): preproc-nop.c compiler.h config.h directiv.h insnsi.h \
- listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-preproc.$(O): preproc.c compiler.h config.h directiv.h eval.h hashtbl.h \
- insnsi.h listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- quote.h regs.h stdscan.h tables.h tokens.h
-quote.$(O): quote.c compiler.h config.h nasmint.h nasmlib.h quote.h
-raa.$(O): raa.c compiler.h config.h nasmint.h nasmlib.h raa.h
-rbtree.$(O): rbtree.c compiler.h config.h nasmint.h rbtree.h
-rdstrnum.$(O): rdstrnum.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regdis.$(O): regdis.c regdis.h regs.h
-regflags.$(O): regflags.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regs.$(O): regs.c compiler.h config.h insnsi.h nasmint.h tables.h
-regvals.$(O): regvals.c compiler.h config.h insnsi.h nasmint.h tables.h
-saa.$(O): saa.c compiler.h config.h nasmint.h nasmlib.h saa.h
-segalloc.$(O): segalloc.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h tables.h tokens.h
-stdlib/snprintf.$(O): stdlib/snprintf.c compiler.h config.h nasmint.h \
- nasmlib.h
-stdlib/strlcpy.$(O): stdlib/strlcpy.c compiler.h config.h nasmint.h
-stdlib/strnlen.$(O): stdlib/strnlen.c compiler.h config.h nasmint.h
-stdlib/vsnprintf.$(O): stdlib/vsnprintf.c compiler.h config.h nasmint.h \
- nasmlib.h
-stdscan.$(O): stdscan.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- quote.h regs.h stdscan.h tables.h tokens.h
-strfunc.$(O): strfunc.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-sync.$(O): sync.c compiler.h config.h nasmint.h nasmlib.h sync.h
-tokhash.$(O): tokhash.c compiler.h config.h directiv.h hashtbl.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regs.h stdscan.h tables.h tokens.h
+asm/assemble.$(O): asm/assemble.c asm/assemble.h include/compiler.h \
+ include/disp8.h include/insns.h asm/listing.h include/nasm.h \
+ include/nasmlib.h include/tables.h
+asm/directiv.$(O): asm/directiv.c include/compiler.h asm/directiv.h \
+ include/hashtbl.h include/nasm.h
+asm/eval.$(O): asm/eval.c include/compiler.h asm/eval.h asm/float.h \
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/exprlib.$(O): asm/exprlib.c include/nasm.h
+asm/float.$(O): asm/float.c include/compiler.h asm/float.h include/nasm.h
+asm/labels.$(O): asm/labels.c include/compiler.h include/hashtbl.h \
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/listing.$(O): asm/listing.c include/compiler.h asm/listing.h \
+ include/nasm.h include/nasmlib.h
+asm/nasm.$(O): asm/nasm.c asm/assemble.h include/compiler.h asm/eval.h \
+ asm/float.h include/iflag.h include/insns.h include/labels.h asm/listing.h \
+ include/nasm.h include/nasmlib.h output/outform.h asm/parser.h \
+ asm/preproc.h include/raa.h include/saa.h asm/stdscan.h include/ver.h
+asm/parser.$(O): asm/parser.c include/compiler.h asm/eval.h asm/float.h \
+ include/insns.h include/nasm.h include/nasmlib.h asm/parser.h asm/stdscan.h \
+ include/tables.h
+asm/pptok.$(O): asm/pptok.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h asm/preproc.h
+asm/preproc-nop.$(O): asm/preproc-nop.c include/compiler.h asm/listing.h \
+ include/nasm.h include/nasmlib.h asm/preproc.h
+asm/preproc.$(O): asm/preproc.c include/compiler.h asm/eval.h \
+ include/hashtbl.h asm/listing.h include/nasm.h include/nasmlib.h \
+ asm/preproc.h asm/quote.h asm/stdscan.h include/tables.h asm/tokens.h
+asm/quote.$(O): asm/quote.c include/compiler.h include/nasmlib.h asm/quote.h
+asm/rdstrnum.$(O): asm/rdstrnum.c include/compiler.h include/nasm.h \
+ include/nasmlib.h
+asm/segalloc.$(O): asm/segalloc.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h
+asm/stdscan.$(O): asm/stdscan.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h asm/quote.h asm/stdscan.h
+asm/strfunc.$(O): asm/strfunc.c include/nasm.h include/nasmlib.h
+asm/tokhash.$(O): asm/tokhash.c include/compiler.h include/hashtbl.h \
+ include/insns.h include/nasm.h asm/stdscan.h
+common/common.$(O): common/common.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h
+disasm/disasm.$(O): disasm/disasm.c include/compiler.h disasm/disasm.h \
+ include/disp8.h include/insns.h include/nasm.h x86/regdis.h disasm/sync.h \
+ include/tables.h
+disasm/ndisasm.$(O): disasm/ndisasm.c include/compiler.h disasm/disasm.h \
+ include/insns.h include/nasm.h include/nasmlib.h disasm/sync.h \
+ include/ver.h
+disasm/sync.$(O): disasm/sync.c include/compiler.h include/nasmlib.h \
+ disasm/sync.h
+macros/macros.$(O): macros/macros.c include/hashtbl.h include/nasmlib.h \
+ output/outform.h include/tables.h
+nasmlib/bsi.$(O): nasmlib/bsi.c include/compiler.h include/nasmlib.h
+nasmlib/crc64.$(O): nasmlib/crc64.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h
+nasmlib/error.$(O): nasmlib/error.c include/compiler.h include/nasmlib.h
+nasmlib/file.$(O): nasmlib/file.c include/compiler.h include/nasmlib.h
+nasmlib/filename.$(O): nasmlib/filename.c include/compiler.h \
+ include/nasmlib.h
+nasmlib/hashtbl.$(O): nasmlib/hashtbl.c include/compiler.h include/hashtbl.h \
+ include/nasm.h
+nasmlib/ilog2.$(O): nasmlib/ilog2.c include/compiler.h include/nasmlib.h
+nasmlib/malloc.$(O): nasmlib/malloc.c include/compiler.h include/nasmlib.h
+nasmlib/md5c.$(O): nasmlib/md5c.c include/md5.h
+nasmlib/raa.$(O): nasmlib/raa.c include/nasmlib.h include/raa.h
+nasmlib/rbtree.$(O): nasmlib/rbtree.c include/rbtree.h
+nasmlib/readnum.$(O): nasmlib/readnum.c include/compiler.h include/nasm.h \
+ include/nasmlib.h
+nasmlib/realpath.$(O): nasmlib/realpath.c include/compiler.h \
+ include/nasmlib.h
+nasmlib/saa.$(O): nasmlib/saa.c include/compiler.h include/nasmlib.h \
+ include/saa.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h
+nasmlib/string.$(O): nasmlib/string.c include/compiler.h include/nasmlib.h
+nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
+nasmlib/zerobuf.$(O): nasmlib/zerobuf.c include/compiler.h include/nasmlib.h
+output/codeview.$(O): output/codeview.c include/compiler.h include/hashtbl.h \
+ include/md5.h include/nasm.h include/nasmlib.h output/outlib.h \
+ output/pecoff.h asm/preproc.h include/saa.h version.h
+output/nulldbg.$(O): output/nulldbg.c include/nasm.h include/nasmlib.h \
+ output/outlib.h
+output/nullout.$(O): output/nullout.c include/nasm.h include/nasmlib.h \
+ output/outlib.h
+output/outaout.$(O): output/outaout.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ include/raa.h include/saa.h asm/stdscan.h
+output/outas86.$(O): output/outas86.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h \
+ include/saa.h
+output/outbin.$(O): output/outbin.c include/compiler.h asm/eval.h \
+ include/labels.h include/nasm.h include/nasmlib.h output/outform.h \
+ output/outlib.h include/saa.h asm/stdscan.h
+output/outcoff.$(O): output/outcoff.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ output/pecoff.h include/raa.h include/saa.h
+output/outdbg.$(O): output/outdbg.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h
+output/outelf.$(O): output/outelf.c include/compiler.h output/dwarf.h \
+ output/elf.h asm/eval.h include/nasm.h include/nasmlib.h output/outelf.h \
+ output/outform.h output/outlib.h include/raa.h include/rbtree.h \
+ include/saa.h output/stabs.h asm/stdscan.h include/ver.h
+output/outform.$(O): output/outform.c include/compiler.h output/outform.h
+output/outieee.$(O): output/outieee.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/ver.h
+output/outlib.$(O): output/outlib.c include/compiler.h include/nasm.h \
+ output/outlib.h
+output/outmacho.$(O): output/outmacho.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h \
+ include/rbtree.h include/saa.h
+output/outobj.$(O): output/outobj.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ asm/stdscan.h include/ver.h
+output/outrdf2.$(O): output/outrdf2.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/rdoff.h \
+ include/saa.h
+stdlib/snprintf.$(O): stdlib/snprintf.c include/compiler.h include/nasmlib.h
+stdlib/strlcpy.$(O): stdlib/strlcpy.c include/compiler.h
+stdlib/strnlen.$(O): stdlib/strnlen.c include/compiler.h
+stdlib/vsnprintf.$(O): stdlib/vsnprintf.c include/compiler.h \
+ include/nasmlib.h
+x86/disp8.$(O): x86/disp8.c include/disp8.h
+x86/iflag.$(O): x86/iflag.c include/iflag.h
+x86/insnsa.$(O): x86/insnsa.c include/insns.h include/nasm.h
+x86/insnsb.$(O): x86/insnsb.c include/insns.h include/nasm.h
+x86/insnsd.$(O): x86/insnsd.c include/insns.h include/nasm.h
+x86/insnsn.$(O): x86/insnsn.c include/tables.h
+x86/regdis.$(O): x86/regdis.c x86/regdis.h
+x86/regflags.$(O): x86/regflags.c include/nasm.h include/tables.h
+x86/regs.$(O): x86/regs.c include/tables.h
+x86/regvals.$(O): x86/regvals.c include/tables.h
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 0bb25340..d10bbab0 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -49,29 +49,29 @@ X = .exe
#-- Begin File Lists --#
# Edit in Makefile.in, not here!
-NASM = nasm.$(O) \
- raa.$(O) saa.$(O) rbtree.$(O) \
- float.$(O) insnsa.$(O) insnsb.$(O) \
- directiv.$(O) \
- assemble.$(O) labels.$(O) hashtbl.$(O) parser.$(O) \
+NASM = asm/nasm.$(O) \
+ asm/float.$(O) \
+ asm/directiv.$(O) \
+ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
+ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
+ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) \
+ asm/stdscan.$(O) \
+ asm/strfunc.$(O) asm/tokhash.$(O) \
+ asm/segalloc.$(O) \
+ asm/preproc-nop.$(O) \
+ asm/rdstrnum.$(O) \
+ \
+ macros/macros.$(O) \
+ \
output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \
output/nullout.$(O) \
output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \
output/outelf.$(O) \
output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \
output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \
- output/codeview.$(O) \
- preproc.$(O) quote.$(O) pptok.$(O) \
- macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \
- strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) \
- segalloc.$(O) \
- preproc-nop.$(O) \
- disp8.$(O) rdstrnum.$(O) \
- iflag.$(O) common.$(O)
-
-NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) \
- insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) \
- disp8.$(O) iflag.$(O) common.$(O)
+ output/codeview.$(O)
+
+NDISASM = disasm/ndisasm.$(O) disasm/disasm.$(O) disasm/sync.$(O)
LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
stdlib/strnlen.$(O) \
@@ -80,7 +80,13 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
nasmlib/file.$(O) nasmlib/ilog2.$(O) \
nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
- nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O)
+ nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
+ nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
+ nasmlib/raa.$(O) nasmlib/saa.$(O) \
+ common/common.$(O) \
+ x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \
+ x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
+ x86/disp8.$(O) x86/iflag.$(O)
#-- End File Lists --#
all: nasm$(X) ndisasm$(X)
@@ -253,148 +259,131 @@ everything: all doc rdf
# @path-separator: "/"
# @exclude: "config.h"
#-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(O): assemble.c assemble.h compiler.h directiv.h disp8.h iflag.h \
- iflaggen.h insns.h insnsi.h listing.h nasm.h nasmint.h nasmlib.h opflags.h \
- pptok.h preproc.h regs.h tables.h tokens.h
-common.$(O): common.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-directiv.$(O): directiv.c compiler.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-disasm.$(O): disasm.c compiler.h directiv.h disasm.h disp8.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regdis.h regs.h sync.h tables.h tokens.h
-disp8.$(O): disp8.c compiler.h directiv.h disp8.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-eval.$(O): eval.c compiler.h directiv.h eval.h float.h insnsi.h labels.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-exprlib.$(O): exprlib.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-float.$(O): float.c compiler.h directiv.h float.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-hashtbl.$(O): hashtbl.c compiler.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-iflag.$(O): iflag.c compiler.h iflag.h iflaggen.h nasmint.h
-insnsa.$(O): insnsa.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsb.$(O): insnsb.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsd.$(O): insnsd.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsn.$(O): insnsn.c compiler.h insnsi.h nasmint.h tables.h
-labels.$(O): labels.c compiler.h directiv.h hashtbl.h insnsi.h labels.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-listing.$(O): listing.c compiler.h directiv.h insnsi.h listing.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-macros.$(O): macros.c compiler.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
- tables.h
-nasm.$(O): nasm.c assemble.h compiler.h directiv.h eval.h float.h iflag.h \
- iflaggen.h insns.h insnsi.h labels.h listing.h nasm.h nasmint.h nasmlib.h \
- opflags.h output/outform.h parser.h pptok.h preproc.h raa.h regs.h saa.h \
- stdscan.h tables.h tokens.h ver.h
-nasmlib/bsi.$(O): nasmlib/bsi.c compiler.h nasmint.h nasmlib.h
-nasmlib/crc64.$(O): nasmlib/crc64.c compiler.h hashtbl.h nasmint.h nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c compiler.h nasmint.h nasmlib.h
-nasmlib/file.$(O): nasmlib/file.c compiler.h nasmint.h nasmlib.h
-nasmlib/filename.$(O): nasmlib/filename.c compiler.h nasmint.h nasmlib.h
-nasmlib/ilog2.$(O): nasmlib/ilog2.c compiler.h nasmint.h nasmlib.h
-nasmlib/malloc.$(O): nasmlib/malloc.c compiler.h nasmint.h nasmlib.h
-nasmlib/md5c.$(O): nasmlib/md5c.c compiler.h md5.h nasmint.h
-nasmlib/readnum.$(O): nasmlib/readnum.c compiler.h directiv.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h nasmint.h nasmlib.h
-nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h hashtbl.h nasmint.h \
- nasmlib.h
-nasmlib/string.$(O): nasmlib/string.c compiler.h nasmint.h nasmlib.h
-nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
-nasmlib/zerobuf.$(O): nasmlib/zerobuf.c compiler.h nasmint.h nasmlib.h
-ndisasm.$(O): ndisasm.c compiler.h directiv.h disasm.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h sync.h tables.h tokens.h ver.h
-output/codeview.$(O): output/codeview.c compiler.h directiv.h hashtbl.h \
- insnsi.h md5.h nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h \
- output/pecoff.h pptok.h preproc.h regs.h saa.h tables.h version.h
-output/nulldbg.$(O): output/nulldbg.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \
- tables.h
-output/nullout.$(O): output/nullout.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \
- tables.h
-output/outaout.$(O): output/outaout.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h raa.h regs.h saa.h stdscan.h tables.h
-output/outas86.$(O): output/outas86.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h raa.h regs.h saa.h tables.h
-output/outbin.$(O): output/outbin.c compiler.h directiv.h eval.h insnsi.h \
- labels.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h regs.h saa.h stdscan.h tables.h
-output/outcoff.$(O): output/outcoff.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- output/pecoff.h pptok.h preproc.h raa.h regs.h saa.h tables.h
-output/outdbg.$(O): output/outdbg.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
- tables.h
-output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
- output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \
- preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
-output/outform.$(O): output/outform.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
- tables.h
-output/outieee.$(O): output/outieee.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h regs.h tables.h ver.h
-output/outlib.$(O): output/outlib.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \
- tables.h
-output/outmacho.$(O): output/outmacho.c compiler.h directiv.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h raa.h rbtree.h regs.h saa.h tables.h
-output/outobj.$(O): output/outobj.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h regs.h stdscan.h tables.h ver.h
-output/outrdf2.$(O): output/outrdf2.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h rdoff/rdoff.h regs.h saa.h tables.h
-parser.$(O): parser.c compiler.h directiv.h eval.h float.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h parser.h \
- pptok.h preproc.h regs.h stdscan.h tables.h tokens.h
-pptok.$(O): pptok.c compiler.h hashtbl.h nasmint.h nasmlib.h pptok.h \
- preproc.h
-preproc-nop.$(O): preproc-nop.c compiler.h directiv.h insnsi.h listing.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-preproc.$(O): preproc.c compiler.h directiv.h eval.h hashtbl.h insnsi.h \
- listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h quote.h \
- regs.h stdscan.h tables.h tokens.h
-quote.$(O): quote.c compiler.h nasmint.h nasmlib.h quote.h
-raa.$(O): raa.c compiler.h nasmint.h nasmlib.h raa.h
-rbtree.$(O): rbtree.c compiler.h nasmint.h rbtree.h
-rdstrnum.$(O): rdstrnum.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regdis.$(O): regdis.c regdis.h regs.h
-regflags.$(O): regflags.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regs.$(O): regs.c compiler.h insnsi.h nasmint.h tables.h
-regvals.$(O): regvals.c compiler.h insnsi.h nasmint.h tables.h
-saa.$(O): saa.c compiler.h nasmint.h nasmlib.h saa.h
-segalloc.$(O): segalloc.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-stdlib/snprintf.$(O): stdlib/snprintf.c compiler.h nasmint.h nasmlib.h
-stdlib/strlcpy.$(O): stdlib/strlcpy.c compiler.h nasmint.h
-stdlib/strnlen.$(O): stdlib/strnlen.c compiler.h nasmint.h
-stdlib/vsnprintf.$(O): stdlib/vsnprintf.c compiler.h nasmint.h nasmlib.h
-stdscan.$(O): stdscan.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h quote.h \
- regs.h stdscan.h tables.h tokens.h
-strfunc.$(O): strfunc.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-sync.$(O): sync.c compiler.h nasmint.h nasmlib.h sync.h
-tokhash.$(O): tokhash.c compiler.h directiv.h hashtbl.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h stdscan.h tables.h tokens.h
+asm/assemble.$(O): asm/assemble.c asm/assemble.h include/compiler.h \
+ include/disp8.h include/insns.h asm/listing.h include/nasm.h \
+ include/nasmlib.h include/tables.h
+asm/directiv.$(O): asm/directiv.c include/compiler.h asm/directiv.h \
+ include/hashtbl.h include/nasm.h
+asm/eval.$(O): asm/eval.c include/compiler.h asm/eval.h asm/float.h \
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/exprlib.$(O): asm/exprlib.c include/nasm.h
+asm/float.$(O): asm/float.c include/compiler.h asm/float.h include/nasm.h
+asm/labels.$(O): asm/labels.c include/compiler.h include/hashtbl.h \
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/listing.$(O): asm/listing.c include/compiler.h asm/listing.h \
+ include/nasm.h include/nasmlib.h
+asm/nasm.$(O): asm/nasm.c asm/assemble.h include/compiler.h asm/eval.h \
+ asm/float.h include/iflag.h include/insns.h include/labels.h asm/listing.h \
+ include/nasm.h include/nasmlib.h output/outform.h asm/parser.h \
+ asm/preproc.h include/raa.h include/saa.h asm/stdscan.h include/ver.h
+asm/parser.$(O): asm/parser.c include/compiler.h asm/eval.h asm/float.h \
+ include/insns.h include/nasm.h include/nasmlib.h asm/parser.h asm/stdscan.h \
+ include/tables.h
+asm/pptok.$(O): asm/pptok.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h asm/preproc.h
+asm/preproc-nop.$(O): asm/preproc-nop.c include/compiler.h asm/listing.h \
+ include/nasm.h include/nasmlib.h asm/preproc.h
+asm/preproc.$(O): asm/preproc.c include/compiler.h asm/eval.h \
+ include/hashtbl.h asm/listing.h include/nasm.h include/nasmlib.h \
+ asm/preproc.h asm/quote.h asm/stdscan.h include/tables.h asm/tokens.h
+asm/quote.$(O): asm/quote.c include/compiler.h include/nasmlib.h asm/quote.h
+asm/rdstrnum.$(O): asm/rdstrnum.c include/compiler.h include/nasm.h \
+ include/nasmlib.h
+asm/segalloc.$(O): asm/segalloc.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h
+asm/stdscan.$(O): asm/stdscan.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h asm/quote.h asm/stdscan.h
+asm/strfunc.$(O): asm/strfunc.c include/nasm.h include/nasmlib.h
+asm/tokhash.$(O): asm/tokhash.c include/compiler.h include/hashtbl.h \
+ include/insns.h include/nasm.h asm/stdscan.h
+common/common.$(O): common/common.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h
+disasm/disasm.$(O): disasm/disasm.c include/compiler.h disasm/disasm.h \
+ include/disp8.h include/insns.h include/nasm.h x86/regdis.h disasm/sync.h \
+ include/tables.h
+disasm/ndisasm.$(O): disasm/ndisasm.c include/compiler.h disasm/disasm.h \
+ include/insns.h include/nasm.h include/nasmlib.h disasm/sync.h \
+ include/ver.h
+disasm/sync.$(O): disasm/sync.c include/compiler.h include/nasmlib.h \
+ disasm/sync.h
+macros/macros.$(O): macros/macros.c include/hashtbl.h include/nasmlib.h \
+ output/outform.h include/tables.h
+nasmlib/bsi.$(O): nasmlib/bsi.c include/compiler.h include/nasmlib.h
+nasmlib/crc64.$(O): nasmlib/crc64.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h
+nasmlib/error.$(O): nasmlib/error.c include/compiler.h include/nasmlib.h
+nasmlib/file.$(O): nasmlib/file.c include/compiler.h include/nasmlib.h
+nasmlib/filename.$(O): nasmlib/filename.c include/compiler.h \
+ include/nasmlib.h
+nasmlib/hashtbl.$(O): nasmlib/hashtbl.c include/compiler.h include/hashtbl.h \
+ include/nasm.h
+nasmlib/ilog2.$(O): nasmlib/ilog2.c include/compiler.h include/nasmlib.h
+nasmlib/malloc.$(O): nasmlib/malloc.c include/compiler.h include/nasmlib.h
+nasmlib/md5c.$(O): nasmlib/md5c.c include/md5.h
+nasmlib/raa.$(O): nasmlib/raa.c include/nasmlib.h include/raa.h
+nasmlib/rbtree.$(O): nasmlib/rbtree.c include/rbtree.h
+nasmlib/readnum.$(O): nasmlib/readnum.c include/compiler.h include/nasm.h \
+ include/nasmlib.h
+nasmlib/realpath.$(O): nasmlib/realpath.c include/compiler.h \
+ include/nasmlib.h
+nasmlib/saa.$(O): nasmlib/saa.c include/compiler.h include/nasmlib.h \
+ include/saa.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h
+nasmlib/string.$(O): nasmlib/string.c include/compiler.h include/nasmlib.h
+nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
+nasmlib/zerobuf.$(O): nasmlib/zerobuf.c include/compiler.h include/nasmlib.h
+output/codeview.$(O): output/codeview.c include/compiler.h include/hashtbl.h \
+ include/md5.h include/nasm.h include/nasmlib.h output/outlib.h \
+ output/pecoff.h asm/preproc.h include/saa.h version.h
+output/nulldbg.$(O): output/nulldbg.c include/nasm.h include/nasmlib.h \
+ output/outlib.h
+output/nullout.$(O): output/nullout.c include/nasm.h include/nasmlib.h \
+ output/outlib.h
+output/outaout.$(O): output/outaout.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ include/raa.h include/saa.h asm/stdscan.h
+output/outas86.$(O): output/outas86.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h \
+ include/saa.h
+output/outbin.$(O): output/outbin.c include/compiler.h asm/eval.h \
+ include/labels.h include/nasm.h include/nasmlib.h output/outform.h \
+ output/outlib.h include/saa.h asm/stdscan.h
+output/outcoff.$(O): output/outcoff.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ output/pecoff.h include/raa.h include/saa.h
+output/outdbg.$(O): output/outdbg.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h
+output/outelf.$(O): output/outelf.c include/compiler.h output/dwarf.h \
+ output/elf.h asm/eval.h include/nasm.h include/nasmlib.h output/outelf.h \
+ output/outform.h output/outlib.h include/raa.h include/rbtree.h \
+ include/saa.h output/stabs.h asm/stdscan.h include/ver.h
+output/outform.$(O): output/outform.c include/compiler.h output/outform.h
+output/outieee.$(O): output/outieee.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/ver.h
+output/outlib.$(O): output/outlib.c include/compiler.h include/nasm.h \
+ output/outlib.h
+output/outmacho.$(O): output/outmacho.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h \
+ include/rbtree.h include/saa.h
+output/outobj.$(O): output/outobj.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ asm/stdscan.h include/ver.h
+output/outrdf2.$(O): output/outrdf2.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/rdoff.h \
+ include/saa.h
+stdlib/snprintf.$(O): stdlib/snprintf.c include/compiler.h include/nasmlib.h
+stdlib/strlcpy.$(O): stdlib/strlcpy.c include/compiler.h
+stdlib/strnlen.$(O): stdlib/strnlen.c include/compiler.h
+stdlib/vsnprintf.$(O): stdlib/vsnprintf.c include/compiler.h \
+ include/nasmlib.h
+x86/disp8.$(O): x86/disp8.c include/disp8.h
+x86/iflag.$(O): x86/iflag.c include/iflag.h
+x86/insnsa.$(O): x86/insnsa.c include/insns.h include/nasm.h
+x86/insnsb.$(O): x86/insnsb.c include/insns.h include/nasm.h
+x86/insnsd.$(O): x86/insnsd.c include/insns.h include/nasm.h
+x86/insnsn.$(O): x86/insnsn.c include/tables.h
+x86/regdis.$(O): x86/regdis.c x86/regdis.h
+x86/regflags.$(O): x86/regflags.c include/nasm.h include/tables.h
+x86/regs.$(O): x86/regs.c include/tables.h
+x86/regvals.$(O): x86/regvals.c include/tables.h
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index 816cb1dd..5c9bfa8e 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -31,28 +31,28 @@ O = o
#-- Begin File Lists --#
# Edit in Makefile.in, not here!
NASM = nasm.o \
- raa.o saa.o rbtree.o \
- float.o insnsa.o insnsb.o \
+ float.o \
directiv.o \
- assemble.o labels.o hashtbl.o parser.o \
+ assemble.o labels.o parser.o \
+ preproc.o quote.o pptok.o \
+ listing.o eval.o exprlib.o \
+ stdscan.o \
+ strfunc.o tokhash.o \
+ segalloc.o \
+ preproc-nop.o \
+ rdstrnum.o \
+ \
+ macros.o \
+ \
outform.o outlib.o nulldbg.o \
nullout.o \
outbin.o outaout.o outcoff.o \
outelf.o \
outobj.o outas86.o outrdf2.o \
outdbg.o outieee.o outmacho.o \
- codeview.o \
- preproc.o quote.o pptok.o \
- macros.o listing.o eval.o exprlib.o stdscan.o \
- strfunc.o tokhash.o regvals.o regflags.o \
- segalloc.o \
- preproc-nop.o \
- disp8.o rdstrnum.o \
- iflag.o common.o
+ codeview.o
-NDISASM = ndisasm.o disasm.o sync.o \
- insnsd.o insnsb.o insnsn.o regs.o regdis.o \
- disp8.o iflag.o common.o
+NDISASM = ndisasm.o disasm.o sync.o
LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
strnlen.o \
@@ -61,7 +61,13 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
error.o md5c.o string.o \
file.o ilog2.o \
realpath.o filename.o srcfile.o \
- zerobuf.o readnum.o bsi.o
+ zerobuf.o readnum.o bsi.o \
+ rbtree.o hashtbl.o \
+ raa.o saa.o \
+ common.o \
+ insnsa.o insnsb.o insnsd.o insnsn.o \
+ regs.o regvals.o regflags.o regdis.o \
+ disp8.o iflag.o
#-- End File Lists --#
NASM_OBJ = $(addprefix $(OBJDIR)/,$(notdir $(NASM))) $(EOLIST)
@@ -139,144 +145,89 @@ $(OBJDIR)/version.mak: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR)
# @path-separator: ""
# @continuation: "\"
#-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.o: assemble.c assemble.h compiler.h config.h directiv.h disp8.h \
- iflag.h iflaggen.h insns.h insnsi.h listing.h nasm.h nasmint.h nasmlib.h \
- opflags.h pptok.h preproc.h regs.h tables.h tokens.h
-common.o: common.c compiler.h config.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-directiv.o: directiv.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-disasm.o: disasm.c compiler.h config.h directiv.h disasm.h disp8.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regdis.h regs.h sync.h tables.h tokens.h
-disp8.o: disp8.c compiler.h config.h directiv.h disp8.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-eval.o: eval.c compiler.h config.h directiv.h eval.h float.h insnsi.h \
- labels.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-exprlib.o: exprlib.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-float.o: float.c compiler.h config.h directiv.h float.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-hashtbl.o: hashtbl.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-iflag.o: iflag.c compiler.h config.h iflag.h iflaggen.h nasmint.h
-insnsa.o: insnsa.c compiler.h config.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsb.o: insnsb.c compiler.h config.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsd.o: insnsd.c compiler.h config.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsn.o: insnsn.c compiler.h config.h insnsi.h nasmint.h tables.h
-labels.o: labels.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- labels.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-listing.o: listing.c compiler.h config.h directiv.h insnsi.h listing.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-macros.o: macros.c compiler.h config.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h pptok.h preproc.h regs.h tables.h
-nasm.o: nasm.c assemble.h compiler.h config.h directiv.h eval.h float.h \
- iflag.h iflaggen.h insns.h insnsi.h labels.h listing.h nasm.h nasmint.h \
- nasmlib.h opflags.h outform.h parser.h pptok.h preproc.h raa.h regs.h saa.h \
- stdscan.h tables.h tokens.h ver.h
-bsi.o: bsi.c compiler.h config.h nasmint.h nasmlib.h
-crc64.o: crc64.c compiler.h config.h hashtbl.h nasmint.h nasmlib.h
-error.o: error.c compiler.h config.h nasmint.h nasmlib.h
-file.o: file.c compiler.h config.h nasmint.h nasmlib.h
-filename.o: filename.c compiler.h config.h nasmint.h nasmlib.h
-ilog2.o: ilog2.c compiler.h config.h nasmint.h nasmlib.h
-malloc.o: malloc.c compiler.h config.h nasmint.h nasmlib.h
-md5c.o: md5c.c compiler.h config.h md5.h nasmint.h
-readnum.o: readnum.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-realpath.o: realpath.c compiler.h config.h nasmint.h nasmlib.h
-srcfile.o: srcfile.c compiler.h config.h hashtbl.h nasmint.h nasmlib.h
-string.o: string.c compiler.h config.h nasmint.h nasmlib.h
-ver.o: ver.c ver.h version.h
-zerobuf.o: zerobuf.c compiler.h config.h nasmint.h nasmlib.h
-ndisasm.o: ndisasm.c compiler.h config.h directiv.h disasm.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regs.h sync.h tables.h tokens.h ver.h
-codeview.o: codeview.c compiler.h config.h directiv.h hashtbl.h insnsi.h \
- md5.h nasm.h nasmint.h nasmlib.h opflags.h outlib.h pecoff.h pptok.h \
- preproc.h regs.h saa.h tables.h version.h
-nulldbg.o: nulldbg.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outlib.h pptok.h preproc.h regs.h tables.h
-nullout.o: nullout.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outlib.h pptok.h preproc.h regs.h tables.h
-outaout.o: outaout.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h \
- regs.h saa.h stdscan.h tables.h
-outas86.o: outas86.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h \
- regs.h saa.h tables.h
-outbin.o: outbin.c compiler.h config.h directiv.h eval.h insnsi.h labels.h \
- nasm.h nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h \
- regs.h saa.h stdscan.h tables.h
-outcoff.o: outcoff.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pecoff.h pptok.h preproc.h \
- raa.h regs.h saa.h tables.h
-outdbg.o: outdbg.c compiler.h config.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h outform.h pptok.h preproc.h regs.h tables.h
-outelf.o: outelf.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h dwarf.h elf.h outelf.h outform.h outlib.h \
- stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h \
+assemble.o: assemble.c assemble.h compiler.h disp8.h insns.h listing.h \
+ nasm.h nasmlib.h tables.h
+directiv.o: directiv.c compiler.h directiv.h hashtbl.h nasm.h
+eval.o: eval.c compiler.h eval.h float.h labels.h nasm.h nasmlib.h
+exprlib.o: exprlib.c nasm.h
+float.o: float.c compiler.h float.h nasm.h
+labels.o: labels.c compiler.h hashtbl.h labels.h nasm.h nasmlib.h
+listing.o: listing.c compiler.h listing.h nasm.h nasmlib.h
+nasm.o: nasm.c assemble.h compiler.h eval.h float.h iflag.h insns.h labels.h \
+ listing.h nasm.h nasmlib.h outform.h parser.h preproc.h raa.h saa.h \
+ stdscan.h ver.h
+parser.o: parser.c compiler.h eval.h float.h insns.h nasm.h nasmlib.h \
+ parser.h stdscan.h tables.h
+pptok.o: pptok.c compiler.h hashtbl.h nasmlib.h preproc.h
+preproc-nop.o: preproc-nop.c compiler.h listing.h nasm.h nasmlib.h preproc.h
+preproc.o: preproc.c compiler.h eval.h hashtbl.h listing.h nasm.h nasmlib.h \
+ preproc.h quote.h stdscan.h tables.h tokens.h
+quote.o: quote.c compiler.h nasmlib.h quote.h
+rdstrnum.o: rdstrnum.c compiler.h nasm.h nasmlib.h
+segalloc.o: segalloc.c compiler.h insns.h nasm.h nasmlib.h
+stdscan.o: stdscan.c compiler.h insns.h nasm.h nasmlib.h quote.h stdscan.h
+strfunc.o: strfunc.c nasm.h nasmlib.h
+tokhash.o: tokhash.c compiler.h hashtbl.h insns.h nasm.h stdscan.h
+common.o: common.c compiler.h insns.h nasm.h nasmlib.h
+disasm.o: disasm.c compiler.h disasm.h disp8.h insns.h nasm.h regdis.h \
+ sync.h tables.h
+ndisasm.o: ndisasm.c compiler.h disasm.h insns.h nasm.h nasmlib.h sync.h \
ver.h
-outform.o: outform.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h pptok.h preproc.h regs.h tables.h
-outieee.o: outieee.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h regs.h \
- tables.h ver.h
-outlib.o: outlib.c compiler.h config.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h outlib.h pptok.h preproc.h regs.h tables.h
-outmacho.o: outmacho.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h \
- rbtree.h regs.h saa.h tables.h
-outobj.o: outobj.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h regs.h \
- stdscan.h tables.h ver.h
-outrdf2.o: outrdf2.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h rdoff.h \
- regs.h saa.h tables.h
-parser.o: parser.c compiler.h config.h directiv.h eval.h float.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h parser.h \
- pptok.h preproc.h regs.h stdscan.h tables.h tokens.h
-pptok.o: pptok.c compiler.h config.h hashtbl.h nasmint.h nasmlib.h pptok.h \
- preproc.h
-preproc-nop.o: preproc-nop.c compiler.h config.h directiv.h insnsi.h \
- listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h
-preproc.o: preproc.c compiler.h config.h directiv.h eval.h hashtbl.h \
- insnsi.h listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- quote.h regs.h stdscan.h tables.h tokens.h
-quote.o: quote.c compiler.h config.h nasmint.h nasmlib.h quote.h
-raa.o: raa.c compiler.h config.h nasmint.h nasmlib.h raa.h
-rbtree.o: rbtree.c compiler.h config.h nasmint.h rbtree.h
-rdstrnum.o: rdstrnum.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regdis.o: regdis.c regdis.h regs.h
-regflags.o: regflags.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regs.o: regs.c compiler.h config.h insnsi.h nasmint.h tables.h
-regvals.o: regvals.c compiler.h config.h insnsi.h nasmint.h tables.h
-saa.o: saa.c compiler.h config.h nasmint.h nasmlib.h saa.h
-segalloc.o: segalloc.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h tables.h tokens.h
-snprintf.o: snprintf.c compiler.h config.h nasmint.h nasmlib.h
-strlcpy.o: strlcpy.c compiler.h config.h nasmint.h
-strnlen.o: strnlen.c compiler.h config.h nasmint.h
-vsnprintf.o: vsnprintf.c compiler.h config.h nasmint.h nasmlib.h
-stdscan.o: stdscan.c compiler.h config.h directiv.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- quote.h regs.h stdscan.h tables.h tokens.h
-strfunc.o: strfunc.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-sync.o: sync.c compiler.h config.h nasmint.h nasmlib.h sync.h
-tokhash.o: tokhash.c compiler.h config.h directiv.h hashtbl.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regs.h stdscan.h tables.h tokens.h
+sync.o: sync.c compiler.h nasmlib.h sync.h
+macros.o: macros.c hashtbl.h nasmlib.h outform.h tables.h
+bsi.o: bsi.c compiler.h nasmlib.h
+crc64.o: crc64.c compiler.h hashtbl.h nasmlib.h
+error.o: error.c compiler.h nasmlib.h
+file.o: file.c compiler.h nasmlib.h
+filename.o: filename.c compiler.h nasmlib.h
+hashtbl.o: hashtbl.c compiler.h hashtbl.h nasm.h
+ilog2.o: ilog2.c compiler.h nasmlib.h
+malloc.o: malloc.c compiler.h nasmlib.h
+md5c.o: md5c.c md5.h
+raa.o: raa.c nasmlib.h raa.h
+rbtree.o: rbtree.c rbtree.h
+readnum.o: readnum.c compiler.h nasm.h nasmlib.h
+realpath.o: realpath.c compiler.h nasmlib.h
+saa.o: saa.c compiler.h nasmlib.h saa.h
+srcfile.o: srcfile.c compiler.h hashtbl.h nasmlib.h
+string.o: string.c compiler.h nasmlib.h
+ver.o: ver.c ver.h version.h
+zerobuf.o: zerobuf.c compiler.h nasmlib.h
+codeview.o: codeview.c compiler.h hashtbl.h md5.h nasm.h nasmlib.h outlib.h \
+ pecoff.h preproc.h saa.h version.h
+nulldbg.o: nulldbg.c nasm.h nasmlib.h outlib.h
+nullout.o: nullout.c nasm.h nasmlib.h outlib.h
+outaout.o: outaout.c compiler.h eval.h nasm.h nasmlib.h outform.h outlib.h \
+ raa.h saa.h stdscan.h
+outas86.o: outas86.c compiler.h nasm.h nasmlib.h outform.h outlib.h raa.h \
+ saa.h
+outbin.o: outbin.c compiler.h eval.h labels.h nasm.h nasmlib.h outform.h \
+ outlib.h saa.h stdscan.h
+outcoff.o: outcoff.c compiler.h eval.h nasm.h nasmlib.h outform.h outlib.h \
+ pecoff.h raa.h saa.h
+outdbg.o: outdbg.c compiler.h nasm.h nasmlib.h outform.h
+outelf.o: outelf.c compiler.h dwarf.h elf.h eval.h nasm.h nasmlib.h outelf.h \
+ outform.h outlib.h raa.h rbtree.h saa.h stabs.h stdscan.h ver.h
+outform.o: outform.c compiler.h outform.h
+outieee.o: outieee.c compiler.h nasm.h nasmlib.h outform.h outlib.h ver.h
+outlib.o: outlib.c compiler.h nasm.h outlib.h
+outmacho.o: outmacho.c compiler.h nasm.h nasmlib.h outform.h outlib.h raa.h \
+ rbtree.h saa.h
+outobj.o: outobj.c compiler.h eval.h nasm.h nasmlib.h outform.h outlib.h \
+ stdscan.h ver.h
+outrdf2.o: outrdf2.c compiler.h nasm.h nasmlib.h outform.h outlib.h rdoff.h \
+ saa.h
+snprintf.o: snprintf.c compiler.h nasmlib.h
+strlcpy.o: strlcpy.c compiler.h
+strnlen.o: strnlen.c compiler.h
+vsnprintf.o: vsnprintf.c compiler.h nasmlib.h
+disp8.o: disp8.c disp8.h
+iflag.o: iflag.c iflag.h
+insnsa.o: insnsa.c insns.h nasm.h
+insnsb.o: insnsb.c insns.h nasm.h
+insnsd.o: insnsd.c insns.h nasm.h
+insnsn.o: insnsn.c tables.h
+regdis.o: regdis.c regdis.h
+regflags.o: regflags.c nasm.h tables.h
+regs.o: regs.c tables.h
+regvals.o: regvals.c tables.h
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index ac73f148..9002b7d3 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -46,29 +46,29 @@ X = .exe
#-- Begin File Lists --#
# Edit in Makefile.in, not here!
-NASM = nasm.$(O) &
- raa.$(O) saa.$(O) rbtree.$(O) &
- float.$(O) insnsa.$(O) insnsb.$(O) &
- directiv.$(O) &
- assemble.$(O) labels.$(O) hashtbl.$(O) parser.$(O) &
+NASM = asm/nasm.$(O) &
+ asm/float.$(O) &
+ asm/directiv.$(O) &
+ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) &
+ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) &
+ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) &
+ asm/stdscan.$(O) &
+ asm/strfunc.$(O) asm/tokhash.$(O) &
+ asm/segalloc.$(O) &
+ asm/preproc-nop.$(O) &
+ asm/rdstrnum.$(O) &
+ &
+ macros/macros.$(O) &
+ &
output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) &
output/nullout.$(O) &
output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) &
output/outelf.$(O) &
output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) &
output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) &
- output/codeview.$(O) &
- preproc.$(O) quote.$(O) pptok.$(O) &
- macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) &
- strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) &
- segalloc.$(O) &
- preproc-nop.$(O) &
- disp8.$(O) rdstrnum.$(O) &
- iflag.$(O) common.$(O)
-
-NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) &
- insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) &
- disp8.$(O) iflag.$(O) common.$(O)
+ output/codeview.$(O)
+
+NDISASM = disasm/ndisasm.$(O) disasm/disasm.$(O) disasm/sync.$(O)
LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
stdlib/strnlen.$(O) &
@@ -77,7 +77,13 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) &
nasmlib/file.$(O) nasmlib/ilog2.$(O) &
nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) &
- nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O)
+ nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) &
+ nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) &
+ nasmlib/raa.$(O) nasmlib/saa.$(O) &
+ common/common.$(O) &
+ x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) &
+ x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) &
+ x86/disp8.$(O) x86/iflag.$(O)
#-- End File Lists --#
what: .SYMBOLIC
@@ -276,162 +282,131 @@ alldeps: perlreq .SYMBOLIC
# @exclude: ""
# @continuation: "&"
#-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(O): assemble.c assemble.h compiler.h config.h directiv.h disp8.h &
- iflag.h iflaggen.h insns.h insnsi.h listing.h nasm.h nasmint.h nasmlib.h &
- opflags.h pptok.h preproc.h regs.h tables.h tokens.h
-common.$(O): common.c compiler.h config.h directiv.h iflag.h iflaggen.h &
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- regs.h tables.h tokens.h
-directiv.$(O): directiv.c compiler.h config.h directiv.h hashtbl.h insnsi.h &
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-disasm.$(O): disasm.c compiler.h config.h directiv.h disasm.h disp8.h &
- iflag.h iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h &
- pptok.h preproc.h regdis.h regs.h sync.h tables.h tokens.h
-disp8.$(O): disp8.c compiler.h config.h directiv.h disp8.h insnsi.h nasm.h &
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-eval.$(O): eval.c compiler.h config.h directiv.h eval.h float.h insnsi.h &
- labels.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h &
- tables.h
-exprlib.$(O): exprlib.c compiler.h config.h directiv.h insnsi.h nasm.h &
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-float.$(O): float.c compiler.h config.h directiv.h float.h insnsi.h nasm.h &
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-hashtbl.$(O): hashtbl.c compiler.h config.h directiv.h hashtbl.h insnsi.h &
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-iflag.$(O): iflag.c compiler.h config.h iflag.h iflaggen.h nasmint.h
-insnsa.$(O): insnsa.c compiler.h config.h directiv.h iflag.h iflaggen.h &
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- regs.h tables.h tokens.h
-insnsb.$(O): insnsb.c compiler.h config.h directiv.h iflag.h iflaggen.h &
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- regs.h tables.h tokens.h
-insnsd.$(O): insnsd.c compiler.h config.h directiv.h iflag.h iflaggen.h &
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- regs.h tables.h tokens.h
-insnsn.$(O): insnsn.c compiler.h config.h insnsi.h nasmint.h tables.h
-labels.$(O): labels.c compiler.h config.h directiv.h hashtbl.h insnsi.h &
- labels.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h &
- tables.h
-listing.$(O): listing.c compiler.h config.h directiv.h insnsi.h listing.h &
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-macros.$(O): macros.c compiler.h config.h directiv.h hashtbl.h insnsi.h &
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h &
- regs.h tables.h
-nasm.$(O): nasm.c assemble.h compiler.h config.h directiv.h eval.h float.h &
- iflag.h iflaggen.h insns.h insnsi.h labels.h listing.h nasm.h nasmint.h &
- nasmlib.h opflags.h output/outform.h parser.h pptok.h preproc.h raa.h &
- regs.h saa.h stdscan.h tables.h tokens.h ver.h
-nasmlib/bsi.$(O): nasmlib/bsi.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/crc64.$(O): nasmlib/crc64.c compiler.h config.h hashtbl.h nasmint.h &
- nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/file.$(O): nasmlib/file.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/filename.$(O): nasmlib/filename.c compiler.h config.h nasmint.h &
- nasmlib.h
-nasmlib/ilog2.$(O): nasmlib/ilog2.c compiler.h config.h nasmint.h nasmlib.h
-nasmlib/malloc.$(O): nasmlib/malloc.c compiler.h config.h nasmint.h &
- nasmlib.h
-nasmlib/md5c.$(O): nasmlib/md5c.c compiler.h config.h md5.h nasmint.h
-nasmlib/readnum.$(O): nasmlib/readnum.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h &
- tables.h
-nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h config.h nasmint.h &
- nasmlib.h
-nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h config.h hashtbl.h &
- nasmint.h nasmlib.h
-nasmlib/string.$(O): nasmlib/string.c compiler.h config.h nasmint.h &
- nasmlib.h
-nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
-nasmlib/zerobuf.$(O): nasmlib/zerobuf.c compiler.h config.h nasmint.h &
- nasmlib.h
-ndisasm.$(O): ndisasm.c compiler.h config.h directiv.h disasm.h iflag.h &
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h &
- preproc.h regs.h sync.h tables.h tokens.h ver.h
-output/codeview.$(O): output/codeview.c compiler.h config.h directiv.h &
- hashtbl.h insnsi.h md5.h nasm.h nasmint.h nasmlib.h opflags.h &
- output/outlib.h output/pecoff.h pptok.h preproc.h regs.h saa.h tables.h &
- version.h
-output/nulldbg.$(O): output/nulldbg.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h &
- preproc.h regs.h tables.h
-output/nullout.$(O): output/nullout.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h &
- preproc.h regs.h tables.h
-output/outaout.$(O): output/outaout.c compiler.h config.h directiv.h eval.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h tables.h
-output/outas86.$(O): output/outas86.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h raa.h regs.h saa.h tables.h
-output/outbin.$(O): output/outbin.c compiler.h config.h directiv.h eval.h &
- insnsi.h labels.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h regs.h saa.h stdscan.h tables.h
-output/outcoff.$(O): output/outcoff.c compiler.h config.h directiv.h eval.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h output/pecoff.h pptok.h preproc.h raa.h regs.h saa.h &
- tables.h
-output/outdbg.$(O): output/outdbg.c compiler.h config.h directiv.h insnsi.h &
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h &
- regs.h tables.h
-output/outelf.$(O): output/outelf.c compiler.h config.h directiv.h eval.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h &
- output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h &
- preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
-output/outform.$(O): output/outform.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h &
- preproc.h regs.h tables.h
-output/outieee.$(O): output/outieee.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h regs.h tables.h ver.h
-output/outlib.$(O): output/outlib.c compiler.h config.h directiv.h insnsi.h &
- nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h &
- regs.h tables.h
-output/outmacho.$(O): output/outmacho.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h tables.h
-output/outobj.$(O): output/outobj.c compiler.h config.h directiv.h eval.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h regs.h stdscan.h tables.h ver.h
-output/outrdf2.$(O): output/outrdf2.c compiler.h config.h directiv.h &
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h &
- output/outlib.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h tables.h
-parser.$(O): parser.c compiler.h config.h directiv.h eval.h float.h iflag.h &
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h parser.h &
- pptok.h preproc.h regs.h stdscan.h tables.h tokens.h
-pptok.$(O): pptok.c compiler.h config.h hashtbl.h nasmint.h nasmlib.h &
- pptok.h preproc.h
-preproc-nop.$(O): preproc-nop.c compiler.h config.h directiv.h insnsi.h &
- listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h &
- tables.h
-preproc.$(O): preproc.c compiler.h config.h directiv.h eval.h hashtbl.h &
- insnsi.h listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- quote.h regs.h stdscan.h tables.h tokens.h
-quote.$(O): quote.c compiler.h config.h nasmint.h nasmlib.h quote.h
-raa.$(O): raa.c compiler.h config.h nasmint.h nasmlib.h raa.h
-rbtree.$(O): rbtree.c compiler.h config.h nasmint.h rbtree.h
-rdstrnum.$(O): rdstrnum.c compiler.h config.h directiv.h insnsi.h nasm.h &
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regdis.$(O): regdis.c regdis.h regs.h
-regflags.$(O): regflags.c compiler.h config.h directiv.h insnsi.h nasm.h &
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regs.$(O): regs.c compiler.h config.h insnsi.h nasmint.h tables.h
-regvals.$(O): regvals.c compiler.h config.h insnsi.h nasmint.h tables.h
-saa.$(O): saa.c compiler.h config.h nasmint.h nasmlib.h saa.h
-segalloc.$(O): segalloc.c compiler.h config.h directiv.h iflag.h iflaggen.h &
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- regs.h tables.h tokens.h
-stdlib/snprintf.$(O): stdlib/snprintf.c compiler.h config.h nasmint.h &
- nasmlib.h
-stdlib/strlcpy.$(O): stdlib/strlcpy.c compiler.h config.h nasmint.h
-stdlib/strnlen.$(O): stdlib/strnlen.c compiler.h config.h nasmint.h
-stdlib/vsnprintf.$(O): stdlib/vsnprintf.c compiler.h config.h nasmint.h &
- nasmlib.h
-stdscan.$(O): stdscan.c compiler.h config.h directiv.h iflag.h iflaggen.h &
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h &
- quote.h regs.h stdscan.h tables.h tokens.h
-strfunc.$(O): strfunc.c compiler.h config.h directiv.h insnsi.h nasm.h &
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-sync.$(O): sync.c compiler.h config.h nasmint.h nasmlib.h sync.h
-tokhash.$(O): tokhash.c compiler.h config.h directiv.h hashtbl.h iflag.h &
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h &
- preproc.h regs.h stdscan.h tables.h tokens.h
+asm/assemble.$(O): asm/assemble.c asm/assemble.h include/compiler.h &
+ include/disp8.h include/insns.h asm/listing.h include/nasm.h &
+ include/nasmlib.h include/tables.h
+asm/directiv.$(O): asm/directiv.c include/compiler.h asm/directiv.h &
+ include/hashtbl.h include/nasm.h
+asm/eval.$(O): asm/eval.c include/compiler.h asm/eval.h asm/float.h &
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/exprlib.$(O): asm/exprlib.c include/nasm.h
+asm/float.$(O): asm/float.c include/compiler.h asm/float.h include/nasm.h
+asm/labels.$(O): asm/labels.c include/compiler.h include/hashtbl.h &
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/listing.$(O): asm/listing.c include/compiler.h asm/listing.h &
+ include/nasm.h include/nasmlib.h
+asm/nasm.$(O): asm/nasm.c asm/assemble.h include/compiler.h asm/eval.h &
+ asm/float.h include/iflag.h include/insns.h include/labels.h asm/listing.h &
+ include/nasm.h include/nasmlib.h output/outform.h asm/parser.h &
+ asm/preproc.h include/raa.h include/saa.h asm/stdscan.h include/ver.h
+asm/parser.$(O): asm/parser.c include/compiler.h asm/eval.h asm/float.h &
+ include/insns.h include/nasm.h include/nasmlib.h asm/parser.h asm/stdscan.h &
+ include/tables.h
+asm/pptok.$(O): asm/pptok.c include/compiler.h include/hashtbl.h &
+ include/nasmlib.h asm/preproc.h
+asm/preproc-nop.$(O): asm/preproc-nop.c include/compiler.h asm/listing.h &
+ include/nasm.h include/nasmlib.h asm/preproc.h
+asm/preproc.$(O): asm/preproc.c include/compiler.h asm/eval.h &
+ include/hashtbl.h asm/listing.h include/nasm.h include/nasmlib.h &
+ asm/preproc.h asm/quote.h asm/stdscan.h include/tables.h asm/tokens.h
+asm/quote.$(O): asm/quote.c include/compiler.h include/nasmlib.h asm/quote.h
+asm/rdstrnum.$(O): asm/rdstrnum.c include/compiler.h include/nasm.h &
+ include/nasmlib.h
+asm/segalloc.$(O): asm/segalloc.c include/compiler.h include/insns.h &
+ include/nasm.h include/nasmlib.h
+asm/stdscan.$(O): asm/stdscan.c include/compiler.h include/insns.h &
+ include/nasm.h include/nasmlib.h asm/quote.h asm/stdscan.h
+asm/strfunc.$(O): asm/strfunc.c include/nasm.h include/nasmlib.h
+asm/tokhash.$(O): asm/tokhash.c include/compiler.h include/hashtbl.h &
+ include/insns.h include/nasm.h asm/stdscan.h
+common/common.$(O): common/common.c include/compiler.h include/insns.h &
+ include/nasm.h include/nasmlib.h
+disasm/disasm.$(O): disasm/disasm.c include/compiler.h disasm/disasm.h &
+ include/disp8.h include/insns.h include/nasm.h x86/regdis.h disasm/sync.h &
+ include/tables.h
+disasm/ndisasm.$(O): disasm/ndisasm.c include/compiler.h disasm/disasm.h &
+ include/insns.h include/nasm.h include/nasmlib.h disasm/sync.h &
+ include/ver.h
+disasm/sync.$(O): disasm/sync.c include/compiler.h include/nasmlib.h &
+ disasm/sync.h
+macros/macros.$(O): macros/macros.c include/hashtbl.h include/nasmlib.h &
+ output/outform.h include/tables.h
+nasmlib/bsi.$(O): nasmlib/bsi.c include/compiler.h include/nasmlib.h
+nasmlib/crc64.$(O): nasmlib/crc64.c include/compiler.h include/hashtbl.h &
+ include/nasmlib.h
+nasmlib/error.$(O): nasmlib/error.c include/compiler.h include/nasmlib.h
+nasmlib/file.$(O): nasmlib/file.c include/compiler.h include/nasmlib.h
+nasmlib/filename.$(O): nasmlib/filename.c include/compiler.h &
+ include/nasmlib.h
+nasmlib/hashtbl.$(O): nasmlib/hashtbl.c include/compiler.h include/hashtbl.h &
+ include/nasm.h
+nasmlib/ilog2.$(O): nasmlib/ilog2.c include/compiler.h include/nasmlib.h
+nasmlib/malloc.$(O): nasmlib/malloc.c include/compiler.h include/nasmlib.h
+nasmlib/md5c.$(O): nasmlib/md5c.c include/md5.h
+nasmlib/raa.$(O): nasmlib/raa.c include/nasmlib.h include/raa.h
+nasmlib/rbtree.$(O): nasmlib/rbtree.c include/rbtree.h
+nasmlib/readnum.$(O): nasmlib/readnum.c include/compiler.h include/nasm.h &
+ include/nasmlib.h
+nasmlib/realpath.$(O): nasmlib/realpath.c include/compiler.h &
+ include/nasmlib.h
+nasmlib/saa.$(O): nasmlib/saa.c include/compiler.h include/nasmlib.h &
+ include/saa.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c include/compiler.h include/hashtbl.h &
+ include/nasmlib.h
+nasmlib/string.$(O): nasmlib/string.c include/compiler.h include/nasmlib.h
+nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
+nasmlib/zerobuf.$(O): nasmlib/zerobuf.c include/compiler.h include/nasmlib.h
+output/codeview.$(O): output/codeview.c include/compiler.h include/hashtbl.h &
+ include/md5.h include/nasm.h include/nasmlib.h output/outlib.h &
+ output/pecoff.h asm/preproc.h include/saa.h version.h
+output/nulldbg.$(O): output/nulldbg.c include/nasm.h include/nasmlib.h &
+ output/outlib.h
+output/nullout.$(O): output/nullout.c include/nasm.h include/nasmlib.h &
+ output/outlib.h
+output/outaout.$(O): output/outaout.c include/compiler.h asm/eval.h &
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h &
+ include/raa.h include/saa.h asm/stdscan.h
+output/outas86.$(O): output/outas86.c include/compiler.h include/nasm.h &
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h &
+ include/saa.h
+output/outbin.$(O): output/outbin.c include/compiler.h asm/eval.h &
+ include/labels.h include/nasm.h include/nasmlib.h output/outform.h &
+ output/outlib.h include/saa.h asm/stdscan.h
+output/outcoff.$(O): output/outcoff.c include/compiler.h asm/eval.h &
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h &
+ output/pecoff.h include/raa.h include/saa.h
+output/outdbg.$(O): output/outdbg.c include/compiler.h include/nasm.h &
+ include/nasmlib.h output/outform.h
+output/outelf.$(O): output/outelf.c include/compiler.h output/dwarf.h &
+ output/elf.h asm/eval.h include/nasm.h include/nasmlib.h output/outelf.h &
+ output/outform.h output/outlib.h include/raa.h include/rbtree.h &
+ include/saa.h output/stabs.h asm/stdscan.h include/ver.h
+output/outform.$(O): output/outform.c include/compiler.h output/outform.h
+output/outieee.$(O): output/outieee.c include/compiler.h include/nasm.h &
+ include/nasmlib.h output/outform.h output/outlib.h include/ver.h
+output/outlib.$(O): output/outlib.c include/compiler.h include/nasm.h &
+ output/outlib.h
+output/outmacho.$(O): output/outmacho.c include/compiler.h include/nasm.h &
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h &
+ include/rbtree.h include/saa.h
+output/outobj.$(O): output/outobj.c include/compiler.h asm/eval.h &
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h &
+ asm/stdscan.h include/ver.h
+output/outrdf2.$(O): output/outrdf2.c include/compiler.h include/nasm.h &
+ include/nasmlib.h output/outform.h output/outlib.h include/rdoff.h &
+ include/saa.h
+stdlib/snprintf.$(O): stdlib/snprintf.c include/compiler.h include/nasmlib.h
+stdlib/strlcpy.$(O): stdlib/strlcpy.c include/compiler.h
+stdlib/strnlen.$(O): stdlib/strnlen.c include/compiler.h
+stdlib/vsnprintf.$(O): stdlib/vsnprintf.c include/compiler.h &
+ include/nasmlib.h
+x86/disp8.$(O): x86/disp8.c include/disp8.h
+x86/iflag.$(O): x86/iflag.c include/iflag.h
+x86/insnsa.$(O): x86/insnsa.c include/insns.h include/nasm.h
+x86/insnsb.$(O): x86/insnsb.c include/insns.h include/nasm.h
+x86/insnsd.$(O): x86/insnsd.c include/insns.h include/nasm.h
+x86/insnsn.$(O): x86/insnsn.c include/tables.h
+x86/regdis.$(O): x86/regdis.c x86/regdis.h
+x86/regflags.$(O): x86/regflags.c include/nasm.h include/tables.h
+x86/regs.$(O): x86/regs.c include/tables.h
+x86/regvals.$(O): x86/regvals.c include/tables.h
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index 227eba98..e96aae12 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -57,29 +57,29 @@ X = .exe
#-- Begin File Lists --#
# Edit in Makefile.in, not here!
-NASM = nasm.$(O) \
- raa.$(O) saa.$(O) rbtree.$(O) \
- float.$(O) insnsa.$(O) insnsb.$(O) \
- directiv.$(O) \
- assemble.$(O) labels.$(O) hashtbl.$(O) parser.$(O) \
+NASM = asm/nasm.$(O) \
+ asm/float.$(O) \
+ asm/directiv.$(O) \
+ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
+ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
+ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) \
+ asm/stdscan.$(O) \
+ asm/strfunc.$(O) asm/tokhash.$(O) \
+ asm/segalloc.$(O) \
+ asm/preproc-nop.$(O) \
+ asm/rdstrnum.$(O) \
+ \
+ macros/macros.$(O) \
+ \
output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \
output/nullout.$(O) \
output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \
output/outelf.$(O) \
output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \
output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \
- output/codeview.$(O) \
- preproc.$(O) quote.$(O) pptok.$(O) \
- macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \
- strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) \
- segalloc.$(O) \
- preproc-nop.$(O) \
- disp8.$(O) rdstrnum.$(O) \
- iflag.$(O) common.$(O)
-
-NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) \
- insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) \
- disp8.$(O) iflag.$(O) common.$(O)
+ output/codeview.$(O)
+
+NDISASM = disasm/ndisasm.$(O) disasm/disasm.$(O) disasm/sync.$(O)
LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
stdlib/strnlen.$(O) \
@@ -88,7 +88,13 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \
nasmlib/file.$(O) nasmlib/ilog2.$(O) \
nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \
- nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O)
+ nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
+ nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
+ nasmlib/raa.$(O) nasmlib/saa.$(O) \
+ common/common.$(O) \
+ x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \
+ x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
+ x86/disp8.$(O) x86/iflag.$(O)
#-- End File Lists --#
what:
@@ -245,148 +251,131 @@ everything: all doc rdf
# @exclude: "config.h"
# @continuation: "\"
#-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(O): assemble.c assemble.h compiler.h directiv.h disp8.h iflag.h \
- iflaggen.h insns.h insnsi.h listing.h nasm.h nasmint.h nasmlib.h opflags.h \
- pptok.h preproc.h regs.h tables.h tokens.h
-common.$(O): common.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-directiv.$(O): directiv.c compiler.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-disasm.$(O): disasm.c compiler.h directiv.h disasm.h disp8.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
- preproc.h regdis.h regs.h sync.h tables.h tokens.h
-disp8.$(O): disp8.c compiler.h directiv.h disp8.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-eval.$(O): eval.c compiler.h directiv.h eval.h float.h insnsi.h labels.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-exprlib.$(O): exprlib.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-float.$(O): float.c compiler.h directiv.h float.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-hashtbl.$(O): hashtbl.c compiler.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-iflag.$(O): iflag.c compiler.h iflag.h iflaggen.h nasmint.h
-insnsa.$(O): insnsa.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsb.$(O): insnsb.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsd.$(O): insnsd.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-insnsn.$(O): insnsn.c compiler.h insnsi.h nasmint.h tables.h
-labels.$(O): labels.c compiler.h directiv.h hashtbl.h insnsi.h labels.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-listing.$(O): listing.c compiler.h directiv.h insnsi.h listing.h nasm.h \
- nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-macros.$(O): macros.c compiler.h directiv.h hashtbl.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
- tables.h
-nasm.$(O): nasm.c assemble.h compiler.h directiv.h eval.h float.h iflag.h \
- iflaggen.h insns.h insnsi.h labels.h listing.h nasm.h nasmint.h nasmlib.h \
- opflags.h output/outform.h parser.h pptok.h preproc.h raa.h regs.h saa.h \
- stdscan.h tables.h tokens.h ver.h
-nasmlib/bsi.$(O): nasmlib/bsi.c compiler.h nasmint.h nasmlib.h
-nasmlib/crc64.$(O): nasmlib/crc64.c compiler.h hashtbl.h nasmint.h nasmlib.h
-nasmlib/error.$(O): nasmlib/error.c compiler.h nasmint.h nasmlib.h
-nasmlib/file.$(O): nasmlib/file.c compiler.h nasmint.h nasmlib.h
-nasmlib/filename.$(O): nasmlib/filename.c compiler.h nasmint.h nasmlib.h
-nasmlib/ilog2.$(O): nasmlib/ilog2.c compiler.h nasmint.h nasmlib.h
-nasmlib/malloc.$(O): nasmlib/malloc.c compiler.h nasmint.h nasmlib.h
-nasmlib/md5c.$(O): nasmlib/md5c.c compiler.h md5.h nasmint.h
-nasmlib/readnum.$(O): nasmlib/readnum.c compiler.h directiv.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h nasmint.h nasmlib.h
-nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h hashtbl.h nasmint.h \
- nasmlib.h
-nasmlib/string.$(O): nasmlib/string.c compiler.h nasmint.h nasmlib.h
-nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
-nasmlib/zerobuf.$(O): nasmlib/zerobuf.c compiler.h nasmint.h nasmlib.h
-ndisasm.$(O): ndisasm.c compiler.h directiv.h disasm.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h sync.h tables.h tokens.h ver.h
-output/codeview.$(O): output/codeview.c compiler.h directiv.h hashtbl.h \
- insnsi.h md5.h nasm.h nasmint.h nasmlib.h opflags.h output/outlib.h \
- output/pecoff.h pptok.h preproc.h regs.h saa.h tables.h version.h
-output/nulldbg.$(O): output/nulldbg.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \
- tables.h
-output/nullout.$(O): output/nullout.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \
- tables.h
-output/outaout.$(O): output/outaout.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h raa.h regs.h saa.h stdscan.h tables.h
-output/outas86.$(O): output/outas86.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h raa.h regs.h saa.h tables.h
-output/outbin.$(O): output/outbin.c compiler.h directiv.h eval.h insnsi.h \
- labels.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h \
- output/outlib.h pptok.h preproc.h regs.h saa.h stdscan.h tables.h
-output/outcoff.$(O): output/outcoff.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- output/pecoff.h pptok.h preproc.h raa.h regs.h saa.h tables.h
-output/outdbg.$(O): output/outdbg.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
- tables.h
-output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
- output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \
- preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
-output/outform.$(O): output/outform.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
- tables.h
-output/outieee.$(O): output/outieee.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h regs.h tables.h ver.h
-output/outlib.$(O): output/outlib.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \
- tables.h
-output/outmacho.$(O): output/outmacho.c compiler.h directiv.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h raa.h rbtree.h regs.h saa.h tables.h
-output/outobj.$(O): output/outobj.c compiler.h directiv.h eval.h insnsi.h \
- nasm.h nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h regs.h stdscan.h tables.h ver.h
-output/outrdf2.$(O): output/outrdf2.c compiler.h directiv.h insnsi.h nasm.h \
- nasmint.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h rdoff/rdoff.h regs.h saa.h tables.h
-parser.$(O): parser.c compiler.h directiv.h eval.h float.h iflag.h \
- iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h parser.h \
- pptok.h preproc.h regs.h stdscan.h tables.h tokens.h
-pptok.$(O): pptok.c compiler.h hashtbl.h nasmint.h nasmlib.h pptok.h \
- preproc.h
-preproc-nop.$(O): preproc-nop.c compiler.h directiv.h insnsi.h listing.h \
- nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-preproc.$(O): preproc.c compiler.h directiv.h eval.h hashtbl.h insnsi.h \
- listing.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h quote.h \
- regs.h stdscan.h tables.h tokens.h
-quote.$(O): quote.c compiler.h nasmint.h nasmlib.h quote.h
-raa.$(O): raa.c compiler.h nasmint.h nasmlib.h raa.h
-rbtree.$(O): rbtree.c compiler.h nasmint.h rbtree.h
-rdstrnum.$(O): rdstrnum.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regdis.$(O): regdis.c regdis.h regs.h
-regflags.$(O): regflags.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-regs.$(O): regs.c compiler.h insnsi.h nasmint.h tables.h
-regvals.$(O): regvals.c compiler.h insnsi.h nasmint.h tables.h
-saa.$(O): saa.c compiler.h nasmint.h nasmlib.h saa.h
-segalloc.$(O): segalloc.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h regs.h \
- tables.h tokens.h
-stdlib/snprintf.$(O): stdlib/snprintf.c compiler.h nasmint.h nasmlib.h
-stdlib/strlcpy.$(O): stdlib/strlcpy.c compiler.h nasmint.h
-stdlib/strnlen.$(O): stdlib/strnlen.c compiler.h nasmint.h
-stdlib/vsnprintf.$(O): stdlib/vsnprintf.c compiler.h nasmint.h nasmlib.h
-stdscan.$(O): stdscan.c compiler.h directiv.h iflag.h iflaggen.h insns.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h quote.h \
- regs.h stdscan.h tables.h tokens.h
-strfunc.$(O): strfunc.c compiler.h directiv.h insnsi.h nasm.h nasmint.h \
- nasmlib.h opflags.h pptok.h preproc.h regs.h tables.h
-sync.$(O): sync.c compiler.h nasmint.h nasmlib.h sync.h
-tokhash.$(O): tokhash.c compiler.h directiv.h hashtbl.h iflag.h iflaggen.h \
- insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
- regs.h stdscan.h tables.h tokens.h
+asm/assemble.$(O): asm/assemble.c asm/assemble.h include/compiler.h \
+ include/disp8.h include/insns.h asm/listing.h include/nasm.h \
+ include/nasmlib.h include/tables.h
+asm/directiv.$(O): asm/directiv.c include/compiler.h asm/directiv.h \
+ include/hashtbl.h include/nasm.h
+asm/eval.$(O): asm/eval.c include/compiler.h asm/eval.h asm/float.h \
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/exprlib.$(O): asm/exprlib.c include/nasm.h
+asm/float.$(O): asm/float.c include/compiler.h asm/float.h include/nasm.h
+asm/labels.$(O): asm/labels.c include/compiler.h include/hashtbl.h \
+ include/labels.h include/nasm.h include/nasmlib.h
+asm/listing.$(O): asm/listing.c include/compiler.h asm/listing.h \
+ include/nasm.h include/nasmlib.h
+asm/nasm.$(O): asm/nasm.c asm/assemble.h include/compiler.h asm/eval.h \
+ asm/float.h include/iflag.h include/insns.h include/labels.h asm/listing.h \
+ include/nasm.h include/nasmlib.h output/outform.h asm/parser.h \
+ asm/preproc.h include/raa.h include/saa.h asm/stdscan.h include/ver.h
+asm/parser.$(O): asm/parser.c include/compiler.h asm/eval.h asm/float.h \
+ include/insns.h include/nasm.h include/nasmlib.h asm/parser.h asm/stdscan.h \
+ include/tables.h
+asm/pptok.$(O): asm/pptok.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h asm/preproc.h
+asm/preproc-nop.$(O): asm/preproc-nop.c include/compiler.h asm/listing.h \
+ include/nasm.h include/nasmlib.h asm/preproc.h
+asm/preproc.$(O): asm/preproc.c include/compiler.h asm/eval.h \
+ include/hashtbl.h asm/listing.h include/nasm.h include/nasmlib.h \
+ asm/preproc.h asm/quote.h asm/stdscan.h include/tables.h asm/tokens.h
+asm/quote.$(O): asm/quote.c include/compiler.h include/nasmlib.h asm/quote.h
+asm/rdstrnum.$(O): asm/rdstrnum.c include/compiler.h include/nasm.h \
+ include/nasmlib.h
+asm/segalloc.$(O): asm/segalloc.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h
+asm/stdscan.$(O): asm/stdscan.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h asm/quote.h asm/stdscan.h
+asm/strfunc.$(O): asm/strfunc.c include/nasm.h include/nasmlib.h
+asm/tokhash.$(O): asm/tokhash.c include/compiler.h include/hashtbl.h \
+ include/insns.h include/nasm.h asm/stdscan.h
+common/common.$(O): common/common.c include/compiler.h include/insns.h \
+ include/nasm.h include/nasmlib.h
+disasm/disasm.$(O): disasm/disasm.c include/compiler.h disasm/disasm.h \
+ include/disp8.h include/insns.h include/nasm.h x86/regdis.h disasm/sync.h \
+ include/tables.h
+disasm/ndisasm.$(O): disasm/ndisasm.c include/compiler.h disasm/disasm.h \
+ include/insns.h include/nasm.h include/nasmlib.h disasm/sync.h \
+ include/ver.h
+disasm/sync.$(O): disasm/sync.c include/compiler.h include/nasmlib.h \
+ disasm/sync.h
+macros/macros.$(O): macros/macros.c include/hashtbl.h include/nasmlib.h \
+ output/outform.h include/tables.h
+nasmlib/bsi.$(O): nasmlib/bsi.c include/compiler.h include/nasmlib.h
+nasmlib/crc64.$(O): nasmlib/crc64.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h
+nasmlib/error.$(O): nasmlib/error.c include/compiler.h include/nasmlib.h
+nasmlib/file.$(O): nasmlib/file.c include/compiler.h include/nasmlib.h
+nasmlib/filename.$(O): nasmlib/filename.c include/compiler.h \
+ include/nasmlib.h
+nasmlib/hashtbl.$(O): nasmlib/hashtbl.c include/compiler.h include/hashtbl.h \
+ include/nasm.h
+nasmlib/ilog2.$(O): nasmlib/ilog2.c include/compiler.h include/nasmlib.h
+nasmlib/malloc.$(O): nasmlib/malloc.c include/compiler.h include/nasmlib.h
+nasmlib/md5c.$(O): nasmlib/md5c.c include/md5.h
+nasmlib/raa.$(O): nasmlib/raa.c include/nasmlib.h include/raa.h
+nasmlib/rbtree.$(O): nasmlib/rbtree.c include/rbtree.h
+nasmlib/readnum.$(O): nasmlib/readnum.c include/compiler.h include/nasm.h \
+ include/nasmlib.h
+nasmlib/realpath.$(O): nasmlib/realpath.c include/compiler.h \
+ include/nasmlib.h
+nasmlib/saa.$(O): nasmlib/saa.c include/compiler.h include/nasmlib.h \
+ include/saa.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c include/compiler.h include/hashtbl.h \
+ include/nasmlib.h
+nasmlib/string.$(O): nasmlib/string.c include/compiler.h include/nasmlib.h
+nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
+nasmlib/zerobuf.$(O): nasmlib/zerobuf.c include/compiler.h include/nasmlib.h
+output/codeview.$(O): output/codeview.c include/compiler.h include/hashtbl.h \
+ include/md5.h include/nasm.h include/nasmlib.h output/outlib.h \
+ output/pecoff.h asm/preproc.h include/saa.h version.h
+output/nulldbg.$(O): output/nulldbg.c include/nasm.h include/nasmlib.h \
+ output/outlib.h
+output/nullout.$(O): output/nullout.c include/nasm.h include/nasmlib.h \
+ output/outlib.h
+output/outaout.$(O): output/outaout.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ include/raa.h include/saa.h asm/stdscan.h
+output/outas86.$(O): output/outas86.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h \
+ include/saa.h
+output/outbin.$(O): output/outbin.c include/compiler.h asm/eval.h \
+ include/labels.h include/nasm.h include/nasmlib.h output/outform.h \
+ output/outlib.h include/saa.h asm/stdscan.h
+output/outcoff.$(O): output/outcoff.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ output/pecoff.h include/raa.h include/saa.h
+output/outdbg.$(O): output/outdbg.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h
+output/outelf.$(O): output/outelf.c include/compiler.h output/dwarf.h \
+ output/elf.h asm/eval.h include/nasm.h include/nasmlib.h output/outelf.h \
+ output/outform.h output/outlib.h include/raa.h include/rbtree.h \
+ include/saa.h output/stabs.h asm/stdscan.h include/ver.h
+output/outform.$(O): output/outform.c include/compiler.h output/outform.h
+output/outieee.$(O): output/outieee.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/ver.h
+output/outlib.$(O): output/outlib.c include/compiler.h include/nasm.h \
+ output/outlib.h
+output/outmacho.$(O): output/outmacho.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/raa.h \
+ include/rbtree.h include/saa.h
+output/outobj.$(O): output/outobj.c include/compiler.h asm/eval.h \
+ include/nasm.h include/nasmlib.h output/outform.h output/outlib.h \
+ asm/stdscan.h include/ver.h
+output/outrdf2.$(O): output/outrdf2.c include/compiler.h include/nasm.h \
+ include/nasmlib.h output/outform.h output/outlib.h include/rdoff.h \
+ include/saa.h
+stdlib/snprintf.$(O): stdlib/snprintf.c include/compiler.h include/nasmlib.h
+stdlib/strlcpy.$(O): stdlib/strlcpy.c include/compiler.h
+stdlib/strnlen.$(O): stdlib/strnlen.c include/compiler.h
+stdlib/vsnprintf.$(O): stdlib/vsnprintf.c include/compiler.h \
+ include/nasmlib.h
+x86/disp8.$(O): x86/disp8.c include/disp8.h
+x86/iflag.$(O): x86/iflag.c include/iflag.h
+x86/insnsa.$(O): x86/insnsa.c include/insns.h include/nasm.h
+x86/insnsb.$(O): x86/insnsb.c include/insns.h include/nasm.h
+x86/insnsd.$(O): x86/insnsd.c include/insns.h include/nasm.h
+x86/insnsn.$(O): x86/insnsn.c include/tables.h
+x86/regdis.$(O): x86/regdis.c x86/regdis.h
+x86/regflags.$(O): x86/regflags.c include/nasm.h include/tables.h
+x86/regs.$(O): x86/regs.c include/tables.h
+x86/regvals.$(O): x86/regvals.c include/tables.h
diff --git a/assemble.c b/asm/assemble.c
index 20e35c27..ad6bfda2 100644
--- a/assemble.c
+++ b/asm/assemble.c
@@ -1936,7 +1936,7 @@ static void gencode(int32_t segment, int64_t offset, int bits,
out(offset, segment, &data, OUT_ADDRESS,
ea_data.bytes, NO_SEG, NO_SEG);
} else {
- /* overflow check in output/linker? */
+ /* overflow check in linker? */
out(offset, segment, &data, OUT_REL4ADR,
insn_end - offset, opy->segment, opy->wrt);
}
diff --git a/assemble.h b/asm/assemble.h
index f85037ad..f85037ad 100644
--- a/assemble.h
+++ b/asm/assemble.h
diff --git a/directiv.dat b/asm/directiv.dat
index a8d9261c..a8d9261c 100644
--- a/directiv.dat
+++ b/asm/directiv.dat
diff --git a/directiv.pl b/asm/directiv.pl
index b567aff9..b567aff9 100755
--- a/directiv.pl
+++ b/asm/directiv.pl
diff --git a/eval.c b/asm/eval.c
index 029d8a04..029d8a04 100644
--- a/eval.c
+++ b/asm/eval.c
diff --git a/eval.h b/asm/eval.h
index 7af17eb8..7af17eb8 100644
--- a/eval.h
+++ b/asm/eval.h
diff --git a/exprlib.c b/asm/exprlib.c
index 7eb3436c..7eb3436c 100644
--- a/exprlib.c
+++ b/asm/exprlib.c
diff --git a/float.c b/asm/float.c
index 6cd14561..6cd14561 100644
--- a/float.c
+++ b/asm/float.c
diff --git a/float.h b/asm/float.h
index b07e542a..b07e542a 100644
--- a/float.h
+++ b/asm/float.h
diff --git a/labels.c b/asm/labels.c
index a8df4780..a8df4780 100644
--- a/labels.c
+++ b/asm/labels.c
diff --git a/listing.c b/asm/listing.c
index 084386dc..084386dc 100644
--- a/listing.c
+++ b/asm/listing.c
diff --git a/listing.h b/asm/listing.h
index 58b5eb8a..58b5eb8a 100644
--- a/listing.h
+++ b/asm/listing.h
diff --git a/nasm.c b/asm/nasm.c
index 3ed3bfdb..ca5584ea 100644
--- a/nasm.c
+++ b/asm/nasm.c
@@ -57,7 +57,7 @@
#include "eval.h"
#include "assemble.h"
#include "labels.h"
-#include "output/outform.h"
+#include "outform.h"
#include "listing.h"
#include "iflag.h"
#include "ver.h"
diff --git a/parser.c b/asm/parser.c
index 6210cc69..6210cc69 100644
--- a/parser.c
+++ b/asm/parser.c
diff --git a/parser.h b/asm/parser.h
index e148c7fa..e148c7fa 100644
--- a/parser.h
+++ b/asm/parser.h
diff --git a/phash.pl b/asm/phash.pl
index 3ef6e714..3ef6e714 100755
--- a/phash.pl
+++ b/asm/phash.pl
diff --git a/pptok.dat b/asm/pptok.dat
index b78d138a..b78d138a 100644
--- a/pptok.dat
+++ b/asm/pptok.dat
diff --git a/pptok.pl b/asm/pptok.pl
index 203332d6..203332d6 100755
--- a/pptok.pl
+++ b/asm/pptok.pl
diff --git a/preproc-nop.c b/asm/preproc-nop.c
index 1cb14457..1cb14457 100644
--- a/preproc-nop.c
+++ b/asm/preproc-nop.c
diff --git a/preproc.c b/asm/preproc.c
index e36ae9c9..e36ae9c9 100644
--- a/preproc.c
+++ b/asm/preproc.c
diff --git a/preproc.h b/asm/preproc.h
index fcf8695b..fcf8695b 100644
--- a/preproc.h
+++ b/asm/preproc.h
diff --git a/quote.c b/asm/quote.c
index 75a93726..75a93726 100644
--- a/quote.c
+++ b/asm/quote.c
diff --git a/quote.h b/asm/quote.h
index 2d8ce87b..2d8ce87b 100644
--- a/quote.h
+++ b/asm/quote.h
diff --git a/rdstrnum.c b/asm/rdstrnum.c
index d9d2a69f..d9d2a69f 100644
--- a/rdstrnum.c
+++ b/asm/rdstrnum.c
diff --git a/segalloc.c b/asm/segalloc.c
index 60596221..60596221 100644
--- a/segalloc.c
+++ b/asm/segalloc.c
diff --git a/stdscan.c b/asm/stdscan.c
index 1287db26..1287db26 100644
--- a/stdscan.c
+++ b/asm/stdscan.c
diff --git a/stdscan.h b/asm/stdscan.h
index 8dbc2d03..8dbc2d03 100644
--- a/stdscan.h
+++ b/asm/stdscan.h
diff --git a/strfunc.c b/asm/strfunc.c
index 236b9d2f..236b9d2f 100644
--- a/strfunc.c
+++ b/asm/strfunc.c
diff --git a/tokens.dat b/asm/tokens.dat
index 528f2431..528f2431 100644
--- a/tokens.dat
+++ b/asm/tokens.dat
diff --git a/tokhash.pl b/asm/tokhash.pl
index 07bc6abe..07bc6abe 100755
--- a/tokhash.pl
+++ b/asm/tokhash.pl
diff --git a/common.c b/common/common.c
index 9c91f910..9c91f910 100644
--- a/common.c
+++ b/common/common.c
diff --git a/configure.ac b/configure.ac
index d42d40e3..e621b3c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,5 +197,5 @@ PA_ADD_CFLAGS([-Werror=missing-declarations])
PA_ADD_CFLAGS([-Werror=comment])
PA_ADD_CFLAGS([-Werror=vla])])
-AC_OUTPUT_COMMANDS([mkdir -p nasmlib nsis output stdlib])
+AC_OUTPUT_COMMANDS([mkdir -p nasmlib nsis output stdlib x86 asm disasm])
AC_OUTPUT(Makefile rdoff/Makefile doc/Makefile)
diff --git a/disasm.c b/disasm/disasm.c
index 8e759fe4..8e759fe4 100644
--- a/disasm.c
+++ b/disasm/disasm.c
diff --git a/disasm.h b/disasm/disasm.h
index fa6e2e2f..fa6e2e2f 100644
--- a/disasm.h
+++ b/disasm/disasm.h
diff --git a/ndisasm.c b/disasm/ndisasm.c
index d90b5c3b..d90b5c3b 100644
--- a/ndisasm.c
+++ b/disasm/ndisasm.c
diff --git a/sync.c b/disasm/sync.c
index 5c703b0b..5c703b0b 100644
--- a/sync.c
+++ b/disasm/sync.c
diff --git a/sync.h b/disasm/sync.h
index 27d8e8b8..27d8e8b8 100644
--- a/sync.h
+++ b/disasm/sync.h
diff --git a/compiler.h b/include/compiler.h
index 1fa4a13b..1fa4a13b 100644
--- a/compiler.h
+++ b/include/compiler.h
diff --git a/disp8.h b/include/disp8.h
index fc18e4f3..fc18e4f3 100644
--- a/disp8.h
+++ b/include/disp8.h
diff --git a/hashtbl.h b/include/hashtbl.h
index 947d0ab3..947d0ab3 100644
--- a/hashtbl.h
+++ b/include/hashtbl.h
diff --git a/iflag.h b/include/iflag.h
index 84e7d75c..84e7d75c 100644
--- a/iflag.h
+++ b/include/iflag.h
diff --git a/insns.h b/include/insns.h
index 8f04d13c..8f04d13c 100644
--- a/insns.h
+++ b/include/insns.h
diff --git a/labels.h b/include/labels.h
index 4da608e4..4da608e4 100644
--- a/labels.h
+++ b/include/labels.h
diff --git a/md5.h b/include/md5.h
index cb779105..cb779105 100644
--- a/md5.h
+++ b/include/md5.h
diff --git a/nasm.h b/include/nasm.h
index ccaac604..ccaac604 100644
--- a/nasm.h
+++ b/include/nasm.h
diff --git a/nasmint.h b/include/nasmint.h
index e353aa93..e353aa93 100644
--- a/nasmint.h
+++ b/include/nasmint.h
diff --git a/nasmlib.h b/include/nasmlib.h
index 440aa8d7..440aa8d7 100644
--- a/nasmlib.h
+++ b/include/nasmlib.h
diff --git a/opflags.h b/include/opflags.h
index ef2838c1..ef2838c1 100644
--- a/opflags.h
+++ b/include/opflags.h
diff --git a/raa.h b/include/raa.h
index 22c4537b..22c4537b 100644
--- a/raa.h
+++ b/include/raa.h
diff --git a/rbtree.h b/include/rbtree.h
index f0ffb914..f0ffb914 100644
--- a/rbtree.h
+++ b/include/rbtree.h
diff --git a/rdoff/rdoff.h b/include/rdoff.h
index 019d012d..019d012d 100644
--- a/rdoff/rdoff.h
+++ b/include/rdoff.h
diff --git a/saa.h b/include/saa.h
index 8a8bd075..8a8bd075 100644
--- a/saa.h
+++ b/include/saa.h
diff --git a/tables.h b/include/tables.h
index 693e4cff..693e4cff 100644
--- a/tables.h
+++ b/include/tables.h
diff --git a/ver.h b/include/ver.h
index 62d9c52d..62d9c52d 100644
--- a/ver.h
+++ b/include/ver.h
diff --git a/macros.pl b/macros/macros.pl
index 67aa08cb..3c461194 100755
--- a/macros.pl
+++ b/macros/macros.pl
@@ -37,7 +37,7 @@
#
require 'phash.ph';
-require 'pptok.ph';
+require 'asm/pptok.ph';
use bytes;
@@ -90,7 +90,7 @@ sub charcify(@) {
#
# Generate macros.c
#
-open(OUT,"> macros.c\0") or die "unable to open macros.c\n";
+open(OUT,"> macros/macros.c\0") or die "unable to open macros.c\n";
print OUT "/*\n";
print OUT " * Do not edit - this file auto-generated by macros.pl from:\n";
@@ -100,7 +100,7 @@ print OUT "\n";
print OUT "#include \"tables.h\"\n";
print OUT "#include \"nasmlib.h\"\n";
print OUT "#include \"hashtbl.h\"\n";
-print OUT "#include \"output/outform.h\"\n";
+print OUT "#include \"outform.h\"\n";
print OUT "\n";
print OUT "#if 1\n";
print OUT "const unsigned char nasm_stdmac[] = {";
diff --git a/standard.mac b/macros/standard.mac
index 60c0387c..60c0387c 100644
--- a/standard.mac
+++ b/macros/standard.mac
diff --git a/misc/makedist.sh b/misc/makedist.sh
deleted file mode 100755
index 3027196a..00000000
--- a/misc/makedist.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# * THIS SCRIPT IS OBSOLETE DO NOT USE *
-
-MAJORVER=`grep NASM_MAJOR_VER nasm.h | head -1 | cut -f3 -d' '`
-MINORVER=`grep NASM_MINOR_VER nasm.h | head -1 | cut -f3 -d' '`
-VERSION=`grep NASM_VER nasm.h | head -1 | cut -f3 -d' ' | sed s/\"//g`
-DOSVERSION="${MAJORVER}${MINORVER}"
-NASM_TAR_GZ=dist/nasm-${VERSION}.tar.gz
-NASM_ZIP=dist/nasm${DOSVERSION}s.zip
-NASM_DOS_ZIP=dist/nasm${DOSVERSION}.zip
-NASM_DOC_ZIP=dist/nasm${DOSVERSION}d.zip
-
-if [ -d dist ]; then rm -rf dist; fi
-if [ -d nasm-${VERSION} ]; then rm -rf nasm-${VERSION}; fi
-if [ ! -d dist ]; then mkdir dist; fi
-if [ -f dist/nasm.tar.gz ]; then rm dist/nasm.tar.gz; fi
-mkdir nasm-${VERSION}
-(cd nasm-${VERSION}; ln -s ../* .;
- rm -f nasm-${VERSION} dist Checklist GNUmakefile)
-find nasm-${VERSION}/ -follow -name GNUmakefile > tar-exclude
-find nasm-${VERSION}/ -follow -name RCS >> tar-exclude
-find nasm-${VERSION}/ -follow -name '*.exe' >> tar-exclude
-find nasm-${VERSION}/ -follow -name '*.uu' >> tar-exclude
-find nasm-${VERSION}/ -follow -name '*,v' >> tar-exclude
-for i in nasm-${VERSION}/doc/{nasmdoc.hpj,nasmdoc.rtf,nasmdoc.texi,Readme};
- do echo $i; done >> tar-exclude
-tar chvfX dist/nasm-${VERSION}.tar tar-exclude nasm-${VERSION}
-rm -f tar-exclude
-tar tf dist/nasm-${VERSION}.tar | (echo nasm.doc; sed \
- -e 's:^nasm-[^/]*/::' \
- -e 's:/$::' \
- -e '/install-sh/d' \
- -e '/makedist\.sh/d' \
- -e '/exasm\.zip/d' \
- -e '/config/d' \
- -e '/doc\/.*\.html/d' \
- -e '/doc\/Readme/d' \
- -e '/doc\/nasmdoc\.ps/d' \
- -e '/doc\/nasmdoc\.txt/d' \
- -e '/doc\/nasmdoc\.rtf/d' \
- -e '/doc\/nasmdoc\.hpj/d' \
- -e '/doc\/nasmdoc\.texi/d' \
- -e '/doc\/nasmdoc\.hlp/d' \
- -e '/doc\/nasm\.info/d' \
- ) | sort > zipfiles
-sed \
- -e '/^[^\/]*\.\(c\|h\|pl\|bas\|dat\)$/d' \
- -e '/^doc\(\/.*\)\?/d' \
- -e '/standard\.mac/d' \
- -e '/Makefile/d' \
- -e '/rdoff/d' \
- < zipfiles > zipfiles.dos
-gzip -9 dist/nasm-${VERSION}.tar
-rm -rf nasm-${VERSION}
-ln -s doc/nasmdoc.src nasm.doc
-zip -l -k ${NASM_ZIP} `cat zipfiles`
-zip -k ${NASM_ZIP} *.exe misc/exasm.zip
-zip -l -k ${NASM_DOS_ZIP} `cat zipfiles.dos`
-zip -k ${NASM_DOS_ZIP} *.exe misc/exasm.zip
-rm -f nasm.doc
-(cd doc; zip -l -k ../${NASM_DOC_ZIP} \
- Readme \
- nasmdoc.src rdsrc.pl inslist.pl \
- nasmdoc.txt \
- nasmdoc.ps \
- *.html
- zip -k ../${NASM_DOC_ZIP} \
- nasmdoc.hlp \
- nasm.info)
-rm -f zipfiles zipfiles.dos
-echo Distributions complete.
diff --git a/hashtbl.c b/nasmlib/hashtbl.c
index 7f8fca63..7f8fca63 100644
--- a/hashtbl.c
+++ b/nasmlib/hashtbl.c
diff --git a/raa.c b/nasmlib/raa.c
index a9ed830b..a9ed830b 100644
--- a/raa.c
+++ b/nasmlib/raa.c
diff --git a/rbtree.c b/nasmlib/rbtree.c
index 5af6067d..5af6067d 100644
--- a/rbtree.c
+++ b/nasmlib/rbtree.c
diff --git a/saa.c b/nasmlib/saa.c
index a0350c10..a0350c10 100644
--- a/saa.c
+++ b/nasmlib/saa.c
diff --git a/output/codeview.c b/output/codeview.c
index d3c72ae3..6e83bd2c 100644
--- a/output/codeview.c
+++ b/output/codeview.c
@@ -47,8 +47,8 @@
#include "preproc.h"
#include "saa.h"
#include "hashtbl.h"
-#include "output/outlib.h"
-#include "output/pecoff.h"
+#include "outlib.h"
+#include "pecoff.h"
#include "md5.h"
static void cv8_init(void);
diff --git a/output/nulldbg.c b/output/nulldbg.c
index e8f87d75..1a9607a9 100644
--- a/output/nulldbg.c
+++ b/output/nulldbg.c
@@ -33,7 +33,7 @@
#include "nasm.h"
#include "nasmlib.h"
-#include "output/outlib.h"
+#include "outlib.h"
void null_debug_init(void)
{
diff --git a/output/nullout.c b/output/nullout.c
index 196a09df..aa3a47e1 100644
--- a/output/nullout.c
+++ b/output/nullout.c
@@ -33,7 +33,7 @@
#include "nasm.h"
#include "nasmlib.h"
-#include "output/outlib.h"
+#include "outlib.h"
int null_setinfo(enum geninfo type, char **string)
{
diff --git a/output/outaout.c b/output/outaout.c
index 62ebab0f..ab5adcbc 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -49,8 +49,8 @@
#include "raa.h"
#include "stdscan.h"
#include "eval.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#if defined OF_AOUT || defined OF_AOUTB
diff --git a/output/outas86.c b/output/outas86.c
index 840bc214..3d3ad84f 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -47,8 +47,8 @@
#include "nasmlib.h"
#include "saa.h"
#include "raa.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#ifdef OF_AS86
diff --git a/output/outbin.c b/output/outbin.c
index fa76f605..544ff2a2 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -86,8 +86,8 @@
#include "stdscan.h"
#include "labels.h"
#include "eval.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#ifdef OF_BIN
diff --git a/output/outcoff.c b/output/outcoff.c
index c2c0393d..2fca0779 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -49,9 +49,9 @@
#include "saa.h"
#include "raa.h"
#include "eval.h"
-#include "output/outform.h"
-#include "output/outlib.h"
-#include "output/pecoff.h"
+#include "outform.h"
+#include "outlib.h"
+#include "pecoff.h"
#if defined(OF_COFF) || defined(OF_WIN32) || defined(OF_WIN64)
diff --git a/output/outdbg.c b/output/outdbg.c
index d4f4ec24..bc36f74c 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -45,7 +45,7 @@
#include "nasm.h"
#include "nasmlib.h"
-#include "output/outform.h"
+#include "outform.h"
#ifdef OF_DBG
diff --git a/output/outelf.c b/output/outelf.c
index fcae88be..bdea5f14 100644
--- a/output/outelf.c
+++ b/output/outelf.c
@@ -46,15 +46,15 @@
#include "raa.h"
#include "stdscan.h"
#include "eval.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#include "rbtree.h"
#include "ver.h"
-#include "output/dwarf.h"
-#include "output/stabs.h"
-#include "output/outelf.h"
-#include "output/elf.h"
+#include "dwarf.h"
+#include "stabs.h"
+#include "outelf.h"
+#include "elf.h"
#if defined(OF_ELF32) || defined(OF_ELF64) || defined(OF_ELFX32)
diff --git a/output/outelf.h b/output/outelf.h
index 909ea882..5eaea4d3 100644
--- a/output/outelf.h
+++ b/output/outelf.h
@@ -37,7 +37,7 @@
#ifndef OUTPUT_OUTELF_H
#define OUTPUT_OUTELF_H
-#include "output/elf.h"
+#include "elf.h"
#include "rbtree.h"
#include "saa.h"
diff --git a/output/outform.c b/output/outform.c
index a93a2a8f..f227be43 100644
--- a/output/outform.c
+++ b/output/outform.c
@@ -44,7 +44,7 @@
#include <string.h>
#define BUILD_DRIVERS_ARRAY
-#include "output/outform.h"
+#include "outform.h"
const struct ofmt *ofmt_find(const char *name,
const struct ofmt_alias **ofmt_alias)
diff --git a/output/outieee.c b/output/outieee.c
index 125339ed..9a0a732b 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -78,8 +78,8 @@
#include "nasmlib.h"
#include "ver.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#ifdef OF_IEEE
diff --git a/output/outlib.c b/output/outlib.c
index 10f1bfa0..c60de055 100644
--- a/output/outlib.c
+++ b/output/outlib.c
@@ -39,7 +39,7 @@
#include "compiler.h"
#include "nasm.h"
-#include "output/outlib.h"
+#include "outlib.h"
uint64_t realsize(enum out_type type, uint64_t size)
{
diff --git a/output/outmacho.c b/output/outmacho.c
index f8007ac7..6f3e7c0e 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -48,8 +48,8 @@
#include "saa.h"
#include "raa.h"
#include "rbtree.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#if defined(OF_MACHO) || defined(OF_MACHO64)
diff --git a/output/outobj.c b/output/outobj.c
index 71fbb9c0..47cb5537 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -50,8 +50,8 @@
#include "eval.h"
#include "ver.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
#ifdef OF_OBJ
diff --git a/output/outrdf2.c b/output/outrdf2.c
index cfd72789..f91d32a8 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 1996-2013 The NASM Authors - All Rights Reserved
+ * Copyright 1996-2016 The NASM Authors - All Rights Reserved
* See the file AUTHORS included with the NASM distribution for
* the specific copyright holders.
*
@@ -48,15 +48,15 @@
#include "nasm.h"
#include "nasmlib.h"
#include "saa.h"
-#include "output/outform.h"
-#include "output/outlib.h"
+#include "outform.h"
+#include "outlib.h"
/* VERBOSE_WARNINGS: define this to add some extra warnings... */
#define VERBOSE_WARNINGS
#ifdef OF_RDF2
-#include "rdoff/rdoff.h"
+#include "rdoff.h"
/* This signature is written to start of RDOFF files */
static const char *RDOFF2Id = RDOFF2_SIGNATURE;
diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in
index 83d81c9b..a4a933fa 100644
--- a/rdoff/Makefile.in
+++ b/rdoff/Makefile.in
@@ -19,7 +19,7 @@ datarootdir = @datarootdir@
CC = @CC@
CFLAGS = @CFLAGS@
BUILD_CFLAGS = $(CFLAGS) @DEFS@
-INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I..
+INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/include -I..
ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@@ -31,7 +31,7 @@ STRIP = @STRIP@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-LN_S = @LN_S@
+LN_S = @LN_S@
MKDIR = mkdir
RM = rm
@@ -84,12 +84,13 @@ rdf2srec$(X):
rdf2ihx.$(O): rdf2ihx.c
rdf2bin.$(O): rdf2bin.c
rdfdump.$(O): rdfdump.c
-rdoff.$(O): rdoff.c rdoff.h
-ldrdf.$(O): ldrdf.c rdoff.h ../nasmlib.h symtab.h collectn.h rdlib.h
+rdoff.$(O): rdoff.c ../include/rdoff.h
+ldrdf.$(O): ldrdf.c ../include/rdoff.h ../include/nasmlib.h symtab.h \
+ collectn.h rdlib.h
symtab.$(O): symtab.c symtab.h
collectn.$(O): collectn.c collectn.h
-rdx.$(O): rdx.c rdoff.h rdfload.h symtab.h
-rdfload.$(O): rdfload.c rdfload.h rdoff.h collectn.h symtab.h
+rdx.$(O): rdx.c ../include/rdoff.h rdfload.h symtab.h
+rdfload.$(O): rdfload.c rdfload.h ../include/rdoff.h collectn.h symtab.h
rdlib.$(O): rdlib.c rdlib.h
rdflib.$(O): rdflib.c
segtab.$(O): segtab.c
diff --git a/misc/cleanfile b/tools/cleanfile
index cefd29e5..cefd29e5 100755
--- a/misc/cleanfile
+++ b/tools/cleanfile
diff --git a/misc/cleanpatch b/tools/cleanpatch
index 9680d03a..9680d03a 100755
--- a/misc/cleanpatch
+++ b/tools/cleanpatch
diff --git a/mkdep.pl b/tools/mkdep.pl
index 9f80ed3e..50d509c3 100755
--- a/mkdep.pl
+++ b/tools/mkdep.pl
@@ -1,12 +1,10 @@
#!/usr/bin/perl
## --------------------------------------------------------------------------
##
-## Copyright 1996-2009 The NASM Authors - All Rights Reserved
+## Copyright 1996-2016 The NASM Authors - All Rights Reserved
## See the file AUTHORS included with the NASM distribution for
## the specific copyright holders.
##
-## Copyright 1996-2009 the NASM Authors - All rights reserved.
-##
## Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that the following
## conditions are met:
@@ -46,6 +44,9 @@ use Fcntl;
$barrier = "#-- Everything below is generated by mkdep.pl - do not edit --#\n";
+# This converts from filenames to full pathnames for our dependencies
+%dep_path = {};
+
#
# Scan files for dependencies
#
@@ -55,10 +56,10 @@ sub scandeps($) {
my(@xdeps) = ();
my(@mdeps) = ();
- sysopen(FILE, $file, O_RDONLY)
+ open(my $fh, '<', $file)
or return; # If not openable, assume generated
- while ( defined($line = <FILE>) ) {
+ while ( defined($line = <$fh>) ) {
chomp $line;
$line =~ s:/\*.*\*/::g;
$line =~ s://.*$::;
@@ -68,7 +69,7 @@ sub scandeps($) {
push(@xdeps, $nf) unless ( defined($deps{$nf}) );
}
}
- close(FILE);
+ close($fh);
$deps{$file} = [@mdeps];
foreach $file ( @xdeps ) {
@@ -120,9 +121,9 @@ sub insert_deps($) {
$nexttemp++; # Unique serial number for each temp file
my($tmp) = File::Spec->catfile(dirname($file), 'tmp.'.$nexttemp);
- sysopen(IN, $file, O_RDONLY)
+ open(my $in, '<', $file)
or die "$0: Cannot open input: $file\n";
- sysopen(OUT, $tmp, O_WRONLY|O_CREAT|O_TRUNC, 0666)
+ open(my $out, '>', $tmp)
or die "$0: Cannot open output: $tmp\n";
my($line,$parm,$val);
@@ -131,9 +132,18 @@ sub insert_deps($) {
my($cont) = "\\";
my($maxline) = 78; # Seems like a reasonable default
my @exclude = (); # Don't exclude anything
+ my @genhdrs = ();
- while ( defined($line = <IN>) ) {
- if ( $line =~ /^\s*\#\s*@([a-z0-9-]+):\s*\"([^\"]*)\"/ ) {
+ while ( defined($line = <$in>) ) {
+ if ( $line =~ /^([^\s\#\$\:]+\.h):/ ) {
+ # Note: we trust the first Makefile given best
+ my $fpath = $1;
+ my $fbase = basename($fpath);
+ if (!defined($dep_path{$fbase})) {
+ $dep_path{$fbase} = $fpath;
+ print STDERR "Makefile: $fbase -> $fpath\n";
+ }
+ } elsif ( $line =~ /^\s*\#\s*@([a-z0-9-]+):\s*\"([^\"]*)\"/ ) {
$parm = $1; $val = $2;
if ( $parm eq 'object-ending' ) {
$obj = $val;
@@ -149,9 +159,9 @@ sub insert_deps($) {
} elsif ( $line eq $barrier ) {
last; # Stop reading input at barrier line
}
- print OUT $line;
+ print $out $line;
}
- close(IN);
+ close($in);
my $e;
my %do_exclude = ();
@@ -162,31 +172,39 @@ sub insert_deps($) {
my $dfile, $ofile, $str, $sl, $len;
my @deps, $dep;
- print OUT $barrier;
+ print $out $barrier;
foreach $dfile ( sort(keys(%deps)) ) {
- if ( $dfile =~ /\.[Cc]$/ ) {
- $ofile = $dfile; $ofile =~ s/\.[Cc]$//;
- $str = convert_file($ofile,$sep).$obj.':';
+ if ( $dfile =~ /^(.*)\.[Cc]$/ ) {
+ $ofile = $1;
+ $str = convert_file($ofile, $sep).$obj.':';
$len = length($str);
- print OUT $str;
+ print $out $str;
foreach $dep ($dfile, alldeps($dfile)) {
unless ($do_exclude{$dep}) {
- $str = convert_file($dep,$sep);
+ if (!defined($dep_path{$dep})) {
+ if ($dep eq $dfile) {
+ $dep_path{$dep} = $dfile;
+ print STDERR "Self: $dep -> $dfile\n";
+ } else {
+ die "$0: unknown dependency: $dep\n";
+ }
+ }
+ $str = convert_file($dep_path{$dep}, $sep);
$sl = length($str)+1;
if ( $len+$sl > $maxline-2 ) {
- print OUT ' ', $cont, "\n ", $str;
+ print $out ' ', $cont, "\n ", $str;
$len = $sl;
} else {
- print OUT ' ', $str;
+ print $out ' ', $str;
$len += $sl;
}
}
}
- print OUT "\n";
+ print $out "\n";
}
}
- close(OUT);
+ close($out);
(unlink($file) && rename($tmp, $file))
or die "$0: Failed to change $tmp -> $file\n";
@@ -196,12 +214,12 @@ sub insert_deps($) {
# Main program
#
-%deps = ();
-@files = ();
-@mkfiles = ();
-$mkmode = 0;
+my %deps = ();
+my @files = ();
+my @mkfiles = ();
+my $mkmode = 0;
-while ( defined($arg = shift(@ARGV)) ) {
+while ( defined(my $arg = shift(@ARGV)) ) {
if ( $arg eq '-m' ) {
$arg = shift(@ARGV);
push(@mkfiles, $arg);
@@ -220,14 +238,17 @@ while ( defined($arg = shift(@ARGV)) ) {
}
}
-foreach $dir ( @files ) {
+foreach my $dir ( @files ) {
opendir(DIR, $dir) or die "$0: Cannot open directory: $dir";
- while ( $file = readdir(DIR) ) {
+ while ( my $file = readdir(DIR) ) {
$path = ($dir eq File::Spec->curdir())
? $file : File::Spec->catfile($dir,$file);
if ( $file =~ /\.[Cc]$/ ) {
scandeps($path);
+ } elsif ( $file =~ /\.[Hh]$/ ) {
+ print STDERR "Filesystem: $file -> $path\n";
+ $dep_path{$file} = $path;
}
}
closedir(DIR);
diff --git a/misc/release b/tools/release
index 14e750a6..14e750a6 100755
--- a/misc/release
+++ b/tools/release
diff --git a/syncfiles.pl b/tools/syncfiles.pl
index 4da87f9c..4da87f9c 100755
--- a/syncfiles.pl
+++ b/tools/syncfiles.pl
diff --git a/misc/tag-release b/tools/tag-release
index 9e3a0bd0..9e3a0bd0 100755
--- a/misc/tag-release
+++ b/tools/tag-release
diff --git a/disp8.c b/x86/disp8.c
index 16210227..16210227 100644
--- a/disp8.c
+++ b/x86/disp8.c
diff --git a/insns-iflags.pl b/x86/insns-iflags.pl
index 1cd7a4c3..9c5abb9b 100644
--- a/insns-iflags.pl
+++ b/x86/insns-iflags.pl
@@ -1,7 +1,7 @@
#!/usr/bin/perl
## --------------------------------------------------------------------------
##
-## Copyright 1996-2013 The NASM Authors - All Rights Reserved
+## Copyright 1996-2016 The NASM Authors - All Rights Reserved
## See the file AUTHORS included with the NASM distribution for
## the specific copyright holders.
##
@@ -206,9 +206,9 @@ sub insns_flag_index(@) {
}
sub write_iflaggen_h() {
- print STDERR "Writing iflaggen.h ...\n";
+ print STDERR "Writing $oname...\n";
- open(N, ">iflaggen.h") or die "$0: $!\n";
+ open(N, '>', $oname) or die "$0: $!\n";
print N "/* This file is auto-generated. Don't edit. */\n";
print N "#ifndef NASM_IFLAGGEN_H\n";
@@ -233,9 +233,9 @@ sub write_iflaggen_h() {
}
sub write_iflag_c() {
- print STDERR "Writing iflag.c ...\n";
+ print STDERR "Writing $oname...\n";
- open N, ">iflag.c";
+ open(N, '>', $oname) or die "$0: $!\n";
print N "/* This file is auto-generated. Don't edit. */\n";
print N "#include \"iflag.h\"\n\n";
diff --git a/insns.dat b/x86/insns.dat
index 1cb85099..1cb85099 100644
--- a/insns.dat
+++ b/x86/insns.dat
diff --git a/insns.pl b/x86/insns.pl
index 258c0235..a71fb39e 100755
--- a/insns.pl
+++ b/x86/insns.pl
@@ -37,7 +37,7 @@
#
# Parse insns.dat and produce generated source code files
-require 'insns-iflags.pl';
+require 'x86/insns-iflags.pl';
# Opcode prefixes which need their own opcode tables
# LONGER PREFIXES FIRST!
@@ -79,7 +79,9 @@ foreach $arg ( @ARGV ) {
}
}
-$fname = "insns.dat" unless $fname = $args[0];
+die if (scalar(@args) != 2); # input output
+($fname, $oname) = @args;
+
open (F, $fname) || die "unable to open $fname";
%dinstables = ();
@@ -190,10 +192,10 @@ undef @bytecode_list;
@opcodes = sort keys(%k_opcodes);
@opcodes_cc = sort keys(%k_opcodes_cc);
-if ( !defined($output) || $output eq 'b') {
- print STDERR "Writing insnsb.c...\n";
+if ( $output eq 'b') {
+ print STDERR "Writing $oname...\n";
- open B, ">insnsb.c";
+ open(B, '>', $oname);
print B "/* This file auto-generated from insns.dat by insns.pl" .
" - don't edit it */\n\n";
@@ -231,10 +233,10 @@ if ( !defined($output) || $output eq 'b') {
close B;
}
-if ( !defined($output) || $output eq 'a' ) {
- print STDERR "Writing insnsa.c...\n";
+if ( $output eq 'a' ) {
+ print STDERR "Writing $oname...\n";
- open A, ">insnsa.c";
+ open(A, '>', $oname);
print A "/* This file auto-generated from insns.dat by insns.pl" .
" - don't edit it */\n\n";
@@ -259,10 +261,10 @@ if ( !defined($output) || $output eq 'a' ) {
close A;
}
-if ( !defined($output) || $output eq 'd' ) {
- print STDERR "Writing insnsd.c...\n";
+if ( $output eq 'd' ) {
+ print STDERR "Writing $oname...\n";
- open D, ">insnsd.c";
+ open(D, '>', $oname);
print D "/* This file auto-generated from insns.dat by insns.pl" .
" - don't edit it */\n\n";
@@ -341,10 +343,10 @@ if ( !defined($output) || $output eq 'd' ) {
close D;
}
-if ( !defined($output) || $output eq 'i' ) {
- print STDERR "Writing insnsi.h...\n";
+if ( $output eq 'i' ) {
+ print STDERR "Writing $oname...\n";
- open I, ">insnsi.h";
+ open(I, '>', $oname);
print I "/* This file is auto-generated from insns.dat by insns.pl" .
" - don't edit it */\n\n";
@@ -372,10 +374,10 @@ if ( !defined($output) || $output eq 'i' ) {
close I;
}
-if ( !defined($output) || $output eq 'n' ) {
- print STDERR "Writing insnsn.c...\n";
+if ( $output eq 'n' ) {
+ print STDERR "Writing $oname...\n";
- open N, ">insnsn.c";
+ open(N, '>', $oname);
print N "/* This file is auto-generated from insns.dat by insns.pl" .
" - don't edit it */\n\n";
@@ -395,11 +397,11 @@ if ( !defined($output) || $output eq 'n' ) {
close N;
}
-if ( !defined($output) || $output eq 'fh') {
+if ( $output eq 'fh') {
write_iflaggen_h();
}
-if ( !defined($output) || $output eq 'fc') {
+if ( $output eq 'fc') {
write_iflag_c();
}
diff --git a/regs.dat b/x86/regs.dat
index 723f6a44..723f6a44 100644
--- a/regs.dat
+++ b/x86/regs.dat
diff --git a/regs.pl b/x86/regs.pl
index 52e5ca3e..52e5ca3e 100755
--- a/regs.pl
+++ b/x86/regs.pl