This is the "megapatch":

a) Automatically generate dependencies for all Makefiles;
b) Move register definitions to a separate .dat file;
c) Add support for "unimplemented but there in theory" registers.

18 files changed, 1094 insertions, 691 deletions

diff --git a/Mkfiles/Makefile.b32 b/Mkfiles/Makefile.b32
index 908f48e..7fe78fa 100644
--- a/Mkfiles/Makefile.b32
+++ b/Mkfiles/Makefile.b32
@@ -18,6 +18,8 @@
 # MAKEFILE is maintained by Stefan.Hoffmeister@Econos.de
 #
 
+PERL=perl
+
 srcdir=.
 BINDIR=e:\devel\bcb5\cbuilder5\bin
 
@@ -112,61 +114,50 @@ ndisasm$(SUFFIX)$(EXE): $(NDISASMOBJS)
     $(LIBRARIES)
 |                                # close temp file, first column!
 
-
-# OBJs with dependencies
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-             listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outdbg.$(OBJ): output/outdbg.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
 # These source files are automagically generated from a single
 # 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.
 
-insnsa.c: InstructionData
-insnsd.c: InstructionData
-insnsi.h: InstructionData
-insnsn.c: InstructionData
+insnsa.c: insns.dat insns.pl
+	$(PERL) $(srcdir)/insns.pl -a $(srcdir)/insns.dat
 
-InstructionData: insns.dat insns.pl
-	perl $(srcdir)/insns.pl -a $(srcdir)/insns.dat
+insnsd.c: insns.dat insns.pl
+	$(PERL) $(srcdir)/insns.pl -d $(srcdir)/insns.dat
+
+insnsi.h: insns.dat insns.pl
+	$(PERL) $(srcdir)/insns.pl -i $(srcdir)/insns.dat
+
+insnsn.c: insns.dat insns.pl
+	$(PERL) $(srcdir)/insns.pl -n $(srcdir)/insns.dat
 
 # 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 standard.mac version.mac
-	perl $(srcdir)/macros.pl $(srcdir)/standard.mac version.mac
+	$(PERL) $(srcdir)/macros.pl $(srcdir)/standard.mac version.mac
 
 # These files contains all the standard macros that are derived from
 # the version number.
 version.h: version version.pl
-        perl $(srcdir)/version.pl h < $(srcdir)/version > version.h
+        $(PERL) $(srcdir)/version.pl h < $(srcdir)/version > version.h
 
 version.mac: version version.pl
