diff --git a/.gitignore b/.gitignore index a4d8ae27..0e68bc29 100644 --- a/.gitignore +++ b/.gitignore @@ -27,8 +27,8 @@ tags TAGS /*.1 /Makefile -/asm/directiv.c -/asm/directiv.h +/asm/directbl.c +/asm/directbl.h /asm/pptok.c /asm/pptok.h /asm/pptok.ph diff --git a/Makefile.in b/Makefile.in index 7cf73922..cfdf186f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -105,7 +105,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ x86/disp8.$(O) x86/iflag.$(O) \ \ asm/float.$(O) \ - asm/directiv.$(O) \ + asm/directbl.$(O) \ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \ @@ -242,12 +242,12 @@ asm/pptok.ph: asm/pptok.dat asm/pptok.pl perllib/phash.ph $(srcdir)/asm/pptok.dat asm/pptok.ph # Directives hash -asm/directiv.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph +asm/directbl.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph $(RUNPERL) $(srcdir)/asm/directiv.pl h \ - $(srcdir)/asm/directiv.dat asm/directiv.h -asm/directiv.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph + $(srcdir)/asm/directiv.dat asm/directbl.h +asm/directbl.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph $(RUNPERL) $(srcdir)/asm/directiv.pl c \ - $(srcdir)/asm/directiv.dat asm/directiv.c + $(srcdir)/asm/directiv.dat asm/directbl.c # This target generates all files that require perl. # This allows easier generation of distribution (see dist target). @@ -256,7 +256,7 @@ PERLREQ = x86/insnsb.c x86/insnsa.c x86/insnsd.c x86/insnsi.h x86/insnsn.c \ x86/regvals.c asm/tokhash.c asm/tokens.h asm/pptok.h asm/pptok.c \ x86/iflag.c x86/iflaggen.h \ macros/macros.c \ - asm/pptok.ph asm/directiv.c asm/directiv.h \ + asm/pptok.ph asm/directbl.c asm/directbl.h \ version.h version.mac version.mak nsis/version.nsh perlreq: $(PERLREQ) @@ -380,48 +380,48 @@ alldeps: perlreq tools/syncfiles.pl tools/mkdep.pl # @object-ending: ".$(O)" # @path-separator: "/" #-- Everything below is generated by mkdep.pl - do not edit --# -asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \ +asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directbl.h \ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/config.h \ config/msvc.h config/unknown.h config/watcom.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/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 \ +asm/directbl.$(O): asm/directbl.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \ +asm/eval.$(O): asm/eval.c asm/directbl.h asm/eval.h asm/float.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/labels.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ include/tables.h x86/insnsi.h x86/regs.h -asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/exprdump.$(O): asm/exprdump.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/exprlib.$(O): asm/exprlib.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \ +asm/float.$(O): asm/float.c asm/directbl.h asm/float.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/labels.$(O): asm/labels.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/labels.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ include/tables.h x86/insnsi.h x86/regs.h -asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \ +asm/listing.$(O): asm/listing.c asm/directbl.h asm/listing.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \ +asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directbl.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/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/iflag.h include/insns.h \ @@ -429,7 +429,7 @@ asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \ include/opflags.h include/raa.h include/saa.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.$(O): asm/parser.c asm/directbl.h asm/eval.h asm/float.h \ asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.h \ @@ -438,12 +438,12 @@ asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h \ asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/config.h \ config/msvc.h config/unknown.h config/watcom.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/preproc-nop.$(O): asm/preproc-nop.c asm/directbl.h asm/listing.h \ asm/pptok.h asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \ +asm/preproc.$(O): asm/preproc.c asm/directbl.h asm/eval.h asm/listing.h \ asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ @@ -452,45 +452,45 @@ asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \ asm/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \ config/unknown.h config/watcom.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 \ +asm/rdstrnum.$(O): asm/rdstrnum.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/segalloc.$(O): asm/segalloc.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/stdscan.$(O): asm/stdscan.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/quote.h asm/stdscan.h asm/tokens.h config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/iflag.h \ include/insns.h include/nasm.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/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/strfunc.$(O): asm/strfunc.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/tokhash.$(O): asm/tokhash.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \ config/watcom.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/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 \ +common/common.$(O): common/common.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \ +disasm/disasm.$(O): disasm/disasm.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.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/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 \ +disasm/ndisasm.$(O): disasm/ndisasm.c asm/directbl.h asm/pptok.h \ asm/preproc.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h disasm/disasm.h disasm/sync.h include/compiler.h \ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \ @@ -499,7 +499,7 @@ disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \ disasm/sync.$(O): disasm/sync.c config/config.h config/msvc.h \ config/unknown.h config/watcom.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 \ +macros/macros.$(O): macros/macros.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -519,7 +519,7 @@ nasmlib/file.$(O): nasmlib/file.c config/config.h config/msvc.h \ nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \ include/nasmlib.h -nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \ +nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/hashtbl.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ @@ -542,7 +542,7 @@ nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \ include/rbtree.h -nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \ +nasmlib/readnum.$(O): nasmlib/readnum.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -566,90 +566,90 @@ nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \ include/nasmlib.h -output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \ +output/codeview.$(O): output/codeview.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.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/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 \ +output/legacy.$(O): output/legacy.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outlib.h \ x86/insnsi.h x86/regs.h -output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \ +output/nulldbg.$(O): output/nulldbg.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ output/outlib.h x86/insnsi.h x86/regs.h -output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \ +output/nullout.$(O): output/nullout.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ output/outlib.h x86/insnsi.h x86/regs.h -output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \ +output/outaout.$(O): output/outaout.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.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 \ +output/outas86.$(O): output/outas86.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.h include/saa.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 \ +output/outbin.$(O): output/outbin.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/labels.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.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 \ +output/outcoff.$(O): output/outcoff.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.h include/saa.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 \ +output/outdbg.$(O): output/outdbg.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h 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 \ +output/outelf.$(O): output/outelf.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.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 \ +output/outform.$(O): output/outform.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ output/outform.h x86/insnsi.h x86/regs.h -output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \ +output/outieee.$(O): output/outieee.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ 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 \ +output/outlib.$(O): output/outlib.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outlib.h \ x86/insnsi.h x86/regs.h -output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \ +output/outmacho.$(O): output/outmacho.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.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 \ +output/outobj.$(O): output/outobj.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ 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 \ +output/outrdf2.$(O): output/outrdf2.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \ @@ -665,7 +665,7 @@ stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h \ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/config.h config/msvc.h \ config/unknown.h config/watcom.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 \ +x86/disp8.$(O): x86/disp8.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/disp8.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -673,17 +673,17 @@ x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h \ x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h \ config/watcom.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 \ +x86/insnsa.$(O): x86/insnsa.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \ +x86/insnsb.$(O): x86/insnsb.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \ +x86/insnsd.$(O): x86/insnsd.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ @@ -692,7 +692,7 @@ x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h \ config/watcom.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 \ +x86/regflags.$(O): x86/regflags.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 51cebf6e..002a9758 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -73,7 +73,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ x86/disp8.$(O) x86/iflag.$(O) \ \ asm/float.$(O) \ - asm/directiv.$(O) \ + asm/directbl.$(O) \ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \ @@ -186,17 +186,17 @@ pptok.ph: pptok.dat pptok.pl perllib/phash.ph $(PERL) $(srcdir)/pptok.pl ph $(srcdir)/pptok.dat pptok.ph # Directives hash -directiv.h: directiv.dat directiv.pl perllib/phash.ph - $(PERL) $(srcdir)/directiv.pl h $(srcdir)/directiv.dat directiv.h -directiv.c: directiv.dat directiv.pl perllib/phash.ph - $(PERL) $(srcdir)/directiv.pl c $(srcdir)/directiv.dat directiv.c +directbl.h: directiv.dat directiv.pl perllib/phash.ph + $(PERL) $(srcdir)/directiv.pl h $(srcdir)/directiv.dat directbl.h +directbl.c: directiv.dat directiv.pl perllib/phash.ph + $(PERL) $(srcdir)/directiv.pl c $(srcdir)/directiv.dat directbl.c # This target generates all files that require perl. # This allows easier generation of distribution (see dist target). PERLREQ = macros.c insnsb.c insnsa.c insnsd.c insnsi.h insnsn.c \ regs.c regs.h regflags.c regdis.c regvals.c tokhash.c tokens.h \ version.h version.mac pptok.h pptok.c iflag.c iflaggen.h \ - directiv.c directiv.h pptok.ph regdis.h + directbl.c directbl.h pptok.ph regdis.h perlreq: $(PERLREQ) clean: @@ -269,53 +269,53 @@ everything: all doc rdf # @path-separator: "/" # @exclude: "config/config.h" #-- Everything below is generated by mkdep.pl - do not edit --# -asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \ +asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directbl.h \ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/msvc.h \ config/unknown.h config/watcom.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/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 \ +asm/directbl.$(O): asm/directbl.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \ +asm/eval.$(O): asm/eval.c asm/directbl.h asm/eval.h asm/float.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/labels.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/exprdump.$(O): asm/exprdump.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/exprlib.$(O): asm/exprlib.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \ +asm/float.$(O): asm/float.c asm/directbl.h asm/float.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/labels.$(O): asm/labels.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/hashtbl.h include/labels.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \ +asm/listing.$(O): asm/listing.c asm/directbl.h asm/listing.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \ +asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directbl.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/msvc.h config/unknown.h config/watcom.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/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.$(O): asm/parser.c asm/directbl.h asm/eval.h asm/float.h \ asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \ @@ -324,12 +324,12 @@ asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h \ asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/msvc.h \ config/unknown.h config/watcom.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/preproc-nop.$(O): asm/preproc-nop.c asm/directbl.h asm/listing.h \ asm/pptok.h asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \ +asm/preproc.$(O): asm/preproc.c asm/directbl.h asm/eval.h asm/listing.h \ asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \ @@ -337,41 +337,41 @@ asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \ x86/regs.h asm/quote.$(O): asm/quote.c asm/quote.h config/msvc.h config/unknown.h \ config/watcom.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 \ +asm/rdstrnum.$(O): asm/rdstrnum.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/segalloc.$(O): asm/segalloc.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/stdscan.$(O): asm/stdscan.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/quote.h asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/iflag.h include/insns.h \ include/nasm.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/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/strfunc.$(O): asm/strfunc.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/tokhash.$(O): asm/tokhash.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.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/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 \ +common/common.$(O): common/common.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \ +disasm/disasm.$(O): disasm/disasm.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/msvc.h config/unknown.h config/watcom.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/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 \ +disasm/ndisasm.$(O): disasm/ndisasm.c asm/directbl.h asm/pptok.h \ asm/preproc.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.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 \ @@ -380,7 +380,7 @@ disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \ disasm/sync.$(O): disasm/sync.c config/msvc.h config/unknown.h \ config/watcom.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 \ +macros/macros.$(O): macros/macros.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outform.h \ @@ -397,7 +397,7 @@ nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h \ nasmlib/file.h nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h -nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \ +nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -416,7 +416,7 @@ nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h \ include/raa.h nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasmint.h include/rbtree.h -nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \ +nasmlib/readnum.$(O): nasmlib/readnum.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ @@ -437,85 +437,85 @@ nasmlib/strlist.$(O): nasmlib/strlist.c config/msvc.h config/unknown.h \ nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h -output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \ +output/codeview.$(O): output/codeview.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.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/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 \ +output/legacy.$(O): output/legacy.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h -output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \ +output/nulldbg.$(O): output/nulldbg.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outlib.h \ x86/insnsi.h x86/regs.h -output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \ +output/nullout.$(O): output/nullout.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outlib.h \ x86/insnsi.h x86/regs.h -output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \ +output/outaout.$(O): output/outaout.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/raa.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 \ +output/outas86.$(O): output/outas86.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/raa.h include/saa.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 \ +output/outbin.$(O): output/outbin.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/labels.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.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 \ +output/outcoff.$(O): output/outcoff.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/raa.h include/saa.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 \ +output/outdbg.$(O): output/outdbg.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h 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 \ +output/outelf.$(O): output/outelf.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/raa.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 \ +output/outform.$(O): output/outform.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outform.h \ x86/insnsi.h x86/regs.h -output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \ +output/outieee.$(O): output/outieee.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h 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 \ +output/outlib.$(O): output/outlib.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h -output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \ +output/outmacho.$(O): output/outmacho.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/raa.h include/rbtree.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 \ +output/outobj.$(O): output/outobj.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h 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 \ +output/outrdf2.$(O): output/outrdf2.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/rdoff.h include/saa.h include/strlist.h \ @@ -528,24 +528,24 @@ stdlib/strnlen.$(O): stdlib/strnlen.c config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasmint.h stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h \ config/watcom.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 \ +x86/disp8.$(O): x86/disp8.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/disp8.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h x86/iflag.$(O): x86/iflag.c config/msvc.h config/unknown.h config/watcom.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 \ +x86/insnsa.$(O): x86/insnsa.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \ +x86/insnsb.$(O): x86/insnsb.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \ +x86/insnsd.$(O): x86/insnsd.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ @@ -553,7 +553,7 @@ x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \ x86/insnsn.$(O): x86/insnsn.c config/msvc.h config/unknown.h config/watcom.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 \ +x86/regflags.$(O): x86/regflags.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index a3fe7c09..bca2fe64 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -50,7 +50,7 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \ disp8.o iflag.o \ \ float.o \ - directiv.o \ + directbl.o \ assemble.o labels.o parser.o \ preproc.o quote.o pptok.o \ listing.o eval.o exprlib.o exprdump.o \ @@ -151,79 +151,79 @@ $(OBJDIR)/version.mak: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR) # @path-separator: "" # @continuation: "\" #-- Everything below is generated by mkdep.pl - do not edit --# -assemble.o: assemble.c assemble.h directiv.h listing.h pptok.h preproc.h \ +assemble.o: assemble.c assemble.h directbl.h listing.h pptok.h preproc.h \ tokens.h config.h msvc.h unknown.h watcom.h compiler.h disp8.h iflag.h \ insns.h nasm.h nasmint.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 msvc.h \ +directbl.o: directbl.c directbl.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.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 msvc.h \ +eval.o: eval.c directbl.h eval.h float.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.h labels.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h -exprdump.o: exprdump.c directiv.h pptok.h preproc.h config.h msvc.h \ +exprdump.o: exprdump.c directbl.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h -exprlib.o: exprlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +exprlib.o: exprlib.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ insnsi.h regs.h -float.o: float.c directiv.h float.h pptok.h preproc.h config.h msvc.h \ +float.o: float.c directbl.h float.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h -labels.o: labels.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +labels.o: labels.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.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 msvc.h \ +listing.o: listing.c directbl.h listing.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h -nasm.o: nasm.c assemble.h directiv.h eval.h float.h listing.h parser.h \ +nasm.o: nasm.c assemble.h directbl.h eval.h float.h listing.h parser.h \ pptok.h preproc.h stdscan.h tokens.h config.h msvc.h unknown.h watcom.h \ compiler.h iflag.h insns.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 \ +parser.o: parser.c directbl.h eval.h float.h parser.h pptok.h preproc.h \ stdscan.h tokens.h config.h msvc.h unknown.h watcom.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 pptok.o: pptok.c pptok.h preproc.h config.h msvc.h unknown.h watcom.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 \ +preproc-nop.o: preproc-nop.c directbl.h listing.h pptok.h preproc.h config.h \ msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h -preproc.o: preproc.c directiv.h eval.h listing.h pptok.h preproc.h quote.h \ +preproc.o: preproc.c directbl.h eval.h listing.h pptok.h preproc.h quote.h \ stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h \ nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h regs.h quote.o: quote.c quote.h config.h msvc.h unknown.h watcom.h compiler.h \ nasmint.h nasmlib.h -rdstrnum.o: rdstrnum.c directiv.h pptok.h preproc.h config.h msvc.h \ +rdstrnum.o: rdstrnum.c directbl.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h -segalloc.o: segalloc.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \ +segalloc.o: segalloc.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.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 \ +stdscan.o: stdscan.c directbl.h pptok.h preproc.h quote.h stdscan.h tokens.h \ config.h msvc.h unknown.h watcom.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 -strfunc.o: strfunc.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +strfunc.o: strfunc.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ insnsi.h regs.h -tokhash.o: tokhash.c directiv.h pptok.h preproc.h stdscan.h tokens.h \ +tokhash.o: tokhash.c directbl.h pptok.h preproc.h stdscan.h tokens.h \ config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h iflag.h insns.h \ nasm.h nasmint.h nasmlib.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 msvc.h \ +common.o: common.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.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 -disasm.o: disasm.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \ +disasm.o: disasm.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.h disasm.h sync.h compiler.h disp8.h iflag.h insns.h \ nasm.h nasmint.h nasmlib.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 msvc.h \ +ndisasm.o: ndisasm.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.h disasm.h sync.h compiler.h iflag.h insns.h nasm.h \ nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h iflaggen.h insnsi.h \ regs.h sync.o: sync.c config.h msvc.h unknown.h watcom.h sync.h compiler.h \ nasmint.h nasmlib.h -macros.o: macros.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +macros.o: macros.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.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 msvc.h unknown.h watcom.h compiler.h nasmint.h \ @@ -236,7 +236,7 @@ file.o: file.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \ nasmlib.h file.h filename.o: filename.c config.h msvc.h unknown.h watcom.h compiler.h \ nasmint.h nasmlib.h -hashtbl.o: hashtbl.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +hashtbl.o: hashtbl.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.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 msvc.h unknown.h watcom.h compiler.h nasmint.h \ @@ -250,7 +250,7 @@ raa.o: raa.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \ nasmlib.h raa.h rbtree.o: rbtree.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \ rbtree.h -readnum.o: readnum.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +readnum.o: readnum.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ insnsi.h regs.h realpath.o: realpath.c config.h msvc.h unknown.h watcom.h compiler.h \ @@ -266,54 +266,54 @@ strlist.o: strlist.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \ ver.o: ver.c ver.h version.h zerobuf.o: zerobuf.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \ nasmlib.h -codeview.o: codeview.c directiv.h pptok.h preproc.h config.h msvc.h \ +codeview.o: codeview.c directbl.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.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 msvc.h unknown.h \ +legacy.o: legacy.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ outlib.h insnsi.h regs.h -nulldbg.o: nulldbg.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +nulldbg.o: nulldbg.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ outlib.h insnsi.h regs.h -nullout.o: nullout.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +nullout.o: nullout.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ outlib.h insnsi.h regs.h -outaout.o: outaout.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ +outaout.o: outaout.c directbl.h eval.h pptok.h preproc.h stdscan.h config.h \ msvc.h unknown.h watcom.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 msvc.h unknown.h \ +outas86.o: outas86.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.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 -outbin.o: outbin.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ +outbin.o: outbin.c directbl.h eval.h pptok.h preproc.h stdscan.h config.h \ msvc.h unknown.h watcom.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 msvc.h \ +outcoff.o: outcoff.c directbl.h eval.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.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 msvc.h unknown.h \ +outdbg.o: outdbg.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ outform.h outlib.h insnsi.h regs.h -outelf.o: outelf.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \ +outelf.o: outelf.c directbl.h eval.h pptok.h preproc.h stdscan.h config.h \ msvc.h unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ raa.h rbtree.h saa.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 msvc.h unknown.h \ +outform.o: outform.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ outform.h insnsi.h regs.h -outieee.o: outieee.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +outieee.o: outieee.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ ver.h outform.h outlib.h insnsi.h regs.h -outlib.o: outlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +outlib.o: outlib.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \ outlib.h insnsi.h regs.h -outmacho.o: outmacho.c directiv.h pptok.h preproc.h config.h msvc.h \ +outmacho.o: outmacho.c directbl.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.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 \ +outobj.o: outobj.c directbl.h eval.h pptok.h preproc.h stdscan.h config.h \ msvc.h unknown.h watcom.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 msvc.h unknown.h \ +outrdf2.o: outrdf2.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.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 msvc.h unknown.h watcom.h compiler.h \ @@ -322,24 +322,24 @@ strlcpy.o: strlcpy.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h strnlen.o: strnlen.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h vsnprintf.o: vsnprintf.c config.h msvc.h unknown.h watcom.h compiler.h \ nasmint.h nasmlib.h -disp8.o: disp8.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \ +disp8.o: disp8.c directbl.h pptok.h preproc.h config.h msvc.h unknown.h \ watcom.h compiler.h disp8.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \ tables.h insnsi.h regs.h iflag.o: iflag.c config.h msvc.h unknown.h watcom.h compiler.h iflag.h \ nasmint.h iflaggen.h -insnsa.o: insnsa.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \ +insnsa.o: insnsa.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.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 -insnsb.o: insnsb.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \ +insnsb.o: insnsb.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.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 -insnsd.o: insnsd.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \ +insnsd.o: insnsd.c directbl.h pptok.h preproc.h tokens.h config.h msvc.h \ unknown.h watcom.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 insnsn.o: insnsn.c config.h msvc.h unknown.h watcom.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 msvc.h \ +regflags.o: regflags.c directbl.h pptok.h preproc.h config.h msvc.h \ unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \ strlist.h tables.h insnsi.h regs.h regs.o: regs.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \ diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index f052fa6a..526c3961 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -66,7 +66,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) & x86/disp8.$(O) x86/iflag.$(O) & & asm/float.$(O) & - asm/directiv.$(O) & + asm/directbl.$(O) & asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) & asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) & asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) & @@ -202,10 +202,10 @@ asm/pptok.ph: asm/pptok.dat asm/pptok.pl perllib/phash.ph $(PERL) $(srcdir)/asm/pptok.pl ph $(srcdir)/asm/pptok.dat asm/pptok.ph # Directives hash -asm/directiv.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph - $(PERL) $(srcdir)/asm/directiv.pl h $(srcdir)/asm/directiv.dat asm/directiv.h -asm/directiv.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph - $(PERL) $(srcdir)/asm/directiv.pl c $(srcdir)/asm/directiv.dat asm/directiv.c +asm/directbl.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph + $(PERL) $(srcdir)/asm/directiv.pl h $(srcdir)/asm/directiv.dat asm/directbl.h +asm/directbl.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph + $(PERL) $(srcdir)/asm/directiv.pl c $(srcdir)/asm/directiv.dat asm/directbl.c # This target generates all files that require perl. # This allows easier generation of distribution (see dist target). @@ -271,53 +271,53 @@ alldeps: perlreq .SYMBOLIC # @exclude: "config/config.h" # @continuation: "&" #-- Everything below is generated by mkdep.pl - do not edit --# -asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h & +asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directbl.h & asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/msvc.h & config/unknown.h config/watcom.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/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 & +asm/directbl.$(O): asm/directbl.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h x86/insnsi.h & x86/regs.h -asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h & +asm/eval.$(O): asm/eval.c asm/directbl.h asm/eval.h asm/float.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/labels.h include/nasm.h include/nasmint.h & include/nasmlib.h include/opflags.h include/strlist.h include/tables.h & x86/insnsi.h x86/regs.h -asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/exprdump.$(O): asm/exprdump.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/exprlib.$(O): asm/exprlib.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h & +asm/float.$(O): asm/float.c asm/directbl.h asm/float.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h x86/insnsi.h & x86/regs.h -asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/labels.$(O): asm/labels.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/hashtbl.h include/labels.h include/nasm.h include/nasmint.h & include/nasmlib.h include/opflags.h include/strlist.h include/tables.h & x86/insnsi.h x86/regs.h -asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h & +asm/listing.$(O): asm/listing.c asm/directbl.h asm/listing.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h x86/insnsi.h & x86/regs.h -asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h & +asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directbl.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/msvc.h config/unknown.h config/watcom.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/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.$(O): asm/parser.c asm/directbl.h asm/eval.h asm/float.h & asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/iflag.h include/insns.h include/nasm.h include/nasmint.h & @@ -326,12 +326,12 @@ asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h & asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/msvc.h & config/unknown.h config/watcom.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/preproc-nop.$(O): asm/preproc-nop.c asm/directbl.h asm/listing.h & asm/pptok.h asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h x86/insnsi.h & x86/regs.h -asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h & +asm/preproc.$(O): asm/preproc.c asm/directbl.h asm/eval.h asm/listing.h & asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h & @@ -339,41 +339,41 @@ asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h & x86/regs.h asm/quote.$(O): asm/quote.c asm/quote.h config/msvc.h config/unknown.h & config/watcom.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 & +asm/rdstrnum.$(O): asm/rdstrnum.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/segalloc.$(O): asm/segalloc.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/tokens.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/iflag.h include/insns.h include/nasm.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/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/stdscan.$(O): asm/stdscan.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/quote.h asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h & config/watcom.h include/compiler.h include/iflag.h include/insns.h & include/nasm.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/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/strfunc.$(O): asm/strfunc.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h x86/insnsi.h x86/regs.h -asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h & +asm/tokhash.$(O): asm/tokhash.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/stdscan.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.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/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 & +common/common.$(O): common/common.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/tokens.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/iflag.h include/insns.h include/nasm.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 -disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h & +disasm/disasm.$(O): disasm/disasm.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/tokens.h config/msvc.h config/unknown.h config/watcom.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/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 & +disasm/ndisasm.$(O): disasm/ndisasm.c asm/directbl.h asm/pptok.h & asm/preproc.h asm/tokens.h config/msvc.h config/unknown.h config/watcom.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 & @@ -382,7 +382,7 @@ disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h & disasm/sync.$(O): disasm/sync.c config/msvc.h config/unknown.h & config/watcom.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 & +macros/macros.$(O): macros/macros.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/hashtbl.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h output/outform.h & @@ -399,7 +399,7 @@ nasmlib/file.$(O): nasmlib/file.c config/msvc.h config/unknown.h & nasmlib/file.h nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h & config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h -nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h & +nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h & include/nasmlib.h include/opflags.h include/strlist.h include/tables.h & @@ -418,7 +418,7 @@ nasmlib/raa.$(O): nasmlib/raa.c config/msvc.h config/unknown.h & include/raa.h nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h & config/watcom.h include/compiler.h include/nasmint.h include/rbtree.h -nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h & +nasmlib/readnum.$(O): nasmlib/readnum.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h x86/insnsi.h & @@ -439,85 +439,85 @@ nasmlib/strlist.$(O): nasmlib/strlist.c config/msvc.h config/unknown.h & nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/msvc.h config/unknown.h & config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h -output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h & +output/codeview.$(O): output/codeview.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.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/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 & +output/legacy.$(O): output/legacy.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h -output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h & +output/nulldbg.$(O): output/nulldbg.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h output/outlib.h & x86/insnsi.h x86/regs.h -output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h & +output/nullout.$(O): output/nullout.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h output/outlib.h & x86/insnsi.h x86/regs.h -output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h & +output/outaout.$(O): output/outaout.c asm/directbl.h asm/eval.h asm/pptok.h & asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/raa.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 & +output/outas86.$(O): output/outas86.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/raa.h include/saa.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 & +output/outbin.$(O): output/outbin.c asm/directbl.h asm/eval.h asm/pptok.h & asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/labels.h include/nasm.h include/nasmint.h & include/nasmlib.h include/opflags.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 & +output/outcoff.$(O): output/outcoff.c asm/directbl.h asm/eval.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/raa.h include/saa.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 & +output/outdbg.$(O): output/outdbg.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h 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 & +output/outelf.$(O): output/outelf.c asm/directbl.h asm/eval.h asm/pptok.h & asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/raa.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 & +output/outform.$(O): output/outform.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h output/outform.h & x86/insnsi.h x86/regs.h -output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h & +output/outieee.$(O): output/outieee.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h 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 & +output/outlib.$(O): output/outlib.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h -output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h & +output/outmacho.$(O): output/outmacho.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/raa.h include/rbtree.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 & +output/outobj.$(O): output/outobj.c asm/directbl.h asm/eval.h asm/pptok.h & asm/preproc.h asm/stdscan.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h 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 & +output/outrdf2.$(O): output/outrdf2.c asm/directbl.h asm/pptok.h & asm/preproc.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/rdoff.h include/saa.h include/strlist.h & @@ -530,24 +530,24 @@ stdlib/strnlen.$(O): stdlib/strnlen.c config/msvc.h config/unknown.h & config/watcom.h include/compiler.h include/nasmint.h stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h & config/watcom.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 & +x86/disp8.$(O): x86/disp8.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/disp8.h include/nasm.h include/nasmint.h include/nasmlib.h & include/opflags.h include/strlist.h include/tables.h x86/insnsi.h & x86/regs.h x86/iflag.$(O): x86/iflag.c config/msvc.h config/unknown.h config/watcom.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 & +x86/insnsa.$(O): x86/insnsa.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/tokens.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h & +x86/insnsb.$(O): x86/insnsb.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/tokens.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h & +x86/insnsd.$(O): x86/insnsd.c asm/directbl.h asm/pptok.h asm/preproc.h & asm/tokens.h config/msvc.h config/unknown.h config/watcom.h & include/compiler.h include/iflag.h include/insns.h include/nasm.h & include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h & @@ -555,7 +555,7 @@ x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h & x86/insnsn.$(O): x86/insnsn.c config/msvc.h config/unknown.h config/watcom.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 & +x86/regflags.$(O): x86/regflags.c asm/directbl.h asm/pptok.h asm/preproc.h & config/msvc.h config/unknown.h config/watcom.h include/compiler.h & include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h & include/strlist.h include/tables.h x86/insnsi.h x86/regs.h diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index 8de6549d..ba89730e 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -77,7 +77,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ x86/disp8.$(O) x86/iflag.$(O) \ \ asm/float.$(O) \ - asm/directiv.$(O) \ + asm/directbl.$(O) \ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \ asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \ asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \ @@ -257,48 +257,48 @@ everything: all doc rdf # @exclude: "config.h" # @continuation: "\" #-- Everything below is generated by mkdep.pl - do not edit --# -asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \ +asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directbl.h \ asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.h config/config.h \ config/msvc.h config/unknown.h config/watcom.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/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 \ +asm/directbl.$(O): asm/directbl.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/eval.$(O): asm/eval.c asm/directiv.h asm/eval.h asm/float.h asm/pptok.h \ +asm/eval.$(O): asm/eval.c asm/directbl.h asm/eval.h asm/float.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/labels.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ include/tables.h x86/insnsi.h x86/regs.h -asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/exprdump.$(O): asm/exprdump.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/exprlib.$(O): asm/exprlib.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \ +asm/float.$(O): asm/float.c asm/directbl.h asm/float.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/labels.$(O): asm/labels.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/labels.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ include/tables.h x86/insnsi.h x86/regs.h -asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \ +asm/listing.$(O): asm/listing.c asm/directbl.h asm/listing.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \ +asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directbl.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/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/iflag.h include/insns.h \ @@ -306,7 +306,7 @@ asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \ include/opflags.h include/raa.h include/saa.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.$(O): asm/parser.c asm/directbl.h asm/eval.h asm/float.h \ asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h asm/tokens.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.h \ @@ -315,12 +315,12 @@ asm/parser.$(O): asm/parser.c asm/directiv.h asm/eval.h asm/float.h \ asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/config.h \ config/msvc.h config/unknown.h config/watcom.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/preproc-nop.$(O): asm/preproc-nop.c asm/directbl.h asm/listing.h \ asm/pptok.h asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ x86/insnsi.h x86/regs.h -asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \ +asm/preproc.$(O): asm/preproc.c asm/directbl.h asm/eval.h asm/listing.h \ asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ @@ -329,45 +329,45 @@ asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \ asm/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \ config/unknown.h config/watcom.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 \ +asm/rdstrnum.$(O): asm/rdstrnum.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/segalloc.$(O): asm/segalloc.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/stdscan.$(O): asm/stdscan.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/quote.h asm/stdscan.h asm/tokens.h config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/iflag.h \ include/insns.h include/nasm.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/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/strfunc.$(O): asm/strfunc.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ x86/regs.h -asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \ +asm/tokhash.$(O): asm/tokhash.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \ config/watcom.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/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 \ +common/common.$(O): common/common.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \ +disasm/disasm.$(O): disasm/disasm.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.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/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 \ +disasm/ndisasm.$(O): disasm/ndisasm.c asm/directbl.h asm/pptok.h \ asm/preproc.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h disasm/disasm.h disasm/sync.h include/compiler.h \ include/iflag.h include/insns.h include/nasm.h include/nasmint.h \ @@ -376,7 +376,7 @@ disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \ disasm/sync.$(O): disasm/sync.c config/config.h config/msvc.h \ config/unknown.h config/watcom.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 \ +macros/macros.$(O): macros/macros.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -396,7 +396,7 @@ nasmlib/file.$(O): nasmlib/file.c config/config.h config/msvc.h \ nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \ include/nasmlib.h -nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \ +nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/hashtbl.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ @@ -419,7 +419,7 @@ nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \ include/rbtree.h -nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \ +nasmlib/readnum.$(O): nasmlib/readnum.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -443,90 +443,90 @@ nasmlib/ver.$(O): nasmlib/ver.c include/ver.h version.h nasmlib/zerobuf.$(O): nasmlib/zerobuf.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \ include/nasmlib.h -output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \ +output/codeview.$(O): output/codeview.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.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/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 \ +output/legacy.$(O): output/legacy.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outlib.h \ x86/insnsi.h x86/regs.h -output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \ +output/nulldbg.$(O): output/nulldbg.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ output/outlib.h x86/insnsi.h x86/regs.h -output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \ +output/nullout.$(O): output/nullout.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ output/outlib.h x86/insnsi.h x86/regs.h -output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \ +output/outaout.$(O): output/outaout.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.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 \ +output/outas86.$(O): output/outas86.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.h include/saa.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 \ +output/outbin.$(O): output/outbin.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/labels.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.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 \ +output/outcoff.$(O): output/outcoff.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.h include/saa.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 \ +output/outdbg.$(O): output/outdbg.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h 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 \ +output/outelf.$(O): output/outelf.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.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 \ +output/outform.$(O): output/outform.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ output/outform.h x86/insnsi.h x86/regs.h -output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \ +output/outieee.$(O): output/outieee.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ 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 \ +output/outlib.$(O): output/outlib.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h output/outlib.h \ x86/insnsi.h x86/regs.h -output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \ +output/outmacho.$(O): output/outmacho.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/raa.h include/rbtree.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 \ +output/outobj.$(O): output/outobj.c asm/directbl.h asm/eval.h asm/pptok.h \ asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ 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 \ +output/outrdf2.$(O): output/outrdf2.c asm/directbl.h asm/pptok.h \ asm/preproc.h config/config.h config/msvc.h config/unknown.h \ config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/rdoff.h include/saa.h \ @@ -542,7 +542,7 @@ stdlib/strnlen.$(O): stdlib/strnlen.c config/config.h config/msvc.h \ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/config.h config/msvc.h \ config/unknown.h config/watcom.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 \ +x86/disp8.$(O): x86/disp8.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/disp8.h include/nasm.h include/nasmint.h \ include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \ @@ -550,17 +550,17 @@ x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h \ x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h \ config/watcom.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 \ +x86/insnsa.$(O): x86/insnsa.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \ +x86/insnsb.$(O): x86/insnsb.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.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 -x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \ +x86/insnsd.$(O): x86/insnsd.c asm/directbl.h asm/pptok.h asm/preproc.h \ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/iflag.h include/insns.h include/nasm.h \ include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \ @@ -569,7 +569,7 @@ x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h \ config/watcom.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 \ +x86/regflags.$(O): x86/regflags.c asm/directbl.h asm/pptok.h asm/preproc.h \ config/config.h config/msvc.h config/unknown.h config/watcom.h \ include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \ include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \ diff --git a/asm/directiv.pl b/asm/directiv.pl index 6a2d5635..d54b4d67 100755 --- a/asm/directiv.pl +++ b/asm/directiv.pl @@ -36,8 +36,8 @@ # Generate a perfect hash for directive parsing # # Usage: -# directiv.pl h directiv.dat directiv.h (to generate C header) -# directiv.pl c directiv.dat directiv.c (to generate C source) +# directiv.pl h directiv.dat directbl.h (to generate C header) +# directiv.pl c directiv.dat directbl.c (to generate C source) # require 'phash.ph'; @@ -124,7 +124,7 @@ if ($output eq 'h') { print C "#include \n"; print C "#include \"nasm.h\"\n"; print C "#include \"hashtbl.h\"\n"; - print C "#include \"directiv.h\"\n"; + print C "#include \"directbl.h\"\n"; print C "\n"; printf C "const char * const directives[%d] =\n", diff --git a/include/nasm.h b/include/nasm.h index f49d9feb..ac445cc0 100644 --- a/include/nasm.h +++ b/include/nasm.h @@ -45,7 +45,7 @@ #include "strlist.h" #include "preproc.h" #include "insnsi.h" /* For enum opcode */ -#include "directiv.h" /* For enum directive */ +#include "directbl.h" /* For enum directive */ #include "opflags.h" #include "regs.h"