Use a perfect hash to look up preprocessor directives

Use a perfect hash to look up preprocessor directives, and generate
the preprocessor directive list automatically.

19 files changed, 185 insertions, 156 deletions

diff --git a/Mkfiles/Makefile.b32 b/Mkfiles/Makefile.b32
index 3981898..3972b60 100644
--- a/Mkfiles/Makefile.b32
+++ b/Mkfiles/Makefile.b32
@@ -173,8 +173,8 @@ clean:
 # @object-ending: ".$(OBJ)"
 # @path-separator: "\"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -188,11 +188,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -222,8 +222,9 @@ output\outrdf2.$(OBJ): output\outrdf2.c rdoff\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.bc3 b/Mkfiles/Makefile.bc3
index 01cb586..f58ae10 100644
--- a/Mkfiles/Makefile.bc3
+++ b/Mkfiles/Makefile.bc3
@@ -133,8 +133,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "\\"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -148,11 +148,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -182,8 +182,9 @@ output\\outrdf2.$(OBJ): output\\outrdf2.c rdoff\\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.bor b/Mkfiles/Makefile.bor
index 69a7e1d..96c0ad4 100644
--- a/Mkfiles/Makefile.bor
+++ b/Mkfiles/Makefile.bor
@@ -62,8 +62,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"		# Is this really right? -hpa
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -77,11 +77,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -111,8 +111,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.dcp b/Mkfiles/Makefile.dcp
index e0d4b1f..a4c2c27 100644
--- a/Mkfiles/Makefile.dcp
+++ b/Mkfiles/Makefile.dcp
@@ -157,7 +157,7 @@ regs.o: regs.c
 regvals.o: regvals.c

 sync.o: sync.c sync.h

 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.o: assemble.c preproc.h insns.h regs.h regflags.c config.h \
+assemble.o: assemble.c preproc.h insns.h pptok.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.o: disasm.c insns.h sync.h regdis.c regs.h config.h regs.c version.h \
  nasm.h insnsn.c names.c insnsi.h disasm.h
@@ -170,10 +170,11 @@ labels.o: labels.c regs.h config.h version.h nasmlib.h nasm.h
 listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
-nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
-nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h regs.h \
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
+nasmlib.o: nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
@@ -203,7 +204,9 @@ output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
+pptok.o: pptok.c
+preproc.o: preproc.c preproc.h macros.c pptok.h regs.h config.h version.h \
+ nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index b6a5a5e..91d6b9d 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -86,7 +86,7 @@ clean:
 # @object-ending: ".o"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.o: assemble.c preproc.h insns.h regs.h regflags.c config.h \
+assemble.o: assemble.c preproc.h insns.h pptok.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.o: disasm.c insns.h sync.h regdis.c regs.h config.h regs.c version.h \
  nasm.h insnsn.c names.c insnsi.h disasm.h
@@ -99,10 +99,11 @@ labels.o: labels.c regs.h config.h version.h nasmlib.h nasm.h
 listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
-nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
-nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h regs.h \
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
+nasmlib.o: nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
@@ -132,7 +133,9 @@ output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
+pptok.o: pptok.c
+preproc.o: preproc.c preproc.h macros.c pptok.h regs.h config.h version.h \
+ nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.djo b/Mkfiles/Makefile.djo
index 0c6f8aa..40b386c 100644
--- a/Mkfiles/Makefile.djo
+++ b/Mkfiles/Makefile.djo
@@ -93,7 +93,7 @@ clean:
 # @object-ending: ".o"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.o: assemble.c preproc.h insns.h regs.h regflags.c config.h \
+assemble.o: assemble.c preproc.h insns.h pptok.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.o: disasm.c insns.h sync.h regdis.c regs.h config.h regs.c version.h \
  nasm.h insnsn.c names.c insnsi.h disasm.h
@@ -106,10 +106,11 @@ labels.o: labels.c regs.h config.h version.h nasmlib.h nasm.h
 listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
-nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
-nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h regs.h \
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
+nasmlib.o: nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
@@ -139,7 +140,9 @@ output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
+pptok.o: pptok.c
+preproc.o: preproc.c preproc.h macros.c pptok.h regs.h config.h version.h \
+ nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.dl b/Mkfiles/Makefile.dl
index 662ecdd..38f8e0d 100644
--- a/Mkfiles/Makefile.dl
+++ b/Mkfiles/Makefile.dl
@@ -47,8 +47,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -62,11 +62,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -96,8 +96,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.dos b/Mkfiles/Makefile.dos
index 1537af0..db7f8ba 100644
--- a/Mkfiles/Makefile.dos
+++ b/Mkfiles/Makefile.dos
@@ -60,8 +60,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -75,11 +75,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -109,8 +109,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.emx b/Mkfiles/Makefile.emx
index 7127abb..68b382e 100644
--- a/Mkfiles/Makefile.emx
+++ b/Mkfiles/Makefile.emx
@@ -143,7 +143,7 @@ install_everything: everything install install_doc install_rdf
 # @object-ending: ".o"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.o: assemble.c preproc.h insns.h regs.h regflags.c config.h \
+assemble.o: assemble.c preproc.h insns.h pptok.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.o: disasm.c insns.h sync.h regdis.c regs.h config.h regs.c version.h \
  nasm.h insnsn.c names.c insnsi.h disasm.h
@@ -156,10 +156,11 @@ labels.o: labels.c regs.h config.h version.h nasmlib.h nasm.h
 listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
-nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
-nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h regs.h \
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
+nasmlib.o: nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
@@ -189,7 +190,9 @@ output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
+pptok.o: pptok.c
+preproc.o: preproc.c preproc.h macros.c pptok.h regs.h config.h version.h \
+ nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.lcc b/Mkfiles/Makefile.lcc
index c74f56b..d5a649c 100644
--- a/Mkfiles/Makefile.lcc
+++ b/Mkfiles/Makefile.lcc
@@ -113,8 +113,8 @@ clean:
 # @object-ending: ".${OBJ}"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.${OBJ}: assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.${OBJ}: assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.${OBJ}: disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.${OBJ}: eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -128,11 +128,11 @@ listing.${OBJ}: listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.${OBJ}: macros.c
 names.${OBJ}: names.c regs.c insnsn.c
-nasm.${OBJ}: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.${OBJ}: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.${OBJ}: nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.${OBJ}: nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.${OBJ}: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.${OBJ}: outform.c regs.h config.h outform.h version.h nasm.h
@@ -162,8 +162,9 @@ output/outrdf2.${OBJ}: output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.${OBJ}: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.${OBJ}: preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.${OBJ}: pptok.c
+preproc.${OBJ}: preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.${OBJ}: regdis.c
 regflags.${OBJ}: regflags.c
 regs.${OBJ}: regs.c
diff --git a/Mkfiles/Makefile.ms7 b/Mkfiles/Makefile.ms7
index 851d251..fa0719e 100644
--- a/Mkfiles/Makefile.ms7
+++ b/Mkfiles/Makefile.ms7
@@ -156,8 +156,8 @@ spotless:  clean
 # @object-ending: ".$(OBJ)"
 # @path-separator: "\"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -171,11 +171,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -205,8 +205,9 @@ output\outrdf2.$(OBJ): output\outrdf2.c rdoff\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.os2 b/Mkfiles/Makefile.os2