-        perl $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+        $(PERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl c $(srcdir)/regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl fc $(srcdir)/regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl dc $(srcdir)/regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl vc $(srcdir)/regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl h $(srcdir)/regs.dat > regs.h
 
 clean:
   @-del /S *.obj  2> NUL 1>&2
@@ -175,3 +166,59 @@ clean:
   @-del /S *.~*  2> NUL 1>&2
   @-del /S nasm$(SUFFIX)$(EXE)  2> NUL 1>&2
   @-del /S ndisasm$(SUFFIX)$(EXE)  2> NUL 1>&2
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"		# Is this really right?  -hpa
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.bc3 b/Mkfiles/Makefile.bc3
index a59b817..2cf9047 100644
--- a/Mkfiles/Makefile.bc3
+++ b/Mkfiles/Makefile.bc3
@@ -44,6 +44,9 @@ LIB = lib		#LIB file extension
 # Compilation command line
 NASM_ASM=$(CC) $(CCFLAGS) -o$*.$(OBJ) $*.c
 
+.c.o:
+	$(NASM_ASM)
+
 ################################################################
 #The OBJ files that NASM is dependent on
 
@@ -91,55 +94,6 @@ $(NDISASMOBJS)
 !
 
 ################################################################
-# Dependencies for all of NASM's obj files
-
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-	$(NASM_ASM)
-
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-	$(NASM_ASM)
-
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-	$(NASM_ASM)
-
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-	$(NASM_ASM)
-
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-		listing.h outform.h
-	$(NASM_ASM)
-
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-	$(NASM_ASM)
-
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-	$(NASM_ASM)
-
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-	$(NASM_ASM)
-
-################################################################
-# Dependencies for all of NDISASM's obj files
-
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-	$(NASM_ASM)
-
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-	$(NASM_ASM)
-
-sync.$(OBJ): sync.c sync.h
-	$(NASM_ASM)
-
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-	$(NASM_ASM)
-
-################################################################
 # Build the output formats as a library
 # The & ... $? construct tells Borland Make to repeat for all
 # out of date dependencies
@@ -148,42 +102,6 @@ output\\out.$(LIB): $(OUTOBJ)
 	for %a in (output\\*.obj) do tlib /C output\\out.$(LIB) +%a
 
 ################################################################
-# Dependencies for all of the output format's OBJ files
-
-output\\outas86.$(OBJ): output\\outas86.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outaout.$(OBJ): output\\outaout.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outbin.$(OBJ): output\\outbin.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outcoff.$(OBJ): output\\outcoff.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outdbg.$(OBJ): output\\outdbg.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outelf.$(OBJ): output\\outelf.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outobj.$(OBJ): output\\outobj.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outrdf.$(OBJ): output\\outrdf.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outrdf2.$(OBJ): output\\outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-output\\outieee.$(OBJ): output\\outieee.c nasm.h version.h insnsi.h nasmlib.h
-	$(NASM_ASM)
-
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-	$(NASM_ASM)
-
-################################################################
 # A quick way to delete the OBJ files as well as the binaries.
 
 clean :
@@ -192,3 +110,59 @@ clean :
 	-del output\\out.$(LIB)
 	-del nasm$(EXE)
 	-del ndisasm$(EXE)
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "\\"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output\\outaout.$(OBJ): output\\outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outas86.$(OBJ): output\\outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outbin.$(OBJ): output\\outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outcoff.$(OBJ): output\\outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outdbg.$(OBJ): output\\outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outelf.$(OBJ): output\\outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outieee.$(OBJ): output\\outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outobj.$(OBJ): output\\outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outrdf.$(OBJ): output\\outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outrdf2.$(OBJ): output\\outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.bor b/Mkfiles/Makefile.bor
index afd1f9b..61d370f 100644
--- a/Mkfiles/Makefile.bor
+++ b/Mkfiles/Makefile.bor
@@ -53,33 +53,63 @@ ndisasm$(EXE): $(NDISASMOBJS)
 #       $(LINK) /Fendisasm.exe $(NDISASMOBJS)
         $(LINK) /Tde $(NDISASMOBJS),ndisasm.exe,,cl.lib,
 
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-             listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outdbg.$(OBJ): output/outdbg.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
 clean :
         del *.obj
         del nasm$(EXE)
         del ndisasm$(EXE)
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"		# Is this really right? -hpa
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index d46b3b6..3b8db41 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -36,32 +36,6 @@ nasm.exe: $(NASM)
 ndisasm.exe: $(NDISASM)
 	$(CC) -o $@ $(NDISASM)
 
-assemble.o: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insns.h
-disasm.o: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.o: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.o: float.c nasm.h version.h insnsi.h
-insnsa.o: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.o: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.o: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.o: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.o: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.o: nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.o: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.o: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.o: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.o: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.o: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.o: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.o: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.o: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.o: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.o: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outieee.o: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.o: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.o: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.o: sync.c sync.h
-
 # These source files are automagically generated from a single
 # instruction-table file by a Perl script. They're distributed,
 # though, so it isn't necessary to have Perl just to recompile NASM
@@ -91,6 +65,71 @@ version.mac: version version.pl
 macros.c: macros.pl standard.mac version.mac
 	perl macros.pl standard.mac version.mac
 
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	perl regs.pl c regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	perl regs.pl fc regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	perl regs.pl dc regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	perl regs.pl vc regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	perl regs.pl h regs.dat > regs.h
+
 clean:
 	rm -f *.o *.exe output/*.o
 
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".o"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h insnsi.h version.h
+insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.o: insnsn.c
+labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+macros.o: macros.c
+names.o: names.c regs.c insnsn.c
+nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
+ nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+regdis.o: regdis.c
+regflags.o: regflags.c
+regs.o: regs.c
+regvals.o: regvals.c
+sync.o: sync.c sync.h
diff --git a/Mkfiles/Makefile.djo b/Mkfiles/Makefile.djo
index e33e01c..34488eb 100644
--- a/Mkfiles/Makefile.djo
+++ b/Mkfiles/Makefile.djo
@@ -6,12 +6,9 @@
 #
 # It uses the syntax of "Opus Make", which is the make program I prefer.
 #
-# It builds five targets:
+# It builds two targets:
 #
-# nasm16.exe  16-bit built with Turbo-C
 # nasm.exe    32-bit built with DJGPP
-# nasmd.exe   nasm.exe with debug information (for use with gdb etc.)
-# nasml.exe   nasm.exe with logging version of malloc (to find memory leaks)
 # ndisasm.exe NASM disassembler (DJGPP version)
 
 .SUFFIXES:
@@ -33,27 +30,11 @@ CFLAGS = -O3
 #	redir -eo $(CC) -g -c -O2 -finline-functions -Wall -ansi -pedantic $*.c >$*.err
 	$(CC) -g -c -O2 -finline-functions -Wall -ansi -pedantic $*.c
 
-.c.ol:
-	$(CC) -DLOGALLOC -g -c -o $*.ol $(CFLAGS) $*.c
-
-.c.obj:
-	tcc -O -Z -c -ml -d -DOF_ONLY -DOF_BIN -DOF_OBJ -If:\public\turboc -I. $*.c >$*.err
-
 NASM = nasm.o nasmlib.o float.o insnsa.o assemble.o labels.o \
        parser.o outform.o output/outbin.o output/outaout.o output/outcoff.o output/outelf.o \
        output/outobj.o output/outas86.o output/outrdf.o output/outrdf2.o output/outieee.o output/outdbg.o preproc.o listing.o \
        eval.o
 
-NASML = nasm.ol nasmlib.ol float.ol insnsa.ol assemble.ol labels.ol \
-       parser.ol outform.ol output/outbin.ol output/outaout.ol output/outcoff.ol output/outelf.ol \
-       output/outobj.ol output/outas86.ol output/outrdf.ol output/outrdf2.ol output/outieee.ol output/outdbg.ol preproc.ol listing.ol \
-       eval.ol
-
-NASM16 = nasm.obj nasmlib.obj float.obj insnsa.obj assemble.obj labels.obj \
-       parser.obj outform.obj output/outbin.obj \
-       output/outobj.obj preproc.obj listing.obj \
-       eval.obj
-
 NDISASM = ndisasm.o disasm.o sync.o nasmlib.o insnsd.o
 
 nasm.exe: $(NASM)
@@ -68,103 +49,6 @@ ndisasm.exe: $(NDISASM)
 <<
 	djp ndisasm.exe
 
-nasml.exe: $(NASML)
-	$(CC) @<<
--s -o $@ $(NASML)
-<<
-
-nasm16.exe: $(NASM16)
-	tlink @<<
-f:\public\turboc\lib\c0l.obj $(NASM16)
-$@
-
-f:\public\turboc\lib\cl.lib
-<< > nasm16.err
-
-
-nasmd.exe: $(NASM)
-	$(CC) @<<
--g -o $@ $(NASM)
-<<
-
-assemble.o: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insns.h
-disasm.o: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.o: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.o: float.c nasm.h version.h insnsi.h
-insnsa.o: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.o: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.o: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.o: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.o: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.o: nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.o: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.o: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.o: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.o: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.o: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.o: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.o: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.o: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.o: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.o: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.o: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.o: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.o: sync.c sync.h
-output/outieee.o: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-
-assemble.ol: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insns.h
-disasm.ol: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.ol: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.ol: float.c nasm.h version.h insnsi.h
-insnsa.ol: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.ol: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.ol: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.ol: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.ol: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.ol: nasmlib.c nasm.h version.h insnsi.h nasmlib.h
-ndisasm.ol: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.ol: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.ol: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.ol: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.ol: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.ol: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.ol: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.ol: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.ol: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.ol: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.ol: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.ol: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.ol: sync.c sync.h
-output/outieee.ol: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-
-assemble.obj: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insns.h
-disasm.obj: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.obj: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.obj: float.c nasm.h version.h insnsi.h
-insnsa.obj: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.obj: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.obj: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.obj: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.obj: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.obj: nasmlib.c nasm.h version.h insnsi.h nasmlib.h
-ndisasm.obj: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.obj: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.obj: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.obj: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.obj: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.obj: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.obj: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.obj: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.obj: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.obj: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.obj: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.obj: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.obj: sync.c sync.h
-output/outieee.obj: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-
 # These four source files are automagically generated from a single
 # instruction-table file by a Perl script. They're distributed,
 # though, so it isn't necessary to have Perl just to recompile NASM
@@ -188,5 +72,71 @@ version.mac: version version.pl
 macros.c: standard.mac macros.pl version.mac
 	perl macros.pl standard.mac version.mac
 
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	perl regs.pl c regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	perl regs.pl fc regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	perl regs.pl dc regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	perl regs.pl vc regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	perl regs.pl h regs.dat > regs.h
+
 clean:
 	rm -f *.o nasm ndisasm
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".o"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h insnsi.h version.h
+insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.o: insnsn.c
+labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+macros.o: macros.c
+names.o: names.c regs.c insnsn.c
+nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
+ nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+regdis.o: regdis.c
+regflags.o: regflags.c
+regs.o: regs.c
+regvals.o: regvals.c
+sync.o: sync.c sync.h
diff --git a/Mkfiles/Makefile.dl b/Mkfiles/Makefile.dl
index a13d19d..712bb41 100644
--- a/Mkfiles/Makefile.dl
+++ b/Mkfiles/Makefile.dl
@@ -42,3 +42,58 @@ clean :
         del *.map
         del *.exe
 
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.dos b/Mkfiles/Makefile.dos
index 02e2180..a7dbfc2 100644
--- a/Mkfiles/Makefile.dos
+++ b/Mkfiles/Makefile.dos
@@ -42,30 +42,6 @@ nasm$(EXE): $(NASMOBJS)
 ndisasm$(EXE): $(NDISASMOBJS)
 	cl /Fendisasm.exe $(NDISASMOBJS)
 
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outdbg.$(OBJ): output/outdbg.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
 # Another grotty hack: QC is less likely to run out of memory than
 # CL proper; and we don't need any optimisation in these modules
 # since they're just data.
@@ -78,3 +54,59 @@ clean :
 	del *.obj
 	del nasm$(EXE)
 	del ndisasm$(EXE)
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.emx b/Mkfiles/Makefile.emx
index 89e9f76..27427df 100644
--- a/Mkfiles/Makefile.emx
+++ b/Mkfiles/Makefile.emx
@@ -25,6 +25,7 @@ INSTALL_PROGRAM	= ${INSTALL}
 INSTALL_DATA	= ${INSTALL} -m 644
 
 NROFF		= echo
+PERL            = perl
 
 .SUFFIXES: .c .i .s .o .1 .man
 
@@ -59,60 +60,47 @@ nasm: $(NASM)
 ndisasm: $(NDISASM)
 	$(CC) $(LDFLAGS) -o ndisasm $(NDISASM) $(LIBS)
 
-assemble.o: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insns.h
-disasm.o: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.o: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.o: float.c nasm.h version.h insnsi.h
-insnsa.o: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.o: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.o: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.o: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.o: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.o: nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.o: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.o: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.o: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.o: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.o: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.o: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.o: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.o: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.o: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.o: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.o: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.o: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.o: sync.c sync.h
-output/outieee.o: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-
 # These source files are automagically generated from a single
 # 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.
 
 insnsa.c: insns.dat insns.pl
-	perl $(srcdir)/insns.pl -a $(srcdir)/insns.dat
+	$(PERL) $(srcdir)/insns.pl -a $(srcdir)/insns.dat
 insnsd.c: insns.dat insns.pl
-	perl $(srcdir)/insns.pl -d $(srcdir)/insns.dat
+	$(PERL) $(srcdir)/insns.pl -d $(srcdir)/insns.dat
 insnsi.h: insns.dat insns.pl
-	perl $(srcdir)/insns.pl -i $(srcdir)/insns.dat
+	$(PERL) $(srcdir)/insns.pl -i $(srcdir)/insns.dat
 insnsn.c: insns.dat insns.pl
-	perl $(srcdir)/insns.pl -n $(srcdir)/insns.dat
+	$(PERL) $(srcdir)/insns.pl -n $(srcdir)/insns.dat
 
 # These files contains all the standard macros that are derived from
 # the version number.
 version.h: version version.pl
-	perl $(srcdir)/version.pl h < $(srcdir)/version > version.h
+	$(PERL) $(srcdir)/version.pl h < $(srcdir)/version > version.h
 
 version.mac: version version.pl
-	perl $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+	$(PERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
 
 # 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: standard.mac macros.pl version.mac
-	perl $(srcdir)/macros.pl $(srcdir)/standard.mac version.mac
+	$(PERL) $(srcdir)/macros.pl $(srcdir)/standard.mac version.mac
+
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl c $(srcdir)/regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl fc $(srcdir)/regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl dc $(srcdir)/regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl vc $(srcdir)/regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	$(PERL) $(srcdir)/regs.pl h $(srcdir)/regs.dat > regs.h
 
 install: nasm ndisasm
 	$(INSTALL_PROGRAM) nasm $(INSTALLROOT)$(bindir)/nasm
@@ -150,3 +138,55 @@ everything: all doc rdf
 
 install_everything: everything install install_doc install_rdf
 
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".o"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h insnsi.h version.h
+insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.o: insnsn.c
+labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+macros.o: macros.c
+names.o: names.c regs.c insnsn.c
+nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
+ nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+regdis.o: regdis.c
+regflags.o: regflags.c
+regs.o: regs.c
+regvals.o: regvals.c
+sync.o: sync.c sync.h
diff --git a/Mkfiles/Makefile.lcc b/Mkfiles/Makefile.lcc
index 460bf86..18baa57 100644
--- a/Mkfiles/Makefile.lcc
+++ b/Mkfiles/Makefile.lcc
@@ -68,32 +68,6 @@ nasm: $(NASM) nasm.lnk
 ndisasm: $(NDISASM) ndisasm.lnk
         $(LD) -o ndisasm.exe @ndisasm.lnk
 
-assemble.${OBJ}: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insns.h
-disasm.${OBJ}: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.${OBJ}: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.${OBJ}: float.c nasm.h version.h insnsi.h
-insnsa.${OBJ}: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.${OBJ}: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.${OBJ}: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.${OBJ}: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.${OBJ}: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.${OBJ}: nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.${OBJ}: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.${OBJ}: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.${OBJ}: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.${OBJ}: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.${OBJ}: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.${OBJ}: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.${OBJ}: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.${OBJ}: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.${OBJ}: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.${OBJ}: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outieee.${OBJ}: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.${OBJ}: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.${OBJ}: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.${OBJ}: sync.c sync.h
-
 # These source files are automagically generated from a single
 # instruction-table file by a Perl script. They're distributed,
 # though, so it isn't necessary to have Perl just to recompile NASM
@@ -117,5 +91,74 @@ version.mac: version version.pl
 macros.c: standard.mac macros.pl version.mac
 	perl macros.pl standard.mac version.mac
 
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	perl regs.pl c regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	perl regs.pl fc regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	perl regs.pl dc regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	perl regs.pl vc regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	perl regs.pl h regs.dat > regs.h
+
 clean:
         rm -f *.${OBJ} nasm.exe ndisasm.exe
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".${OBJ}"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.${OBJ}: assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.${OBJ}: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.${OBJ}: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.${OBJ}: float.c nasm.h regs.h insnsi.h version.h
+insnsa.${OBJ}: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.${OBJ}: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.${OBJ}: insnsn.c
+labels.${OBJ}: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.${OBJ}: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.${OBJ}: macros.c
+names.${OBJ}: names.c regs.c insnsn.c
+nasm.${OBJ}: nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.${OBJ}: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.${OBJ}: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.${OBJ}: outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.${OBJ}: output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.${OBJ}: output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.${OBJ}: output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.${OBJ}: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.${OBJ}: output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.${OBJ}: output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.${OBJ}: output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.${OBJ}: output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.${OBJ}: output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.${OBJ}: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.${OBJ}: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.${OBJ}: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.${OBJ}: regdis.c
+regflags.${OBJ}: regflags.c
+regs.${OBJ}: regs.c
+regvals.${OBJ}: regvals.c
+sync.${OBJ}: sync.c sync.h
diff --git a/Mkfiles/Makefile.ms7 b/Mkfiles/Makefile.ms7
index cfc225a..73605f0 100644
--- a/Mkfiles/Makefile.ms7
+++ b/Mkfiles/Makefile.ms7
@@ -91,33 +91,6 @@ output\nasmlib.h: nasmlib.h
 output\outform.h: outform.h
 	copy outform.h output
 
-
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h version.h
-nasmlib.$(OBJ): nasmlib.c nasm.h insnsi.h nasmlib.h names.c insnsn.c version.h
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-output\outas86.$(OBJ): output\outas86.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outaout.$(OBJ): output\outaout.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outbin.$(OBJ): output\outbin.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outcoff.$(OBJ): output\outcoff.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outdbg.$(OBJ): output\outdbg.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outelf.$(OBJ): output\outelf.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outobj.$(OBJ): output\outobj.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outrdf.$(OBJ): output\outrdf.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outrdf2.$(OBJ): output\outrdf2.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-output\outieee.$(OBJ): output\outieee.c output\nasm.h output\insnsi.h output\nasmlib.h output\outform.h output\version.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
-
 # These files contains all the standard macros that are derived from
 # the version number.
 version.h: version version.pl
@@ -140,6 +113,19 @@ insns16.dat:  insns.dat
 	grep -v WILLAMETTE insns.dat | grep -v KATMAI | grep -v SSE | \
 	    grep -v MMX | grep -v 3DNOW | grep -v UNDOC >insns16.dat
 
+# These source files are generated from regs.dat by yet another
+# perl script.
+ regs.c: regs.dat regs.pl
+	perl regs.pl c regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	perl regs.pl fc regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	perl regs.pl dc regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	perl regs.pl vc regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	perl regs.pl h regs.dat > regs.h
+
 # Another grotty hack: QC is less likely to run out of memory than
 # CL proper; and we don't need any optimisation in these modules
 # since they're just data.
@@ -166,3 +152,58 @@ spotless:  clean
 	del insnsn.c
         del version.h
 
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "\"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output\outaout.$(OBJ): output\outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outas86.$(OBJ): output\outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outbin.$(OBJ): output\outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outcoff.$(OBJ): output\outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outdbg.$(OBJ): output\outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outelf.$(OBJ): output\outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outieee.$(OBJ): output\outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outobj.$(OBJ): output\outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outrdf.$(OBJ): output\outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\outrdf2.$(OBJ): output\outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.os2 b/Mkfiles/Makefile.os2
index 4c9dc07..cccf6a2 100644
--- a/Mkfiles/Makefile.os2
+++ b/Mkfiles/Makefile.os2
@@ -28,17 +28,11 @@ LIBS       = c2 + os2
 #
 # --------------------------------------------------------------------------
 
-CCFLAGS = /c /v /b
+CCFLAGS = /d /c /O /v /b
 
 CC = bcc                #compiler
 LINK = tlink            #linker
 
-DCCFLAGS = /d /c /O /A  #compiler flags for NDISASM
-  #/d=merge dupicate strings
-  #/c=compile only
-  #/O=Optimise jumps
-  #/A=ANSI standard C
-
 LINKFLAGS = /c /x       #linker flags
   #/c=case sIgnificance on symbols
   #/x=No map file at all
@@ -47,35 +41,32 @@ LIBRARIES =             #any libaries to add, out side of the standard libary
 EXE = .exe              #executable file extention (keep the . as the start)
 OBJ = obj               #OBJ file extention
 
-NASM_ASM=$(CC) $(CCFLAGS) $&.c         #Command line for NASM
-DASM_ASM=$(CC) $(DCCFLAGS) $&.c        #command line for NDISASM
+# How to build an object file from a C file
+.c.$(OBJ):
+	$(CC) $(CCFLAGS) /o$*.$(OBJ) $*.c
 
-# NOTE: $& is used to create the file name, as it only gives the name it's
-# self, where as using $* would have give the full path of the file it
-# want's done. This becomes a problem if the OBJ files are in a seperate
-# directory, becuse it will then try to find the source file in the OBJ
-# dir.
 
 ################################################################
 #The OBJ files that NASM is dependent on
 
-NASMOBJS = $(OBJD)nasm.$(OBJ)   $(OBJD)nasmlib.$(OBJ)  $(OBJD)float.$(OBJ)  \
-           $(OBJD)insnsa.$(OBJ) $(OBJD)assemble.$(OBJ) $(OBJD)labels.$(OBJ) \
-           $(OBJD)parser.$(OBJ) $(OBJD)outform.$(OBJ)  $(OBJD)preproc.$(OBJ) \
-	   $(OBJD)listing.$(OBJ) $(OBJD)eval.$(OBJ) $(OBJD)outrdf2.$(OBJ) $(OBJD)zoutieee.$(OBJ) 
+NASMOBJS = nasm.$(OBJ)   nasmlib.$(OBJ)  float.$(OBJ)  \
+           insnsa.$(OBJ) assemble.$(OBJ) labels.$(OBJ) \
+           parser.$(OBJ) outform.$(OBJ)  preproc.$(OBJ) \
+	   listing.$(OBJ) eval.$(OBJ)
 
 ################################################################
 #The OBJ files that NDISASM is dependent on
 
-NDISASMOBJS = $(OBJD)ndisasm.$(OBJ)  $(OBJD)disasm.$(OBJ) $(OBJD)sync.$(OBJ) \
-              $(OBJD)nasmlibd.$(OBJ) $(OBJD)insnsd.$(OBJ)
+NDISASMOBJS = ndisasm.$(OBJ)  disasm.$(OBJ) sync.$(OBJ) \
+              nasmlib.$(OBJ) insnsd.$(OBJ)
 
 ################################################################
 #The OBJ file for the output formats.
 
-OUTOBJ= $(OBJD)outbin.$(OBJ) $(OBJD)outaout.$(OBJ) $(OBJD)outcoff.$(OBJ) \
-        $(OBJD)outelf.$(OBJ) $(OBJD)outobj.$(OBJ)  $(OBJD)outas86.$(OBJ) \
-        $(OBJD)outrdf.$(OBJ) $(OBJD)outdbg.$(OBJ)
+OUTOBJ= output\\outbin.$(OBJ) output\\outaout.$(OBJ) output\\outcoff.$(OBJ) \
+        output\\outelf.$(OBJ) output\\outobj.$(OBJ)  output\\outas86.$(OBJ) \
+        output\\outrdf.$(OBJ) output\\outdbg.$(OBJ) output\\outrdf2.$(OBJ) \
+	output\\outieee.$(OBJ) 
 
 
 ################################################################
@@ -103,102 +94,66 @@ ndisasm2$(EXE): $(NDISASMOBJS)
         $(LIBS) $(LIBRARIES)              #Libaries needed
 !
 
-################################################################
-# Dependencies for all of NASM's obj files
-
-$(OBJD)assemble.$(OBJ): assemble.c nasm.h version.h assemble.h insns.h
-        $(NASM_ASM)
-
-$(OBJD)float.$(OBJ): float.c nasm.h version.h
-        $(NASM_ASM)
-
-$(OBJD)labels.$(OBJ): labels.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)listing.$(OBJ): listing.c nasm.h version.h nasmlib.h listing.h
-        $(NASM_ASM)
-
-$(OBJD)eval.$(OBJ): eval.c nasm.h version.h nasmlib.h eval.h
-        $(NASM_ASM)
-
-$(OBJD)nasm.$(OBJ): nasm.c nasm.h version.h nasmlib.h parser.h assemble.h labels.h \
-		listing.h outform.h
-        $(NASM_ASM)
-
-$(OBJD)nasmlib.$(OBJ): nasmlib.c nasm.h version.h nasmlib.h names.c insnsn.c
-        $(NASM_ASM)
-
-$(OBJD)parser.$(OBJ): parser.c nasm.h version.h nasmlib.h parser.h float.h names.c
-        $(NASM_ASM)
-
-$(OBJD)preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h nasmlib.h
-	$(NASM_ASM)
-
-$(OBJD)insnsa.$(OBJ): insnsa.c nasm.h version.h insns.h
-        $(NASM_ASM)
-
-################################################################
-# Dependencies for all of NDISASM's obj files
-
-$(OBJD)disasm.$(OBJ): disasm.c nasm.h version.h disasm.h sync.h insns.h names.c
-        $(DASM_ASM)
-
-$(OBJD)ndisasm.$(OBJ): ndisasm.c nasm.h version.h sync.h disasm.h
-        $(DASM_ASM)
-
-$(OBJD)sync.$(OBJ): sync.c sync.h
-        $(DASM_ASM)
-
-$(OBJD)insnsd.$(OBJ): insnsd.c nasm.h version.h insns.h
-        $(DASM_ASM)
-
-# This is a kludge from the word go, as we can't use the nasmlib.obj compiled
-# for NASM, as it's could be the wrong model size, so we have to compile it
-# again as huge to make sure.
-#
-# So as not to overwrite the nasmlib.obj for NASM (if it did, that
-# could cause all kinds of problems) it compiles it into nasmlibd.obj.
-#
-# the -o... switch tells it the name to compile the obj file to, right here
-# $(OBJD)nasmlibd.obj
-
-$(OBJD)nasmlibd.$(OBJ): nasmlib.c nasm.h version.h nasmlib.h
-        $(CC) $(DCCFLAGS) -o$(OBJD)nasmlibd.obj nasmlib.c
-
-################################################################
-# Dependencies for all of the output format's OBJ files
-
-$(OBJD)outas86.$(OBJ): output/outas86.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outaout.$(OBJ): output/outaout.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outbin.$(OBJ): output/outbin.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outcoff.$(OBJ): output/outcoff.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outdbg.$(OBJ): output/outdbg.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outelf.$(OBJ): output/outelf.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outobj.$(OBJ): output/outobj.c nasm.h version.h nasmlib.h
-        $(NASM_ASM)
-
-$(OBJD)outform.$(OBJ): outform.c outform.h nasm.h version.h
-        $(NASM_ASM)
-
-################################################################
-# A quick way to delete the OBJ files as well as the binaries.
-
 clean :
-        del $(OBJD)*.obj
+        del *.obj
 	del nasmos2$(EXE)
 	del ndisasm2$(EXE)
 
 # Makefile created by Chuck Crayne <ccrayne@pacific.net> --05/4/99
 # Based on Makefile.bc2 by Fox Cutter <lmb@comtch.iea.com> --01/27/97
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "\\"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output\\outaout.$(OBJ): output\\outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outas86.$(OBJ): output\\outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outbin.$(OBJ): output\\outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outcoff.$(OBJ): output\\outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outdbg.$(OBJ): output\\outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outelf.$(OBJ): output\\outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outieee.$(OBJ): output\\outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outobj.$(OBJ): output\\outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outrdf.$(OBJ): output\\outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output\\outrdf2.$(OBJ): output\\outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.sc b/Mkfiles/Makefile.sc
index 429d7a6..25a1048 100644
--- a/Mkfiles/Makefile.sc
+++ b/Mkfiles/Makefile.sc
@@ -76,41 +76,66 @@ cx.obj $(NDISASMOBJS)
 ndisasm.exe
 <<
 
-
-
 #
 # modules for programs
 #
-
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outdbg.$(OBJ): output/outdbg.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-
-
-
 clean :
 	del *.obj
 	del nasm$(EXE)
 	del ndisasm$(EXE)
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.scw b/Mkfiles/Makefile.scw
index 8922df3..a372b61 100644
--- a/Mkfiles/Makefile.scw
+++ b/Mkfiles/Makefile.scw
@@ -76,41 +76,63 @@ $(NDISASMOBJS)
 ndisasmw.exe;
 <<
 
-
-
-#
-# modules for programs
-#
-
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outdbg.$(OBJ): output/outdbg.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-
-
-
 clean :
 	del *.obj
 	del nasmw$(EXE)
 	del ndisasmw$(EXE)
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.unx b/Mkfiles/Makefile.unx
index 012edec..1c66d00 100644
--- a/Mkfiles/Makefile.unx
+++ b/Mkfiles/Makefile.unx
@@ -46,32 +46,6 @@ nasm: $(NASM)
 ndisasm: $(NDISASM)
 	$(CC) -o ndisasm $(NDISASM)
 
-assemble.o: assemble.c nasm.h version.h insnsi.h nasmlib.h assemble.h insnsn.c
-disasm.o: disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.o: eval.c eval.h nasm.h version.h insnsi.h nasmlib.h
-float.o: float.c nasm.h version.h insnsi.h
-insnsa.o: insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.o: insnsd.c nasm.h version.h insnsi.h insns.h
-labels.o: labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.o: listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.o: nasm.c nasm.h version.h insnsi.h nasmlib.h preproc.h parser.h assemble.h labels.h \
- outform.h listing.h
-nasmlib.o: nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.o: ndisasm.c nasm.h version.h insnsi.h nasmlib.h sync.h disasm.h
-output/outaout.o: output/outaout.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outas86.o: output/outas86.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outbin.o: output/outbin.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outcoff.o: output/outcoff.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outdbg.o: output/outdbg.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outelf.o: output/outelf.c nasm.h version.h insnsi.h nasmlib.h outform.h
-outform.o: outform.c outform.h nasm.h version.h insnsi.h
-output/outobj.o: output/outobj.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outrdf2.o: output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h outform.h
-output/outieee.o: output/outieee.c nasm.h version.h insnsi.h nasmlib.h outform.h
-parser.o: parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.o: preproc.c nasm.h version.h insnsi.h nasmlib.h macros.c
-sync.o: sync.c sync.h
-
 # These files contains all the standard macros that are derived from
 # the version number.
 version.h: version version.pl
@@ -99,9 +73,25 @@ insnsi.h: insns.pl insns.dat
 insnsn.c: insns.pl insns.dat
 	$(PERL) insns.pl -n insns.dat
 
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	$(PERL) regs.pl c regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	$(PERL) regs.pl fc regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	$(PERL) regs.pl dc regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	$(PERL) regs.pl vc regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	$(PERL) regs.pl h regs.dat > regs.h
+
 # This target generates all files that require perl.
 # This allows easier generation of distribution (see dist target).
-perlreq: macros.c insnsa.c insnsd.c insnsi.h insnsn.c version.h version.mac
+PERLREQ = macros.c insnsa.c insnsd.c insnsi.h insnsn.c \
+	  regs.c regs.h regflags.c regdis.c regvals.c \
+	  version.h version.mac 
+perlreq: $(PERLREQ)
 
 install: nasm ndisasm
 	$(INSTALL_PROGRAM) nasm $(bindir)/nasm
@@ -118,3 +108,56 @@ rdf:
 
 rdf_install install_rdf:
 	$(MAKE) -C rdoff install
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".o"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.o: assemble.c insns.h assemble.h regvals.c nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+disasm.o: disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.o: eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+float.o: float.c nasm.h regs.h insnsi.h version.h
+insnsa.o: insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.o: insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.o: insnsn.c
+labels.o: labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.o: listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h version.h
+macros.o: macros.c
+names.o: names.c regs.c insnsn.c
+nasm.o: nasm.c listing.h preproc.h insns.h outform.h assemble.h parser.h \
+ nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.o: nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.o: ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.o: outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.o: output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.o: output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.o: output/outbin.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outcoff.o: output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.o: output/outdbg.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outelf.o: output/outelf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outieee.o: output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.o: output/outobj.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf.o: output/outrdf.c outform.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+output/outrdf2.o: output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.o: parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.o: preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h version.h
+regdis.o: regdis.c
+regflags.o: regflags.c
+regs.o: regs.c
+regvals.o: regvals.c
+sync.o: sync.c sync.h
diff --git a/Mkfiles/Makefile.vc b/Mkfiles/Makefile.vc
index bc20308..b6317a5 100644
--- a/Mkfiles/Makefile.vc
+++ b/Mkfiles/Makefile.vc
@@ -41,30 +41,6 @@ nasm$(SUFFIX)$(EXE): $(NASMOBJS)
 ndisasm$(SUFFIX)$(EXE): $(NDISASMOBJS)
 	cl /Fendisasm$(SUFFIX).exe $(NDISASMOBJS)
 
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outdbg.$(OBJ): output/outdbg.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
 # Another grotty hack: QC is less likely to run out of memory than
 # CL proper; and we don't need any optimisation in these modules
 # since they're just data.
@@ -102,7 +78,76 @@ version.mac: version version.pl
 macros.c: macros.pl standard.mac version.mac
 	perl macros.pl standard.mac version.mac
 
+# These source files are generated from regs.dat by yet another
+# perl script.
+regs.c: regs.dat regs.pl
+	perl regs.pl c regs.dat > regs.c
+regflags.c: regs.dat regs.pl
+	perl regs.pl fc regs.dat > regflags.c
+regdis.c: regs.dat regs.pl
+	perl regs.pl dc regs.dat > regdis.c
+regvals.c: regs.dat regs.pl
+	perl regs.pl vc regs.dat > regvals.c
+regs.h: regs.dat regs.pl
+	perl regs.pl h regs.dat > regs.h
+
 clean :
 	del *.obj
 	del nasm$(SUFFIX)$(EXE)
 	del ndisasm$(SUFFIX)$(EXE)
+
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.wc b/Mkfiles/Makefile.wc
index 4820f31..87fe397 100644
--- a/Mkfiles/Makefile.wc
+++ b/Mkfiles/Makefile.wc
@@ -91,34 +91,64 @@ NDISASM.LNK: makefile.wc
         echo F nasmlib.$(OBJ) >> NDISASM.LNK
         echo F insnsd.$(OBJ) >> NDISASM.LNK
 
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
 clean :
         del *.obj
         del *.lnk
         del nasm.exe
         del ndisasm.exe
 
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/Makefile.wcw b/Mkfiles/Makefile.wcw
index 9e92311..4bc1cdd 100644
--- a/Mkfiles/Makefile.wcw
+++ b/Mkfiles/Makefile.wcw
@@ -91,34 +91,64 @@ NDISASM.LNK: makefile.wcw
         echo F nasmlib.$(OBJ) >> NDISASM.LNK
         echo F insnsd.$(OBJ) >> NDISASM.LNK
 
-assemble.$(OBJ): assemble.c nasm.h version.h insnsi.h assemble.h insns.h
-disasm.$(OBJ): disasm.c nasm.h version.h insnsi.h disasm.h sync.h insns.h names.c insnsn.c
-eval.$(OBJ): eval.c nasm.h version.h insnsi.h nasmlib.h eval.h
-float.$(OBJ): float.c nasm.h version.h insnsi.h
-insnsa.$(OBJ): insnsa.c nasm.h version.h insnsi.h insns.h
-insnsd.$(OBJ): insnsd.c nasm.h version.h insnsi.h insns.h
-labels.$(OBJ): labels.c nasm.h version.h insnsi.h nasmlib.h
-listing.$(OBJ): listing.c nasm.h version.h insnsi.h nasmlib.h listing.h
-nasm.$(OBJ): nasm.c nasm.h version.h insnsi.h nasmlib.h parser.h assemble.h labels.h \
-	listing.h outform.h
-nasmlib.$(OBJ): nasmlib.c nasm.h version.h insnsi.h nasmlib.h names.c insnsn.c
-ndisasm.$(OBJ): ndisasm.c nasm.h version.h insnsi.h sync.h disasm.h
-output/outas86.$(OBJ): output/outas86.c nasm.h version.h insnsi.h nasmlib.h
-output/outaout.$(OBJ): output/outaout.c nasm.h version.h insnsi.h nasmlib.h
-output/outbin.$(OBJ): output/outbin.c nasm.h version.h insnsi.h nasmlib.h
-output/outcoff.$(OBJ): output/outcoff.c nasm.h version.h insnsi.h nasmlib.h
-output/outelf.$(OBJ): output/outelf.c nasm.h version.h insnsi.h nasmlib.h
-output/outobj.$(OBJ): output/outobj.c nasm.h version.h insnsi.h nasmlib.h
-output/outrdf2.$(OBJ): output/outrdf2.c nasm.h version.h insnsi.h nasmlib.h
-output/outieee.$(OBJ): output/outieee.c nasm.h version.h insnsi.h nasmlib.h
-outform.$(OBJ): outform.c outform.h nasm.h version.h insnsi.h
-parser.$(OBJ): parser.c nasm.h version.h insnsi.h nasmlib.h parser.h float.h names.c insnsn.c
-preproc.$(OBJ): preproc.c macros.c preproc.h nasm.h version.h insnsi.h nasmlib.h
-sync.$(OBJ): sync.c sync.h
-
 clean :
         del *.obj
         del *.lnk
         del nasm.exe
         del ndisasm.exe
 
+#-- Magic hints to mkdep.pl --#
+# @object-ending: ".$(OBJ)"
+# @path-separator: "/"
+#-- Everything below is generated by mkdep.pl - do not edit --#
+assemble.$(OBJ): assemble.c insns.h assemble.h regvals.c nasm.h regs.h \
+ insnsi.h nasmlib.h version.h
+disasm.$(OBJ): disasm.c insns.h regs.c sync.h names.c nasm.h disasm.h regs.h \
+ insnsn.c insnsi.h version.h regdis.c
+eval.$(OBJ): eval.c nasm.h regs.h labels.h insnsi.h nasmlib.h version.h \
+ eval.h
+float.$(OBJ): float.c nasm.h regs.h insnsi.h version.h
+insnsa.$(OBJ): insnsa.c insns.h nasm.h regs.h insnsi.h version.h
+insnsd.$(OBJ): insnsd.c insns.h nasm.h regs.h insnsi.h version.h
+insnsn.$(OBJ): insnsn.c
+labels.$(OBJ): labels.c nasm.h regs.h insnsi.h nasmlib.h version.h
+listing.$(OBJ): listing.c listing.h nasm.h regs.h insnsi.h nasmlib.h \
+ version.h
+macros.$(OBJ): macros.c
+names.$(OBJ): names.c regs.c insnsn.c
+nasm.$(OBJ): nasm.c listing.h preproc.h insns.h outform.h assemble.h \
+ parser.h nasm.h regs.h labels.h insnsi.h nasmlib.h version.h eval.h
+nasmlib.$(OBJ): nasmlib.c regs.c names.c nasm.h regs.h insnsn.c insnsi.h \
+ nasmlib.h version.h
+ndisasm.$(OBJ): ndisasm.c insns.h sync.h nasm.h disasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+outform.$(OBJ): outform.c outform.h nasm.h regs.h insnsi.h version.h
+output/outaout.$(OBJ): output/outaout.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outas86.$(OBJ): output/outas86.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outbin.$(OBJ): output/outbin.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outcoff.$(OBJ): output/outcoff.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outdbg.$(OBJ): output/outdbg.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outelf.$(OBJ): output/outelf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outieee.$(OBJ): output/outieee.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outobj.$(OBJ): output/outobj.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf.$(OBJ): output/outrdf.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+output/outrdf2.$(OBJ): output/outrdf2.c outform.h nasm.h regs.h insnsi.h \
+ nasmlib.h version.h
+parser.$(OBJ): parser.c parser.h nasm.h regs.h insnsi.h regflags.c float.h \
+ nasmlib.h version.h
+preproc.$(OBJ): preproc.c nasm.h macros.c regs.h insnsi.h nasmlib.h \
+ version.h
+regdis.$(OBJ): regdis.c
+regflags.$(OBJ): regflags.c
+regs.$(OBJ): regs.c
+regvals.$(OBJ): regvals.c
+sync.$(OBJ): sync.c sync.h
diff --git a/Mkfiles/README b/Mkfiles/README
index 33dc7f7..471928b 100644
--- a/Mkfiles/README
+++ b/Mkfiles/README
@@ -15,15 +15,15 @@ The Makefiles are:
 
   Filename      Target		Compiler	Notes
   ---------------------------------------------------------------------------
-  Makefile.b32	Win32		Borland C++
-  Makefile.bc3	16-bit DOS	Borland C++	OK as of NASM 0.98.31
-  Makefile.bor	16-bit DOS	Turbo C		probably obsolete
-  Makefile.dj	32-bit DOS	DJGPP		OK as of NASM 0.98.31
-  Makefile.djo	32-bit DOS	DJGPP		"Opus Make" version
-  Makefile.dl	32-bit DOS	cc386		cc386 by David Lindauer
-  Makefile.dos	16-bit DOS	MSC 5		probably obsolete
+  Makefile.b32	Win32	    	Borland C++
+  Makefile.bc3	16-bit DOS  	Borland C++	OK as of NASM 0.98.34
+  Makefile.bor	16-bit DOS  	Turbo C		(**)
+  Makefile.dj	32-bit DOS  	DJGPP		OK as of NASM 0.98.31
+  Makefile.djo	32-bit DOS  	DJGPP		"Opus Make" version(**)
+  Makefile.dl	32-bit DOS  	cc386		cc386 by David Lindauer
+  Makefile.dos	16-bit DOS	MSC 5		(**)
   Makefile.ms7	16-bit DOS	MSC 7		OK as of NASM 0.98.31
-  Makefile.os2	OS/2 Warp	Borland C++
+  Makefile.os2	OS/2 Warp	Borland C++	(**)
   Makefile.sc	32-bit DOS	Symantec C++ 7
   Makefile.scw	Win32		Symantec C++ 7
   Makefile.unx	Unix		Any(*)		use only if "configure" fails
@@ -36,3 +36,5 @@ The Makefiles are:
       arguments, such as -c and -O.  Pre-ANSI compilers, such as the
       "cc" distributed with SunOS 4.x, will not work.
 
+(**) = Probably obsolete, needs updating.
+