Factor out common string list handling code

Simplify the preprocessor code by factoring out the common string list
handling code.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 83 insertions, 77 deletions

diff --git a/Makefile.in b/Makefile.in
index eea5cb47..61da7583 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,6 +119,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \
 	nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
 	nasmlib/raa.$(O) nasmlib/saa.$(O) \
+	nasmlib/strlist.$(O) \
 	common/common.$(O) \
 	x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \
 	x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
@@ -375,98 +376,98 @@ asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \
  asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config.h \
  include/compiler.h include/disp8.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/directiv.$(O): asm/directiv.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/hashtbl.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/labels.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/insnsi.h x86/regs.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.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/hashtbl.h include/labels.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/listing.h asm/parser.h asm/pptok.h asm/preproc.h \
  asm/stdscan.h asm/tokens.h config.h include/compiler.h include/iflag.h \
  include/insns.h include/labels.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/tables.h include/ver.h output/outform.h x86/iflaggen.h x86/insnsi.h \
- x86/regs.h
+ include/strlist.h include/tables.h include/ver.h output/outform.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h \
  asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h config.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config.h \
  include/compiler.h include/hashtbl.h include/nasmint.h include/nasmlib.h
 asm/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h \
  asm/pptok.h asm/preproc.h config.h include/compiler.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \
  asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h config.h \
  include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/quote.$(O): asm/quote.c asm/quote.h config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 asm/rdstrnum.$(O): asm/rdstrnum.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config.h include/compiler.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/quote.h asm/stdscan.h asm/tokens.h config.h include/compiler.h \
  include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/iflaggen.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/stdscan.h asm/tokens.h config.h include/compiler.h include/hashtbl.h \
  include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/iflaggen.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config.h include/compiler.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config.h disasm/disasm.h disasm/sync.h include/compiler.h \
  include/disp8.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regdis.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regdis.h x86/regs.h
 disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \
  asm/preproc.h asm/tokens.h config.h disasm/disasm.h disasm/sync.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 disasm/sync.$(O): disasm/sync.c config.h disasm/sync.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 macros/macros.$(O): macros/macros.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/hashtbl.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- output/outform.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h output/outform.h x86/insnsi.h x86/regs.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 nasmlib/crc64.$(O): nasmlib/crc64.c config.h include/compiler.h \
@@ -479,8 +480,8 @@ nasmlib/filename.$(O): nasmlib/filename.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/hashtbl.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 nasmlib/ilog2.$(O): nasmlib/ilog2.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 nasmlib/malloc.$(O): nasmlib/malloc.c config.h include/compiler.h \
@@ -493,8 +494,8 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config.h include/compiler.h \
  include/nasmint.h include/rbtree.h
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config.h include/compiler.h \
@@ -503,80 +504,85 @@ nasmlib/srcfile.$(O): nasmlib/srcfile.c config.h include/compiler.h \
  include/hashtbl.h include/nasmint.h include/nasmlib.h
 nasmlib/string.$(O): nasmlib/string.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
+nasmlib/strlist.$(O): nasmlib/strlist.c config.h include/compiler.h \
+ include/nasmint.h include/nasmlib.h include/strlist.h
 nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h
 nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/hashtbl.h include/md5.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/saa.h include/tables.h output/outlib.h output/pecoff.h version.h \
- x86/insnsi.h x86/regs.h
+ include/saa.h include/strlist.h include/tables.h output/outlib.h \
+ output/pecoff.h version.h x86/insnsi.h x86/regs.h
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config.h include/compiler.h include/nasm.h \
  include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/saa.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outbin.$(O): output/outbin.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config.h include/compiler.h include/labels.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/saa.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outcoff.$(O): output/outcoff.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/tables.h output/outform.h output/outlib.h output/pecoff.h \
- x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ output/pecoff.h x86/insnsi.h x86/regs.h
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outelf.$(O): output/outelf.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config.h include/compiler.h include/nasm.h \
  include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/rbtree.h include/saa.h include/tables.h include/ver.h \
- output/dwarf.h output/elf.h output/outelf.h output/outform.h \
+ include/rbtree.h include/saa.h include/strlist.h include/tables.h \
+ include/ver.h output/dwarf.h output/elf.h output/outelf.h output/outform.h \
  output/outlib.h output/stabs.h x86/insnsi.h x86/regs.h
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h output/outform.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outform.h x86/insnsi.h x86/regs.h
 output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h include/ver.h \
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/raa.h include/rbtree.h \
- include/saa.h include/tables.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/saa.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outobj.$(O): output/outobj.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config.h include/compiler.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- include/ver.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h include/ver.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config.h include/compiler.h include/nasm.h include/nasmint.h \
  include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \
- include/tables.h output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 stdlib/snprintf.$(O): stdlib/snprintf.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config.h include/compiler.h \
@@ -587,29 +593,29 @@ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/disp8.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 x86/iflag.$(O): x86/iflag.c config.h include/compiler.h include/iflag.h \
  include/nasmint.h x86/iflaggen.h
 x86/insnsa.$(O): x86/insnsa.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config.h include/compiler.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config.h include/compiler.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config.h include/compiler.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 x86/insnsn.$(O): x86/insnsn.c config.h include/compiler.h include/nasmint.h \
  include/tables.h x86/insnsi.h
 x86/regdis.$(O): x86/regdis.c x86/regdis.h x86/regs.h
 x86/regflags.$(O): x86/regflags.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 x86/regs.$(O): x86/regs.c config.h include/compiler.h include/nasmint.h \
  include/tables.h x86/insnsi.h
 x86/regvals.$(O): x86/regvals.c config.h include/compiler.h \