diff --git a/src/cmd/Makefile b/src/cmd/Makefile index f5c7ae2..5d1484f 100644 --- a/src/cmd/Makefile +++ b/src/cmd/Makefile @@ -10,7 +10,7 @@ CFLAGS += -Werror # Programs that live in subdirectories, and have makefiles of their own. # /bin -SUBDIR = adb adc-demo ar as awk basic cc chflags chpass \ +SUBDIR = adb adc-demo aout ar as awk basic cc chflags chpass \ cpp dc diff emg env fdisk find forth fstat glcdtest \ hostname id la lcc lcpp ld ls login make man med \ more nm passwd picoc portio printf pwm \ diff --git a/src/cmd/aout/Makefile b/src/cmd/aout/Makefile new file mode 100644 index 0000000..7ca33a2 --- /dev/null +++ b/src/cmd/aout/Makefile @@ -0,0 +1,25 @@ +# +# aout - Display information from a.out files +# +TOPSRC = $(shell cd ../../..; pwd) +include $(TOPSRC)/target.mk +#include $(TOPSRC)/cross.mk + +CFLAGS += -Werror -Wall -Os +LDFLAGS += + +AOUTOBJS = aout.o mips-dis.o + +all: aout + +aout: $(AOUTOBJS) + ${CC} ${LDFLAGS} -o aout.elf $(AOUTOBJS) ${LIBS} + ${OBJDUMP} -S aout.elf > aout.dis + ${SIZE} aout.elf + ${ELF2AOUT} aout.elf $@ && rm aout.elf + +clean: + rm -f *.o *.0 *.elf aout tags *~ *.dis + +install: all + install aout $(DESTDIR)/bin/ diff --git a/src/cmd/as/aout.c b/src/cmd/aout/aout.c similarity index 100% rename from src/cmd/as/aout.c rename to src/cmd/aout/aout.c diff --git a/src/cmd/as/mips-dis.c b/src/cmd/aout/mips-dis.c similarity index 100% rename from src/cmd/as/mips-dis.c rename to src/cmd/aout/mips-dis.c diff --git a/src/cmd/as/mips-opc.c b/src/cmd/aout/mips-opc.c similarity index 100% rename from src/cmd/as/mips-opc.c rename to src/cmd/aout/mips-opc.c diff --git a/src/cmd/as/mips-opcode.h b/src/cmd/aout/mips-opcode.h similarity index 100% rename from src/cmd/as/mips-opcode.h rename to src/cmd/aout/mips-opcode.h diff --git a/src/cmd/as/mips16-opc.c b/src/cmd/aout/mips16-opc.c similarity index 100% rename from src/cmd/as/mips16-opc.c rename to src/cmd/aout/mips16-opc.c diff --git a/src/cmd/as/Makefile b/src/cmd/as/Makefile index 78d7e12..06a3019 100644 --- a/src/cmd/as/Makefile +++ b/src/cmd/as/Makefile @@ -1,6 +1,5 @@ # # as - Assembler -# aout - Display information from a.out files # TOPSRC = $(shell cd ../../..; pwd) include $(TOPSRC)/target.mk @@ -9,9 +8,7 @@ include $(TOPSRC)/target.mk CFLAGS += -Werror -Wall -Os LDFLAGS += -AOUTOBJS = aout.o mips-dis.o - -all: as aout +all: as as: as.o ${CC} ${LDFLAGS} -o as.elf as.o ${LIBS} @@ -19,26 +16,8 @@ as: as.o ${SIZE} as.elf ${ELF2AOUT} as.elf $@ && rm as.elf -aout: $(AOUTOBJS) - ${CC} ${LDFLAGS} -o aout.elf $(AOUTOBJS) ${LIBS} - ${OBJDUMP} -S aout.elf > aout.dis - ${SIZE} aout.elf - ${ELF2AOUT} aout.elf $@ && rm aout.elf - clean: - rm -f *.o *.0 *.elf as aout tags *~ *.dis tests/*.dis tests/*.gcc-dis tests/*.o - -test: - /usr/local/pic32-tools/bin/pic32-as -al example.s + rm -f *.o *.0 *.elf as tags *~ *.dis tests/*.dis tests/*.gcc-dis tests/*.o install: all install as $(DESTDIR)/bin/ - install aout $(DESTDIR)/bin/ - -test.dis-gcc: test.s - $(AS) $< -o test.o - ${OBJDUMP} -D test.o > $@ - -test.dis: test.s as aout - ./as $< -o test.o - ./aout test.o > $@ diff --git a/src/libc/gen/modff.c b/src/libc/gen/modff.c index 7eeac60..0595a33 100644 --- a/src/libc/gen/modff.c +++ b/src/libc/gen/modff.c @@ -1,9 +1,9 @@ /* * Written by Serge Vakulenko . * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. */ #include @@ -11,8 +11,6 @@ * modff(float x, float *iptr) * return fraction part of x, and return x's integral part in *iptr. */ -static const float one = 1.0; - float modff (float fx, float *iptr) { union { diff --git a/tools/fsutil/block.c b/tools/fsutil/block.c index d178e66..5aa53ba 100644 --- a/tools/fsutil/block.c +++ b/tools/fsutil/block.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include "bsdfs.h" diff --git a/tools/fsutil/bsdfs.h b/tools/fsutil/bsdfs.h index 4dc8ff9..d27696a 100644 --- a/tools/fsutil/bsdfs.h +++ b/tools/fsutil/bsdfs.h @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #define BSDFS_BSIZE 1024 /* block size */ #define BSDFS_ROOT_INODE 2 /* root directory in inode 2 */ diff --git a/tools/fsutil/check.c b/tools/fsutil/check.c index cae91b7..6240cde 100644 --- a/tools/fsutil/check.c +++ b/tools/fsutil/check.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include diff --git a/tools/fsutil/create.c b/tools/fsutil/create.c index ad3eea9..28e8b43 100644 --- a/tools/fsutil/create.c +++ b/tools/fsutil/create.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include diff --git a/tools/fsutil/file.c b/tools/fsutil/file.c index aed769b..06d5312 100644 --- a/tools/fsutil/file.c +++ b/tools/fsutil/file.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include diff --git a/tools/fsutil/fsutil.c b/tools/fsutil/fsutil.c index 8f7eca1..03a56f3 100644 --- a/tools/fsutil/fsutil.c +++ b/tools/fsutil/fsutil.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include diff --git a/tools/fsutil/inode.c b/tools/fsutil/inode.c index da70cf5..881df87 100644 --- a/tools/fsutil/inode.c +++ b/tools/fsutil/inode.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include diff --git a/tools/fsutil/superblock.c b/tools/fsutil/superblock.c index e8c02aa..aa1d373 100644 --- a/tools/fsutil/superblock.c +++ b/tools/fsutil/superblock.c @@ -3,9 +3,23 @@ * * Copyright (C) 2006-2011 Serge Vakulenko, * - * This file is part of RetroBSD project, which is distributed - * under the terms of the GNU General Public License (GPL). - * See the accompanying file "COPYING" for more details. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and this + * permission notice and warranty disclaimer appear in supporting + * documentation, and that the name of the author not be used in + * advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * The author disclaim all warranties with regard to this + * software, including all implied warranties of merchantability + * and fitness. In no event shall the author be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether + * in an action of contract, negligence or other tortious action, + * arising out of or in connection with the use or performance of + * this software. */ #include #include