From 31b707bef0af5fffe7c507089e1e281925b13aae Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 27 Jun 2009 22:07:33 -0700 Subject: [PATCH] Move backend-specific code to output/; break out null debug stuff Move backend-specific code into the output/ directory, and make the null debugging backend a separate file (it certainly isn't needed for ndisasm...) Signed-off-by: H. Peter Anvin --- Makefile.in | 58 ++++++++++++++++++++++++------------------- Mkfiles/msvc.mak | 56 ++++++++++++++++++++++------------------- Mkfiles/netware.mak | 28 +++++++++++---------- Mkfiles/openwcom.mak | 56 ++++++++++++++++++++++------------------- Mkfiles/owlinux.mak | 56 ++++++++++++++++++++++------------------- doc/nasmdoc.src | 2 +- macros.pl | 2 +- nasm.c | 2 +- nasmlib.c | 54 ---------------------------------------- output/nulldbg.c | 56 +++++++++++++++++++++++++++++++++++++++++ output/outaout.c | 4 +-- output/outas86.c | 4 +-- output/outbin.c | 4 +-- output/outcoff.c | 4 +-- output/outdbg.c | 2 +- output/outelf.c | 2 +- output/outelf32.c | 4 +-- output/outelf64.c | 4 +-- outform.c => output/outform.c | 2 +- outform.h => output/outform.h | 2 +- output/outieee.c | 2 +- outlib.c => output/outlib.c | 2 +- outlib.h => output/outlib.h | 0 output/outmacho.c | 4 +-- output/outobj.c | 2 +- output/outrdf.c | 2 +- output/outrdf2.c | 2 +- 27 files changed, 222 insertions(+), 194 deletions(-) create mode 100644 output/nulldbg.c rename outform.c => output/outform.c (98%) rename outform.h => output/outform.h (98%) rename outlib.c => output/outlib.c (92%) rename outlib.h => output/outlib.h (100%) diff --git a/Makefile.in b/Makefile.in index fbdf3f6..296d92d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,8 +63,8 @@ NASM = nasm.$(O) nasmlib.$(O) ver.$(O) \ raa.$(O) saa.$(O) rbtree.$(O) \ float.$(O) insnsa.$(O) insnsb.$(O) \ assemble.$(O) labels.$(O) hashtbl.$(O) crc64.$(O) parser.$(O) \ - outform.$(O) outlib.$(O) output/outbin.$(O) \ - output/outaout.$(O) output/outcoff.$(O) \ + output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \ + output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \ output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \ @@ -271,50 +271,56 @@ lib/vsnprintf.$(O): lib/vsnprintf.c compiler.h config.h nasmlib.h listing.$(O): listing.c compiler.h config.h insnsi.h listing.h nasm.h \ nasmlib.h pptok.h preproc.h regs.h macros.$(O): macros.c compiler.h config.h hashtbl.h insnsi.h nasm.h \ - nasmlib.h outform.h pptok.h preproc.h regs.h tables.h + nasmlib.h output/outform.h pptok.h preproc.h regs.h tables.h nasm.$(O): nasm.c assemble.h compiler.h config.h eval.h float.h insns.h \ - insnsi.h labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h \ - preproc.h raa.h regs.h saa.h stdscan.h tokens.h + insnsi.h labels.h listing.h nasm.h nasmlib.h output/outform.h parser.h \ + pptok.h preproc.h raa.h regs.h saa.h stdscan.h tokens.h nasmlib.$(O): nasmlib.c compiler.h config.h insns.h insnsi.h nasm.h \ nasmlib.h pptok.h preproc.h regs.h tokens.h ndisasm.$(O): ndisasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \ nasmlib.h pptok.h preproc.h regs.h sync.h tokens.h -outform.$(O): outform.c compiler.h config.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h -outlib.$(O): outlib.c compiler.h config.h insnsi.h nasm.h nasmlib.h outlib.h \ - pptok.h preproc.h regs.h +output/nulldbg.$(O): output/nulldbg.c output/outaout.$(O): output/outaout.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h + nasmlib.h output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h \ + saa.h stdscan.h output/outas86.$(O): output/outas86.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + nasmlib.h output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h \ + saa.h output/outbin.$(O): output/outbin.c compiler.h config.h eval.h insnsi.h \ - labels.h nasm.h nasmlib.h outform.h outlib.h pptok.h preproc.h regs.h saa.h \ - stdscan.h + labels.h nasm.h nasmlib.h output/outform.h output/outlib.h pptok.h \ + preproc.h regs.h saa.h stdscan.h output/outcoff.$(O): output/outcoff.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + nasmlib.h output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h \ + saa.h output/outdbg.$(O): output/outdbg.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h pptok.h preproc.h regs.h + nasmlib.h output/outform.h pptok.h preproc.h regs.h output/outelf.$(O): output/outelf.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h output/dwarf.h output/elfcommon.h output/outelf.h pptok.h \ - preproc.h regs.h + nasmlib.h output/dwarf.h output/elfcommon.h output/outelf.h \ + output/outform.h pptok.h preproc.h regs.h output/outelf32.$(O): output/outelf32.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h outlib.h output/dwarf.h output/elf32.h \ - output/elfcommon.h output/outelf.h pptok.h preproc.h raa.h rbtree.h regs.h \ + nasmlib.h output/dwarf.h output/elf32.h output/elfcommon.h output/outelf.h \ + output/outform.h output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h \ saa.h stdscan.h output/outelf64.$(O): output/outelf64.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h outlib.h output/dwarf.h output/elf64.h \ - output/elfcommon.h output/outelf.h pptok.h preproc.h raa.h rbtree.h regs.h \ + nasmlib.h output/dwarf.h output/elf64.h output/elfcommon.h output/outelf.h \ + output/outform.h output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h \ saa.h stdscan.h +output/outform.$(O): output/outform.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h output/outform.h pptok.h preproc.h regs.h output/outieee.$(O): output/outieee.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h pptok.h preproc.h regs.h + nasmlib.h output/outform.h pptok.h preproc.h regs.h +output/outlib.$(O): output/outlib.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h output/outlib.h pptok.h preproc.h regs.h output/outmacho.$(O): output/outmacho.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + nasmlib.h output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h \ + saa.h output/outobj.$(O): output/outobj.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h pptok.h preproc.h regs.h stdscan.h + nasmlib.h output/outform.h pptok.h preproc.h regs.h stdscan.h output/outrdf.$(O): output/outrdf.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h pptok.h preproc.h regs.h + nasmlib.h output/outform.h pptok.h preproc.h regs.h output/outrdf2.$(O): output/outrdf2.c compiler.h config.h insnsi.h nasm.h \ - nasmlib.h outform.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h + nasmlib.h output/outform.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h +owtest.$(O): owtest.c parser.$(O): parser.c compiler.h config.h float.h insns.h insnsi.h nasm.h \ nasmlib.h parser.h pptok.h preproc.h regs.h stdscan.h tables.h tokens.h pptok.$(O): pptok.c compiler.h config.h hashtbl.h nasmlib.h pptok.h \ diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index e70f1e1..cee0249 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -38,8 +38,8 @@ NASM = nasm.$(O) nasmlib.$(O) ver.$(O) \ raa.$(O) saa.$(O) rbtree.$(O) \ float.$(O) insnsa.$(O) insnsb.$(O) \ assemble.$(O) labels.$(O) hashtbl.$(O) crc64.$(O) parser.$(O) \ - outform.$(O) outlib.$(O) output/outbin.$(O) \ - output/outaout.$(O) output/outcoff.$(O) \ + output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \ + output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \ output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \ @@ -209,47 +209,53 @@ lib/vsnprintf.$(O): lib/vsnprintf.c compiler.h nasmlib.h listing.$(O): listing.c compiler.h insnsi.h listing.h nasm.h nasmlib.h \ pptok.h preproc.h regs.h macros.$(O): macros.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h tables.h + output/outform.h pptok.h preproc.h regs.h tables.h nasm.$(O): nasm.c assemble.h compiler.h eval.h float.h insns.h insnsi.h \ - labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h preproc.h \ - raa.h regs.h saa.h stdscan.h tokens.h + labels.h listing.h nasm.h nasmlib.h output/outform.h parser.h pptok.h \ + preproc.h raa.h regs.h saa.h stdscan.h tokens.h nasmlib.$(O): nasmlib.c compiler.h insns.h insnsi.h nasm.h nasmlib.h pptok.h \ preproc.h regs.h tokens.h ndisasm.$(O): ndisasm.c compiler.h disasm.h insns.h insnsi.h nasm.h \ nasmlib.h pptok.h preproc.h regs.h sync.h tokens.h -outform.$(O): outform.c compiler.h insnsi.h nasm.h nasmlib.h outform.h \ - pptok.h preproc.h regs.h -outlib.$(O): outlib.c compiler.h insnsi.h nasm.h nasmlib.h outlib.h pptok.h \ - preproc.h regs.h +output/nulldbg.$(O): output/nulldbg.c output/outaout.$(O): output/outaout.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h \ + stdscan.h output/outas86.$(O): output/outas86.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h output/outbin.$(O): output/outbin.c compiler.h eval.h insnsi.h labels.h \ - nasm.h nasmlib.h outform.h outlib.h pptok.h preproc.h regs.h saa.h \ - stdscan.h + nasm.h nasmlib.h output/outform.h output/outlib.h pptok.h preproc.h regs.h \ + saa.h stdscan.h output/outcoff.$(O): output/outcoff.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h output/outdbg.$(O): output/outdbg.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h + output/outform.h pptok.h preproc.h regs.h output/outelf.$(O): output/outelf.c compiler.h insnsi.h nasm.h nasmlib.h \ - output/dwarf.h output/elfcommon.h output/outelf.h pptok.h preproc.h regs.h + output/dwarf.h output/elfcommon.h output/outelf.h output/outform.h pptok.h \ + preproc.h regs.h output/outelf32.$(O): output/outelf32.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h output/dwarf.h output/elf32.h output/elfcommon.h \ - output/outelf.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h + output/dwarf.h output/elf32.h output/elfcommon.h output/outelf.h \ + output/outform.h output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h \ + saa.h stdscan.h output/outelf64.$(O): output/outelf64.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h output/dwarf.h output/elf64.h output/elfcommon.h \ - output/outelf.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h + output/dwarf.h output/elf64.h output/elfcommon.h output/outelf.h \ + output/outform.h output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h \ + saa.h stdscan.h +output/outform.$(O): output/outform.c compiler.h insnsi.h nasm.h nasmlib.h \ + output/outform.h pptok.h preproc.h regs.h output/outieee.$(O): output/outieee.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h + output/outform.h pptok.h preproc.h regs.h +output/outlib.$(O): output/outlib.c compiler.h insnsi.h nasm.h nasmlib.h \ + output/outlib.h pptok.h preproc.h regs.h output/outmacho.$(O): output/outmacho.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h output/outobj.$(O): output/outobj.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h stdscan.h + output/outform.h pptok.h preproc.h regs.h stdscan.h output/outrdf.$(O): output/outrdf.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h + output/outform.h pptok.h preproc.h regs.h output/outrdf2.$(O): output/outrdf2.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h + output/outform.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h +owtest.$(O): owtest.c parser.$(O): parser.c compiler.h float.h insns.h insnsi.h nasm.h nasmlib.h \ parser.h pptok.h preproc.h regs.h stdscan.h tables.h tokens.h pptok.$(O): pptok.c compiler.h hashtbl.h nasmlib.h pptok.h preproc.h diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index 30a575a..0e22b49 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -34,8 +34,8 @@ NASM = nasm.o nasmlib.o ver.o \ raa.o saa.o rbtree.o \ float.o insnsa.o insnsb.o \ assemble.o labels.o hashtbl.o crc64.o parser.o \ - outform.o outlib.o outbin.o \ - outaout.o outcoff.o \ + outform.o outlib.o nulldbg.o \ + outbin.o outaout.o outcoff.o \ outelf.o outelf32.o outelf64.o \ outobj.o outas86.o outrdf2.o \ outdbg.o outieee.o outmacho.o \ @@ -157,10 +157,7 @@ nasmlib.o: nasmlib.c compiler.h config.h insns.h insnsi.h nasm.h nasmlib.h \ pptok.h preproc.h regs.h tokens.h ndisasm.o: ndisasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \ nasmlib.h pptok.h preproc.h regs.h sync.h tokens.h -outform.o: outform.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ - pptok.h preproc.h regs.h -outlib.o: outlib.c compiler.h config.h insnsi.h nasm.h nasmlib.h outlib.h \ - pptok.h preproc.h regs.h +nulldbg.o: nulldbg.c outaout.o: outaout.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h outas86.o: outas86.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ @@ -172,15 +169,19 @@ outcoff.o: outcoff.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ outdbg.o: outdbg.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ pptok.h preproc.h regs.h outelf.o: outelf.c compiler.h config.h insnsi.h nasm.h nasmlib.h dwarf.h \ - elfcommon.h outelf.h pptok.h preproc.h regs.h -outelf32.o: outelf32.c compiler.h config.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h dwarf.h elf32.h elfcommon.h outelf.h pptok.h preproc.h \ - raa.h rbtree.h regs.h saa.h stdscan.h -outelf64.o: outelf64.c compiler.h config.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h dwarf.h elf64.h elfcommon.h outelf.h pptok.h preproc.h \ - raa.h rbtree.h regs.h saa.h stdscan.h + elfcommon.h outelf.h outform.h pptok.h preproc.h regs.h +outelf32.o: outelf32.c compiler.h config.h insnsi.h nasm.h nasmlib.h dwarf.h \ + elf32.h elfcommon.h outelf.h outform.h outlib.h pptok.h preproc.h raa.h \ + rbtree.h regs.h saa.h stdscan.h +outelf64.o: outelf64.c compiler.h config.h insnsi.h nasm.h nasmlib.h dwarf.h \ + elf64.h elfcommon.h outelf.h outform.h outlib.h pptok.h preproc.h raa.h \ + rbtree.h regs.h saa.h stdscan.h +outform.o: outform.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ + pptok.h preproc.h regs.h outieee.o: outieee.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ pptok.h preproc.h regs.h +outlib.o: outlib.c compiler.h config.h insnsi.h nasm.h nasmlib.h outlib.h \ + pptok.h preproc.h regs.h outmacho.o: outmacho.c compiler.h config.h insnsi.h nasm.h nasmlib.h \ outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h outobj.o: outobj.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ @@ -189,6 +190,7 @@ outrdf.o: outrdf.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ pptok.h preproc.h regs.h outrdf2.o: outrdf2.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \ pptok.h preproc.h rdoff.h regs.h saa.h +owtest.o: owtest.c parser.o: parser.c compiler.h config.h float.h insns.h insnsi.h nasm.h \ nasmlib.h parser.h pptok.h preproc.h regs.h stdscan.h tables.h tokens.h pptok.o: pptok.c compiler.h config.h hashtbl.h nasmlib.h pptok.h preproc.h diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 80770b7..a27cc68 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -50,8 +50,8 @@ NASM = nasm.$(O) nasmlib.$(O) ver.$(O) & raa.$(O) saa.$(O) rbtree.$(O) & float.$(O) insnsa.$(O) insnsb.$(O) & assemble.$(O) labels.$(O) hashtbl.$(O) crc64.$(O) parser.$(O) & - outform.$(O) outlib.$(O) output\outbin.$(O) & - output\outaout.$(O) output\outcoff.$(O) & + output\outform.$(O) output\outlib.$(O) output\nulldbg.$(O) & + output\outbin.$(O) output\outaout.$(O) output\outcoff.$(O) & output\outelf.$(O) output\outelf32.$(O) output\outelf64.$(O) & output\outobj.$(O) output\outas86.$(O) output\outrdf2.$(O) & output\outdbg.$(O) output\outieee.$(O) output\outmacho.$(O) & @@ -238,47 +238,53 @@ lib\vsnprintf.$(O): lib\vsnprintf.c compiler.h nasmlib.h listing.$(O): listing.c compiler.h insnsi.h listing.h nasm.h nasmlib.h & pptok.h preproc.h regs.h macros.$(O): macros.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h & - outform.h pptok.h preproc.h regs.h tables.h + output\outform.h pptok.h preproc.h regs.h tables.h nasm.$(O): nasm.c assemble.h compiler.h eval.h float.h insns.h insnsi.h & - labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h preproc.h & - raa.h regs.h saa.h stdscan.h tokens.h + labels.h listing.h nasm.h nasmlib.h output\outform.h parser.h pptok.h & + preproc.h raa.h regs.h saa.h stdscan.h tokens.h nasmlib.$(O): nasmlib.c compiler.h insns.h insnsi.h nasm.h nasmlib.h pptok.h & preproc.h regs.h tokens.h ndisasm.$(O): ndisasm.c compiler.h disasm.h insns.h insnsi.h nasm.h & nasmlib.h pptok.h preproc.h regs.h sync.h tokens.h -outform.$(O): outform.c compiler.h insnsi.h nasm.h nasmlib.h outform.h & - pptok.h preproc.h regs.h -outlib.$(O): outlib.c compiler.h insnsi.h nasm.h nasmlib.h outlib.h pptok.h & - preproc.h regs.h +output\nulldbg.$(O): output\nulldbg.c output\outaout.$(O): output\outaout.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h + output\outform.h output\outlib.h pptok.h preproc.h raa.h regs.h saa.h & + stdscan.h output\outas86.$(O): output\outas86.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output\outform.h output\outlib.h pptok.h preproc.h raa.h regs.h saa.h output\outbin.$(O): output\outbin.c compiler.h eval.h insnsi.h labels.h & - nasm.h nasmlib.h outform.h outlib.h pptok.h preproc.h regs.h saa.h & - stdscan.h + nasm.h nasmlib.h output\outform.h output\outlib.h pptok.h preproc.h regs.h & + saa.h stdscan.h output\outcoff.$(O): output\outcoff.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output\outform.h output\outlib.h pptok.h preproc.h raa.h regs.h saa.h output\outdbg.$(O): output\outdbg.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h pptok.h preproc.h regs.h + output\outform.h pptok.h preproc.h regs.h output\outelf.$(O): output\outelf.c compiler.h insnsi.h nasm.h nasmlib.h & - output\dwarf.h output\elfcommon.h output\outelf.h pptok.h preproc.h regs.h + output\dwarf.h output\elfcommon.h output\outelf.h output\outform.h pptok.h & + preproc.h regs.h output\outelf32.$(O): output\outelf32.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h outlib.h output\dwarf.h output\elf32.h output\elfcommon.h & - output\outelf.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h + output\dwarf.h output\elf32.h output\elfcommon.h output\outelf.h & + output\outform.h output\outlib.h pptok.h preproc.h raa.h rbtree.h regs.h & + saa.h stdscan.h output\outelf64.$(O): output\outelf64.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h outlib.h output\dwarf.h output\elf64.h output\elfcommon.h & - output\outelf.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h + output\dwarf.h output\elf64.h output\elfcommon.h output\outelf.h & + output\outform.h output\outlib.h pptok.h preproc.h raa.h rbtree.h regs.h & + saa.h stdscan.h +output\outform.$(O): output\outform.c compiler.h insnsi.h nasm.h nasmlib.h & + output\outform.h pptok.h preproc.h regs.h output\outieee.$(O): output\outieee.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h pptok.h preproc.h regs.h + output\outform.h pptok.h preproc.h regs.h +output\outlib.$(O): output\outlib.c compiler.h insnsi.h nasm.h nasmlib.h & + output\outlib.h pptok.h preproc.h regs.h output\outmacho.$(O): output\outmacho.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output\outform.h output\outlib.h pptok.h preproc.h raa.h regs.h saa.h output\outobj.$(O): output\outobj.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h pptok.h preproc.h regs.h stdscan.h + output\outform.h pptok.h preproc.h regs.h stdscan.h output\outrdf.$(O): output\outrdf.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h pptok.h preproc.h regs.h + output\outform.h pptok.h preproc.h regs.h output\outrdf2.$(O): output\outrdf2.c compiler.h insnsi.h nasm.h nasmlib.h & - outform.h pptok.h preproc.h rdoff\rdoff.h regs.h saa.h + output\outform.h pptok.h preproc.h rdoff\rdoff.h regs.h saa.h +owtest.$(O): owtest.c parser.$(O): parser.c compiler.h float.h insns.h insnsi.h nasm.h nasmlib.h & parser.h pptok.h preproc.h regs.h stdscan.h tables.h tokens.h pptok.$(O): pptok.c compiler.h hashtbl.h nasmlib.h pptok.h preproc.h diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index a9ef001..c2a03c8 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -61,8 +61,8 @@ NASM = nasm.$(O) nasmlib.$(O) ver.$(O) \ raa.$(O) saa.$(O) rbtree.$(O) \ float.$(O) insnsa.$(O) insnsb.$(O) \ assemble.$(O) labels.$(O) hashtbl.$(O) crc64.$(O) parser.$(O) \ - outform.$(O) outlib.$(O) output/outbin.$(O) \ - output/outaout.$(O) output/outcoff.$(O) \ + output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \ + output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \ output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \ @@ -248,47 +248,53 @@ lib/vsnprintf.$(O): lib/vsnprintf.c compiler.h nasmlib.h listing.$(O): listing.c compiler.h insnsi.h listing.h nasm.h nasmlib.h \ pptok.h preproc.h regs.h macros.$(O): macros.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h tables.h + output/outform.h pptok.h preproc.h regs.h tables.h nasm.$(O): nasm.c assemble.h compiler.h eval.h float.h insns.h insnsi.h \ - labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h preproc.h \ - raa.h regs.h saa.h stdscan.h tokens.h + labels.h listing.h nasm.h nasmlib.h output/outform.h parser.h pptok.h \ + preproc.h raa.h regs.h saa.h stdscan.h tokens.h nasmlib.$(O): nasmlib.c compiler.h insns.h insnsi.h nasm.h nasmlib.h pptok.h \ preproc.h regs.h tokens.h ndisasm.$(O): ndisasm.c compiler.h disasm.h insns.h insnsi.h nasm.h \ nasmlib.h pptok.h preproc.h regs.h sync.h tokens.h -outform.$(O): outform.c compiler.h insnsi.h nasm.h nasmlib.h outform.h \ - pptok.h preproc.h regs.h -outlib.$(O): outlib.c compiler.h insnsi.h nasm.h nasmlib.h outlib.h pptok.h \ - preproc.h regs.h +output/nulldbg.$(O): output/nulldbg.c output/outaout.$(O): output/outaout.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h stdscan.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h \ + stdscan.h output/outas86.$(O): output/outas86.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h output/outbin.$(O): output/outbin.c compiler.h eval.h insnsi.h labels.h \ - nasm.h nasmlib.h outform.h outlib.h pptok.h preproc.h regs.h saa.h \ - stdscan.h + nasm.h nasmlib.h output/outform.h output/outlib.h pptok.h preproc.h regs.h \ + saa.h stdscan.h output/outcoff.$(O): output/outcoff.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h output/outdbg.$(O): output/outdbg.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h + output/outform.h pptok.h preproc.h regs.h output/outelf.$(O): output/outelf.c compiler.h insnsi.h nasm.h nasmlib.h \ - output/dwarf.h output/elfcommon.h output/outelf.h pptok.h preproc.h regs.h + output/dwarf.h output/elfcommon.h output/outelf.h output/outform.h pptok.h \ + preproc.h regs.h output/outelf32.$(O): output/outelf32.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h output/dwarf.h output/elf32.h output/elfcommon.h \ - output/outelf.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h + output/dwarf.h output/elf32.h output/elfcommon.h output/outelf.h \ + output/outform.h output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h \ + saa.h stdscan.h output/outelf64.$(O): output/outelf64.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h output/dwarf.h output/elf64.h output/elfcommon.h \ - output/outelf.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h + output/dwarf.h output/elf64.h output/elfcommon.h output/outelf.h \ + output/outform.h output/outlib.h pptok.h preproc.h raa.h rbtree.h regs.h \ + saa.h stdscan.h +output/outform.$(O): output/outform.c compiler.h insnsi.h nasm.h nasmlib.h \ + output/outform.h pptok.h preproc.h regs.h output/outieee.$(O): output/outieee.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h + output/outform.h pptok.h preproc.h regs.h +output/outlib.$(O): output/outlib.c compiler.h insnsi.h nasm.h nasmlib.h \ + output/outlib.h pptok.h preproc.h regs.h output/outmacho.$(O): output/outmacho.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h + output/outform.h output/outlib.h pptok.h preproc.h raa.h regs.h saa.h output/outobj.$(O): output/outobj.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h stdscan.h + output/outform.h pptok.h preproc.h regs.h stdscan.h output/outrdf.$(O): output/outrdf.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h regs.h + output/outform.h pptok.h preproc.h regs.h output/outrdf2.$(O): output/outrdf2.c compiler.h insnsi.h nasm.h nasmlib.h \ - outform.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h + output/outform.h pptok.h preproc.h rdoff/rdoff.h regs.h saa.h +owtest.$(O): owtest.c parser.$(O): parser.c compiler.h float.h insns.h insnsi.h nasm.h nasmlib.h \ parser.h pptok.h preproc.h regs.h stdscan.h tables.h tokens.h pptok.$(O): pptok.c compiler.h hashtbl.h nasmlib.h pptok.h preproc.h diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src index 888a19f..656b82c 100644 --- a/doc/nasmdoc.src +++ b/doc/nasmdoc.src @@ -5690,7 +5690,7 @@ a hint as to where to find requested symbols. The \c{dbg} output format is not built into NASM in the default configuration. If you are building your own NASM executable from the -sources, you can define \i\c{OF_DBG} in \c{outform.h} or on the +sources, you can define \i\c{OF_DBG} in \c{output/outform.h} or on the compiler command line, and obtain the \c{dbg} output format. The \c{dbg} format does not output an object file as such; instead, diff --git a/macros.pl b/macros.pl index 2eb5167..d86da96 100755 --- a/macros.pl +++ b/macros.pl @@ -47,7 +47,7 @@ print OUT "\n"; print OUT "#include \"tables.h\"\n"; print OUT "#include \"nasmlib.h\"\n"; print OUT "#include \"hashtbl.h\"\n"; -print OUT "#include \"outform.h\"\n"; +print OUT "#include \"output/outform.h\"\n"; print OUT "\n"; print OUT "#if 1\n"; print OUT "const unsigned char nasm_stdmac[] = {"; diff --git a/nasm.c b/nasm.c index 632d794..2819b66 100644 --- a/nasm.c +++ b/nasm.c @@ -29,7 +29,7 @@ #include "eval.h" #include "assemble.h" #include "labels.h" -#include "outform.h" +#include "output/outform.h" #include "listing.h" struct forwrefinfo { /* info held on forward refs. */ diff --git a/nasmlib.c b/nasmlib.c index 94c9dda..5291832 100644 --- a/nasmlib.c +++ b/nasmlib.c @@ -606,57 +606,3 @@ char *nasm_strcat(const char *one, const char *two) strcpy(rslt + l1, two); return rslt; } - -void null_debug_init(struct ofmt *of, void *id, FILE * fp, efunc error) -{ - (void)of; - (void)id; - (void)fp; - (void)error; -} -void null_debug_linenum(const char *filename, int32_t linenumber, int32_t segto) -{ - (void)filename; - (void)linenumber; - (void)segto; -} -void null_debug_deflabel(char *name, int32_t segment, int64_t offset, - int is_global, char *special) -{ - (void)name; - (void)segment; - (void)offset; - (void)is_global; - (void)special; -} -void null_debug_routine(const char *directive, const char *params) -{ - (void)directive; - (void)params; -} -void null_debug_typevalue(int32_t type) -{ - (void)type; -} -void null_debug_output(int type, void *param) -{ - (void)type; - (void)param; -} -void null_debug_cleanup(void) -{ -} - -struct dfmt null_debug_form = { - "Null debug format", - "null", - null_debug_init, - null_debug_linenum, - null_debug_deflabel, - null_debug_routine, - null_debug_typevalue, - null_debug_output, - null_debug_cleanup -}; - -struct dfmt *null_debug_arr[2] = { &null_debug_form, NULL }; diff --git a/output/nulldbg.c b/output/nulldbg.c new file mode 100644 index 0000000..e1b13e8 --- /dev/null +++ b/output/nulldbg.c @@ -0,0 +1,56 @@ +#include "nasm.h" +#include "nasmlib.h" + +void null_debug_init(struct ofmt *of, void *id, FILE * fp, efunc error) +{ + (void)of; + (void)id; + (void)fp; + (void)error; +} +void null_debug_linenum(const char *filename, int32_t linenumber, int32_t segto) +{ + (void)filename; + (void)linenumber; + (void)segto; +} +void null_debug_deflabel(char *name, int32_t segment, int64_t offset, + int is_global, char *special) +{ + (void)name; + (void)segment; + (void)offset; + (void)is_global; + (void)special; +} +void null_debug_routine(const char *directive, const char *params) +{ + (void)directive; + (void)params; +} +void null_debug_typevalue(int32_t type) +{ + (void)type; +} +void null_debug_output(int type, void *param) +{ + (void)type; + (void)param; +} +void null_debug_cleanup(void) +{ +} + +struct dfmt null_debug_form = { + "Null debug format", + "null", + null_debug_init, + null_debug_linenum, + null_debug_deflabel, + null_debug_routine, + null_debug_typevalue, + null_debug_output, + null_debug_cleanup +}; + +struct dfmt *null_debug_arr[2] = { &null_debug_form, NULL }; diff --git a/output/outaout.c b/output/outaout.c index 467b20e..3c48eed 100644 --- a/output/outaout.c +++ b/output/outaout.c @@ -20,8 +20,8 @@ #include "saa.h" #include "raa.h" #include "stdscan.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #if defined OF_AOUT || defined OF_AOUTB diff --git a/output/outas86.c b/output/outas86.c index 914dcea..9a09b84 100644 --- a/output/outas86.c +++ b/output/outas86.c @@ -19,8 +19,8 @@ #include "nasmlib.h" #include "saa.h" #include "raa.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #ifdef OF_AS86 diff --git a/output/outbin.c b/output/outbin.c index fa4c9a3..fdd1788 100644 --- a/output/outbin.c +++ b/output/outbin.c @@ -58,8 +58,8 @@ #include "stdscan.h" #include "labels.h" #include "eval.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #ifdef OF_BIN diff --git a/output/outcoff.c b/output/outcoff.c index 1540c60..b8a9c7d 100644 --- a/output/outcoff.c +++ b/output/outcoff.c @@ -20,8 +20,8 @@ #include "nasmlib.h" #include "saa.h" #include "raa.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #if defined(OF_COFF) || defined(OF_WIN32) || defined(OF_WIN64) diff --git a/output/outdbg.c b/output/outdbg.c index 102e422..e00b084 100644 --- a/output/outdbg.c +++ b/output/outdbg.c @@ -17,7 +17,7 @@ #include "nasm.h" #include "nasmlib.h" -#include "outform.h" +#include "output/outform.h" #ifdef OF_DBG diff --git a/output/outelf.c b/output/outelf.c index 6991515..afd6787 100644 --- a/output/outelf.c +++ b/output/outelf.c @@ -9,7 +9,7 @@ #include #include "nasm.h" -#include "outform.h" +#include "output/outform.h" #include "output/elfcommon.h" #include "output/dwarf.h" diff --git a/output/outelf32.c b/output/outelf32.c index 1e2d76f..1a327cf 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -20,8 +20,8 @@ #include "saa.h" #include "raa.h" #include "stdscan.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #include "rbtree.h" #include "output/elf32.h" diff --git a/output/outelf64.c b/output/outelf64.c index 7068764..59df792 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -19,8 +19,8 @@ #include "saa.h" #include "raa.h" #include "stdscan.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #include "rbtree.h" #include "output/elf64.h" diff --git a/outform.c b/output/outform.c similarity index 98% rename from outform.c rename to output/outform.c index 2aa5513..2546c1b 100644 --- a/outform.c +++ b/output/outform.c @@ -16,7 +16,7 @@ #include #define BUILD_DRIVERS_ARRAY -#include "outform.h" +#include "output/outform.h" static int ndrivers = 0; diff --git a/outform.h b/output/outform.h similarity index 98% rename from outform.h rename to output/outform.h index d2449a5..5c12092 100644 --- a/outform.h +++ b/output/outform.h @@ -1,4 +1,4 @@ -/* outform.h header file for binding output format drivers to the +/* output/outform.h header file for binding output format drivers to the * remainder of the code in the Netwide Assembler * * The Netwide Assembler is copyright (C) 1996 Simon Tatham and diff --git a/output/outieee.c b/output/outieee.c index abf493c..cadcb2a 100644 --- a/output/outieee.c +++ b/output/outieee.c @@ -48,7 +48,7 @@ #include "nasm.h" #include "nasmlib.h" -#include "outform.h" +#include "output/outform.h" #ifdef OF_IEEE diff --git a/outlib.c b/output/outlib.c similarity index 92% rename from outlib.c rename to output/outlib.c index cf68721..e1b61b1 100644 --- a/outlib.c +++ b/output/outlib.c @@ -6,7 +6,7 @@ #include "compiler.h" #include "nasm.h" -#include "outlib.h" +#include "output/outlib.h" uint64_t realsize(enum out_type type, uint64_t size) { diff --git a/outlib.h b/output/outlib.h similarity index 100% rename from outlib.h rename to output/outlib.h diff --git a/output/outmacho.c b/output/outmacho.c index 5387e99..d88ca80 100644 --- a/output/outmacho.c +++ b/output/outmacho.c @@ -22,8 +22,8 @@ #include "nasmlib.h" #include "saa.h" #include "raa.h" -#include "outform.h" -#include "outlib.h" +#include "output/outform.h" +#include "output/outlib.h" #if defined(OF_MACHO) diff --git a/output/outobj.c b/output/outobj.c index fe2de3e..83870cf 100644 --- a/output/outobj.c +++ b/output/outobj.c @@ -18,7 +18,7 @@ #include "nasm.h" #include "nasmlib.h" #include "stdscan.h" -#include "outform.h" +#include "output/outform.h" #ifdef OF_OBJ diff --git a/output/outrdf.c b/output/outrdf.c index 8c5b239..af78f9d 100644 --- a/output/outrdf.c +++ b/output/outrdf.c @@ -22,7 +22,7 @@ #include "nasm.h" #include "nasmlib.h" -#include "outform.h" +#include "output/outform.h" /* VERBOSE_WARNINGS: define this to add some extra warnings... */ #define VERBOSE_WARNINGS diff --git a/output/outrdf2.c b/output/outrdf2.c index b502715..c5e2e06 100644 --- a/output/outrdf2.c +++ b/output/outrdf2.c @@ -21,7 +21,7 @@ #include "nasm.h" #include "nasmlib.h" #include "saa.h" -#include "outform.h" +#include "output/outform.h" /* VERBOSE_WARNINGS: define this to add some extra warnings... */ #define VERBOSE_WARNINGS -- 2.7.4