Support __float*__ for floating-point numbers in expressions

Add special operators to allow the use of floating-point constants in
contexts other than DW/DD/DQ/DT/DO.

As part of this checkin, make MAX_KEYWORD generated by tokhash.pl,
since it knows what all the keywords are so it can tell which one is
the longest.

1 files changed, 22 insertions, 14 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 96b5449c..5871efb3 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -1,3 +1,5 @@
+# -*- makefile -*-
+#
 # Makefile for building NASM using Microsoft Visual C++ and NMAKE.
 # Tested on Microsoft Visual C++ 2005 Express Edition.
 #
@@ -95,9 +97,14 @@ regs.h: regs.dat regs.pl
 
 # Assembler token hash
 tokhash.c: insns.dat regs.dat tokens.dat tokhash.pl perllib/phash.ph
-	$(PERL) $(srcdir)/tokhash.pl $(srcdir)/insns.dat $(srcdir)/regs.dat \
+	$(PERL) $(srcdir)/tokhash.pl c $(srcdir)/insns.dat $(srcdir)/regs.dat \
 		$(srcdir)/tokens.dat > tokhash.c
 
+# Assembler token metadata
+tokens.h: insns.dat regs.dat tokens.dat tokhash.pl perllib/phash.ph
+	$(PERL) $(srcdir)/tokhash.pl h $(srcdir)/insns.dat $(srcdir)/regs.dat \
+		$(srcdir)/tokens.dat > tokens.h
+
 # Preprocessor token hash
 pptok.h: pptok.dat pptok.pl perllib/phash.ph
 	$(PERL) $(srcdir)/pptok.pl h $(srcdir)/pptok.dat pptok.h
@@ -107,7 +114,7 @@ pptok.c: pptok.dat pptok.pl perllib/phash.ph
 # 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 \
-	  regs.c regs.h regflags.c regdis.c regvals.c tokhash.c \
+	  regs.c regs.h regflags.c regdis.c regvals.c tokhash.c tokens.h \
 	  version.h version.mac pptok.h pptok.c
 perlreq: $(PERLREQ)
 
@@ -166,12 +173,13 @@ everything: all doc rdf
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 assemble.$(O): assemble.c assemble.h compiler.h config.h insns.h insnsi.h \
- nasm.h nasmlib.h pptok.h preproc.h regflags.c regs.h regvals.c version.h
+ nasm.h nasmlib.h pptok.h preproc.h regflags.c regs.h regvals.c tokens.h \
+ version.h
 crc64.$(O): crc64.c
 disasm.$(O): disasm.c compiler.h config.h disasm.h insns.h insnsi.h insnsn.c \
- names.c nasm.h nasmlib.h regdis.c regs.c regs.h sync.h version.h
-eval.$(O): eval.c compiler.h config.h eval.h insnsi.h labels.h nasm.h \
- nasmlib.h regs.h version.h
+ names.c nasm.h nasmlib.h regdis.c regs.c regs.h sync.h tokens.h version.h
+eval.$(O): eval.c compiler.h config.h eval.h float.h insnsi.h labels.h \
+ nasm.h nasmlib.h regs.h version.h
 exprlib.$(O): exprlib.c compiler.h config.h insnsi.h nasm.h nasmlib.h regs.h \
  version.h
 float.$(O): float.c compiler.h config.h insnsi.h nasm.h nasmlib.h regs.h \
@@ -179,9 +187,9 @@ float.$(O): float.c compiler.h config.h insnsi.h nasm.h nasmlib.h regs.h \
 hashtbl.$(O): hashtbl.c compiler.h config.h hashtbl.h insnsi.h nasm.h \
  nasmlib.h regs.h version.h
 insnsa.$(O): insnsa.c compiler.h config.h insns.h insnsi.h nasm.h nasmlib.h \
- regs.h version.h
+ regs.h tokens.h version.h
 insnsd.$(O): insnsd.c compiler.h config.h insns.h insnsi.h nasm.h nasmlib.h \
- regs.h version.h
+ regs.h tokens.h version.h
 insnsn.$(O): insnsn.c
 labels.$(O): labels.c compiler.h config.h hashtbl.h insnsi.h nasm.h \
  nasmlib.h regs.h version.h
@@ -191,11 +199,11 @@ macros.$(O): macros.c
 names.$(O): names.c insnsn.c regs.c
 nasm.$(O): nasm.c assemble.h compiler.h config.h eval.h insns.h insnsi.h \
  labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h preproc.h \
- regs.h stdscan.h version.h
+ regs.h stdscan.h tokens.h version.h
 nasmlib.$(O): nasmlib.c compiler.h config.h insns.h insnsi.h nasm.h \
- nasmlib.h regs.h version.h
+ nasmlib.h regs.h tokens.h version.h
 ndisasm.$(O): ndisasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \
- nasmlib.h regs.h sync.h version.h
+ nasmlib.h regs.h sync.h tokens.h version.h
 outform.$(O): outform.c compiler.h config.h insnsi.h nasm.h nasmlib.h \
  outform.h regs.h version.h
 output/outaout.$(O): output/outaout.c compiler.h config.h insnsi.h nasm.h \
@@ -223,7 +231,7 @@ output/outrdf.$(O): output/outrdf.c compiler.h config.h insnsi.h nasm.h \
 output/outrdf2.$(O): output/outrdf2.c compiler.h config.h insnsi.h nasm.h \
  nasmlib.h outform.h rdoff/rdoff.h regs.h version.h
 parser.$(O): parser.c compiler.h config.h float.h insns.h insnsi.h nasm.h \
- nasmlib.h parser.h regflags.c regs.h stdscan.h version.h
+ nasmlib.h parser.h regflags.c regs.h stdscan.h tokens.h version.h
 pptok.$(O): pptok.c compiler.h config.h nasmlib.h pptok.h preproc.h
 preproc.$(O): preproc.c compiler.h config.h hashtbl.h insnsi.h macros.c \
  nasm.h nasmlib.h pptok.h preproc.h regs.h version.h
@@ -232,7 +240,7 @@ regflags.$(O): regflags.c
 regs.$(O): regs.c
 regvals.$(O): regvals.c
 stdscan.$(O): stdscan.c compiler.h config.h insns.h insnsi.h nasm.h \
- nasmlib.h regs.h stdscan.h version.h
+ nasmlib.h regs.h stdscan.h tokens.h version.h
 sync.$(O): sync.c compiler.h config.h nasmlib.h sync.h
 tokhash.$(O): tokhash.c compiler.h config.h insns.h insnsi.h nasm.h \
- nasmlib.h regs.h version.h
+ nasmlib.h regs.h tokens.h version.h