index 5aaac52..82e8932 100644
--- a/Mkfiles/Makefile.os2
+++ b/Mkfiles/Makefile.os2
@@ -107,8 +107,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "\\"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -122,11 +122,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -156,8 +156,9 @@ output\\outrdf2.$(OBJ): output\\outrdf2.c rdoff\\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.sc b/Mkfiles/Makefile.sc
index 6a080b5..801c051 100644
--- a/Mkfiles/Makefile.sc
+++ b/Mkfiles/Makefile.sc
@@ -89,8 +89,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -104,11 +104,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -138,8 +138,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.scw b/Mkfiles/Makefile.scw
index 67b3413..8d2298d 100644
--- a/Mkfiles/Makefile.scw
+++ b/Mkfiles/Makefile.scw
@@ -86,8 +86,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -101,11 +101,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -135,8 +135,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.unx b/Mkfiles/Makefile.unx
index 8c483fd..7bc0ab0 100644
--- a/Mkfiles/Makefile.unx
+++ b/Mkfiles/Makefile.unx
@@ -113,7 +113,7 @@ rdf_install install_rdf:
 # @object-ending: ".o"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.o: assemble.c preproc.h insns.h regs.h regflags.c config.h \
+assemble.o: assemble.c preproc.h insns.h pptok.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.o: disasm.c insns.h sync.h regdis.c regs.h config.h regs.c version.h \
  nasm.h insnsn.c names.c insnsi.h disasm.h
@@ -126,10 +126,11 @@ labels.o: labels.c regs.h config.h version.h nasmlib.h nasm.h
 listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
-nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
-nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h regs.h \
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
+nasmlib.o: nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
@@ -159,7 +160,9 @@ output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
+pptok.o: pptok.c
+preproc.o: preproc.c preproc.h macros.c pptok.h regs.h config.h version.h \
+ nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
diff --git a/Mkfiles/Makefile.vc b/Mkfiles/Makefile.vc
index 1086921..e45a398 100644
--- a/Mkfiles/Makefile.vc
+++ b/Mkfiles/Makefile.vc
@@ -101,8 +101,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -116,11 +116,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -150,8 +150,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.wc b/Mkfiles/Makefile.wc
index 61742dc..98ee015 100644
--- a/Mkfiles/Makefile.wc
+++ b/Mkfiles/Makefile.wc
@@ -103,8 +103,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -118,11 +118,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -152,8 +152,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.wcd b/Mkfiles/Makefile.wcd
index e64c062..1e38fd8 100644
--- a/Mkfiles/Makefile.wcd
+++ b/Mkfiles/Makefile.wcd
@@ -88,8 +88,8 @@ clean :	.SYMBOLIC
 # @object-ending: ".$(OBJ)"
 # @path-separator: ""	# This means kill the path completely
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -103,11 +103,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -135,8 +135,9 @@ outrdf2.$(OBJ): outrdf2.c rdoff.h regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
diff --git a/Mkfiles/Makefile.wcw b/Mkfiles/Makefile.wcw
index 0409cd6..7e10577 100644
--- a/Mkfiles/Makefile.wcw
+++ b/Mkfiles/Makefile.wcw
@@ -103,8 +103,8 @@ clean :
 # @object-ending: ".$(OBJ)"
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
-assemble.$(OBJ): assemble.c preproc.h insns.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
+assemble.$(OBJ): assemble.c preproc.h insns.h pptok.h regs.h regflags.c \
+ config.h version.h nasmlib.h nasm.h regvals.c insnsi.h assemble.h
 disasm.$(OBJ): disasm.c insns.h sync.h regdis.c regs.h config.h regs.c \
  version.h nasm.h insnsn.c names.c insnsi.h disasm.h
 eval.$(OBJ): eval.c labels.h eval.h regs.h config.h version.h nasmlib.h \
@@ -118,11 +118,11 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
  listing.h
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
-nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
- listing.h
-nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
- nasm.h insnsn.c names.c insnsi.h
+nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h pptok.h \
+ regs.h outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h \
+ insnsi.h listing.h
+nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
@@ -152,8 +152,9 @@ output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
  version.h nasmlib.h nasm.h stdscan.h insnsi.h
-preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
- nasm.h
+pptok.$(OBJ): pptok.c
+preproc.$(OBJ): preproc.c preproc.h macros.c pptok.h regs.h config.h \
+ version.h nasmlib.h nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c