diff --git a/Makefile.in b/Makefile.in
index b8888464..8b96e128 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -391,6 +391,11 @@ asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \
  config/watcom.h include/compiler.h include/labels.h include/nasm.h \
  include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
  include/tables.h x86/insnsi.h x86/regs.h
+asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 9998a2ae..09265361 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -76,7 +76,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	asm/directiv.$(O) \
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
 	asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
-	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) \
+	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \
 	asm/stdscan.$(O) \
 	asm/strfunc.$(O) asm/tokhash.$(O) \
 	asm/segalloc.$(O) \
@@ -282,6 +282,10 @@ asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \
  include/compiler.h include/labels.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
  x86/insnsi.h x86/regs.h
+asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index 123c6305..18800b91 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -53,7 +53,7 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
 	directiv.o \
 	assemble.o labels.o parser.o \
 	preproc.o quote.o pptok.o \
-	listing.o eval.o exprlib.o \
+	listing.o eval.o exprlib.o exprdump.o \
 	stdscan.o \
 	strfunc.o tokhash.o \
 	segalloc.o \
@@ -158,6 +158,9 @@ directiv.o: directiv.c directiv.h pptok.h preproc.h config.h msvc.h \
 eval.o: eval.c directiv.h eval.h float.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \
  strlist.h tables.h insnsi.h regs.h
+exprdump.o: exprdump.c directiv.h pptok.h preproc.h config.h msvc.h \
+ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
+ strlist.h tables.h insnsi.h regs.h
 exprlib.o: exprlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
  insnsi.h regs.h
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index a5619b71..9ea0aaae 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -69,7 +69,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
 	asm/directiv.$(O) &
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) &
 	asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) &
-	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) &
+	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) &
 	asm/stdscan.$(O) &
 	asm/strfunc.$(O) asm/tokhash.$(O) &
 	asm/segalloc.$(O) &
@@ -272,6 +272,10 @@ asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h &
  include/compiler.h include/labels.h include/nasm.h include/nasmint.h &
  include/nasmlib.h include/opflags.h include/strlist.h include/tables.h &
  x86/insnsi.h x86/regs.h
+asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h &
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h &
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h &
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h &
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index ac1dad7c..47b5c949 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -80,7 +80,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	asm/directiv.$(O) \
 	asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
 	asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
-	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) \
+	asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \
 	asm/stdscan.$(O) \
 	asm/strfunc.$(O) asm/tokhash.$(O) \
 	asm/segalloc.$(O) \
@@ -270,6 +270,11 @@ asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \
  config/watcom.h include/compiler.h include/labels.h include/nasm.h \
  include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
  include/tables.h x86/insnsi.h x86/regs.h
+asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \
+ config/config.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
+ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
+ x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \