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 \ diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 6b031c2e..9e58a5ff 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -83,6 +83,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) \ @@ -262,95 +263,99 @@ everything: all doc rdf asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.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/nasmint.h include/nasmlib.h include/opflags.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 \ 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/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \ asm/preproc.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 \ 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/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 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 \ 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/nasmint.h include/nasmlib.h include/opflags.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 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 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 \ 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 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 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 \ 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 include/compiler.h include/nasmint.h \ include/nasmlib.h asm/rdstrnum.$(O): asm/rdstrnum.c asm/directiv.h asm/pptok.h asm/preproc.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/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 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 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/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 \ 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/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 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 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 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 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/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 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 \ 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/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 include/compiler.h include/nasmint.h \ include/nasmlib.h nasmlib/crc64.$(O): nasmlib/crc64.c include/compiler.h include/hashtbl.h \ @@ -363,8 +368,8 @@ nasmlib/filename.$(O): nasmlib/filename.c include/compiler.h \ include/nasmint.h include/nasmlib.h nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \ asm/preproc.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 include/compiler.h include/nasmint.h \ include/nasmlib.h nasmlib/malloc.$(O): nasmlib/malloc.c include/compiler.h include/nasmint.h \ @@ -377,8 +382,8 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c include/compiler.h include/nasmint.h \ include/rbtree.h nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \ asm/preproc.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 include/compiler.h \ include/nasmint.h include/nasmlib.h nasmlib/saa.$(O): nasmlib/saa.c include/compiler.h include/nasmint.h \ @@ -387,78 +392,85 @@ nasmlib/srcfile.$(O): nasmlib/srcfile.c include/compiler.h include/hashtbl.h \ include/nasmint.h include/nasmlib.h nasmlib/string.$(O): nasmlib/string.c include/compiler.h include/nasmint.h \ include/nasmlib.h +nasmlib/strlist.$(O): nasmlib/strlist.c 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 include/compiler.h include/nasmint.h \ include/nasmlib.h output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \ asm/preproc.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 \ 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/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 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 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 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 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 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 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 \ 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/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 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 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 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 \ 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/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 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 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 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 include/compiler.h include/nasmint.h \ include/nasmlib.h stdlib/strlcpy.$(O): stdlib/strlcpy.c include/compiler.h include/nasmint.h @@ -467,28 +479,29 @@ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c include/compiler.h \ include/nasmint.h include/nasmlib.h x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.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/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ + x86/insnsi.h x86/regs.h x86/iflag.$(O): x86/iflag.c 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 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 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 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 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 \ 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/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ + x86/regs.h x86/regs.$(O): x86/regs.c include/compiler.h include/nasmint.h \ include/tables.h x86/insnsi.h x86/regvals.$(O): x86/regvals.c include/compiler.h include/nasmint.h \ diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index 958ee02e..568595e0 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -64,6 +64,7 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \ zerobuf.o readnum.o bsi.o \ rbtree.o hashtbl.o \ raa.o saa.o \ + strlist.o \ common.o \ insnsa.o insnsb.o insnsd.o insnsn.o \ regs.o regvals.o regflags.o regdis.o \ @@ -147,144 +148,150 @@ $(OBJDIR)/version.mak: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR) #-- Everything below is generated by mkdep.pl - do not edit --# assemble.o: assemble.c assemble.h directiv.h listing.h pptok.h preproc.h \ tokens.h config.h compiler.h disp8.h iflag.h insns.h nasm.h nasmint.h \ - nasmlib.h opflags.h tables.h iflaggen.h insnsi.h regs.h + nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h directiv.o: directiv.c directiv.h pptok.h preproc.h config.h compiler.h \ - hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \ + regs.h eval.o: eval.c directiv.h eval.h float.h pptok.h preproc.h config.h \ - compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h \ - regs.h + compiler.h labels.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 compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h float.o: float.c directiv.h float.h pptok.h preproc.h config.h compiler.h \ - nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h labels.o: labels.c directiv.h pptok.h preproc.h config.h compiler.h \ - hashtbl.h labels.h nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h \ - regs.h + hashtbl.h labels.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ + insnsi.h regs.h listing.o: listing.c directiv.h listing.h pptok.h preproc.h config.h \ - compiler.h nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \ + regs.h nasm.o: nasm.c assemble.h directiv.h eval.h float.h listing.h parser.h \ pptok.h preproc.h stdscan.h tokens.h config.h compiler.h iflag.h insns.h \ - labels.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h tables.h ver.h \ - outform.h iflaggen.h insnsi.h regs.h + labels.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h strlist.h \ + tables.h ver.h outform.h iflaggen.h insnsi.h regs.h parser.o: parser.c directiv.h eval.h float.h parser.h pptok.h preproc.h \ stdscan.h tokens.h config.h compiler.h iflag.h insns.h nasm.h nasmint.h \ - nasmlib.h opflags.h tables.h iflaggen.h insnsi.h regs.h + nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h pptok.o: pptok.c pptok.h preproc.h config.h compiler.h hashtbl.h nasmint.h \ nasmlib.h preproc-nop.o: preproc-nop.c directiv.h listing.h pptok.h preproc.h config.h \ - compiler.h nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \ + regs.h preproc.o: preproc.c directiv.h eval.h listing.h pptok.h preproc.h quote.h \ stdscan.h tokens.h config.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h \ - opflags.h tables.h insnsi.h regs.h + opflags.h strlist.h tables.h insnsi.h regs.h quote.o: quote.c quote.h config.h compiler.h nasmint.h nasmlib.h rdstrnum.o: rdstrnum.c directiv.h pptok.h preproc.h config.h compiler.h \ - nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h segalloc.o: segalloc.c directiv.h pptok.h preproc.h tokens.h config.h \ - compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h tables.h \ - iflaggen.h insnsi.h regs.h + compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \ + tables.h iflaggen.h insnsi.h regs.h stdscan.o: stdscan.c directiv.h pptok.h preproc.h quote.h stdscan.h tokens.h \ config.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h \ - tables.h iflaggen.h insnsi.h regs.h + strlist.h tables.h iflaggen.h insnsi.h regs.h strfunc.o: strfunc.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h tokhash.o: tokhash.c directiv.h pptok.h preproc.h stdscan.h tokens.h \ config.h compiler.h hashtbl.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \ - opflags.h tables.h iflaggen.h insnsi.h regs.h + opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h common.o: common.c directiv.h pptok.h preproc.h tokens.h config.h compiler.h \ - iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h tables.h iflaggen.h \ - insnsi.h regs.h + iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ + iflaggen.h insnsi.h regs.h disasm.o: disasm.c directiv.h pptok.h preproc.h tokens.h config.h disasm.h \ sync.h compiler.h disp8.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \ - opflags.h tables.h iflaggen.h insnsi.h regdis.h regs.h + opflags.h strlist.h tables.h iflaggen.h insnsi.h regdis.h regs.h ndisasm.o: ndisasm.c directiv.h pptok.h preproc.h tokens.h config.h disasm.h \ sync.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h \ - tables.h ver.h iflaggen.h insnsi.h regs.h + strlist.h tables.h ver.h iflaggen.h insnsi.h regs.h sync.o: sync.c config.h sync.h compiler.h nasmint.h nasmlib.h macros.o: macros.c directiv.h pptok.h preproc.h config.h compiler.h \ - hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h tables.h outform.h insnsi.h \ - regs.h + hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h outform.h \ + insnsi.h regs.h bsi.o: bsi.c config.h compiler.h nasmint.h nasmlib.h crc64.o: crc64.c config.h compiler.h hashtbl.h nasmint.h nasmlib.h error.o: error.c config.h compiler.h nasmint.h nasmlib.h file.o: file.c config.h compiler.h nasmint.h nasmlib.h filename.o: filename.c config.h compiler.h nasmint.h nasmlib.h hashtbl.o: hashtbl.c directiv.h pptok.h preproc.h config.h compiler.h \ - hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \ + regs.h ilog2.o: ilog2.c config.h compiler.h nasmint.h nasmlib.h malloc.o: malloc.c config.h compiler.h nasmint.h nasmlib.h md5c.o: md5c.c config.h compiler.h md5.h nasmint.h raa.o: raa.c config.h compiler.h nasmint.h nasmlib.h raa.h rbtree.o: rbtree.c config.h compiler.h nasmint.h rbtree.h readnum.o: readnum.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h realpath.o: realpath.c config.h compiler.h nasmint.h nasmlib.h saa.o: saa.c config.h compiler.h nasmint.h nasmlib.h saa.h srcfile.o: srcfile.c config.h compiler.h hashtbl.h nasmint.h nasmlib.h string.o: string.c config.h compiler.h nasmint.h nasmlib.h +strlist.o: strlist.c config.h compiler.h nasmint.h nasmlib.h strlist.h ver.o: ver.c ver.h version.h zerobuf.o: zerobuf.c config.h compiler.h nasmint.h nasmlib.h codeview.o: codeview.c directiv.h pptok.h preproc.h config.h compiler.h \ - hashtbl.h md5.h nasm.h nasmint.h nasmlib.h opflags.h saa.h tables.h \ - outlib.h pecoff.h version.h insnsi.h regs.h + hashtbl.h md5.h nasm.h nasmint.h nasmlib.h opflags.h saa.h strlist.h \ + tables.h outlib.h pecoff.h version.h insnsi.h regs.h legacy.o: legacy.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h nulldbg.o: nulldbg.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h outlib.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h insnsi.h regs.h nullout.o: nullout.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h outlib.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h insnsi.h regs.h outaout.o: outaout.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ - compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h tables.h \ - outform.h outlib.h insnsi.h regs.h + compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h strlist.h \ + tables.h outform.h outlib.h insnsi.h regs.h outas86.o: outas86.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h raa.h saa.h tables.h outform.h outlib.h \ - insnsi.h regs.h + nasmint.h nasmlib.h opflags.h raa.h saa.h strlist.h tables.h outform.h \ + outlib.h insnsi.h regs.h outbin.o: outbin.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ - compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h saa.h tables.h \ - outform.h outlib.h insnsi.h regs.h + compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h saa.h strlist.h \ + tables.h outform.h outlib.h insnsi.h regs.h outcoff.o: outcoff.c directiv.h eval.h pptok.h preproc.h config.h compiler.h \ - nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h tables.h outform.h \ - outlib.h pecoff.h insnsi.h regs.h + nasm.h nasmint.h nasmlib.h opflags.h raa.h saa.h strlist.h tables.h \ + outform.h outlib.h pecoff.h insnsi.h regs.h outdbg.o: outdbg.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h outform.h outlib.h insnsi.h regs.h + nasmint.h nasmlib.h opflags.h strlist.h tables.h outform.h outlib.h \ + insnsi.h regs.h outelf.o: outelf.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ compiler.h nasm.h nasmint.h nasmlib.h opflags.h raa.h rbtree.h saa.h \ - tables.h ver.h dwarf.h elf.h outelf.h outform.h outlib.h stabs.h insnsi.h \ - regs.h -outform.o: outform.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h outform.h insnsi.h regs.h -outieee.o: outieee.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h ver.h outform.h outlib.h insnsi.h \ - regs.h -outlib.o: outlib.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h tables.h outlib.h insnsi.h regs.h -outmacho.o: outmacho.c directiv.h pptok.h preproc.h config.h compiler.h \ - nasm.h nasmint.h nasmlib.h opflags.h raa.h rbtree.h saa.h tables.h \ - outform.h outlib.h insnsi.h regs.h -outobj.o: outobj.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ - compiler.h nasm.h nasmint.h nasmlib.h opflags.h tables.h ver.h outform.h \ - outlib.h insnsi.h regs.h -outrdf2.o: outrdf2.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ - nasmint.h nasmlib.h opflags.h rdoff.h saa.h tables.h outform.h outlib.h \ + strlist.h tables.h ver.h dwarf.h elf.h outelf.h outform.h outlib.h stabs.h \ insnsi.h regs.h +outform.o: outform.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ + nasmint.h nasmlib.h opflags.h strlist.h tables.h outform.h insnsi.h regs.h +outieee.o: outieee.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ + nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h outform.h outlib.h \ + insnsi.h regs.h +outlib.o: outlib.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ + nasmint.h nasmlib.h opflags.h strlist.h tables.h outlib.h insnsi.h regs.h +outmacho.o: outmacho.c directiv.h pptok.h preproc.h config.h compiler.h \ + nasm.h nasmint.h nasmlib.h opflags.h raa.h rbtree.h saa.h strlist.h \ + tables.h outform.h outlib.h insnsi.h regs.h +outobj.o: outobj.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ + compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h \ + outform.h outlib.h insnsi.h regs.h +outrdf2.o: outrdf2.c directiv.h pptok.h preproc.h config.h compiler.h nasm.h \ + nasmint.h nasmlib.h opflags.h rdoff.h saa.h strlist.h tables.h outform.h \ + outlib.h insnsi.h regs.h snprintf.o: snprintf.c config.h compiler.h nasmint.h nasmlib.h strlcpy.o: strlcpy.c config.h compiler.h nasmint.h strnlen.o: strnlen.c config.h compiler.h nasmint.h vsnprintf.o: vsnprintf.c config.h compiler.h nasmint.h nasmlib.h disp8.o: disp8.c directiv.h pptok.h preproc.h config.h compiler.h disp8.h \ - nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h iflag.o: iflag.c config.h compiler.h iflag.h nasmint.h iflaggen.h insnsa.o: insnsa.c directiv.h pptok.h preproc.h tokens.h config.h compiler.h \ - iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h tables.h iflaggen.h \ - insnsi.h regs.h + iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ + iflaggen.h insnsi.h regs.h insnsb.o: insnsb.c directiv.h pptok.h preproc.h tokens.h config.h compiler.h \ - iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h tables.h iflaggen.h \ - insnsi.h regs.h + iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ + iflaggen.h insnsi.h regs.h insnsd.o: insnsd.c directiv.h pptok.h preproc.h tokens.h config.h compiler.h \ - iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h tables.h iflaggen.h \ - insnsi.h regs.h + iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ + iflaggen.h insnsi.h regs.h insnsn.o: insnsn.c config.h compiler.h nasmint.h tables.h insnsi.h regdis.o: regdis.c regdis.h regs.h regflags.o: regflags.c directiv.h pptok.h preproc.h config.h compiler.h \ - nasm.h nasmint.h nasmlib.h opflags.h tables.h insnsi.h regs.h + nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h regs.o: regs.c config.h compiler.h nasmint.h tables.h insnsi.h regvals.o: regvals.c config.h compiler.h nasmint.h tables.h insnsi.h diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index c8fbf856..7498f7ae 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -80,6 +80,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) & @@ -286,98 +287,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 & @@ -390,8 +391,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 & @@ -404,8 +405,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 & @@ -414,80 +415,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 & @@ -498,29 +504,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 & diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index 8ffe2ab5..40487c16 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -91,6 +91,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) \ @@ -254,95 +255,99 @@ everything: all doc rdf asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.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/nasmint.h include/nasmlib.h include/opflags.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 \ 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/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \ asm/preproc.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 \ 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/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 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 \ 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/nasmint.h include/nasmlib.h include/opflags.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 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 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 \ 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 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 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 \ 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 include/compiler.h include/nasmint.h \ include/nasmlib.h asm/rdstrnum.$(O): asm/rdstrnum.c asm/directiv.h asm/pptok.h asm/preproc.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/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 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 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/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 \ 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/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 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 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 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 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/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 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 \ 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/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 include/compiler.h include/nasmint.h \ include/nasmlib.h nasmlib/crc64.$(O): nasmlib/crc64.c include/compiler.h include/hashtbl.h \ @@ -355,8 +360,8 @@ nasmlib/filename.$(O): nasmlib/filename.c include/compiler.h \ include/nasmint.h include/nasmlib.h nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \ asm/preproc.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 include/compiler.h include/nasmint.h \ include/nasmlib.h nasmlib/malloc.$(O): nasmlib/malloc.c include/compiler.h include/nasmint.h \ @@ -369,8 +374,8 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c include/compiler.h include/nasmint.h \ include/rbtree.h nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \ asm/preproc.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 include/compiler.h \ include/nasmint.h include/nasmlib.h nasmlib/saa.$(O): nasmlib/saa.c include/compiler.h include/nasmint.h \ @@ -379,78 +384,85 @@ nasmlib/srcfile.$(O): nasmlib/srcfile.c include/compiler.h include/hashtbl.h \ include/nasmint.h include/nasmlib.h nasmlib/string.$(O): nasmlib/string.c include/compiler.h include/nasmint.h \ include/nasmlib.h +nasmlib/strlist.$(O): nasmlib/strlist.c 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 include/compiler.h include/nasmint.h \ include/nasmlib.h output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \ asm/preproc.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 \ 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/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 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 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 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 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 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 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 \ 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/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 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 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 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 \ 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/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 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 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 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 include/compiler.h include/nasmint.h \ include/nasmlib.h stdlib/strlcpy.$(O): stdlib/strlcpy.c include/compiler.h include/nasmint.h @@ -459,28 +471,29 @@ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c include/compiler.h \ include/nasmint.h include/nasmlib.h x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.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/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ + x86/insnsi.h x86/regs.h x86/iflag.$(O): x86/iflag.c 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 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 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 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 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 \ 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/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ + x86/regs.h x86/regs.$(O): x86/regs.c include/compiler.h include/nasmint.h \ include/tables.h x86/insnsi.h x86/regvals.$(O): x86/regvals.c include/compiler.h include/nasmint.h \ diff --git a/asm/preproc-nop.c b/asm/preproc-nop.c index 5c93a849..1f9cc7e7 100644 --- a/asm/preproc-nop.c +++ b/asm/preproc-nop.c @@ -72,12 +72,7 @@ static void nop_reset(char *file, int pass, StrList **deplist) nasm_fatal(ERR_NOFILE, "unable to open input file `%s'", file); (void)pass; /* placate compilers */ - if (deplist) { - StrList *sl = nasm_malloc(strlen(file)+1+sizeof sl->next); - sl->next = NULL; - strcpy(sl->str, file); - *deplist = sl; - } + nasm_add_string_to_strlist(deplist, file); } static char *nop_getline(void) diff --git a/asm/preproc.c b/asm/preproc.c index a7d8252b..0853bed1 100644 --- a/asm/preproc.c +++ b/asm/preproc.c @@ -1493,53 +1493,6 @@ static Context *get_ctx(const char *name, const char **namep) return ctx; } -/* - * Append a string list entry to a string list if and only if it isn't - * already there. Return true if it was added. - */ -static bool add_to_list(StrList **head, StrList *entry) -{ - StrList *list; - - if (!head) - return false; - - list = *head; - while (list) { - if (!strcmp(list->str, entry->str)) - return false; - head = &list->next; - list = list->next; - } - - *head = entry; - entry->next = NULL; - return true; -} - -/* - * Append a string to a string list if and only if it isn't - * already there. Return true if it was added. - */ -static bool add_string_to_list(StrList **head, const char *str) -{ - StrList *list; - - if (!head) - return false; - - list = *head; - while (list) { - if (!strcmp(list->str, str)) - return false; - head = &list->next; - list = list->next; - } - - *head = nasm_str_to_strlist(str); - return true; -} - /* * Open an include file. This routine must always return a valid * file pointer if it returns - it's responsible for throwing an @@ -1647,7 +1600,7 @@ static FILE *inc_fopen(const char *file, * in case the file was already added with %depend. */ if (path || omode != INC_NEEDED) - add_to_list(dhead, sl); + nasm_add_to_strlist(dhead, sl); } if (!path) { @@ -2592,7 +2545,7 @@ static int do_directive(Token * tline) p = t->text; if (t->type != TOK_INTERNAL_STRING) nasm_unquote_cstr(p, i); - add_string_to_list(dephead, p); + nasm_add_string_to_strlist(dephead, p); free_tlist(origline); return DIRECTIVE_FOUND; @@ -4978,7 +4931,7 @@ pp_reset(char *file, int apass, StrList **deplist) pass = apass > 2 ? 2 : apass; dephead = deplist; - add_string_to_list(dephead, file); + nasm_add_string_to_strlist(dephead, file); /* * Define the __PASS__ macro. This is defined here unlike diff --git a/include/nasm.h b/include/nasm.h index 558ee896..67204362 100644 --- a/include/nasm.h +++ b/include/nasm.h @@ -42,6 +42,7 @@ #include #include "nasmlib.h" +#include "strlist.h" #include "preproc.h" #include "insnsi.h" /* For enum opcode */ #include "directiv.h" /* For enum directive */ @@ -332,25 +333,6 @@ typedef expr *(*evalfunc)(scanner sc, void *scprivate, #define EXPR_RDSAE (EXPR_REG_END+4) #define EXPR_SEGBASE (EXPR_REG_END+5) -/* - * Linked list of strings - */ -typedef struct string_list { - struct string_list *next; - char str[1]; -} StrList; - -static inline StrList *nasm_str_to_strlist(const char *str) -{ - size_t l = strlen(str) + 1; - StrList *sl = nasm_malloc(l + sizeof sl->next); - - memcpy(sl->str, str, l); - sl->next = NULL; - - return sl; -} - /* * preprocessors ought to look like this: */ diff --git a/include/strlist.h b/include/strlist.h new file mode 100644 index 00000000..e00fc1f6 --- /dev/null +++ b/include/strlist.h @@ -0,0 +1,55 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 1996-2016 The NASM Authors - All Rights Reserved + * See the file AUTHORS included with the NASM distribution for + * the specific copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ----------------------------------------------------------------------- */ + +/* + * strlist.h - simple linked list of strings + */ + +#ifndef NASM_STRLIST_H +#define NASM_STRLIST_H + +#include "compiler.h" + +#include + +#include "nasmlib.h" + +typedef struct string_list { + struct string_list *next; + char str[1]; +} StrList; + +bool nasm_add_to_strlist(StrList **head, StrList *entry); +bool nasm_add_string_to_strlist(StrList **head, const char *str); + +#endif /* NASM_STRLIST_H */ diff --git a/nasmlib/strlist.c b/nasmlib/strlist.c new file mode 100644 index 00000000..cf475278 --- /dev/null +++ b/nasmlib/strlist.c @@ -0,0 +1,100 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 1996-2016 The NASM Authors - All Rights Reserved + * See the file AUTHORS included with the NASM distribution for + * the specific copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following + * conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ----------------------------------------------------------------------- */ + +/* + * strlist.c - simple linked list of strings + */ + +#include "compiler.h" + +#include + +#include "strlist.h" + +static inline StrList *nasm_str_to_strlist(const char *str) +{ + size_t l = strlen(str) + 1; + StrList *sl = nasm_malloc(l + sizeof sl->next); + + memcpy(sl->str, str, l); + sl->next = NULL; + + return sl; +} + +/* + * Append a string list entry to a string list if and only if it isn't + * already there. Return true if it was added. + */ +bool nasm_add_to_strlist(StrList **head, StrList *entry) +{ + StrList *list; + + if (!head) + return false; + + list = *head; + while (list) { + if (!strcmp(list->str, entry->str)) + return false; + head = &list->next; + list = list->next; + } + + *head = entry; + entry->next = NULL; + return true; +} + +/* + * Append a string to a string list if and only if it isn't + * already there. Return true if it was added. + */ +bool nasm_add_string_to_strlist(StrList **head, const char *str) +{ + StrList *list; + + if (!head) + return false; + + list = *head; + while (list) { + if (!strcmp(list->str, str)) + return false; + head = &list->next; + list = list->next; + } + + *head = nasm_str_to_strlist(str); + return true; +}